Compare commits
209 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d64ea76647 | ||
|
|
c9f958d194 | ||
|
|
889a9c7ee5 | ||
|
|
29a7cced3a | ||
|
|
0d86d05d45 | ||
|
|
1598c2a3d9 | ||
|
|
997e9c5cb5 | ||
|
|
9cfe0502dd | ||
|
|
ff2536fcc5 | ||
|
|
df5564b1ea | ||
|
|
093031e720 | ||
|
|
65b595b899 | ||
|
|
bf5f02908f | ||
|
|
6c3140d422 | ||
|
|
dd27edc36b | ||
|
|
2065c975e0 | ||
|
|
0020a33e65 | ||
|
|
dd423c08d8 | ||
|
|
f9f049c177 | ||
|
|
034bdbb344 | ||
|
|
d7d4cb7fa7 | ||
|
|
b83483e3c0 | ||
|
|
9b909b3233 | ||
|
|
fac9df1de5 | ||
|
|
3262adadd4 | ||
|
|
74e9bdde72 | ||
|
|
f567ef5567 | ||
|
|
c89d7023c4 | ||
|
|
72aa64258f | ||
|
|
b5b63c11f2 | ||
|
|
4da684f3b6 | ||
|
|
fb29419c27 | ||
|
|
8789dadaef | ||
|
|
1c936d4b73 | ||
|
|
7c2f947518 | ||
|
|
bfbfef87d2 | ||
|
|
ea3beceef7 | ||
|
|
b0f0bc0331 | ||
|
|
932547af2a | ||
|
|
79ac9fb823 | ||
|
|
a437eb01eb | ||
|
|
6d921a9c46 | ||
|
|
abcb81d28c | ||
|
|
ea54f32805 | ||
|
|
3dbf29afac | ||
|
|
2c520d97a9 | ||
|
|
38148b24cb | ||
|
|
97895bdfa5 | ||
|
|
0c1c12680c | ||
|
|
6485e4b019 | ||
|
|
ee1e084455 | ||
|
|
5c8d679a6d | ||
|
|
94dc13088c | ||
|
|
9b572d77aa | ||
|
|
c1fa6de038 | ||
|
|
227e1927b4 | ||
|
|
ea98b61ddf | ||
|
|
9d1d60b764 | ||
|
|
7509d909e8 | ||
|
|
9612f64aba | ||
|
|
1b04d59539 | ||
|
|
e6998506f3 | ||
|
|
576397b2b0 | ||
|
|
6c1935bc61 | ||
|
|
1e68cfa568 | ||
|
|
8188d9a07a | ||
|
|
d7ae8d28c1 | ||
|
|
afa5639752 | ||
|
|
e0213e18a0 | ||
|
|
a74d60c7eb | ||
|
|
fcabc49d39 | ||
|
|
ad0722b57b | ||
|
|
6e11a2c8a7 | ||
|
|
0329cfad61 | ||
|
|
ede8a3ce5f | ||
|
|
cde4f2179e | ||
|
|
374dc17a6b | ||
|
|
626259c379 | ||
|
|
36644bda67 | ||
|
|
236e9e2fb3 | ||
|
|
b551216517 | ||
|
|
c8d9d9f075 | ||
|
|
4d43588b10 | ||
|
|
5f71add418 | ||
|
|
3fcfc6306d | ||
|
|
e78c774dbf | ||
|
|
6a54b1328f | ||
|
|
47c8273b7d | ||
|
|
0f01a4c076 | ||
|
|
17b43e3ae4 | ||
|
|
7fd6b10ddf | ||
|
|
7f16050f9e | ||
|
|
f57d525452 | ||
|
|
f05046b8bd | ||
|
|
a34aa7d72f | ||
|
|
72646ffee2 | ||
|
|
060fc65ffb | ||
|
|
4169ee9c6e | ||
|
|
51f380a800 | ||
|
|
c90062e7a0 | ||
|
|
26007f8318 | ||
|
|
0146ce5c30 | ||
|
|
87518df394 | ||
|
|
e49f5474f6 | ||
|
|
af4401fc62 | ||
|
|
c2d608a5cc | ||
|
|
b91b160b66 | ||
|
|
46a3df95bd | ||
|
|
d08aee047e | ||
|
|
406d8cf9a1 | ||
|
|
e1b9ab6b09 | ||
|
|
71f9014777 | ||
|
|
adca5adff2 | ||
|
|
1857f1d0e5 | ||
|
|
2d56820e8b | ||
|
|
119094b230 | ||
|
|
744b6e1e15 | ||
|
|
17f47732a0 | ||
|
|
3a46b97544 | ||
|
|
44976f4afa | ||
|
|
9da7c6ccf2 | ||
|
|
4b68eecf53 | ||
|
|
8d7058b947 | ||
|
|
933ae69d0b | ||
|
|
1af36f0a7a | ||
|
|
f4e9de5094 | ||
|
|
2ccaf404ab | ||
|
|
44c79c7646 | ||
|
|
a845d3f74d | ||
|
|
730113424c | ||
|
|
658be3004f | ||
|
|
214d0ad5c3 | ||
|
|
ca70c8a06d | ||
|
|
1c680367a7 | ||
|
|
3bd43d5ba9 | ||
|
|
0965f8f8e5 | ||
|
|
005eb603ae | ||
|
|
65a9303dff | ||
|
|
3bc6b625ec | ||
|
|
2b0dc6d17f | ||
|
|
842d790dcb | ||
|
|
20eac48349 | ||
|
|
efb80e8c33 | ||
|
|
35fbc651cd | ||
|
|
e55779ffa7 | ||
|
|
878176ea9c | ||
|
|
e3a2eab000 | ||
|
|
7478846754 | ||
|
|
8b244e6c26 | ||
|
|
19217de010 | ||
|
|
93a57b5dae | ||
|
|
defb447f29 | ||
|
|
93b73de164 | ||
|
|
ffc6124c0e | ||
|
|
ab40a992c2 | ||
|
|
5258569044 | ||
|
|
04d8055d56 | ||
|
|
68b6d54f60 | ||
|
|
a950a1e44b | ||
|
|
22f5472dbe | ||
|
|
d6d37a623d | ||
|
|
757184fbc8 | ||
|
|
043fa2c32a | ||
|
|
f94f5ca714 | ||
|
|
788bfc68bc | ||
|
|
dacc39c1d9 | ||
|
|
3fb2228031 | ||
|
|
4535178fa9 | ||
|
|
42e9e1603f | ||
|
|
9a0c3c6c62 | ||
|
|
ba864a62bf | ||
|
|
6dbfe18f58 | ||
|
|
d8c65ff1f3 | ||
|
|
426990f94e | ||
|
|
6d57929e89 | ||
|
|
2b51171592 | ||
|
|
701c9ffa5f | ||
|
|
4260b1c2b6 | ||
|
|
5e926f658d | ||
|
|
78e13bb1d3 | ||
|
|
9e5ec3406d | ||
|
|
21804d277b | ||
|
|
95d1a6b35c | ||
|
|
78395d48b4 | ||
|
|
c6795f201f | ||
|
|
8e7a362bc2 | ||
|
|
7ff3e9d017 | ||
|
|
902b0bb638 | ||
|
|
8097352a6c | ||
|
|
ecf902b73e | ||
|
|
bb0ace7e23 | ||
|
|
d964b11b8c | ||
|
|
53fa67f3bf | ||
|
|
adf7ece3e9 | ||
|
|
02d5b4d16b | ||
|
|
67f8e64140 | ||
|
|
45ceb17238 | ||
|
|
a1ee99618c | ||
|
|
de854a76f1 | ||
|
|
d59ebb44be | ||
|
|
5a2ac54c73 | ||
|
|
8fd8bae5aa | ||
|
|
5929b9b1ea | ||
|
|
aae14f1a6e | ||
|
|
96ad637882 | ||
|
|
73aa9129a8 | ||
|
|
1c89a6f6f9 | ||
|
|
c2beb96dda | ||
|
|
4c4fc3fc7f |
35
.autod.conf.js
Normal file
35
.autod.conf.js
Normal file
@@ -0,0 +1,35 @@
|
||||
'ues strict';
|
||||
|
||||
module.exports = {
|
||||
write: true,
|
||||
prefix: '^',
|
||||
devprefix: '^',
|
||||
registry: 'https://r.cnpmjs.org',
|
||||
exclude: [
|
||||
'test/fixtures',
|
||||
'examples',
|
||||
'docs',
|
||||
'public',
|
||||
],
|
||||
dep: [
|
||||
'mysql',
|
||||
'egg',
|
||||
'koa-router',
|
||||
],
|
||||
devdep: [
|
||||
'autod',
|
||||
'autod-egg',
|
||||
'eslint',
|
||||
'eslint-config-egg',
|
||||
'egg-bin',
|
||||
'egg-mock',
|
||||
],
|
||||
keep: [
|
||||
],
|
||||
semver: [
|
||||
'changes-stream@1',
|
||||
'nodemailer@1',
|
||||
'koa-router@3',
|
||||
'supertest@2',
|
||||
],
|
||||
};
|
||||
6
.eslintignore
Normal file
6
.eslintignore
Normal file
@@ -0,0 +1,6 @@
|
||||
test/fixtures
|
||||
test/mocks
|
||||
examples/**/app/public
|
||||
logs
|
||||
run
|
||||
public/
|
||||
@@ -1,7 +0,0 @@
|
||||
node_modules/
|
||||
coverage/
|
||||
.tmp/
|
||||
.git/
|
||||
tools/
|
||||
public/
|
||||
test/
|
||||
95
.jshintrc
95
.jshintrc
@@ -1,95 +0,0 @@
|
||||
{
|
||||
// JSHint Default Configuration File (as on JSHint website)
|
||||
// See http://jshint.com/docs/ for more details
|
||||
|
||||
"maxerr" : 50, // {int} Maximum error before stopping
|
||||
|
||||
// Enforcing
|
||||
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
|
||||
"camelcase" : false, // true: Identifiers must be in camelCase
|
||||
"curly" : true, // true: Require {} for every new block or scope
|
||||
"eqeqeq" : true, // true: Require triple equals (===) for comparison
|
||||
"forin" : false, // true: Require filtering for..in loops with obj.hasOwnProperty()
|
||||
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
|
||||
"indent" : false, // {int} Number of spaces to use for indentation
|
||||
"latedef" : false, // true: Require variables/functions to be defined before being used
|
||||
"newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
|
||||
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
|
||||
"noempty" : true, // true: Prohibit use of empty blocks
|
||||
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
|
||||
"plusplus" : false, // true: Prohibit use of `++` & `--`
|
||||
"quotmark" : false, // Quotation mark consistency:
|
||||
// false : do nothing (default)
|
||||
// true : ensure whatever is used is consistent
|
||||
// "single" : require single quotes
|
||||
// "double" : require double quotes
|
||||
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
|
||||
"unused" : true, // true: Require all defined variables be used
|
||||
"strict" : true, // true: Requires all functions run in ES5 Strict Mode
|
||||
"trailing" : false, // true: Prohibit trailing whitespaces
|
||||
"maxparams" : false, // {int} Max number of formal params allowed per function
|
||||
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
|
||||
"maxstatements" : false, // {int} Max number statements per function
|
||||
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
|
||||
"maxlen" : false, // {int} Max number of characters per line
|
||||
|
||||
// Relaxing
|
||||
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
|
||||
"boss" : true, // true: Tolerate assignments where comparisons would be expected
|
||||
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
|
||||
"eqnull" : false, // true: Tolerate use of `== null`
|
||||
"es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
|
||||
"esnext" : true, // true: Allow ES.next (ES6) syntax (ex: `const`)
|
||||
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
|
||||
// (ex: `for each`, multiple try/catch, function expression…)
|
||||
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
|
||||
"expr" : true, // true: Tolerate `ExpressionStatement` as Programs
|
||||
"funcscope" : false, // true: Tolerate defining variables inside control statements"
|
||||
"globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
|
||||
"iterator" : false, // true: Tolerate using the `__iterator__` property
|
||||
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
|
||||
"laxbreak" : true, // true: Tolerate possibly unsafe line breakings
|
||||
"laxcomma" : false, // true: Tolerate comma-first style coding
|
||||
"loopfunc" : false, // true: Tolerate functions being defined in loops
|
||||
"multistr" : true, // true: Tolerate multi-line strings
|
||||
"proto" : false, // true: Tolerate using the `__proto__` property
|
||||
"scripturl" : false, // true: Tolerate script-targeted URLs
|
||||
"smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
|
||||
"shadow" : true, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
|
||||
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
|
||||
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
|
||||
"validthis" : true, // true: Tolerate using this in a non-constructor function
|
||||
|
||||
// Environments
|
||||
"browser" : true, // Web Browser (window, document, etc)
|
||||
"couch" : false, // CouchDB
|
||||
"devel" : true, // Development/debugging (alert, confirm, etc)
|
||||
"dojo" : false, // Dojo Toolkit
|
||||
"jquery" : false, // jQuery
|
||||
"mootools" : false, // MooTools
|
||||
"node" : true, // Node.js
|
||||
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
|
||||
"prototypejs" : false, // Prototype and Scriptaculous
|
||||
"rhino" : false, // Rhino
|
||||
"worker" : false, // Web Workers
|
||||
"wsh" : false, // Windows Scripting Host
|
||||
"yui" : false, // Yahoo User Interface
|
||||
"noyield" : true, // allow generators without a yield
|
||||
|
||||
// Legacy
|
||||
"nomen" : false, // true: Prohibit dangling `_` in variables
|
||||
"onevar" : false, // true: Allow only one `var` statement per function
|
||||
"passfail" : false, // true: Stop on first error
|
||||
"white" : false, // true: Check against strict whitespace and indentation rules
|
||||
|
||||
// Custom Globals
|
||||
"globals" : { // additional predefined global variables
|
||||
// mocha
|
||||
"describe": true,
|
||||
"it": true,
|
||||
"before": true,
|
||||
"afterEach": true,
|
||||
"beforeEach": true,
|
||||
"after": true
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"notify": false
|
||||
}
|
||||
@@ -1,10 +1,11 @@
|
||||
sudo: false
|
||||
language: node_js
|
||||
node_js:
|
||||
- '2'
|
||||
- '4'
|
||||
- '6'
|
||||
- '7'
|
||||
addons:
|
||||
- postgresql: '9.3'
|
||||
script: 'make test-travis-all'
|
||||
script:
|
||||
- TEST_TIMEOUT=60000 CNPM_SOURCE_NPM=https://registry.npmjs.org CNPM_SOURCE_NPM_ISCNPM=false npm run test-all
|
||||
after_script:
|
||||
- "npm i codecov.io && cat ./coverage/coverage.json | ./node_modules/codecov.io/bin/codecov.io.js"
|
||||
- npm i codecov && codecov
|
||||
|
||||
3
AUTHORS
3
AUTHORS
@@ -6,4 +6,7 @@ alsotang <alsotang@gmail.com> (https://github.com/alsotang)
|
||||
4simple <wondger@qq.com> (https://github.com/4simple)
|
||||
afc163 <afc163@gmail.com> (https://github.com/afc163)
|
||||
Yuwei Ba <i@xiaoba.me> (https://github.com/ibigbug)
|
||||
dickeylth <dickeylth@gmail.com> (https://github.com/dickeylth)
|
||||
wenbing <wenbing@users.noreply.github.com> (https://github.com/wenbing)
|
||||
21paradox <1036339815@qq.com> (https://github.com/21paradox)
|
||||
|
||||
|
||||
257
History.md
257
History.md
@@ -1,4 +1,253 @@
|
||||
|
||||
2.19.2 / 2017-01-05
|
||||
==================
|
||||
|
||||
* fix: should auto sync un-deprecate message (#1105)
|
||||
|
||||
2.19.1 / 2016-12-29
|
||||
==================
|
||||
|
||||
* fix: try to use the best repository url (#1102)
|
||||
|
||||
2.19.0 / 2016-12-21
|
||||
==================
|
||||
|
||||
* feat: keyword search with limit to support keywords > 100 (#1097)
|
||||
|
||||
2.18.0 / 2016-12-05
|
||||
==================
|
||||
|
||||
* fix: support downloads total on scope package (#1088)
|
||||
* fix: try to sync from official replicate (#1076)
|
||||
* feat: add change password script (#1070)
|
||||
* test: skip always fail tests
|
||||
* test: add node v7
|
||||
* feat: show more sync info
|
||||
|
||||
2.17.2 / 2016-11-13
|
||||
==================
|
||||
|
||||
* fix: ignore long package name on unpublished sync (#1067)
|
||||
|
||||
2.17.1 / 2016-11-08
|
||||
==================
|
||||
|
||||
* fix: add publish_time for private packages (#1061)
|
||||
|
||||
2.17.0 / 2016-11-03
|
||||
==================
|
||||
|
||||
* feat: make snyk.io url configable (#1058)
|
||||
|
||||
2.16.2 / 2016-09-27
|
||||
==================
|
||||
|
||||
* fix: try to use config.registryHost first on setDownloadURL (#1044)
|
||||
|
||||
2.16.1 / 2016-08-22
|
||||
==================
|
||||
|
||||
* refactor: refine publishable's code (#1022)
|
||||
|
||||
2.16.0 / 2016-08-22
|
||||
==================
|
||||
|
||||
* feat: admin can do everything (#1021)
|
||||
|
||||
2.15.0 / 2016-08-22
|
||||
==================
|
||||
|
||||
* feat: return dist-tag on package registry ([#1020](https://github.com/cnpm/cnpmjs.org/issues/1020))
|
||||
* chore(package): update supertest to version 2.0.0 ([#1004](https://github.com/cnpm/cnpmjs.org/issues/1004))
|
||||
|
||||
2.14.0 / 2016-08-04
|
||||
==================
|
||||
|
||||
* feat: password may contains ":" ([#999](https://github.com/cnpm/cnpmjs.org/issues/999))
|
||||
* fix: limit sync fails email notice ([#1006](https://github.com/cnpm/cnpmjs.org/issues/1006))
|
||||
|
||||
2.13.0 / 2016-07-26
|
||||
==================
|
||||
|
||||
* feat: enable maxrequests middleware ([#1003](https://github.com/cnpm/cnpmjs.org/issues/1003))
|
||||
|
||||
2.12.2 / 2016-07-11
|
||||
==================
|
||||
|
||||
* fix: getModuleByRange don't list all packages ([#990](https://github.com/cnpm/cnpmjs.org/issues/990))
|
||||
* fix: should show new version package count ([#984](https://github.com/cnpm/cnpmjs.org/issues/984))
|
||||
|
||||
2.12.1 / 2016-07-01
|
||||
==================
|
||||
|
||||
* fix: make sure chagnes stream destroy ([#982](https://github.com/cnpm/cnpmjs.org/issues/982))
|
||||
* chore(package): update semver to version 5.2.0 ([#978](https://github.com/cnpm/cnpmjs.org/issues/978))
|
||||
* deps: use ^ instead of ~ ([#976](https://github.com/cnpm/cnpmjs.org/issues/976))
|
||||
* chore(package): update mini-logger to version 1.1.1 ([#973](https://github.com/cnpm/cnpmjs.org/issues/973))
|
||||
|
||||
2.12.0 / 2016-06-26
|
||||
==================
|
||||
|
||||
* fix: logger seperator should be one EOL ([#972](https://github.com/cnpm/cnpmjs.org/issues/972))
|
||||
* feat: add security check badge for public package ([#971](https://github.com/cnpm/cnpmjs.org/issues/971))
|
||||
|
||||
2.11.0 / 2016-06-25
|
||||
==================
|
||||
|
||||
* feat: add changes stream syncer ([#970](https://github.com/cnpm/cnpmjs.org/issues/970))
|
||||
* chore(package): update pg to version 5.1.0 ([#953](https://github.com/cnpm/cnpmjs.org/issues/953))
|
||||
|
||||
2.10.1 / 2016-06-05
|
||||
==================
|
||||
|
||||
* fix: should sync missing public scoped package on install ([#946](https://github.com/cnpm/cnpmjs.org/issues/946))
|
||||
* chore(package): update bytes to version 2.4.0 ([#943](https://github.com/cnpm/cnpmjs.org/issues/943))
|
||||
* userService ([#926](https://github.com/cnpm/cnpmjs.org/issues/926))
|
||||
* chore(package): update should to version 8.4.0 ([#928](https://github.com/cnpm/cnpmjs.org/issues/928))
|
||||
* chore(package): update humanize-ms to version 1.2.0 ([#927](https://github.com/cnpm/cnpmjs.org/issues/927))
|
||||
* chore(package): update kcors to version 1.2.1 ([#918](https://github.com/cnpm/cnpmjs.org/issues/918))
|
||||
* chore(package): update urllib to version 2.9.0 ([#898](https://github.com/cnpm/cnpmjs.org/issues/898))
|
||||
|
||||
2.10.0 / 2016-04-15
|
||||
==================
|
||||
|
||||
* feat: show tarball url on package page ([#894](https://github.com/cnpm/cnpmjs.org/issues/894))
|
||||
* chore(package): update koa-mock to version 1.6.1 ([#891](https://github.com/cnpm/cnpmjs.org/issues/891))
|
||||
|
||||
2.9.5 / 2016-04-12
|
||||
==================
|
||||
|
||||
* fix: change logo url to a better https source
|
||||
* fix: http://cnpmjs.org/package/fms pre style ([#739](https://github.com/cnpm/cnpmjs.org/issues/739))
|
||||
|
||||
2.9.4 / 2016-04-09
|
||||
==================
|
||||
|
||||
* fix: don't sync constructor package on exists mode ([#883](https://github.com/cnpm/cnpmjs.org/issues/883))
|
||||
* Update utility to version 1.7.0 🚀
|
||||
* chore: update sponsor link
|
||||
|
||||
2.9.3 / 2016-04-05
|
||||
==================
|
||||
|
||||
* fix: use better diff time to check sync status
|
||||
* Update sequelize to version 3.21.0 🚀
|
||||
* chore(package): update agentkeepalive to version 2.1.0
|
||||
* chore(package): update pg to version 4.5.2
|
||||
|
||||
2.9.2 / 2016-03-29
|
||||
==================
|
||||
|
||||
* fix: override antd for ul & ol list number & icon.
|
||||
|
||||
2.9.1 / 2016-03-29
|
||||
==================
|
||||
|
||||
* refactor: add more ua info on syncer
|
||||
|
||||
2.9.0 / 2016-03-26
|
||||
==================
|
||||
|
||||
* feat: only admin can unpublish
|
||||
* chore(package): update gravatar to version 1.5.0
|
||||
* chore(package): update sequelize to version 3.20.0
|
||||
* fix: fix save download count unqiue constraint error
|
||||
* chore(package): update moment to version 2.12.0
|
||||
|
||||
2.8.1 / 2016-03-07
|
||||
==================
|
||||
|
||||
* fix: only send warning email if no any sync data after 24h
|
||||
* chore(package): update kcors to version 1.1.0
|
||||
* chore(package): update koa to version 1.2.0
|
||||
* chore(package): update urllib to version 2.8.0
|
||||
|
||||
2.8.0 / 2016-02-23
|
||||
==================
|
||||
|
||||
* fix: convert `*` to latest tag
|
||||
* deps: upgrade deps and remove node 2.0.0 support
|
||||
* doc: update sponsors on readme
|
||||
* fix: update copyright year
|
||||
* doc: fix disturl typo
|
||||
* deps: sequelize@3.19.0
|
||||
|
||||
2.7.1 / 2016-02-01
|
||||
==================
|
||||
|
||||
* fix(semver): when have invalid version([#817](https://github.com/cnpm/cnpmjs.org/issues/817))
|
||||
|
||||
2.7.0 / 2016-02-01
|
||||
==================
|
||||
|
||||
* test: fix all test cases
|
||||
* test: fix unpublish
|
||||
* test: add complex range test case
|
||||
* feat: support semver([#816](https://github.com/cnpm/cnpmjs.org/issues/816))
|
||||
|
||||
2.6.2 / 2016-01-19
|
||||
==================
|
||||
|
||||
* feat: list & show support jsonp
|
||||
* chore(package): update urllib to version 2.7.0
|
||||
* Delete install.md
|
||||
|
||||
2.6.1 / 2016-01-12
|
||||
==================
|
||||
|
||||
* fix: source registry is not cnpm, ignore check status
|
||||
|
||||
2.6.0 / 2016-01-12
|
||||
==================
|
||||
|
||||
* feat(sync): monitor sync status
|
||||
* chore(package): update agentkeepalive to version 2.0.3
|
||||
* fix SequelizeDatabaseError: ER_NO_SUCH_TABLE: Table 'qnpm.total' doesn't exist\nreproduce this bug:\nthe first startup of cnpmjs.org
|
||||
* chore(package): update moment to version 2.11.0
|
||||
* chore(package): update xss to version 0.2.10
|
||||
* chore(package): update pg-hstore to version 2.3.2
|
||||
* chore(package): update mini-logger to version 1.1.0
|
||||
* chore(package): update urllib to version 2.6.0
|
||||
* fix: row.package will json parse error
|
||||
* remove bluebird
|
||||
* chore(package): update utility to version 1.6.0
|
||||
|
||||
2.5.1 / 2015-12-02
|
||||
==================
|
||||
|
||||
* chore(package): update bluebird to version 3.0.6
|
||||
* fix: SequelizeDatabaseError
|
||||
* fix(dist_tag): disable delete latest tag
|
||||
* feat: count total private pkgs
|
||||
* fix: use isoweek. a week start from monday
|
||||
* chore(package): update xss to version 0.2.8
|
||||
* chore(package): update semver to version 5.1.0
|
||||
|
||||
2.5.0 / 2015-11-17
|
||||
==================
|
||||
|
||||
* test: add node v5
|
||||
* feat(sync): sync deleted user
|
||||
* Update show.js
|
||||
* chore(package): update bytes to version 2.2.0
|
||||
* do not sync inner username
|
||||
* gzip static file
|
||||
* chore(package): update bytes to version 2.1.0
|
||||
* chore(package): update is-type-of to version 1.0.0
|
||||
* Update static.js
|
||||
* chore(package): update cfork to version 1.4.0
|
||||
* chore(package): update bluebird to version 3.0.5
|
||||
|
||||
2.4.1 / 2015-10-27
|
||||
==================
|
||||
|
||||
* fix: improve registry index page performance with cache
|
||||
* Configable badge URL prefix.
|
||||
* chore(package): update koa-mock to version 1.5.0
|
||||
* chore(package): update urllib to version 2.5.0
|
||||
* chore(package): update co to version 4.6.0
|
||||
* chore(package): update semver to version 5.0.3
|
||||
|
||||
2.4.0 / 2015-10-21
|
||||
==================
|
||||
|
||||
@@ -23,7 +272,7 @@
|
||||
* Add mock data.
|
||||
* refactor: add more sync log
|
||||
* Fix sidebar overflow.
|
||||
* Merge pull request #680 from ibigbug/ant-design
|
||||
* Merge pull request [#680](https://github.com/cnpm/cnpmjs.org/issues/680) from ibigbug/ant-design
|
||||
* Clean code.
|
||||
* Indent.
|
||||
* chore(package): update debug to version 2.2.0
|
||||
@@ -120,10 +369,10 @@
|
||||
|
||||
* feat: support always-auth
|
||||
* fix mysql select args = [] bug
|
||||
* fix #597 sequelize raw query.
|
||||
* fix [#597](https://github.com/cnpm/cnpmjs.org/issues/597) sequelize raw query.
|
||||
* fix(markdown): hotfix markdown-it cpu problem
|
||||
* feat: upgrade to co4
|
||||
* use kcors fixes #594
|
||||
* use kcors fixes [#594](https://github.com/cnpm/cnpmjs.org/issues/594)
|
||||
|
||||
2.0.0-rc.13 / 2015-02-04
|
||||
==================
|
||||
@@ -734,7 +983,7 @@
|
||||
* npm publish dont contains .jshint*
|
||||
* npm test run jshint
|
||||
* Add jshint check: $ make jshint
|
||||
* use `yield* next` instead of `yield next`
|
||||
* use `yield next` instead of `yield next`
|
||||
* replace dist.u.qiniudn.com with cnpmjs.org/dist
|
||||
|
||||
0.3.5 / 2014-03-05
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
This software is licensed under the MIT License.
|
||||
|
||||
Copyright(c) cnpmjs.org and other contributors.
|
||||
Copyright(c) cnpm and other contributors.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
119
Makefile
119
Makefile
@@ -1,119 +0,0 @@
|
||||
TESTS = $(shell ls -S `find test -type f -name "*.test.js" -print`)
|
||||
REPORTER = spec
|
||||
TIMEOUT = 30000
|
||||
MOCHA_OPTS =
|
||||
DB = sqlite
|
||||
DISTURL = https://npm.taobao.org/mirrors/iojs
|
||||
BIN = iojs
|
||||
|
||||
ifeq ($(findstring io.js, $(shell which node)),)
|
||||
BIN = node
|
||||
DISTURL = https://npm.taobao.org/mirrors/node
|
||||
endif
|
||||
|
||||
install:
|
||||
@npm install --build-from-source --registry=http://registry.npm.taobao.org \
|
||||
--disturl=$(DISTURL)
|
||||
|
||||
install-production production:
|
||||
@NODE_ENV=production $(MAKE) install
|
||||
|
||||
jshint: install
|
||||
@-node_modules/.bin/jshint ./
|
||||
|
||||
init-database:
|
||||
@$(BIN) test/init_db.js
|
||||
|
||||
init-mysql:
|
||||
@mysql -uroot -e 'DROP DATABASE IF EXISTS cnpmjs_test;'
|
||||
@mysql -uroot -e 'CREATE DATABASE cnpmjs_test;'
|
||||
|
||||
init-pg:
|
||||
@psql -c 'DROP DATABASE IF EXISTS cnpmjs_test;'
|
||||
@psql -c 'CREATE DATABASE cnpmjs_test;'
|
||||
|
||||
test: install init-database
|
||||
@NODE_ENV=test DB=${DB} node_modules/.bin/mocha \
|
||||
--reporter $(REPORTER) \
|
||||
--timeout $(TIMEOUT) \
|
||||
--require should \
|
||||
--require should-http \
|
||||
--require co-mocha \
|
||||
--require ./test/init.js \
|
||||
$(MOCHA_OPTS) \
|
||||
$(TESTS)
|
||||
|
||||
test-sqlite:
|
||||
@$(MAKE) test DB=sqlite
|
||||
|
||||
test-mysql: init-mysql
|
||||
@$(MAKE) test DB=mysql
|
||||
|
||||
test-pg: init-pg
|
||||
@DB_PORT=5432 DB_USER=$(USER) $(MAKE) test DB=postgres
|
||||
|
||||
test-all: test-sqlite test-mysql
|
||||
|
||||
test-cov cov: install init-database
|
||||
@NODE_ENV=test DB=${DB} $(BIN) \
|
||||
node_modules/.bin/istanbul cover --preserve-comments \
|
||||
node_modules/.bin/_mocha \
|
||||
-- -u exports \
|
||||
--reporter $(REPORTER) \
|
||||
--timeout $(TIMEOUT) \
|
||||
--require should \
|
||||
--require should-http \
|
||||
--require co-mocha \
|
||||
--require ./test/init.js \
|
||||
$(MOCHA_OPTS) \
|
||||
$(TESTS)
|
||||
|
||||
test-cov-sqlite:
|
||||
@$(MAKE) test-cov DB=sqlite
|
||||
|
||||
test-cov-mysql: init-mysql
|
||||
@$(MAKE) test-cov DB=mysql
|
||||
|
||||
test-travis: install init-database
|
||||
@NODE_ENV=test DB=${DB} CNPM_SOURCE_NPM=http://registry.npmjs.com CNPM_SOURCE_NPM_ISCNPM=false \
|
||||
$(BIN) \
|
||||
node_modules/.bin/istanbul cover --preserve-comments \
|
||||
node_modules/.bin/_mocha \
|
||||
-- -u exports \
|
||||
--reporter dot \
|
||||
--timeout $(TIMEOUT) \
|
||||
--require should \
|
||||
--require should-http \
|
||||
--require co-mocha \
|
||||
--require ./test/init.js \
|
||||
$(MOCHA_OPTS) \
|
||||
$(TESTS)
|
||||
|
||||
test-travis-sqlite:
|
||||
@$(MAKE) test-travis DB=sqlite
|
||||
|
||||
test-travis-mysql: init-mysql
|
||||
@$(MAKE) test-travis DB=mysql
|
||||
|
||||
test-travis-pg:
|
||||
@psql -c 'DROP DATABASE IF EXISTS cnpmjs_test;' -U postgres
|
||||
@psql -c 'CREATE DATABASE cnpmjs_test;' -U postgres
|
||||
@DB_PORT=5432 DB_USER=postgres $(MAKE) test-travis DB=postgres
|
||||
|
||||
test-travis-all: test-travis-sqlite test-travis-mysql test-travis-pg
|
||||
|
||||
dev:
|
||||
@NODE_ENV=development $(BIN) node_modules/.bin/node-dev --harmony dispatch.js
|
||||
|
||||
contributors: install
|
||||
@node_modules/.bin/contributors -f plain -o AUTHORS
|
||||
|
||||
autod: install
|
||||
@node_modules/.bin/autod -w \
|
||||
--prefix "~" \
|
||||
--exclude public,view,docs,backup,coverage \
|
||||
--dep bluebird,mysql \
|
||||
--keep should,supertest,should-http,chunkstream,mm,pedding
|
||||
@$(MAKE) install
|
||||
|
||||
.PHONY: test
|
||||
14
README.md
14
README.md
@@ -3,18 +3,21 @@ cnpmjs.org
|
||||
|
||||
[![NPM version][npm-image]][npm-url]
|
||||
[![build status][travis-image]][travis-url]
|
||||
[![Test coverage][cov-image]][cov-url]
|
||||
[![Test coverage][codecov-image]][codecov-url]
|
||||
[![David deps][david-image]][david-url]
|
||||
[![Known Vulnerabilities][snyk-image]][snyk-url]
|
||||
[![npm download][download-image]][download-url]
|
||||
|
||||
[npm-image]: http://cnpmjs.org/badge/v/cnpmjs.org.svg?style=flat-square
|
||||
[npm-url]: http://cnpmjs.org/package/cnpmjs.org
|
||||
[travis-image]: https://img.shields.io/travis/cnpm/cnpmjs.org.svg?style=flat-square
|
||||
[travis-url]: https://travis-ci.org/cnpm/cnpmjs.org
|
||||
[cov-image]: http://codecov.io/github/cnpm/cnpmjs.org/coverage.svg?branch=master
|
||||
[cov-url]: http://codecov.io/github/cnpm/cnpmjs.org?branch=master
|
||||
[codecov-image]: https://codecov.io/gh/cnpm/cnpmjs.org/branch/master/graph/badge.svg
|
||||
[codecov-url]: https://codecov.io/gh/cnpm/cnpmjs.org
|
||||
[david-image]: https://img.shields.io/david/cnpm/cnpmjs.org.svg?style=flat-square
|
||||
[david-url]: https://david-dm.org/cnpm/cnpmjs.org
|
||||
[snyk-image]: https://snyk.io/test/npm/cnpmjs.org/badge.svg?style=flat-square
|
||||
[snyk-url]: https://snyk.io/test/npm/cnpmjs.org
|
||||
[download-image]: https://img.shields.io/npm/dm/cnpmjs.org.svg?style=flat-square
|
||||
[download-url]: https://npmjs.org/package/cnpmjs.org
|
||||
|
||||
@@ -71,7 +74,7 @@ as well as [New features in 2.x](https://github.com/cnpm/cnpmjs.org/wiki/New-fea
|
||||
|
||||
### Dependencies
|
||||
|
||||
* [node](http://nodejs.org) >=0.11.12, use `--harmony`
|
||||
* [node](http://nodejs.org) >= 4.3.1
|
||||
* Databases: only required one type
|
||||
* [sqlite3](https://npm.taobao.org/package/sqlite3) >= 3.0.2, we use `sqlite3` by default
|
||||
* [MySQL](http://dev.mysql.com/downloads/) >= 0.5.0, include `mysqld` and `mysql cli`. I test on `mysql@5.6.16`.
|
||||
@@ -111,7 +114,8 @@ Tips: make sure your code is following the [node-style-guide](https://github.com
|
||||
|
||||
## Sponsors
|
||||
|
||||
- [](http://www.ucloud.cn?sem=sdk-CNPMJS)
|
||||
- [](http://click.aliyun.com/m/4288/) (2016.2 - now)
|
||||
- [](http://www.ucloud.cn?sem=sdk-CNPMJS) (2015.3 - 2016.3)
|
||||
|
||||
## License
|
||||
|
||||
|
||||
24
bin/change_password.js
Normal file
24
bin/change_password.js
Normal file
@@ -0,0 +1,24 @@
|
||||
'use strict';
|
||||
// Only support for ./services/DefaultUserService. If you use custom user service, ignore this file.
|
||||
// call with:
|
||||
// $ node ./bin/change_password.js 'username' 'new_password'
|
||||
|
||||
const UserModel = require('../models').User;
|
||||
const co = require('co');
|
||||
const utility = require('utility');
|
||||
|
||||
const username = process.argv[2];
|
||||
const newPassword = process.argv[3];
|
||||
|
||||
co(function* () {
|
||||
let user = yield UserModel.find({ where: { name: username } });
|
||||
const salt = user.salt;
|
||||
console.log(`user original password_sha: ${user.password_sha}`);
|
||||
const newPasswordSha = utility.sha1(newPassword + salt);
|
||||
user.password_sha = newPasswordSha;
|
||||
user = yield user.save();
|
||||
console.log(`change user password successful!! user new password_sha: ${user.password_sha}`);
|
||||
process.exit(0);
|
||||
}).catch(function(e) {
|
||||
console.log(e);
|
||||
});
|
||||
62
bin/cli.js
62
bin/cli.js
@@ -1,26 +1,14 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**!
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <m@fengmk2.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:cli');
|
||||
var program = require('commander');
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var mkdirp = require('mkdirp');
|
||||
var treekill = require('treekill');
|
||||
var version = require('../package.json').version;
|
||||
const debug = require('debug')('cnpmjs.org:cli');
|
||||
const program = require('commander');
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const mkdirp = require('mkdirp');
|
||||
const treekill = require('treekill');
|
||||
const version = require('../package.json').version;
|
||||
|
||||
function list(val) {
|
||||
return val.split(',');
|
||||
@@ -49,11 +37,11 @@ program.parse(process.argv);
|
||||
|
||||
function start(options) {
|
||||
stop(options);
|
||||
var dataDir = options.dataDir || path.join(process.env.HOME, '.cnpmjs.org');
|
||||
const dataDir = options.dataDir || path.join(process.env.HOME, '.cnpmjs.org');
|
||||
mkdirp.sync(dataDir);
|
||||
|
||||
var configfile = path.join(dataDir, 'config.json');
|
||||
var config = {};
|
||||
const configfile = path.join(dataDir, 'config.json');
|
||||
let config = {};
|
||||
if (fs.existsSync(configfile)) {
|
||||
try {
|
||||
config = require(configfile);
|
||||
@@ -64,12 +52,12 @@ function start(options) {
|
||||
// config.enableCluster = !!options.cluster;
|
||||
if (options.admins) {
|
||||
config.admins = {};
|
||||
for (var i = 0; i < options.admins.length; i++) {
|
||||
for (let i = 0; i < options.admins.length; i++) {
|
||||
config.admins[options.admins[i]] = options.admins[i] + '@localhost.com';
|
||||
}
|
||||
}
|
||||
if (options.scopes) {
|
||||
config.scopes = options.scopes.map(function (name) {
|
||||
config.scopes = options.scopes.map(function(name) {
|
||||
if (name[0] !== '@') {
|
||||
name = '@' + name;
|
||||
}
|
||||
@@ -77,24 +65,25 @@ function start(options) {
|
||||
});
|
||||
}
|
||||
|
||||
var configJSON = JSON.stringify(config, null, 2);
|
||||
const configJSON = JSON.stringify(config, null, 2);
|
||||
fs.writeFileSync(configfile, configJSON);
|
||||
|
||||
debug('save config %s to %s', configJSON, configfile);
|
||||
|
||||
// if sqlite db file not exists, init first
|
||||
initDatabase();
|
||||
initDatabase(function() {
|
||||
require('../dispatch');
|
||||
});
|
||||
|
||||
require('../dispatch');
|
||||
fs.writeFileSync(path.join(dataDir, 'pid'), process.pid + '');
|
||||
}
|
||||
|
||||
function stop(options) {
|
||||
var dataDir = options.dataDir || path.join(process.env.HOME, '.cnpmjs.org');
|
||||
var pidfile = path.join(dataDir, 'pid');
|
||||
const dataDir = options.dataDir || path.join(process.env.HOME, '.cnpmjs.org');
|
||||
const pidfile = path.join(dataDir, 'pid');
|
||||
if (fs.existsSync(pidfile)) {
|
||||
var pid = Number(fs.readFileSync(pidfile, 'utf8'));
|
||||
treekill(pid, function (err) {
|
||||
const pid = Number(fs.readFileSync(pidfile, 'utf8'));
|
||||
treekill(pid, function(err) {
|
||||
if (err) {
|
||||
console.log(err);
|
||||
throw err;
|
||||
@@ -105,22 +94,23 @@ function stop(options) {
|
||||
}
|
||||
}
|
||||
|
||||
function initDatabase() {
|
||||
var models = require('../models');
|
||||
function initDatabase(callback) {
|
||||
const models = require('../models');
|
||||
|
||||
models.sequelize.sync({ force: false })
|
||||
.then(function () {
|
||||
models.Total.init(function (err) {
|
||||
.then(function() {
|
||||
models.Total.init(function(err) {
|
||||
if (err) {
|
||||
console.error('[models/init_script.js] sequelize init fail');
|
||||
console.error(err);
|
||||
throw err;
|
||||
} else {
|
||||
console.log('[models/init_script.js] `sqlite` sequelize sync and init success');
|
||||
callback();
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(function (err) {
|
||||
.catch(function(err) {
|
||||
console.error('[models/init_script.js] sequelize sync fail');
|
||||
console.error(err);
|
||||
throw err;
|
||||
|
||||
@@ -1,62 +1,56 @@
|
||||
/**!
|
||||
* cnpmjs.org - common/logger.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const debug = require('debug')('cnpmjs.org:logger');
|
||||
const formater = require('error-formater');
|
||||
const Logger = require('mini-logger');
|
||||
const utility = require('utility');
|
||||
const util = require('util');
|
||||
const os = require('os');
|
||||
const config = require('../config');
|
||||
const mail = require('./mail');
|
||||
|
||||
var formater = require('error-formater');
|
||||
var Logger = require('mini-logger');
|
||||
var utility = require('utility');
|
||||
var util = require('util');
|
||||
var config = require('../config');
|
||||
var mail = require('./mail');
|
||||
const isTEST = process.env.NODE_ENV === 'test';
|
||||
const categories = [ 'sync_info', 'sync_error' ];
|
||||
|
||||
var isTEST = process.env.NODE_ENV === 'test';
|
||||
var categories = ['sync_info', 'sync_error'];
|
||||
|
||||
var logger = module.exports = Logger({
|
||||
categories: categories,
|
||||
const logger = module.exports = Logger({
|
||||
categories,
|
||||
dir: config.logdir,
|
||||
duration: '1d',
|
||||
format: '[{category}.]YYYY-MM-DD[.log]',
|
||||
stdout: config.debug && !isTEST,
|
||||
errorFormater: errorFormater
|
||||
errorFormater,
|
||||
seperator: os.EOL,
|
||||
});
|
||||
|
||||
var to = [];
|
||||
for (var user in config.admins) {
|
||||
const to = [];
|
||||
for (const user in config.admins) {
|
||||
to.push(config.admins[user]);
|
||||
}
|
||||
|
||||
function errorFormater(err) {
|
||||
var msg = formater.both(err);
|
||||
const msg = formater.both(err);
|
||||
mail.error(to, msg.json.name, msg.text);
|
||||
return msg.text;
|
||||
}
|
||||
|
||||
logger.syncInfo = function () {
|
||||
var args = [].slice.call(arguments);
|
||||
logger.syncInfo = function() {
|
||||
const args = [].slice.call(arguments);
|
||||
if (typeof args[0] === 'string') {
|
||||
args[0] = util.format('[%s][%s] ', utility.logDate(), process.pid) + args[0];
|
||||
}
|
||||
if (debug.enabled) {
|
||||
debug.apply(debug, args);
|
||||
}
|
||||
logger.sync_info.apply(logger, args);
|
||||
};
|
||||
|
||||
logger.syncError =function () {
|
||||
var args = [].slice.call(arguments);
|
||||
logger.syncError = function() {
|
||||
const args = [].slice.call(arguments);
|
||||
if (typeof args[0] === 'string') {
|
||||
args[0] = util.format('[%s][%s] ', utility.logDate(), process.pid) + args[0];
|
||||
}
|
||||
if (debug.enabled) {
|
||||
debug.apply(debug, args);
|
||||
}
|
||||
logger.sync_error.apply(logger, arguments);
|
||||
};
|
||||
|
||||
@@ -1,25 +1,11 @@
|
||||
/**!
|
||||
* cnpmjs.org - common/mail.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const nodemailer = require('nodemailer');
|
||||
const utility = require('utility');
|
||||
const os = require('os');
|
||||
const mailConfig = require('../config').mail;
|
||||
|
||||
var nodemailer = require('nodemailer');
|
||||
var utility = require('utility');
|
||||
var os = require('os');
|
||||
var mailConfig = require('../config').mail;
|
||||
|
||||
var smtpConfig;
|
||||
let smtpConfig;
|
||||
if (mailConfig.auth) {
|
||||
// new style
|
||||
smtpConfig = mailConfig;
|
||||
@@ -33,12 +19,12 @@ if (mailConfig.auth) {
|
||||
debug: mailConfig.debug,
|
||||
auth: {
|
||||
user: mailConfig.user,
|
||||
pass: mailConfig.pass
|
||||
}
|
||||
pass: mailConfig.pass,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
var transport;
|
||||
let transport;
|
||||
|
||||
/**
|
||||
* Send notice email with mail level and appname.
|
||||
@@ -49,15 +35,16 @@ var transport;
|
||||
* @param {String} html
|
||||
* @param {Function(err, result)} callback
|
||||
*/
|
||||
|
||||
exports.notice = function sendLogMail(to, level, subject, html, callback) {
|
||||
subject = '[' + mailConfig.appname + '] [' + level + '] [' + os.hostname() + '] ' + subject;
|
||||
html = String(html);
|
||||
exports.send(to, subject, html.replace(/\n/g, '<br/>'), callback);
|
||||
};
|
||||
|
||||
var LEVELS = [ 'log', 'warn', 'error' ];
|
||||
LEVELS.forEach(function (level) {
|
||||
exports[level] = function (to, subject, html, callback) {
|
||||
const LEVELS = [ 'log', 'warn', 'error' ];
|
||||
LEVELS.forEach(function(level) {
|
||||
exports[level] = function(to, subject, html, callback) {
|
||||
exports.notice(to, level, subject, html, callback);
|
||||
};
|
||||
});
|
||||
@@ -69,7 +56,8 @@ LEVELS.forEach(function (level) {
|
||||
* @param {String} html
|
||||
* @param {Function(err, result)} callback
|
||||
*/
|
||||
exports.send = function (to, subject, html, callback) {
|
||||
|
||||
exports.send = function(to, subject, html, callback) {
|
||||
callback = callback || utility.noop;
|
||||
|
||||
if (mailConfig.enable === false) {
|
||||
@@ -81,14 +69,14 @@ exports.send = function (to, subject, html, callback) {
|
||||
transport = nodemailer.createTransport(smtpConfig);
|
||||
}
|
||||
|
||||
var message = {
|
||||
const message = {
|
||||
from: mailConfig.from || mailConfig.sender,
|
||||
to: to,
|
||||
subject: subject,
|
||||
html: html,
|
||||
to,
|
||||
subject,
|
||||
html,
|
||||
};
|
||||
|
||||
transport.sendMail(message, function (err, result) {
|
||||
transport.sendMail(message, function(err, result) {
|
||||
callback(err, result);
|
||||
});
|
||||
};
|
||||
|
||||
@@ -14,19 +14,19 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var xss = require('xss');
|
||||
var MarkdownIt = require('markdown-it');
|
||||
const xss = require('xss');
|
||||
const MarkdownIt = require('markdown-it');
|
||||
|
||||
// allow class attr on code
|
||||
xss.whiteList.code = ['class'];
|
||||
xss.whiteList.code = [ 'class' ];
|
||||
|
||||
var md = new MarkdownIt({
|
||||
const md = new MarkdownIt({
|
||||
html: true,
|
||||
linkify: true,
|
||||
});
|
||||
|
||||
exports.render = function (content, filterXss) {
|
||||
var html = md.render(content);
|
||||
exports.render = function(content, filterXss) {
|
||||
let html = md.render(content);
|
||||
if (filterXss !== false) {
|
||||
html = xss(html);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/*!
|
||||
/* !
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
@@ -12,6 +12,6 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var config = require('../config');
|
||||
const config = require('../config');
|
||||
|
||||
module.exports = config.nfs;
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var Sequelize = require('sequelize');
|
||||
var DataTypes = require('sequelize/lib/data-types');
|
||||
var config = require('../config');
|
||||
const Sequelize = require('sequelize');
|
||||
const DataTypes = require('sequelize/lib/data-types');
|
||||
const config = require('../config');
|
||||
|
||||
if (config.mysqlServers && config.database.dialect === 'sqlite') {
|
||||
// https://github.com/cnpm/cnpmjs.org/wiki/Migrating-from-1.x-to-2.x
|
||||
@@ -34,7 +34,7 @@ if (config.mysqlServers && config.database.dialect === 'sqlite') {
|
||||
// mysqlQueryTimeout: 5000,
|
||||
|
||||
console.warn('[WARNNING] your config.js was too old, please @see https://github.com/cnpm/cnpmjs.org/wiki/Migrating-from-1.x-to-2.x');
|
||||
var server = config.mysqlServers[0];
|
||||
const server = config.mysqlServers[0];
|
||||
config.database = {
|
||||
db: config.mysqlDatabase,
|
||||
username: server.user,
|
||||
@@ -45,13 +45,13 @@ if (config.mysqlServers && config.database.dialect === 'sqlite') {
|
||||
pool: {
|
||||
maxConnections: config.mysqlMaxConnections || 10,
|
||||
minConnections: 0,
|
||||
maxIdleTime: 30000
|
||||
maxIdleTime: 30000,
|
||||
},
|
||||
logging: !!process.env.SQL_DEBUG,
|
||||
};
|
||||
}
|
||||
|
||||
var database = config.database;
|
||||
const database = config.database;
|
||||
|
||||
// sync database before app start, defaul is false
|
||||
database.syncFirst = false;
|
||||
@@ -70,6 +70,6 @@ database.define = {
|
||||
collate: 'utf8_general_ci',
|
||||
};
|
||||
|
||||
var sequelize = new Sequelize(database.db, database.username, database.password, database);
|
||||
const sequelize = new Sequelize(database.db, database.username, database.password, database);
|
||||
|
||||
module.exports = sequelize;
|
||||
|
||||
@@ -14,43 +14,43 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var urlparse = require('url').parse;
|
||||
var urllib = require('urllib');
|
||||
var HttpAgent = require('agentkeepalive');
|
||||
var HttpsAgent = require('agentkeepalive').HttpsAgent;
|
||||
var config = require('../config');
|
||||
const urlparse = require('url').parse;
|
||||
const urllib = require('urllib');
|
||||
const HttpAgent = require('agentkeepalive');
|
||||
const HttpsAgent = require('agentkeepalive').HttpsAgent;
|
||||
const config = require('../config');
|
||||
|
||||
var httpAgent;
|
||||
var httpsAgent;
|
||||
let httpAgent;
|
||||
let httpsAgent;
|
||||
|
||||
if (config.httpProxy) {
|
||||
var tunnel = require('tunnel-agent');
|
||||
var urlinfo = urlparse(config.httpProxy);
|
||||
const tunnel = require('tunnel-agent');
|
||||
const urlinfo = urlparse(config.httpProxy);
|
||||
if (urlinfo.protocol === 'http:') {
|
||||
httpAgent = tunnel.httpOverHttp({
|
||||
proxy: {
|
||||
host: urlinfo.hostname,
|
||||
port: urlinfo.port
|
||||
}
|
||||
port: urlinfo.port,
|
||||
},
|
||||
});
|
||||
httpsAgent = tunnel.httpsOverHttp({
|
||||
proxy: {
|
||||
host: urlinfo.hostname,
|
||||
port: urlinfo.port
|
||||
}
|
||||
port: urlinfo.port,
|
||||
},
|
||||
});
|
||||
} else if (urlinfo.protocol === 'https:') {
|
||||
httpAgent = tunnel.httpOverHttps({
|
||||
proxy: {
|
||||
host: urlinfo.hostname,
|
||||
port: urlinfo.port
|
||||
}
|
||||
port: urlinfo.port,
|
||||
},
|
||||
});
|
||||
httpsAgent = tunnel.httpsOverHttps({
|
||||
proxy: {
|
||||
host: urlinfo.hostname,
|
||||
port: urlinfo.port
|
||||
}
|
||||
port: urlinfo.port,
|
||||
},
|
||||
});
|
||||
} else {
|
||||
throw new TypeError('httpProxy format error: ' + config.httpProxy);
|
||||
@@ -58,17 +58,17 @@ if (config.httpProxy) {
|
||||
} else {
|
||||
httpAgent = new HttpAgent({
|
||||
timeout: 0,
|
||||
keepAliveTimeout: 15000
|
||||
keepAliveTimeout: 15000,
|
||||
});
|
||||
httpsAgent = new HttpsAgent({
|
||||
timeout: 0,
|
||||
keepAliveTimeout: 15000
|
||||
keepAliveTimeout: 15000,
|
||||
});
|
||||
}
|
||||
|
||||
var client = urllib.create({
|
||||
const client = urllib.create({
|
||||
agent: httpAgent,
|
||||
httpsAgent: httpsAgent
|
||||
httpsAgent,
|
||||
});
|
||||
|
||||
module.exports = client;
|
||||
|
||||
@@ -1,31 +1,19 @@
|
||||
/**!
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com>
|
||||
* fengmk2 <m@fengmk2.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const mkdirp = require('mkdirp');
|
||||
const copy = require('copy-to');
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const os = require('os');
|
||||
|
||||
var mkdirp = require('mkdirp');
|
||||
var copy = require('copy-to');
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var os = require('os');
|
||||
const version = require('../package.json').version;
|
||||
|
||||
var version = require('../package.json').version;
|
||||
const root = path.dirname(__dirname);
|
||||
const dataDir = path.join(process.env.HOME || root, '.cnpmjs.org');
|
||||
|
||||
var root = path.dirname(__dirname);
|
||||
var dataDir = path.join(process.env.HOME || root, '.cnpmjs.org');
|
||||
|
||||
var config = {
|
||||
version: version,
|
||||
const config = {
|
||||
version,
|
||||
dataDir,
|
||||
|
||||
/**
|
||||
* Cluster mode
|
||||
@@ -89,11 +77,11 @@ var config = {
|
||||
service: 'gmail',
|
||||
auth: {
|
||||
user: 'address@gmail.com',
|
||||
pass: 'your password'
|
||||
}
|
||||
pass: 'your password',
|
||||
},
|
||||
},
|
||||
|
||||
logoURL: '//ww4.sinaimg.cn/large/69c1d4acgw1ebfly5kjlij208202oglr.jpg', // cnpm logo image url
|
||||
logoURL: 'https://os.alipayobjects.com/rmsportal/oygxuIUkkrRccUz.jpg', // cnpm logo image url
|
||||
adBanner: '',
|
||||
customReadmeFile: '', // you can use your custom readme file instead the cnpm one
|
||||
customFooter: '', // you can add copyright and site total script html here
|
||||
@@ -129,7 +117,7 @@ var config = {
|
||||
pool: {
|
||||
maxConnections: 10,
|
||||
minConnections: 0,
|
||||
maxIdleTime: 30000
|
||||
maxIdleTime: 30000,
|
||||
},
|
||||
|
||||
// the storage engine for 'sqlite'
|
||||
@@ -141,7 +129,7 @@ var config = {
|
||||
|
||||
// package tarball store in local filesystem by default
|
||||
nfs: require('fs-cnpm')({
|
||||
dir: path.join(dataDir, 'nfs')
|
||||
dir: path.join(dataDir, 'nfs'),
|
||||
}),
|
||||
// if set true, will 302 redirect to `nfs.url(dist.key)`
|
||||
downloadRedirectToNFS: false,
|
||||
@@ -174,12 +162,13 @@ var config = {
|
||||
// cnpm wont directly sync from this one
|
||||
// but sometimes will request it for some package infomations
|
||||
// please don't change it if not necessary
|
||||
officialNpmRegistry: 'https://registry.npmjs.org',
|
||||
officialNpmRegistry: 'https://registry.npmjs.com',
|
||||
officialNpmReplicate: 'https://replicate.npmjs.com',
|
||||
|
||||
// sync source, upstream registry
|
||||
// If you want to directly sync from official npm's registry
|
||||
// please drop them an email first
|
||||
sourceNpmRegistry: 'http://registry.npm.taobao.org',
|
||||
sourceNpmRegistry: 'https://registry.npm.taobao.org',
|
||||
|
||||
// upstream registry is base on cnpm/cnpmjs.org or not
|
||||
// if your upstream is official npm registry, please turn it off
|
||||
@@ -209,10 +198,17 @@ var config = {
|
||||
// sync devDependencies or not, default is false
|
||||
syncDevDependencies: false,
|
||||
|
||||
// changes streaming sync
|
||||
syncChangesStream: false,
|
||||
handleSyncRegistry: 'http://127.0.0.1:7001',
|
||||
|
||||
// badge subject on http://shields.io/
|
||||
badgePrefixURL: 'https://img.shields.io/badge',
|
||||
badgeSubject: 'cnpm',
|
||||
|
||||
// custom user service, @see https://github.com/cnpm/cnpmjs.org/wiki/Use-Your-Own-User-Authorization
|
||||
// when you not intend to ingegrate with your company's user system, then use null, it would
|
||||
// use the default cnpm user system
|
||||
userService: null,
|
||||
|
||||
// always-auth https://docs.npmjs.com/misc/config#always-auth
|
||||
@@ -222,10 +218,13 @@ var config = {
|
||||
// if you're behind firewall, need to request through http proxy, please set this
|
||||
// e.g.: `httpProxy: 'http://proxy.mycompany.com:8080'`
|
||||
httpProxy: null,
|
||||
|
||||
// snyk.io root url
|
||||
snykUrl: 'https://snyk.io',
|
||||
};
|
||||
|
||||
if (process.env.NODE_ENV !== 'test') {
|
||||
var customConfig;
|
||||
let customConfig;
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
customConfig = path.join(root, 'config', 'config.js');
|
||||
} else {
|
||||
@@ -246,7 +245,7 @@ mkdirp.sync(config.uploadDir);
|
||||
|
||||
module.exports = config;
|
||||
|
||||
config.loadConfig = function (customConfig) {
|
||||
config.loadConfig = function(customConfig) {
|
||||
if (!customConfig) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../../../services/package');
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
module.exports = deprecateVersions;
|
||||
|
||||
@@ -22,28 +22,28 @@ module.exports = deprecateVersions;
|
||||
* @see https://github.com/cnpm/cnpmjs.org/issues/415
|
||||
*/
|
||||
function* deprecateVersions() {
|
||||
var body = this.request.body;
|
||||
var name = this.params.name || this.params[0];
|
||||
const body = this.request.body;
|
||||
const name = this.params.name || this.params[0];
|
||||
|
||||
var tasks = [];
|
||||
for (var version in body.versions) {
|
||||
const tasks = [];
|
||||
for (const version in body.versions) {
|
||||
tasks.push(packageService.getModule(name, version));
|
||||
}
|
||||
var rs = yield tasks;
|
||||
const rs = yield tasks;
|
||||
|
||||
var updateTasks = [];
|
||||
for (var i = 0; i < rs.length; i++) {
|
||||
var row = rs[i];
|
||||
const updateTasks = [];
|
||||
for (let i = 0; i < rs.length; i++) {
|
||||
const row = rs[i];
|
||||
if (!row) {
|
||||
// some version not exists
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'version_error',
|
||||
reason: 'Some versions: ' + JSON.stringify(Object.keys(body.versions)) + ' not found'
|
||||
reason: 'Some versions: ' + JSON.stringify(Object.keys(body.versions)) + ' not found',
|
||||
};
|
||||
return;
|
||||
}
|
||||
var data = body.versions[row.package.version];
|
||||
const data = body.versions[row.package.version];
|
||||
if (typeof data.deprecated === 'string') {
|
||||
row.package.deprecated = data.deprecated;
|
||||
updateTasks.push(packageService.updateModulePackage(row.id, row.package));
|
||||
@@ -51,10 +51,10 @@ function* deprecateVersions() {
|
||||
}
|
||||
yield updateTasks;
|
||||
// update last modified
|
||||
yield* packageService.updateModuleLastModified(name);
|
||||
yield packageService.updateModuleLastModified(name);
|
||||
|
||||
this.status = 201;
|
||||
this.body = {
|
||||
ok: true
|
||||
ok: true,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,34 +1,20 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/dist_tag.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../../../services/package');
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
function ok() {
|
||||
return {
|
||||
ok: "dist-tags updated"
|
||||
ok: 'dist-tags updated',
|
||||
};
|
||||
}
|
||||
|
||||
// GET /-/package/:pkg/dist-tags -- returns the package's dist-tags
|
||||
exports.index = function* () {
|
||||
var name = this.params.name || this.params[0];
|
||||
var rows = yield* packageService.listModuleTags(name);
|
||||
var tags = {};
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
var row = rows[i];
|
||||
const name = this.params.name || this.params[0];
|
||||
const rows = yield packageService.listModuleTags(name);
|
||||
const tags = {};
|
||||
for (let i = 0; i < rows.length; i++) {
|
||||
const row = rows[i];
|
||||
tags[row.tag] = row.version;
|
||||
}
|
||||
this.body = tags;
|
||||
@@ -36,17 +22,17 @@ exports.index = function* () {
|
||||
|
||||
// PUT /-/package/:pkg/dist-tags -- Set package's dist-tags to provided object body (removing missing)
|
||||
exports.save = function* () {
|
||||
var name = this.params.name || this.params[0];
|
||||
const name = this.params.name || this.params[0];
|
||||
yield packageService.removeModuleTags(name);
|
||||
yield* exports.update.call(this);
|
||||
yield exports.update.call(this);
|
||||
};
|
||||
|
||||
// POST /-/package/:pkg/dist-tags -- Add/modify dist-tags from provided object body (merge)
|
||||
exports.update = function* () {
|
||||
var name = this.params.name || this.params[0];
|
||||
var tags = this.request.body;
|
||||
for (var tag in tags) {
|
||||
var version = tags[tag];
|
||||
const name = this.params.name || this.params[0];
|
||||
const tags = this.request.body;
|
||||
for (const tag in tags) {
|
||||
const version = tags[tag];
|
||||
yield packageService.addModuleTag(name, tag, version);
|
||||
}
|
||||
this.status = 201;
|
||||
@@ -56,16 +42,16 @@ exports.update = function* () {
|
||||
// PUT /-/package/:pkg/dist-tags/:tag -- Set package's dist-tags[tag] to provided string body
|
||||
// POST /-/package/:pkg/dist-tags/:tag -- Same as PUT /-/package/:pkg/dist-tags/:tag
|
||||
exports.set = function* () {
|
||||
var name = this.params.name || this.params[0];
|
||||
var tag = this.params.tag || this.params[1];
|
||||
var version = this.request.body;
|
||||
const name = this.params.name || this.params[0];
|
||||
const tag = this.params.tag || this.params[1];
|
||||
const version = this.request.body;
|
||||
// make sure version exists
|
||||
var pkg = yield packageService.getModule(name, version);
|
||||
const pkg = yield packageService.getModule(name, version);
|
||||
if (!pkg) {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'version_error',
|
||||
reason: name + '@' + version + ' not exists'
|
||||
reason: name + '@' + version + ' not exists',
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -77,8 +63,16 @@ exports.set = function* () {
|
||||
|
||||
// DELETE /-/package/:pkg/dist-tags/:tag -- Remove tag from dist-tags
|
||||
exports.destroy = function* () {
|
||||
var name = this.params.name || this.params[0];
|
||||
var tag = this.params.tag || this.params[1];
|
||||
const name = this.params.name || this.params[0];
|
||||
const tag = this.params.tag || this.params[1];
|
||||
if (tag === 'latest') {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'dist_tag_error',
|
||||
reason: 'Can\'t not delete latest tag',
|
||||
};
|
||||
return;
|
||||
}
|
||||
yield packageService.removeModuleTagsByNames(name, tag);
|
||||
this.body = ok();
|
||||
};
|
||||
|
||||
@@ -1,39 +1,27 @@
|
||||
/**!
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:download');
|
||||
const mime = require('mime');
|
||||
const utility = require('utility');
|
||||
const defer = require('co-defer');
|
||||
const is = require('is-type-of');
|
||||
const nfs = require('../../../common/nfs');
|
||||
const logger = require('../../../common/logger');
|
||||
const common = require('../../../lib/common');
|
||||
const downloadAsReadStream = require('../../utils').downloadAsReadStream;
|
||||
const packageService = require('../../../services/package');
|
||||
const downloadTotalService = require('../../../services/download_total');
|
||||
const config = require('../../../config');
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:download');
|
||||
var mime = require('mime');
|
||||
var utility = require('utility');
|
||||
var defer = require('co-defer');
|
||||
var is = require('is-type-of');
|
||||
var nfs = require('../../../common/nfs');
|
||||
var logger = require('../../../common/logger');
|
||||
var common = require('../../../lib/common');
|
||||
var downloadAsReadStream = require('../../utils').downloadAsReadStream;
|
||||
var packageService = require('../../../services/package');
|
||||
var downloadTotalService = require('../../../services/download_total');
|
||||
var config = require('../../../config');
|
||||
|
||||
var _downloads = {};
|
||||
let _downloads = {};
|
||||
|
||||
module.exports = function* download(next) {
|
||||
var name = this.params.name || this.params[0];
|
||||
var filename = this.params.filename || this.params[1];
|
||||
var version = filename.slice(name.length + 1, -4);
|
||||
var row = yield packageService.getModule(name, version);
|
||||
const name = this.params.name || this.params[0];
|
||||
const filename = this.params.filename || this.params[1];
|
||||
const version = filename.slice(name.length + 1, -4);
|
||||
const row = yield packageService.getModule(name, version);
|
||||
// can not get dist
|
||||
var url = null;
|
||||
let url = null;
|
||||
|
||||
if (typeof nfs.url === 'function') {
|
||||
if (is.generatorFunction(nfs.url)) {
|
||||
@@ -47,7 +35,7 @@ module.exports = function* download(next) {
|
||||
|
||||
if (!row || !row.package || !row.package.dist) {
|
||||
if (!url) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
this.status = 302;
|
||||
this.set('Location', url);
|
||||
@@ -63,7 +51,7 @@ module.exports = function* download(next) {
|
||||
return;
|
||||
}
|
||||
|
||||
var dist = row.package.dist;
|
||||
const dist = row.package.dist;
|
||||
if (!dist.key) {
|
||||
// try to use nsf.url() first
|
||||
url = url || dist.tarball;
|
||||
@@ -86,10 +74,10 @@ module.exports = function* download(next) {
|
||||
|
||||
defer.setInterval(function* () {
|
||||
// save download count
|
||||
var totals = [];
|
||||
for (var name in _downloads) {
|
||||
var count = _downloads[name];
|
||||
totals.push([name, count]);
|
||||
const totals = [];
|
||||
for (const name in _downloads) {
|
||||
const count = _downloads[name];
|
||||
totals.push([ name, count ]);
|
||||
}
|
||||
_downloads = {};
|
||||
|
||||
@@ -99,18 +87,20 @@ defer.setInterval(function* () {
|
||||
|
||||
debug('save download total: %j', totals);
|
||||
|
||||
var date = utility.YYYYMMDD();
|
||||
for (var i = 0; i < totals.length; i++) {
|
||||
var item = totals[i];
|
||||
var name = item[0];
|
||||
var count = item[1];
|
||||
const date = utility.YYYYMMDD();
|
||||
for (let i = 0; i < totals.length; i++) {
|
||||
const item = totals[i];
|
||||
const name = item[0];
|
||||
const count = item[1];
|
||||
try {
|
||||
yield* downloadTotalService.plusModuleTotal({ name: name, date: date, count: count });
|
||||
yield downloadTotalService.plusModuleTotal({ name, date, count });
|
||||
} catch (err) {
|
||||
err.message += '; name: ' + name + ', count: ' + count + ', date: ' + date;
|
||||
logger.error(err);
|
||||
if (err.name !== 'SequelizeUniqueConstraintError') {
|
||||
err.message += '; name: ' + name + ', count: ' + count + ', date: ' + date;
|
||||
logger.error(err);
|
||||
}
|
||||
// save back to _downloads, try again next time
|
||||
_downloads[name] = (_downloads[name] || 0) + count;
|
||||
}
|
||||
}
|
||||
}, 5000);
|
||||
}, 5000 + Math.ceil(Math.random() * 1000));
|
||||
|
||||
@@ -1,25 +1,11 @@
|
||||
/*!
|
||||
* cnpmjs.org - controllers/registry/package/download_total.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (https://github.com/dead-horse)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const DownloadTotal = require('../../../services/download_total');
|
||||
const DATE_REG = /^\d{4}-\d{2}-\d{2}$/;
|
||||
|
||||
var DownloadTotal = require('../../../services/download_total');
|
||||
var DATE_REG = /^\d{4}-\d{2}-\d{2}$/;
|
||||
|
||||
module.exports = function* downloadTotal () {
|
||||
var range = this.params.range;
|
||||
var name = this.params.name;
|
||||
module.exports = function* downloadTotal() {
|
||||
let range = this.params.range || this.params[0] || '';
|
||||
const name = this.params.name || this.params[1];
|
||||
|
||||
range = range.split(':');
|
||||
if (range.length !== 2
|
||||
@@ -28,7 +14,7 @@ module.exports = function* downloadTotal () {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'range_error',
|
||||
reason: 'range must be YYYY-MM-DD:YYYY-MM-DD style'
|
||||
reason: 'range must be YYYY-MM-DD:YYYY-MM-DD style',
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -39,42 +25,42 @@ module.exports = function* downloadTotal () {
|
||||
};
|
||||
|
||||
function* getPackageTotal(name, start, end) {
|
||||
var res = yield DownloadTotal.getModuleTotal(name, start, end);
|
||||
var downloads = res.map(function (row) {
|
||||
const res = yield DownloadTotal.getModuleTotal(name, start, end);
|
||||
const downloads = res.map(function(row) {
|
||||
return {
|
||||
day: row.date,
|
||||
downloads: row.count
|
||||
downloads: row.count,
|
||||
};
|
||||
});
|
||||
|
||||
downloads.sort(function (a, b) {
|
||||
downloads.sort(function(a, b) {
|
||||
return a.day > b.day ? 1 : -1;
|
||||
});
|
||||
|
||||
return {
|
||||
downloads: downloads,
|
||||
downloads,
|
||||
package: name,
|
||||
start: start,
|
||||
end: end
|
||||
start,
|
||||
end,
|
||||
};
|
||||
}
|
||||
|
||||
function* getTotal(start, end) {
|
||||
var res = yield DownloadTotal.getTotal(start, end);
|
||||
var downloads = res.map(function (row) {
|
||||
const res = yield DownloadTotal.getTotal(start, end);
|
||||
const downloads = res.map(function(row) {
|
||||
return {
|
||||
day: row.date,
|
||||
downloads: row.count
|
||||
downloads: row.count,
|
||||
};
|
||||
});
|
||||
|
||||
downloads.sort(function (a, b) {
|
||||
downloads.sort(function(a, b) {
|
||||
return a.day > b.day ? 1 : -1;
|
||||
});
|
||||
|
||||
return {
|
||||
downloads: downloads,
|
||||
start: start,
|
||||
end: end
|
||||
downloads,
|
||||
start,
|
||||
end,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,45 +1,31 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/list.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:package:list');
|
||||
var packageService = require('../../../services/package');
|
||||
var common = require('../../../lib/common');
|
||||
var SyncModuleWorker = require('../../sync_module_worker');
|
||||
var config = require('../../../config');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:package:list');
|
||||
const packageService = require('../../../services/package');
|
||||
const common = require('../../../lib/common');
|
||||
const SyncModuleWorker = require('../../sync_module_worker');
|
||||
const config = require('../../../config');
|
||||
|
||||
/**
|
||||
* list all version of a module
|
||||
* GET /:name
|
||||
*/
|
||||
|
||||
module.exports = function* list() {
|
||||
var orginalName = this.params.name || this.params[0];
|
||||
var name = orginalName;
|
||||
var rs = yield [
|
||||
const orginalName = this.params.name || this.params[0];
|
||||
const name = orginalName;
|
||||
const rs = yield [
|
||||
packageService.getModuleLastModified(name),
|
||||
packageService.listModuleTags(name)
|
||||
packageService.listModuleTags(name),
|
||||
];
|
||||
var modifiedTime = rs[0];
|
||||
var tags = rs[1];
|
||||
let modifiedTime = rs[0];
|
||||
const tags = rs[1];
|
||||
|
||||
debug('show %s(%s), last modified: %s, tags: %j', name, orginalName, modifiedTime, tags);
|
||||
if (modifiedTime) {
|
||||
// find out the latest modfied time
|
||||
// because update tags only modfied tag, wont change module gmt_modified
|
||||
for (var i = 0; i < tags.length; i++) {
|
||||
var tag = tags[i];
|
||||
for (const tag of tags) {
|
||||
if (tag.gmt_modified > modifiedTime) {
|
||||
modifiedTime = tag.gmt_modified;
|
||||
}
|
||||
@@ -54,21 +40,20 @@ module.exports = function* list() {
|
||||
}
|
||||
}
|
||||
|
||||
var r = yield [
|
||||
const r = yield [
|
||||
packageService.listModulesByName(name),
|
||||
packageService.listStarUserNames(name),
|
||||
packageService.listMaintainers(name),
|
||||
];
|
||||
var rows = r[0];
|
||||
var starUsers = r[1];
|
||||
var maintainers = r[2];
|
||||
const rows = r[0];
|
||||
let starUsers = r[1];
|
||||
const maintainers = r[2];
|
||||
|
||||
debug('show %s got %d rows, %d tags, %d star users, maintainers: %j',
|
||||
name, rows.length, tags.length, starUsers.length, maintainers);
|
||||
|
||||
var starUserMap = {};
|
||||
for (var i = 0; i < starUsers.length; i++) {
|
||||
var starUser = starUsers[i];
|
||||
const starUserMap = {};
|
||||
for (const starUser of starUsers) {
|
||||
if (starUser[0] !== '"' && starUser[0] !== "'") {
|
||||
starUserMap[starUser] = true;
|
||||
}
|
||||
@@ -77,7 +62,7 @@ module.exports = function* list() {
|
||||
|
||||
if (rows.length === 0) {
|
||||
// check if unpublished
|
||||
var unpublishedInfo = yield* packageService.getUnpublishedModule(name);
|
||||
const unpublishedInfo = yield packageService.getUnpublishedModule(name);
|
||||
debug('show unpublished %j', unpublishedInfo);
|
||||
if (unpublishedInfo) {
|
||||
this.status = 404;
|
||||
@@ -88,7 +73,7 @@ module.exports = function* list() {
|
||||
modified: unpublishedInfo.package.time,
|
||||
unpublished: unpublishedInfo.package,
|
||||
},
|
||||
_attachments: {}
|
||||
_attachments: {},
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -101,40 +86,44 @@ module.exports = function* list() {
|
||||
this.status = 404;
|
||||
this.body = {
|
||||
error: 'not_found',
|
||||
reason: 'document not found'
|
||||
reason: 'document not found',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// start sync
|
||||
var logId = yield* SyncModuleWorker.sync(name, 'sync-by-install');
|
||||
const logId = yield SyncModuleWorker.sync(name, 'sync-by-install');
|
||||
debug('start sync %s, get log id %s', name, logId);
|
||||
|
||||
return this.redirect(config.officialNpmRegistry + this.url);
|
||||
}
|
||||
|
||||
var latestMod = null;
|
||||
var readme = null;
|
||||
let latestMod = null;
|
||||
let readme = null;
|
||||
// set tags
|
||||
var distTags = {};
|
||||
for (var i = 0; i < tags.length; i++) {
|
||||
var t = tags[i];
|
||||
const distTags = {};
|
||||
for (const t of tags) {
|
||||
distTags[t.tag] = t.version;
|
||||
}
|
||||
|
||||
// set versions and times
|
||||
var versions = {};
|
||||
var times = {};
|
||||
var attachments = {};
|
||||
var createdTime = null;
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
var row = rows[i];
|
||||
var pkg = row.package;
|
||||
const versions = {};
|
||||
let times = {};
|
||||
const attachments = {};
|
||||
let createdTime = null;
|
||||
for (const row of rows) {
|
||||
const pkg = row.package;
|
||||
// pkg is string ... ignore it
|
||||
if (typeof pkg === 'string') {
|
||||
continue;
|
||||
}
|
||||
common.setDownloadURL(pkg, this);
|
||||
pkg._cnpm_publish_time = row.publish_time;
|
||||
pkg.publish_time = pkg.publish_time || row.publish_time;
|
||||
|
||||
versions[pkg.version] = pkg;
|
||||
|
||||
var t = times[pkg.version] = row.publish_time ? new Date(row.publish_time) : row.gmt_modified;
|
||||
const t = times[pkg.version] = row.publish_time ? new Date(row.publish_time) : row.gmt_modified;
|
||||
if ((!distTags.latest && !latestMod) || distTags.latest === pkg.version) {
|
||||
latestMod = row;
|
||||
readme = pkg.readme;
|
||||
@@ -151,11 +140,11 @@ module.exports = function* list() {
|
||||
}
|
||||
|
||||
if (modifiedTime && createdTime) {
|
||||
var ts = {
|
||||
const ts = {
|
||||
modified: modifiedTime,
|
||||
created: createdTime,
|
||||
};
|
||||
for (var t in times) {
|
||||
for (const t in times) {
|
||||
ts[t] = times[t];
|
||||
}
|
||||
times = ts;
|
||||
@@ -165,8 +154,8 @@ module.exports = function* list() {
|
||||
latestMod = rows[0];
|
||||
}
|
||||
|
||||
var rev = String(latestMod.id);
|
||||
var pkg = latestMod.package;
|
||||
const rev = String(latestMod.id);
|
||||
const pkg = latestMod.package;
|
||||
|
||||
if (tags.length === 0) {
|
||||
// some sync error reason, will cause tags missing
|
||||
@@ -174,19 +163,19 @@ module.exports = function* list() {
|
||||
distTags.latest = pkg.version;
|
||||
}
|
||||
|
||||
var info = {
|
||||
const info = {
|
||||
_id: orginalName,
|
||||
_rev: rev,
|
||||
name: orginalName,
|
||||
description: pkg.description,
|
||||
"dist-tags": distTags,
|
||||
'dist-tags': distTags,
|
||||
maintainers: pkg.maintainers,
|
||||
time: times,
|
||||
users: starUsers,
|
||||
author: pkg.author,
|
||||
repository: pkg.repository,
|
||||
versions: versions,
|
||||
readme: readme,
|
||||
versions,
|
||||
readme,
|
||||
_attachments: attachments,
|
||||
};
|
||||
|
||||
@@ -196,5 +185,5 @@ module.exports = function* list() {
|
||||
info.license = pkg.license;
|
||||
|
||||
debug('show module %s: %s, latest: %s', orginalName, rev, latestMod.version);
|
||||
this.body = info;
|
||||
this.jsonp = info;
|
||||
};
|
||||
|
||||
@@ -1,29 +1,15 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/list_all.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../../../services/package');
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
// GET /-/all
|
||||
// List all packages names
|
||||
// https://github.com/npm/npm-registry-client/blob/master/lib/get.js#L86
|
||||
module.exports = function* () {
|
||||
var updated = Date.now();
|
||||
var names = yield* packageService.listAllPublicModuleNames();
|
||||
var result = { _updated: updated };
|
||||
names.forEach(function (name) {
|
||||
const updated = Date.now();
|
||||
const names = yield packageService.listAllPublicModuleNames();
|
||||
const result = { _updated: updated };
|
||||
names.forEach(function(name) {
|
||||
result[name] = true;
|
||||
});
|
||||
this.body = result;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
module.exports = function*() {
|
||||
module.exports = function* () {
|
||||
const username = this.params.user;
|
||||
const packages = yield packageService.listModulesByUser(username);
|
||||
|
||||
@@ -24,6 +24,6 @@ module.exports = function*() {
|
||||
user: {
|
||||
name: username,
|
||||
},
|
||||
packages: packages,
|
||||
packages,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
module.exports = function*() {
|
||||
module.exports = function* () {
|
||||
const name = this.params.name || this.params[0];
|
||||
const dependents = yield packageService.listDependents(name);
|
||||
|
||||
this.body = {
|
||||
dependents: dependents,
|
||||
dependents,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../../../services/package');
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
// GET /-/short
|
||||
// List all packages names only
|
||||
|
||||
@@ -1,57 +1,43 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/list_since.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
var packageService = require('../../../services/package');
|
||||
|
||||
var A_WEEK_MS = 3600000 * 24 * 7;
|
||||
const A_WEEK_MS = 3600000 * 24 * 7;
|
||||
|
||||
// GET /-/all/since?stale=update_after&startkey={key}
|
||||
// List packages names since startkey
|
||||
// https://github.com/npm/npm-registry-client/blob/master/lib/get.js#L89
|
||||
module.exports = function* () {
|
||||
var query = this.query;
|
||||
module.exports = function* listSince() {
|
||||
const query = this.query;
|
||||
if (query.stale !== 'update_after') {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'query_parse_error',
|
||||
reason: 'Invalid value for `stale`.'
|
||||
reason: 'Invalid value for `stale`.',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var startkey = Number(query.startkey);
|
||||
let startkey = Number(query.startkey);
|
||||
if (!startkey) {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'query_parse_error',
|
||||
reason: 'Invalid value for `startkey`.'
|
||||
reason: 'Invalid value for `startkey`.',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var updated = Date.now();
|
||||
const updated = Date.now();
|
||||
if (updated - startkey > A_WEEK_MS) {
|
||||
startkey = updated - A_WEEK_MS;
|
||||
console.warn('[%s] list modules since time out of range: query: %j, ip: %s',
|
||||
Date(), query, this.ip);
|
||||
}
|
||||
|
||||
var names = yield* packageService.listPublicModuleNamesSince(startkey);
|
||||
var result = { _updated: updated };
|
||||
names.forEach(function (name) {
|
||||
const names = yield packageService.listPublicModuleNamesSince(startkey);
|
||||
const result = { _updated: updated };
|
||||
names.forEach(function(name) {
|
||||
result[name] = true;
|
||||
});
|
||||
|
||||
|
||||
@@ -14,25 +14,25 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:package:remove');
|
||||
var urlparse = require('url').parse;
|
||||
var packageService = require('../../../services/package');
|
||||
var totalService = require('../../../services/total');
|
||||
var nfs = require('../../../common/nfs');
|
||||
var logger = require('../../../common/logger');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:package:remove');
|
||||
const urlparse = require('url').parse;
|
||||
const packageService = require('../../../services/package');
|
||||
const totalService = require('../../../services/total');
|
||||
const nfs = require('../../../common/nfs');
|
||||
const logger = require('../../../common/logger');
|
||||
|
||||
// DELETE /:name/-rev/:rev
|
||||
// https://github.com/npm/npm-registry-client/blob/master/lib/unpublish.js#L25
|
||||
module.exports = function* remove(next) {
|
||||
var name = this.params.name || this.params[0];
|
||||
var rev = this.params.rev || this.params[1];
|
||||
const name = this.params.name || this.params[0];
|
||||
const rev = this.params.rev || this.params[1];
|
||||
debug('remove all the module with name: %s, id: %s', name, rev);
|
||||
|
||||
var mods = yield* packageService.listModulesByName(name);
|
||||
const mods = yield packageService.listModulesByName(name);
|
||||
debug('removeAll module %s: %d', name, mods.length);
|
||||
var mod = mods[0];
|
||||
const mod = mods[0];
|
||||
if (!mod) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
yield [
|
||||
@@ -41,11 +41,11 @@ module.exports = function* remove(next) {
|
||||
totalService.plusDeleteModule(),
|
||||
];
|
||||
|
||||
var keys = [];
|
||||
for (var i = 0; i < mods.length; i++) {
|
||||
var row = mods[i];
|
||||
var dist = row.package.dist;
|
||||
var key = dist.key;
|
||||
const keys = [];
|
||||
for (let i = 0; i < mods.length; i++) {
|
||||
const row = mods[i];
|
||||
const dist = row.package.dist;
|
||||
let key = dist.key;
|
||||
if (!key) {
|
||||
key = urlparse(dist.tarball).pathname;
|
||||
}
|
||||
@@ -53,7 +53,7 @@ module.exports = function* remove(next) {
|
||||
}
|
||||
|
||||
try {
|
||||
yield keys.map(function (key) {
|
||||
yield keys.map(function(key) {
|
||||
return nfs.remove(key);
|
||||
});
|
||||
} catch (err) {
|
||||
@@ -61,7 +61,7 @@ module.exports = function* remove(next) {
|
||||
}
|
||||
|
||||
// remove the maintainers
|
||||
yield* packageService.removeAllMaintainers(name);
|
||||
yield packageService.removeAllMaintainers(name);
|
||||
|
||||
this.body = { ok: true };
|
||||
};
|
||||
|
||||
@@ -14,45 +14,45 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:package:remove_version');
|
||||
var packageService = require('../../../services/package');
|
||||
var nfs = require('../../../common/nfs');
|
||||
var logger = require('../../../common/logger');
|
||||
var getCDNKey = require('../../../lib/common').getCDNKey;
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:package:remove_version');
|
||||
const packageService = require('../../../services/package');
|
||||
const nfs = require('../../../common/nfs');
|
||||
const logger = require('../../../common/logger');
|
||||
const getCDNKey = require('../../../lib/common').getCDNKey;
|
||||
|
||||
// DELETE /:name/download/:filename/-rev/:rev
|
||||
// https://github.com/npm/npm-registry-client/blob/master/lib/unpublish.js#L97
|
||||
module.exports = function* removeOneVersion(next) {
|
||||
var name = this.params.name || this.params[0];
|
||||
var filename = this.params.filename || this.params[1];
|
||||
var id = Number(this.params.rev || this.params[2]);
|
||||
const name = this.params.name || this.params[0];
|
||||
const filename = this.params.filename || this.params[1];
|
||||
const id = Number(this.params.rev || this.params[2]);
|
||||
// cnpmjs.org-2.0.0.tgz
|
||||
var version = filename.split(name + '-')[1];
|
||||
let version = filename.split(name + '-')[1];
|
||||
if (version) {
|
||||
// 2.0.0.tgz
|
||||
version = version.substring(0, version.lastIndexOf('.tgz'));
|
||||
}
|
||||
if (!version) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
debug('remove tarball with filename: %s, version: %s, revert to => rev id: %s', filename, version, id);
|
||||
|
||||
if (isNaN(id)) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var rs = yield [
|
||||
const rs = yield [
|
||||
packageService.getModuleById(id),
|
||||
packageService.getModule(name, version),
|
||||
];
|
||||
var revertTo = rs[0];
|
||||
var mod = rs[1]; // module need to delete
|
||||
const revertTo = rs[0];
|
||||
const mod = rs[1]; // module need to delete
|
||||
if (!mod || mod.name !== name) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var key = mod.package && mod.package.dist && mod.package.dist.key;
|
||||
let key = mod.package && mod.package.dist && mod.package.dist.key;
|
||||
if (!key) {
|
||||
key = getCDNKey(mod.name, filename);
|
||||
}
|
||||
@@ -68,7 +68,7 @@ module.exports = function* removeOneVersion(next) {
|
||||
logger.error(err);
|
||||
}
|
||||
// remove version from table
|
||||
yield* packageService.removeModulesByNameAndVersions(name, [version]);
|
||||
yield packageService.removeModulesByNameAndVersions(name, [ version ]);
|
||||
debug('removed %s@%s', name, version);
|
||||
this.body = { ok: true };
|
||||
};
|
||||
|
||||
@@ -1,26 +1,12 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/save.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:package:save');
|
||||
var crypto = require('crypto');
|
||||
var deprecateVersions = require('./deprecate');
|
||||
var packageService = require('../../../services/package');
|
||||
var common = require('../../../lib/common');
|
||||
var nfs = require('../../../common/nfs');
|
||||
var config = require('../../../config');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:package:save');
|
||||
const crypto = require('crypto');
|
||||
const deprecateVersions = require('./deprecate');
|
||||
const packageService = require('../../../services/package');
|
||||
const common = require('../../../lib/common');
|
||||
const nfs = require('../../../common/nfs');
|
||||
const config = require('../../../config');
|
||||
|
||||
// old flows:
|
||||
// 1. add()
|
||||
@@ -37,63 +23,63 @@ module.exports = function* save(next) {
|
||||
// { content_type: 'application/octet-stream',
|
||||
// data: 'H4sIAAAAA
|
||||
// length: 9883
|
||||
var pkg = this.request.body;
|
||||
var username = this.user.name;
|
||||
var name = this.params.name || this.params[0];
|
||||
var filename = Object.keys(pkg._attachments || {})[0];
|
||||
var version = Object.keys(pkg.versions || {})[0];
|
||||
const pkg = this.request.body;
|
||||
const username = this.user.name;
|
||||
const name = this.params.name || this.params[0];
|
||||
const filename = Object.keys(pkg._attachments || {})[0];
|
||||
const version = Object.keys(pkg.versions || {})[0];
|
||||
if (!version) {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'version_error',
|
||||
reason: 'package.versions is empty'
|
||||
reason: 'package.versions is empty',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// check maintainers
|
||||
var result = yield* packageService.authMaintainer(name, username);
|
||||
const result = yield packageService.authMaintainer(name, username);
|
||||
if (!result.isMaintainer) {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'forbidden user',
|
||||
reason: username + ' not authorized to modify ' + name +
|
||||
', please contact maintainers: ' + result.maintainers.join(', ')
|
||||
', please contact maintainers: ' + result.maintainers.join(', '),
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
if (!filename) {
|
||||
var hasDeprecated = false;
|
||||
for (var v in pkg.versions) {
|
||||
var row = pkg.versions[v];
|
||||
let hasDeprecated = false;
|
||||
for (const v in pkg.versions) {
|
||||
const row = pkg.versions[v];
|
||||
if (typeof row.deprecated === 'string') {
|
||||
hasDeprecated = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (hasDeprecated) {
|
||||
return yield* deprecateVersions.call(this, next);
|
||||
return yield deprecateVersions.call(this, next);
|
||||
}
|
||||
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'attachment_error',
|
||||
reason: 'package._attachments is empty'
|
||||
reason: 'package._attachments is empty',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var attachment = pkg._attachments[filename];
|
||||
var versionPackage = pkg.versions[version];
|
||||
var maintainers = versionPackage.maintainers;
|
||||
const attachment = pkg._attachments[filename];
|
||||
const versionPackage = pkg.versions[version];
|
||||
const maintainers = versionPackage.maintainers;
|
||||
|
||||
// should never happened in normal request
|
||||
if (!maintainers) {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'maintainers error',
|
||||
reason: 'request body need maintainers'
|
||||
reason: 'request body need maintainers',
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -103,31 +89,31 @@ module.exports = function* save(next) {
|
||||
|
||||
// make sure user in auth is in maintainers
|
||||
// should never happened in normal request
|
||||
var m = maintainers.filter(function (maintainer) {
|
||||
const m = maintainers.filter(function(maintainer) {
|
||||
return maintainer.name === username;
|
||||
});
|
||||
if (m.length === 0) {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'maintainers error',
|
||||
reason: username + ' does not in maintainer list'
|
||||
reason: username + ' does not in maintainer list',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// TODO: add this info into some table
|
||||
versionPackage._publish_on_cnpm = true;
|
||||
var distTags = pkg['dist-tags'] || {};
|
||||
var tags = []; // tag, version
|
||||
for (var t in distTags) {
|
||||
tags.push([t, distTags[t]]);
|
||||
const distTags = pkg['dist-tags'] || {};
|
||||
const tags = []; // tag, version
|
||||
for (const t in distTags) {
|
||||
tags.push([ t, distTags[t] ]);
|
||||
}
|
||||
|
||||
if (tags.length === 0) {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'invalid',
|
||||
reason: 'dist-tags should not be empty'
|
||||
reason: 'dist-tags should not be empty',
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -135,20 +121,19 @@ module.exports = function* save(next) {
|
||||
debug('%s publish new %s:%s, attachment size: %s, maintainers: %j, distTags: %j',
|
||||
username, name, version, attachment.length, versionPackage.maintainers, distTags);
|
||||
|
||||
var exists = yield* packageService.getModule(name, version);
|
||||
var shasum;
|
||||
const exists = yield packageService.getModule(name, version);
|
||||
let shasum;
|
||||
if (exists) {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'forbidden',
|
||||
reason: 'cannot modify pre-existing version: ' + version
|
||||
reason: 'cannot modify pre-existing version: ' + version,
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// upload attachment
|
||||
var tarballBuffer;
|
||||
tarballBuffer = new Buffer(attachment.data, 'base64');
|
||||
const tarballBuffer = new Buffer(attachment.data, 'base64');
|
||||
|
||||
if (tarballBuffer.length !== attachment.length) {
|
||||
this.status = 403;
|
||||
@@ -162,10 +147,10 @@ module.exports = function* save(next) {
|
||||
|
||||
if (!distTags.latest) {
|
||||
// need to check if latest tag exists or not
|
||||
var latest = yield* packageService.getModuleByTag(name, 'latest');
|
||||
const latest = yield packageService.getModuleByTag(name, 'latest');
|
||||
if (!latest) {
|
||||
// auto add latest
|
||||
tags.push(['latest', tags[0][1]]);
|
||||
tags.push([ 'latest', tags[0][1] ]);
|
||||
debug('auto add latest tag: %j', tags);
|
||||
}
|
||||
}
|
||||
@@ -174,16 +159,16 @@ module.exports = function* save(next) {
|
||||
shasum.update(tarballBuffer);
|
||||
shasum = shasum.digest('hex');
|
||||
|
||||
var options = {
|
||||
const options = {
|
||||
key: common.getCDNKey(name, filename),
|
||||
shasum: shasum
|
||||
shasum,
|
||||
};
|
||||
var uploadResult = yield nfs.uploadBuffer(tarballBuffer, options);
|
||||
const uploadResult = yield nfs.uploadBuffer(tarballBuffer, options);
|
||||
debug('upload %j', uploadResult);
|
||||
|
||||
var dist = {
|
||||
shasum: shasum,
|
||||
size: attachment.length
|
||||
const dist = {
|
||||
shasum,
|
||||
size: attachment.length,
|
||||
};
|
||||
|
||||
// if nfs upload return a key, record it
|
||||
@@ -194,42 +179,42 @@ module.exports = function* save(next) {
|
||||
dist.tarball = uploadResult.key;
|
||||
}
|
||||
|
||||
var mod = {
|
||||
name: name,
|
||||
version: version,
|
||||
const mod = {
|
||||
name,
|
||||
version,
|
||||
author: username,
|
||||
package: versionPackage
|
||||
package: versionPackage,
|
||||
};
|
||||
|
||||
mod.package.dist = dist;
|
||||
yield* addDepsRelations(mod.package);
|
||||
yield addDepsRelations(mod.package);
|
||||
|
||||
var addResult = yield* packageService.saveModule(mod);
|
||||
const addResult = yield packageService.saveModule(mod);
|
||||
debug('%s module: save file to %s, size: %d, sha1: %s, dist: %j, version: %s',
|
||||
addResult.id, dist.tarball, dist.size, shasum, dist, version);
|
||||
|
||||
if (tags.length) {
|
||||
yield tags.map(function (tag) {
|
||||
yield tags.map(function(tag) {
|
||||
// tag: [tagName, version]
|
||||
return packageService.addModuleTag(name, tag[0], tag[1]);
|
||||
});
|
||||
}
|
||||
|
||||
// ensure maintainers exists
|
||||
var maintainerNames = maintainers.map(function (item) {
|
||||
const maintainerNames = maintainers.map(function(item) {
|
||||
return item.name;
|
||||
});
|
||||
yield* packageService.addPrivateModuleMaintainers(name, maintainerNames);
|
||||
yield packageService.addPrivateModuleMaintainers(name, maintainerNames);
|
||||
|
||||
this.status = 201;
|
||||
this.body = {
|
||||
ok: true,
|
||||
rev: String(addResult.id)
|
||||
rev: String(addResult.id),
|
||||
};
|
||||
};
|
||||
|
||||
function* addDepsRelations(pkg) {
|
||||
var dependencies = Object.keys(pkg.dependencies || {});
|
||||
let dependencies = Object.keys(pkg.dependencies || {});
|
||||
if (dependencies.length > config.maxDependencies) {
|
||||
dependencies = dependencies.slice(0, config.maxDependencies);
|
||||
}
|
||||
|
||||
@@ -1,23 +1,11 @@
|
||||
/**!
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:package:show');
|
||||
var semver = require('semver');
|
||||
var packageService = require('../../../services/package');
|
||||
var setDownloadURL = require('../../../lib/common').setDownloadURL;
|
||||
var SyncModuleWorker = require('../../sync_module_worker');
|
||||
var config = require('../../../config');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:package:show');
|
||||
const semver = require('semver');
|
||||
const packageService = require('../../../services/package');
|
||||
const setDownloadURL = require('../../../lib/common').setDownloadURL;
|
||||
const SyncModuleWorker = require('../../sync_module_worker');
|
||||
const config = require('../../../config');
|
||||
|
||||
/**
|
||||
* [deprecate] api
|
||||
@@ -28,38 +16,58 @@ var config = require('../../../config');
|
||||
* GET /:name/:tag
|
||||
*/
|
||||
module.exports = function* show() {
|
||||
var name = this.params.name || this.params[0];
|
||||
var tag = this.params.version || this.params[1];
|
||||
var version = semver.valid(tag);
|
||||
var mod;
|
||||
if (version) {
|
||||
mod = yield* packageService.getModule(name, version);
|
||||
} else {
|
||||
mod = yield* packageService.getModuleByTag(name, tag);
|
||||
const name = this.params.name || this.params[0];
|
||||
let tag = this.params.version || this.params[1];
|
||||
if (tag === '*') {
|
||||
tag = 'latest';
|
||||
}
|
||||
const version = semver.valid(tag);
|
||||
const range = semver.validRange(tag);
|
||||
let mod;
|
||||
if (version) {
|
||||
mod = yield packageService.getModule(name, version);
|
||||
} else if (range) {
|
||||
mod = yield packageService.getModuleByRange(name, range);
|
||||
} else {
|
||||
mod = yield packageService.getModuleByTag(name, tag);
|
||||
}
|
||||
|
||||
if (mod) {
|
||||
setDownloadURL(mod.package, this);
|
||||
mod.package._cnpm_publish_time = mod.publish_time;
|
||||
var maintainers = yield* packageService.listMaintainers(name);
|
||||
mod.package.publish_time = mod.package.publish_time || mod.publish_time;
|
||||
const rs = yield [
|
||||
packageService.listMaintainers(name),
|
||||
packageService.listModuleTags(name),
|
||||
];
|
||||
const maintainers = rs[0];
|
||||
if (maintainers.length > 0) {
|
||||
mod.package.maintainers = maintainers;
|
||||
}
|
||||
this.body = mod.package;
|
||||
const tags = rs[1];
|
||||
const distTags = {};
|
||||
for (let i = 0; i < tags.length; i++) {
|
||||
const t = tags[i];
|
||||
distTags[t.tag] = t.version;
|
||||
}
|
||||
// show tags for npminstall faster download
|
||||
mod.package['dist-tags'] = distTags;
|
||||
this.jsonp = mod.package;
|
||||
return;
|
||||
}
|
||||
|
||||
// if not fond, sync from source registry
|
||||
if (!this.allowSync) {
|
||||
this.status = 404;
|
||||
this.body = {
|
||||
this.jsonp = {
|
||||
error: 'not exist',
|
||||
reason: 'version not found: ' + version
|
||||
reason: 'version not found: ' + version,
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// start sync
|
||||
var logId = yield* SyncModuleWorker.sync(name, 'sync-by-install');
|
||||
const logId = yield SyncModuleWorker.sync(name, 'sync-by-install');
|
||||
debug('start sync %s, get log id %s', name, logId);
|
||||
|
||||
this.redirect(config.officialNpmRegistry + this.url);
|
||||
|
||||
@@ -1,69 +1,55 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/tag.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:package:tag');
|
||||
var semver = require('semver');
|
||||
var util = require('util');
|
||||
var packageService = require('../../../services/package');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:package:tag');
|
||||
const semver = require('semver');
|
||||
const util = require('util');
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
// PUT /:name/:tag
|
||||
// https://github.com/npm/npm-registry-client/blob/master/lib/tag.js#L4
|
||||
// this.request("PUT", uri+"/"+tagName, { body : JSON.stringify(version) }, cb)
|
||||
module.exports = function* tag() {
|
||||
var version = this.request.body;
|
||||
var name = this.params.name || this.params[0];
|
||||
var tag = this.params.tag || this.params[1];
|
||||
const version = this.request.body;
|
||||
const name = this.params.name || this.params[0];
|
||||
const tag = this.params.tag || this.params[1];
|
||||
debug('tag %j to %s/%s', version, name, tag);
|
||||
|
||||
if (!version) {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'version_missed',
|
||||
reason: 'version not found'
|
||||
reason: 'version not found',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
if (!semver.valid(version)) {
|
||||
this.status = 403;
|
||||
var reason = util.format('setting tag %s to invalid version: %s: %s/%s',
|
||||
const reason = util.format('setting tag %s to invalid version: %s: %s/%s',
|
||||
tag, version, name, tag);
|
||||
this.body = {
|
||||
error: 'forbidden',
|
||||
reason: reason
|
||||
reason,
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var mod = yield* packageService.getModule(name, version);
|
||||
const mod = yield packageService.getModule(name, version);
|
||||
if (!mod) {
|
||||
this.status = 403;
|
||||
var reason = util.format('setting tag %s to unknown version: %s: %s/%s',
|
||||
const reason = util.format('setting tag %s to unknown version: %s: %s/%s',
|
||||
tag, version, name, tag);
|
||||
this.body = {
|
||||
error: 'forbidden',
|
||||
reason: reason
|
||||
reason,
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var row = yield* packageService.addModuleTag(name, tag, version);
|
||||
const row = yield packageService.addModuleTag(name, tag, version);
|
||||
this.status = 201;
|
||||
this.body = {
|
||||
ok: true,
|
||||
modified: row.gmt_modified
|
||||
modified: row.gmt_modified,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,65 +1,51 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/update.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:package:update');
|
||||
var packageService = require('../../../services/package');
|
||||
var userService = require('../../../services/user');
|
||||
var config = require('../../../config');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:package:update');
|
||||
const packageService = require('../../../services/package');
|
||||
const userService = require('../../../services/user');
|
||||
const config = require('../../../config');
|
||||
|
||||
// PUT /:name/-rev/:rev
|
||||
//
|
||||
// * remove with versions, then will `DELETE /:name/download/:filename/-rev/:rev`
|
||||
// * ...
|
||||
module.exports = function* update(next) {
|
||||
var name = this.params.name || this.params[0];
|
||||
const name = this.params.name || this.params[0];
|
||||
debug('update module %s, %s, %j', this.url, name, this.request.body);
|
||||
|
||||
var body = this.request.body;
|
||||
const body = this.request.body;
|
||||
if (body.versions) {
|
||||
yield* updateVersions.call(this, next);
|
||||
yield updateVersions.call(this, next);
|
||||
} else if (body.maintainers) {
|
||||
yield* updateMaintainers.call(this, next);
|
||||
yield updateMaintainers.call(this, next);
|
||||
} else {
|
||||
yield* next;
|
||||
yield next;
|
||||
}
|
||||
};
|
||||
|
||||
// update with versions
|
||||
// https://github.com/npm/npm-registry-client/blob/master/lib/unpublish.js#L63
|
||||
function* updateVersions(next) {
|
||||
var name = this.params.name || this.params[0];
|
||||
const name = this.params.name || this.params[0];
|
||||
// left versions
|
||||
var versions = this.request.body.versions;
|
||||
const versions = this.request.body.versions;
|
||||
|
||||
// step1: list all the versions
|
||||
var mods = yield* packageService.listModulesByName(name);
|
||||
const mods = yield packageService.listModulesByName(name);
|
||||
debug('removeWithVersions module %s, left versions %j, %s mods',
|
||||
name, Object.keys(versions), mods && mods.length);
|
||||
if (!mods || !mods.length) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
// step3: calculate which versions need to remove and
|
||||
// which versions need to remain
|
||||
var removeVersions = [];
|
||||
var removeVersionMaps = {};
|
||||
var remainVersions = [];
|
||||
const removeVersions = [];
|
||||
const removeVersionMaps = {};
|
||||
const remainVersions = [];
|
||||
|
||||
for (var i = 0; i < mods.length; i++) {
|
||||
var v = mods[i].version;
|
||||
for (let i = 0; i < mods.length; i++) {
|
||||
const v = mods[i].version;
|
||||
if (!versions[v]) {
|
||||
removeVersions.push(v);
|
||||
removeVersionMaps[v] = true;
|
||||
@@ -78,11 +64,11 @@ function* updateVersions(next) {
|
||||
|
||||
// step 4: remove all the versions which need to remove
|
||||
// let removeTar do remove versions from module table
|
||||
var tags = yield* packageService.listModuleTags(name);
|
||||
const tags = yield packageService.listModuleTags(name);
|
||||
|
||||
var removeTags = [];
|
||||
var latestRemoved = false;
|
||||
tags.forEach(function (tag) {
|
||||
const removeTags = [];
|
||||
let latestRemoved = false;
|
||||
tags.forEach(function(tag) {
|
||||
// this tag need be removed
|
||||
if (removeVersionMaps[tag.version]) {
|
||||
removeTags.push(tag.id);
|
||||
@@ -95,28 +81,28 @@ function* updateVersions(next) {
|
||||
debug('remove tags: %j', removeTags);
|
||||
if (removeTags.length) {
|
||||
// step 5: remove all the tags
|
||||
yield* packageService.removeModuleTagsByIds(removeTags);
|
||||
yield packageService.removeModuleTagsByIds(removeTags);
|
||||
if (latestRemoved && remainVersions[0]) {
|
||||
debug('latest tags removed, generate a new latest tag with new version: %s',
|
||||
remainVersions[0]);
|
||||
// step 6: insert new latest tag
|
||||
yield* packageService.addModuleTag(name, 'latest', remainVersions[0]);
|
||||
yield packageService.addModuleTag(name, 'latest', remainVersions[0]);
|
||||
}
|
||||
}
|
||||
|
||||
// step 7: update last modified, make sure etag change
|
||||
yield* packageService.updateModuleLastModified(name);
|
||||
yield packageService.updateModuleLastModified(name);
|
||||
|
||||
this.status = 201;
|
||||
this.body = { ok: true };
|
||||
}
|
||||
|
||||
function* updateMaintainers() {
|
||||
var name = this.params.name || this.params[0];
|
||||
var body = this.request.body;
|
||||
const name = this.params.name || this.params[0];
|
||||
const body = this.request.body;
|
||||
debug('updateMaintainers module %s, %j', name, body);
|
||||
|
||||
var usernames = body.maintainers.map(function (user) {
|
||||
const usernames = body.maintainers.map(function(user) {
|
||||
return user.name;
|
||||
});
|
||||
|
||||
@@ -124,35 +110,32 @@ function* updateMaintainers() {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'invalid operation',
|
||||
reason: 'Can not remove all maintainers'
|
||||
reason: 'Can not remove all maintainers',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
if (config.customUserService) {
|
||||
// ensure new authors are vaild
|
||||
var maintainers = yield* packageService.listMaintainerNamesOnly(name);
|
||||
var map = {};
|
||||
var newNames = [];
|
||||
for (var i = 0; i < maintainers.length; i++) {
|
||||
map[maintainers[i]] = 1;
|
||||
const maintainers = yield packageService.listMaintainerNamesOnly(name);
|
||||
const map = {};
|
||||
const newNames = [];
|
||||
for (const maintainer of maintainers) {
|
||||
map[maintainer] = 1;
|
||||
}
|
||||
for (var i = 0; i < usernames.length; i++) {
|
||||
var username = usernames[i];
|
||||
for (const username of usernames) {
|
||||
if (map[username] !== 1) {
|
||||
newNames.push(username);
|
||||
}
|
||||
}
|
||||
if (newNames.length > 0) {
|
||||
var users = yield* userService.list(newNames);
|
||||
var map = {};
|
||||
for (var i = 0; i < users.length; i++) {
|
||||
var user = users[i];
|
||||
const users = yield userService.list(newNames);
|
||||
const map = {};
|
||||
for (const user of users) {
|
||||
map[user.login] = 1;
|
||||
}
|
||||
var invailds = [];
|
||||
for (var i = 0; i < newNames.length; i++) {
|
||||
var username = newNames[i];
|
||||
const invailds = [];
|
||||
for (const username of newNames) {
|
||||
if (map[username] !== 1) {
|
||||
invailds.push(username);
|
||||
}
|
||||
@@ -161,14 +144,14 @@ function* updateMaintainers() {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'invalid user name',
|
||||
reason: 'User: `' + invailds.join(', ') + '` not exists'
|
||||
reason: 'User: `' + invailds.join(', ') + '` not exists',
|
||||
};
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var r = yield* packageService.updatePrivateModuleMaintainers(name, usernames);
|
||||
const r = yield packageService.updatePrivateModuleMaintainers(name, usernames);
|
||||
debug('result: %j', r);
|
||||
|
||||
this.status = 201;
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var ensurePasswordSalt = require('./common').ensurePasswordSalt;
|
||||
var userService = require('../../../services/user');
|
||||
var config = require('../../../config');
|
||||
const ensurePasswordSalt = require('./common').ensurePasswordSalt;
|
||||
const userService = require('../../../services/user');
|
||||
const config = require('../../../config');
|
||||
|
||||
// npm 1.4.4
|
||||
// add new user first
|
||||
@@ -53,9 +53,9 @@ var config = require('../../../config');
|
||||
// roles: [],
|
||||
// date: '2014-03-15T02:39:25.696Z' }
|
||||
module.exports = function* addUser() {
|
||||
var name = this.params.name;
|
||||
var body = this.request.body || {};
|
||||
var user = {
|
||||
const name = this.params.name;
|
||||
const body = this.request.body || {};
|
||||
const user = {
|
||||
name: body.name,
|
||||
// salt: body.salt,
|
||||
// password_sha: body.password_sha,
|
||||
@@ -70,19 +70,19 @@ module.exports = function* addUser() {
|
||||
this.status = 422;
|
||||
this.body = {
|
||||
error: 'paramError',
|
||||
reason: 'params missing, name, email or password missing.'
|
||||
reason: 'params missing, name, email or password missing.',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var loginedUser;
|
||||
let loginedUser;
|
||||
try {
|
||||
loginedUser = yield* userService.authAndSave(body.name, body.password);
|
||||
loginedUser = yield userService.authAndSave(body.name, body.password);
|
||||
} catch (err) {
|
||||
this.status = err.status || 500;
|
||||
this.body = {
|
||||
error: err.name,
|
||||
reason: err.message
|
||||
reason: err.message,
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -91,7 +91,7 @@ module.exports = function* addUser() {
|
||||
this.body = {
|
||||
ok: true,
|
||||
id: 'org.couchdb.user:' + loginedUser.login,
|
||||
rev: Date.now() + '-' + loginedUser.login
|
||||
rev: Date.now() + '-' + loginedUser.login,
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -101,28 +101,28 @@ module.exports = function* addUser() {
|
||||
this.status = 401;
|
||||
this.body = {
|
||||
error: 'unauthorized',
|
||||
reason: 'Login fail, please check your login name and password'
|
||||
reason: 'Login fail, please check your login name and password',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var existUser = yield* userService.get(name);
|
||||
const existUser = yield userService.get(name);
|
||||
if (existUser) {
|
||||
this.status = 409;
|
||||
this.body = {
|
||||
error: 'conflict',
|
||||
reason: 'User ' + name + ' already exists.'
|
||||
reason: 'User ' + name + ' already exists.',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// add new user
|
||||
var result = yield* userService.add(user);
|
||||
const result = yield userService.add(user);
|
||||
this.etag = '"' + result.rev + '"';
|
||||
this.status = 201;
|
||||
this.body = {
|
||||
ok: true,
|
||||
id: 'org.couchdb.user:' + name,
|
||||
rev: result.rev
|
||||
rev: result.rev,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var crypto = require('crypto');
|
||||
var utility = require('utility');
|
||||
const crypto = require('crypto');
|
||||
const utility = require('utility');
|
||||
|
||||
exports.ensurePasswordSalt = function (user, body) {
|
||||
exports.ensurePasswordSalt = function(user, body) {
|
||||
if (!user.password_sha && body.password) {
|
||||
// create password_sha on server
|
||||
user.salt = crypto.randomBytes(30).toString('hex');
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var userService = require('../../../services/user');
|
||||
const userService = require('../../../services/user');
|
||||
|
||||
// GET /-/user/org.couchdb.user::name
|
||||
module.exports = function* show(next) {
|
||||
var name = this.params.name;
|
||||
var user = yield* userService.getAndSave(name);
|
||||
const name = this.params.name;
|
||||
const user = yield userService.getAndSave(name);
|
||||
if (!user) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var data = user.json;
|
||||
let data = user.json;
|
||||
if (!data) {
|
||||
data = {
|
||||
_id: 'org.couchdb.user:' + user.name,
|
||||
@@ -53,7 +53,7 @@ module.exports = function* show(next) {
|
||||
fullname: data.name || data.login,
|
||||
homepage: data.html_url,
|
||||
scopes: data.scopes,
|
||||
site_admin: data.site_admin
|
||||
site_admin: data.site_admin,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:registry:user:update');
|
||||
var ensurePasswordSalt = require('./common').ensurePasswordSalt;
|
||||
var userService = require('../../../services/user');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:registry:user:update');
|
||||
const ensurePasswordSalt = require('./common').ensurePasswordSalt;
|
||||
const userService = require('../../../services/user');
|
||||
|
||||
// logined before update, no need to auth user again
|
||||
// { name: 'admin',
|
||||
@@ -37,10 +37,10 @@ var userService = require('../../../services/user');
|
||||
// admin: true,
|
||||
// scopes: [ '@cnpm', '@cnpmtest' ] } }
|
||||
module.exports = function* updateUser(next) {
|
||||
var name = this.params.name;
|
||||
var rev = this.params.rev;
|
||||
const name = this.params.name;
|
||||
const rev = this.params.rev;
|
||||
if (!name || !rev) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
debug('update: %s, rev: %s, user.name: %s', name, rev, this.user.name);
|
||||
|
||||
@@ -49,13 +49,13 @@ module.exports = function* updateUser(next) {
|
||||
this.status = 401;
|
||||
this.body = {
|
||||
error: 'unauthorized',
|
||||
reason: 'Name is incorrect.'
|
||||
reason: 'Name is incorrect.',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var body = this.request.body || {};
|
||||
var user = {
|
||||
const body = this.request.body || {};
|
||||
const user = {
|
||||
name: body.name,
|
||||
// salt: body.salt,
|
||||
// password_sha: body.password_sha,
|
||||
@@ -73,17 +73,17 @@ module.exports = function* updateUser(next) {
|
||||
this.status = 422;
|
||||
this.body = {
|
||||
error: 'paramError',
|
||||
reason: 'params missing, name, email or password missing.'
|
||||
reason: 'params missing, name, email or password missing.',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var result = yield* userService.update(user);
|
||||
const result = yield userService.update(user);
|
||||
if (!result) {
|
||||
this.status = 409;
|
||||
this.body = {
|
||||
error: 'conflict',
|
||||
reason: 'Document update conflict.'
|
||||
reason: 'Document update conflict.',
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -92,6 +92,6 @@ module.exports = function* updateUser(next) {
|
||||
this.body = {
|
||||
ok: true,
|
||||
id: 'org.couchdb.user:' + user.name,
|
||||
rev: result.rev
|
||||
rev: result.rev,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -14,35 +14,35 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../../services/package');
|
||||
const packageService = require('../../services/package');
|
||||
|
||||
// GET /-/by-user/:user
|
||||
exports.list = function* () {
|
||||
var users = this.params.user.split('|');
|
||||
const users = this.params.user.split('|');
|
||||
if (users.length > 20) {
|
||||
this.status = 400;
|
||||
this.body = {
|
||||
error: 'bad_request',
|
||||
reason: 'reach max user names limit, must <= 20 user names'
|
||||
reason: 'reach max user names limit, must <= 20 user names',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var firstUser = users[0];
|
||||
const firstUser = users[0];
|
||||
if (!firstUser) {
|
||||
// params.user = '|'
|
||||
this.body = {};
|
||||
return;
|
||||
}
|
||||
|
||||
var tasks = {};
|
||||
for (var i = 0; i < users.length; i++) {
|
||||
var username = users[i];
|
||||
const tasks = {};
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
const username = users[i];
|
||||
tasks[username] = packageService.listPublicModuleNamesByUser(username);
|
||||
}
|
||||
|
||||
var data = yield tasks;
|
||||
for (var k in data) {
|
||||
const data = yield tasks;
|
||||
for (const k in data) {
|
||||
if (data[k].length === 0) {
|
||||
data[k] = undefined;
|
||||
}
|
||||
|
||||
@@ -14,62 +14,67 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:sync');
|
||||
var Log = require('../services/module_log');
|
||||
var SyncModuleWorker = require('./sync_module_worker');
|
||||
var config = require('../config');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:sync');
|
||||
const Log = require('../services/module_log');
|
||||
const SyncModuleWorker = require('./sync_module_worker');
|
||||
const config = require('../config');
|
||||
|
||||
exports.sync = function* () {
|
||||
var username = this.user.name || 'anonymous';
|
||||
var name = this.params.name || this.params[0];
|
||||
var type = 'package';
|
||||
const username = this.user.name || 'anonymous';
|
||||
let name = this.params.name || this.params[0];
|
||||
let type = 'package';
|
||||
if (name.indexOf(':') > 0) {
|
||||
// user:fengmk2
|
||||
// package:pedding
|
||||
var splits = name.split(':');
|
||||
const splits = name.split(':');
|
||||
type = splits[0];
|
||||
name = splits[1];
|
||||
}
|
||||
var publish = this.query.publish === 'true';
|
||||
var noDep = this.query.nodeps === 'true';
|
||||
const publish = this.query.publish === 'true';
|
||||
const noDep = this.query.nodeps === 'true';
|
||||
debug('sync %s with query: %j', name, this.query);
|
||||
if (type === 'package' && publish && !this.user.isAdmin) {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'no_perms',
|
||||
reason: 'Only admin can publish'
|
||||
reason: 'Only admin can publish',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
var options = {
|
||||
type: type,
|
||||
publish: publish,
|
||||
noDep: noDep,
|
||||
const options = {
|
||||
type,
|
||||
publish,
|
||||
noDep,
|
||||
syncUpstreamFirst: config.sourceNpmRegistryIsCNpm,
|
||||
};
|
||||
|
||||
var logId = yield* SyncModuleWorker.sync(name, username, options);
|
||||
const logId = yield SyncModuleWorker.sync(name, username, options);
|
||||
debug('sync %s got log id %j', name, logId);
|
||||
|
||||
this.status = 201;
|
||||
this.body = {
|
||||
ok: true,
|
||||
logId: logId
|
||||
logId,
|
||||
};
|
||||
};
|
||||
|
||||
exports.getSyncLog = function* (next) {
|
||||
var logId = this.params.id || this.params[1];
|
||||
var offset = Number(this.query.offset) || 0;
|
||||
var row = yield* Log.get(logId);
|
||||
const logId = Number(this.params.id || this.params[1]);
|
||||
const offset = Number(this.query.offset) || 0;
|
||||
|
||||
if (!logId) { // NaN
|
||||
this.status = 404;
|
||||
return;
|
||||
}
|
||||
const row = yield Log.get(logId);
|
||||
if (!row) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var log = row.log.trim();
|
||||
let log = row.log.trim();
|
||||
if (offset > 0) {
|
||||
log = log.split('\n').slice(offset).join('\n');
|
||||
}
|
||||
this.body = {ok: true, log: log};
|
||||
this.body = { ok: true, log };
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,31 +1,23 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/total.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const Total = require('../services/total');
|
||||
const version = require('../package.json').version;
|
||||
const config = require('../config');
|
||||
const getDownloadTotal = require('./utils').getDownloadTotal;
|
||||
|
||||
var Total = require('../services/total');
|
||||
var version = require('../package.json').version;
|
||||
var config = require('../config');
|
||||
var getDownloadTotal = require('./utils').getDownloadTotal;
|
||||
|
||||
var startTime = '' + Date.now();
|
||||
const startTime = '' + Date.now();
|
||||
let cache = null;
|
||||
|
||||
module.exports = function* showTotal() {
|
||||
var r = yield [Total.get(), getDownloadTotal()];
|
||||
var total = r[0];
|
||||
var download = r[1];
|
||||
if (cache && Date.now() - cache.cache_time < 10000) {
|
||||
// cache 10 seconds
|
||||
this.body = cache;
|
||||
return;
|
||||
}
|
||||
|
||||
const r = yield [ Total.get(), getDownloadTotal() ];
|
||||
const total = r[0];
|
||||
const download = r[1];
|
||||
|
||||
total.download = download;
|
||||
total.db_name = 'registry';
|
||||
@@ -35,5 +27,8 @@ module.exports = function* showTotal() {
|
||||
total.donate = 'https://www.gittip.com/fengmk2';
|
||||
total.sync_model = config.syncModel;
|
||||
|
||||
cache = total;
|
||||
total.cache_time = Date.now();
|
||||
|
||||
this.body = total;
|
||||
};
|
||||
|
||||
@@ -14,25 +14,25 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:utils');
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var utility = require('utility');
|
||||
var ms = require('humanize-ms');
|
||||
var moment = require('moment');
|
||||
var downloadTotalService = require('../services/download_total');
|
||||
var nfs = require('../common/nfs');
|
||||
var config = require('../config');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:utils');
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const utility = require('utility');
|
||||
const ms = require('humanize-ms');
|
||||
const moment = require('moment');
|
||||
const downloadTotalService = require('../services/download_total');
|
||||
const nfs = require('../common/nfs');
|
||||
const config = require('../config');
|
||||
|
||||
var DOWNLOAD_TIMEOUT = ms('10m');
|
||||
const DOWNLOAD_TIMEOUT = ms('10m');
|
||||
|
||||
exports.downloadAsReadStream = function* (key) {
|
||||
var options = { timeout: DOWNLOAD_TIMEOUT };
|
||||
const options = { timeout: DOWNLOAD_TIMEOUT };
|
||||
if (nfs.createDownloadStream) {
|
||||
return yield nfs.createDownloadStream(key, options);
|
||||
}
|
||||
|
||||
var tmpPath = path.join(config.uploadDir,
|
||||
const tmpPath = path.join(config.uploadDir,
|
||||
utility.randomString() + key.replace(/\//g, '-'));
|
||||
function cleanup() {
|
||||
debug('cleanup %s', tmpPath);
|
||||
@@ -46,32 +46,32 @@ exports.downloadAsReadStream = function* (key) {
|
||||
cleanup();
|
||||
throw err;
|
||||
}
|
||||
var tarball = fs.createReadStream(tmpPath);
|
||||
const tarball = fs.createReadStream(tmpPath);
|
||||
tarball.once('error', cleanup);
|
||||
tarball.once('end', cleanup);
|
||||
return tarball;
|
||||
};
|
||||
|
||||
exports.getDownloadTotal = function* (name) {
|
||||
var end = moment();
|
||||
var start = end.clone().subtract(1, 'months').startOf('month');
|
||||
var lastday = end.clone().subtract(1, 'days').format('YYYY-MM-DD');
|
||||
var lastweekStart = end.clone().subtract(1, 'weeks').startOf('week');
|
||||
var lastweekEnd = lastweekStart.clone().endOf('week').format('YYYY-MM-DD');
|
||||
var lastmonthEnd = start.clone().endOf('month').format('YYYY-MM-DD');
|
||||
var thismonthStart = end.clone().startOf('month').format('YYYY-MM-DD');
|
||||
var thisweekStart = end.clone().startOf('week').format('YYYY-MM-DD');
|
||||
let end = moment();
|
||||
let start = end.clone().subtract(1, 'months').startOf('month');
|
||||
const lastday = end.clone().subtract(1, 'days').format('YYYY-MM-DD');
|
||||
let lastweekStart = end.clone().subtract(1, 'weeks').startOf('isoweek');
|
||||
const lastweekEnd = lastweekStart.clone().endOf('isoweek').format('YYYY-MM-DD');
|
||||
const lastmonthEnd = start.clone().endOf('month').format('YYYY-MM-DD');
|
||||
const thismonthStart = end.clone().startOf('month').format('YYYY-MM-DD');
|
||||
const thisweekStart = end.clone().startOf('isoweek').format('YYYY-MM-DD');
|
||||
start = start.format('YYYY-MM-DD');
|
||||
end = end.format('YYYY-MM-DD');
|
||||
lastweekStart = lastweekStart.format('YYYY-MM-DD');
|
||||
var method = name ? 'getModuleTotal' : 'getTotal';
|
||||
var args = [start, end];
|
||||
const method = name ? 'getModuleTotal' : 'getTotal';
|
||||
const args = [ start, end ];
|
||||
if (name) {
|
||||
args.unshift(name);
|
||||
}
|
||||
|
||||
var rows = yield* downloadTotalService[method].apply(downloadTotalService, args);
|
||||
var download = {
|
||||
const rows = yield downloadTotalService[method].apply(downloadTotalService, args);
|
||||
const download = {
|
||||
today: 0,
|
||||
thisweek: 0,
|
||||
thismonth: 0,
|
||||
@@ -80,8 +80,8 @@ exports.getDownloadTotal = function* (name) {
|
||||
lastmonth: 0,
|
||||
};
|
||||
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
var r = rows[i];
|
||||
for (let i = 0; i < rows.length; i++) {
|
||||
const r = rows[i];
|
||||
if (r.date === end) {
|
||||
download.today += r.count;
|
||||
}
|
||||
@@ -105,11 +105,11 @@ exports.getDownloadTotal = function* (name) {
|
||||
return download;
|
||||
};
|
||||
|
||||
exports.setLicense = function (pkg) {
|
||||
var license;
|
||||
exports.setLicense = function(pkg) {
|
||||
let license;
|
||||
license = pkg.license || pkg.licenses || pkg.licence || pkg.licences;
|
||||
if (!license) {
|
||||
return ;
|
||||
return;
|
||||
}
|
||||
|
||||
if (Array.isArray(license)) {
|
||||
@@ -119,7 +119,7 @@ exports.setLicense = function (pkg) {
|
||||
if (typeof license === 'object') {
|
||||
pkg.license = {
|
||||
name: license.name || license.type,
|
||||
url: license.url
|
||||
url: license.url,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -127,38 +127,38 @@ exports.setLicense = function (pkg) {
|
||||
if (license.match(/(http|https)(:\/\/)/ig)) {
|
||||
pkg.license = {
|
||||
name: license,
|
||||
url: license
|
||||
url: license,
|
||||
};
|
||||
} else {
|
||||
pkg.license = {
|
||||
url: exports.getOssLicenseUrlFromName(license),
|
||||
name: license
|
||||
name: license,
|
||||
};
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
exports.getOssLicenseUrlFromName = function (name) {
|
||||
var base = 'http://opensource.org/licenses/';
|
||||
exports.getOssLicenseUrlFromName = function(name) {
|
||||
const base = 'http://opensource.org/licenses/';
|
||||
|
||||
var licenseMap = {
|
||||
'bsd': 'BSD-2-Clause',
|
||||
'mit': 'MIT',
|
||||
'x11': 'MIT',
|
||||
const licenseMap = {
|
||||
bsd: 'BSD-2-Clause',
|
||||
mit: 'MIT',
|
||||
x11: 'MIT',
|
||||
'mit/x11': 'MIT',
|
||||
'apache 2.0': 'Apache-2.0',
|
||||
'apache2': 'Apache-2.0',
|
||||
apache2: 'Apache-2.0',
|
||||
'apache 2': 'Apache-2.0',
|
||||
'apache-2': 'Apache-2.0',
|
||||
'apache': 'Apache-2.0',
|
||||
'gpl': 'GPL-3.0',
|
||||
'gplv3': 'GPL-3.0',
|
||||
'gplv2': 'GPL-2.0',
|
||||
'gpl3': 'GPL-3.0',
|
||||
'gpl2': 'GPL-2.0',
|
||||
'lgpl': 'LGPL-2.1',
|
||||
apache: 'Apache-2.0',
|
||||
gpl: 'GPL-3.0',
|
||||
gplv3: 'GPL-3.0',
|
||||
gplv2: 'GPL-2.0',
|
||||
gpl3: 'GPL-3.0',
|
||||
gpl2: 'GPL-2.0',
|
||||
lgpl: 'LGPL-2.1',
|
||||
'lgplv2.1': 'LGPL-2.1',
|
||||
'lgplv2': 'LGPL-2.1'
|
||||
lgplv2: 'LGPL-2.1',
|
||||
};
|
||||
|
||||
return licenseMap[name.toLowerCase()] ?
|
||||
|
||||
@@ -14,18 +14,18 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var utility = require('utility');
|
||||
var util = require('util');
|
||||
var config = require('../../config');
|
||||
var packageService = require('../../services/package');
|
||||
var DownloadTotal = require('../../services/download_total');
|
||||
const utility = require('utility');
|
||||
const util = require('util');
|
||||
const config = require('../../config');
|
||||
const packageService = require('../../services/package');
|
||||
const DownloadTotal = require('../../services/download_total');
|
||||
|
||||
exports.version = function* () {
|
||||
var color = 'lightgrey';
|
||||
var version = 'invalid';
|
||||
var name = this.params[0];
|
||||
var tag = this.query.tag || 'latest';
|
||||
var info = yield* packageService.getModuleByTag(name, tag);
|
||||
let color = 'lightgrey';
|
||||
let version = 'invalid';
|
||||
const name = this.params[0];
|
||||
const tag = this.query.tag || 'latest';
|
||||
const info = yield packageService.getModuleByTag(name, tag);
|
||||
if (info) {
|
||||
version = info.version;
|
||||
if (/^0\.0\./.test(version)) {
|
||||
@@ -40,23 +40,23 @@ exports.version = function* () {
|
||||
}
|
||||
}
|
||||
|
||||
var subject = config.badgeSubject.replace(/\-/g, '--');
|
||||
let subject = config.badgeSubject.replace(/\-/g, '--');
|
||||
if (this.query.subject) {
|
||||
subject = this.query.subject.replace(/\-/g, '--');
|
||||
}
|
||||
version = version.replace(/\-/g, '--');
|
||||
var style = this.query.style || 'flat-square';
|
||||
var url = util.format('https://dn-img-shields-io.qbox.me/badge/%s-%s-%s.svg?style=%s',
|
||||
const style = this.query.style || 'flat-square';
|
||||
const url = util.format(config.badgePrefixURL + '/%s-%s-%s.svg?style=%s',
|
||||
utility.encodeURIComponent(subject), version, color, utility.encodeURIComponent(style));
|
||||
this.redirect(url);
|
||||
};
|
||||
|
||||
exports.downloads = function* () {
|
||||
// https://dn-img-shields-io.qbox.me/badge/downloads-100k/month-brightgreen.svg?style=flat-square
|
||||
var name = this.params[0];
|
||||
var count = yield DownloadTotal.getTotalByName(name);
|
||||
var style = this.query.style || 'flat-square';
|
||||
var url = util.format('https://dn-img-shields-io.qbox.me/badge/downloads-%s-brightgreen.svg?style=%s',
|
||||
const name = this.params[0];
|
||||
const count = yield DownloadTotal.getTotalByName(name);
|
||||
const style = this.query.style || 'flat-square';
|
||||
const url = util.format(config.badgePrefixURL + '/downloads-%s-brightgreen.svg?style=%s',
|
||||
count, utility.encodeURIComponent(style));
|
||||
this.redirect(url);
|
||||
};
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../../../services/package');
|
||||
var config = require('../../../config');
|
||||
const packageService = require('../../../services/package');
|
||||
const config = require('../../../config');
|
||||
|
||||
module.exports = function* listPrivates() {
|
||||
var tasks = {};
|
||||
for (var i = 0; i < config.scopes.length; i++) {
|
||||
var scope = config.scopes[i];
|
||||
const tasks = {};
|
||||
for (let i = 0; i < config.scopes.length; i++) {
|
||||
const scope = config.scopes[i];
|
||||
tasks[scope] = packageService.listPrivateModulesByScope(scope);
|
||||
}
|
||||
|
||||
@@ -29,9 +29,9 @@ module.exports = function* listPrivates() {
|
||||
tasks['no scoped'] = packageService.listModules(config.privatePackages);
|
||||
}
|
||||
|
||||
var scopes = yield tasks;
|
||||
const scopes = yield tasks;
|
||||
yield this.render('private', {
|
||||
title: 'private packages',
|
||||
scopes: scopes
|
||||
scopes,
|
||||
});
|
||||
};
|
||||
|
||||
@@ -15,18 +15,26 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:web:package:search');
|
||||
var packageService = require('../../../services/package');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:web:package:search');
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
module.exports = function* search() {
|
||||
var params = this.params;
|
||||
var word = params.word || params[0];
|
||||
debug('search %j', word);
|
||||
var result = yield* packageService.search(word);
|
||||
const params = this.params;
|
||||
const word = params.word || params[0];
|
||||
let limit = Number(this.query.limit) || 100;
|
||||
|
||||
var match = null;
|
||||
for (var i = 0; i < result.searchMatchs.length; i++) {
|
||||
var p = result.searchMatchs[i];
|
||||
if (limit > 10000) {
|
||||
limit = 10000;
|
||||
}
|
||||
|
||||
debug('search %j', word);
|
||||
const result = yield packageService.search(word, {
|
||||
limit,
|
||||
});
|
||||
|
||||
let match = null;
|
||||
for (let i = 0; i < result.searchMatchs.length; i++) {
|
||||
const p = result.searchMatchs[i];
|
||||
if (p.name === word) {
|
||||
match = p;
|
||||
break;
|
||||
@@ -37,7 +45,7 @@ module.exports = function* search() {
|
||||
if (this.query && this.query.type === 'json') {
|
||||
this.jsonp = {
|
||||
keyword: word,
|
||||
match: match,
|
||||
match,
|
||||
packages: result.searchMatchs,
|
||||
keywords: result.keywordMatchs,
|
||||
};
|
||||
@@ -46,7 +54,7 @@ module.exports = function* search() {
|
||||
yield this.render('search', {
|
||||
title: 'Keyword - ' + word,
|
||||
keyword: word,
|
||||
match: match,
|
||||
match,
|
||||
packages: result.searchMatchs,
|
||||
keywords: result.keywordMatchs,
|
||||
});
|
||||
|
||||
@@ -15,35 +15,35 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../../../services/package');
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
module.exports = function* searchRange() {
|
||||
var startKey = this.query.startkey || '';
|
||||
let startKey = this.query.startkey || '';
|
||||
if (startKey[0] === '"') {
|
||||
startKey = startKey.substring(1);
|
||||
}
|
||||
if (startKey[startKey.length - 1] === '"') {
|
||||
startKey = startKey.substring(0, startKey.length - 1);
|
||||
}
|
||||
var limit = Number(this.query.limit) || 20;
|
||||
var result = yield* packageService.search(startKey, {limit: limit});
|
||||
const limit = Number(this.query.limit) || 20;
|
||||
const result = yield packageService.search(startKey, { limit });
|
||||
|
||||
var packages = result.searchMatchs.concat(result.keywordMatchs);
|
||||
const packages = result.searchMatchs.concat(result.keywordMatchs);
|
||||
|
||||
var rows = [];
|
||||
for (var i = 0; i < packages.length; i++) {
|
||||
var p = packages[i];
|
||||
var row = {
|
||||
const rows = [];
|
||||
for (let i = 0; i < packages.length; i++) {
|
||||
const p = packages[i];
|
||||
const row = {
|
||||
key: p.name,
|
||||
count: 1,
|
||||
value: {
|
||||
name: p.name,
|
||||
description: p.description,
|
||||
}
|
||||
},
|
||||
};
|
||||
rows.push(row);
|
||||
}
|
||||
this.body = {
|
||||
rows: rows
|
||||
rows,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,90 +1,77 @@
|
||||
/**!
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:controllers:web:package:show');
|
||||
var bytes = require('bytes');
|
||||
var giturl = require('giturl');
|
||||
var moment = require('moment');
|
||||
var semver = require('semver');
|
||||
var gravatar = require('gravatar');
|
||||
var humanize = require('humanize-number');
|
||||
var config = require('../../../config');
|
||||
var utils = require('../../utils');
|
||||
var setDownloadURL = require('../../../lib/common').setDownloadURL;
|
||||
var renderMarkdown = require('../../../common/markdown').render;
|
||||
var packageService = require('../../../services/package');
|
||||
const debug = require('debug')('cnpmjs.org:controllers:web:package:show');
|
||||
const bytes = require('bytes');
|
||||
const giturl = require('giturl');
|
||||
const moment = require('moment');
|
||||
const semver = require('semver');
|
||||
const gravatar = require('gravatar');
|
||||
const humanize = require('humanize-number');
|
||||
const config = require('../../../config');
|
||||
const utils = require('../../utils');
|
||||
const setDownloadURL = require('../../../lib/common').setDownloadURL;
|
||||
const renderMarkdown = require('../../../common/markdown').render;
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
module.exports = function* show(next) {
|
||||
var params = this.params;
|
||||
const params = this.params;
|
||||
// normal: {name: $name, version: $version}
|
||||
// scope: [$name, $version]
|
||||
var orginalName = params.name || params[0];
|
||||
var name = orginalName;
|
||||
var tag = params.version || params[1];
|
||||
const orginalName = params.name || params[0];
|
||||
const name = orginalName;
|
||||
const tag = params.version || params[1];
|
||||
debug('display %s with %j', name, params);
|
||||
|
||||
var getPackageMethod;
|
||||
var getPackageArgs;
|
||||
var version = semver.valid(tag || '');
|
||||
let getPackageMethod;
|
||||
let getPackageArgs;
|
||||
const version = semver.valid(tag || '');
|
||||
if (version) {
|
||||
getPackageMethod = 'getModule';
|
||||
getPackageArgs = [name, version];
|
||||
getPackageArgs = [ name, version ];
|
||||
} else {
|
||||
getPackageMethod = 'getModuleByTag';
|
||||
getPackageArgs = [name, tag || 'latest'];
|
||||
getPackageArgs = [ name, tag || 'latest' ];
|
||||
}
|
||||
|
||||
var pkg = yield packageService[getPackageMethod].apply(packageService, getPackageArgs);
|
||||
let pkg = yield packageService[getPackageMethod].apply(packageService, getPackageArgs);
|
||||
if (!pkg || !pkg.package) {
|
||||
// check if unpublished
|
||||
var unpublishedInfo = yield* packageService.getUnpublishedModule(name);
|
||||
const unpublishedInfo = yield packageService.getUnpublishedModule(name);
|
||||
debug('show unpublished %j', unpublishedInfo);
|
||||
if (unpublishedInfo) {
|
||||
var data = {
|
||||
name: name,
|
||||
unpublished: unpublishedInfo.package
|
||||
const data = {
|
||||
name,
|
||||
unpublished: unpublishedInfo.package,
|
||||
};
|
||||
data.unpublished.time = new Date(data.unpublished.time);
|
||||
if (data.unpublished.maintainers) {
|
||||
for (var i = 0; i < data.unpublished.maintainers.length; i++) {
|
||||
var maintainer = data.unpublished.maintainers[i];
|
||||
for (let i = 0; i < data.unpublished.maintainers.length; i++) {
|
||||
const maintainer = data.unpublished.maintainers[i];
|
||||
if (maintainer.email) {
|
||||
maintainer.gravatar = gravatar.url(maintainer.email, {s: '50', d: 'retro'}, true);
|
||||
maintainer.gravatar = gravatar.url(maintainer.email, { s: '50', d: 'retro' }, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
yield this.render('package_unpublished', {
|
||||
package: data,
|
||||
title: 'Package - ' + name
|
||||
title: 'Package - ' + name,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var r = yield [
|
||||
const r = yield [
|
||||
utils.getDownloadTotal(name),
|
||||
packageService.listDependents(name),
|
||||
packageService.listStarUserNames(name),
|
||||
packageService.listMaintainers(name)
|
||||
packageService.listMaintainers(name),
|
||||
];
|
||||
var download = r[0];
|
||||
var dependents = r[1];
|
||||
var users = r[2];
|
||||
var maintainers = r[3];
|
||||
const download = r[0];
|
||||
const dependents = r[1];
|
||||
const users = r[2];
|
||||
const maintainers = r[3];
|
||||
|
||||
pkg.package.fromNow = moment(pkg.publish_time).fromNow();
|
||||
pkg = pkg.package;
|
||||
@@ -104,10 +91,10 @@ module.exports = function* show(next) {
|
||||
}
|
||||
|
||||
if (pkg.maintainers) {
|
||||
for (var i = 0; i < pkg.maintainers.length; i++) {
|
||||
var maintainer = pkg.maintainers[i];
|
||||
for (let i = 0; i < pkg.maintainers.length; i++) {
|
||||
const maintainer = pkg.maintainers[i];
|
||||
if (maintainer.email) {
|
||||
maintainer.gravatar = gravatar.url(maintainer.email, {s: '50', d: 'retro'}, true);
|
||||
maintainer.gravatar = gravatar.url(maintainer.email, { s: '50', d: 'retro' }, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -115,7 +102,7 @@ module.exports = function* show(next) {
|
||||
if (pkg._npmUser) {
|
||||
pkg.lastPublishedUser = pkg._npmUser;
|
||||
if (pkg.lastPublishedUser.email) {
|
||||
pkg.lastPublishedUser.gravatar = gravatar.url(pkg.lastPublishedUser.email, {s: '50', d: 'retro'}, true);
|
||||
pkg.lastPublishedUser.gravatar = gravatar.url(pkg.lastPublishedUser.email, { s: '50', d: 'retro' }, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -123,7 +110,7 @@ module.exports = function* show(next) {
|
||||
pkg.repository = null;
|
||||
}
|
||||
if (pkg.repository && pkg.repository.url) {
|
||||
pkg.repository.weburl = giturl.parse(pkg.repository.url) || pkg.repository.url;
|
||||
pkg.repository.weburl = /^https?:\/\//.test(pkg.repository.url) ? pkg.repository.url : (giturl.parse(pkg.repository.url) || pkg.repository.url);
|
||||
}
|
||||
if (!pkg.bugs) {
|
||||
pkg.bugs = {};
|
||||
@@ -131,7 +118,7 @@ module.exports = function* show(next) {
|
||||
|
||||
utils.setLicense(pkg);
|
||||
|
||||
for (var k in download) {
|
||||
for (const k in download) {
|
||||
download[k] = humanize(download[k]);
|
||||
}
|
||||
setDownloadURL(pkg, this, config.registryHost);
|
||||
@@ -156,12 +143,12 @@ module.exports = function* show(next) {
|
||||
// "node3": ">= 0.6.9",
|
||||
// };
|
||||
if (pkg.engines) {
|
||||
for (var k in pkg.engines) {
|
||||
var engine = String(pkg.engines[k] || '').trim();
|
||||
var color = 'blue';
|
||||
for (const k in pkg.engines) {
|
||||
const engine = String(pkg.engines[k] || '').trim();
|
||||
let color = 'blue';
|
||||
if (k.indexOf('node') === 0) {
|
||||
color = 'yellowgreen';
|
||||
var version = /(\d+\.\d+\.\d+)/.exec(engine);
|
||||
let version = /(\d+\.\d+\.\d+)/.exec(engine);
|
||||
if (version) {
|
||||
version = version[0];
|
||||
if (/^0\.11\.\d+/.test(version)) {
|
||||
@@ -177,15 +164,26 @@ module.exports = function* show(next) {
|
||||
pkg.engines[k] = {
|
||||
version: engine,
|
||||
title: k + ': ' + engine,
|
||||
badgeURL: 'https://dn-img-shields-io.qbox.me/badge/' + encodeURIComponent(k) +
|
||||
badgeURL: config.badgePrefixURL + '/' + encodeURIComponent(k) +
|
||||
'-' + encodeURIComponent(engine) + '-' + color + '.svg?style=flat-square',
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
if (pkg._publish_on_cnpm) {
|
||||
pkg.isPrivate = true;
|
||||
} else {
|
||||
pkg.isPrivate = false;
|
||||
// add security check badge
|
||||
pkg.snyk = {
|
||||
badge: `${config.snykUrl}/test/npm/${pkg.name}/badge.svg?style=flat-square`,
|
||||
url: `${config.snykUrl}/test/npm/${pkg.name}`,
|
||||
};
|
||||
}
|
||||
|
||||
yield this.render('package', {
|
||||
title: 'Package - ' + pkg.name,
|
||||
package: pkg,
|
||||
download: download
|
||||
download,
|
||||
});
|
||||
};
|
||||
|
||||
@@ -16,19 +16,19 @@
|
||||
*/
|
||||
|
||||
module.exports = function* showSync() {
|
||||
var name = this.params.name || this.params[0] || this.query.name;
|
||||
let name = this.params.name || this.params[0] || this.query.name;
|
||||
if (!name) {
|
||||
return this.redirect('/');
|
||||
}
|
||||
var type = 'package';
|
||||
let type = 'package';
|
||||
if (name.indexOf(':') > 0) {
|
||||
var splits = name.split(':');
|
||||
const splits = name.split(':');
|
||||
name = splits[1];
|
||||
type = splits[0];
|
||||
}
|
||||
yield this.render('sync', {
|
||||
type: type,
|
||||
name: name,
|
||||
type,
|
||||
name,
|
||||
title: 'Sync ' + type + ' - ' + name,
|
||||
});
|
||||
};
|
||||
|
||||
@@ -1,49 +1,34 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/web/user/show.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var config = require('../../../config');
|
||||
var packageService = require('../../../services/package');
|
||||
var userService = require('../../../services/user');
|
||||
var common = require('../../../lib/common');
|
||||
const config = require('../../../config');
|
||||
const packageService = require('../../../services/package');
|
||||
const userService = require('../../../services/user');
|
||||
const common = require('../../../lib/common');
|
||||
|
||||
module.exports = function* showUser(next) {
|
||||
var name = this.params.name;
|
||||
var isAdmin = common.isAdmin(name);
|
||||
var scopes = config.scopes || [];
|
||||
var user;
|
||||
var r = yield [packageService.listModulesByUser(name), userService.getAndSave(name)];
|
||||
var packages = r[0];
|
||||
var user = r[1];
|
||||
const name = this.params.name;
|
||||
const isAdmin = common.isAdmin(name);
|
||||
const scopes = config.scopes || [];
|
||||
const r = yield [ packageService.listModulesByUser(name), userService.getAndSave(name) ];
|
||||
const packages = r[0];
|
||||
let user = r[1];
|
||||
if (!user && !packages.length) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
user = user || {};
|
||||
|
||||
var data = {
|
||||
name: name,
|
||||
const data = {
|
||||
name,
|
||||
email: user.email,
|
||||
json: user.json || {}
|
||||
json: user.json || {},
|
||||
isNpmUser: user.isNpmUser,
|
||||
};
|
||||
|
||||
if (data.json.login) {
|
||||
// custom user format
|
||||
// convert to npm user format
|
||||
var json = data.json;
|
||||
const json = data.json;
|
||||
data.json = {
|
||||
_id: 'org.couchdb.user:' + user.name,
|
||||
_rev: user.rev,
|
||||
@@ -55,16 +40,16 @@ module.exports = function* showUser(next) {
|
||||
avatar: json.avatar_url,
|
||||
fullname: json.name || json.login,
|
||||
homepage: json.html_url,
|
||||
im: json.im_url
|
||||
im: json.im_url,
|
||||
};
|
||||
}
|
||||
|
||||
yield this.render('profile', {
|
||||
title: 'User - ' + name,
|
||||
packages: packages,
|
||||
packages,
|
||||
user: data,
|
||||
lastModified: user.gmt_modified,
|
||||
isAdmin: isAdmin,
|
||||
scopes: scopes
|
||||
isAdmin,
|
||||
scopes,
|
||||
});
|
||||
};
|
||||
|
||||
46
dispatch.js
46
dispatch.js
@@ -1,25 +1,12 @@
|
||||
/**!
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com>
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var childProcess = require('child_process');
|
||||
var path = require('path');
|
||||
var util = require('util');
|
||||
var cfork = require('cfork');
|
||||
var config = require('./config');
|
||||
var workerPath = path.join(__dirname, 'worker.js');
|
||||
var syncPath = path.join(__dirname, 'sync');
|
||||
const childProcess = require('child_process');
|
||||
const path = require('path');
|
||||
const util = require('util');
|
||||
const cfork = require('cfork');
|
||||
const config = require('./config');
|
||||
const workerPath = path.join(__dirname, 'worker.js');
|
||||
const syncPath = path.join(__dirname, 'sync');
|
||||
|
||||
console.log('Starting cnpmjs.org ...\ncluster: %s\nadmins: %j\nscopes: %j\nsourceNpmRegistry: %s\nsyncModel: %s',
|
||||
config.enableCluster, config.admins, config.scopes, config.sourceNpmRegistry, config.syncModel);
|
||||
@@ -40,14 +27,17 @@ function forkWorker() {
|
||||
cfork({
|
||||
exec: workerPath,
|
||||
count: config.numCPUs,
|
||||
}).on('fork', function (worker) {
|
||||
})
|
||||
.on('fork', worker => {
|
||||
console.log('[%s] [worker:%d] new worker start', Date(), worker.process.pid);
|
||||
}).on('disconnect', function (worker) {
|
||||
})
|
||||
.on('disconnect', worker => {
|
||||
console.error('[%s] [master:%s] wroker:%s disconnect, suicide: %s, state: %s.',
|
||||
Date(), process.pid, worker.process.pid, worker.suicide, worker.state);
|
||||
}).on('exit', function (worker, code, signal) {
|
||||
var exitCode = worker.process.exitCode;
|
||||
var err = new Error(util.format('worker %s died (code: %s, signal: %s, suicide: %s, state: %s)',
|
||||
})
|
||||
.on('exit', (worker, code, signal) => {
|
||||
const exitCode = worker.process.exitCode;
|
||||
const err = new Error(util.format('worker %s died (code: %s, signal: %s, suicide: %s, state: %s)',
|
||||
worker.process.pid, exitCode, signal, worker.suicide, worker.state));
|
||||
err.name = 'WorkerDiedError';
|
||||
console.error('[%s] [master:%s] wroker exit: %s', Date(), process.pid, err.stack);
|
||||
@@ -55,9 +45,9 @@ function forkWorker() {
|
||||
}
|
||||
|
||||
function forkSyncer() {
|
||||
var syncer = childProcess.fork(syncPath);
|
||||
syncer.on('exit', function (code, signal) {
|
||||
var err = new Error(util.format('syncer %s died (code: %s, signal: %s, stdout: %s, stderr: %s)',
|
||||
const syncer = childProcess.fork(syncPath);
|
||||
syncer.on('exit', (code, signal) => {
|
||||
const err = new Error(util.format('syncer %s died (code: %s, signal: %s, stdout: %s, stderr: %s)',
|
||||
syncer.pid, code, signal, syncer.stdout, syncer.stderr));
|
||||
err.name = 'SyncerWorkerDiedError';
|
||||
console.error('[%s] [master:%s] syncer exit: %s: %s',
|
||||
|
||||
BIN
docs/network.png
Normal file
BIN
docs/network.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 123 KiB |
98
docs/network.puml
Normal file
98
docs/network.puml
Normal file
@@ -0,0 +1,98 @@
|
||||
@startuml
|
||||
|
||||
title cnpmjs.org, npm.taobao.org Network
|
||||
|
||||
node "China User" {
|
||||
[cnpm cli]
|
||||
}
|
||||
|
||||
node "OSS: aliyuncs.com" {
|
||||
[tnpm-hz.oss-cn-hangzhou]
|
||||
}
|
||||
|
||||
node "SLB: 114.55.80.225 Hangzhou" {
|
||||
[npm.taobao.org]
|
||||
[registry.npm.taobao.org]
|
||||
}
|
||||
|
||||
node "npmtaobao3: 121.41.*" {
|
||||
[nginx 5]
|
||||
[registry 5]
|
||||
[web 5]
|
||||
[syncer 5]
|
||||
}
|
||||
|
||||
node "npmtaobao4: 120.26.*" {
|
||||
[nginx 6]
|
||||
[registry 6]
|
||||
[web 6]
|
||||
}
|
||||
|
||||
node "cnpm6: 47.88.189.193 Singapore" {
|
||||
[cnpmjs.org]
|
||||
[r.cnpmjs.org]
|
||||
[nginx 7]
|
||||
[registry 7]
|
||||
[web 7]
|
||||
[syncer 7]
|
||||
}
|
||||
|
||||
node "Aliyun CDN" {
|
||||
[cdn.npm.taobao.org]
|
||||
}
|
||||
|
||||
node "qiniu CDN" {
|
||||
[cnpmjs.up.qiniu.com]
|
||||
[dn-cnpm.qbox.me]
|
||||
}
|
||||
|
||||
database "taobaonpm DB" {
|
||||
[rds2860*.mysql.rds.aliyuncs.com]
|
||||
}
|
||||
|
||||
database "cnpm DB" {
|
||||
[rdsqiz*.mysql.rds.aliyuncs.com]
|
||||
}
|
||||
|
||||
node "npmjs.com" {
|
||||
[registry.npmjs.com]
|
||||
[www.npmjs.com]
|
||||
}
|
||||
|
||||
[cnpm cli] -down-> [registry.npm.taobao.org]: Read, Write
|
||||
[cnpm cli] -down-> [cdn.npm.taobao.org]: Read tgz
|
||||
[cnpm cli] -down-> [npm.taobao.org]: "Read /mirrors"
|
||||
|
||||
[registry.npm.taobao.org] -down-> [nginx 5]
|
||||
[nginx 5] -down-> [registry 5]
|
||||
[npm.taobao.org] -down-> [nginx 5]
|
||||
[nginx 5] -down-> [web 5]
|
||||
[registry.npm.taobao.org] -down-> [nginx 6]
|
||||
[nginx 6] -down-> [registry 6]
|
||||
[npm.taobao.org] -down-> [nginx 6]
|
||||
[nginx 6] -down-> [web 6]
|
||||
|
||||
[registry 5] -down-> [rds2860*.mysql.rds.aliyuncs.com]: Read, Write
|
||||
[web 5] -down-> [rds2860*.mysql.rds.aliyuncs.com]: Read
|
||||
[syncer 5] -down-> [rds2860*.mysql.rds.aliyuncs.com]: Read, Write
|
||||
[syncer 5] -down-> [tnpm-hz.oss-cn-hangzhou]: Write
|
||||
[syncer 5] -> [r.cnpmjs.org]: Read
|
||||
[syncer 5] -> [dn-cnpm.qbox.me]: Read tgz
|
||||
[registry 6] -down-> [rds2860*.mysql.rds.aliyuncs.com]: Read, Write
|
||||
[web 6] -down-> [rds2860*.mysql.rds.aliyuncs.com]: Read
|
||||
|
||||
[cnpmjs.org] -down-> [nginx 7]
|
||||
[nginx 7] -down-> [registry 7]
|
||||
[r.cnpmjs.org] -down-> [nginx 7]
|
||||
[nginx 7] -down-> [web 7]
|
||||
|
||||
[registry 7] -down-> [rdsqiz*.mysql.rds.aliyuncs.com]: Read, Write
|
||||
[web 7] -down-> [rdsqiz*.mysql.rds.aliyuncs.com]: Read
|
||||
[syncer 7] -down-> [rdsqiz*.mysql.rds.aliyuncs.com]: Read, Write
|
||||
[syncer 7] -down-> [cnpmjs.up.qiniu.com]: Write
|
||||
[syncer 7] -down-> [registry.npmjs.com]: Read
|
||||
|
||||
[cdn.npm.taobao.org] -down-> [tnpm-hz.oss-cn-hangzhou]: Read
|
||||
[dn-cnpm.qbox.me] -down-> [cnpmjs.up.qiniu.com]: Read
|
||||
|
||||
@enduml
|
||||
@@ -9,6 +9,8 @@
|
||||
* [User](/docs/registry-api.md#user)
|
||||
* [Search](/docs/registry-api.md#search)
|
||||
|
||||
[](https://app.getpostman.com/run-collection/f6c8cb46358039bcd689#?env%5BRegistry%5D=W3sia2V5IjoicmVnaXN0cnkiLCJ0eXBlIjoidGV4dCIsInZhbHVlIjoiaHR0cHM6Ly9yZWdpc3RyeS5ucG0udGFvYmFvLm9yZyIsImVuYWJsZWQiOnRydWV9LHsia2V5IjoicGFja2FnZSIsInZhbHVlIjoiY25wbSIsInR5cGUiOiJ0ZXh0IiwiZW5hYmxlZCI6dHJ1ZX1d)
|
||||
|
||||
## Schema
|
||||
|
||||
All API access is over HTTPS or HTTP,
|
||||
|
||||
@@ -1,115 +0,0 @@
|
||||
# Install & Get Started
|
||||
|
||||
## Deps
|
||||
|
||||
* MySQL Server: http://db4free.net/
|
||||
* qiniu CDN: http://www.qiniu.com/
|
||||
* redis session: https://garantiadata.com Support 24MB free spaces.
|
||||
* node: >=0.10.21
|
||||
|
||||
## Clone
|
||||
|
||||
```bash
|
||||
$ git clone git://github.com/fengmk2/cnpmjs.org.git $HOME/cnpmjs.org
|
||||
$ cd $HOME/cnpmjs.org
|
||||
```
|
||||
|
||||
## Create your `config.js`
|
||||
|
||||
```bash
|
||||
$ vim config/config.js
|
||||
```
|
||||
|
||||
`config.js` content sample:
|
||||
|
||||
```js
|
||||
module.exports = {
|
||||
debug: false,
|
||||
enableCluster: true, // enable cluster mode
|
||||
logdir: 'your application log dir',
|
||||
mysqlServers: [
|
||||
{
|
||||
host: 'your mysql host',
|
||||
port: 3306,
|
||||
user: 'yourname',
|
||||
password: 'your password'
|
||||
}
|
||||
],
|
||||
mysqlDatabase: 'cnpmjs',
|
||||
redis: {
|
||||
host: 'your redist host',
|
||||
port: 6379,
|
||||
},
|
||||
qn: {
|
||||
accessKey: "your qiniu appkey",
|
||||
secretKey: "your secret key",
|
||||
bucket: "foobucket",
|
||||
domain: "http://foobucket.u.qiniudn.com"
|
||||
},
|
||||
nfs: null, // you can set a nfs to replace qiniu cdn
|
||||
enablePrivate: true, // enable private mode, only admin can publish, other use just can sync package from source npm
|
||||
admins: {
|
||||
admin: 'admin@cnpmjs.org',
|
||||
},
|
||||
syncModel: 'exist', //`all` sync all packages, `exist` only update exist packages, `none` do nothing
|
||||
};
|
||||
```
|
||||
|
||||
## Create MySQL Database and Tables
|
||||
|
||||
```bash
|
||||
$ mysql -u yourname -p
|
||||
|
||||
mysql> use cnpmjs;
|
||||
mysql> source docs/db.sql
|
||||
```
|
||||
|
||||
## Use your own CDN
|
||||
If you wan to use your own CDN instead of qiniu. Just look at `common/qnfs.js` and implement the interface like it, then pass it by set `config.nfs`.
|
||||
|
||||
## npm install
|
||||
|
||||
```bash
|
||||
$ npm install
|
||||
```
|
||||
|
||||
## start
|
||||
|
||||
```bash
|
||||
$ ./bin/nodejsctl start
|
||||
|
||||
Starting cnpmjs.org ...
|
||||
Start nodejs success. PID=27175
|
||||
```
|
||||
|
||||
## open registry and web
|
||||
|
||||
```bash
|
||||
# registry
|
||||
$ open http://localhost:7001
|
||||
# web
|
||||
$ open http://localhost:7002
|
||||
```
|
||||
|
||||
## use cnpm cli with your own registry
|
||||
You do not need to write another command line tool with your own registry,
|
||||
just alias [cnpm](http://github.com/fengmk2/cnpm), then you can get a npm client for you own registry.
|
||||
|
||||
```
|
||||
# install cnpm first
|
||||
npm install -g cnpm
|
||||
|
||||
# then alias lnpm to cnpm, but change config to your own registry
|
||||
alias lnpm='cnpm --registry=http://localhost:7001\
|
||||
--registryweb=http://localhost:7002\
|
||||
--cache=$HOME/.npm/.cache/lnpm\
|
||||
--disturl=http://cnpmjs.org/dist\
|
||||
--userconfig=$HOME/.lnpmrc'
|
||||
|
||||
#or put this in .zshrc or .bashrc
|
||||
echo "#lnpm alias\nalias lnpm='cnpm --registry=http://localhost:7001\
|
||||
--registryweb=http://localhost:7002\
|
||||
--cache=$HOME/.npm/.cache/lnpm\
|
||||
--disturl=http://cnpmjs.org/dist\
|
||||
--userconfig=$HOME/.lnpmrc'" >> $HOME/.zshrc && source $HOME/.zshrc
|
||||
```
|
||||
@@ -4,10 +4,10 @@ So `cnpm` is meaning: **Company npm**.
|
||||
|
||||
## Registry
|
||||
|
||||
- Our public registry: [r.cnpmjs.org](//r.cnpmjs.org), syncing from [registry.npmjs.org](//registry.npmjs.org)
|
||||
- Our public registry: [r.cnpmjs.org](https://r.cnpmjs.org), syncing from [registry.npmjs.com](https://registry.npmjs.com)
|
||||
- [cnpmjs.org](/) version: <span id="app-version"></span>
|
||||
- [Node.js](https://nodejs.org) version: <span id="node-version"></span>
|
||||
- For developers behind the GFW, please visit [the Chinese mirror](https://npm.taobao.org). 中国用户请访问[国内镜像站点](https://npm.taobao.org/)。
|
||||
- For developers in China, please visit [the China mirror](https://npm.taobao.org). 中国用户请访问[国内镜像站点](https://npm.taobao.org)。
|
||||
|
||||
<div class="ant-table">
|
||||
<table class="downloads">
|
||||
@@ -65,42 +65,42 @@ Default style is `flat-square`.
|
||||
|
||||
### Version
|
||||
|
||||
Badge URL: `http://cnpmjs.org/badge/v/cnpmjs.org.svg` 
|
||||
Badge URL: `https://cnpmjs.org/badge/v/cnpmjs.org.svg` 
|
||||
|
||||
* `<0.1.0 & >=0.0.0`: 
|
||||
* `<1.0.0 & >=0.1.0`: 
|
||||
* `>=1.0.0`: 
|
||||
* `<0.1.0 & >=0.0.0`: 
|
||||
* `<1.0.0 & >=0.1.0`: 
|
||||
* `>=1.0.0`: 
|
||||
|
||||
### Downloads
|
||||
|
||||
Badge URL: `http://cnpmjs.org/badge/d/cnpmjs.org.svg` 
|
||||
Badge URL: `https://cnpmjs.org/badge/d/cnpmjs.org.svg` 
|
||||
|
||||
## Usage
|
||||
|
||||
use our npm client [cnpm](https://github.com/cnpm/cnpm)(More suitable with cnpmjs.org and gzip support), you can get our client through npm:
|
||||
|
||||
```bash
|
||||
$ npm install -g cnpm --registry=http://registry.npm.taobao.org
|
||||
$ npm install -g cnpm --registry=https://registry.npm.taobao.org
|
||||
```
|
||||
|
||||
Or you can alias NPM to use it:
|
||||
|
||||
```bash
|
||||
alias cnpm="npm --registry=http://registry.npm.taobao.org \
|
||||
alias cnpm="npm --registry=https://registry.npm.taobao.org \
|
||||
--cache=$HOME/.npm/.cache/cnpm \
|
||||
--disturl=http://registry.npm.taobao.org/mirrors/node \
|
||||
--disturl=https://npm.taobao.org/mirrors/node \
|
||||
--userconfig=$HOME/.cnpmrc"
|
||||
|
||||
#Or alias it in .bashrc or .zshrc
|
||||
$ echo '\n#alias for cnpm\nalias cnpm="npm --registry=http://registry.npm.taobao.org \
|
||||
$ echo '\n#alias for cnpm\nalias cnpm="npm --registry=https://registry.npm.taobao.org \
|
||||
--cache=$HOME/.npm/.cache/cnpm \
|
||||
--disturl=http://registry.npm.taobao.org/mirrors/node \
|
||||
--disturl=https://npm.taobao.org/mirrors/node \
|
||||
--userconfig=$HOME/.cnpmrc"' >> ~/.zshrc && source ~/.zshrc
|
||||
```
|
||||
|
||||
### install
|
||||
|
||||
Install package from [r.cnpmjs.org](//r.cnpmjs.org). When installing a package or version does not exist, it will try to install from the official registry([registry.npmjs.org](//registry.npmjs.org)), and sync this package to cnpm in the backend.
|
||||
Install package from [r.cnpmjs.org](//r.cnpmjs.org). When installing a package or version does not exist, it will try to install from the official registry([registry.npmjs.org](https://registry.npmjs.org)), and sync this package to cnpm in the backend.
|
||||
|
||||
```bash
|
||||
$ cnpm install [name]
|
||||
@@ -145,10 +145,11 @@ $ cnpm info cnpm
|
||||
|
||||
Release [History](/history).
|
||||
|
||||
## npm and cnpm relation
|
||||
## npmjs.org, cnpmjs.org and npm.taobao.org relation
|
||||
|
||||

|
||||

|
||||
|
||||
## Sponsors
|
||||
|
||||
- [](http://www.ucloud.cn?sem=sdk-CNPMJS)
|
||||
- [](http://click.aliyun.com/m/4288/) (2016.2 - now)
|
||||
- [](http://www.ucloud.cn?sem=sdk-CNPMJS) (2015.3 - 2016.3)
|
||||
|
||||
18
index.js
18
index.js
@@ -1,28 +1,16 @@
|
||||
/**!
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var config = require('./config');
|
||||
const config = require('./config');
|
||||
|
||||
exports.loadConfig = config.loadConfig;
|
||||
exports.config = config;
|
||||
|
||||
exports.startWorker = function (customConfig) {
|
||||
exports.startWorker = function(customConfig) {
|
||||
config.loadConfig(customConfig);
|
||||
require('./worker');
|
||||
};
|
||||
|
||||
exports.startSync = function (customConfig) {
|
||||
exports.startSync = function(customConfig) {
|
||||
config.loadConfig(customConfig);
|
||||
require('./sync');
|
||||
};
|
||||
|
||||
@@ -1,32 +1,18 @@
|
||||
/**!
|
||||
* cnpmjs.org - lib/common.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const crypto = require('crypto');
|
||||
const path = require('path');
|
||||
const config = require('../config');
|
||||
const util = require('util');
|
||||
|
||||
var crypto = require('crypto');
|
||||
var path = require('path');
|
||||
var config = require('../config');
|
||||
var util = require('util');
|
||||
|
||||
exports.getTarballFilepath = function (filename) {
|
||||
exports.getTarballFilepath = function(filename) {
|
||||
// ensure download file path unique
|
||||
// TODO: not only .tgz, and also other extname
|
||||
var name = filename.replace(/\.tgz$/, '.' + crypto.randomBytes(16).toString('hex') + '.tgz');
|
||||
const name = filename.replace(/\.tgz$/, '.' + crypto.randomBytes(16).toString('hex') + '.tgz');
|
||||
return path.join(config.uploadDir, name);
|
||||
};
|
||||
|
||||
exports.getCDNKey = function (name, filename) {
|
||||
exports.getCDNKey = function(name, filename) {
|
||||
// if name is scope package name, need to auto fix filename as a scope package file name
|
||||
// e.g.: @scope/foo, filename: foo-1.0.0.tgz => filename: @scope/foo-1.0.0.tgz
|
||||
if (name[0] === '@' && filename[0] !== '@') {
|
||||
@@ -35,36 +21,36 @@ exports.getCDNKey = function (name, filename) {
|
||||
return '/' + name + '/-/' + filename;
|
||||
};
|
||||
|
||||
exports.setDownloadURL = function (pkg, ctx, host) {
|
||||
exports.setDownloadURL = function(pkg, ctx, host) {
|
||||
if (pkg.dist) {
|
||||
host = host || ctx.host;
|
||||
host = host || config.registryHost || ctx.host;
|
||||
pkg.dist.tarball = util.format('%s://%s/%s/download/%s-%s.tgz',
|
||||
ctx.protocol,
|
||||
host, pkg.name, pkg.name, pkg.version);
|
||||
}
|
||||
};
|
||||
|
||||
exports.isAdmin = function (username) {
|
||||
exports.isAdmin = function(username) {
|
||||
return typeof config.admins[username] === 'string';
|
||||
};
|
||||
|
||||
exports.isMaintainer = function (user, maintainers) {
|
||||
exports.isMaintainer = function(user, maintainers) {
|
||||
if (user.isAdmin) {
|
||||
return true;
|
||||
}
|
||||
|
||||
var username = user.name;
|
||||
const username = user.name;
|
||||
maintainers = maintainers || [];
|
||||
var match = maintainers.filter(function (item) {
|
||||
const match = maintainers.filter(function(item) {
|
||||
return item.name === username;
|
||||
});
|
||||
|
||||
return match.length > 0;
|
||||
};
|
||||
|
||||
exports.isLocalModule = function (mods) {
|
||||
for (var i = 0; i < mods.length; i++) {
|
||||
var r = mods[i];
|
||||
exports.isLocalModule = function(mods) {
|
||||
for (let i = 0; i < mods.length; i++) {
|
||||
const r = mods[i];
|
||||
if (r.package && r.package._publish_on_cnpm) {
|
||||
return true;
|
||||
}
|
||||
@@ -72,7 +58,7 @@ exports.isLocalModule = function (mods) {
|
||||
return false;
|
||||
};
|
||||
|
||||
exports.isPrivateScopedPackage = function (name) {
|
||||
exports.isPrivateScopedPackage = function(name) {
|
||||
if (name[0] !== '@') {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1,50 +1,37 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/auth.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:middleware:auth');
|
||||
var UserService = require('../services/user');
|
||||
var config = require('../config');
|
||||
const debug = require('debug')('cnpmjs.org:middleware:auth');
|
||||
const UserService = require('../services/user');
|
||||
const config = require('../config');
|
||||
|
||||
/**
|
||||
* Parse the request authorization
|
||||
* get the real user
|
||||
*/
|
||||
|
||||
module.exports = function () {
|
||||
module.exports = function() {
|
||||
return function* auth(next) {
|
||||
this.user = {};
|
||||
|
||||
var authorization = (this.get('authorization') || '').split(' ')[1] || '';
|
||||
let authorization = (this.get('authorization') || '').split(' ')[1] || '';
|
||||
authorization = authorization.trim();
|
||||
debug('%s %s with %j', this.method, this.url, authorization);
|
||||
if (!authorization) {
|
||||
return yield* unauthorized.call(this, next);
|
||||
return yield unauthorized.call(this, next);
|
||||
}
|
||||
|
||||
authorization = new Buffer(authorization, 'base64').toString().split(':');
|
||||
if (authorization.length !== 2) {
|
||||
return yield* unauthorized.call(this, next);
|
||||
authorization = new Buffer(authorization, 'base64').toString();
|
||||
const pos = authorization.indexOf(':');
|
||||
if (pos === -1) {
|
||||
return yield unauthorized.call(this, next);
|
||||
}
|
||||
|
||||
var username = authorization[0];
|
||||
var password = authorization[1];
|
||||
const username = authorization.slice(0, pos);
|
||||
const password = authorization.slice(pos + 1);
|
||||
|
||||
var row;
|
||||
let row;
|
||||
try {
|
||||
row = yield* UserService.auth(username, password);
|
||||
row = yield UserService.auth(username, password);
|
||||
} catch (err) {
|
||||
// do not response error here
|
||||
// many request do not need login
|
||||
@@ -53,27 +40,27 @@ module.exports = function () {
|
||||
|
||||
if (!row) {
|
||||
debug('auth fail user: %j, headers: %j', row, this.header);
|
||||
return yield* unauthorized.call(this, next);
|
||||
return yield unauthorized.call(this, next);
|
||||
}
|
||||
|
||||
this.user.name = row.login;
|
||||
this.user.isAdmin = row.site_admin;
|
||||
this.user.scopes = row.scopes;
|
||||
debug('auth pass user: %j, headers: %j', this.user, this.header);
|
||||
yield* next;
|
||||
yield next;
|
||||
};
|
||||
};
|
||||
|
||||
function* unauthorized(next) {
|
||||
if (!config.alwaysAuth || this.method !== 'GET') {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
this.status = 401;
|
||||
this.set('WWW-Authenticate', 'Basic realm="sample"');
|
||||
if (this.accepts(['html', 'json']) === 'json') {
|
||||
if (this.accepts([ 'html', 'json' ]) === 'json') {
|
||||
this.body = {
|
||||
error: 'unauthorized',
|
||||
reason: 'login first'
|
||||
reason: 'login first',
|
||||
};
|
||||
} else {
|
||||
this.body = 'login first';
|
||||
|
||||
@@ -1,28 +1,15 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/block.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
module.exports = function () {
|
||||
module.exports = () => {
|
||||
return function* block(next) {
|
||||
var ua = String(this.get('user-agent')).toLowerCase();
|
||||
const ua = String(this.get('user-agent')).toLowerCase();
|
||||
if (ua === 'ruby') {
|
||||
this.status = 403;
|
||||
return this.body = {
|
||||
message: 'forbidden Ruby user-agent, ip: ' + this.ip
|
||||
this.body = {
|
||||
message: 'forbidden Ruby user-agent, ip: ' + this.ip,
|
||||
};
|
||||
return;
|
||||
}
|
||||
yield* next;
|
||||
yield next;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,42 +1,28 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/editable.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../services/package');
|
||||
const packageService = require('../services/package');
|
||||
|
||||
// admin or module's maintainer can modified the module
|
||||
module.exports = function* editable(next) {
|
||||
var username = this.user && this.user.name;
|
||||
var moduleName = this.params.name || this.params[0];
|
||||
const username = this.user && this.user.name;
|
||||
const moduleName = this.params.name || this.params[0];
|
||||
if (username && moduleName) {
|
||||
if (this.user.isAdmin) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
var isMaintainer = yield* packageService.isMaintainer(moduleName, username);
|
||||
const isMaintainer = yield packageService.isMaintainer(moduleName, username);
|
||||
if (isMaintainer) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
}
|
||||
|
||||
this.status = 403;
|
||||
var message = 'not authorized to modify ' + moduleName;
|
||||
let message = 'not authorized to modify ' + moduleName;
|
||||
if (username) {
|
||||
message = username + ' ' + message;
|
||||
}
|
||||
this.body = {
|
||||
error: 'forbidden user',
|
||||
reason: message
|
||||
reason: message,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,30 +1,16 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/exists_package.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var packageService = require('../services/package');
|
||||
const packageService = require('../services/package');
|
||||
|
||||
module.exports = function* (next) {
|
||||
var name = this.params.name || this.params[0];
|
||||
var pkg = yield packageService.getLatestModule(name);
|
||||
const name = this.params.name || this.params[0];
|
||||
const pkg = yield packageService.getLatestModule(name);
|
||||
if (pkg) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
this.status = 404;
|
||||
this.body = {
|
||||
error: 'not_found',
|
||||
reason: 'document not found'
|
||||
reason: 'document not found',
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,27 +1,13 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/limit.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const config = require('../config');
|
||||
const limit = require('koa-limit');
|
||||
|
||||
var config = require('../config');
|
||||
var limit = require('koa-limit');
|
||||
|
||||
var limitConfig = config.limit;
|
||||
const limitConfig = config.limit;
|
||||
|
||||
if (!limitConfig.enable) {
|
||||
module.exports = function *ignoreLimit(next) {
|
||||
yield *next;
|
||||
module.exports = function* ignoreLimit(next) {
|
||||
yield next;
|
||||
};
|
||||
} else {
|
||||
module.exports = limit(limitConfig);
|
||||
|
||||
@@ -1,31 +1,17 @@
|
||||
/*!
|
||||
* cnpmjs.org - middleware/login.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const http = require('http');
|
||||
|
||||
var http = require('http');
|
||||
|
||||
module.exports = function *login(next) {
|
||||
module.exports = function* login(next) {
|
||||
if (this.user.error) {
|
||||
var status = this.user.error.status;
|
||||
const status = this.user.error.status;
|
||||
this.status = http.STATUS_CODES[status]
|
||||
? status
|
||||
: 500;
|
||||
|
||||
this.body = {
|
||||
error: this.user.error.name,
|
||||
reason: this.user.error.message
|
||||
reason: this.user.error.message,
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -34,9 +20,9 @@ module.exports = function *login(next) {
|
||||
this.status = 401;
|
||||
this.body = {
|
||||
error: 'unauthorized',
|
||||
reason: 'Login first'
|
||||
reason: 'Login first',
|
||||
};
|
||||
return;
|
||||
}
|
||||
yield *next;
|
||||
yield next;
|
||||
};
|
||||
|
||||
@@ -1,32 +1,19 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/opensearch.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const template = `<?xml version="1.0" encoding="UTF-8"?>
|
||||
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
|
||||
<ShortName>CNPM</ShortName>
|
||||
<Description>Search packages in CNPM.</Description>
|
||||
<Tags>CNPM</Tags>
|
||||
<Url method="get" type="text/html" template="http://{{host}}/browse/keyword/{searchTerms}"/>
|
||||
</OpenSearchDescription>`;
|
||||
|
||||
var template = '<?xml version="1.0" encoding="UTF-8"?>\
|
||||
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">\
|
||||
<ShortName>CNPM</ShortName>\
|
||||
<Description>Search packages in CNPM.</Description>\
|
||||
<Tags>CNPM</Tags>\
|
||||
<Url method="get" type="text/html" template="http://${host}/browse/keyword/{searchTerms}"/>\
|
||||
</OpenSearchDescription>';
|
||||
|
||||
module.exports = function *opensearch(next) {
|
||||
module.exports = function* opensearch(next) {
|
||||
if (this.path === '/opensearch.xml') {
|
||||
this.type = 'text/xml';
|
||||
this.charset = 'utf-8';
|
||||
this.body = template.replace('${host}', this.host);
|
||||
this.body = template.replace('{{host}}', this.host);
|
||||
return;
|
||||
}
|
||||
yield *next;
|
||||
yield next;
|
||||
};
|
||||
|
||||
@@ -1,24 +1,11 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/proxy_to_npm.js
|
||||
*
|
||||
* Copyright(c) Alibaba Group Holding Limited.
|
||||
*
|
||||
* Authors:
|
||||
* 苏千 <suqian.yf@alipay.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const debug = require('debug')('cnpmjs.org:middleware:proxy_to_npm');
|
||||
const config = require('../config');
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:middleware:proxy_to_npm');
|
||||
var config = require('../config');
|
||||
|
||||
module.exports = function (options) {
|
||||
var redirectUrl = config.sourceNpmRegistry;
|
||||
var proxyUrls = [
|
||||
module.exports = function(options) {
|
||||
let redirectUrl = config.sourceNpmRegistry;
|
||||
let proxyUrls = [
|
||||
// /:pkg, dont contains scoped package
|
||||
/^\/[\w\-\.]+$/,
|
||||
// /-/package/:pkg/dist-tags
|
||||
@@ -33,26 +20,26 @@ module.exports = function (options) {
|
||||
}
|
||||
return function* proxyToNpm(next) {
|
||||
if (config.syncModel !== 'none') {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
// only proxy read requests
|
||||
if (this.method !== 'GET' && this.method !== 'HEAD') {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var pathname = this.path;
|
||||
var match;
|
||||
for (var i = 0; i < proxyUrls.length; i++) {
|
||||
const pathname = this.path;
|
||||
let match;
|
||||
for (let i = 0; i < proxyUrls.length; i++) {
|
||||
match = proxyUrls[i].test(pathname);
|
||||
if (match) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!match) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var url = redirectUrl + this.url;
|
||||
const url = redirectUrl + this.url;
|
||||
debug('proxy to %s', url);
|
||||
this.redirect(url);
|
||||
};
|
||||
|
||||
@@ -1,56 +1,45 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/publishable.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const util = require('util');
|
||||
const config = require('../config');
|
||||
const debug = require('debug')('cnpmjs.org:middlewares/publishable');
|
||||
|
||||
var util = require('util');
|
||||
var config = require('../config');
|
||||
var debug = require('debug')('cnpmjs.org:middlewares/publishable');
|
||||
module.exports = function* publishable(next) {
|
||||
// admins always can publish and unpublish
|
||||
if (this.user.isAdmin) {
|
||||
return yield next;
|
||||
}
|
||||
|
||||
module.exports = function *publishable(next) {
|
||||
// private mode, only admin user can publish
|
||||
if (config.enablePrivate && !this.user.isAdmin) {
|
||||
// private mode, normal user can't publish and unpublish
|
||||
if (config.enablePrivate) {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'no_perms',
|
||||
reason: 'Private mode enable, only admin can publish this module'
|
||||
reason: 'Private mode enable, only admin can publish this module',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// public mode, all user have permission to publish `scoped package`
|
||||
// public mode, normal user have permission to publish `scoped package`
|
||||
// and only can publish with scopes in `ctx.user.scopes`, default is `config.scopes`
|
||||
|
||||
var name = this.params.name || this.params[0];
|
||||
const name = this.params.name || this.params[0];
|
||||
|
||||
// check if is private package list in config
|
||||
if (config.privatePackages && config.privatePackages.indexOf(name) !== -1) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
// scope
|
||||
// scoped module
|
||||
if (name[0] === '@') {
|
||||
if (checkScope(name, this)) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// none-scope
|
||||
if (checkNoneScope(name, this)) {
|
||||
return yield* next;
|
||||
}
|
||||
assertNoneScope(name, this);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -63,13 +52,13 @@ function checkScope(name, ctx) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var scope = name.split('/')[0];
|
||||
const scope = name.split('/')[0];
|
||||
if (ctx.user.scopes.indexOf(scope) === -1) {
|
||||
debug('assert scope %s error', name);
|
||||
ctx.status = 400;
|
||||
ctx.body = {
|
||||
error: 'invalid scope',
|
||||
reason: util.format('scope %s not match legal scopes: %s', scope, ctx.user.scopes.join(', '))
|
||||
reason: util.format('scope %s not match legal scopes: %s', scope, ctx.user.scopes.join(', ')),
|
||||
};
|
||||
return false;
|
||||
}
|
||||
@@ -81,23 +70,18 @@ function checkScope(name, ctx) {
|
||||
* check if user have permission to publish without scope
|
||||
*/
|
||||
|
||||
function checkNoneScope(name, ctx) {
|
||||
// admins unpublished everything
|
||||
if (ctx.user.isAdmin && ctx.method === 'DELETE') {
|
||||
return true;
|
||||
}
|
||||
|
||||
function assertNoneScope(name, ctx) {
|
||||
ctx.status = 403;
|
||||
if (ctx.user.scopes.length === 0) {
|
||||
ctx.body = {
|
||||
error: 'no_perms',
|
||||
reason: 'can\'t publish non-scoped package, please set `config.scopes`'
|
||||
reason: 'can\'t publish non-scoped package, please set `config.scopes`',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
ctx.body = {
|
||||
error: 'no_perms',
|
||||
reason: 'only allow publish with ' + ctx.user.scopes.join(', ') + ' scope(s)'
|
||||
reason: 'only allow publish with ' + ctx.user.scopes.join(', ') + ' scope(s)',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
module.exports = function* notFound(next) {
|
||||
yield* next;
|
||||
yield next;
|
||||
|
||||
if (this.status && this.status !== 404) {
|
||||
return;
|
||||
@@ -27,6 +27,6 @@ module.exports = function* notFound(next) {
|
||||
this.status = 404;
|
||||
this.body = {
|
||||
error: 'not_found',
|
||||
reason: 'document not found'
|
||||
reason: 'document not found',
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,29 +1,16 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/static.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const path = require('path');
|
||||
const middlewares = require('koa-middlewares');
|
||||
const config = require('../config');
|
||||
|
||||
var path = require('path');
|
||||
var middlewares = require('koa-middlewares');
|
||||
var config = require('../config');
|
||||
|
||||
var staticDir = path.join(path.dirname(__dirname), 'public');
|
||||
const staticDir = path.join(path.dirname(__dirname), 'public');
|
||||
|
||||
module.exports = middlewares.staticCache(staticDir, {
|
||||
buffer: config.debug ? false : true,
|
||||
buffer: !config.debug,
|
||||
maxAge: config.debug ? 0 : 60 * 60 * 24 * 7,
|
||||
alas: {
|
||||
'/favicon.ico': '/favicon.png'
|
||||
}
|
||||
alias: {
|
||||
'/favicon.ico': '/favicon.png',
|
||||
},
|
||||
gzip: config.enableCompress,
|
||||
});
|
||||
|
||||
@@ -1,49 +1,38 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/sync_by_install.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var config = require('../config');
|
||||
const config = require('../config');
|
||||
|
||||
/**
|
||||
* this.allowSync - allow sync triggle by cnpm install
|
||||
* {Boolean} this.allowSync - allow sync triggle by cnpm install
|
||||
*/
|
||||
|
||||
module.exports = function* syncByInstall(next) {
|
||||
this.allowSync = false;
|
||||
if (!config.syncByInstall) {
|
||||
// only config.enablePrivate should enable sync on install
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
// request not by node, consider it request from web, dont sync
|
||||
var ua = this.get('user-agent');
|
||||
// request not by node, consider it request from web, don't sync
|
||||
const ua = this.get('user-agent');
|
||||
if (!ua || ua.indexOf('node') < 0) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
// if request with `/xxx?write=true`, meaning the read request using for write, dont sync
|
||||
// if request with `/xxx?write=true`, meaning the read request using for write, don't sync
|
||||
if (this.query.write) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var name = this.params.name || this.params[0];
|
||||
const name = this.params.name || this.params[0];
|
||||
|
||||
// scoped package dont sync
|
||||
// private scoped package don't sync
|
||||
if (name && name[0] === '@') {
|
||||
return yield* next;
|
||||
const scope = name.split('/')[0];
|
||||
if (config.scopes.indexOf(scope) >= 0) {
|
||||
return yield next;
|
||||
}
|
||||
}
|
||||
|
||||
this.allowSync = true;
|
||||
yield* next;
|
||||
yield next;
|
||||
};
|
||||
|
||||
14
middleware/unpublishable.js
Normal file
14
middleware/unpublishable.js
Normal file
@@ -0,0 +1,14 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = function* unpublishable(next) {
|
||||
// only admin user can unpublish
|
||||
if (!this.user.isAdmin) {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'no_perms',
|
||||
reason: 'Only administrators can unpublish module',
|
||||
};
|
||||
return;
|
||||
}
|
||||
yield next;
|
||||
};
|
||||
@@ -1,23 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/web_not_found.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:middleware:web_not_found');
|
||||
const debug = require('debug')('cnpmjs.org:middleware:web_not_found');
|
||||
|
||||
module.exports = function* notFound(next) {
|
||||
yield* next;
|
||||
yield next;
|
||||
|
||||
if (this.status && this.status !== 404) {
|
||||
return;
|
||||
@@ -26,7 +12,7 @@ module.exports = function* notFound(next) {
|
||||
return;
|
||||
}
|
||||
|
||||
var m = /^\/([\w\-\.]+)\/?$/.exec(this.path);
|
||||
let m = /^\/([\w\-\.]+)\/?$/.exec(this.path);
|
||||
if (!m) {
|
||||
// scoped packages
|
||||
m = /^\/(@[\w\-\.]+\/[\w\-\.]+)$/.exec(this.path);
|
||||
@@ -38,16 +24,16 @@ module.exports = function* notFound(next) {
|
||||
|
||||
// package not found
|
||||
m = /\/package\/([\w\-\_\.]+)\/?$/.exec(this.url);
|
||||
var name = null;
|
||||
var title = '404: Page Not Found';
|
||||
let name = null;
|
||||
let title = '404: Page Not Found';
|
||||
if (m) {
|
||||
name = m[1];
|
||||
title = name + ' Not Found';
|
||||
}
|
||||
|
||||
this.status = 404;
|
||||
yield* this.render('404', {
|
||||
title: title,
|
||||
name: name
|
||||
yield this.render('404', {
|
||||
title,
|
||||
name,
|
||||
});
|
||||
};
|
||||
|
||||
@@ -1,32 +1,18 @@
|
||||
/**!
|
||||
* cnpmjs.org - models/_module_maintainer_class_methods.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
/**
|
||||
* list all module names by user
|
||||
* @param {String} user
|
||||
*/
|
||||
|
||||
exports.listModuleNamesByUser = function* (user) {
|
||||
var rows = yield this.findAll({
|
||||
attributrs: ['name'],
|
||||
const rows = yield this.findAll({
|
||||
attributrs: [ 'name' ],
|
||||
where: {
|
||||
user: user
|
||||
}
|
||||
user,
|
||||
},
|
||||
});
|
||||
return rows.map(function (row) {
|
||||
return rows.map(function(row) {
|
||||
return row.name;
|
||||
});
|
||||
};
|
||||
@@ -37,13 +23,13 @@ exports.listModuleNamesByUser = function* (user) {
|
||||
*/
|
||||
|
||||
exports.listMaintainers = function* (name) {
|
||||
var rows = yield this.findAll({
|
||||
attributrs: ['user'],
|
||||
const rows = yield this.findAll({
|
||||
attributrs: [ 'user' ],
|
||||
where: {
|
||||
name: name
|
||||
}
|
||||
name,
|
||||
},
|
||||
});
|
||||
return rows.map(function (row) {
|
||||
return rows.map(function(row) {
|
||||
return row.user;
|
||||
});
|
||||
};
|
||||
@@ -55,16 +41,16 @@ exports.listMaintainers = function* (name) {
|
||||
*/
|
||||
|
||||
exports.addMaintainer = function* (name, user) {
|
||||
var row = yield this.find({
|
||||
let row = yield this.find({
|
||||
where: {
|
||||
user: user,
|
||||
name: name
|
||||
}
|
||||
user,
|
||||
name,
|
||||
},
|
||||
});
|
||||
if (!row) {
|
||||
row = yield this.build({
|
||||
user: user,
|
||||
name: name
|
||||
user,
|
||||
name,
|
||||
}).save();
|
||||
}
|
||||
return row;
|
||||
@@ -77,7 +63,7 @@ exports.addMaintainer = function* (name, user) {
|
||||
*/
|
||||
|
||||
exports.addMaintainers = function* (name, users) {
|
||||
return yield users.map(function (user) {
|
||||
return yield users.map(function(user) {
|
||||
return this.addMaintainer(name, user);
|
||||
}.bind(this));
|
||||
};
|
||||
@@ -91,16 +77,16 @@ exports.addMaintainers = function* (name, users) {
|
||||
exports.removeMaintainers = function* (name, users) {
|
||||
// removeMaintainers(name, oneUserName)
|
||||
if (typeof users === 'string') {
|
||||
users = [users];
|
||||
users = [ users ];
|
||||
}
|
||||
if (users.length === 0) {
|
||||
return;
|
||||
}
|
||||
yield this.destroy({
|
||||
where: {
|
||||
name: name,
|
||||
name,
|
||||
user: users,
|
||||
}
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -112,8 +98,8 @@ exports.removeMaintainers = function* (name, users) {
|
||||
exports.removeAllMaintainers = function* (name) {
|
||||
yield this.destroy({
|
||||
where: {
|
||||
name: name
|
||||
}
|
||||
name,
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -131,17 +117,17 @@ exports.updateMaintainers = function* (name, users) {
|
||||
if (users.length === 0) {
|
||||
return {
|
||||
add: [],
|
||||
remove: []
|
||||
remove: [],
|
||||
};
|
||||
}
|
||||
var exists = yield* this.listMaintainers(name);
|
||||
const exists = yield this.listMaintainers(name);
|
||||
|
||||
var addUsers = users.filter(function (username) {
|
||||
const addUsers = users.filter(function(username) {
|
||||
// add user which in `users` but do not in `exists`
|
||||
return exists.indexOf(username) === -1;
|
||||
});
|
||||
|
||||
var removeUsers = exists.filter(function (username) {
|
||||
const removeUsers = exists.filter(function(username) {
|
||||
// remove user which in `exists` by not in `users`
|
||||
return users.indexOf(username) === -1;
|
||||
});
|
||||
@@ -153,7 +139,6 @@ exports.updateMaintainers = function* (name, users) {
|
||||
|
||||
return {
|
||||
add: addUsers,
|
||||
remove: removeUsers
|
||||
remove: removeUsers,
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,13 +1,3 @@
|
||||
/**!
|
||||
* cnpmjs.org - models/download_total.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
@@ -56,7 +46,7 @@
|
||||
// KEY `date` (`date`)
|
||||
// ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module download total info';
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('DownloadTotal', {
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
@@ -260,14 +250,14 @@ module.exports = function (sequelize, DataTypes) {
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['name', 'date']
|
||||
fields: [ 'name', 'date' ],
|
||||
},
|
||||
{
|
||||
fields: ['date']
|
||||
}
|
||||
fields: [ 'date' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
|
||||
}
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -12,15 +12,15 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var path = require('path');
|
||||
var sequelize = require('../common/sequelize');
|
||||
const path = require('path');
|
||||
const sequelize = require('../common/sequelize');
|
||||
|
||||
function load(name) {
|
||||
return sequelize.import(path.join(__dirname, name));
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
sequelize: sequelize,
|
||||
sequelize,
|
||||
Module: load('module'),
|
||||
ModuleLog: load('module_log'),
|
||||
ModuleStar: load('module_star'),
|
||||
@@ -35,16 +35,16 @@ module.exports = {
|
||||
Total: load('total'),
|
||||
DownloadTotal: load('download_total'),
|
||||
|
||||
query: function* (sql, args) {
|
||||
var options = { replacements: args };
|
||||
var data = yield this.sequelize.query(sql, options).spread();
|
||||
* query(sql, args) {
|
||||
const options = { replacements: args };
|
||||
const data = yield this.sequelize.query(sql, options);
|
||||
if (/select /i.test(sql)) {
|
||||
return data[0];
|
||||
}
|
||||
return data[1];
|
||||
},
|
||||
queryOne: function* (sql, args) {
|
||||
var rows = yield* this.query(sql, args);
|
||||
* queryOne(sql, args) {
|
||||
const rows = yield this.query(sql, args);
|
||||
return rows && rows[0];
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
@@ -14,30 +14,33 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var config = require('../config');
|
||||
const config = require('../config');
|
||||
|
||||
config.database.logging = console.log;
|
||||
|
||||
// $ node --harmony models/init_script.js <force> <dialect> <port> <username>
|
||||
var force = process.argv[2] === 'true';
|
||||
var dialect = process.argv[3];
|
||||
const force = process.argv[2] === 'true';
|
||||
const dialect = process.argv[3];
|
||||
if (dialect) {
|
||||
config.database.dialect = dialect;
|
||||
}
|
||||
var port = process.argv[4];
|
||||
const port = process.argv[4];
|
||||
if (port) {
|
||||
config.database.port = parseInt(port);
|
||||
}
|
||||
var username = process.argv[5];
|
||||
const username = process.argv[5];
|
||||
if (username) {
|
||||
config.database.username = username;
|
||||
}
|
||||
|
||||
var models = require('./');
|
||||
const models = require('./');
|
||||
|
||||
models.sequelize.sync({ force: force })
|
||||
.then(function () {
|
||||
models.Total.init(function (err) {
|
||||
models.sequelize.sync({
|
||||
force,
|
||||
logging: console.log,
|
||||
})
|
||||
.then(function() {
|
||||
models.Total.init(function(err) {
|
||||
if (err) {
|
||||
console.error('[models/init_script.js] sequelize init fail');
|
||||
console.error(err);
|
||||
@@ -49,7 +52,7 @@ models.sequelize.sync({ force: force })
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(function (err) {
|
||||
.catch(function(err) {
|
||||
console.error('[models/init_script.js] sequelize sync fail');
|
||||
console.error(err);
|
||||
process.exit(1);
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/**!
|
||||
* cnpmjs.org - models/module.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
/*
|
||||
CREATE TABLE IF NOT EXISTS `module` (
|
||||
`id` INTEGER NOT NULL auto_increment ,
|
||||
@@ -38,22 +24,22 @@ CREATE INDEX `module_publish_time` ON `module` (`publish_time`);
|
||||
CREATE INDEX `module_author` ON `module` (`author`);
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('Module', {
|
||||
author: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'first maintainer name'
|
||||
comment: 'first maintainer name',
|
||||
},
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'module name'
|
||||
comment: 'module name',
|
||||
},
|
||||
version: {
|
||||
type: DataTypes.STRING(30),
|
||||
allowNull: false,
|
||||
comment: 'module version'
|
||||
comment: 'module version',
|
||||
},
|
||||
description: {
|
||||
type: DataTypes.LONGTEXT,
|
||||
@@ -78,31 +64,31 @@ module.exports = function (sequelize, DataTypes) {
|
||||
publish_time: {
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: true,
|
||||
}
|
||||
},
|
||||
}, {
|
||||
tableName: 'module',
|
||||
comment: 'module info',
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['name', 'version']
|
||||
fields: [ 'name', 'version' ],
|
||||
},
|
||||
{
|
||||
fields: ['gmt_modified']
|
||||
fields: [ 'gmt_modified' ],
|
||||
},
|
||||
{
|
||||
fields: ['publish_time']
|
||||
fields: [ 'publish_time' ],
|
||||
},
|
||||
{
|
||||
fields: ['author']
|
||||
}
|
||||
fields: [ 'author' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
findByNameAndVersion: function* (name, version) {
|
||||
* findByNameAndVersion(name, version) {
|
||||
return yield this.find({
|
||||
where: { name: name, version: version }
|
||||
where: { name, version },
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `module_deps` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module deps';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('ModuleDependency', {
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
@@ -36,8 +36,8 @@ module.exports = function (sequelize, DataTypes) {
|
||||
dependent: {
|
||||
field: 'deps',
|
||||
type: DataTypes.STRING(100),
|
||||
comment: '`name` is depended by `deps`. `deps` == depend => `name`'
|
||||
}
|
||||
comment: '`name` is depended by `deps`. `deps` == depend => `name`',
|
||||
},
|
||||
}, {
|
||||
tableName: 'module_deps',
|
||||
comment: 'module deps',
|
||||
@@ -46,13 +46,13 @@ module.exports = function (sequelize, DataTypes) {
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['name', 'deps']
|
||||
fields: [ 'name', 'deps' ],
|
||||
},
|
||||
{
|
||||
fields: ['deps']
|
||||
}
|
||||
fields: [ 'deps' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
}
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS `module_keyword` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module keyword';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('ModuleKeyword', {
|
||||
keyword: {
|
||||
type: DataTypes.STRING(100),
|
||||
@@ -41,7 +41,7 @@ module.exports = function (sequelize, DataTypes) {
|
||||
description: {
|
||||
type: DataTypes.LONGTEXT,
|
||||
allowNull: true,
|
||||
}
|
||||
},
|
||||
}, {
|
||||
tableName: 'module_keyword',
|
||||
comment: 'module keyword',
|
||||
@@ -49,21 +49,21 @@ module.exports = function (sequelize, DataTypes) {
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['keyword', 'name']
|
||||
fields: [ 'keyword', 'name' ],
|
||||
},
|
||||
{
|
||||
fields: ['name']
|
||||
}
|
||||
fields: [ 'name' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
findByKeywordAndName: function* (keyword, name) {
|
||||
* findByKeywordAndName(keyword, name) {
|
||||
return yield this.find({
|
||||
where: {
|
||||
keyword: keyword,
|
||||
name: name
|
||||
}
|
||||
keyword,
|
||||
name,
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -27,12 +27,12 @@ CREATE TABLE IF NOT EXISTS `module_log` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module sync log';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('ModuleLog', {
|
||||
username: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'user name'
|
||||
comment: 'user name',
|
||||
},
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
@@ -40,17 +40,17 @@ module.exports = function (sequelize, DataTypes) {
|
||||
comment: 'module name',
|
||||
},
|
||||
log: {
|
||||
type: DataTypes.LONGTEXT
|
||||
}
|
||||
type: DataTypes.LONGTEXT,
|
||||
},
|
||||
}, {
|
||||
tableName: 'module_log',
|
||||
comment: 'module sync log',
|
||||
indexes: [
|
||||
{
|
||||
fields: ['name']
|
||||
}
|
||||
fields: [ 'name' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
}
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -26,18 +26,18 @@ CREATE TABLE IF NOT EXISTS `module_maintainer` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='private module maintainers';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('ModuleMaintainer', {
|
||||
user: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'user name'
|
||||
comment: 'user name',
|
||||
},
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'module name',
|
||||
}
|
||||
},
|
||||
}, {
|
||||
tableName: 'module_maintainer',
|
||||
comment: 'private module maintainers',
|
||||
@@ -45,11 +45,11 @@ module.exports = function (sequelize, DataTypes) {
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['user', 'name']
|
||||
fields: [ 'user', 'name' ],
|
||||
},
|
||||
{
|
||||
fields: ['name']
|
||||
}
|
||||
fields: [ 'name' ],
|
||||
},
|
||||
],
|
||||
classMethods: require('./_module_maintainer_class_methods'),
|
||||
});
|
||||
|
||||
@@ -26,18 +26,18 @@ CREATE TABLE IF NOT EXISTS `module_star` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module star';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('ModuleStar', {
|
||||
user: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'user name'
|
||||
comment: 'user name',
|
||||
},
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'module name',
|
||||
}
|
||||
},
|
||||
}, {
|
||||
tableName: 'module_star',
|
||||
comment: 'module star',
|
||||
@@ -45,13 +45,13 @@ module.exports = function (sequelize, DataTypes) {
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['user', 'name']
|
||||
fields: [ 'user', 'name' ],
|
||||
},
|
||||
{
|
||||
fields: ['name']
|
||||
}
|
||||
fields: [ 'name' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
}
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var utils = require('./utils');
|
||||
const utils = require('./utils');
|
||||
|
||||
/*
|
||||
CREATE TABLE IF NOT EXISTS `module_unpublished` (
|
||||
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS `module_unpublished` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module unpublished info';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('ModuleUnpublished', {
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
@@ -41,47 +41,47 @@ module.exports = function (sequelize, DataTypes) {
|
||||
comment: 'base info: tags, time, maintainers, description, versions',
|
||||
get: utils.JSONGetter('package'),
|
||||
set: utils.JSONSetter('package'),
|
||||
}
|
||||
},
|
||||
}, {
|
||||
tableName: 'module_unpublished',
|
||||
comment: 'module unpublished info',
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['name']
|
||||
fields: [ 'name' ],
|
||||
},
|
||||
{
|
||||
fields: ['gmt_modified']
|
||||
}
|
||||
fields: [ 'gmt_modified' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
findByName: function* (name) {
|
||||
* findByName(name) {
|
||||
return yield this.find({
|
||||
where: {
|
||||
name: name
|
||||
}
|
||||
name,
|
||||
},
|
||||
});
|
||||
},
|
||||
save: function* (name, pkg) {
|
||||
var row = yield this.find({
|
||||
* save(name, pkg) {
|
||||
let row = yield this.find({
|
||||
where: {
|
||||
name: name
|
||||
}
|
||||
name,
|
||||
},
|
||||
});
|
||||
if (row) {
|
||||
row.package = pkg;
|
||||
if (row.isDirty) {
|
||||
row = yield row.save(['package']);
|
||||
if (row.changed()) {
|
||||
row = yield row.save([ 'package' ]);
|
||||
}
|
||||
return row;
|
||||
}
|
||||
|
||||
row = this.build({
|
||||
name: name,
|
||||
name,
|
||||
package: pkg,
|
||||
});
|
||||
return yield row.save();
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -26,18 +26,18 @@ CREATE TABLE IF NOT EXISTS `npm_module_maintainer` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='npm original module maintainers';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('NpmModuleMaintainer', {
|
||||
user: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'user name'
|
||||
comment: 'user name',
|
||||
},
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'module name',
|
||||
}
|
||||
},
|
||||
}, {
|
||||
tableName: 'npm_module_maintainer',
|
||||
comment: 'npm original module maintainers',
|
||||
@@ -45,11 +45,11 @@ module.exports = function (sequelize, DataTypes) {
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['user', 'name']
|
||||
fields: [ 'user', 'name' ],
|
||||
},
|
||||
{
|
||||
fields: ['name']
|
||||
}
|
||||
fields: [ 'name' ],
|
||||
},
|
||||
],
|
||||
classMethods: require('./_module_maintainer_class_methods'),
|
||||
});
|
||||
|
||||
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS `tag` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module tag';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('Tag', {
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
@@ -49,24 +49,24 @@ module.exports = function (sequelize, DataTypes) {
|
||||
module_id: {
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
comment: 'module id'
|
||||
}
|
||||
comment: 'module id',
|
||||
},
|
||||
}, {
|
||||
tableName: 'tag',
|
||||
comment: 'module tag',
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['name', 'tag']
|
||||
fields: [ 'name', 'tag' ],
|
||||
},
|
||||
{
|
||||
fields: ['gmt_modified']
|
||||
}
|
||||
fields: [ 'gmt_modified' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
findByNameAndTag: function* (name, tag) {
|
||||
return yield this.find({ where: { name: name, tag: tag } });
|
||||
}
|
||||
}
|
||||
* findByNameAndTag(name, tag) {
|
||||
return yield this.find({ where: { name, tag } });
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/**!
|
||||
* cnpmjs.org - models/total.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
// CREATE TABLE IF NOT EXISTS `total` (
|
||||
// `name` varchar(100) NOT NULL COMMENT 'total name',
|
||||
// `gmt_modified` datetime NOT NULL COMMENT 'modified time',
|
||||
@@ -32,12 +18,12 @@
|
||||
// INSERT INTO total(name, gmt_modified) VALUES('total', now())
|
||||
// ON DUPLICATE KEY UPDATE gmt_modified=now();
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('Total', {
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
primaryKey: true,
|
||||
comment: 'total name'
|
||||
comment: 'total name',
|
||||
},
|
||||
module_delete: {
|
||||
type: DataTypes.BIGINT(20),
|
||||
@@ -97,14 +83,14 @@ module.exports = function (sequelize, DataTypes) {
|
||||
comment: 'total info',
|
||||
createdAt: false,
|
||||
classMethods: {
|
||||
init: function (callback) {
|
||||
var that = this;
|
||||
init(callback) {
|
||||
const that = this;
|
||||
that.find({
|
||||
where: { name: 'total' }
|
||||
}).then(function (row) {
|
||||
where: { name: 'total' },
|
||||
}).then(function(row) {
|
||||
if (!row) {
|
||||
that.build({name: 'total'}).save()
|
||||
.then(function () {
|
||||
that.build({ name: 'total' }).save()
|
||||
.then(function() {
|
||||
callback();
|
||||
})
|
||||
.catch(callback);
|
||||
@@ -112,7 +98,7 @@ module.exports = function (sequelize, DataTypes) {
|
||||
}
|
||||
callback();
|
||||
}).catch(callback);
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
100
models/user.js
100
models/user.js
@@ -14,8 +14,8 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var utility = require('utility');
|
||||
var utils = require('./utils');
|
||||
const utility = require('utility');
|
||||
const utils = require('./utils');
|
||||
|
||||
/*
|
||||
CREATE TABLE IF NOT EXISTS `user` (
|
||||
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS `user` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='user base info';
|
||||
*/
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
module.exports = function(sequelize, DataTypes) {
|
||||
return sequelize.define('User', {
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
@@ -83,65 +83,65 @@ module.exports = function (sequelize, DataTypes) {
|
||||
allowNull: false,
|
||||
defaultValue: false,
|
||||
comment: 'user sync from npm or not, 1: true, other: false',
|
||||
}
|
||||
},
|
||||
}, {
|
||||
tableName: 'user',
|
||||
comment: 'user base info',
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['name']
|
||||
fields: [ 'name' ],
|
||||
},
|
||||
{
|
||||
fields: ['gmt_modified']
|
||||
}
|
||||
fields: [ 'gmt_modified' ],
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
// utils
|
||||
createPasswordSha: function (password, salt) {
|
||||
createPasswordSha(password, salt) {
|
||||
return utility.sha1(password + salt);
|
||||
},
|
||||
|
||||
// read
|
||||
auth: function* (name, password) {
|
||||
var user = yield* this.findByName(name);
|
||||
* auth(name, password) {
|
||||
let user = yield this.findByName(name);
|
||||
if (user) {
|
||||
var sha = this.createPasswordSha(password, user.salt);
|
||||
const sha = this.createPasswordSha(password, user.salt);
|
||||
if (user.password_sha !== sha) {
|
||||
user = null;
|
||||
}
|
||||
}
|
||||
return user;
|
||||
},
|
||||
findByName: function* (name) {
|
||||
return yield this.find({ where: { name: name } });
|
||||
* findByName(name) {
|
||||
return yield this.find({ where: { name } });
|
||||
},
|
||||
listByNames: function* (names) {
|
||||
* listByNames(names) {
|
||||
if (!names || names.length === 0) {
|
||||
return [];
|
||||
}
|
||||
return yield this.findAll({
|
||||
where: {
|
||||
name: {
|
||||
in: names
|
||||
}
|
||||
}
|
||||
in: names,
|
||||
},
|
||||
},
|
||||
});
|
||||
},
|
||||
search: function* (query, options) {
|
||||
* search(query, options) {
|
||||
return yield this.findAll({
|
||||
where: {
|
||||
name: {
|
||||
like: query + '%'
|
||||
}
|
||||
like: query + '%',
|
||||
},
|
||||
},
|
||||
limit: options.limit
|
||||
limit: options.limit,
|
||||
});
|
||||
},
|
||||
|
||||
// write
|
||||
saveNpmUser: function* (data) {
|
||||
var user = yield* this.findByName(data.name);
|
||||
* saveNpmUser(data) {
|
||||
let user = yield this.findByName(data.name);
|
||||
if (!user) {
|
||||
user = this.build({
|
||||
isNpmUser: true,
|
||||
@@ -155,25 +155,25 @@ module.exports = function (sequelize, DataTypes) {
|
||||
user.json = data;
|
||||
user.email = data.email || '';
|
||||
user.rev = data._rev || '';
|
||||
if (user.isDirty) {
|
||||
if (user.changed()) {
|
||||
user = yield user.save();
|
||||
}
|
||||
return user;
|
||||
},
|
||||
saveCustomUser: function* (data) {
|
||||
var name = data.user.login;
|
||||
var user = yield* this.findByName(name);
|
||||
* saveCustomUser(data) {
|
||||
const name = data.user.login;
|
||||
let user = yield this.findByName(name);
|
||||
if (!user) {
|
||||
user = this.build({
|
||||
isNpmUser: false,
|
||||
name: name,
|
||||
name,
|
||||
});
|
||||
}
|
||||
|
||||
var rev = '1-' + data.user.login;
|
||||
var salt = data.salt || '0';
|
||||
var passwordSha = data.password_sha || '0';
|
||||
var ip = data.ip || '0';
|
||||
const rev = '1-' + data.user.login;
|
||||
const salt = data.salt || '0';
|
||||
const passwordSha = data.password_sha || '0';
|
||||
const ip = data.ip || '0';
|
||||
|
||||
user.isNpmUser = false;
|
||||
user.email = data.user.email;
|
||||
@@ -182,55 +182,55 @@ module.exports = function (sequelize, DataTypes) {
|
||||
user.rev = rev;
|
||||
user.salt = salt;
|
||||
user.password_sha = passwordSha;
|
||||
if (user.isDirty) {
|
||||
if (user.changed()) {
|
||||
user = yield user.save();
|
||||
}
|
||||
return user;
|
||||
},
|
||||
|
||||
// add cnpm user
|
||||
add: function* (user) {
|
||||
var roles = user.roles || [];
|
||||
* add(user) {
|
||||
let roles = user.roles || [];
|
||||
try {
|
||||
roles = JSON.stringify(roles);
|
||||
} catch (e) {
|
||||
roles = '[]';
|
||||
}
|
||||
var rev = '1-' + utility.md5(JSON.stringify(user));
|
||||
const rev = '1-' + utility.md5(JSON.stringify(user));
|
||||
|
||||
var row = this.build({
|
||||
rev: rev,
|
||||
const row = this.build({
|
||||
rev,
|
||||
name: user.name,
|
||||
email: user.email,
|
||||
salt: user.salt,
|
||||
password_sha: user.password_sha,
|
||||
ip: user.ip,
|
||||
roles: roles,
|
||||
roles,
|
||||
isNpmUser: false,
|
||||
});
|
||||
|
||||
return yield row.save();
|
||||
},
|
||||
|
||||
update: function* (user) {
|
||||
var rev = user.rev || user._rev;
|
||||
var revNo = Number(rev.split('-', 1));
|
||||
* update(user) {
|
||||
const rev = user.rev || user._rev;
|
||||
let revNo = Number(rev.split('-', 1));
|
||||
if (!revNo) {
|
||||
var err = new Error(rev + ' format error');
|
||||
const err = new Error(rev + ' format error');
|
||||
err.name = 'RevFormatError';
|
||||
err.data = {user: user};
|
||||
err.data = { user };
|
||||
throw err;
|
||||
}
|
||||
revNo++;
|
||||
var newRev = revNo + '-' + utility.md5(JSON.stringify(user));
|
||||
var roles = user.roles || [];
|
||||
const newRev = revNo + '-' + utility.md5(JSON.stringify(user));
|
||||
let roles = user.roles || [];
|
||||
try {
|
||||
roles = JSON.stringify(roles);
|
||||
} catch (e) {
|
||||
roles = '[]';
|
||||
}
|
||||
|
||||
var row = yield* this.findByName(user.name);
|
||||
const row = yield this.findByName(user.name);
|
||||
if (!row) {
|
||||
return null;
|
||||
}
|
||||
@@ -243,8 +243,8 @@ module.exports = function (sequelize, DataTypes) {
|
||||
row.roles = roles;
|
||||
row.isNpmUser = false;
|
||||
|
||||
return yield row.save(['rev', 'email', 'salt', 'password_sha', 'ip', 'roles', 'isNpmUser']);
|
||||
}
|
||||
}
|
||||
return yield row.save([ 'rev', 'email', 'salt', 'password_sha', 'ip', 'roles', 'isNpmUser' ]);
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
exports.JSONGetter = function (propertyName) {
|
||||
exports.JSONGetter = function(propertyName) {
|
||||
return function JSONGetter() {
|
||||
var value = this.getDataValue(propertyName);
|
||||
let value = this.getDataValue(propertyName);
|
||||
if (value && typeof value === 'string') {
|
||||
value = JSON.parse(value);
|
||||
}
|
||||
@@ -24,7 +24,7 @@ exports.JSONGetter = function (propertyName) {
|
||||
};
|
||||
};
|
||||
|
||||
exports.JSONSetter = function (propertyName) {
|
||||
exports.JSONSetter = function(propertyName) {
|
||||
return function JSONSetter(value) {
|
||||
if (typeof value !== 'string') {
|
||||
value = JSON.stringify(value);
|
||||
|
||||
132
package.json
132
package.json
@@ -1,77 +1,91 @@
|
||||
{
|
||||
"name": "cnpmjs.org",
|
||||
"version": "2.4.0",
|
||||
"version": "2.19.2",
|
||||
"description": "Private npm registry and web for Enterprise, base on MySQL and Simple Store Service",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"test": "make install && make jshint && make test",
|
||||
"dev": "DEBUG=cnpm* node dispatch.js",
|
||||
"test": "npm run lint && egg-bin test",
|
||||
"test-local": "egg-bin test",
|
||||
"cov": "egg-bin cov",
|
||||
"test-mysql": "DB=mysql npm run cov",
|
||||
"test-postgres": "DB_PORT=5432 DB_USER=postgres DB=postgres npm run cov",
|
||||
"test-all": "npm run lint && npm run cov && npm run test-mysql && npm run test-postgres",
|
||||
"start": "./bin/nodejsctl start && cp History.md docs/web/history.md",
|
||||
"status": "./bin/nodejsctl status",
|
||||
"stop": "./bin/nodejsctl stop"
|
||||
"stop": "./bin/nodejsctl stop",
|
||||
"autod": "autod",
|
||||
"lint": "eslint ."
|
||||
},
|
||||
"bin": {
|
||||
"cnpmjs.org": "bin/cli.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"agentkeepalive": "~1.2.0",
|
||||
"bluebird": "~2.10.2",
|
||||
"bytes": "~1.0.0",
|
||||
"cfork": "~1.3.1",
|
||||
"co": "~4.3.1",
|
||||
"co-defer": "~1.0.0",
|
||||
"co-gather": "~0.0.1",
|
||||
"co-sleep": "~0.0.1",
|
||||
"commander": "~2.6.0",
|
||||
"copy-to": "~2.0.1",
|
||||
"debug": "~2.2.0",
|
||||
"error-formater": "~1.0.3",
|
||||
"fs-cnpm": "~1.2.0",
|
||||
"agentkeepalive": "^3.0.0",
|
||||
"await-event": "^1.0.0",
|
||||
"bytes": "^2.4.0",
|
||||
"cfork": "^1.6.0",
|
||||
"changes-stream": "^1.1.0",
|
||||
"co": "^4.6.0",
|
||||
"co-defer": "^1.0.0",
|
||||
"co-gather": "^0.0.1",
|
||||
"commander": "^2.9.0",
|
||||
"copy-to": "^2.0.1",
|
||||
"debug": "^2.6.0",
|
||||
"egg": "^0.11.0",
|
||||
"error-formater": "^1.0.3",
|
||||
"fs-cnpm": "^1.2.0",
|
||||
"giturl": "^1.0.0",
|
||||
"graceful": "~1.0.0",
|
||||
"gravatar": "~1.1.0",
|
||||
"humanize-ms": "~1.0.1",
|
||||
"humanize-number": "~0.0.2",
|
||||
"is-type-of": "~0.3.1",
|
||||
"kcors": "~1.0.1",
|
||||
"koa": "~1.1.0",
|
||||
"koa-limit": "~1.0.2",
|
||||
"koa-markdown": "~2.0.1",
|
||||
"koa-middlewares": "~2.1.0",
|
||||
"koa-mock": "~1.1.4",
|
||||
"koa-safe-jsonp": "~0.3.0",
|
||||
"markdown-it": "~3.0.6",
|
||||
"mime": "~1.3.4",
|
||||
"mini-logger": "~1.0.0",
|
||||
"mkdirp": "~0.5.0",
|
||||
"moment": "~2.10.6",
|
||||
"mysql": "~2.5.4",
|
||||
"nodemailer": "~1.3.0",
|
||||
"semver": "~4.2.0",
|
||||
"sequelize": "~2.0.1",
|
||||
"thunkify-wrap": "~1.0.4",
|
||||
"treekill": "~1.0.0",
|
||||
"tunnel-agent": "^0.4.0",
|
||||
"urllib": "~2.2.2",
|
||||
"utility": "~1.5.0",
|
||||
"xss": "~0.1.20"
|
||||
"graceful": "^1.0.1",
|
||||
"gravatar": "^1.6.0",
|
||||
"humanize-ms": "^1.2.0",
|
||||
"humanize-number": "^0.0.2",
|
||||
"is-type-of": "^1.0.0",
|
||||
"kcors": "^1.3.1",
|
||||
"ko-sleep": "^1.0.2",
|
||||
"koa": "^1.2.4",
|
||||
"koa-limit": "^1.0.2",
|
||||
"koa-markdown": "^2.0.1",
|
||||
"koa-maxrequests": "^1.0.0",
|
||||
"koa-middlewares": "^2.1.0",
|
||||
"koa-mock": "^1.6.1",
|
||||
"koa-router": "^3.8.0",
|
||||
"koa-safe-jsonp": "^0.3.1",
|
||||
"markdown-it": "^8.2.2",
|
||||
"mime": "^1.3.4",
|
||||
"mini-logger": "^1.1.1",
|
||||
"mkdirp": "^0.5.1",
|
||||
"moment": "^2.17.1",
|
||||
"mysql": "^2.13.0",
|
||||
"mz": "^2.6.0",
|
||||
"nodemailer": "^1.11.0",
|
||||
"normalize-registry-metadata": "^1.1.2",
|
||||
"semver": "^5.3.0",
|
||||
"sequelize": "^3.30.2",
|
||||
"thunkify-wrap": "^1.0.4",
|
||||
"treekill": "^1.0.0",
|
||||
"tunnel-agent": "^0.4.3",
|
||||
"urllib": "^2.20.0",
|
||||
"utility": "^1.9.0",
|
||||
"xss": "^0.3.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"autod": "*",
|
||||
"chunkstream": "*",
|
||||
"co-mocha": "*",
|
||||
"autod": "^2.7.1",
|
||||
"autod-egg": "^1.0.0",
|
||||
"chunkstream": "^0.0.1",
|
||||
"contributors": "*",
|
||||
"istanbul": "*",
|
||||
"jshint": "*",
|
||||
"mm": "*",
|
||||
"mocha": "*",
|
||||
"node-dev": "*",
|
||||
"pedding": "*",
|
||||
"pg": "~4.4.2",
|
||||
"pg-hstore": "~2.3.1",
|
||||
"should": "~7.1.0",
|
||||
"should-http": "*",
|
||||
"egg-bin": "^2.0.2",
|
||||
"egg-mock": "^2.4.0",
|
||||
"eslint": "^3.15.0",
|
||||
"eslint-config-egg": "^3.2.0",
|
||||
"mm": "^2.1.0",
|
||||
"pedding": "^1.1.0",
|
||||
"pg": "5",
|
||||
"pg-hstore": "2",
|
||||
"runscript": "^1.2.0",
|
||||
"should": "^11.2.0",
|
||||
"sqlite3": "*",
|
||||
"supertest": "*"
|
||||
"supertest": "2"
|
||||
},
|
||||
"homepage": "https://github.com/cnpm/cnpmjs.org",
|
||||
"repository": {
|
||||
@@ -91,10 +105,10 @@
|
||||
"registry"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 2.0.0"
|
||||
"node": ">= 6.9.0"
|
||||
},
|
||||
"author": [
|
||||
"fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)",
|
||||
"fengmk2 <fengmk2@gmail.com> (https://fengmk2.com)",
|
||||
"dead_horse <dead_horse@qq.com> (http://deadhorse.me)"
|
||||
],
|
||||
"license": "MIT"
|
||||
|
||||
@@ -453,6 +453,7 @@
|
||||
font-size: 85%;
|
||||
line-height: 1.45;
|
||||
background-color: #f7f7f7;
|
||||
color:#333;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
|
||||
@@ -201,6 +201,12 @@ pre code {
|
||||
font-size: 28px;
|
||||
line-height: 48px;
|
||||
}
|
||||
|
||||
.pack-ver a.badge-link {
|
||||
font-size: inherit;
|
||||
border-bottom: 0px;
|
||||
}
|
||||
|
||||
.pack-lastup {
|
||||
font-size: 14px;
|
||||
display: inline-block;
|
||||
@@ -292,3 +298,6 @@ pre code {
|
||||
height: 30px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
ul, ol{
|
||||
list-style: initial;
|
||||
}
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
$(function () {
|
||||
$(function() {
|
||||
function humanize(n, options) {
|
||||
options = options || {};
|
||||
var d = options.delimiter || ',';
|
||||
var s = options.separator || '.';
|
||||
const d = options.delimiter || ',';
|
||||
const s = options.separator || '.';
|
||||
n = n.toString().split('.');
|
||||
n[0] = n[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1' + d);
|
||||
return n.join(s);
|
||||
}
|
||||
|
||||
$.getJSON('/total', function (data) {
|
||||
$.getJSON('/total', function(data) {
|
||||
$('#total-packages').html(humanize(data.doc_count));
|
||||
$('#total-versions').html(humanize(data.doc_version_count));
|
||||
$('#total-deletes').html(humanize(data.doc_del_count));
|
||||
|
||||
var downloads = $('table.downloads');
|
||||
const downloads = $('table.downloads');
|
||||
downloads.find('td.count:eq(3)').html(humanize(data.download.today));
|
||||
downloads.find('td.count:eq(4)').html(humanize(data.download.thisweek));
|
||||
downloads.find('td.count:eq(5)').html(humanize(data.download.thismonth));
|
||||
|
||||
@@ -1,54 +1,42 @@
|
||||
/**!
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com>
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
"use strict";
|
||||
const limit = require('../middleware/limit');
|
||||
const login = require('../middleware/login');
|
||||
const publishable = require('../middleware/publishable');
|
||||
const syncByInstall = require('../middleware/sync_by_install');
|
||||
const editable = require('../middleware/editable');
|
||||
const existsPackage = require('../middleware/exists_package');
|
||||
const unpublishable = require('../middleware/unpublishable');
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
const showTotal = require('../controllers/total');
|
||||
|
||||
var limit = require('../middleware/limit');
|
||||
var login = require('../middleware/login');
|
||||
var publishable = require('../middleware/publishable');
|
||||
var syncByInstall = require('../middleware/sync_by_install');
|
||||
var editable = require('../middleware/editable');
|
||||
var existsPackage = require('../middleware/exists_package');
|
||||
const listAll = require('../controllers/registry/package/list_all');
|
||||
const listShorts = require('../controllers/registry/package/list_shorts');
|
||||
const listSince = require('../controllers/registry/package/list_since');
|
||||
const listAllVersions = require('../controllers/registry/package/list');
|
||||
const listDependents = require('../controllers/registry/package/list_dependents');
|
||||
const getOneVersion = require('../controllers/registry/package/show');
|
||||
const savePackage = require('../controllers/registry/package/save');
|
||||
const tag = require('../controllers/registry/package/tag');
|
||||
const removePackage = require('../controllers/registry/package/remove');
|
||||
const removeOneVersion = require('../controllers/registry/package/remove_version');
|
||||
const updatePackage = require('../controllers/registry/package/update');
|
||||
const downloadPackage = require('../controllers/registry/package/download');
|
||||
const downloadTotal = require('../controllers/registry/package/download_total');
|
||||
const listPackagesByUser = require('../controllers/registry/package/list_by_user');
|
||||
|
||||
var showTotal = require('../controllers/total');
|
||||
const addUser = require('../controllers/registry/user/add');
|
||||
const showUser = require('../controllers/registry/user/show');
|
||||
const updateUser = require('../controllers/registry/user/update');
|
||||
|
||||
var listAll = require('../controllers/registry/package/list_all');
|
||||
var listShorts = require('../controllers/registry/package/list_shorts');
|
||||
var listSince = require('../controllers/registry/package/list_since');
|
||||
var listAllVersions = require('../controllers/registry/package/list');
|
||||
var listDependents = require('../controllers/registry/package/list_dependents');
|
||||
var getOneVersion = require('../controllers/registry/package/show');
|
||||
var savePackage = require('../controllers/registry/package/save');
|
||||
var tag = require('../controllers/registry/package/tag');
|
||||
var removePackage = require('../controllers/registry/package/remove');
|
||||
var removeOneVersion = require('../controllers/registry/package/remove_version');
|
||||
var updatePackage = require('../controllers/registry/package/update');
|
||||
var downloadPackage = require('../controllers/registry/package/download');
|
||||
var downloadTotal = require('../controllers/registry/package/download_total');
|
||||
var listPackagesByUser = require('../controllers/registry/package/list_by_user');
|
||||
|
||||
var addUser = require('../controllers/registry/user/add');
|
||||
var showUser = require('../controllers/registry/user/show');
|
||||
var updateUser = require('../controllers/registry/user/update');
|
||||
|
||||
var sync = require('../controllers/sync');
|
||||
var userPackage = require('../controllers/registry/user_package');
|
||||
var tags = require('../controllers/registry/package/dist_tag');
|
||||
const sync = require('../controllers/sync');
|
||||
const userPackage = require('../controllers/registry/user_package');
|
||||
const tags = require('../controllers/registry/package/dist_tag');
|
||||
|
||||
function routes(app) {
|
||||
|
||||
function* jsonp(next) {
|
||||
yield* next;
|
||||
yield next;
|
||||
if (this.body) {
|
||||
this.jsonp = this.body;
|
||||
}
|
||||
@@ -65,9 +53,9 @@ function routes(app) {
|
||||
|
||||
// module
|
||||
// scope package: params: [$name]
|
||||
app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)$/, syncByInstall, listAllVersions);
|
||||
app.get(/^\/(@[\w\-\.]+\/[^\/]+)$/, syncByInstall, listAllVersions);
|
||||
// scope package: params: [$name, $version]
|
||||
app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/([\w\.\-]+)$/, syncByInstall, getOneVersion);
|
||||
app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/([^\/]+)$/, syncByInstall, getOneVersion);
|
||||
|
||||
app.get('/:name', syncByInstall, listAllVersions);
|
||||
app.get('/:name/:version', syncByInstall, getOneVersion);
|
||||
@@ -94,16 +82,16 @@ function routes(app) {
|
||||
|
||||
// delete tarball and remove one version
|
||||
app.delete(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/download\/(@[\w\-\.]+\/[\w\-\.]+)\/\-rev\/([\w\-\.]+)$/,
|
||||
login, publishable, editable, removeOneVersion);
|
||||
app.delete('/:name/download/:filename/-rev/:rev', login, publishable, editable, removeOneVersion);
|
||||
login, unpublishable, removeOneVersion);
|
||||
app.delete('/:name/download/:filename/-rev/:rev', login, unpublishable, removeOneVersion);
|
||||
|
||||
// update module, unpublish will PUT this
|
||||
app.put(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/\-rev\/([\w\-\.]+)$/, login, publishable, editable, updatePackage);
|
||||
app.put('/:name/-rev/:rev', login, publishable, editable, updatePackage);
|
||||
|
||||
// remove all versions
|
||||
app.delete(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/\-rev\/([\w\-\.]+)$/, login, publishable, editable, removePackage);
|
||||
app.delete('/:name/-rev/:rev', login, publishable, editable, removePackage);
|
||||
app.delete(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/\-rev\/([\w\-\.]+)$/, login, unpublishable, removePackage);
|
||||
app.delete('/:name/-rev/:rev', login, unpublishable, removePackage);
|
||||
|
||||
// try to create a new user
|
||||
// https://registry.npmjs.org/-/user/org.couchdb.user:fengmk2
|
||||
@@ -117,6 +105,7 @@ function routes(app) {
|
||||
|
||||
// download times
|
||||
app.get('/downloads/range/:range/:name', downloadTotal);
|
||||
app.get(/^\/downloads\/range\/([^\/]+)\/(@[\w\-\.]+\/[\w\-\.]+)$/, downloadTotal);
|
||||
app.get('/downloads/range/:range', downloadTotal);
|
||||
|
||||
// GET /-/package/:pkg/dependents
|
||||
|
||||
@@ -1,29 +1,14 @@
|
||||
/**!
|
||||
* cnpmjs.org - routes/web.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com>
|
||||
* fengmk2 <m@fengmk2.com> (http://fengmk2.com)
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var showPackage = require('../controllers/web/package/show');
|
||||
var searchPackage = require('../controllers/web/package/search');
|
||||
var searchRange = require('../controllers/web/package/search_range');
|
||||
var listPrivates = require('../controllers/web/package/list_privates');
|
||||
var showSync = require('../controllers/web/show_sync');
|
||||
var showUser = require('../controllers/web/user/show');
|
||||
var sync = require('../controllers/sync');
|
||||
var showTotal = require('../controllers/total');
|
||||
var badge = require('../controllers/web/badge');
|
||||
const showPackage = require('../controllers/web/package/show');
|
||||
const searchPackage = require('../controllers/web/package/search');
|
||||
const searchRange = require('../controllers/web/package/search_range');
|
||||
const listPrivates = require('../controllers/web/package/list_privates');
|
||||
const showSync = require('../controllers/web/show_sync');
|
||||
const showUser = require('../controllers/web/user/show');
|
||||
const sync = require('../controllers/sync');
|
||||
const showTotal = require('../controllers/total');
|
||||
const badge = require('../controllers/web/badge');
|
||||
|
||||
function routes(app) {
|
||||
app.get('/total', showTotal);
|
||||
|
||||
@@ -1,53 +1,40 @@
|
||||
/**!
|
||||
* cnpmjs.org - servers/registry.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com>
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
global.Promise = require('bluebird');
|
||||
var koa = require('koa');
|
||||
var app = module.exports = koa();
|
||||
var http = require('http');
|
||||
var middlewares = require('koa-middlewares');
|
||||
var routes = require('../routes/registry');
|
||||
var logger = require('../common/logger');
|
||||
var config = require('../config');
|
||||
var block = require('../middleware/block');
|
||||
var auth = require('../middleware/auth');
|
||||
var staticCache = require('../middleware/static');
|
||||
var notFound = require('../middleware/registry_not_found');
|
||||
var cors = require('kcors');
|
||||
var proxyToNpm = require('../middleware/proxy_to_npm');
|
||||
const koa = require('koa');
|
||||
let app = module.exports = koa();
|
||||
const http = require('http');
|
||||
const middlewares = require('koa-middlewares');
|
||||
const router = require('koa-router');
|
||||
const routes = require('../routes/registry');
|
||||
const logger = require('../common/logger');
|
||||
const config = require('../config');
|
||||
const block = require('../middleware/block');
|
||||
const auth = require('../middleware/auth');
|
||||
const staticCache = require('../middleware/static');
|
||||
const notFound = require('../middleware/registry_not_found');
|
||||
const cors = require('kcors');
|
||||
const proxyToNpm = require('../middleware/proxy_to_npm');
|
||||
const maxrequests = require('koa-maxrequests');
|
||||
|
||||
app.use(maxrequests());
|
||||
app.use(block());
|
||||
middlewares.jsonp(app);
|
||||
app.use(middlewares.rt({headerName: 'X-ReadTime'}));
|
||||
app.use(middlewares.rt({ headerName: 'X-ReadTime' }));
|
||||
app.use(middlewares.rewrite('/favicon.ico', '/favicon.png'));
|
||||
app.use(staticCache);
|
||||
|
||||
app.keys = ['todokey', config.sessionSecret];
|
||||
app.keys = [ 'todokey', config.sessionSecret ];
|
||||
app.proxy = true;
|
||||
app.use(middlewares.bodyParser({jsonLimit: config.jsonLimit}));
|
||||
app.use(middlewares.bodyParser({ jsonLimit: config.jsonLimit }));
|
||||
app.use(cors({
|
||||
allowMethods: 'GET,HEAD'
|
||||
allowMethods: 'GET,HEAD',
|
||||
}));
|
||||
app.use(auth());
|
||||
app.use(proxyToNpm());
|
||||
app.use(notFound);
|
||||
|
||||
if (config.enableCompress) {
|
||||
app.use(middlewares.compress({threshold: 150}));
|
||||
app.use(middlewares.compress({ threshold: 150 }));
|
||||
}
|
||||
app.use(middlewares.conditional());
|
||||
app.use(middlewares.etag());
|
||||
@@ -56,14 +43,14 @@ app.use(middlewares.etag());
|
||||
* Routes
|
||||
*/
|
||||
|
||||
app.use(middlewares.router(app));
|
||||
app.use(router(app));
|
||||
routes(app);
|
||||
|
||||
/**
|
||||
* Error handler
|
||||
*/
|
||||
|
||||
app.on('error', function (err, ctx) {
|
||||
app.on('error', function(err, ctx) {
|
||||
console.log(err);
|
||||
console.log(err.stack);
|
||||
err.url = err.url || ctx.request.url;
|
||||
|
||||
@@ -1,87 +1,74 @@
|
||||
/**!
|
||||
* cnpmjs.org - servers/web.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com>
|
||||
* fengmk2 <m@fengmk2.com> (http://fengmk2.com)
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
"use strict";
|
||||
const opensearch = require('../middleware/opensearch');
|
||||
const notFound = require('../middleware/web_not_found');
|
||||
const staticCache = require('../middleware/static');
|
||||
const middlewares = require('koa-middlewares');
|
||||
const router = require('koa-router');
|
||||
const markdownMiddleware = require('koa-markdown');
|
||||
const block = require('../middleware/block');
|
||||
const logger = require('../common/logger');
|
||||
const renderMarkdown = require('../common/markdown').render;
|
||||
const auth = require('../middleware/auth');
|
||||
const proxyToNpm = require('../middleware/proxy_to_npm');
|
||||
const routes = require('../routes/web');
|
||||
const config = require('../config');
|
||||
const jsonp = require('koa-safe-jsonp');
|
||||
const path = require('path');
|
||||
const http = require('http');
|
||||
const koa = require('koa');
|
||||
const fs = require('fs');
|
||||
const maxrequests = require('koa-maxrequests');
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
global.Promise = require('bluebird');
|
||||
var opensearch = require('../middleware/opensearch');
|
||||
var notFound = require('../middleware/web_not_found');
|
||||
var staticCache = require('../middleware/static');
|
||||
var middlewares = require('koa-middlewares');
|
||||
var markdownMiddleware = require('koa-markdown');
|
||||
var block = require('../middleware/block');
|
||||
var logger = require('../common/logger');
|
||||
var renderMarkdown = require('../common/markdown').render;
|
||||
var auth = require('../middleware/auth');
|
||||
var proxyToNpm = require('../middleware/proxy_to_npm');
|
||||
var routes = require('../routes/web');
|
||||
var config = require('../config');
|
||||
var jsonp = require('koa-safe-jsonp');
|
||||
var path = require('path');
|
||||
var http = require('http');
|
||||
var koa = require('koa');
|
||||
var fs = require('fs');
|
||||
|
||||
var app = koa();
|
||||
let app = koa();
|
||||
|
||||
jsonp(app);
|
||||
|
||||
var rootdir = path.dirname(__dirname);
|
||||
const rootdir = path.dirname(__dirname);
|
||||
|
||||
app.use(maxrequests());
|
||||
app.use(block());
|
||||
app.use(middlewares.rt({headerName: 'X-ReadTime'}));
|
||||
app.use(middlewares.rt({ headerName: 'X-ReadTime' }));
|
||||
app.use(middlewares.rewrite('/favicon.ico', '/favicon.png'));
|
||||
app.use(staticCache);
|
||||
|
||||
if (config.pagemock) {
|
||||
app.use(require('koa-mock')({
|
||||
datadir: path.join(rootdir, 'test', 'mocks')
|
||||
datadir: path.join(rootdir, 'test', 'mocks'),
|
||||
}));
|
||||
}
|
||||
|
||||
app.use(opensearch);
|
||||
app.keys = ['todokey', config.sessionSecret];
|
||||
app.keys = [ 'todokey', config.sessionSecret ];
|
||||
app.proxy = true;
|
||||
app.use(proxyToNpm({
|
||||
isWeb: true
|
||||
isWeb: true,
|
||||
}));
|
||||
app.use(middlewares.bodyParser());
|
||||
app.use(auth());
|
||||
app.use(notFound);
|
||||
|
||||
if (config.enableCompress) {
|
||||
app.use(middlewares.compress({threshold: 150}));
|
||||
app.use(middlewares.compress({ threshold: 150 }));
|
||||
}
|
||||
|
||||
app.use(middlewares.conditional());
|
||||
app.use(middlewares.etag());
|
||||
|
||||
var viewDir = path.join(rootdir, 'view', 'web');
|
||||
var docDir = path.join(rootdir, 'docs', 'web');
|
||||
const viewDir = path.join(rootdir, 'view', 'web');
|
||||
const docDir = path.join(rootdir, 'docs', 'web');
|
||||
|
||||
var layoutFile = path.join(viewDir, '_layout.html');
|
||||
var footer = config.customFooter || fs.readFileSync(path.join(viewDir, 'footer.html'), 'utf8');
|
||||
var layout = fs.readFileSync(path.join(viewDir, 'layout.html'), 'utf8')
|
||||
const layoutFile = path.join(viewDir, '_layout.html');
|
||||
const footer = config.customFooter || fs.readFileSync(path.join(viewDir, 'footer.html'), 'utf8');
|
||||
const layout = fs.readFileSync(path.join(viewDir, 'layout.html'), 'utf8')
|
||||
.replace('{{footer}}', footer)
|
||||
.replace('{{logoURL}}', config.logoURL)
|
||||
.replace('{{adBanner}}', config.adBanner || '');
|
||||
fs.writeFileSync(layoutFile, layout);
|
||||
|
||||
// custom web readme home page support
|
||||
var readmeFile = path.join(docDir, '_readme.md');
|
||||
var readmeContent;
|
||||
const readmeFile = path.join(docDir, '_readme.md');
|
||||
let readmeContent;
|
||||
if (config.customReadmeFile) {
|
||||
readmeContent = fs.readFileSync(config.customReadmeFile, 'utf8');
|
||||
} else {
|
||||
@@ -97,13 +84,13 @@ app.use(markdownMiddleware({
|
||||
bodyHolder: '<%- locals.body %>',
|
||||
indexName: '_readme',
|
||||
cache: true,
|
||||
render: function (content) {
|
||||
render(content) {
|
||||
return renderMarkdown(content, false);
|
||||
},
|
||||
}));
|
||||
|
||||
var locals = {
|
||||
config: config
|
||||
const locals = {
|
||||
config,
|
||||
};
|
||||
|
||||
middlewares.ejs(app, {
|
||||
@@ -112,20 +99,21 @@ middlewares.ejs(app, {
|
||||
layout: '_layout',
|
||||
cache: config.viewCache,
|
||||
debug: config.debug,
|
||||
locals: locals
|
||||
locals,
|
||||
});
|
||||
|
||||
/**
|
||||
* Routes
|
||||
*/
|
||||
app.use(middlewares.router(app));
|
||||
|
||||
app.use(router(app));
|
||||
routes(app);
|
||||
|
||||
/**
|
||||
* Error handler
|
||||
*/
|
||||
|
||||
app.on('error', function (err, ctx) {
|
||||
app.on('error', function(err, ctx) {
|
||||
err.url = err.url || ctx.request.url;
|
||||
console.log(err);
|
||||
console.log(err.stack);
|
||||
|
||||
@@ -1,25 +1,11 @@
|
||||
/**!
|
||||
* cnpmjs.org - services/common.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var config = require('../config');
|
||||
var isPrivateScopedPackage = require('../lib/common').isPrivateScopedPackage;
|
||||
const config = require('../config');
|
||||
const isPrivateScopedPackage = require('../lib/common').isPrivateScopedPackage;
|
||||
|
||||
config.privatePackages = config.privatePackages || [];
|
||||
|
||||
exports.isPrivatePackage = function (name) {
|
||||
exports.isPrivatePackage = function(name) {
|
||||
if (isPrivateScopedPackage(name)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user