Compare commits
347 Commits
2.0.0-rc.1
...
3.0.0-alph
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
49bb2a81f5 | ||
|
|
65c0ad8eb8 | ||
|
|
345d6d5dfc | ||
|
|
9656111ef4 | ||
|
|
c9395b983c | ||
|
|
ccd05af9d0 | ||
|
|
0e5586f4f4 | ||
|
|
00fc931291 | ||
|
|
81ce21bfbf | ||
|
|
707bf663e5 | ||
|
|
abfd997d0c | ||
|
|
358b41bc0f | ||
|
|
d984cd9177 | ||
|
|
90b5368a05 | ||
|
|
842bb7fa11 | ||
|
|
f55c6ba1c6 | ||
|
|
cd21e800fa | ||
|
|
8cf3344b68 | ||
|
|
373b535bc5 | ||
|
|
2daa34faab | ||
|
|
10170537dd | ||
|
|
598dc08ef6 | ||
|
|
f0238f6063 | ||
|
|
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 | ||
|
|
82395fdc33 | ||
|
|
ced4887269 | ||
|
|
8f96a5a57b | ||
|
|
f6e79ff5e7 | ||
|
|
e932f16424 | ||
|
|
622c93c3fe | ||
|
|
ccf3e8a83c | ||
|
|
2069b4334c | ||
|
|
ef84cedd79 | ||
|
|
ba07f87ee0 | ||
|
|
10cbe70378 | ||
|
|
244ce60857 | ||
|
|
97a4f6cd92 | ||
|
|
10197ef2aa | ||
|
|
d2e7350b27 | ||
|
|
9a4a7c6bf0 | ||
|
|
550024176f | ||
|
|
90485d33dd | ||
|
|
02d9bd923e | ||
|
|
a256e044c5 | ||
|
|
a194fc8f3c | ||
|
|
0f61c71e2b | ||
|
|
2acfc52057 | ||
|
|
e144506634 | ||
|
|
cc9b547c86 | ||
|
|
e8bea69a4d | ||
|
|
cd36984a56 | ||
|
|
ec00eeee75 | ||
|
|
571aea5277 | ||
|
|
9e9fd84e12 | ||
|
|
dbe0f96855 | ||
|
|
66f17619e6 | ||
|
|
1d491a244b | ||
|
|
bbb6a59441 | ||
|
|
76e0563308 | ||
|
|
5e969cc305 | ||
|
|
9d886b0599 | ||
|
|
cd2e96f460 | ||
|
|
f86734674d | ||
|
|
e2c37d312f | ||
|
|
689e7e1c08 | ||
|
|
cd6f78d91b | ||
|
|
b832c91d21 | ||
|
|
646c830a68 | ||
|
|
e543f8578b | ||
|
|
5ff7e2867f | ||
|
|
98e8e7d498 | ||
|
|
b7eb9f8374 | ||
|
|
12a8eff1f6 | ||
|
|
9156be88a9 | ||
|
|
cebbf7dda2 | ||
|
|
ea226e8ad6 | ||
|
|
eb3b79cae2 | ||
|
|
49b70b4b4d | ||
|
|
af724960c2 | ||
|
|
79797376d3 | ||
|
|
7fd264440e | ||
|
|
1982b9404e | ||
|
|
4bea6f4e5f | ||
|
|
3dd04b6aac | ||
|
|
ec605efc9c | ||
|
|
7f27447dac | ||
|
|
a2c151f246 | ||
|
|
35efc132b3 | ||
|
|
dd37527651 | ||
|
|
a82e772097 | ||
|
|
70fb543e7a | ||
|
|
bbfc3e57db | ||
|
|
9b9ec50ccf | ||
|
|
4098d966b8 | ||
|
|
6e7d528c9f | ||
|
|
701abe831f | ||
|
|
449deab2ed | ||
|
|
20f1ab3af8 | ||
|
|
a932b6487d | ||
|
|
8f05a6e8b9 | ||
|
|
4a91795288 | ||
|
|
de72396cd2 | ||
|
|
7f48d45e0d | ||
|
|
553c1daf85 | ||
|
|
084b83e8d7 | ||
|
|
05e5ac86ba | ||
|
|
2a530a3d6e | ||
|
|
bde9de9f90 | ||
|
|
d538658be9 | ||
|
|
81a010bc53 | ||
|
|
7f2c5725e5 | ||
|
|
7f89b3be92 | ||
|
|
1c6eb50e05 | ||
|
|
aa8d4ac850 | ||
|
|
e0eeefa43e | ||
|
|
662b91ea9a | ||
|
|
cc70f9e6b1 | ||
|
|
7312d761ca | ||
|
|
d5c0e07c1c | ||
|
|
e108b4804d | ||
|
|
92c218d755 | ||
|
|
df2a974b2c | ||
|
|
7fc1a8411c | ||
|
|
0759328140 | ||
|
|
3fc2ea7f25 | ||
|
|
2f2794785f | ||
|
|
ea1f253624 | ||
|
|
b25eaaf73e | ||
|
|
0b0164cbf4 | ||
|
|
8a727c351d | ||
|
|
2c6a08908d | ||
|
|
9a7e94f7a4 | ||
|
|
9a2fba42c6 | ||
|
|
ab8d6bfd19 | ||
|
|
619f4310e8 | ||
|
|
41eea6747d | ||
|
|
4e3a50f3bb | ||
|
|
e5a9a22f86 | ||
|
|
eb66d8958f | ||
|
|
8a0dcb5063 | ||
|
|
cba9d5dbbb | ||
|
|
233b736401 | ||
|
|
58d72bde22 |
@@ -2,3 +2,6 @@ node_modules/
|
||||
coverage/
|
||||
.tmp/
|
||||
.git/
|
||||
tools/
|
||||
public/
|
||||
test/
|
||||
|
||||
13
.travis.yml
13
.travis.yml
@@ -1,6 +1,11 @@
|
||||
sudo: false
|
||||
language: node_js
|
||||
node_js:
|
||||
- '0.11.14'
|
||||
before_install: "npm install --build-from-source"
|
||||
script: "make test-travis-all"
|
||||
after_script: "npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
|
||||
- '4'
|
||||
- '6'
|
||||
- '7'
|
||||
addons:
|
||||
- postgresql: '9.3'
|
||||
script: 'make test-travis-all'
|
||||
after_script:
|
||||
- 'npm i codecov && codecov'
|
||||
|
||||
5
AUTHORS
5
AUTHORS
@@ -5,3 +5,8 @@ dead-horse <dead_horse@qq.com> (https://github.com/dead-horse)
|
||||
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)
|
||||
|
||||
|
||||
416
History.md
416
History.md
@@ -1,4 +1,420 @@
|
||||
|
||||
3.0.0-alpha.6 / 2017-05-18
|
||||
==================
|
||||
|
||||
* feat: add globalHook on config (#1177)
|
||||
* fix: TypeError caused by invalid engines property (#1151)
|
||||
* test: add new test for application/vnd.npm.install-v1+json request
|
||||
|
||||
3.0.0-alpha.5 / 2017-04-14
|
||||
==================
|
||||
|
||||
* fix: should auto sync missing deprecated property (#1167)
|
||||
|
||||
3.0.0-alpha.4 / 2017-04-12
|
||||
==================
|
||||
|
||||
* fix: add missing deprecated on abbreviated meta (#1165)
|
||||
|
||||
3.0.0-alpha.2 / 2017-03-27
|
||||
==================
|
||||
|
||||
* fix: only get from package_readme table
|
||||
|
||||
3.0.0-alpha.1 / 2017-03-27
|
||||
==================
|
||||
|
||||
* chore: start 3.x
|
||||
* fix: ignore sync npm registry status 502
|
||||
* feat: remove readme from package
|
||||
* feat: [BREAKING_CHANGE] support abbreviated meta
|
||||
|
||||
2.19.4 / 2017-03-26
|
||||
==================
|
||||
|
||||
* feat: need to sync sourceNpmRegistry also (#1153)
|
||||
* docs: change user.json to utf8mb4
|
||||
|
||||
2.19.3 / 2017-02-22
|
||||
==================
|
||||
|
||||
* fix: should get package from orginal registry when package is unpublished (#1130)
|
||||
|
||||
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
|
||||
==================
|
||||
|
||||
* feat(registry): add package's dependents api
|
||||
* fix: show package's dependents
|
||||
* chore(package): update utility to version 1.5.0
|
||||
* chore(package): update bluebird to version 2.10.2
|
||||
|
||||
2.3.1 / 2015-10-15
|
||||
==================
|
||||
|
||||
* refactor: remove gnode
|
||||
* deps: upgrade giturl
|
||||
* Some fixes
|
||||
|
||||
2.3.0 / 2015-10-15
|
||||
==================
|
||||
|
||||
* Add dev dependencies.
|
||||
* Package page fix.
|
||||
* refactor: add more sync log
|
||||
* Add mock data.
|
||||
* refactor: add more sync log
|
||||
* Fix sidebar overflow.
|
||||
* 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
|
||||
* chore(package): update should to version 7.1.0
|
||||
* chore(package): update koa to version 1.1.0
|
||||
* Remove default adBanner.
|
||||
* Package pages.
|
||||
* Common styles.
|
||||
* search page.
|
||||
* Sync page.
|
||||
* Profile page antd style.
|
||||
* Unpublished pkg page style.
|
||||
* Add page title for unpubed pkg.
|
||||
* Index page style use antd.
|
||||
* chore(package): update pg to version 4.4.2
|
||||
* chore(package): update cfork to version 1.3.1
|
||||
* chore(package): update moment to version 2.10.6
|
||||
* feat(badge): Use qiniu cdn
|
||||
|
||||
2.2.1 / 2015-09-30
|
||||
==================
|
||||
|
||||
* test: use istanbul
|
||||
* pref: move out try/catch block
|
||||
* fix: support nfs.url is generator
|
||||
|
||||
2.2.0 / 2015-09-29
|
||||
==================
|
||||
|
||||
* feat: list packages by username
|
||||
* test: use codecov
|
||||
* feat(badge): support custom subject
|
||||
* fix(sync): add recover logic
|
||||
* feat(sync): add sync scripts
|
||||
|
||||
2.1.5 / 2015-09-05
|
||||
==================
|
||||
|
||||
* fix: only sync update packages
|
||||
|
||||
2.1.4 / 2015-09-05
|
||||
==================
|
||||
|
||||
* fix: support new array and old map format both
|
||||
* fix: /-/all/since had been redirect to /-/all/static/today.json
|
||||
* fix(list): let koa-etag to caculate the etag
|
||||
|
||||
2.1.3 / 2015-08-18
|
||||
==================
|
||||
|
||||
* fix: sync public scope package download url is wrong
|
||||
* fix: default registry change to taobao registry
|
||||
|
||||
2.1.2 / 2015-08-09
|
||||
==================
|
||||
|
||||
* fix(syncer): sync worker pkg null bug
|
||||
* feat(web): add downloads badge
|
||||
|
||||
2.1.1 / 2015-07-27
|
||||
==================
|
||||
|
||||
* fix: fix private scope package detect
|
||||
* fix: dont sync if upstream is npm registry
|
||||
* fix(sync): support sync public scope package
|
||||
* test: fix fails tests
|
||||
* fix: ignore 503 server error
|
||||
* fix: ignore sync 503 server error
|
||||
|
||||
2.1.0 / 2015-07-08
|
||||
==================
|
||||
|
||||
* feat(web): search support jsonp
|
||||
* fix function name
|
||||
|
||||
2.0.0 / 2015-05-11
|
||||
==================
|
||||
|
||||
* fix: real download as stream
|
||||
* add custom ad banner config
|
||||
* add sponsors: ucloud.cn
|
||||
* fix small typo
|
||||
* feat(urllib): support http_proxy
|
||||
* force using https links
|
||||
|
||||
2.0.0-rc.15 / 2015-02-15
|
||||
==================
|
||||
|
||||
* fix(markdown): filter xss after markdown render
|
||||
* feat(database): support PostgreSQL
|
||||
|
||||
2.0.0-rc.14 / 2015-02-14
|
||||
==================
|
||||
|
||||
* feat: support always-auth
|
||||
* fix mysql select args = [] bug
|
||||
* 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](https://github.com/cnpm/cnpmjs.org/issues/594)
|
||||
|
||||
2.0.0-rc.13 / 2015-02-04
|
||||
==================
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
73
Makefile
73
Makefile
@@ -1,35 +1,30 @@
|
||||
TESTS = $(shell ls -S `find test -type f -name "*.test.js" -print`)
|
||||
REPORTER = spec
|
||||
TIMEOUT = 30000
|
||||
TIMEOUT = 60000
|
||||
MOCHA_OPTS =
|
||||
REGISTRY = --registry=https://registry.npm.taobao.org
|
||||
DB = sqlite
|
||||
|
||||
install:
|
||||
@npm install --build-from-source $(REGISTRY) \
|
||||
--disturl=https://npm.taobao.org/dist
|
||||
|
||||
install-production production:
|
||||
@NODE_ENV=production $(MAKE) install
|
||||
|
||||
jshint: install
|
||||
@-node_modules/.bin/jshint ./
|
||||
jshint:
|
||||
@node_modules/.bin/jshint .
|
||||
|
||||
init-database:
|
||||
@node --harmony test/init_db.js
|
||||
@NODE_ENV=test node test/init_db.js
|
||||
|
||||
init-mysql:
|
||||
@mysql -uroot -e 'DROP DATABASE IF EXISTS cnpmjs_test;'
|
||||
@mysql -uroot -e 'CREATE DATABASE cnpmjs_test;'
|
||||
|
||||
test: install init-database
|
||||
init-pg:
|
||||
@psql -c 'DROP DATABASE IF EXISTS cnpmjs_test;'
|
||||
@psql -c 'CREATE DATABASE cnpmjs_test;'
|
||||
|
||||
test: init-database
|
||||
@NODE_ENV=test DB=${DB} node_modules/.bin/mocha \
|
||||
--harmony \
|
||||
--reporter $(REPORTER) \
|
||||
--timeout $(TIMEOUT) \
|
||||
--require intelli-espower-loader \
|
||||
--require should \
|
||||
--require should-http \
|
||||
--require co-mocha \
|
||||
--require thunk-mocha \
|
||||
--require ./test/init.js \
|
||||
$(MOCHA_OPTS) \
|
||||
$(TESTS)
|
||||
@@ -40,18 +35,21 @@ test-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} node --harmony \
|
||||
node_modules/.bin/istanbul cover --preserve-comments \
|
||||
test-cov cov: init-database
|
||||
@NODE_ENV=test DB=${DB} node \
|
||||
node_modules/.bin/istanbul cover \
|
||||
node_modules/.bin/_mocha \
|
||||
-- -u exports \
|
||||
--reporter $(REPORTER) \
|
||||
--timeout $(TIMEOUT) \
|
||||
--require intelli-espower-loader \
|
||||
--require should \
|
||||
--require should-http \
|
||||
--require co-mocha \
|
||||
--require thunk-mocha \
|
||||
--require ./test/init.js \
|
||||
$(MOCHA_OPTS) \
|
||||
$(TESTS)
|
||||
@@ -62,18 +60,17 @@ test-cov-sqlite:
|
||||
test-cov-mysql: init-mysql
|
||||
@$(MAKE) test-cov DB=mysql
|
||||
|
||||
test-travis: install init-database
|
||||
@NODE_ENV=test DB=${DB} CNPM_SOURCE_NPM=https://registry.npmjs.org CNPM_SOURCE_NPM_ISCNPM=false \
|
||||
node --harmony \
|
||||
node_modules/.bin/istanbul cover --preserve-comments \
|
||||
test-travis: init-database
|
||||
@NODE_ENV=test DB=${DB} CNPM_SOURCE_NPM=https://registry.npmjs.com CNPM_SOURCE_NPM_ISCNPM=false \
|
||||
node \
|
||||
node_modules/.bin/istanbul cover \
|
||||
node_modules/.bin/_mocha \
|
||||
--report lcovonly \
|
||||
-- \
|
||||
-- -u exports \
|
||||
--reporter dot \
|
||||
--timeout $(TIMEOUT) \
|
||||
--require intelli-espower-loader \
|
||||
--require should \
|
||||
--require should-http \
|
||||
--require co-mocha \
|
||||
--require thunk-mocha \
|
||||
--require ./test/init.js \
|
||||
$(MOCHA_OPTS) \
|
||||
$(TESTS)
|
||||
@@ -84,20 +81,24 @@ test-travis-sqlite:
|
||||
test-travis-mysql: init-mysql
|
||||
@$(MAKE) test-travis DB=mysql
|
||||
|
||||
test-travis-all: test-travis-sqlite test-travis-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: jshint test-travis-sqlite test-travis-mysql test-travis-pg
|
||||
|
||||
dev:
|
||||
@NODE_ENV=development node_modules/.bin/node-dev --harmony dispatch.js
|
||||
@NODE_ENV=development node node_modules/.bin/node-dev dispatch.js
|
||||
|
||||
contributors: install
|
||||
contributors:
|
||||
@node_modules/.bin/contributors -f plain -o AUTHORS
|
||||
|
||||
autod: install
|
||||
autod:
|
||||
@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
|
||||
--dep mysql \
|
||||
--keep should,supertest,chunkstream,mm,pedding
|
||||
|
||||
.PHONY: test
|
||||
|
||||
31
README.md
31
README.md
@@ -3,29 +3,23 @@ cnpmjs.org
|
||||
|
||||
[![NPM version][npm-image]][npm-url]
|
||||
[![build status][travis-image]][travis-url]
|
||||
[![Test coverage][coveralls-image]][coveralls-url]
|
||||
[![Gittip][gittip-image]][gittip-url]
|
||||
[![Test coverage][codecov-image]][codecov-url]
|
||||
[![David deps][david-image]][david-url]
|
||||
[![node version][node-image]][node-url]
|
||||
[![Known Vulnerabilities][snyk-image]][snyk-url]
|
||||
[![npm download][download-image]][download-url]
|
||||
[![gitter][gitter-image]][gitter-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
|
||||
[coveralls-image]: https://img.shields.io/coveralls/cnpm/cnpmjs.org.svg?style=flat-square
|
||||
[coveralls-url]: https://coveralls.io/r/cnpm/cnpmjs.org?branch=master
|
||||
[gittip-image]: https://img.shields.io/gittip/fengmk2.svg?style=flat-square
|
||||
[gittip-url]: https://www.gittip.com/fengmk2/
|
||||
[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
|
||||
[node-image]: https://img.shields.io/badge/node.js-%3E=_0.11-red.svg?style=flat-square
|
||||
[node-url]: http://nodejs.org/download/
|
||||
[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
|
||||
[gitter-image]: https://badges.gitter.im/Join%20Chat.svg
|
||||
[gitter-url]: https://gitter.im/cnpm/cnpmjs.org?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
|
||||
|
||||

|
||||
|
||||
@@ -60,6 +54,7 @@ And it easy to wrap for your own registry which build with `cnpmjs.org`.
|
||||
* **Compatible with NPM client**: you can use the origin NPM client with `cnpmjs.org`,
|
||||
only need to change the registry in config. Even include manual synchronization (through `install` command).
|
||||
* **Version badge**: base on [shields.io](http://shields.io/) 
|
||||
* **Support http_proxy**: if you're behind firewall, need to request through http proxy
|
||||
|
||||
**PROTIP** Be sure to read [Migrating from 1.x to 2.x](https://github.com/cnpm/cnpmjs.org/wiki/Migrating-from-1.x-to-2.x)
|
||||
as well as [New features in 2.x](https://github.com/cnpm/cnpmjs.org/wiki/New-features-in-2.x).
|
||||
@@ -72,13 +67,14 @@ as well as [New features in 2.x](https://github.com/cnpm/cnpmjs.org/wiki/New-fea
|
||||
* Mirror NPM in China: [cnpmjs.org](http://cnpmjs.org)
|
||||
* cnpm client: [cnpm](https://github.com/cnpm/cnpm), `npm install -g cnpm`
|
||||
* [How to deploy cnpmjs.org](https://github.com/cnpm/cnpmjs.org/wiki/Deploy)
|
||||
* [Sync packages through `http_proxy`](https://github.com/cnpm/cnpmjs.org/wiki/Sync-packages-through-http_proxy)
|
||||
* [wiki](https://github.com/cnpm/cnpmjs.org/wiki)
|
||||
|
||||
## Develop on your local machine
|
||||
|
||||
### 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`.
|
||||
@@ -100,7 +96,7 @@ $ make test
|
||||
# coverage
|
||||
$ make test-cov
|
||||
|
||||
# udpate dependencies
|
||||
# update dependencies
|
||||
$ make autod
|
||||
|
||||
# start server with development mode
|
||||
@@ -116,6 +112,11 @@ $ make dev
|
||||
|
||||
Tips: make sure your code is following the [node-style-guide](https://github.com/felixge/node-style-guide).
|
||||
|
||||
## Sponsors
|
||||
|
||||
- [](http://click.aliyun.com/m/4288/) (2016.2 - now)
|
||||
- [](http://www.ucloud.cn?sem=sdk-CNPMJS) (2015.3 - 2016.3)
|
||||
|
||||
## License
|
||||
|
||||
MIT
|
||||
[MIT](LICENSE.txt)
|
||||
|
||||
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'
|
||||
|
||||
var UserModel = require('../models').User;
|
||||
var co = require('co');
|
||||
var utility = require('utility');
|
||||
|
||||
var username = process.argv[2];
|
||||
var newPassword = process.argv[3];
|
||||
|
||||
co(function * () {
|
||||
var user = yield UserModel.find({where: {name: username}});
|
||||
var salt = user.salt;
|
||||
console.log(`user original password_sha: ${user.password_sha}`);
|
||||
var 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);
|
||||
});
|
||||
13
bin/cli.js
13
bin/cli.js
@@ -1,9 +1,7 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/**!
|
||||
* cnpmjs.org - bin/cli.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
@@ -16,7 +14,6 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
require('gnode');
|
||||
var debug = require('debug')('cnpmjs.org:cli');
|
||||
var program = require('commander');
|
||||
var path = require('path');
|
||||
@@ -86,9 +83,10 @@ function start(options) {
|
||||
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 + '');
|
||||
}
|
||||
|
||||
@@ -108,7 +106,7 @@ function stop(options) {
|
||||
}
|
||||
}
|
||||
|
||||
function initDatabase() {
|
||||
function initDatabase(callback) {
|
||||
var models = require('../models');
|
||||
|
||||
models.sequelize.sync({ force: false })
|
||||
@@ -120,6 +118,7 @@ function initDatabase() {
|
||||
throw err;
|
||||
} else {
|
||||
console.log('[models/init_script.js] `sqlite` sequelize sync and init success');
|
||||
callback();
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
@@ -7,7 +7,7 @@ export NODE_ENV='production'
|
||||
ulimit -c unlimited
|
||||
|
||||
cd `dirname $0`/..
|
||||
NODEJS='node --harmony'
|
||||
NODEJS='node'
|
||||
BASE_HOME=`pwd`
|
||||
PROJECT_NAME=`basename ${BASE_HOME}`
|
||||
STDOUT_LOG=`$NODEJS -e "console.log(require('path').join(require('$BASE_HOME/config').logdir, 'nodejs_stdout.log'));\
|
||||
|
||||
@@ -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({
|
||||
const logger = module.exports = Logger({
|
||||
categories: categories,
|
||||
dir: config.logdir,
|
||||
duration: '1d',
|
||||
format: '[{category}.]YYYY-MM-DD[.log]',
|
||||
stdout: config.debug && !isTEST,
|
||||
errorFormater: errorFormater
|
||||
errorFormater: errorFormater,
|
||||
seperator: os.EOL,
|
||||
});
|
||||
|
||||
var to = [];
|
||||
const to = [];
|
||||
for (var 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);
|
||||
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);
|
||||
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);
|
||||
};
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var mailConfig = require('../config').mail;
|
||||
var nodemailer = require('nodemailer');
|
||||
var utility = require('utility');
|
||||
var os = require('os');
|
||||
var mailConfig = require('../config').mail;
|
||||
|
||||
var smtpConfig;
|
||||
if (mailConfig.auth) {
|
||||
@@ -25,6 +25,7 @@ if (mailConfig.auth) {
|
||||
smtpConfig = mailConfig;
|
||||
} else {
|
||||
smtpConfig = {
|
||||
enable: mailConfig.enable,
|
||||
// backward compat
|
||||
host: mailConfig.host,
|
||||
port: mailConfig.port,
|
||||
@@ -37,7 +38,7 @@ if (mailConfig.auth) {
|
||||
};
|
||||
}
|
||||
|
||||
var transport = nodemailer.createTransport(smtpConfig);
|
||||
var transport;
|
||||
|
||||
/**
|
||||
* Send notice email with mail level and appname.
|
||||
@@ -71,6 +72,15 @@ LEVELS.forEach(function (level) {
|
||||
exports.send = function (to, subject, html, callback) {
|
||||
callback = callback || utility.noop;
|
||||
|
||||
if (mailConfig.enable === false) {
|
||||
console.log('[send mail debug] [%s] to: %s, subject: %s\n%s', Date(), to, subject, html);
|
||||
return callback();
|
||||
}
|
||||
|
||||
if (!transport) {
|
||||
transport = nodemailer.createTransport(smtpConfig);
|
||||
}
|
||||
|
||||
var message = {
|
||||
from: mailConfig.from || mailConfig.sender,
|
||||
to: to,
|
||||
|
||||
@@ -17,11 +17,18 @@
|
||||
var xss = require('xss');
|
||||
var MarkdownIt = require('markdown-it');
|
||||
|
||||
// allow class attr on code
|
||||
xss.whiteList.code = ['class'];
|
||||
|
||||
var md = new MarkdownIt({
|
||||
html: true,
|
||||
linkify: true,
|
||||
});
|
||||
|
||||
exports.render = function (content, filterXss) {
|
||||
return md.render(filterXss === false ? content : xss(content));
|
||||
var html = md.render(content);
|
||||
if (filterXss !== false) {
|
||||
html = xss(html);
|
||||
}
|
||||
return html;
|
||||
};
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
/*!
|
||||
* cnpmjs.org - common/nfs.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
@@ -14,18 +14,58 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var urlparse = require('url').parse;
|
||||
var urllib = require('urllib');
|
||||
var HttpAgent = require('agentkeepalive');
|
||||
var HttpsAgent = require('agentkeepalive').HttpsAgent;
|
||||
var config = require('../config');
|
||||
|
||||
var httpAgent;
|
||||
var httpsAgent;
|
||||
|
||||
if (config.httpProxy) {
|
||||
var tunnel = require('tunnel-agent');
|
||||
var urlinfo = urlparse(config.httpProxy);
|
||||
if (urlinfo.protocol === 'http:') {
|
||||
httpAgent = tunnel.httpOverHttp({
|
||||
proxy: {
|
||||
host: urlinfo.hostname,
|
||||
port: urlinfo.port
|
||||
}
|
||||
});
|
||||
httpsAgent = tunnel.httpsOverHttp({
|
||||
proxy: {
|
||||
host: urlinfo.hostname,
|
||||
port: urlinfo.port
|
||||
}
|
||||
});
|
||||
} else if (urlinfo.protocol === 'https:') {
|
||||
httpAgent = tunnel.httpOverHttps({
|
||||
proxy: {
|
||||
host: urlinfo.hostname,
|
||||
port: urlinfo.port
|
||||
}
|
||||
});
|
||||
httpsAgent = tunnel.httpsOverHttps({
|
||||
proxy: {
|
||||
host: urlinfo.hostname,
|
||||
port: urlinfo.port
|
||||
}
|
||||
});
|
||||
} else {
|
||||
throw new TypeError('httpProxy format error: ' + config.httpProxy);
|
||||
}
|
||||
} else {
|
||||
httpAgent = new HttpAgent({
|
||||
timeout: 0,
|
||||
keepAliveTimeout: 15000
|
||||
});
|
||||
httpsAgent = new HttpsAgent({
|
||||
timeout: 0,
|
||||
keepAliveTimeout: 15000
|
||||
});
|
||||
}
|
||||
|
||||
var httpAgent = new HttpAgent({
|
||||
timeout: 0,
|
||||
keepAliveTimeout: 15000
|
||||
});
|
||||
var httpsAgent = new HttpsAgent({
|
||||
timeout: 0,
|
||||
keepAliveTimeout: 15000
|
||||
});
|
||||
var client = urllib.create({
|
||||
agent: httpAgent,
|
||||
httpsAgent: httpsAgent
|
||||
|
||||
@@ -1,23 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - config/index.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';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var mkdirp = require('mkdirp');
|
||||
var copy = require('copy-to');
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var os = require('os');
|
||||
|
||||
var version = require('../package.json').version;
|
||||
@@ -27,6 +13,7 @@ var dataDir = path.join(process.env.HOME || root, '.cnpmjs.org');
|
||||
|
||||
var config = {
|
||||
version: version,
|
||||
dataDir: dataDir,
|
||||
|
||||
/**
|
||||
* Cluster mode
|
||||
@@ -84,6 +71,7 @@ var config = {
|
||||
// email notification for errors
|
||||
// check https://github.com/andris9/Nodemailer for more informations
|
||||
mail: {
|
||||
enable: false,
|
||||
appname: 'cnpmjs.org',
|
||||
from: 'cnpmjs.org mail sender <adderss@gmail.com>',
|
||||
service: 'gmail',
|
||||
@@ -93,7 +81,8 @@ var config = {
|
||||
}
|
||||
},
|
||||
|
||||
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
|
||||
npmClientName: 'cnpm', // use `${name} install package`
|
||||
@@ -158,7 +147,7 @@ var config = {
|
||||
enablePrivate: false,
|
||||
|
||||
// registry scopes, if don't set, means do not support scopes
|
||||
scopes: [ '@cnpm', '@cnpmtest' ],
|
||||
scopes: [ '@cnpm', '@cnpmtest', '@cnpm-test' ],
|
||||
|
||||
// some registry already have some private packages in global scope
|
||||
// but we want to treat them as scoped private packages,
|
||||
@@ -173,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
|
||||
@@ -208,27 +198,58 @@ 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
|
||||
// Force npm to always require authentication when accessing the registry, even for GET requests.
|
||||
alwaysAuth: false,
|
||||
|
||||
// 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',
|
||||
|
||||
// https://github.com/cnpm/cnpmjs.org/issues/1149
|
||||
// if enable this option, must create module_abbreviated and package_readme table in database
|
||||
enableAbbreviatedMetadata: false,
|
||||
|
||||
// global hook function: function* (envelope) {}
|
||||
// envelope format please see https://github.com/npm/registry/blob/master/docs/hooks/hooks-payload.md#payload
|
||||
globalHook: null,
|
||||
};
|
||||
|
||||
if (process.env.NODE_ENV === 'test') {
|
||||
config.enableAbbreviatedMetadata = true;
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV !== 'test') {
|
||||
// 1. try to load `$dataDir/config.js` first, not exists then goto 2.
|
||||
// 2. load config/config.js, everything in config.js will cover the same key in index.js
|
||||
var customConfig = path.join(dataDir, 'config');
|
||||
try {
|
||||
copy(require(customConfig)).override(config);
|
||||
} catch (err) {
|
||||
customConfig = path.join(root, 'config', 'config');
|
||||
try {
|
||||
copy(require(customConfig)).override(config);
|
||||
} catch (err) {
|
||||
// ignore
|
||||
var customConfig;
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
customConfig = path.join(root, 'config', 'config.js');
|
||||
} else {
|
||||
// 1. try to load `$dataDir/config.json` first, not exists then goto 2.
|
||||
// 2. load config/config.js, everything in config.js will cover the same key in index.js
|
||||
customConfig = path.join(dataDir, 'config.json');
|
||||
if (!fs.existsSync(customConfig)) {
|
||||
customConfig = path.join(root, 'config', 'config.js');
|
||||
}
|
||||
}
|
||||
if (fs.existsSync(customConfig)) {
|
||||
copy(require(customConfig)).override(config);
|
||||
}
|
||||
}
|
||||
|
||||
mkdirp.sync(config.logdir);
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/**!
|
||||
* 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');
|
||||
|
||||
function ok() {
|
||||
@@ -25,7 +11,7 @@ function ok() {
|
||||
// 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 rows = yield packageService.listModuleTags(name);
|
||||
var tags = {};
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
var row = rows[i];
|
||||
@@ -79,6 +65,14 @@ exports.set = function* () {
|
||||
exports.destroy = function* () {
|
||||
var name = this.params.name || this.params[0];
|
||||
var 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,11 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/download.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -18,6 +16,7 @@ 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');
|
||||
@@ -32,12 +31,16 @@ 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);
|
||||
var row = yield packageService.getModule(name, version);
|
||||
// can not get dist
|
||||
var url = null;
|
||||
|
||||
if (typeof nfs.url === 'function') {
|
||||
url = nfs.url(common.getCDNKey(name, filename));
|
||||
if (is.generatorFunction(nfs.url)) {
|
||||
url = yield nfs.url(common.getCDNKey(name, filename));
|
||||
} else {
|
||||
url = nfs.url(common.getCDNKey(name, filename));
|
||||
}
|
||||
}
|
||||
|
||||
debug('download %s %s %s %s', name, filename, version, url);
|
||||
@@ -52,10 +55,11 @@ module.exports = function* download(next) {
|
||||
return;
|
||||
}
|
||||
|
||||
_downloads[name] = (_downloads[name] || 0) + 1;
|
||||
|
||||
if (config.downloadRedirectToNFS && url) {
|
||||
this.status = 302;
|
||||
this.set('Location', url);
|
||||
_downloads[name] = (_downloads[name] || 0) + 1;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -66,17 +70,10 @@ module.exports = function* download(next) {
|
||||
debug('get tarball by 302, url: %s', url);
|
||||
this.status = 302;
|
||||
this.set('Location', url);
|
||||
_downloads[name] = (_downloads[name] || 0) + 1;
|
||||
return;
|
||||
}
|
||||
|
||||
// else use `dist.key` to get tarball from nfs
|
||||
if (!nfs.download) {
|
||||
return yield* next;
|
||||
}
|
||||
|
||||
_downloads[name] = (_downloads[name] || 0) + 1;
|
||||
|
||||
if (typeof dist.size === 'number' && dist.size > 0) {
|
||||
this.length = dist.size;
|
||||
}
|
||||
@@ -84,7 +81,7 @@ module.exports = function* download(next) {
|
||||
this.attachment(filename);
|
||||
this.etag = dist.shasum;
|
||||
|
||||
this.body = yield* downloadAsReadStream(dist.key);
|
||||
this.body = yield downloadAsReadStream(dist.key);
|
||||
};
|
||||
|
||||
defer.setInterval(function* () {
|
||||
@@ -110,10 +107,12 @@ defer.setInterval(function* () {
|
||||
try {
|
||||
yield* downloadTotalService.plusModuleTotal({ name: name, date: date, count: 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.
|
||||
*/
|
||||
|
||||
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() {
|
||||
var range = this.params.range || this.params[0] || '';
|
||||
var name = this.params.name || this.params[1];
|
||||
|
||||
range = range.split(':');
|
||||
if (range.length !== 2
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/**!
|
||||
* 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');
|
||||
@@ -25,16 +11,15 @@ var config = require('../../../config');
|
||||
* GET /:name
|
||||
*/
|
||||
module.exports = function* list() {
|
||||
var orginalName = this.params.name || this.params[0];
|
||||
var name = orginalName;
|
||||
var name = this.params.name || this.params[0];
|
||||
var rs = yield [
|
||||
packageService.getModuleLastModified(name),
|
||||
packageService.listModuleTags(name)
|
||||
packageService.listModuleTags(name),
|
||||
];
|
||||
var modifiedTime = rs[0];
|
||||
var tags = rs[1];
|
||||
|
||||
debug('show %s(%s), last modified: %s, tags: %j', name, orginalName, modifiedTime, tags);
|
||||
debug('show %s, last modified: %s, tags: %j', name, modifiedTime, tags);
|
||||
if (modifiedTime) {
|
||||
// find out the latest modfied time
|
||||
// because update tags only modfied tag, wont change module gmt_modified
|
||||
@@ -45,9 +30,6 @@ module.exports = function* list() {
|
||||
}
|
||||
}
|
||||
|
||||
// use modifiedTime as etag
|
||||
this.set('ETag', '"' + modifiedTime.getTime() + '"');
|
||||
|
||||
// must set status first
|
||||
this.status = 200;
|
||||
if (this.fresh) {
|
||||
@@ -57,6 +39,21 @@ module.exports = function* list() {
|
||||
}
|
||||
}
|
||||
|
||||
var abbreviatedMetaType = 'application/vnd.npm.install-v1+json';
|
||||
if (config.enableAbbreviatedMetadata && this.accepts([ 'json', abbreviatedMetaType ]) === abbreviatedMetaType) {
|
||||
var rows = yield packageService.listModuleAbbreviatedsByName(name);
|
||||
if (rows.length > 0) {
|
||||
yield handleAbbreviatedMetaRequest(this, name, modifiedTime, tags, rows);
|
||||
return;
|
||||
}
|
||||
var fullRows = yield packageService.listModulesByName(name);
|
||||
if (fullRows.length > 0) {
|
||||
// no abbreviated meta rows, use the full meta convert to abbreviated meta
|
||||
yield handleAbbreviatedMetaRequestWithFullMeta(this, name, modifiedTime, tags, fullRows);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
var r = yield [
|
||||
packageService.listModulesByName(name),
|
||||
packageService.listStarUserNames(name),
|
||||
@@ -80,18 +77,18 @@ module.exports = function* list() {
|
||||
|
||||
if (rows.length === 0) {
|
||||
// check if unpublished
|
||||
var unpublishedInfo = yield* packageService.getUnpublishedModule(name);
|
||||
var unpublishedInfo = yield packageService.getUnpublishedModule(name);
|
||||
debug('show unpublished %j', unpublishedInfo);
|
||||
if (unpublishedInfo) {
|
||||
this.status = 404;
|
||||
this.body = {
|
||||
_id: orginalName,
|
||||
name: orginalName,
|
||||
this.jsonp = {
|
||||
_id: name,
|
||||
name: name,
|
||||
time: {
|
||||
modified: unpublishedInfo.package.time,
|
||||
unpublished: unpublishedInfo.package,
|
||||
},
|
||||
_attachments: {}
|
||||
_attachments: {},
|
||||
};
|
||||
return;
|
||||
}
|
||||
@@ -102,15 +99,15 @@ module.exports = function* list() {
|
||||
if (rows.length === 0) {
|
||||
if (!this.allowSync) {
|
||||
this.status = 404;
|
||||
this.body = {
|
||||
this.jsonp = {
|
||||
error: 'not_found',
|
||||
reason: 'document not found'
|
||||
reason: 'document not found',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
// start sync
|
||||
var logId = yield* SyncModuleWorker.sync(name, 'sync-by-install');
|
||||
var 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);
|
||||
@@ -133,8 +130,14 @@ module.exports = function* list() {
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
var row = rows[i];
|
||||
var 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;
|
||||
@@ -177,12 +180,19 @@ module.exports = function* list() {
|
||||
distTags.latest = pkg.version;
|
||||
}
|
||||
|
||||
if (!readme && config.enableAbbreviatedMetadata) {
|
||||
var packageReadme = yield packageService.getPackageReadme(name);
|
||||
if (packageReadme) {
|
||||
readme = packageReadme.readme;
|
||||
}
|
||||
}
|
||||
|
||||
var info = {
|
||||
_id: orginalName,
|
||||
_id: name,
|
||||
_rev: rev,
|
||||
name: orginalName,
|
||||
name: name,
|
||||
description: pkg.description,
|
||||
"dist-tags": distTags,
|
||||
'dist-tags': distTags,
|
||||
maintainers: pkg.maintainers,
|
||||
time: times,
|
||||
users: starUsers,
|
||||
@@ -198,6 +208,119 @@ module.exports = function* list() {
|
||||
info.bugs = pkg.bugs;
|
||||
info.license = pkg.license;
|
||||
|
||||
debug('show module %s: %s, latest: %s', orginalName, rev, latestMod.version);
|
||||
this.body = info;
|
||||
debug('show module %s: %s, latest: %s', name, rev, latestMod.version);
|
||||
this.jsonp = info;
|
||||
};
|
||||
|
||||
function* handleAbbreviatedMetaRequest(ctx, name, modifiedTime, tags, rows) {
|
||||
debug('show %s got %d rows, %d tags, modifiedTime: %s', name, rows.length, tags.length, modifiedTime);
|
||||
var latestMod = null;
|
||||
// set tags
|
||||
var distTags = {};
|
||||
for (var i = 0; i < tags.length; i++) {
|
||||
var t = tags[i];
|
||||
distTags[t.tag] = t.version;
|
||||
}
|
||||
|
||||
// set versions and times
|
||||
var versions = {};
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
var row = rows[i];
|
||||
var pkg = row.package;
|
||||
common.setDownloadURL(pkg, ctx);
|
||||
pkg._cnpm_publish_time = undefined;
|
||||
pkg.publish_time = undefined;
|
||||
|
||||
versions[pkg.version] = pkg;
|
||||
|
||||
if ((!distTags.latest && !latestMod) || distTags.latest === pkg.version) {
|
||||
latestMod = row;
|
||||
}
|
||||
}
|
||||
|
||||
if (!latestMod) {
|
||||
latestMod = rows[0];
|
||||
}
|
||||
|
||||
if (tags.length === 0) {
|
||||
// some sync error reason, will cause tags missing
|
||||
// set latest tag at least
|
||||
distTags.latest = latestMod.package.version;
|
||||
}
|
||||
|
||||
var info = {
|
||||
name: name,
|
||||
modified: modifiedTime,
|
||||
'dist-tags': distTags,
|
||||
versions: versions,
|
||||
};
|
||||
|
||||
debug('show %j', info);
|
||||
ctx.jsonp = info;
|
||||
}
|
||||
|
||||
function* handleAbbreviatedMetaRequestWithFullMeta(ctx, name, modifiedTime, tags, rows) {
|
||||
debug('show %s got %d rows, %d tags',
|
||||
name, rows.length, tags.length);
|
||||
var latestMod = null;
|
||||
// set tags
|
||||
var distTags = {};
|
||||
for (var i = 0; i < tags.length; i++) {
|
||||
var t = tags[i];
|
||||
distTags[t.tag] = t.version;
|
||||
}
|
||||
|
||||
// set versions and times
|
||||
var versions = {};
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
var row = rows[i];
|
||||
// pkg is string ... ignore it
|
||||
if (typeof row.package === 'string') {
|
||||
continue;
|
||||
}
|
||||
// https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md#abbreviated-version-object
|
||||
var pkg = {
|
||||
name: row.package.name,
|
||||
version: row.package.version,
|
||||
deprecated: row.package.deprecated,
|
||||
dependencies: row.package.dependencies,
|
||||
optionalDependencies: row.package.optionalDependencies,
|
||||
devDependencies: row.package.devDependencies,
|
||||
bundleDependencies: row.package.bundleDependencies,
|
||||
peerDependencies: row.package.peerDependencies,
|
||||
bin: row.package.bin,
|
||||
directories: row.package.directories,
|
||||
dist: row.package.dist,
|
||||
engines: row.package.engines,
|
||||
_hasShrinkwrap: row.package._hasShrinkwrap,
|
||||
_publish_on_cnpm: row.package._publish_on_cnpm,
|
||||
};
|
||||
common.setDownloadURL(pkg, ctx);
|
||||
|
||||
versions[pkg.version] = pkg;
|
||||
|
||||
if ((!distTags.latest && !latestMod) || distTags.latest === pkg.version) {
|
||||
latestMod = row;
|
||||
}
|
||||
}
|
||||
|
||||
if (!latestMod) {
|
||||
latestMod = rows[0];
|
||||
}
|
||||
|
||||
if (tags.length === 0) {
|
||||
// some sync error reason, will cause tags missing
|
||||
// set latest tag at least
|
||||
distTags.latest = latestMod.package.version;
|
||||
}
|
||||
|
||||
var info = {
|
||||
name: name,
|
||||
modified: modifiedTime,
|
||||
'dist-tags': distTags,
|
||||
versions: versions,
|
||||
};
|
||||
|
||||
debug('show %j', info);
|
||||
ctx.jsonp = info;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ var packageService = require('../../../services/package');
|
||||
// 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 names = yield packageService.listAllPublicModuleNames();
|
||||
var result = { _updated: updated };
|
||||
names.forEach(function (name) {
|
||||
result[name] = true;
|
||||
|
||||
29
controllers/registry/package/list_by_user.js
Normal file
29
controllers/registry/package/list_by_user.js
Normal file
@@ -0,0 +1,29 @@
|
||||
/**!
|
||||
* list packages by username
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <m@fengmk2.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
module.exports = function*() {
|
||||
const username = this.params.user;
|
||||
const packages = yield packageService.listModulesByUser(username);
|
||||
|
||||
this.body = {
|
||||
user: {
|
||||
name: username,
|
||||
},
|
||||
packages: packages,
|
||||
};
|
||||
};
|
||||
26
controllers/registry/package/list_dependents.js
Normal file
26
controllers/registry/package/list_dependents.js
Normal file
@@ -0,0 +1,26 @@
|
||||
/**!
|
||||
* list package's dependents
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <m@fengmk2.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
const packageService = require('../../../services/package');
|
||||
|
||||
module.exports = function*() {
|
||||
const name = this.params.name || this.params[0];
|
||||
const dependents = yield packageService.listDependents(name);
|
||||
|
||||
this.body = {
|
||||
dependents: dependents,
|
||||
};
|
||||
};
|
||||
@@ -1,11 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/registry/package/list_shorts.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -19,5 +17,5 @@ var packageService = require('../../../services/package');
|
||||
// GET /-/short
|
||||
// List all packages names only
|
||||
module.exports = function* () {
|
||||
this.body = yield* packageService.listAllPublicModuleNames();
|
||||
this.body = yield packageService.listAllPublicModuleNames();
|
||||
};
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/**!
|
||||
* 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.
|
||||
*/
|
||||
|
||||
var packageService = require('../../../services/package');
|
||||
|
||||
var A_WEEK_MS = 3600000 * 24 * 7;
|
||||
@@ -21,7 +7,7 @@ var 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* () {
|
||||
module.exports = function* listSince() {
|
||||
var query = this.query;
|
||||
if (query.stale !== 'update_after') {
|
||||
this.status = 400;
|
||||
@@ -49,7 +35,7 @@ module.exports = function* () {
|
||||
Date(), query, this.ip);
|
||||
}
|
||||
|
||||
var names = yield* packageService.listPublicModuleNamesSince(startkey);
|
||||
var names = yield packageService.listPublicModuleNamesSince(startkey);
|
||||
var result = { _updated: updated };
|
||||
names.forEach(function (name) {
|
||||
result[name] = true;
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/**!
|
||||
* 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');
|
||||
@@ -21,6 +7,7 @@ var packageService = require('../../../services/package');
|
||||
var common = require('../../../lib/common');
|
||||
var nfs = require('../../../common/nfs');
|
||||
var config = require('../../../config');
|
||||
var hook = require('../../../services/hook');
|
||||
|
||||
// old flows:
|
||||
// 1. add()
|
||||
@@ -135,7 +122,7 @@ 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 exists = yield packageService.getModule(name, version);
|
||||
var shasum;
|
||||
if (exists) {
|
||||
this.status = 403;
|
||||
@@ -202,9 +189,9 @@ module.exports = function* save(next) {
|
||||
};
|
||||
|
||||
mod.package.dist = dist;
|
||||
yield* addDepsRelations(mod.package);
|
||||
yield addDepsRelations(mod.package);
|
||||
|
||||
var addResult = yield* packageService.saveModule(mod);
|
||||
var 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);
|
||||
|
||||
@@ -219,13 +206,25 @@ module.exports = function* save(next) {
|
||||
var 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)
|
||||
};
|
||||
|
||||
// hooks
|
||||
const envelope = {
|
||||
event: 'package:publish',
|
||||
name: mod.name,
|
||||
type: 'package',
|
||||
version: mod.version,
|
||||
hookOwner: null,
|
||||
payload: null,
|
||||
change: null,
|
||||
};
|
||||
hook.trigger(envelope);
|
||||
};
|
||||
|
||||
function* addDepsRelations(pkg) {
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/**!
|
||||
* cnpmjs.js - controllers/registry/package/show.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:show');
|
||||
var semver = require('semver');
|
||||
var packageService = require('../../../services/package');
|
||||
@@ -32,28 +18,48 @@ var config = require('../../../config');
|
||||
module.exports = function* show() {
|
||||
var name = this.params.name || this.params[0];
|
||||
var tag = this.params.version || this.params[1];
|
||||
if (tag === '*') {
|
||||
tag = 'latest';
|
||||
}
|
||||
var version = semver.valid(tag);
|
||||
var range = semver.validRange(tag);
|
||||
var mod;
|
||||
if (version) {
|
||||
mod = yield* packageService.getModule(name, version);
|
||||
mod = yield packageService.getModule(name, version);
|
||||
} else if (range) {
|
||||
mod = yield packageService.getModuleByRange(name, range);
|
||||
} else {
|
||||
mod = yield* packageService.getModuleByTag(name, tag);
|
||||
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;
|
||||
var rs = yield [
|
||||
packageService.listMaintainers(name),
|
||||
packageService.listModuleTags(name),
|
||||
];
|
||||
var maintainers = rs[0];
|
||||
if (maintainers.length > 0) {
|
||||
mod.package.maintainers = maintainers;
|
||||
}
|
||||
this.body = mod.package;
|
||||
var tags = rs[1];
|
||||
var distTags = {};
|
||||
for (var i = 0; i < tags.length; i++) {
|
||||
var 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
|
||||
};
|
||||
@@ -61,7 +67,7 @@ module.exports = function* show() {
|
||||
}
|
||||
|
||||
// start sync
|
||||
var logId = yield* SyncModuleWorker.sync(name, 'sync-by-install');
|
||||
var logId = yield SyncModuleWorker.sync(name, 'sync-by-install');
|
||||
debug('start sync %s, get log id %s', name, logId);
|
||||
|
||||
this.redirect(config.officialNpmRegistry + this.url);
|
||||
|
||||
@@ -29,11 +29,11 @@ module.exports = function* update(next) {
|
||||
|
||||
var 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;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ var config = require('../config');
|
||||
|
||||
exports.sync = function* () {
|
||||
var username = this.user.name || 'anonymous';
|
||||
var name = this.params.name;
|
||||
var name = this.params.name || this.params[0];
|
||||
var type = 'package';
|
||||
if (name.indexOf(':') > 0) {
|
||||
// user:fengmk2
|
||||
@@ -60,8 +60,13 @@ exports.sync = function* () {
|
||||
};
|
||||
|
||||
exports.getSyncLog = function* (next) {
|
||||
var logId = this.params.id;
|
||||
var logId = Number(this.params.id || this.params[1]);
|
||||
var offset = Number(this.query.offset) || 0;
|
||||
|
||||
if (!logId) { // NaN
|
||||
this.status = 404;
|
||||
return;
|
||||
}
|
||||
var row = yield* Log.get(logId);
|
||||
if (!row) {
|
||||
return yield* next;
|
||||
|
||||
@@ -1,21 +1,6 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/sync_module_worker.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.
|
||||
*/
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:proxy:sync_module_worker');
|
||||
var debug = require('debug')('cnpmjs.org:sync_module_worker');
|
||||
var co = require('co');
|
||||
var gather = require('co-gather');
|
||||
var defer = require('co-defer');
|
||||
@@ -40,7 +25,11 @@ var User = require('../models').User;
|
||||
var os = require('os');
|
||||
|
||||
var USER_AGENT = 'sync.cnpmjs.org/' + config.version +
|
||||
' hostname/' + os.hostname() + ' ' + urllib.USER_AGENT;
|
||||
' hostname/' + os.hostname() +
|
||||
' syncModel/' + config.syncModel +
|
||||
' syncInterval/' + config.syncInterval +
|
||||
' syncConcurrency/' + config.syncConcurrency +
|
||||
' ' + urllib.USER_AGENT;
|
||||
|
||||
function SyncModuleWorker(options) {
|
||||
EventEmitter.call(this);
|
||||
@@ -70,6 +59,7 @@ function SyncModuleWorker(options) {
|
||||
|
||||
this.successes = [];
|
||||
this.fails = [];
|
||||
this.updates = [];
|
||||
}
|
||||
|
||||
util.inherits(SyncModuleWorker, EventEmitter);
|
||||
@@ -116,10 +106,13 @@ SyncModuleWorker.prototype._saveLog = function () {
|
||||
that._log = '';
|
||||
co(function* () {
|
||||
yield* logService.append(that._logId, logstr);
|
||||
})(function (err) {
|
||||
if (err) {
|
||||
logger.error(err);
|
||||
}).then(function () {
|
||||
that._loging = false;
|
||||
if (that._log) {
|
||||
that._saveLog();
|
||||
}
|
||||
}).catch(function (err) {
|
||||
logger.error(err);
|
||||
that._loging = false;
|
||||
if (that._log) {
|
||||
that._saveLog();
|
||||
@@ -131,11 +124,11 @@ SyncModuleWorker.prototype.start = function () {
|
||||
this.log('user: %s, sync %s worker start, %d concurrency, nodeps: %s, publish: %s',
|
||||
this.username, this.names[0], this.concurrency, this.noDep, this._publish);
|
||||
var that = this;
|
||||
co(function *() {
|
||||
co(function* () {
|
||||
// sync upstream
|
||||
if (that.syncUpstreamFirst) {
|
||||
try {
|
||||
yield* that.syncUpstream(that.startName);
|
||||
yield that.syncUpstream(that.startName);
|
||||
} catch (err) {
|
||||
logger.error(err);
|
||||
}
|
||||
@@ -151,7 +144,9 @@ SyncModuleWorker.prototype.start = function () {
|
||||
arr.push(that.next(i));
|
||||
}
|
||||
yield arr;
|
||||
})();
|
||||
}).catch(function (err) {
|
||||
logger.error(err);
|
||||
});
|
||||
};
|
||||
|
||||
SyncModuleWorker.prototype.pushSuccess = function (name) {
|
||||
@@ -186,11 +181,18 @@ SyncModuleWorker.prototype._doneOne = function* (concurrencyId, name, success) {
|
||||
var that = this;
|
||||
// relase the stack: https://github.com/cnpm/cnpmjs.org/issues/328
|
||||
defer.setImmediate(function* () {
|
||||
yield* that.next(concurrencyId);
|
||||
yield that.next(concurrencyId);
|
||||
});
|
||||
};
|
||||
|
||||
SyncModuleWorker.prototype.syncUpstream = function* (name) {
|
||||
if (config.sourceNpmRegistry.indexOf('registry.npmjs.org') >= 0 ||
|
||||
config.sourceNpmRegistry.indexOf('registry.npmjs.com') >= 0 ||
|
||||
config.sourceNpmRegistry.indexOf('replicate.npmjs.com') >= 0) {
|
||||
this.log('----------------- upstream is npm registry: %s, ignore it -------------------',
|
||||
config.sourceNpmRegistry);
|
||||
return;
|
||||
}
|
||||
var syncname = name;
|
||||
if (this.type === 'user') {
|
||||
syncname = this.type + ':' + syncname;
|
||||
@@ -280,6 +282,8 @@ SyncModuleWorker.prototype.syncUser = function* () {
|
||||
|
||||
SyncModuleWorker.prototype.next = function* (concurrencyId) {
|
||||
if (config.syncModel === 'none') {
|
||||
this.log('[c#%d] [%s] syncModel is none, ignore',
|
||||
concurrencyId, name);
|
||||
return this.finish();
|
||||
}
|
||||
|
||||
@@ -288,6 +292,19 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
|
||||
return setImmediate(this.finish.bind(this));
|
||||
}
|
||||
|
||||
// try to sync from official replicate when source npm registry is not cnpmjs.org
|
||||
const registry = config.sourceNpmRegistryIsCNpm ? config.sourceNpmRegistry : config.officialNpmReplicate;
|
||||
|
||||
let versions = yield this.syncByName(concurrencyId, name, registry);
|
||||
if (versions && versions.length === 0 && registry === config.officialNpmReplicate) {
|
||||
// need to sync sourceNpmRegistry also
|
||||
// make sure package data be update event replicate down.
|
||||
// https://github.com/npm/registry/issues/129
|
||||
versions = yield this.syncByName(concurrencyId, name, config.officialNpmRegistry);
|
||||
}
|
||||
};
|
||||
|
||||
SyncModuleWorker.prototype.syncByName = function* (concurrencyId, name, registry) {
|
||||
var that = this;
|
||||
that.syncingNames[name] = true;
|
||||
var pkg = null;
|
||||
@@ -295,76 +312,114 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
|
||||
|
||||
this.log('----------------- Syncing %s -------------------', name);
|
||||
|
||||
// ignore scoped package
|
||||
if (name[0] === '@') {
|
||||
this.log('[c#%d] [%s] ignore sync scoped package',
|
||||
concurrencyId, name);
|
||||
yield* this._doneOne(concurrencyId, name, true);
|
||||
// ignore private scoped package
|
||||
if (common.isPrivateScopedPackage(name)) {
|
||||
this.log('[c#%d] [%s] ignore sync private scoped %j package',
|
||||
concurrencyId, name, config.scopes);
|
||||
yield this._doneOne(concurrencyId, name, true);
|
||||
return;
|
||||
}
|
||||
|
||||
// get from npm
|
||||
const packageUrl = '/' + name.replace('/', '%2f');
|
||||
try {
|
||||
var result = yield* npmSerivce.request('/' + name);
|
||||
var result = yield npmSerivce.request(packageUrl, { registry: registry });
|
||||
pkg = result.data;
|
||||
status = result.status;
|
||||
} catch (err) {
|
||||
// if 404
|
||||
if (!err.res || err.res.statusCode !== 404) {
|
||||
var errMessage = err.name + ': ' + err.message;
|
||||
that.log('[c#%s] [error] [%s] get package error: %s, status: %s',
|
||||
concurrencyId, name, errMessage, status);
|
||||
yield *that._doneOne(concurrencyId, name, false);
|
||||
that.log('[c#%s] [error] [%s] get package(%s%s) error: %s, status: %s',
|
||||
concurrencyId, name, registry, packageUrl, errMessage, status);
|
||||
yield that._doneOne(concurrencyId, name, false);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (status === 404 && pkg && pkg.reason === 'deleted' && registry === config.officialNpmReplicate) {
|
||||
// unpublished package on replicate.npmjs.com
|
||||
// 404 { error: 'not_found', reason: 'deleted' }
|
||||
// try to read from registry.npmjs.com and get the whole unpublished info
|
||||
try {
|
||||
var result = yield npmSerivce.request(packageUrl, { registry: config.sourceNpmRegistry });
|
||||
pkg = result.data;
|
||||
status = result.status;
|
||||
} catch (err) {
|
||||
// if 404
|
||||
if (!err.res || err.res.statusCode !== 404) {
|
||||
var errMessage = err.name + ': ' + err.message;
|
||||
that.log('[c#%s] [error] [%s] get package(%s%s) error: %s, status: %s',
|
||||
concurrencyId, name, config.sourceNpmRegistry, packageUrl, errMessage, status);
|
||||
yield that._doneOne(concurrencyId, name, false);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var unpublishedInfo = null;
|
||||
if (status === 404) {
|
||||
// check if it's unpublished
|
||||
if (pkg.time && pkg.time.unpublished && pkg.time.unpublished.time) {
|
||||
// ignore too long package name, see https://github.com/cnpm/cnpmjs.org/issues/1066
|
||||
if (name.length < 80 && pkg && pkg.time && pkg.time.unpublished && pkg.time.unpublished.time) {
|
||||
unpublishedInfo = pkg.time.unpublished;
|
||||
} else {
|
||||
pkg = null;
|
||||
}
|
||||
} else {
|
||||
// unpublished package status become to 200
|
||||
if (name.length < 80 && pkg && pkg.time && pkg.time.unpublished && pkg.time.unpublished.time) {
|
||||
unpublishedInfo = pkg.time.unpublished;
|
||||
}
|
||||
}
|
||||
|
||||
if (!pkg) {
|
||||
that.log('[c#%s] [error] [%s] get package error: package not exists, status: %s',
|
||||
concurrencyId, name, status);
|
||||
yield* that._doneOne(concurrencyId, name, true);
|
||||
return;
|
||||
that.log('[c#%s] [error] [%s] get package(%s%s) error: package not exists, status: %s',
|
||||
concurrencyId, name, registry, packageUrl, status);
|
||||
yield that._doneOne(concurrencyId, name, true);
|
||||
// return empty versions, try again on officialNpmRegistry
|
||||
return [];
|
||||
}
|
||||
|
||||
that.log('[c#%d] [%s] pkg status: %d, start...', concurrencyId, name, status);
|
||||
that.log('[c#%d] [%s] package(%s%s) status: %s, dist-tags: %j, time.modified: %s, unpublished: %j, start...',
|
||||
concurrencyId, name, registry, packageUrl, status,
|
||||
pkg['dist-tags'], pkg.time && pkg.time.modified,
|
||||
unpublishedInfo);
|
||||
|
||||
if (unpublishedInfo) {
|
||||
try {
|
||||
yield* that._unpublished(name, unpublishedInfo);
|
||||
yield that._unpublished(name, unpublishedInfo);
|
||||
} catch (err) {
|
||||
that.log('[c#%s] [error] [%s] sync error: %s', concurrencyId, name, err.stack);
|
||||
yield* that._doneOne(concurrencyId, name, false);
|
||||
yield that._doneOne(concurrencyId, name, false);
|
||||
return;
|
||||
}
|
||||
return yield* that._doneOne(concurrencyId, name, true);
|
||||
return yield that._doneOne(concurrencyId, name, true);
|
||||
}
|
||||
|
||||
var versions;
|
||||
try {
|
||||
versions = yield* that._sync(name, pkg);
|
||||
versions = yield that._sync(name, pkg);
|
||||
} catch (err) {
|
||||
that.log('[c#%s] [error] [%s] sync error: %s', concurrencyId, name, err.stack);
|
||||
yield* that._doneOne(concurrencyId, name, false);
|
||||
yield that._doneOne(concurrencyId, name, false);
|
||||
return;
|
||||
}
|
||||
|
||||
// has new version
|
||||
if (versions.length > 0) {
|
||||
that.updates.push(name);
|
||||
}
|
||||
|
||||
this.log('[c#%d] [%s] synced success, %d versions: %s',
|
||||
concurrencyId, name, versions.length, versions.join(', '));
|
||||
yield* this._doneOne(concurrencyId, name, true);
|
||||
yield this._doneOne(concurrencyId, name, true);
|
||||
|
||||
return versions;
|
||||
};
|
||||
|
||||
function* _listStarUsers(modName) {
|
||||
var users = yield* packageService.listStarUserNames(modName);
|
||||
var users = yield packageService.listStarUserNames(modName);
|
||||
var userMap = {};
|
||||
users.forEach(function (user) {
|
||||
userMap[user] = true;
|
||||
@@ -373,24 +428,34 @@ function* _listStarUsers(modName) {
|
||||
}
|
||||
|
||||
function* _saveNpmUser(username) {
|
||||
var user = yield* npmSerivce.getUser(username);
|
||||
var user = yield npmSerivce.getUser(username);
|
||||
if (!user) {
|
||||
return;
|
||||
var existsUser = yield User.findByName(username);
|
||||
if (existsUser && existsUser.isNpmUser) {
|
||||
// delete it
|
||||
yield User.destroy({
|
||||
where: {
|
||||
name: username,
|
||||
}
|
||||
});
|
||||
return { exists: true, deleted: true, isNpmUser: true };
|
||||
}
|
||||
return { exists: false };
|
||||
}
|
||||
yield* User.saveNpmUser(user);
|
||||
yield User.saveNpmUser(user);
|
||||
return user;
|
||||
}
|
||||
|
||||
function* _saveMaintainer(modName, username, action) {
|
||||
if (action === 'add') {
|
||||
yield* packageService.addPublicModuleMaintainer(modName, username);
|
||||
yield packageService.addPublicModuleMaintainer(modName, username);
|
||||
} else if (action === 'remove') {
|
||||
yield* packageService.removePublicModuleMaintainer(modName, username);
|
||||
yield packageService.removePublicModuleMaintainer(modName, username);
|
||||
}
|
||||
}
|
||||
|
||||
SyncModuleWorker.prototype._unpublished = function* (name, unpublishedInfo) {
|
||||
var mods = yield* packageService.listModulesByName(name);
|
||||
var mods = yield packageService.listModulesByName(name);
|
||||
this.log(' [%s] start unpublished %d versions from local cnpm registry',
|
||||
name, mods.length);
|
||||
if (common.isLocalModule(mods)) {
|
||||
@@ -399,13 +464,16 @@ SyncModuleWorker.prototype._unpublished = function* (name, unpublishedInfo) {
|
||||
return [];
|
||||
}
|
||||
|
||||
var r = yield* packageService.saveUnpublishedModule(name, unpublishedInfo);
|
||||
var r = yield packageService.saveUnpublishedModule(name, unpublishedInfo);
|
||||
this.log(' [%s] save unpublished info: %j to row#%s',
|
||||
name, unpublishedInfo, r.id);
|
||||
if (mods.length === 0) {
|
||||
return;
|
||||
}
|
||||
yield [packageService.removeModulesByName(name), packageService.removeModuleTags(name)];
|
||||
yield [
|
||||
packageService.removeModulesByName(name),
|
||||
packageService.removeModuleTags(name),
|
||||
];
|
||||
var keys = [];
|
||||
for (var i = 0; i < mods.length; i++) {
|
||||
var row = mods[i];
|
||||
@@ -439,11 +507,13 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
packageService.listModuleTags(name),
|
||||
_listStarUsers(name),
|
||||
packageService.listPublicModuleMaintainers(name),
|
||||
packageService.listModuleAbbreviatedsByName(name),
|
||||
];
|
||||
var moduleRows = result[0];
|
||||
var tagRows = result[1];
|
||||
var existsStarUsers = result[2];
|
||||
var existsNpmMaintainers = result[3];
|
||||
var existsModuleAbbreviateds = result[4];
|
||||
|
||||
if (common.isLocalModule(moduleRows)) {
|
||||
// publish on cnpm, dont sync this version package
|
||||
@@ -451,6 +521,12 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
return [];
|
||||
}
|
||||
|
||||
var missingModuleAbbreviateds = [];
|
||||
var existsModuleAbbreviatedsMap = {};
|
||||
for (var item of existsModuleAbbreviateds) {
|
||||
existsModuleAbbreviatedsMap[item.version] = item;
|
||||
}
|
||||
|
||||
hasModules = moduleRows.length > 0;
|
||||
var map = {};
|
||||
var localVersionNames = [];
|
||||
@@ -467,6 +543,11 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
localVersionNames.push(r.version);
|
||||
}
|
||||
|
||||
var latestVersionPackageReadme = {
|
||||
version: pkg['dist-tags'].latest,
|
||||
readme: pkg.readme,
|
||||
};
|
||||
|
||||
var tags = {};
|
||||
for (var i = 0; i < tagRows.length; i++) {
|
||||
var r = tagRows[i];
|
||||
@@ -477,6 +558,37 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
tags[r.tag] = r.version;
|
||||
}
|
||||
|
||||
// get package AbbreviatedMetadata
|
||||
var abbreviatedMetadatas = {};
|
||||
if (config.enableAbbreviatedMetadata) {
|
||||
var packageUrl = '/' + name.replace('/', '%2f');
|
||||
var result = yield npmSerivce.request(packageUrl, {
|
||||
dataType: 'text',
|
||||
registry: config.sourceNpmRegistry,
|
||||
headers: {
|
||||
Accept: 'application/vnd.npm.install-v1+json',
|
||||
},
|
||||
});
|
||||
if (result.status === 200) {
|
||||
var data;
|
||||
try {
|
||||
data = JSON.parse(result.data);
|
||||
} catch (err) {
|
||||
that.log(' [%s] get abbreviated meta error: %s, headers: %j, %j',
|
||||
name, err, result.headers, result.data);
|
||||
}
|
||||
if (data) {
|
||||
var versions = data && data.versions || {};
|
||||
for (var version in versions) {
|
||||
const item = versions[version];
|
||||
if (item && typeof item._hasShrinkwrap === 'boolean') {
|
||||
abbreviatedMetadatas[version] = { _hasShrinkwrap: item._hasShrinkwrap };
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var missingVersions = [];
|
||||
var missingTags = [];
|
||||
var missingDescriptions = [];
|
||||
@@ -487,6 +599,15 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
// [[user, 'add or remove'], ...]
|
||||
var diffNpmMaintainers = [];
|
||||
|
||||
// [
|
||||
// { name, version, _hasShrinkwrap }
|
||||
// ]
|
||||
var missingAbbreviatedMetadatas = [];
|
||||
// [
|
||||
// { name, version, deprecated },
|
||||
// ]
|
||||
var missingDeprecatedsOnExistsModuleAbbreviated = [];
|
||||
|
||||
// find out new maintainers
|
||||
var pkgMaintainers = pkg.maintainers || [];
|
||||
if (Array.isArray(pkgMaintainers)) {
|
||||
@@ -560,17 +681,47 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
if (!version || !version.dist || !version.dist.tarball) {
|
||||
continue;
|
||||
}
|
||||
//patch for readme
|
||||
if (!version.readme) {
|
||||
version.readme = pkg.readme;
|
||||
// remove readme
|
||||
if (config.enableAbbreviatedMetadata) {
|
||||
version.readme = undefined;
|
||||
} else {
|
||||
// patch for readme
|
||||
if (!version.readme) {
|
||||
version.readme = pkg.readme;
|
||||
}
|
||||
}
|
||||
|
||||
var publish_time = times[v];
|
||||
version.publish_time = publish_time ? Date.parse(publish_time) : null;
|
||||
if (!version.maintainers || !version.maintainers[0]) {
|
||||
version.maintainers = pkg.maintainers;
|
||||
}
|
||||
if (exists.package &&
|
||||
exists.package.dist.shasum === version.dist.shasum) {
|
||||
|
||||
var abbreviatedMetadata = abbreviatedMetadatas[version.version];
|
||||
|
||||
if (exists.package && exists.package.dist.shasum === version.dist.shasum) {
|
||||
var existsModuleAbbreviated = existsModuleAbbreviatedsMap[exists.package.version];
|
||||
if (!existsModuleAbbreviated) {
|
||||
missingModuleAbbreviateds.push(exists);
|
||||
} else {
|
||||
// sync missing deprecated on existsModuleAbbreviated
|
||||
if (exists.package.deprecated && exists.package.deprecated !== existsModuleAbbreviated.package.deprecated) {
|
||||
// add deprecated
|
||||
missingDeprecatedsOnExistsModuleAbbreviated.push({
|
||||
name,
|
||||
version: exists.package.version,
|
||||
deprecated: exists.package.deprecated,
|
||||
});
|
||||
} else if (existsModuleAbbreviated.package.deprecated && !exists.package.deprecated) {
|
||||
// remove deprecated
|
||||
missingDeprecatedsOnExistsModuleAbbreviated.push({
|
||||
name,
|
||||
version: exists.package.version,
|
||||
deprecated: undefined,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// * shasum make sure equal
|
||||
if ((version.publish_time === exists.publish_time) ||
|
||||
(!version.publish_time && exists.publish_time)) {
|
||||
@@ -585,24 +736,60 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
});
|
||||
}
|
||||
|
||||
if (!exists.package.readme && version.readme) {
|
||||
// * make sure readme exists
|
||||
missingReadmes.push({
|
||||
id: exists.id,
|
||||
readme: version.readme
|
||||
});
|
||||
if (config.enableAbbreviatedMetadata) {
|
||||
// remove readme
|
||||
if (exists.package.readme) {
|
||||
missingReadmes.push({
|
||||
id: exists.id,
|
||||
readme: undefined,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
if (!exists.package.readme && version.readme) {
|
||||
// * make sure readme exists
|
||||
missingReadmes.push({
|
||||
id: exists.id,
|
||||
readme: version.readme,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (version.deprecated && version.deprecated !== exists.package.deprecated) {
|
||||
// need to sync deprecated field
|
||||
missingDeprecateds.push({
|
||||
id: exists.id,
|
||||
deprecated: version.deprecated
|
||||
deprecated: version.deprecated,
|
||||
});
|
||||
}
|
||||
if (exists.package.deprecated && !version.deprecated) {
|
||||
// remove deprecated info
|
||||
missingDeprecateds.push({
|
||||
id: exists.id,
|
||||
deprecated: undefined,
|
||||
});
|
||||
}
|
||||
// find missing abbreviatedMetadata
|
||||
if (abbreviatedMetadata) {
|
||||
for (var key in abbreviatedMetadata) {
|
||||
if (!(key in exists.package) || abbreviatedMetadata[key] !== exists.package[key]) {
|
||||
missingAbbreviatedMetadatas.push(Object.assign({
|
||||
id: exists.id,
|
||||
name: exists.package.name,
|
||||
version: exists.package.version,
|
||||
}, abbreviatedMetadata));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// set abbreviatedMetadata to version package
|
||||
if (abbreviatedMetadata) {
|
||||
Object.assign(version, abbreviatedMetadata);
|
||||
}
|
||||
missingVersions.push(version);
|
||||
}
|
||||
|
||||
@@ -652,7 +839,7 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
yield* that._syncOneVersion(index, syncModule);
|
||||
yield that._syncOneVersion(index, syncModule);
|
||||
syncedVersionNames.push(syncModule.version);
|
||||
} catch (err) {
|
||||
that.log(' [%s:%d] sync error, version: %s, %s: %s',
|
||||
@@ -660,14 +847,13 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (deletedVersionNames.length === 0) {
|
||||
that.log(' [%s] no versions need to deleted', name);
|
||||
} else {
|
||||
that.log(' [%s] %d versions: %j need to deleted',
|
||||
name, deletedVersionNames.length, deletedVersionNames);
|
||||
try {
|
||||
yield* packageService.removeModulesByNameAndVersions(name, deletedVersionNames);
|
||||
yield packageService.removeModulesByNameAndVersions(name, deletedVersionNames);
|
||||
} catch (err) {
|
||||
that.log(' [%s] delete error, %s: %s', name, err.name, err.message);
|
||||
}
|
||||
@@ -699,7 +885,7 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
// sync missing tags
|
||||
function* syncTag() {
|
||||
if (deletedTags.length > 0) {
|
||||
yield* packageService.removeModuleTagsByNames(name, deletedTags);
|
||||
yield packageService.removeModuleTagsByNames(name, deletedTags);
|
||||
that.log(' [%s] deleted %d tags: %j',
|
||||
name, deletedTags.length, deletedTags);
|
||||
}
|
||||
@@ -748,6 +934,92 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
}
|
||||
}
|
||||
|
||||
function* syncModuleAbbreviateds() {
|
||||
if (missingModuleAbbreviateds.length === 0) {
|
||||
return;
|
||||
}
|
||||
that.log(' [%s] saving %d missing moduleAbbreviateds', name, missingModuleAbbreviateds.length);
|
||||
|
||||
var res = yield gather(missingModuleAbbreviateds.map(function (item) {
|
||||
return packageService.saveModuleAbbreviated(item);
|
||||
}));
|
||||
|
||||
for (var i = 0; i < res.length; i++) {
|
||||
var item = missingModuleAbbreviateds[i];
|
||||
var r = res[i];
|
||||
if (r.error) {
|
||||
that.log(' save moduleAbbreviateds error, module: %s@%s, error: %s', item.name, item.version, r.error.message);
|
||||
} else {
|
||||
that.log(' saved moduleAbbreviateds, module: %s@%s', item.name, item.version);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function* syncAbbreviatedMetadatas() {
|
||||
if (missingAbbreviatedMetadatas.length === 0) {
|
||||
return;
|
||||
}
|
||||
that.log(' [%s] saving %d abbreviated meta datas', name, missingAbbreviatedMetadatas.length);
|
||||
|
||||
var res = yield gather(missingAbbreviatedMetadatas.map(function (item) {
|
||||
return packageService.updateModuleAbbreviatedPackage(item);
|
||||
}));
|
||||
|
||||
for (var i = 0; i < res.length; i++) {
|
||||
var item = missingAbbreviatedMetadatas[i];
|
||||
var r = res[i];
|
||||
if (r.error) {
|
||||
that.log(' save error, module_abbreviated: %s@%s, error: %s',
|
||||
item.name, item.version, r.error.stack);
|
||||
} else {
|
||||
that.log(' saved, module_abbreviated: %s@%s, %j', item.name, item.version, item);
|
||||
}
|
||||
}
|
||||
|
||||
var res = yield gather(missingAbbreviatedMetadatas.map(function (item) {
|
||||
var fields = {};
|
||||
for (var key in item) {
|
||||
if (key === 'id' || key === 'name' || key === 'version') {
|
||||
continue;
|
||||
}
|
||||
fields[key] = item[key];
|
||||
}
|
||||
return packageService.updateModulePackageFields(item.id, fields);
|
||||
}));
|
||||
|
||||
for (var i = 0; i < res.length; i++) {
|
||||
var item = missingAbbreviatedMetadatas[i];
|
||||
var r = res[i];
|
||||
if (r.error) {
|
||||
that.log(' save error, module id: %s, error: %s', item.id, r.error.stack);
|
||||
} else {
|
||||
that.log(' saved, module id: %s, %j', item.id, item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function *syncDeprecatedsOnExistsModuleAbbreviated() {
|
||||
if (missingDeprecatedsOnExistsModuleAbbreviated.length === 0) {
|
||||
return;
|
||||
}
|
||||
that.log(' [%s] saving %d module abbreviated deprecated fields',
|
||||
name, missingDeprecatedsOnExistsModuleAbbreviated.length);
|
||||
|
||||
var res = yield gather(missingDeprecatedsOnExistsModuleAbbreviated.map(function (item) {
|
||||
return packageService.updateModuleAbbreviatedPackage(item);
|
||||
}));
|
||||
|
||||
for (var i = 0; i < res.length; i++) {
|
||||
var item = missingDeprecatedsOnExistsModuleAbbreviated[i];
|
||||
var r = res[i];
|
||||
if (r.error) {
|
||||
that.log(' save error, module abbreviated: %s@%s, error: %s', item.name, item.version, r.error.message);
|
||||
} else {
|
||||
that.log(' saved, module abbreviated: %s@%s, deprecated: %j', item.name, item.version, item.deprecated);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function *syncDeprecateds() {
|
||||
if (missingDeprecateds.length === 0) {
|
||||
return;
|
||||
@@ -766,7 +1038,7 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
if (r.error) {
|
||||
that.log(' save error, id: %s, error: %s', item.id, r.error.message);
|
||||
} else {
|
||||
that.log(' saved, id: %s', item.id);
|
||||
that.log(' saved, id: %s, deprecated: %j', item.id, item.deprecated);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -849,19 +1121,35 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
|
||||
}
|
||||
}
|
||||
|
||||
yield [
|
||||
syncDes(),
|
||||
syncTag(),
|
||||
syncReadme(),
|
||||
syncDeprecateds(),
|
||||
syncMissingStarUsers(),
|
||||
syncMissingUsers(),
|
||||
syncNpmPackageMaintainers(),
|
||||
];
|
||||
if (latestVersionPackageReadme.version && latestVersionPackageReadme.readme) {
|
||||
var existsPackageReadme = yield packageService.getPackageReadme(name, true);
|
||||
if (!existsPackageReadme ||
|
||||
existsPackageReadme.version !== latestVersionPackageReadme.version ||
|
||||
existsPackageReadme.readme !== latestVersionPackageReadme.readme) {
|
||||
var r = yield packageService.savePackageReadme(name, latestVersionPackageReadme.readme, latestVersionPackageReadme.version);
|
||||
that.log(' save packageReadme: %s %s %s', r.id, r.name, r.version);
|
||||
}
|
||||
}
|
||||
|
||||
yield syncDes();
|
||||
yield syncTag();
|
||||
yield syncReadme();
|
||||
yield syncDeprecateds();
|
||||
yield syncMissingStarUsers();
|
||||
yield syncMissingUsers();
|
||||
yield syncNpmPackageMaintainers();
|
||||
yield syncModuleAbbreviateds();
|
||||
yield syncAbbreviatedMetadatas();
|
||||
yield syncDeprecatedsOnExistsModuleAbbreviated();
|
||||
|
||||
return syncedVersionNames;
|
||||
};
|
||||
|
||||
SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePackage) {
|
||||
var delay = Date.now() - sourcePackage.publish_time;
|
||||
logger.syncInfo('[sync_module_worker] delay: %s ms, publish_time: %s, start sync %s@%s',
|
||||
delay, utility.logDate(new Date(sourcePackage.publish_time)),
|
||||
sourcePackage.name, sourcePackage.version);
|
||||
var that = this;
|
||||
var username = this.username;
|
||||
var downurl = sourcePackage.dist.tarball;
|
||||
@@ -885,9 +1173,11 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
|
||||
devDependencies = Object.keys(sourcePackage.devDependencies || {});
|
||||
}
|
||||
|
||||
that.log(' [%s:%d] syncing, version: %s, dist: %j, no deps: %s, ' +
|
||||
that.log(' [%s:%d] syncing, delay: %s ms, version: %s, dist: %j, no deps: %s, ' +
|
||||
'publish on cnpm: %s, dependencies: %d, devDependencies: %d, syncDevDependencies: %s',
|
||||
sourcePackage.name, versionIndex, sourcePackage.version,
|
||||
sourcePackage.name, versionIndex,
|
||||
delay,
|
||||
sourcePackage.version,
|
||||
sourcePackage.dist, that.noDep, that._publish,
|
||||
dependencies.length,
|
||||
devDependencies.length, this.syncDevDependencies);
|
||||
@@ -911,14 +1201,22 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
|
||||
}
|
||||
|
||||
// add module dependence
|
||||
yield* packageService.addDependencies(sourcePackage.name, dependencies);
|
||||
yield packageService.addDependencies(sourcePackage.name, dependencies);
|
||||
|
||||
var shasum = crypto.createHash('sha1');
|
||||
var dataSize = 0;
|
||||
|
||||
try {
|
||||
// get tarball
|
||||
var r = yield urllib.request(downurl, options);
|
||||
logger.syncInfo('[sync_module_worker] downloading %j to %j', downurl, filepath);
|
||||
var r;
|
||||
try {
|
||||
r = yield urllib.request(downurl, options);
|
||||
} catch (err) {
|
||||
logger.syncInfo('[sync_module_worker] download %j to %j error: %s', downurl, filepath, err);
|
||||
throw err;
|
||||
}
|
||||
|
||||
var statusCode = r.status || -1;
|
||||
// https://github.com/cnpm/cnpmjs.org/issues/325
|
||||
// if (statusCode === 404) {
|
||||
@@ -932,6 +1230,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
|
||||
var err = new Error('Download ' + downurl + ' fail, status: ' + statusCode);
|
||||
err.name = 'DownloadTarballError';
|
||||
err.data = sourcePackage;
|
||||
logger.syncInfo('[sync_module_worker] %s', err.message);
|
||||
throw err;
|
||||
}
|
||||
|
||||
@@ -948,6 +1247,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
|
||||
var err = new Error('Download ' + downurl + ' file size is zero');
|
||||
err.name = 'DownloadTarballSizeZeroError';
|
||||
err.data = sourcePackage;
|
||||
logger.syncInfo('[sync_module_worker] %s', err.message);
|
||||
throw err;
|
||||
}
|
||||
|
||||
@@ -958,6 +1258,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
|
||||
' not match ' + sourcePackage.dist.shasum);
|
||||
err.name = 'DownloadTarballShasumError';
|
||||
err.data = sourcePackage;
|
||||
logger.syncInfo('[sync_module_worker] %s', err.message);
|
||||
throw err;
|
||||
}
|
||||
|
||||
@@ -968,8 +1269,18 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
|
||||
};
|
||||
// upload to NFS
|
||||
logger.syncInfo('[sync_module_worker] uploading %j to nfs', options);
|
||||
var result = yield nfs.upload(filepath, options);
|
||||
return yield *afterUpload(result);
|
||||
var result;
|
||||
try {
|
||||
result = yield nfs.upload(filepath, options);
|
||||
} catch (err) {
|
||||
logger.syncInfo('[sync_module_worker] upload %j to nfs error: %s', err);
|
||||
throw err;
|
||||
}
|
||||
logger.syncInfo('[sync_module_worker] uploaded, saving %j to database', result);
|
||||
var r = yield afterUpload(result);
|
||||
logger.syncInfo('[sync_module_worker] sync %s@%s done!',
|
||||
sourcePackage.name, sourcePackage.version);
|
||||
return r;
|
||||
} finally {
|
||||
// remove tmp file whatever
|
||||
fs.unlink(filepath, utility.noop);
|
||||
@@ -1012,15 +1323,22 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
|
||||
}
|
||||
|
||||
mod.package.dist = dist;
|
||||
var r = yield* packageService.saveModule(mod);
|
||||
var r = yield packageService.saveModule(mod);
|
||||
var moduleAbbreviatedId = null;
|
||||
if (config.enableAbbreviatedMetadata) {
|
||||
var moduleAbbreviatedResult = yield packageService.saveModuleAbbreviated(mod);
|
||||
moduleAbbreviatedId = moduleAbbreviatedResult.id;
|
||||
}
|
||||
|
||||
that.log(' [%s:%s] done, insertId: %s, author: %s, version: %s, '
|
||||
+ 'size: %d, publish_time: %j, publish on cnpm: %s',
|
||||
+ 'size: %d, publish_time: %j, publish on cnpm: %s, '
|
||||
+ 'moduleAbbreviatedId: %s',
|
||||
sourcePackage.name, versionIndex,
|
||||
r.id,
|
||||
author, mod.version, dataSize,
|
||||
new Date(mod.publish_time),
|
||||
that._publish);
|
||||
that._publish,
|
||||
moduleAbbreviatedId);
|
||||
|
||||
return r;
|
||||
}
|
||||
@@ -1028,7 +1346,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
|
||||
|
||||
SyncModuleWorker.sync = function* (name, username, options) {
|
||||
options = options || {};
|
||||
var result = yield* logService.create({name: name, username: username});
|
||||
var result = yield logService.create({name: name, username: username});
|
||||
var worker = new SyncModuleWorker({
|
||||
logId: result.id,
|
||||
type: options.type,
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
@@ -27,6 +27,11 @@ var config = require('../config');
|
||||
var DOWNLOAD_TIMEOUT = ms('10m');
|
||||
|
||||
exports.downloadAsReadStream = function* (key) {
|
||||
var options = { timeout: DOWNLOAD_TIMEOUT };
|
||||
if (nfs.createDownloadStream) {
|
||||
return yield nfs.createDownloadStream(key, options);
|
||||
}
|
||||
|
||||
var tmpPath = path.join(config.uploadDir,
|
||||
utility.randomString() + key.replace(/\//g, '-'));
|
||||
function cleanup() {
|
||||
@@ -35,7 +40,7 @@ exports.downloadAsReadStream = function* (key) {
|
||||
}
|
||||
debug('downloadAsReadStream() %s to %s', key, tmpPath);
|
||||
try {
|
||||
yield nfs.download(key, tmpPath, {timeout: DOWNLOAD_TIMEOUT});
|
||||
yield nfs.download(key, tmpPath, options);
|
||||
} catch (err) {
|
||||
debug('downloadAsReadStream() %s to %s error: %s', key, tmpPath, err.stack);
|
||||
cleanup();
|
||||
@@ -51,11 +56,11 @@ 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 lastweekStart = end.clone().subtract(1, 'weeks').startOf('isoweek');
|
||||
var lastweekEnd = lastweekStart.clone().endOf('isoweek').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');
|
||||
var 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');
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -18,6 +18,7 @@ var utility = require('utility');
|
||||
var util = require('util');
|
||||
var config = require('../../config');
|
||||
var packageService = require('../../services/package');
|
||||
var DownloadTotal = require('../../services/download_total');
|
||||
|
||||
exports.version = function* () {
|
||||
var color = 'lightgrey';
|
||||
@@ -40,9 +41,22 @@ exports.version = function* () {
|
||||
}
|
||||
|
||||
var 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://img.shields.io/badge/%s-%s-%s.svg?style=%s',
|
||||
subject, version, color, utility.encodeURIComponent(style));
|
||||
var 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(config.badgePrefixURL + '/downloads-%s-brightgreen.svg?style=%s',
|
||||
count, utility.encodeURIComponent(style));
|
||||
this.redirect(url);
|
||||
};
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com> (http://deadhorse.me)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <m@fengmk2.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -21,8 +21,16 @@ var packageService = require('../../../services/package');
|
||||
module.exports = function* search() {
|
||||
var params = this.params;
|
||||
var word = params.word || params[0];
|
||||
var limit = Number(this.query.limit) || 100;
|
||||
|
||||
if (limit > 10000) {
|
||||
limit = 10000;
|
||||
}
|
||||
|
||||
debug('search %j', word);
|
||||
var result = yield* packageService.search(word);
|
||||
var result = yield* packageService.search(word, {
|
||||
limit: limit
|
||||
});
|
||||
|
||||
var match = null;
|
||||
for (var i = 0; i < result.searchMatchs.length; i++) {
|
||||
@@ -35,13 +43,12 @@ module.exports = function* search() {
|
||||
|
||||
// return a json result
|
||||
if (this.query && this.query.type === 'json') {
|
||||
this.body = {
|
||||
this.jsonp = {
|
||||
keyword: word,
|
||||
match: match,
|
||||
packages: result.searchMatchs,
|
||||
keywords: result.keywordMatchs,
|
||||
};
|
||||
this.type = 'application/json; charset=utf-8';
|
||||
return;
|
||||
}
|
||||
yield this.render('search', {
|
||||
|
||||
@@ -1,20 +1,5 @@
|
||||
/**!
|
||||
* cnpmjs.org - controllers/web/package/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 debug = require('debug')('cnpmjs.org:controllers:web:package:show');
|
||||
var bytes = require('bytes');
|
||||
var giturl = require('giturl');
|
||||
@@ -51,7 +36,7 @@ module.exports = function* show(next) {
|
||||
var pkg = yield packageService[getPackageMethod].apply(packageService, getPackageArgs);
|
||||
if (!pkg || !pkg.package) {
|
||||
// check if unpublished
|
||||
var unpublishedInfo = yield* packageService.getUnpublishedModule(name);
|
||||
var unpublishedInfo = yield packageService.getUnpublishedModule(name);
|
||||
debug('show unpublished %j', unpublishedInfo);
|
||||
if (unpublishedInfo) {
|
||||
var data = {
|
||||
@@ -68,12 +53,13 @@ module.exports = function* show(next) {
|
||||
}
|
||||
}
|
||||
yield this.render('package_unpublished', {
|
||||
package: data
|
||||
package: data,
|
||||
title: 'Package - ' + name
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var r = yield [
|
||||
@@ -90,6 +76,12 @@ module.exports = function* show(next) {
|
||||
pkg.package.fromNow = moment(pkg.publish_time).fromNow();
|
||||
pkg = pkg.package;
|
||||
pkg.users = users;
|
||||
if (!pkg.readme && config.enableAbbreviatedMetadata) {
|
||||
var packageReadme = yield packageService.getPackageReadme(name);
|
||||
if (packageReadme) {
|
||||
pkg.readme = packageReadme.readme;
|
||||
}
|
||||
}
|
||||
if (pkg.readme && typeof pkg.readme !== 'string') {
|
||||
pkg.readme = 'readme is not string: ' + JSON.stringify(pkg.readme);
|
||||
} else {
|
||||
@@ -124,7 +116,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 = {};
|
||||
@@ -156,32 +148,47 @@ module.exports = function* show(next) {
|
||||
// "node2": ">= 0.10.9",
|
||||
// "node3": ">= 0.6.9",
|
||||
// };
|
||||
if (pkg.engines) {
|
||||
for (var k in pkg.engines) {
|
||||
var engine = String(pkg.engines[k] || '').trim();
|
||||
var color = 'blue';
|
||||
if (k.indexOf('node') === 0) {
|
||||
color = 'yellowgreen';
|
||||
var version = /(\d+\.\d+\.\d+)/.exec(engine);
|
||||
if (version) {
|
||||
version = version[0];
|
||||
if (/^0\.11\.\d+/.test(version)) {
|
||||
color = 'red';
|
||||
} else if (/^0\.10\./.test(version) ||
|
||||
/^0\.12\./.test(version) ||
|
||||
/^0\.14\./.test(version) ||
|
||||
/^[^0]+\./.test(version)) {
|
||||
color = 'brightgreen';
|
||||
}
|
||||
// "engines": "0.10.24",
|
||||
// invalid engines
|
||||
if (pkg.engines && typeof pkg.engines !== 'object') {
|
||||
pkg.engines = {};
|
||||
}
|
||||
|
||||
for (var k in pkg.engines) {
|
||||
var engine = String(pkg.engines[k] || '').trim();
|
||||
var color = 'blue';
|
||||
if (k.indexOf('node') === 0) {
|
||||
color = 'yellowgreen';
|
||||
var version = /(\d+\.\d+\.\d+)/.exec(engine);
|
||||
if (version) {
|
||||
version = version[0];
|
||||
if (/^0\.11\.\d+/.test(version)) {
|
||||
color = 'red';
|
||||
} else if (/^0\.10\./.test(version) ||
|
||||
/^0\.12\./.test(version) ||
|
||||
/^0\.14\./.test(version) ||
|
||||
/^[^0]+\./.test(version)) {
|
||||
color = 'brightgreen';
|
||||
}
|
||||
}
|
||||
pkg.engines[k] = {
|
||||
version: engine,
|
||||
title: k + ': ' + engine,
|
||||
badgeURL: 'https://img.shields.io/badge/' + encodeURIComponent(k) +
|
||||
'-' + encodeURIComponent(engine) + '-' + color + '.svg?style=flat-square',
|
||||
};
|
||||
}
|
||||
pkg.engines[k] = {
|
||||
version: engine,
|
||||
title: k + ': ' + engine,
|
||||
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', {
|
||||
|
||||
@@ -37,7 +37,8 @@ module.exports = function* showUser(next) {
|
||||
var data = {
|
||||
name: name,
|
||||
email: user.email,
|
||||
json: user.json || {}
|
||||
json: user.json || {},
|
||||
isNpmUser: user.isNpmUser,
|
||||
};
|
||||
|
||||
if (data.json.login) {
|
||||
|
||||
19
dispatch.js
19
dispatch.js
@@ -1,20 +1,5 @@
|
||||
/**!
|
||||
* cnpmjs.org - dispatch.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';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var childProcess = require('child_process');
|
||||
var path = require('path');
|
||||
var util = require('util');
|
||||
@@ -23,8 +8,8 @@ var config = require('./config');
|
||||
var workerPath = path.join(__dirname, 'worker.js');
|
||||
var syncPath = path.join(__dirname, 'sync');
|
||||
|
||||
console.log('Starting cnpmjs.org ...\ncluster: %s\nadmins: %j\nscopes: %j\nsourceNpmRegistry: %s',
|
||||
config.enableCluster, config.admins, config.scopes, config.sourceNpmRegistry);
|
||||
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);
|
||||
|
||||
if (config.enableCluster) {
|
||||
forkWorker();
|
||||
|
||||
29
docs/db.sql
29
docs/db.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `user` (
|
||||
`roles` varchar(200) NOT NULL DEFAULT '[]',
|
||||
`rev` varchar(40) NOT NULL,
|
||||
`email` varchar(400) NOT NULL,
|
||||
`json` longtext CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT 'json details',
|
||||
`json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'json details',
|
||||
`npm_user` tinyint(1) DEFAULT '0' COMMENT 'user sync from npm or not, 1: true, other: false',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `name` (`name`),
|
||||
@@ -18,6 +18,7 @@ CREATE TABLE IF NOT EXISTS `user` (
|
||||
-- ALTER TABLE `user`
|
||||
-- ADD `json` longtext CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT 'json details',
|
||||
-- ADD `npm_user` tinyint(1) DEFAULT '0' COMMENT 'user sync from npm or not, 1: true, other: false';
|
||||
-- ALTER TABLE `user` CHANGE `json` `json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'json details';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `module_keyword` (
|
||||
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
|
||||
@@ -86,6 +87,32 @@ CREATE TABLE IF NOT EXISTS `module` (
|
||||
-- show create table module\G
|
||||
-- ALTER TABLE `module` CHANGE `name` `name` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'module name';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `module_abbreviated` (
|
||||
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
|
||||
`gmt_create` datetime NOT NULL COMMENT 'create time',
|
||||
`gmt_modified` datetime NOT NULL COMMENT 'modified time',
|
||||
`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'module name',
|
||||
`version` varchar(30) NOT NULL COMMENT 'module version',
|
||||
`package` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'the abbreviated metadata',
|
||||
`publish_time` bigint(20) unsigned,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `name` (`name`,`version`),
|
||||
KEY `gmt_modified` (`gmt_modified`),
|
||||
KEY `publish_time` (`publish_time`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module abbreviated info';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `package_readme` (
|
||||
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
|
||||
`gmt_create` datetime NOT NULL COMMENT 'create time',
|
||||
`gmt_modified` datetime NOT NULL COMMENT 'modified time',
|
||||
`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'module name',
|
||||
`readme` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT 'the latest version readme',
|
||||
`version` varchar(30) NOT NULL COMMENT 'module version',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `name` (`name`),
|
||||
KEY `gmt_modified` (`gmt_modified`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='package latest readme';
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `module_log` (
|
||||
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
|
||||
`gmt_create` datetime NOT NULL COMMENT 'create time',
|
||||
|
||||
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,11 +4,12 @@ So `cnpm` is meaning: **Company npm**.
|
||||
|
||||
## Registry
|
||||
|
||||
- Our public registry: [r.cnpmjs.org](http://r.cnpmjs.org), syncing from [registry.npmjs.org](http://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">
|
||||
<tbody>
|
||||
<tr>
|
||||
@@ -28,12 +29,17 @@ So `cnpm` is meaning: **Company npm**.
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="sync" style="display:none;">
|
||||
<h3>Sync Status</h3>
|
||||
<p id="sync-model"></p>
|
||||
<p>Last sync time is <span id="last-sync-time"></span>. </p>
|
||||
<p class="syncing alert alert-info">The sync worker is working in the backend now. </p>
|
||||
<div class="ant-alert ant-alert-info syncing">
|
||||
<span class="anticon ant-alert-icon anticon-info-circle"></span>
|
||||
<span class="ant-alert-description">The sync worker is working in the backend now. </span>
|
||||
</div>
|
||||
<div class="ant-table">
|
||||
<table class="sync-status">
|
||||
<tbody>
|
||||
<tr>
|
||||
@@ -48,48 +54,53 @@ So `cnpm` is meaning: **Company npm**.
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Running on [Node.js](http://nodejs.org), version <span id="node-version"></span>.
|
||||
|
||||
<script src="/js/readme.js"></script>
|
||||
|
||||
## Version Badge
|
||||
## Badges
|
||||
|
||||
Default style is `flat-square`.
|
||||
|
||||
Badge URL: `http://cnpmjs.org/badge/v/cnpmjs.org.svg` 
|
||||
### Version
|
||||
|
||||
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`: 
|
||||
|
||||
### Downloads
|
||||
|
||||
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://r.cnpmjs.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://r.cnpmjs.org \
|
||||
alias cnpm="npm --registry=https://registry.npm.taobao.org \
|
||||
--cache=$HOME/.npm/.cache/cnpm \
|
||||
--disturl=http://cnpmjs.org/dist \
|
||||
--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://r.cnpmjs.org \
|
||||
$ echo '\n#alias for cnpm\nalias cnpm="npm --registry=https://registry.npm.taobao.org \
|
||||
--cache=$HOME/.npm/.cache/cnpm \
|
||||
--disturl=http://cnpmjs.org/dist \
|
||||
--disturl=https://npm.taobao.org/mirrors/node \
|
||||
--userconfig=$HOME/.cnpmrc"' >> ~/.zshrc && source ~/.zshrc
|
||||
```
|
||||
|
||||
### install
|
||||
|
||||
Install package from [r.cnpmjs.org](http://r.cnpmjs.org). When installing a package or version does not exist, it will try to install from the official registry([registry.npmjs.org](http://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]
|
||||
@@ -106,7 +117,7 @@ $ cnpm sync connect
|
||||
sync package on web: [sync/connect](/sync/connect)
|
||||
|
||||
```bash
|
||||
$ open http://cnpmjs.org/sync/connect
|
||||
$ open http://registry.npm.taobao.org/sync/connect
|
||||
```
|
||||
|
||||
### publish / unpublish
|
||||
@@ -134,6 +145,11 @@ $ cnpm info cnpm
|
||||
|
||||
Release [History](/history).
|
||||
|
||||
## npm and cnpm relation
|
||||
## npmjs.org, cnpmjs.org and npm.taobao.org relation
|
||||
|
||||

|
||||

|
||||
|
||||
## Sponsors
|
||||
|
||||
- [](http://click.aliyun.com/m/4288/) (2016.2 - now)
|
||||
- [](http://www.ucloud.cn?sem=sdk-CNPMJS) (2015.3 - 2016.3)
|
||||
|
||||
2
index.js
2
index.js
@@ -1,6 +1,4 @@
|
||||
/**!
|
||||
* cnpmjs.org - index.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/**!
|
||||
* 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.
|
||||
*/
|
||||
|
||||
var crypto = require('crypto');
|
||||
var path = require('path');
|
||||
var config = require('../config');
|
||||
@@ -27,12 +13,17 @@ exports.getTarballFilepath = function (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] !== '@') {
|
||||
filename = name.split('/')[0] + '/' + filename;
|
||||
}
|
||||
return '/' + name + '/-/' + filename;
|
||||
};
|
||||
|
||||
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);
|
||||
@@ -66,3 +57,10 @@ exports.isLocalModule = function (mods) {
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
exports.isPrivateScopedPackage = function (name) {
|
||||
if (name[0] !== '@') {
|
||||
return false;
|
||||
}
|
||||
return config.scopes.indexOf(name.split('/')[0]) >= 0;
|
||||
};
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:middleware:auth');
|
||||
var UserService = require('../services/user');
|
||||
var config = require('../config');
|
||||
|
||||
/**
|
||||
* Parse the request authorization
|
||||
@@ -30,16 +31,17 @@ module.exports = function () {
|
||||
authorization = authorization.trim();
|
||||
debug('%s %s with %j', this.method, this.url, authorization);
|
||||
if (!authorization) {
|
||||
return yield* next;
|
||||
return yield* unauthorized.call(this, next);
|
||||
}
|
||||
|
||||
authorization = new Buffer(authorization, 'base64').toString().split(':');
|
||||
if (authorization.length !== 2) {
|
||||
return yield* next;
|
||||
authorization = new Buffer(authorization, 'base64').toString();
|
||||
var pos = authorization.indexOf(':');
|
||||
if (pos === -1) {
|
||||
return yield* unauthorized.call(this, next);
|
||||
}
|
||||
|
||||
var username = authorization[0];
|
||||
var password = authorization[1];
|
||||
var username = authorization.slice(0, pos);
|
||||
var password = authorization.slice(pos + 1);
|
||||
|
||||
var row;
|
||||
try {
|
||||
@@ -52,7 +54,7 @@ module.exports = function () {
|
||||
|
||||
if (!row) {
|
||||
debug('auth fail user: %j, headers: %j', row, this.header);
|
||||
return yield* next;
|
||||
return yield* unauthorized.call(this, next);
|
||||
}
|
||||
|
||||
this.user.name = row.login;
|
||||
@@ -62,3 +64,19 @@ module.exports = function () {
|
||||
yield* next;
|
||||
};
|
||||
};
|
||||
|
||||
function* unauthorized(next) {
|
||||
if (!config.alwaysAuth || this.method !== 'GET') {
|
||||
return yield* next;
|
||||
}
|
||||
this.status = 401;
|
||||
this.set('WWW-Authenticate', 'Basic realm="sample"');
|
||||
if (this.accepts(['html', 'json']) === 'json') {
|
||||
this.body = {
|
||||
error: 'unauthorized',
|
||||
reason: 'login first'
|
||||
};
|
||||
} else {
|
||||
this.body = 'login first';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
/**
|
||||
* CORS middleware
|
||||
*
|
||||
* @param {Object} [settings]
|
||||
* @return {Function}
|
||||
* @api public
|
||||
*/
|
||||
module.exports = function(settings) {
|
||||
"use strict";
|
||||
var defaults = {
|
||||
origin: function(ctx) {
|
||||
return ctx.get('origin') || '*';
|
||||
},
|
||||
methods: 'GET,HEAD,PUT,POST,DELETE'
|
||||
};
|
||||
|
||||
/**
|
||||
* Set options
|
||||
*
|
||||
* @type {Object}
|
||||
*/
|
||||
var options = settings || defaults;
|
||||
if (options.origin !== false) {
|
||||
var t = typeof options.origin;
|
||||
if (t !== 'string' && t !== 'function') {
|
||||
options.origin = defaults.origin;
|
||||
}
|
||||
}
|
||||
|
||||
if (Array.isArray(options.expose)) {
|
||||
options.expose = options.expose.join(',');
|
||||
}
|
||||
|
||||
options.maxAge = options.maxAge && options.maxAge.toString();
|
||||
|
||||
options.methods = options.methods || defaults.methods;
|
||||
if (Array.isArray(options.methods)) {
|
||||
options.methods = options.methods.join(',');
|
||||
}
|
||||
|
||||
if (Array.isArray(options.headers)) {
|
||||
options.headers = options.headers.join(',');
|
||||
}
|
||||
|
||||
return function* cors(next) {
|
||||
/**
|
||||
* Access Control Allow Origin
|
||||
*/
|
||||
|
||||
var origin = options.origin;
|
||||
if (origin === false) {
|
||||
return yield* next;
|
||||
}
|
||||
|
||||
if (typeof options.origin === 'function') {
|
||||
origin = options.origin(this);
|
||||
}
|
||||
|
||||
if (origin === false) {
|
||||
return yield* next;
|
||||
}
|
||||
|
||||
this.set('Access-Control-Allow-Origin', origin);
|
||||
|
||||
/**
|
||||
* Access Control Expose Headers
|
||||
*/
|
||||
if (options.expose) {
|
||||
this.set('Access-Control-Expose-Headers', options.expose);
|
||||
}
|
||||
|
||||
/**
|
||||
* Access Control Max Age
|
||||
*/
|
||||
|
||||
if (options.maxAge) {
|
||||
this.set('Access-Control-Max-Age', options.maxAge);
|
||||
}
|
||||
|
||||
/**
|
||||
* Access Control Allow Credentials
|
||||
*/
|
||||
if (options.credentials === true) {
|
||||
this.set('Access-Control-Allow-Credentials', 'true');
|
||||
}
|
||||
|
||||
/**
|
||||
* Access Control Allow Methods
|
||||
*/
|
||||
this.set('Access-Control-Allow-Methods', options.methods);
|
||||
|
||||
/**
|
||||
* Access Control Allow Headers
|
||||
*/
|
||||
var allowHeaders = options.headers;
|
||||
if (!allowHeaders) {
|
||||
allowHeaders = this.get('access-control-request-headers');
|
||||
}
|
||||
if (allowHeaders) {
|
||||
this.set('Access-Control-Allow-Headers', allowHeaders);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns
|
||||
*/
|
||||
if (this.method === 'OPTIONS') {
|
||||
this.status = 204;
|
||||
} else {
|
||||
yield* next;
|
||||
}
|
||||
};
|
||||
|
||||
};
|
||||
@@ -1,11 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/exists_package.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
@@ -22,7 +22,7 @@ var template = '<?xml version="1.0" encoding="UTF-8"?>\
|
||||
<Url method="get" type="text/html" template="http://${host}/browse/keyword/{searchTerms}"/>\
|
||||
</OpenSearchDescription>';
|
||||
|
||||
module.exports = function *publishable(next) {
|
||||
module.exports = function *opensearch(next) {
|
||||
if (this.path === '/opensearch.xml') {
|
||||
this.type = 'text/xml';
|
||||
this.charset = 'utf-8';
|
||||
|
||||
@@ -1,12 +1,3 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/proxy_to_npm.js
|
||||
*
|
||||
* Copyright(c) Alibaba Group Holding Limited.
|
||||
*
|
||||
* Authors:
|
||||
* 苏千 <suqian.yf@alipay.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
@@ -33,11 +24,11 @@ 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;
|
||||
@@ -49,7 +40,7 @@ module.exports = function (options) {
|
||||
}
|
||||
}
|
||||
if (!match) {
|
||||
return yield* next;
|
||||
return yield next;
|
||||
}
|
||||
|
||||
var url = redirectUrl + this.url;
|
||||
|
||||
@@ -19,8 +19,13 @@ var config = require('../config');
|
||||
var debug = require('debug')('cnpmjs.org:middlewares/publishable');
|
||||
|
||||
module.exports = function *publishable(next) {
|
||||
// private mode, only admin user can publish
|
||||
if (config.enablePrivate && !this.user.isAdmin) {
|
||||
// admins always can publish and unpublish
|
||||
if (this.user.isAdmin) {
|
||||
return yield next;
|
||||
}
|
||||
|
||||
// private mode, normal user can't publish and unpublish
|
||||
if (config.enablePrivate) {
|
||||
this.status = 403;
|
||||
this.body = {
|
||||
error: 'no_perms',
|
||||
@@ -29,28 +34,26 @@ module.exports = function *publishable(next) {
|
||||
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];
|
||||
|
||||
// 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);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -81,12 +84,7 @@ 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 = {
|
||||
|
||||
@@ -23,7 +23,8 @@ var staticDir = path.join(path.dirname(__dirname), 'public');
|
||||
module.exports = middlewares.staticCache(staticDir, {
|
||||
buffer: config.debug ? false : true,
|
||||
maxAge: config.debug ? 0 : 60 * 60 * 24 * 7,
|
||||
alas: {
|
||||
alias: {
|
||||
'/favicon.ico': '/favicon.png'
|
||||
}
|
||||
},
|
||||
gzip: config.enableCompress,
|
||||
});
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/sync_by_install.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
/**
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
@@ -17,33 +15,36 @@
|
||||
var 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
|
||||
// request not by node, consider it request from web, don't sync
|
||||
var 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];
|
||||
|
||||
// scoped package dont sync
|
||||
// private scoped package don't sync
|
||||
if (name && name[0] === '@') {
|
||||
return yield* next;
|
||||
var scope = name.split('/')[0];
|
||||
if (config.scopes.indexOf(scope) >= 0) {
|
||||
return yield next;
|
||||
}
|
||||
}
|
||||
|
||||
this.allowSync = true;
|
||||
yield* next;
|
||||
yield next;
|
||||
};
|
||||
|
||||
24
middleware/unpublishable.js
Normal file
24
middleware/unpublishable.js
Normal file
@@ -0,0 +1,24 @@
|
||||
/**!
|
||||
* cnpmjs.org - middleware/unpublishable.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* dead_horse <dead_horse@qq.com>
|
||||
*/
|
||||
|
||||
'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;
|
||||
};
|
||||
@@ -64,192 +64,192 @@ module.exports = function (sequelize, DataTypes) {
|
||||
comment: 'module name',
|
||||
},
|
||||
date: {
|
||||
type: DataTypes.INTEGER.UNSIGNED,
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
comment: 'YYYYMM format',
|
||||
},
|
||||
d01: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '01 download count',
|
||||
},
|
||||
d02: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '02 download count',
|
||||
},
|
||||
d03: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '03 download count',
|
||||
},
|
||||
d04: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '04 download count',
|
||||
},
|
||||
d05: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '05 download count',
|
||||
},
|
||||
d06: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '06 download count',
|
||||
},
|
||||
d07: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '07 download count',
|
||||
},
|
||||
d08: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '08 download count',
|
||||
},
|
||||
d09: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '09 download count',
|
||||
},
|
||||
d10: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '10 download count',
|
||||
},
|
||||
d11: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '11 download count',
|
||||
},
|
||||
d12: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '12 download count',
|
||||
},
|
||||
d13: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '13 download count',
|
||||
},
|
||||
d14: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '14 download count',
|
||||
},
|
||||
d15: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '15 download count',
|
||||
},
|
||||
d16: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '16 download count',
|
||||
},
|
||||
d17: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '17 download count',
|
||||
},
|
||||
d18: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '18 download count',
|
||||
},
|
||||
d19: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '19 download count',
|
||||
},
|
||||
d20: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '20 download count',
|
||||
},
|
||||
d21: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '21 download count',
|
||||
},
|
||||
d22: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '22 download count',
|
||||
},
|
||||
d23: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '23 download count',
|
||||
},
|
||||
d24: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '24 download count',
|
||||
},
|
||||
d25: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '25 download count',
|
||||
},
|
||||
d26: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '26 download count',
|
||||
},
|
||||
d27: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '27 download count',
|
||||
},
|
||||
d28: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '28 download count',
|
||||
},
|
||||
d29: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '29 download count',
|
||||
},
|
||||
d30: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '30 download count',
|
||||
},
|
||||
d31: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '31 download count',
|
||||
|
||||
@@ -1,26 +1,16 @@
|
||||
/**!
|
||||
* cnpmjs.org - models/index.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var path = require('path');
|
||||
var config = require('../config');
|
||||
var sequelize = require('../common/sequelize');
|
||||
|
||||
function load(name) {
|
||||
return sequelize.import(path.join(__dirname, name));
|
||||
}
|
||||
|
||||
var _ModuleAbbreviated = config.enableAbbreviatedMetadata ? load('module_abbreviated') : null;
|
||||
var _PackageReadme = config.enableAbbreviatedMetadata ? load('package_readme') : null;
|
||||
|
||||
module.exports = {
|
||||
sequelize: sequelize,
|
||||
Module: load('module'),
|
||||
@@ -38,10 +28,35 @@ module.exports = {
|
||||
DownloadTotal: load('download_total'),
|
||||
|
||||
query: function* (sql, args) {
|
||||
return yield this.sequelize.query(sql, null, {raw: true}, args);
|
||||
var options = { replacements: args };
|
||||
var 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);
|
||||
var rows = yield this.query(sql, args);
|
||||
return rows && rows[0];
|
||||
}
|
||||
},
|
||||
|
||||
get ModuleAbbreviated() {
|
||||
if (!config.enableAbbreviatedMetadata) {
|
||||
return null;
|
||||
}
|
||||
if (!_ModuleAbbreviated) {
|
||||
_ModuleAbbreviated = load('module_abbreviated');
|
||||
}
|
||||
return _ModuleAbbreviated;
|
||||
},
|
||||
|
||||
get PackageReadme() {
|
||||
if (!config.enableAbbreviatedMetadata) {
|
||||
return null;
|
||||
}
|
||||
if (!_PackageReadme) {
|
||||
_PackageReadme = load('package_readme');
|
||||
}
|
||||
return _PackageReadme;
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,33 +1,30 @@
|
||||
/**!
|
||||
* cnpmjs.org - models/init_script.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');
|
||||
|
||||
config.database.logging = console.log;
|
||||
|
||||
// $ node --harmony models/init_script.js <force> <dialect>
|
||||
// $ node --harmony models/init_script.js <force> <dialect> <port> <username>
|
||||
var force = process.argv[2] === 'true';
|
||||
var dialect = process.argv[3];
|
||||
if (dialect) {
|
||||
config.database.dialect = dialect;
|
||||
}
|
||||
var port = process.argv[4];
|
||||
if (port) {
|
||||
config.database.port = parseInt(port);
|
||||
}
|
||||
var username = process.argv[5];
|
||||
if (username) {
|
||||
config.database.username = username;
|
||||
}
|
||||
|
||||
var models = require('./');
|
||||
|
||||
models.sequelize.sync({ force: force })
|
||||
models.sequelize.sync({
|
||||
force: force,
|
||||
logging: console.log,
|
||||
})
|
||||
.then(function () {
|
||||
models.Total.init(function (err) {
|
||||
if (err) {
|
||||
@@ -44,5 +41,5 @@ models.sequelize.sync({ force: force })
|
||||
.catch(function (err) {
|
||||
console.error('[models/init_script.js] sequelize sync fail');
|
||||
console.error(err);
|
||||
throw err;
|
||||
process.exit(1);
|
||||
});
|
||||
|
||||
@@ -14,8 +14,6 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var utils = require('./utils');
|
||||
|
||||
/*
|
||||
CREATE TABLE IF NOT EXISTS `module` (
|
||||
`id` INTEGER NOT NULL auto_increment ,
|
||||
@@ -73,12 +71,12 @@ module.exports = function (sequelize, DataTypes) {
|
||||
allowNull: true,
|
||||
},
|
||||
dist_size: {
|
||||
type: DataTypes.INTEGER.UNSIGNED,
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
},
|
||||
publish_time: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: true,
|
||||
}
|
||||
}, {
|
||||
|
||||
46
models/module_abbreviated.js
Normal file
46
models/module_abbreviated.js
Normal file
@@ -0,0 +1,46 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
return sequelize.define('ModuleAbbreviated', {
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'module name'
|
||||
},
|
||||
version: {
|
||||
type: DataTypes.STRING(30),
|
||||
allowNull: false,
|
||||
comment: 'module version'
|
||||
},
|
||||
package: {
|
||||
type: DataTypes.LONGTEXT,
|
||||
comment: 'package.json',
|
||||
},
|
||||
publish_time: {
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: true,
|
||||
}
|
||||
}, {
|
||||
tableName: 'module_abbreviated',
|
||||
comment: 'module abbreviated info',
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['name', 'version']
|
||||
},
|
||||
{
|
||||
fields: ['gmt_modified']
|
||||
},
|
||||
{
|
||||
fields: ['publish_time']
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
findByNameAndVersion: function* (name, version) {
|
||||
return yield this.find({
|
||||
where: { name: name, version: version }
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -70,7 +70,7 @@ module.exports = function (sequelize, DataTypes) {
|
||||
});
|
||||
if (row) {
|
||||
row.package = pkg;
|
||||
if (row.isDirty) {
|
||||
if (row.changed()) {
|
||||
row = yield row.save(['package']);
|
||||
}
|
||||
return row;
|
||||
|
||||
39
models/package_readme.js
Normal file
39
models/package_readme.js
Normal file
@@ -0,0 +1,39 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = function (sequelize, DataTypes) {
|
||||
return sequelize.define('PackageReadme', {
|
||||
name: {
|
||||
type: DataTypes.STRING(100),
|
||||
allowNull: false,
|
||||
comment: 'module name'
|
||||
},
|
||||
version: {
|
||||
type: DataTypes.STRING(30),
|
||||
allowNull: false,
|
||||
comment: 'module latest version'
|
||||
},
|
||||
readme: {
|
||||
type: DataTypes.LONGTEXT,
|
||||
comment: 'latest version readme',
|
||||
},
|
||||
}, {
|
||||
tableName: 'package_readme',
|
||||
comment: 'package latest readme',
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['name']
|
||||
},
|
||||
{
|
||||
fields: ['gmt_modified']
|
||||
},
|
||||
],
|
||||
classMethods: {
|
||||
findByName: function* (name) {
|
||||
return yield this.find({
|
||||
where: { name: name },
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -47,7 +47,7 @@ module.exports = function (sequelize, DataTypes) {
|
||||
comment: 'module version',
|
||||
},
|
||||
module_id: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
comment: 'module id'
|
||||
}
|
||||
|
||||
@@ -40,49 +40,49 @@ module.exports = function (sequelize, DataTypes) {
|
||||
comment: 'total name'
|
||||
},
|
||||
module_delete: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: 'module delete count',
|
||||
},
|
||||
last_sync_time: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: 'last timestamp sync from official registry',
|
||||
},
|
||||
last_exist_sync_time: {
|
||||
type: DataTypes.BIGINT(20).UNSIGNED,
|
||||
type: DataTypes.BIGINT(20),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: 'last timestamp sync exist packages from official registry',
|
||||
},
|
||||
sync_status: {
|
||||
type: 'TINYINT',
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: 'system sync from official registry status',
|
||||
},
|
||||
need_sync_num: {
|
||||
type: DataTypes.INTEGER.UNSIGNED,
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: 'how many packages need to be sync',
|
||||
},
|
||||
success_sync_num: {
|
||||
type: DataTypes.INTEGER.UNSIGNED,
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: 'how many packages sync success at this time',
|
||||
},
|
||||
fail_sync_num: {
|
||||
type: DataTypes.INTEGER.UNSIGNED,
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: 'how many packages sync fail at this time',
|
||||
},
|
||||
left_sync_num: {
|
||||
type: DataTypes.INTEGER.UNSIGNED,
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: 'how many packages left to be sync',
|
||||
|
||||
@@ -117,6 +117,9 @@ module.exports = function (sequelize, DataTypes) {
|
||||
return yield this.find({ where: { name: name } });
|
||||
},
|
||||
listByNames: function* (names) {
|
||||
if (!names || names.length === 0) {
|
||||
return [];
|
||||
}
|
||||
return yield this.findAll({
|
||||
where: {
|
||||
name: {
|
||||
@@ -152,7 +155,7 @@ 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;
|
||||
@@ -179,7 +182,7 @@ 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;
|
||||
|
||||
106
package.json
106
package.json
@@ -1,10 +1,12 @@
|
||||
{
|
||||
"name": "cnpmjs.org",
|
||||
"version": "2.0.0-rc.13",
|
||||
"version": "3.0.0-alpha.6",
|
||||
"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": "make jshint && make test",
|
||||
"test-local": "make test",
|
||||
"start": "./bin/nodejsctl start && cp History.md docs/web/history.md",
|
||||
"status": "./bin/nodejsctl status",
|
||||
"stop": "./bin/nodejsctl stop"
|
||||
@@ -13,60 +15,70 @@
|
||||
"cnpmjs.org": "bin/cli.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"agentkeepalive": "~1.2.0",
|
||||
"bluebird": "~2.9.6",
|
||||
"bytes": "~1.0.0",
|
||||
"cfork": "~1.2.2",
|
||||
"co": "~3.1.0",
|
||||
"co-defer": "~0.1.2",
|
||||
"co-gather": "~0.0.1",
|
||||
"co-sleep": "~0.0.1",
|
||||
"commander": "~2.6.0",
|
||||
"copy-to": "~2.0.1",
|
||||
"debug": "~2.1.1",
|
||||
"error-formater": "~1.0.3",
|
||||
"fs-cnpm": "~1.2.0",
|
||||
"giturl": "~0.0.3",
|
||||
"gnode": "~0.1.1",
|
||||
"graceful": "~1.0.0",
|
||||
"gravatar": "~1.1.0",
|
||||
"humanize-ms": "~1.0.1",
|
||||
"humanize-number": "~0.0.2",
|
||||
"koa": "~0.13.0",
|
||||
"koa-limit": "~1.0.2",
|
||||
"koa-markdown": "~2.0.1",
|
||||
"koa-middlewares": "~2.1.0",
|
||||
"koa-mock": "~1.1.4",
|
||||
"markdown-it": "~3.0.4",
|
||||
"mime": "~1.2.11",
|
||||
"mini-logger": "~1.0.0",
|
||||
"mkdirp": "~0.5.0",
|
||||
"moment": "~2.9.0",
|
||||
"mysql": "~2.5.4",
|
||||
"nodemailer": "~1.3.0",
|
||||
"semver": "~4.2.0",
|
||||
"sequelize": "~2.0.0-rc8",
|
||||
"thunkify-wrap": "~1.0.4",
|
||||
"treekill": "~1.0.0",
|
||||
"urllib": "~2.2.2",
|
||||
"utility": "~1.3.0",
|
||||
"xss": "~0.1.20"
|
||||
"agentkeepalive": "^2.2.0",
|
||||
"await-event": "^1.0.0",
|
||||
"bytes": "^2.4.0",
|
||||
"cfork": "^1.5.1",
|
||||
"changes-stream": "^1.1.0",
|
||||
"co": "^4.6.0",
|
||||
"co-defer": "^1.0.0",
|
||||
"co-gather": "^0.0.1",
|
||||
"co-sleep": "^0.0.1",
|
||||
"commander": "^2.9.0",
|
||||
"copy-to": "^2.0.1",
|
||||
"debug": "^2.2.0",
|
||||
"error-formater": "^1.0.3",
|
||||
"fs-cnpm": "^1.2.0",
|
||||
"giturl": "^1.0.0",
|
||||
"graceful": "^1.0.0",
|
||||
"gravatar": "^1.5.0",
|
||||
"humanize-ms": "^1.2.0",
|
||||
"humanize-number": "^0.0.2",
|
||||
"is-type-of": "^1.0.0",
|
||||
"kcors": "^1.2.1",
|
||||
"koa": "^1.2.0",
|
||||
"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-safe-jsonp": "^0.3.1",
|
||||
"markdown-it": "^3.0.6",
|
||||
"mime": "^1.3.4",
|
||||
"mini-logger": "^1.1.1",
|
||||
"mkdirp": "^0.5.0",
|
||||
"moment": "^2.12.0",
|
||||
"mysql": "^2.10.2",
|
||||
"mz": "^2.4.0",
|
||||
"nodemailer": "^1.3.0",
|
||||
"normalize-registry-metadata": "^1.1.2",
|
||||
"semver": "^5.2.0",
|
||||
"sequelize": "^3.23.4",
|
||||
"thunkify-wrap": "^1.0.4",
|
||||
"treekill": "^1.0.0",
|
||||
"tunnel-agent": "^0.4.0",
|
||||
"urllib": "^2.11.0",
|
||||
"utility": "^1.8.0",
|
||||
"xss": "^0.2.13"
|
||||
},
|
||||
"devDependencies": {
|
||||
"autod": "*",
|
||||
"chunkstream": "*",
|
||||
"co-mocha": "*",
|
||||
"contributors": "*",
|
||||
"istanbul-harmony": "*",
|
||||
"intelli-espower-loader": "^1.0.1",
|
||||
"istanbul": "*",
|
||||
"jshint": "*",
|
||||
"mm": "*",
|
||||
"mocha": "*",
|
||||
"node-dev": "*",
|
||||
"pedding": "*",
|
||||
"should": "~4.0.4",
|
||||
"should-http": "*",
|
||||
"pg": "5",
|
||||
"pg-hstore": "2",
|
||||
"power-assert": "^1.4.2",
|
||||
"should": "8",
|
||||
"sqlite3": "*",
|
||||
"supertest": "*"
|
||||
"supertest": "2",
|
||||
"thunk-mocha": "1"
|
||||
},
|
||||
"homepage": "https://github.com/cnpm/cnpmjs.org",
|
||||
"repository": {
|
||||
@@ -86,10 +98,10 @@
|
||||
"registry"
|
||||
],
|
||||
"engines": {
|
||||
"node": ">= 0.11.14"
|
||||
"node": ">= 4.3.1"
|
||||
},
|
||||
"author": [
|
||||
"fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)",
|
||||
"fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)",
|
||||
"dead_horse <dead_horse@qq.com> (http://deadhorse.me)"
|
||||
],
|
||||
"license": "MIT"
|
||||
|
||||
1
public/css/antd-0.9.1.min.css
vendored
Normal file
1
public/css/antd-0.9.1.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
@@ -453,6 +453,7 @@
|
||||
font-size: 85%;
|
||||
line-height: 1.45;
|
||||
background-color: #f7f7f7;
|
||||
color:#333;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,32 +1,144 @@
|
||||
body {
|
||||
font-size: 16px;
|
||||
color: #333333;
|
||||
}
|
||||
header {
|
||||
max-width: 1140px;
|
||||
min-width: 960px;
|
||||
margin: 30px auto 30px auto;
|
||||
|
||||
.mb15 {
|
||||
margin-bottom: 15px !important;
|
||||
}
|
||||
header .logo {
|
||||
|
||||
.container {
|
||||
min-width: 960px;;
|
||||
padding-right: 15px;
|
||||
padding-left: 15px;
|
||||
margin-right: auto;
|
||||
margin-left: auto
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.container {
|
||||
width:750px
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 992px) {
|
||||
.container {
|
||||
width:970px
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1200px) {
|
||||
.container {
|
||||
width:1170px
|
||||
}
|
||||
}
|
||||
|
||||
hr {
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
border: 0;
|
||||
border-top: 1px solid #eee;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
#header {
|
||||
padding: 30px 0;
|
||||
height: 156px;
|
||||
}
|
||||
|
||||
#header .logo {
|
||||
display: inline-block;
|
||||
}
|
||||
header #search-input {
|
||||
|
||||
#header .logo a {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
#search-input {
|
||||
display: inline-block;
|
||||
width: 400px;
|
||||
height: 50px;
|
||||
font-size: 30px;
|
||||
font-size: 20px;
|
||||
float: right;
|
||||
margin-top: 22px;
|
||||
border-radius: 8px;
|
||||
padding: 10px 20px;
|
||||
transition: width .3s ease-in-out;
|
||||
}
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
#search-input {
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
.pack-overview-background {
|
||||
min-width: 960px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#search .package.match {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.bottom {
|
||||
text-align: center;
|
||||
font-size: 14px;
|
||||
padding-bottom: 15px;
|
||||
}
|
||||
|
||||
code {
|
||||
padding: 2px 4px;
|
||||
font-size: 95%;
|
||||
color: #c7254e;
|
||||
background-color: #f9f2f4;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
pre {
|
||||
margin-bottom: 20px;
|
||||
background: #333;
|
||||
color: #fff;
|
||||
border-radius: 6px;
|
||||
margin-top: 30px;
|
||||
padding: 10px 20px;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
pre code {
|
||||
padding: 0;
|
||||
font-size: inherit;
|
||||
color: inherit;
|
||||
white-space: pre-wrap;
|
||||
background-color: transparent;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.ant-table {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.ant-alert {
|
||||
font-size: 14px !important;
|
||||
padding: 15px;
|
||||
}
|
||||
|
||||
|
||||
.pack-overview {
|
||||
min-width: 960px;
|
||||
color: #f1f1f1;
|
||||
height: 300px;
|
||||
width: 100%;
|
||||
margin-bottom: 50px;
|
||||
position: relative;
|
||||
}
|
||||
.pack-overview-background {
|
||||
height: 300px;
|
||||
background: #428bca url(http://rockdai.u.qiniudn.com/bs-docs-masthead-pattern.png) repeat center center;
|
||||
background: #428bca url(https://dn-cnpm.qbox.me/bs-docs-masthead-pattern.png) repeat center center;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
z-index: -1;
|
||||
@@ -34,13 +146,18 @@ header #search-input {
|
||||
}
|
||||
.pack-overview a {
|
||||
color: #f1f1f1;
|
||||
text-decoration: underline;
|
||||
text-decoration: none;
|
||||
font-size: 16px;
|
||||
transition: all .2s ease-in-out;
|
||||
padding-bottom: 2px;
|
||||
border-bottom: 1px solid;
|
||||
}
|
||||
.pack-overview a:hover {
|
||||
color: #ffffff;
|
||||
opacity: .7;
|
||||
}
|
||||
|
||||
.pack-info {
|
||||
position: relative;
|
||||
max-width: 1140px;
|
||||
margin: 0 auto;
|
||||
padding: 30px 0;
|
||||
@@ -53,133 +170,134 @@ header #search-input {
|
||||
line-height: 48px;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.pack-description {
|
||||
line-height: 28px;
|
||||
text-overflow: ellipsis;
|
||||
color: #fff;
|
||||
font-family: "-apple-system", sans-serif;
|
||||
margin-top: 20px;
|
||||
display: block; /* Fallback for non-webkit */
|
||||
display: -webkit-box;
|
||||
width: 600px;
|
||||
white-space:nowrap;
|
||||
font-size: 20px;
|
||||
line-height: 26px;
|
||||
-webkit-line-clamp: 3;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
overflow:hidden;
|
||||
max-height: 100px;
|
||||
}
|
||||
.deprecated {
|
||||
text-decoration: line-through;
|
||||
color: #BDBDBD;
|
||||
}
|
||||
.deprecated-content {
|
||||
color: #FF8A65;
|
||||
color: #555;
|
||||
width: 600px;
|
||||
white-space:nowrap;
|
||||
text-overflow: ellipsis;
|
||||
overflow:hidden;
|
||||
font-style: italic;
|
||||
}
|
||||
.pack-ver {
|
||||
font-size: 28px;
|
||||
line-height: 48px;
|
||||
}
|
||||
.pack-repo {
|
||||
margin-top: 50px;
|
||||
|
||||
.pack-ver a.badge-link {
|
||||
font-size: inherit;
|
||||
border-bottom: 0px;
|
||||
}
|
||||
|
||||
.pack-lastup {
|
||||
font-size: 14px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.pack-repo {
|
||||
position: absolute;
|
||||
bottom: 10px;
|
||||
text-align: right;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.pack-repo a {
|
||||
border: none;
|
||||
}
|
||||
|
||||
.pack-repo a:hover {
|
||||
border-bottom: 1px solid;
|
||||
}
|
||||
|
||||
.pack-install {
|
||||
position: absolute;
|
||||
top: 85px;
|
||||
top: 75px;
|
||||
right: 0px;
|
||||
max-width: 450px;
|
||||
}
|
||||
.pack-install pre {
|
||||
border: none;
|
||||
background-color: #666666;
|
||||
color: #f1f1f1;
|
||||
font-size: 16px;
|
||||
width: 480px;
|
||||
}
|
||||
.pack-details {
|
||||
max-width: 1140px;
|
||||
min-width: 960px;
|
||||
margin: 40px auto;
|
||||
}
|
||||
|
||||
|
||||
.pack-details a {
|
||||
color: #333333;
|
||||
}
|
||||
.cols-box {
|
||||
display: flex;
|
||||
-webkit-box-pack: center;
|
||||
|
||||
.pack-details a:hover {
|
||||
border-bottom: 1px solid;
|
||||
opacity: .8;
|
||||
}
|
||||
|
||||
.cols-box ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.cols-box-item {
|
||||
flex: 1;
|
||||
height: 250px;
|
||||
margin-right: 30px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.cols-box-item:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
.cols-box-title {
|
||||
font-size: 20px;
|
||||
color: #428bca;
|
||||
margin-bottom: 10px;
|
||||
font-weight: bold;
|
||||
overflow: hidden;
|
||||
border-bottom: 1px solid #ccc;
|
||||
padding-bottom: 3px;
|
||||
}
|
||||
.cols-box-item .more-item {
|
||||
font-size: 16px;
|
||||
line-height: 28px;
|
||||
color: #428bca;
|
||||
text-decoration: underline;
|
||||
float: right;
|
||||
margin-top: 15px;
|
||||
}
|
||||
.pack-dep-ver, .pack-download-num {
|
||||
float: right;
|
||||
}
|
||||
.pack-lastup, .pack-sync {
|
||||
margin-top: 10px;
|
||||
}
|
||||
.pack-sync a {
|
||||
font-size: 23px;
|
||||
}
|
||||
.maintainers .row {
|
||||
display: -moz-box;
|
||||
display: -webkit-box;
|
||||
display: box;
|
||||
-webkit-box-pack: center;
|
||||
margin-right: 0;
|
||||
margin-left: 0;
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
||||
.maintainer {
|
||||
-moz-box-flex: 1;
|
||||
-webkit-box-flex: 1;
|
||||
box-flex: 1;
|
||||
margin-bottom: 10px;
|
||||
width: 50%;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-box-pack: center;
|
||||
line-height: 50px;
|
||||
line-height: 30px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.maintainer a:hover {
|
||||
font-style: italic;
|
||||
border: none;
|
||||
}
|
||||
.maintainer .avatar {
|
||||
-webkit-border-radius: 50px;
|
||||
-moz-border-radius: 50px;
|
||||
border-radius: 50px;
|
||||
border-radius: 30px;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.downloads .row {
|
||||
margin-left: 0;
|
||||
margin-right: 50px;
|
||||
line-height: 28px;
|
||||
border-bottom: 1px solid #f2f2f2;
|
||||
}
|
||||
.pack-readme {
|
||||
max-width: 1140px;
|
||||
min-width: 960px;
|
||||
margin: 10px auto;
|
||||
border-top: 1px solid #dddddd;
|
||||
}
|
||||
.pack-readme .title {
|
||||
color: #dddddd;
|
||||
font-weight: bolder;
|
||||
margin-bottom: 20px;
|
||||
text-align: right;
|
||||
ul, ol{
|
||||
list-style: initial;
|
||||
}
|
||||
|
||||
147
public/css/yue.css
Normal file
147
public/css/yue.css
Normal file
@@ -0,0 +1,147 @@
|
||||
/**
|
||||
* yue.css
|
||||
*
|
||||
* yue.css is designed for readable content.
|
||||
*
|
||||
* Copyright (c) 2013 - 2014 by Hsiaoming Yang.
|
||||
*/
|
||||
|
||||
|
||||
.yue h1,
|
||||
.yue h2,
|
||||
.yue h3,
|
||||
.yue h4,
|
||||
.yue h5,
|
||||
.yue h6 {
|
||||
font-family: "-apple-system-headline", "Georgia", "Xin Gothic", "Hiragino Sans GB", "Droid Sans Fallback", "Microsoft YaHei", "SimSun", sans-serif;
|
||||
color: #222223;
|
||||
}
|
||||
|
||||
.yue h1 {
|
||||
font-size: 1.8em;
|
||||
margin: 0.67em 0;
|
||||
}
|
||||
|
||||
.yue > h1 {
|
||||
margin-top: 0;
|
||||
font-size: 2em;
|
||||
}
|
||||
|
||||
.yue h2 {
|
||||
font-size: 1.5em;
|
||||
margin: 0.83em 0;
|
||||
}
|
||||
|
||||
.yue h3 {
|
||||
font-size: 1.17em;
|
||||
margin: 1em 0;
|
||||
}
|
||||
|
||||
.yue h4,
|
||||
.yue h5,
|
||||
.yue h6 {
|
||||
font-size: 1em;
|
||||
margin: 1.6em 0 1em 0;
|
||||
}
|
||||
|
||||
.yue h6 {
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.yue p {
|
||||
margin-top: 0;
|
||||
margin-bottom: 1.46em;
|
||||
}
|
||||
|
||||
|
||||
.yue strong,
|
||||
.yue b {
|
||||
font-weight: 700;
|
||||
color: #222223;
|
||||
}
|
||||
|
||||
.yue em,
|
||||
.yue i {
|
||||
font-style: italic;
|
||||
color: #222223;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.yue hr {
|
||||
display: block;
|
||||
width: 14%;
|
||||
margin: 40px auto 34px;
|
||||
border: 0 none;
|
||||
border-top: 3px solid #dededc;
|
||||
}
|
||||
|
||||
.yue blockquote {
|
||||
margin: 0 0 1.64em 0;
|
||||
border-left: 3px solid #dadada;
|
||||
padding-left: 12px;
|
||||
color: #666664;
|
||||
}
|
||||
|
||||
.yue blockquote a {
|
||||
color: #666664;
|
||||
}
|
||||
|
||||
.yue ul,
|
||||
.yue ol {
|
||||
margin: 0 0 24px 6px;
|
||||
padding-left: 16px;
|
||||
}
|
||||
|
||||
.yue ul {
|
||||
list-style-type: square;
|
||||
}
|
||||
|
||||
.yue ol {
|
||||
list-style-type: decimal;
|
||||
}
|
||||
|
||||
.yue li {
|
||||
margin-bottom: 0.2em;
|
||||
}
|
||||
|
||||
.yue li ul,
|
||||
.yue li ol {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
margin-left: 14px;
|
||||
}
|
||||
|
||||
.yue li ul {
|
||||
list-style-type: disc;
|
||||
}
|
||||
|
||||
.yue li ul ul {
|
||||
list-style-type: circle;
|
||||
}
|
||||
|
||||
.yue li p {
|
||||
margin: 0.4em 0 0.6em;
|
||||
}
|
||||
|
||||
.yue .unstyled {
|
||||
list-style-type: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@media (min-width: 1100px) {
|
||||
.yue blockquote {
|
||||
margin-left: -24px;
|
||||
padding-left: 20px;
|
||||
border-width: 4px;
|
||||
}
|
||||
|
||||
.yue blockquote blockquote {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
@@ -41,7 +41,7 @@ $(function () {
|
||||
data.last_sync_module + '</a>');
|
||||
|
||||
if (!data.sync_status) {
|
||||
$('.syncing').html('');
|
||||
$('.syncing').remove();
|
||||
}
|
||||
|
||||
$('.sync').show();
|
||||
|
||||
@@ -1,19 +1,4 @@
|
||||
/**!
|
||||
* cnpmjs.org - routes/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";
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
var limit = require('../middleware/limit');
|
||||
var login = require('../middleware/login');
|
||||
@@ -21,6 +6,7 @@ var publishable = require('../middleware/publishable');
|
||||
var syncByInstall = require('../middleware/sync_by_install');
|
||||
var editable = require('../middleware/editable');
|
||||
var existsPackage = require('../middleware/exists_package');
|
||||
var unpublishable = require('../middleware/unpublishable');
|
||||
|
||||
var showTotal = require('../controllers/total');
|
||||
|
||||
@@ -28,6 +14,7 @@ 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');
|
||||
@@ -36,6 +23,7 @@ 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');
|
||||
@@ -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);
|
||||
@@ -77,7 +65,9 @@ function routes(app) {
|
||||
app.put('/:name', login, publishable, savePackage);
|
||||
|
||||
// sync from source npm
|
||||
app.put(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/sync$/, sync.sync);
|
||||
app.put('/:name/sync', sync.sync);
|
||||
app.get(/^\/(@[\w\-\.]+\/[\w\-\.]+)\/sync\/log\/(\d+)$/, sync.getSyncLog);
|
||||
app.get('/:name/sync/log/:id', sync.getSyncLog);
|
||||
|
||||
// add tag
|
||||
@@ -92,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
|
||||
@@ -111,11 +101,17 @@ function routes(app) {
|
||||
|
||||
// list all packages of user
|
||||
app.get('/-/by-user/:user', userPackage.list);
|
||||
app.get('/-/users/:user/packages', listPackagesByUser);
|
||||
|
||||
// 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
|
||||
app.get('/-/package/:name/dependents', existsPackage, listDependents);
|
||||
app.get(/^\/\-\/package\/(@[\w\-\.]+\/[\w\-\.]+)\/dependents$/, existsPackage, listDependents);
|
||||
|
||||
// GET /-/package/:pkg/dist-tags -- returns the package's dist-tags
|
||||
app.get('/-/package/:name/dist-tags', existsPackage, tags.index);
|
||||
app.get(/^\/\-\/package\/(@[\w\-\.]+\/[\w\-\.]+)\/dist\-tags$/, existsPackage, tags.index);
|
||||
|
||||
@@ -1,19 +1,4 @@
|
||||
/**!
|
||||
* cnpmjs.org - routes/web.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";
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
var showPackage = require('../controllers/web/package/show');
|
||||
var searchPackage = require('../controllers/web/package/search');
|
||||
@@ -42,15 +27,19 @@ function routes(app) {
|
||||
|
||||
app.get('/~:name', showUser);
|
||||
|
||||
app.get(/\/sync\/(@[\w\-\.]+\/[\w\-\.]+)$/, showSync);
|
||||
app.get('/sync/:name', showSync);
|
||||
app.get('/sync', showSync);
|
||||
app.put(/\/sync\/(@[\w\-\.]+\/[\w\-\.]+)$/, sync.sync);
|
||||
app.put('/sync/:name', sync.sync);
|
||||
|
||||
app.get(/\/sync\/(@[\w\-\.]+\/[\w\-\.]+)\/log\/(\d+)$/, sync.getSyncLog);
|
||||
app.get('/sync/:name/log/:id', sync.getSyncLog);
|
||||
|
||||
app.get('/_list/search/search', searchRange);
|
||||
|
||||
app.get(/^\/badge\/v\/([@\w\-\.\/]+)\.svg$/, badge.version);
|
||||
app.get(/^\/badge\/d\/([@\w\-\.\/]+)\.svg$/, badge.downloads);
|
||||
}
|
||||
|
||||
module.exports = routes;
|
||||
|
||||
@@ -1,19 +1,4 @@
|
||||
/**!
|
||||
* 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";
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
var koa = require('koa');
|
||||
var app = module.exports = koa();
|
||||
@@ -26,27 +11,29 @@ 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('../middleware/cors');
|
||||
var cors = require('kcors');
|
||||
var proxyToNpm = require('../middleware/proxy_to_npm');
|
||||
var 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.proxy = true;
|
||||
app.use(proxyToNpm());
|
||||
app.use(middlewares.bodyParser({jsonLimit: config.jsonLimit}));
|
||||
app.use(middlewares.bodyParser({ jsonLimit: config.jsonLimit }));
|
||||
app.use(cors({
|
||||
methods: '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());
|
||||
|
||||
@@ -1,19 +1,4 @@
|
||||
/**!
|
||||
* cnpmjs.org - servers/web.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";
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
var opensearch = require('../middleware/opensearch');
|
||||
var notFound = require('../middleware/web_not_found');
|
||||
@@ -27,15 +12,20 @@ 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 maxrequests = require('koa-maxrequests');
|
||||
|
||||
var app = koa();
|
||||
|
||||
jsonp(app);
|
||||
|
||||
var rootdir = path.dirname(__dirname);
|
||||
|
||||
app.use(maxrequests());
|
||||
app.use(block());
|
||||
app.use(middlewares.rt({headerName: 'X-ReadTime'}));
|
||||
app.use(middlewares.rewrite('/favicon.ico', '/favicon.png'));
|
||||
@@ -71,7 +61,8 @@ 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')
|
||||
.replace('{{footer}}', footer)
|
||||
.replace('{{logoURL}}', config.logoURL);
|
||||
.replace('{{logoURL}}', config.logoURL)
|
||||
.replace('{{adBanner}}', config.adBanner || '');
|
||||
fs.writeFileSync(layoutFile, layout);
|
||||
|
||||
// custom web readme home page support
|
||||
|
||||
@@ -15,11 +15,12 @@
|
||||
*/
|
||||
|
||||
var config = require('../config');
|
||||
var isPrivateScopedPackage = require('../lib/common').isPrivateScopedPackage;
|
||||
|
||||
config.privatePackages = config.privatePackages || [];
|
||||
|
||||
exports.isPrivatePackage = function* (name) {
|
||||
if (name[0] === '@') {
|
||||
exports.isPrivatePackage = function (name) {
|
||||
if (isPrivateScopedPackage(name)) {
|
||||
return true;
|
||||
}
|
||||
if (config.privatePackages.indexOf(name) >= 0) {
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - services/download_total.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -14,6 +12,7 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var utility = require('utility');
|
||||
var DownloadTotal = require('../models').DownloadTotal;
|
||||
|
||||
exports.getModuleTotal = function* (name, start, end) {
|
||||
@@ -31,6 +30,27 @@ exports.getModuleTotal = function* (name, start, end) {
|
||||
return formatRows(rows, start, end);
|
||||
};
|
||||
|
||||
exports.getTotalByName = function* (name) {
|
||||
var rows = yield DownloadTotal.findAll({
|
||||
where: {
|
||||
name: name
|
||||
}
|
||||
});
|
||||
var count = 0;
|
||||
rows.forEach(function (row) {
|
||||
for (var i = 1; i <= 31; i++) {
|
||||
var day = i < 10 ? '0' + i : String(i);
|
||||
var field = 'd' + day;
|
||||
var val = row[field];
|
||||
if (typeof val === 'string') {
|
||||
val = utility.toSafeNumber(val);
|
||||
}
|
||||
count += val;
|
||||
}
|
||||
});
|
||||
return count;
|
||||
};
|
||||
|
||||
exports.plusModuleTotal = function* (data) {
|
||||
var yearMonth = parseYearMonth(data.date);
|
||||
// all module download total
|
||||
@@ -47,8 +67,12 @@ exports.plusModuleTotal = function* (data) {
|
||||
});
|
||||
}
|
||||
var field = 'd' + data.date.substring(8, 10);
|
||||
if (typeof row[field] === 'string') {
|
||||
// pg bigint is string...
|
||||
row[field] = utility.toSafeNumber(row[field]);
|
||||
}
|
||||
row[field] += data.count;
|
||||
if (row.isDirty) {
|
||||
if (row.changed()) {
|
||||
yield row.save();
|
||||
}
|
||||
|
||||
@@ -65,15 +89,19 @@ exports.plusModuleTotal = function* (data) {
|
||||
});
|
||||
}
|
||||
var field = 'd' + data.date.substring(8, 10);
|
||||
if (typeof row[field] === 'string') {
|
||||
// pg bigint is string...
|
||||
row[field] = utility.toSafeNumber(row[field]);
|
||||
}
|
||||
row[field] += data.count;
|
||||
if (row.isDirty) {
|
||||
if (row.changed()) {
|
||||
return yield row.save();
|
||||
}
|
||||
return row;
|
||||
};
|
||||
|
||||
exports.getTotal = function* (start, end) {
|
||||
return yield* exports.getModuleTotal('__all__', start, end);
|
||||
return yield exports.getModuleTotal('__all__', start, end);
|
||||
};
|
||||
|
||||
function parseYearMonth(date) {
|
||||
@@ -92,6 +120,9 @@ function formatRows(rows, startDate, endDate) {
|
||||
var field = 'd' + day;
|
||||
var d = yearMonth + '-' + day;
|
||||
var count = row[field];
|
||||
if (typeof count === 'string') {
|
||||
count = utility.toSafeNumber(count);
|
||||
}
|
||||
if (count > 0 && d >= startDate && d <= endDate) {
|
||||
dates.push({
|
||||
name: row.name,
|
||||
|
||||
19
services/hook.js
Normal file
19
services/hook.js
Normal file
@@ -0,0 +1,19 @@
|
||||
'use strict';
|
||||
|
||||
const co = require('co');
|
||||
const config = require('../config');
|
||||
const logger = require('../common/logger');
|
||||
|
||||
exports.trigger = envelope => {
|
||||
if (!config.globalHook) {
|
||||
return;
|
||||
}
|
||||
|
||||
envelope.time = Date.now();
|
||||
|
||||
co(function* () {
|
||||
yield config.globalHook(envelope);
|
||||
}).catch(err => {
|
||||
logger.error(err);
|
||||
});
|
||||
};
|
||||
@@ -50,5 +50,5 @@ exports.append = function* (id, log) {
|
||||
};
|
||||
|
||||
exports.get = function* (id) {
|
||||
return yield ModuleLog.find(Number(id));
|
||||
return yield ModuleLog.findById(id);
|
||||
};
|
||||
|
||||
118
services/npm.js
118
services/npm.js
@@ -1,20 +1,7 @@
|
||||
/**!
|
||||
* cnpmjs.org - services/npm.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.
|
||||
*/
|
||||
|
||||
var ms = require('humanize-ms');
|
||||
var cleanNpmMetadata = require('normalize-registry-metadata');
|
||||
var urllib = require('../common/urllib');
|
||||
var config = require('../config');
|
||||
|
||||
@@ -24,21 +11,27 @@ function* request(url, options) {
|
||||
options = options || {};
|
||||
options.dataType = options.dataType || 'json';
|
||||
options.timeout = options.timeout || 120000;
|
||||
options.headers = {
|
||||
options.headers = Object.assign({
|
||||
'user-agent': USER_AGENT
|
||||
};
|
||||
}, options.headers);
|
||||
options.gzip = true;
|
||||
options.followRedirect = true;
|
||||
var registry = options.registry || config.sourceNpmRegistry;
|
||||
url = registry + url;
|
||||
var r;
|
||||
try {
|
||||
r = yield urllib.requestThunk(url, options);
|
||||
r = yield urllib.request(url, options);
|
||||
// https://github.com/npm/registry/issues/87#issuecomment-261450090
|
||||
if (options.dataType === 'json' && r.data && config.officialNpmReplicate === registry) {
|
||||
cleanNpmMetadata(r.data);
|
||||
}
|
||||
} catch (err) {
|
||||
var statusCode = err.status || -1;
|
||||
var data = err.data || '[empty]';
|
||||
if (err.name === 'JSONResponseFormatError' && statusCode >= 500) {
|
||||
err.name = 'NPMServerError';
|
||||
err.message = 'Status ' + statusCode + ', ' + data.toString();
|
||||
err.status = statusCode;
|
||||
err.message = 'Url: ' + url + ', Status ' + statusCode + ', ' + data.toString();
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
@@ -59,7 +52,7 @@ exports.getUser = function* (name) {
|
||||
};
|
||||
|
||||
exports.get = function* (name) {
|
||||
var r = yield* request('/' + name);
|
||||
var r = yield request('/' + name);
|
||||
var data = r.data;
|
||||
if (r.status === 404) {
|
||||
data = null;
|
||||
@@ -67,6 +60,83 @@ exports.get = function* (name) {
|
||||
return data;
|
||||
};
|
||||
|
||||
exports.fetchUpdatesSince = function* (lastSyncTime, timeout) {
|
||||
var lastModified = lastSyncTime - ms('10m');
|
||||
var data = yield exports.getAllSince(lastModified, timeout);
|
||||
var result = {
|
||||
lastModified: lastSyncTime,
|
||||
names: [],
|
||||
};
|
||||
if (!data) {
|
||||
return result;
|
||||
}
|
||||
if (Array.isArray(data)) {
|
||||
// support https://registry.npmjs.org/-/all/static/today.json
|
||||
var maxModified;
|
||||
data.forEach(function (pkg) {
|
||||
if (pkg.time && pkg.time.modified) {
|
||||
var modified = Date.parse(pkg.time.modified);
|
||||
if (modified >= lastModified) {
|
||||
result.names.push(pkg.name);
|
||||
}
|
||||
if (!maxModified || modified > maxModified) {
|
||||
maxModified = modified;
|
||||
}
|
||||
} else {
|
||||
result.names.push(pkg.name);
|
||||
}
|
||||
});
|
||||
if (maxModified) {
|
||||
result.lastModified = maxModified;
|
||||
}
|
||||
} else {
|
||||
// /-/all/since
|
||||
if (data._updated) {
|
||||
result.lastModified = data._updated;
|
||||
delete data._updated;
|
||||
}
|
||||
result.names = Object.keys(data);
|
||||
}
|
||||
return result;
|
||||
};
|
||||
|
||||
exports.fetchAllPackagesSince = function* (timestamp) {
|
||||
var r = yield request('/-/all/static/all.json', {
|
||||
registry: 'http://registry.npmjs.org',
|
||||
timeout: 600000
|
||||
});
|
||||
// {"_updated":1441520402174,"0":{"name":"0","dist-tags
|
||||
// "time":{"modified":"2014-06-17T06:38:43.495Z"}
|
||||
var data = r.data;
|
||||
var result = {
|
||||
lastModified: timestamp,
|
||||
lastModifiedName: null,
|
||||
names: [],
|
||||
};
|
||||
var maxModified;
|
||||
for (var key in data) {
|
||||
if (key === '_updated') {
|
||||
continue;
|
||||
}
|
||||
var pkg = data[key];
|
||||
if (!pkg.time || !pkg.time.modified) {
|
||||
continue;
|
||||
}
|
||||
var modified = Date.parse(pkg.time.modified);
|
||||
if (modified >= timestamp) {
|
||||
result.names.push(pkg.name);
|
||||
}
|
||||
if (!maxModified || modified > maxModified) {
|
||||
maxModified = modified;
|
||||
result.lastModifiedName = pkg.name;
|
||||
}
|
||||
}
|
||||
if (maxModified) {
|
||||
result.lastModified = maxModified;
|
||||
}
|
||||
return result;
|
||||
};
|
||||
|
||||
exports.getAllSince = function* (startkey, timeout) {
|
||||
var r = yield* request('/-/all/since?stale=update_after&startkey=' + startkey, {
|
||||
timeout: timeout || 300000
|
||||
@@ -74,6 +144,14 @@ exports.getAllSince = function* (startkey, timeout) {
|
||||
return r.data;
|
||||
};
|
||||
|
||||
exports.getAllToday = function* (timeout) {
|
||||
var r = yield* request('/-/all/static/today.json', {
|
||||
timeout: timeout || 300000
|
||||
});
|
||||
// data is array: see https://registry.npmjs.org/-/all/static/today.json
|
||||
return r.data;
|
||||
};
|
||||
|
||||
exports.getShort = function* (timeout) {
|
||||
var r = yield* request('/-/short', {
|
||||
timeout: timeout || 300000,
|
||||
|
||||
@@ -1,21 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - services/package.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var semver = require('semver');
|
||||
var models = require('../models');
|
||||
var common = require('./common');
|
||||
var config = require('../config');
|
||||
var Tag = models.Tag;
|
||||
var User = models.User;
|
||||
var Module = models.Module;
|
||||
@@ -27,16 +15,23 @@ var ModuleUnpublished = models.ModuleUnpublished;
|
||||
var NpmModuleMaintainer = models.NpmModuleMaintainer;
|
||||
|
||||
// module
|
||||
var _parseRow = function (row) {
|
||||
if (row.package.indexOf('%7B%22') === 0) {
|
||||
// now store package will encodeURIComponent() after JSON.stringify
|
||||
row.package = decodeURIComponent(row.package);
|
||||
}
|
||||
row.package = JSON.parse(row.package);
|
||||
if (typeof row.publish_time === 'string') {
|
||||
// pg bigint is string
|
||||
row.publish_time = Number(row.publish_time);
|
||||
}
|
||||
};
|
||||
|
||||
// module:read
|
||||
function parseRow(row) {
|
||||
if (row && row.package) {
|
||||
try {
|
||||
if (row.package.indexOf('%7B%22') === 0) {
|
||||
// now store package will encodeURIComponent() after JSON.stringify
|
||||
row.package = decodeURIComponent(row.package);
|
||||
}
|
||||
row.package = JSON.parse(row.package);
|
||||
_parseRow(row);
|
||||
} catch (e) {
|
||||
console.warn('parse package error: %s, id: %s version: %s, error: %s', row.name, row.id, row.version, e);
|
||||
}
|
||||
@@ -49,27 +44,46 @@ function stringifyPackage(pkg) {
|
||||
}
|
||||
|
||||
exports.getModuleById = function* (id) {
|
||||
var row = yield Module.find(Number(id));
|
||||
var row = yield Module.findById(Number(id));
|
||||
parseRow(row);
|
||||
return row;
|
||||
};
|
||||
|
||||
exports.getModule = function* (name, version) {
|
||||
var row = yield* Module.findByNameAndVersion(name, version);
|
||||
var row = yield Module.findByNameAndVersion(name, version);
|
||||
parseRow(row);
|
||||
return row;
|
||||
};
|
||||
|
||||
exports.getModuleByTag = function* (name, tag) {
|
||||
var tag = yield* Tag.findByNameAndTag(name, tag);
|
||||
var tag = yield Tag.findByNameAndTag(name, tag);
|
||||
if (!tag) {
|
||||
return null;
|
||||
}
|
||||
return yield* exports.getModule(tag.name, tag.version);
|
||||
return yield exports.getModule(tag.name, tag.version);
|
||||
};
|
||||
|
||||
exports.getModuleByRange = function* (name, range) {
|
||||
var rows = yield exports.listModulesByName(name, [ 'id', 'version' ]);
|
||||
var versionMap = {};
|
||||
var versions = rows.map(function(row) {
|
||||
versionMap[row.version] = row;
|
||||
return row.version;
|
||||
}).filter(function(version) {
|
||||
return semver.valid(version);
|
||||
});
|
||||
|
||||
var version = semver.maxSatisfying(versions, range);
|
||||
if (!versionMap[version]) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var id = versionMap[version].id;
|
||||
return yield exports.getModuleById(id);
|
||||
};
|
||||
|
||||
exports.getLatestModule = function* (name) {
|
||||
return yield* exports.getModuleByTag(name, 'latest');
|
||||
return yield exports.getModuleByTag(name, 'latest');
|
||||
};
|
||||
|
||||
// module:list
|
||||
@@ -124,7 +138,7 @@ exports.listModules = function* (names) {
|
||||
id: ids
|
||||
},
|
||||
attributes: [
|
||||
'name', 'description'
|
||||
'name', 'description', 'version',
|
||||
]
|
||||
});
|
||||
return rows;
|
||||
@@ -182,7 +196,7 @@ exports.listPublicModuleNamesByUser = function* (username) {
|
||||
});
|
||||
|
||||
// find from npm module maintainer table
|
||||
var moduleNames = yield* NpmModuleMaintainer.listModuleNamesByUser(username);
|
||||
var moduleNames = yield NpmModuleMaintainer.listModuleNamesByUser(username);
|
||||
moduleNames.forEach(function (name) {
|
||||
if (!map[name]) {
|
||||
names.push(name);
|
||||
@@ -192,7 +206,7 @@ exports.listPublicModuleNamesByUser = function* (username) {
|
||||
};
|
||||
|
||||
// start must be a date or timestamp
|
||||
exports.listPublicModuleNamesSince = function* (start) {
|
||||
exports.listPublicModuleNamesSince = function* listPublicModuleNamesSince(start) {
|
||||
if (!(start instanceof Date)) {
|
||||
start = new Date(Number(start));
|
||||
}
|
||||
@@ -215,23 +229,25 @@ exports.listAllPublicModuleNames = function* () {
|
||||
var sql = 'SELECT DISTINCT(name) AS name FROM tag ORDER BY name';
|
||||
var rows = yield models.query(sql);
|
||||
return rows.filter(function (row) {
|
||||
return row.name[0] !== '@';
|
||||
return !common.isPrivatePackage(row.name);
|
||||
}).map(function (row) {
|
||||
return row.name;
|
||||
});
|
||||
};
|
||||
|
||||
exports.listModulesByName = function* (moduleName) {
|
||||
exports.listModulesByName = function* (moduleName, attributes) {
|
||||
var mods = yield Module.findAll({
|
||||
where: {
|
||||
name: moduleName
|
||||
},
|
||||
order: [ ['id', 'DESC'] ]
|
||||
order: [ ['id', 'DESC'] ],
|
||||
attributes,
|
||||
});
|
||||
return mods.map(function (mod) {
|
||||
|
||||
for (var mod of mods) {
|
||||
parseRow(mod);
|
||||
return mod;
|
||||
});
|
||||
}
|
||||
return mods;
|
||||
};
|
||||
|
||||
exports.getModuleLastModified = function* (name) {
|
||||
@@ -260,7 +276,7 @@ exports.saveModule = function* (mod) {
|
||||
// dist.shasum = '';
|
||||
// dist.size = 0;
|
||||
var publish_time = mod.publish_time || Date.now();
|
||||
var item = yield* Module.findByNameAndVersion(mod.name, mod.version);
|
||||
var item = yield Module.findByNameAndVersion(mod.name, mod.version);
|
||||
if (!item) {
|
||||
item = Module.build({
|
||||
name: mod.name,
|
||||
@@ -276,7 +292,7 @@ exports.saveModule = function* (mod) {
|
||||
item.dist_size = dist.size;
|
||||
item.description = description;
|
||||
|
||||
if (item.isDirty) {
|
||||
if (item.changed()) {
|
||||
item = yield item.save();
|
||||
}
|
||||
var result = {
|
||||
@@ -301,14 +317,68 @@ exports.saveModule = function* (mod) {
|
||||
|
||||
if (words.length > 0) {
|
||||
// add keywords
|
||||
yield* exports.addKeywords(mod.name, description, words);
|
||||
yield exports.addKeywords(mod.name, description, words);
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
|
||||
exports.listModuleAbbreviatedsByName = function* (name) {
|
||||
var rows = yield models.ModuleAbbreviated.findAll({
|
||||
where: {
|
||||
name: name
|
||||
},
|
||||
order: [ ['id', 'DESC'] ],
|
||||
});
|
||||
|
||||
for (var row of rows) {
|
||||
row.package = JSON.parse(row.package);
|
||||
}
|
||||
return rows;
|
||||
};
|
||||
|
||||
// https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md#abbreviated-version-object
|
||||
exports.saveModuleAbbreviated = function* (mod) {
|
||||
var pkg = JSON.stringify({
|
||||
name: mod.package.name,
|
||||
version: mod.package.version,
|
||||
deprecated: mod.package.deprecated,
|
||||
dependencies: mod.package.dependencies,
|
||||
optionalDependencies: mod.package.optionalDependencies,
|
||||
devDependencies: mod.package.devDependencies,
|
||||
bundleDependencies: mod.package.bundleDependencies,
|
||||
peerDependencies: mod.package.peerDependencies,
|
||||
bin: mod.package.bin,
|
||||
directories: mod.package.directories,
|
||||
dist: mod.package.dist,
|
||||
engines: mod.package.engines,
|
||||
_hasShrinkwrap: mod.package._hasShrinkwrap,
|
||||
_publish_on_cnpm: mod.package._publish_on_cnpm,
|
||||
});
|
||||
var publish_time = mod.publish_time || Date.now();
|
||||
var item = yield models.ModuleAbbreviated.findByNameAndVersion(mod.name, mod.version);
|
||||
if (!item) {
|
||||
item = models.ModuleAbbreviated.build({
|
||||
name: mod.name,
|
||||
version: mod.version,
|
||||
});
|
||||
}
|
||||
item.publish_time = publish_time;
|
||||
item.package = pkg;
|
||||
|
||||
if (item.changed()) {
|
||||
item = yield item.save();
|
||||
}
|
||||
var result = {
|
||||
id: item.id,
|
||||
gmt_modified: item.gmt_modified,
|
||||
};
|
||||
|
||||
return result;
|
||||
};
|
||||
|
||||
exports.updateModulePackage = function* (id, pkg) {
|
||||
var mod = yield Module.find(Number(id));
|
||||
var mod = yield Module.findById(Number(id));
|
||||
if (!mod) {
|
||||
// not exists
|
||||
return null;
|
||||
@@ -318,7 +388,7 @@ exports.updateModulePackage = function* (id, pkg) {
|
||||
};
|
||||
|
||||
exports.updateModulePackageFields = function* (id, fields) {
|
||||
var mod = yield* exports.getModuleById(id);
|
||||
var mod = yield exports.getModuleById(id);
|
||||
if (!mod) {
|
||||
return null;
|
||||
}
|
||||
@@ -326,21 +396,39 @@ exports.updateModulePackageFields = function* (id, fields) {
|
||||
for (var k in fields) {
|
||||
pkg[k] = fields[k];
|
||||
}
|
||||
return yield* exports.updateModulePackage(id, pkg);
|
||||
return yield exports.updateModulePackage(id, pkg);
|
||||
};
|
||||
|
||||
exports.updateModuleAbbreviatedPackage = function* (item) {
|
||||
// item => { id, name, version, _hasShrinkwrap }
|
||||
var mod = yield models.ModuleAbbreviated.findByNameAndVersion(item.name, item.version);
|
||||
if (!mod) {
|
||||
return null;
|
||||
}
|
||||
var pkg = JSON.parse(mod.package);
|
||||
for (var key in item) {
|
||||
if (key === 'name' || key === 'version' || key === 'id') {
|
||||
continue;
|
||||
}
|
||||
pkg[key] = item[key];
|
||||
}
|
||||
mod.package = JSON.stringify(pkg);
|
||||
|
||||
return yield mod.save([ 'package' ]);
|
||||
};
|
||||
|
||||
exports.updateModuleReadme = function* (id, readme) {
|
||||
var mod = yield* exports.getModuleById(id);
|
||||
var mod = yield exports.getModuleById(id);
|
||||
if (!mod) {
|
||||
return null;
|
||||
}
|
||||
var pkg = mod.package || {};
|
||||
pkg.readme = readme;
|
||||
return yield* exports.updateModulePackage(id, pkg);
|
||||
return yield exports.updateModulePackage(id, pkg);
|
||||
};
|
||||
|
||||
exports.updateModuleDescription = function* (id, description) {
|
||||
var mod = yield* exports.getModuleById(id);
|
||||
var mod = yield exports.getModuleById(id);
|
||||
if (!mod) {
|
||||
return null;
|
||||
}
|
||||
@@ -361,23 +449,67 @@ exports.updateModuleLastModified = function* (name) {
|
||||
if (!row) {
|
||||
return null;
|
||||
}
|
||||
row.gmt_modified = new Date();
|
||||
return yield row.save(['gmt_modified']);
|
||||
// gmt_modified is readonly, we must use setDataValue
|
||||
row.setDataValue('gmt_modified', new Date());
|
||||
return yield row.save();
|
||||
};
|
||||
|
||||
// try to return latest version readme
|
||||
exports.getPackageReadme = function* (name, onlyPackageReadme) {
|
||||
if (config.enableAbbreviatedMetadata) {
|
||||
var row = yield models.PackageReadme.findByName(name);
|
||||
if (row) {
|
||||
return {
|
||||
version: row.version,
|
||||
readme: row.readme,
|
||||
};
|
||||
}
|
||||
if (onlyPackageReadme) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
var mod = yield exports.getLatestModule(name);
|
||||
if (mod) {
|
||||
return {
|
||||
version: mod.package.version,
|
||||
readme: mod.package.readme,
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
exports.savePackageReadme = function* (name, readme, latestVersion) {
|
||||
var item = yield models.PackageReadme.find({ where: { name: name } });
|
||||
if (!item) {
|
||||
item = models.PackageReadme.build({
|
||||
name: name,
|
||||
});
|
||||
}
|
||||
item.readme = readme;
|
||||
item.version = latestVersion;
|
||||
return yield item.save();
|
||||
};
|
||||
|
||||
exports.removeModulesByName = function* (name) {
|
||||
yield Module.destroy({
|
||||
where: {
|
||||
name: name
|
||||
}
|
||||
name: name,
|
||||
},
|
||||
});
|
||||
if (config.enableAbbreviatedMetadata) {
|
||||
yield models.ModuleAbbreviated.destroy({
|
||||
where: {
|
||||
name: name,
|
||||
},
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
exports.removeModulesByNameAndVersions = function* (name, versions) {
|
||||
yield Module.destroy({
|
||||
where: {
|
||||
name: name,
|
||||
version: versions
|
||||
version: versions,
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -385,12 +517,12 @@ exports.removeModulesByNameAndVersions = function* (name, versions) {
|
||||
// tags
|
||||
|
||||
exports.addModuleTag = function* (name, tag, version) {
|
||||
var mod = yield* exports.getModule(name, version);
|
||||
var mod = yield exports.getModule(name, version);
|
||||
if (!mod) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var row = yield* Tag.findByNameAndTag(name, tag);
|
||||
var row = yield Tag.findByNameAndTag(name, tag);
|
||||
if (!row) {
|
||||
row = Tag.build({
|
||||
name: name,
|
||||
@@ -399,7 +531,7 @@ exports.addModuleTag = function* (name, tag, version) {
|
||||
}
|
||||
row.module_id = mod.id;
|
||||
row.version = version;
|
||||
if (row.isDirty) {
|
||||
if (row.changed()) {
|
||||
return yield row.save();
|
||||
}
|
||||
return row;
|
||||
@@ -496,8 +628,7 @@ exports.updatePrivateModuleMaintainers = function* (name, usernames) {
|
||||
};
|
||||
|
||||
function* getMaintainerModel(name) {
|
||||
var isPrivatePackage = yield* common.isPrivatePackage(name);
|
||||
return isPrivatePackage ? PrivateModuleMaintainer : NpmModuleMaintainer;
|
||||
return common.isPrivatePackage(name) ? PrivateModuleMaintainer : NpmModuleMaintainer;
|
||||
}
|
||||
|
||||
exports.listMaintainers = function* (name) {
|
||||
@@ -576,7 +707,7 @@ exports.addKeyword = function* (data) {
|
||||
item = ModuleKeyword.build(data);
|
||||
}
|
||||
item.description = data.description;
|
||||
if (item.isDirty) {
|
||||
if (item.changed()) {
|
||||
// make sure object will change, otherwise will cause empty sql error
|
||||
// @see https://github.com/cnpm/cnpmjs.org/issues/533
|
||||
return yield item.save();
|
||||
@@ -609,7 +740,7 @@ exports.search = function* (word, options) {
|
||||
// 3. keyword equal search
|
||||
var ids = {};
|
||||
|
||||
var sql = 'SELECT module_id FROM tag WHERE LOWER(name) LIKE LOWER(?) AND tag="latest" \
|
||||
var sql = 'SELECT module_id FROM tag WHERE LOWER(name) LIKE LOWER(?) AND tag=\'latest\' \
|
||||
ORDER BY name LIMIT ?;';
|
||||
var rows = yield* models.query(sql, [word + '%', limit ]);
|
||||
for (var i = 0; i < rows.length; i++) {
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - services/total.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
/**
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -18,15 +16,20 @@ var config = require('../config');
|
||||
var models = require('../models');
|
||||
var Total = models.Total;
|
||||
|
||||
var TOTAL_MODULE_SQL = 'SELECT count(distinct(name)) AS count FROM module;';
|
||||
var TOTAL_VERSION_SQL = 'SELECT count(name) AS count FROM module;';
|
||||
var TOTAL_USER_SQL = 'SELECT count(name) AS count FROM user;';
|
||||
if (config.database.dialect === 'postgres') {
|
||||
// pg not allow table name as 'user'
|
||||
TOTAL_USER_SQL = 'SELECT count(name) AS count FROM public.user;';
|
||||
}
|
||||
|
||||
exports.get = function* () {
|
||||
// var DB_SIZE_SQL = 'SELECT TABLE_NAME AS name, data_length, index_length \
|
||||
// FROM information_schema.tables WHERE TABLE_SCHEMA = ? \
|
||||
// GROUP BY TABLE_NAME \
|
||||
// ORDER BY data_length DESC \
|
||||
// LIMIT 0, 200';
|
||||
var TOTAL_MODULE_SQL = 'SELECT count(distinct(name)) AS count FROM `module`;';
|
||||
var TOTAL_VERSION_SQL = 'SELECT count(name) AS count FROM `module`;';
|
||||
var TOTAL_USER_SQL = 'SELECT count(name) AS count FROM `user`;';
|
||||
var rs = yield [
|
||||
// models.query(DB_SIZE_SQL, [config.db]),
|
||||
models.queryOne(TOTAL_MODULE_SQL),
|
||||
@@ -41,6 +44,10 @@ exports.get = function* () {
|
||||
var uc = rs[2];
|
||||
var info = rs[3] || {};
|
||||
|
||||
if (typeof info.module_delete === 'string') {
|
||||
info.module_delete = Number(info.module_delete);
|
||||
}
|
||||
|
||||
var total = {
|
||||
data_tables: {},
|
||||
disk_size: 0,
|
||||
@@ -82,42 +89,49 @@ exports.get = function* () {
|
||||
};
|
||||
|
||||
exports.getTotalInfo = function* () {
|
||||
return yield Total.find({
|
||||
var row = yield Total.find({
|
||||
where: {
|
||||
name: 'total'
|
||||
}
|
||||
});
|
||||
if (row && typeof row.module_delete === 'string') {
|
||||
row.module_delete = Number(row.module_delete);
|
||||
}
|
||||
return row;
|
||||
};
|
||||
|
||||
exports.plusDeleteModule = function* () {
|
||||
var sql = 'UPDATE total SET module_delete=module_delete+1 WHERE name="total"';
|
||||
var sql = 'UPDATE total SET module_delete=module_delete+1 WHERE name=\'total\'';
|
||||
return yield* models.query(sql);
|
||||
};
|
||||
|
||||
exports.setLastSyncTime = function* (time) {
|
||||
var sql = 'UPDATE total SET last_sync_time=? WHERE name="total"';
|
||||
var sql = 'UPDATE total SET last_sync_time=? WHERE name=\'total\'';
|
||||
return yield* models.query(sql, [Number(time)]);
|
||||
};
|
||||
|
||||
exports.setLastExistSyncTime = function* (time) {
|
||||
var sql = 'UPDATE total SET last_exist_sync_time=? WHERE name="total"';
|
||||
var sql = 'UPDATE total SET last_exist_sync_time=? WHERE name=\'total\'';
|
||||
return yield* models.query(sql, [Number(time)]);
|
||||
};
|
||||
|
||||
exports.updateSyncStatus = function* (status) {
|
||||
var sql = 'UPDATE total SET sync_status=? WHERE name="total"';
|
||||
var sql = 'UPDATE total SET sync_status=? WHERE name=\'total\'';
|
||||
return yield* models.query(sql, [status]);
|
||||
};
|
||||
|
||||
exports.updateSyncNum = function* (params) {
|
||||
var arg = {
|
||||
sync_status: params.syncStatus,
|
||||
need_sync_num: params.need || 0,
|
||||
success_sync_num: params.success || 0,
|
||||
fail_sync_num: params.fail || 0,
|
||||
left_sync_num: params.left || 0,
|
||||
last_sync_module: params.lastSyncModule
|
||||
};
|
||||
var sql = 'UPDATE total SET ? WHERE name="total"';
|
||||
return yield* models.query(sql, [arg]);
|
||||
var args = [
|
||||
params.syncStatus,
|
||||
params.need || 0,
|
||||
params.success || 0,
|
||||
params.fail || 0,
|
||||
params.left || 0,
|
||||
params.lastSyncModule
|
||||
];
|
||||
var sql = 'UPDATE total SET \
|
||||
sync_status=?, need_sync_num=?, success_sync_num=?, \
|
||||
fail_sync_num=?, left_sync_num=?, last_sync_module=? \
|
||||
WHERE name=\'total\'';
|
||||
return yield* models.query(sql, args);
|
||||
};
|
||||
|
||||
85
sync/changes_stream_syncer.js
Normal file
85
sync/changes_stream_syncer.js
Normal file
@@ -0,0 +1,85 @@
|
||||
'use strict';
|
||||
|
||||
const ChangesStream = require('changes-stream');
|
||||
const path = require('path');
|
||||
const fs = require('mz/fs');
|
||||
const urllib = require('urllib');
|
||||
const streamAwait = require('await-event');
|
||||
const logger = require('../common/logger');
|
||||
const config = require('../config');
|
||||
|
||||
const db = config.officialNpmReplicate;
|
||||
const lastSeqFile = path.join(config.dataDir, '.cnpmjs.org.last_seq.txt');
|
||||
let _STREAM_ID = 0;
|
||||
|
||||
module.exports = function* sync() {
|
||||
const since = yield getLastSequence();
|
||||
const streamId = _STREAM_ID++;
|
||||
let changesCount = 0;
|
||||
logger.syncInfo('start changes stream#%d, since: %s', streamId, since);
|
||||
const changes = new ChangesStream({
|
||||
db,
|
||||
since,
|
||||
include_docs: false,
|
||||
});
|
||||
changes.await = streamAwait;
|
||||
changes.on('data', change => {
|
||||
changesCount++;
|
||||
logger.syncInfo('stream#%d get change#%d: %j', streamId, changesCount, change);
|
||||
syncPackage(change);
|
||||
});
|
||||
|
||||
try {
|
||||
yield changes.await('error');
|
||||
} catch (err) {
|
||||
// make sure changes steam is destroy
|
||||
changes.destroy();
|
||||
err.message += `, stream#${streamId}, changesCount#${changesCount}`;
|
||||
throw err;
|
||||
}
|
||||
};
|
||||
|
||||
function syncPackage(change) {
|
||||
const url = `${config.handleSyncRegistry}/${change.id}/sync`;
|
||||
urllib.request(url, {
|
||||
method: 'PUT',
|
||||
dataType: 'json',
|
||||
timeout: 10000,
|
||||
}, (err, data) => {
|
||||
if (err) {
|
||||
logger.syncInfo('%s:%s PUT %s error: %s, retry after 5s',
|
||||
change.seq, change.id, url, err);
|
||||
logger.syncError(err);
|
||||
syncPackage(change);
|
||||
setTimeout(() => syncPackage(change), 5000);
|
||||
} else {
|
||||
saveLastSequence(change.seq);
|
||||
logger.syncInfo('%s:%s sync request sent, log: %s/log/%s',
|
||||
change.seq, change.id, url, data.logId);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function* getLastSequence() {
|
||||
let lastSeq;
|
||||
if (yield fs.exists(lastSeqFile)) {
|
||||
lastSeq = yield fs.readFile(lastSeqFile, 'utf8');
|
||||
lastSeq = Number(lastSeq);
|
||||
}
|
||||
if (!lastSeq) {
|
||||
lastSeq = 2649694;
|
||||
}
|
||||
// const r = yield urllib.request(db, {
|
||||
// dataType: 'json',
|
||||
// timeout: 15000,
|
||||
// });
|
||||
// logger.syncInfo('get registry info: %j', r.data);
|
||||
// if (lastSeq < r.data.update_seq) {
|
||||
// lastSeq = r.data.update_seq;
|
||||
// }
|
||||
return lastSeq;
|
||||
}
|
||||
|
||||
function saveLastSequence(seq) {
|
||||
fs.writeFile(lastSeqFile, String(seq), () => {});
|
||||
}
|
||||
255
sync/index.js
255
sync/index.js
@@ -1,37 +1,23 @@
|
||||
/**!
|
||||
* cnpmjs.org - sync/index.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 debug = require('debug')('cnpmjs.org:sync:index');
|
||||
const co = require('co');
|
||||
const ms = require('humanize-ms');
|
||||
const util = require('util');
|
||||
const config = require('../config');
|
||||
const mail = require('../common/mail');
|
||||
const logger = require('../common/logger');
|
||||
const totalService = require('../services/total');
|
||||
|
||||
var debug = require('debug')('cnpmjs.org:sync:index');
|
||||
var co = require('co');
|
||||
var ms = require('humanize-ms');
|
||||
var util = require('util');
|
||||
var config = require('../config');
|
||||
var mail = require('../common/mail');
|
||||
var logger = require('../common/logger');
|
||||
var totalService = require('../services/total');
|
||||
|
||||
var sync = null;
|
||||
let sync = null;
|
||||
|
||||
switch (config.syncModel) {
|
||||
case 'all':
|
||||
sync = require('./sync_all');
|
||||
break;
|
||||
case 'exist':
|
||||
sync = require('./sync_exist');
|
||||
break;
|
||||
case 'all':
|
||||
sync = require('./sync_all');
|
||||
break;
|
||||
case 'exist':
|
||||
sync = require('./sync_exist');
|
||||
break;
|
||||
}
|
||||
|
||||
if (!sync && config.enableCluster) {
|
||||
@@ -39,104 +25,136 @@ if (!sync && config.enableCluster) {
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
console.log('[%s] [sync_worker:%s] syncing with %s mode',
|
||||
Date(), process.pid, config.syncModel);
|
||||
console.log('[%s] [sync_worker:%s] syncing with %s mode, changesStreamingSync: %s',
|
||||
Date(), process.pid, config.syncModel, config.changesStreamingSync);
|
||||
|
||||
//set sync_status = 0 at first
|
||||
function onerror(err) {
|
||||
logger.error(err);
|
||||
}
|
||||
|
||||
// set sync_status = 0 at first
|
||||
co(function* () {
|
||||
yield* totalService.updateSyncStatus(0);
|
||||
})(function (err) {
|
||||
if (err) {
|
||||
logger.error(err);
|
||||
}
|
||||
});
|
||||
yield totalService.updateSyncStatus(0);
|
||||
yield checkSyncStatus();
|
||||
}).catch(onerror);
|
||||
|
||||
var syncInterval = ms(config.syncInterval);
|
||||
var minSyncInterval = ms('5m');
|
||||
let syncInterval = ms(config.syncInterval);
|
||||
const minSyncInterval = ms('5m');
|
||||
if (!syncInterval || syncInterval < minSyncInterval) {
|
||||
syncInterval = minSyncInterval;
|
||||
}
|
||||
|
||||
// the same time only sync once
|
||||
var syncing = false;
|
||||
var handleSync = co(function* () {
|
||||
debug('mode: %s, syncing: %s', config.syncModel, syncing);
|
||||
if (!syncing) {
|
||||
syncing = true;
|
||||
debug('start syncing');
|
||||
var data;
|
||||
var error;
|
||||
try {
|
||||
data = yield* sync();
|
||||
} catch (err) {
|
||||
error = err;
|
||||
error.message += ' (sync package error)';
|
||||
logger.syncError(error);
|
||||
}
|
||||
data && logger.syncInfo(data);
|
||||
if (!config.debug) {
|
||||
sendMailToAdmin(error, data, new Date());
|
||||
}
|
||||
syncing = false;
|
||||
}
|
||||
});
|
||||
|
||||
if (sync) {
|
||||
handleSync();
|
||||
setInterval(handleSync, syncInterval);
|
||||
// the same time only sync once
|
||||
let syncing = false;
|
||||
const syncFn = co.wrap(function*() {
|
||||
debug('mode: %s, syncing: %s', config.syncModel, syncing);
|
||||
if (!syncing) {
|
||||
syncing = true;
|
||||
debug('start syncing');
|
||||
let data;
|
||||
let error;
|
||||
try {
|
||||
data = yield sync();
|
||||
} catch (err) {
|
||||
error = err;
|
||||
error.message += ' (sync package error)';
|
||||
logger.syncError(error);
|
||||
}
|
||||
data && logger.syncInfo(data);
|
||||
if (!config.debug) {
|
||||
sendMailToAdmin(error, data, new Date());
|
||||
}
|
||||
syncing = false;
|
||||
}
|
||||
|
||||
// check last_sync_time and last_exist_sync_time
|
||||
yield checkSyncStatus();
|
||||
});
|
||||
|
||||
syncFn().catch(onerror);
|
||||
setInterval(() => syncFn().catch(onerror), syncInterval);
|
||||
}
|
||||
|
||||
/**
|
||||
* sync popular modules
|
||||
*/
|
||||
|
||||
var startSyncPopular = require('./sync_popular');
|
||||
var syncingPopular = false;
|
||||
var syncPopular = co(function* syncPopular() {
|
||||
if (syncingPopular) {
|
||||
return;
|
||||
}
|
||||
syncingPopular = true;
|
||||
logger.syncInfo('Start syncing popular modules...');
|
||||
var data;
|
||||
var error;
|
||||
try {
|
||||
data = yield* startSyncPopular();
|
||||
} catch (err) {
|
||||
error = err;
|
||||
error.message += ' (sync package error)';
|
||||
logger.syncError(error);
|
||||
}
|
||||
|
||||
if (data) {
|
||||
logger.syncInfo(data);
|
||||
}
|
||||
if (!config.debug) {
|
||||
sendMailToAdmin(error, data, new Date());
|
||||
}
|
||||
|
||||
syncingPopular = false;
|
||||
});
|
||||
|
||||
if (config.syncPopular) {
|
||||
syncPopular();
|
||||
setInterval(syncPopular, ms(config.syncPopularInterval));
|
||||
} else {
|
||||
logger.syncInfo('sync popular module disable');
|
||||
const sync = require('./sync_popular');
|
||||
let syncing = false;
|
||||
const syncFn = co.wrap(function*() {
|
||||
if (syncing) {
|
||||
return;
|
||||
}
|
||||
syncing = true;
|
||||
logger.syncInfo('Start syncing popular modules...');
|
||||
let data;
|
||||
let error;
|
||||
try {
|
||||
data = yield sync();
|
||||
} catch (err) {
|
||||
error = err;
|
||||
error.message += ' (sync package error)';
|
||||
logger.syncError(error);
|
||||
}
|
||||
|
||||
if (data) {
|
||||
logger.syncInfo(data);
|
||||
}
|
||||
if (!config.debug) {
|
||||
sendMailToAdmin(error, data, new Date());
|
||||
}
|
||||
syncing = false;
|
||||
});
|
||||
|
||||
syncFn().catch(onerror);
|
||||
setInterval(() => syncFn().catch(onerror), ms(config.syncPopularInterval));
|
||||
}
|
||||
|
||||
if (config.syncChangesStream) {
|
||||
const sync = require('./changes_stream_syncer');
|
||||
let syncing = false;
|
||||
const syncFn = co.wrap(function*() {
|
||||
if (syncing) {
|
||||
return;
|
||||
}
|
||||
syncing = true;
|
||||
logger.syncInfo('Start changes stream syncing...');
|
||||
try {
|
||||
yield sync();
|
||||
} catch (err) {
|
||||
err.message += ' (sync changes stream error)';
|
||||
logger.syncError(err);
|
||||
}
|
||||
syncing = false;
|
||||
});
|
||||
|
||||
syncFn().catch(onerror);
|
||||
setInterval(() => syncFn().catch(onerror), ms('1m'));
|
||||
}
|
||||
|
||||
function sendMailToAdmin(err, result, syncTime) {
|
||||
result = result || {};
|
||||
var to = [];
|
||||
const to = [];
|
||||
for (var name in config.admins) {
|
||||
to.push(config.admins[name]);
|
||||
}
|
||||
debug('Send email to all admins: %j, with err message: %s, result: %j, start sync time: %s.',
|
||||
to, err ? err.message : '', result, syncTime);
|
||||
var subject;
|
||||
var type;
|
||||
var html;
|
||||
let subject;
|
||||
let type;
|
||||
let html;
|
||||
if (err) {
|
||||
// ignore 503, 504 error
|
||||
// 504: Gateway Time-out
|
||||
// 502 Bad Gateway
|
||||
if (err.status === 503 || err.status === 504 || err.status === 502) {
|
||||
return;
|
||||
}
|
||||
if (err.name === 'JSONResponseFormatError') {
|
||||
return;
|
||||
}
|
||||
subject = 'Sync Error';
|
||||
type = 'error';
|
||||
html = util.format('Sync packages from official registry failed.\n' +
|
||||
@@ -148,6 +166,10 @@ function sendMailToAdmin(err, result, syncTime) {
|
||||
'Start sync time is %s.\n %d packges sync failed: %j ...\n %d packages sync successes :%j ...',
|
||||
syncTime, result.fails.length, result.fails.slice(0, 10),
|
||||
result.successes.length, result.successes.slice(0, 10));
|
||||
// skip email notice when fails items small then 3
|
||||
if (result.fails.length < 3) {
|
||||
type = 'log';
|
||||
}
|
||||
} else if (result.successes && result.successes.length) {
|
||||
subject = 'Sync Finished';
|
||||
type = 'log';
|
||||
@@ -158,10 +180,37 @@ function sendMailToAdmin(err, result, syncTime) {
|
||||
debug('send email with type: %s, subject: %s, html: %s', type, subject, html);
|
||||
logger.syncInfo('send email with type: %s, subject: %s, html: %s', type, subject, html);
|
||||
if (type && type !== 'log') {
|
||||
mail[type](to, subject, html, function (err) {
|
||||
mail[type](to, subject, html, err => {
|
||||
if (err) {
|
||||
logger.error(err);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function* checkSyncStatus() {
|
||||
// if source registry not cnpm, ignore it. e.g.: cnpmjs.org source registry is npmjs.org
|
||||
if (!config.sourceNpmRegistryIsCNpm) {
|
||||
return;
|
||||
}
|
||||
const total = yield totalService.getTotalInfo();
|
||||
let lastSyncTime;
|
||||
if (config.syncModel === 'all') {
|
||||
lastSyncTime = total.last_sync_time;
|
||||
} else if (config.syncModel === 'exist') {
|
||||
lastSyncTime = total.last_exist_sync_time;
|
||||
}
|
||||
debug('checkSyncStatus start, lastSyncTime: %s, syncInterval: %s', lastSyncTime, syncInterval);
|
||||
if (!lastSyncTime) {
|
||||
return;
|
||||
}
|
||||
const diff = Date.now() - lastSyncTime;
|
||||
const oneDay = 3600000 * 24;
|
||||
const maxTime = Math.max(oneDay, syncInterval * 2);
|
||||
if (diff > maxTime) {
|
||||
const err = new Error('Last sync time is expired in ' + diff + ' ms, lastSyncTime: ' +
|
||||
new Date(lastSyncTime) + ', maxTime: ' + maxTime + ' ms');
|
||||
err.name = 'SyncExpiredError';
|
||||
sendMailToAdmin(err, null, new Date());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/*!
|
||||
* cnpmjs.org - sync/status.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:sync:status');
|
||||
var co = require('co');
|
||||
var Total = require('../services/total');
|
||||
@@ -36,8 +22,8 @@ Status.prototype.log = function (syncDone) {
|
||||
lastSyncModule: this.lastSyncModule,
|
||||
};
|
||||
co(function* () {
|
||||
yield* Total.updateSyncNum(params);
|
||||
})();
|
||||
yield Total.updateSyncNum(params);
|
||||
}).catch(function () {});
|
||||
};
|
||||
|
||||
Status.prototype.start = function () {
|
||||
|
||||
@@ -1,20 +1,5 @@
|
||||
/*!
|
||||
* cnpmjs.org - sync/sync_all.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 ms = require('humanize-ms');
|
||||
var thunkify = require('thunkify-wrap');
|
||||
var config = require('../config');
|
||||
var Status = require('./status');
|
||||
@@ -40,19 +25,6 @@ function* getFirstSyncPackages(lastSyncModule) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get all the packages that update time > lastSyncTime
|
||||
* @param {Number} lastSyncTime
|
||||
*/
|
||||
function* getCommonSyncPackages(lastSyncTime) {
|
||||
var data = yield* npmService.getAllSince(lastSyncTime);
|
||||
if (!data) {
|
||||
return [];
|
||||
}
|
||||
delete data._updated;
|
||||
return Object.keys(data);
|
||||
}
|
||||
|
||||
module.exports = function* sync() {
|
||||
var syncTime = Date.now();
|
||||
var info = yield* totalService.getTotalInfo();
|
||||
@@ -66,7 +38,9 @@ module.exports = function* sync() {
|
||||
logger.syncInfo('First time sync all packages from official registry');
|
||||
packages = yield* getFirstSyncPackages(info.last_sync_module);
|
||||
} else {
|
||||
packages = yield* getCommonSyncPackages(info.last_sync_time - ms('10m'));
|
||||
var result = yield npmService.fetchUpdatesSince(info.last_sync_time);
|
||||
syncTime = result.lastModified;
|
||||
packages = result.names;
|
||||
}
|
||||
|
||||
packages = packages || [];
|
||||
@@ -83,19 +57,22 @@ module.exports = function* sync() {
|
||||
concurrency: config.syncConcurrency,
|
||||
syncUpstreamFirst: false,
|
||||
});
|
||||
Status.init({need: packages.length}, worker);
|
||||
Status.init({
|
||||
need: packages.length,
|
||||
}, worker);
|
||||
worker.start();
|
||||
var end = thunkify.event(worker);
|
||||
yield end();
|
||||
|
||||
logger.syncInfo('All packages sync done, successes %d, fails %d',
|
||||
worker.successes.length, worker.fails.length);
|
||||
logger.syncInfo('All packages sync done, successes %d, fails %d, updates %d',
|
||||
worker.successes.length, worker.fails.length, worker.updates.length);
|
||||
//only when all succss, set last sync time
|
||||
if (!worker.fails.length) {
|
||||
yield* totalService.setLastSyncTime(syncTime);
|
||||
yield totalService.setLastSyncTime(syncTime);
|
||||
}
|
||||
return {
|
||||
successes: worker.successes,
|
||||
fails: worker.fails
|
||||
fails: worker.fails,
|
||||
updates: worker.updates,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,22 +1,7 @@
|
||||
/*!
|
||||
* cnpmjs.org - sync/sync_exist.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:sync:sync_exist');
|
||||
var Status = require('./status');
|
||||
var ms = require('humanize-ms');
|
||||
var thunkify = require('thunkify-wrap');
|
||||
var config = require('../config');
|
||||
var npmService = require('../services/npm');
|
||||
@@ -34,7 +19,7 @@ function intersection(arrOne, arrTwo) {
|
||||
map[name] = true;
|
||||
});
|
||||
arrTwo.forEach(function (name) {
|
||||
map[name] && results.push(name);
|
||||
map[name] === true && results.push(name);
|
||||
});
|
||||
return results;
|
||||
}
|
||||
@@ -51,7 +36,7 @@ module.exports = function* sync() {
|
||||
|
||||
var allPackages;
|
||||
if (!info.last_exist_sync_time) {
|
||||
var pkgs = yield* npmService.getShort();
|
||||
var pkgs = yield npmService.getShort();
|
||||
debug('First time sync all packages from official registry, got %d packages', pkgs.length);
|
||||
if (info.last_sync_module) {
|
||||
// start from last success
|
||||
@@ -63,16 +48,10 @@ module.exports = function* sync() {
|
||||
}
|
||||
allPackages = pkgs;
|
||||
} else {
|
||||
debug('sync new module from last exist sync time: %s', info.last_sync_time);
|
||||
var data = yield* npmService.getAllSince(info.last_exist_sync_time - ms('10m'));
|
||||
if (!data) {
|
||||
allPackages = [];
|
||||
}
|
||||
if (data._updated) {
|
||||
syncTime = data._updated;
|
||||
delete data._updated;
|
||||
}
|
||||
allPackages = Object.keys(data);
|
||||
debug('sync new module from last exist sync time: %s', info.last_exist_sync_time);
|
||||
var result = yield npmService.fetchUpdatesSince(info.last_exist_sync_time);
|
||||
allPackages = result.names;
|
||||
syncTime = result.lastModified;
|
||||
}
|
||||
|
||||
var packages = intersection(existPackages, allPackages);
|
||||
@@ -83,7 +62,7 @@ module.exports = function* sync() {
|
||||
fails: []
|
||||
};
|
||||
}
|
||||
debug('Total %d packages to sync', packages.length);
|
||||
debug('Total %d packages to sync, top 10: %j', packages.length, packages.slice(0, 10));
|
||||
|
||||
var worker = new SyncModuleWorker({
|
||||
username: 'admin',
|
||||
|
||||
@@ -1,19 +1,5 @@
|
||||
/*!
|
||||
* cnpmjs.org - sync/sync_popular.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:sync:sync_popular');
|
||||
var thunkify = require('thunkify-wrap');
|
||||
var config = require('../config');
|
||||
|
||||
52
sync/sync_since.js
Normal file
52
sync/sync_since.js
Normal file
@@ -0,0 +1,52 @@
|
||||
'use strict';
|
||||
|
||||
const thunkify = require('thunkify-wrap');
|
||||
const co = require('co');
|
||||
const ms = require('humanize-ms');
|
||||
const npmService = require('../services/npm');
|
||||
const SyncModuleWorker = require('../controllers/sync_module_worker');
|
||||
|
||||
function* sync(sinceTimestamp) {
|
||||
console.log('Fetching packages since: %s', new Date(sinceTimestamp));
|
||||
var result = yield npmService.fetchAllPackagesSince(sinceTimestamp);
|
||||
var packages = result.names;
|
||||
|
||||
packages = packages || [];
|
||||
if (!packages.length) {
|
||||
console.log('no packages need be sync');
|
||||
process.exit(0);
|
||||
}
|
||||
// var news = [];
|
||||
// for (var i = 0; i < packages.length; i++) {
|
||||
// if (packages[i] === 'elwms') {
|
||||
// news = packages.slice(i);
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// packages = news;
|
||||
console.log('lastModified: %s, lastModified package: %s, total %d packages to sync: %j',
|
||||
new Date(result.lastModified), result.lastModifiedName, packages.length, packages);
|
||||
|
||||
var worker = new SyncModuleWorker({
|
||||
username: 'sync_since',
|
||||
name: packages,
|
||||
noDep: true,
|
||||
concurrency: 1,
|
||||
syncUpstreamFirst: false,
|
||||
});
|
||||
worker.start();
|
||||
var end = thunkify.event(worker);
|
||||
yield end();
|
||||
|
||||
console.log('All packages sync done, successes %d, fails %d',
|
||||
worker.successes.length, worker.fails.length);
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
co(function* () {
|
||||
var timestamp = Date.now() - ms(process.argv[2] || '30d');
|
||||
yield sync(timestamp);
|
||||
}).catch(function (err) {
|
||||
console.error(err.stack);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -5,7 +5,7 @@
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <m@fengmk2.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -14,23 +14,30 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var utils = require('../utils');
|
||||
var markdown = require('../../common/markdown');
|
||||
|
||||
describe('common/markdown.test.js', function () {
|
||||
var fixtures = path.join(__dirname, '..', 'fixtures');
|
||||
|
||||
it('should render sonido readme', function () {
|
||||
var readme = fs.readFileSync(path.join(fixtures, 'sonido.md'), 'utf8');
|
||||
var readme = utils.getFileContent('sonido.md');
|
||||
var md = markdown.render(readme);
|
||||
md.should.equal('<p>Configuration Wizard: <!--- This is what the user will see during the configuration -></p>\n');
|
||||
});
|
||||
|
||||
it('should filter xss', function () {
|
||||
var html = markdown.render('foo<script>alert(1)</script>/xss\n[foo](/foo) <a onclick="alert(1)">bar</a>\n"\'');
|
||||
// console.log(html);
|
||||
html.should.equal('<p>foo<script>alert(1)</script>/xss\n<a href="/foo">foo</a> <a>bar</a>\n"\'</p>\n');
|
||||
markdown.render('[xss link](javascript:alert(2))').should.equal('<p>[xss link](javascript:alert(2))</p>\n');
|
||||
});
|
||||
|
||||
it('should handle eat cpu markdown', function () {
|
||||
var readme = utils.getFileContent('eat-cpu.md');
|
||||
markdown.render(readme);
|
||||
});
|
||||
|
||||
it('should not filter < and > on code', function () {
|
||||
var content = utils.getFileContent('code.md');
|
||||
var html = markdown.render(content);
|
||||
html.should.containEql('<pre><code class="language-html"><body>hi</body>');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,13 +1,3 @@
|
||||
/**!
|
||||
* cnpmjs.org - test/controllers/registry/module/scope_package.test.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
@@ -21,7 +11,7 @@ var config = require('../../../../config');
|
||||
var app = require('../../../../servers/registry');
|
||||
var utils = require('../../../utils');
|
||||
|
||||
describe('controllers/registry/module/scope_package.test.js', function () {
|
||||
describe('test/controllers/registry/module/scope_package.test.js', function () {
|
||||
var pkgname = '@cnpm/test-scope-package';
|
||||
var pkgURL = '/@' + encodeURIComponent(pkgname.substring(1));
|
||||
before(function (done) {
|
||||
@@ -52,16 +42,17 @@ describe('controllers/registry/module/scope_package.test.js', function () {
|
||||
|
||||
afterEach(mm.restore);
|
||||
|
||||
it('should get 404 when do not support scope', function (done) {
|
||||
it('should get 302 when do not support scope', function (done) {
|
||||
mm(config, 'scopes', []);
|
||||
request(app)
|
||||
.get('/@invalid/test')
|
||||
.expect(404, done);
|
||||
.expect('Location', 'https://registry.npmjs.com/@invalid/test')
|
||||
.expect(302, done);
|
||||
});
|
||||
|
||||
it('should get 400 when scope not match', function (done) {
|
||||
it('should get 404 when scope is private', function (done) {
|
||||
request(app)
|
||||
.get('/@invalid/test')
|
||||
.get('/@cnpmtest/test')
|
||||
.expect(404, done);
|
||||
});
|
||||
|
||||
|
||||
@@ -170,6 +170,18 @@ describe('controllers/registry/package/dist_tag.test.js', function () {
|
||||
});
|
||||
});
|
||||
|
||||
it('should not destroy latest tag', function(done) {
|
||||
request(app.listen())
|
||||
.delete('/-/package/@cnpmtest/dist_tag_test_module_destroy/dist-tags/latest')
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.set('content-type', 'application/json')
|
||||
.expect({
|
||||
error: 'dist_tag_error',
|
||||
reason: 'Can\'t not delete latest tag',
|
||||
})
|
||||
.expect(400, done);
|
||||
});
|
||||
|
||||
it('should 404 destroy not exists tag', function (done) {
|
||||
request(app.listen())
|
||||
.delete('/-/package/@cnpmtest/dist_tag_test_module_destroy/dist-tags/not-exists')
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
/**!
|
||||
* cnpmjs.org - test/controllers/registry/package/download.test.js
|
||||
*
|
||||
* Copyright(c) fengmk2 and other contributors.
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -15,36 +13,66 @@
|
||||
*/
|
||||
|
||||
var request = require('supertest');
|
||||
var mm = require('mm');
|
||||
var config = require('../../../../config');
|
||||
var app = require('../../../../servers/registry');
|
||||
var utils = require('../../../utils');
|
||||
|
||||
describe('controllers/registry/package/download.test.js', function () {
|
||||
describe('test/controllers/registry/package/download.test.js', function () {
|
||||
before(function (done) {
|
||||
var pkg = utils.getPackage('@cnpmtest/download-test-module', '1.0.0', utils.admin);
|
||||
request(app.listen())
|
||||
request(app)
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.send(pkg)
|
||||
.expect(201, done);
|
||||
});
|
||||
|
||||
afterEach(mm.restore);
|
||||
|
||||
describe('GET /:name/download/:filename', function () {
|
||||
it('should download a file with 200', function (done) {
|
||||
request(app.listen())
|
||||
request(app)
|
||||
.get('/@cnpmtest/download-test-module/download/@cnpmtest/download-test-module-1.0.0.tgz')
|
||||
.expect(200, done);
|
||||
});
|
||||
|
||||
it('should alias /:name/-/:filename to /:name/download/:filename', function (done) {
|
||||
request(app.listen())
|
||||
request(app)
|
||||
.get('/@cnpmtest/download-test-module/-/@cnpmtest/download-test-module-1.0.0.tgz')
|
||||
.expect(200, done);
|
||||
});
|
||||
|
||||
it('should 404 when package not exists', function (done) {
|
||||
request(app.listen())
|
||||
request(app)
|
||||
.get('/@cnpmtest/download-test-module-not-exists/download/@cnpmtest/download-test-module-not-exists-1.0.0.tgz')
|
||||
.expect(404, done);
|
||||
});
|
||||
|
||||
describe('nfs.url is function', function() {
|
||||
it('should work with nfs.url is generatorFunction', function(done) {
|
||||
mm(config.nfs, 'url', function*(key) {
|
||||
return 'http://foo.test.com' + key;
|
||||
});
|
||||
mm(config, 'downloadRedirectToNFS', true);
|
||||
|
||||
request(app)
|
||||
.get('/@cnpmtest/download-test-module/-/@cnpmtest/download-test-module-1.0.0.tgz')
|
||||
.expect('Location', 'http://foo.test.com/@cnpmtest/download-test-module/-/@cnpmtest/download-test-module-1.0.0.tgz')
|
||||
.expect(302, done);
|
||||
});
|
||||
|
||||
it('should work with nfs.url is function', function(done) {
|
||||
mm(config.nfs, 'url', function(key) {
|
||||
return 'http://foo.test.com' + key;
|
||||
});
|
||||
mm(config, 'downloadRedirectToNFS', true);
|
||||
|
||||
request(app)
|
||||
.get('/@cnpmtest/download-test-module/-/@cnpmtest/download-test-module-1.0.0.tgz')
|
||||
.expect('Location', 'http://foo.test.com/@cnpmtest/download-test-module/-/@cnpmtest/download-test-module-1.0.0.tgz')
|
||||
.expect(302, done);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,38 +1,34 @@
|
||||
/**!
|
||||
* cnpmjs.org - test/controllers/registry/package/download_total.test.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 request = require('supertest');
|
||||
const mm = require('mm');
|
||||
const DownloadTotal = require('../../../../services/download_total');
|
||||
const app = require('../../../../servers/registry');
|
||||
const utils = require('../../../utils');
|
||||
|
||||
var request = require('supertest');
|
||||
var mm = require('mm');
|
||||
var DownloadTotal = require('../../../../services/download_total');
|
||||
var app = require('../../../../servers/registry');
|
||||
|
||||
describe('controllers/registry/package/download_total.test.js', function () {
|
||||
describe('test/controllers/registry/package/download_total.test.js', () => {
|
||||
afterEach(mm.restore);
|
||||
|
||||
it('should error when range error', function (done) {
|
||||
request(app.listen())
|
||||
before(() => {
|
||||
const pkg2 = utils.getPackage('@cnpmtest/download_total_test_module', '1.0.1', utils.otherUser);
|
||||
return request(app.listen())
|
||||
.put('/' + pkg2.name)
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.send(pkg2)
|
||||
.expect(201);
|
||||
});
|
||||
|
||||
it('should error when range error', () => {
|
||||
return request(app.listen())
|
||||
.get('/downloads/range/2014-10-10:xxxx/koa')
|
||||
.expect(400)
|
||||
.expect({
|
||||
error: 'range_error',
|
||||
reason: 'range must be YYYY-MM-DD:YYYY-MM-DD style'
|
||||
}, done);
|
||||
});
|
||||
});
|
||||
|
||||
it('should get package downloads ok', function (done) {
|
||||
it('should get package downloads ok', () => {
|
||||
mm.data(DownloadTotal, 'getModuleTotal', [{
|
||||
id: 1,
|
||||
count: 10,
|
||||
@@ -50,7 +46,7 @@ describe('controllers/registry/package/download_total.test.js', function () {
|
||||
name: 'koa'
|
||||
}]);
|
||||
|
||||
request(app.listen())
|
||||
return request(app.listen())
|
||||
.get('/downloads/range/2014-12-01:2014-12-03/koa')
|
||||
.expect(200)
|
||||
.expect({
|
||||
@@ -67,10 +63,10 @@ describe('controllers/registry/package/download_total.test.js', function () {
|
||||
day: '2014-12-03',
|
||||
downloads: 10
|
||||
}]
|
||||
}, done);
|
||||
});
|
||||
});
|
||||
|
||||
it('should get total downloads ok', function (done) {
|
||||
it('should get total downloads ok', () => {
|
||||
mm.data(DownloadTotal, 'getTotal', [{
|
||||
count: 20,
|
||||
date: '2014-12-03',
|
||||
@@ -82,7 +78,7 @@ describe('controllers/registry/package/download_total.test.js', function () {
|
||||
date: '2014-12-02',
|
||||
}]);
|
||||
|
||||
request(app.listen())
|
||||
return request(app.listen())
|
||||
.get('/downloads/range/2014-12-01:2014-12-03')
|
||||
.expect(200)
|
||||
.expect({
|
||||
@@ -98,6 +94,44 @@ describe('controllers/registry/package/download_total.test.js', function () {
|
||||
day: '2014-12-03',
|
||||
downloads: 20
|
||||
}]
|
||||
}, done);
|
||||
});
|
||||
});
|
||||
|
||||
it('should get scope package downloads ok', () => {
|
||||
mm.data(DownloadTotal, 'getModuleTotal', [{
|
||||
id: 1,
|
||||
count: 10,
|
||||
date: '2014-12-03',
|
||||
name: '@cnpmtest/download_total_test_module'
|
||||
}, {
|
||||
id: 1,
|
||||
count: 8,
|
||||
date: '2014-12-01',
|
||||
name: '@cnpmtest/download_total_test_module'
|
||||
}, {
|
||||
id: 1,
|
||||
count: 5,
|
||||
date: '2014-12-02',
|
||||
name: '@cnpmtest/download_total_test_module'
|
||||
}]);
|
||||
|
||||
return request(app.listen())
|
||||
.get('/downloads/range/2014-12-01:2014-12-03/@cnpmtest/download_total_test_module')
|
||||
.expect(200)
|
||||
.expect({
|
||||
start: '2014-12-01',
|
||||
end: '2014-12-03',
|
||||
package: '@cnpmtest/download_total_test_module',
|
||||
downloads: [{
|
||||
day: '2014-12-01',
|
||||
downloads: 8
|
||||
}, {
|
||||
day: '2014-12-02',
|
||||
downloads: 5
|
||||
}, {
|
||||
day: '2014-12-03',
|
||||
downloads: 10
|
||||
}]
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,20 +1,7 @@
|
||||
/**!
|
||||
* cnpmjs.org - test/controllers/registry/package/list.test.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var should = require('should');
|
||||
var assert = require('assert');
|
||||
var request = require('supertest');
|
||||
var mm = require('mm');
|
||||
var pedding = require('pedding');
|
||||
@@ -23,7 +10,7 @@ var app = require('../../../../servers/registry');
|
||||
var utils = require('../../../utils');
|
||||
var config = require('../../../../config');
|
||||
|
||||
describe('controllers/registry/package/list.test.js', function () {
|
||||
describe('test/controllers/registry/package/list.test.js', () => {
|
||||
afterEach(mm.restore);
|
||||
|
||||
before(function (done) {
|
||||
@@ -71,6 +58,43 @@ describe('controllers/registry/package/list.test.js', function () {
|
||||
});
|
||||
});
|
||||
|
||||
it('should return all versions in abbreviated meta format for private scope package', function(done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-list-1')
|
||||
.set('Accept', 'application/vnd.npm.install-v1+json')
|
||||
.expect(200, function(err, res) {
|
||||
should.not.exist(err);
|
||||
var data = res.body;
|
||||
assert(data.name === '@cnpmtest/testmodule-list-1');
|
||||
assert.deepEqual(Object.keys(data.versions), ['1.0.0', '0.0.1']);
|
||||
assert(data.modified);
|
||||
assert.deepEqual(data['dist-tags'], { latest: '1.0.0' });
|
||||
assert(!data.time);
|
||||
|
||||
// should 304
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-list-1')
|
||||
.set('Accept', 'application/vnd.npm.install-v1+json')
|
||||
.set('If-None-Match', res.headers.etag)
|
||||
.expect(304, done);
|
||||
});
|
||||
});
|
||||
|
||||
it('should return abbreviated meta when Accept: application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*', () => {
|
||||
return request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-list-1')
|
||||
.set('Accept', 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*')
|
||||
.expect(res => {
|
||||
var data = res.body;
|
||||
assert(data.name === '@cnpmtest/testmodule-list-1');
|
||||
assert.deepEqual(Object.keys(data.versions), ['1.0.0', '0.0.1']);
|
||||
assert(data.modified);
|
||||
assert.deepEqual(data['dist-tags'], { latest: '1.0.0' });
|
||||
assert(!data.time);
|
||||
})
|
||||
.expect(200);
|
||||
});
|
||||
|
||||
it('should show star users', function (done) {
|
||||
mm(packageService, 'listStarUserNames', function* () {
|
||||
return ['fengmk2', 'foouser'];
|
||||
@@ -85,10 +109,18 @@ describe('controllers/registry/package/list.test.js', function () {
|
||||
fengmk2: true,
|
||||
foouser: true
|
||||
});
|
||||
data.versions['0.0.1'].publish_time.should.equal(data.versions['0.0.1']._cnpm_publish_time);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should support jsonp', function (done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-list-1?callback=jsonp')
|
||||
.expect(/jsonp\(\{/)
|
||||
.expect(200, done);
|
||||
});
|
||||
|
||||
it('should 404 when package not exists', function (done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/not-exists-package')
|
||||
@@ -128,20 +160,20 @@ describe('controllers/registry/package/list.test.js', function () {
|
||||
}, done);
|
||||
});
|
||||
|
||||
describe('unpublished', function () {
|
||||
before(function (done) {
|
||||
utils.sync('tfs', done);
|
||||
describe.skip('unpublished', () => {
|
||||
before(done => {
|
||||
mm(config, 'syncModel', 'all');
|
||||
utils.sync('moduletest1', done);
|
||||
});
|
||||
|
||||
it('should show unpublished info', function (done) {
|
||||
it('should show unpublished info', done => {
|
||||
mm(config, 'syncModel', 'all');
|
||||
request(app.listen())
|
||||
.get('/tfs')
|
||||
.get('/moduletest1')
|
||||
.expect(404, function (err, res) {
|
||||
should.not.exist(err);
|
||||
var data = res.body;
|
||||
data.time.unpublished.name.should.equal('fengmk2');
|
||||
data.time.unpublished.description.should.equal('tfs');
|
||||
data.time.unpublished.name.should.equal('dead_horse');
|
||||
done();
|
||||
});
|
||||
});
|
||||
@@ -159,13 +191,8 @@ describe('controllers/registry/package/list.test.js', function () {
|
||||
.expect(200, function (err, res) {
|
||||
should.not.exist(err);
|
||||
var data = res.body;
|
||||
data.name.should.equal('tair');
|
||||
data.maintainers.should.eql([
|
||||
{
|
||||
email: 'kate.sf@taobao.com',
|
||||
name: 'sunfang1cn'
|
||||
}
|
||||
]);
|
||||
assert(data.name === 'tair');
|
||||
assert(data.maintainers);
|
||||
done();
|
||||
});
|
||||
});
|
||||
@@ -199,4 +226,87 @@ describe('controllers/registry/package/list.test.js', function () {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('list AbbreviatedMeta', () => {
|
||||
before(done => {
|
||||
mm(config, 'sourceNpmRegistry', config.officialNpmRegistry);
|
||||
mm(config, 'syncModel', 'all');
|
||||
mm(config, 'enableAbbreviatedMetadata', true);
|
||||
utils.sync('detect-port', done);
|
||||
});
|
||||
|
||||
it('should return abbreviated meta when Accept: application/vnd.npm.install-v1+json', () => {
|
||||
mm(config, 'syncModel', 'all');
|
||||
mm(config, 'enableAbbreviatedMetadata', true);
|
||||
return request(app.listen())
|
||||
.get('/detect-port')
|
||||
.set('Accept', 'application/vnd.npm.install-v1+json')
|
||||
.expect(200)
|
||||
.expect(res => {
|
||||
const data = res.body;
|
||||
assert(data.name === 'detect-port');
|
||||
assert(data.modified);
|
||||
assert(data['dist-tags'].latest);
|
||||
assert(Object.keys(data.versions).length > 0);
|
||||
for (const v in data.versions) {
|
||||
assert('_hasShrinkwrap' in data.versions[v]);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
it('should 404 when package not exists', () => {
|
||||
mm(config, 'syncModel', 'all');
|
||||
mm(config, 'enableAbbreviatedMetadata', true);
|
||||
return request(app.listen())
|
||||
.get('/@cnpmtest/not-exists-package')
|
||||
.set('Accept', 'application/vnd.npm.install-v1+json')
|
||||
.expect(404)
|
||||
.expect({
|
||||
error: 'not_found',
|
||||
reason: 'document not found'
|
||||
});
|
||||
});
|
||||
|
||||
it('should return full meta when enableAbbreviatedMetadata is false and Accept is application/vnd.npm.install-v1+json', () => {
|
||||
mm(config, 'syncModel', 'all');
|
||||
mm(config, 'enableAbbreviatedMetadata', false);
|
||||
return request(app.listen())
|
||||
.get('/detect-port')
|
||||
.set('Accept', 'application/vnd.npm.install-v1+json')
|
||||
.expect(200)
|
||||
.expect(res => {
|
||||
const data = res.body;
|
||||
assert(data.name === 'detect-port');
|
||||
assert(data.description);
|
||||
assert(data.maintainers);
|
||||
// assert(data.readme);
|
||||
assert(data['dist-tags'].latest);
|
||||
assert(Object.keys(data.versions).length > 0);
|
||||
for (const v in data.versions) {
|
||||
assert('_hasShrinkwrap' in data.versions[v]);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
it('should return full meta when Accept is not application/vnd.npm.install-v1+json', () => {
|
||||
mm(config, 'syncModel', 'all');
|
||||
mm(config, 'enableAbbreviatedMetadata', true);
|
||||
return request(app.listen())
|
||||
.get('/detect-port')
|
||||
.set('Accept', 'application/json')
|
||||
.expect(200)
|
||||
.expect(res => {
|
||||
const data = res.body;
|
||||
assert(data.name === 'detect-port');
|
||||
assert(data.description);
|
||||
assert(data.readme);
|
||||
assert(data.maintainers);
|
||||
assert(data['dist-tags'].latest);
|
||||
assert(Object.keys(data.versions).length > 0);
|
||||
for (const v in data.versions) {
|
||||
assert('_hasShrinkwrap' in data.versions[v]);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
87
test/controllers/registry/package/list_by_user.test.js
Normal file
87
test/controllers/registry/package/list_by_user.test.js
Normal file
@@ -0,0 +1,87 @@
|
||||
/**!
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var request = require('supertest');
|
||||
var mm = require('mm');
|
||||
var should = require('should');
|
||||
var app = require('../../../../servers/registry');
|
||||
var utils = require('../../../utils');
|
||||
|
||||
describe('test/controllers/registry/package/list_by_user.test.js', function () {
|
||||
var user = 'cnpmjstest_list_by_user';
|
||||
var userauth = 'Basic ' + new Buffer(user + ':' + user).toString('base64');
|
||||
|
||||
afterEach(mm.restore);
|
||||
|
||||
before(function (done) {
|
||||
var pkg = utils.getPackage('@cnpmtest/list_by_user_module1', '1.0.1', user);
|
||||
request(app)
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', userauth)
|
||||
.send(pkg)
|
||||
.expect(201, function (err) {
|
||||
should.not.exist(err);
|
||||
|
||||
var pkg2 = utils.getPackage('@cnpmtest/list_by_user_module2', '2.0.0', user);
|
||||
request(app)
|
||||
.put('/' + pkg2.name)
|
||||
.set('authorization', userauth)
|
||||
.send(pkg2)
|
||||
.expect(201, done);
|
||||
});
|
||||
});
|
||||
|
||||
describe('GET /-/users/:user/packages', function () {
|
||||
it('should get 200', function (done) {
|
||||
var url = '/-/users/' + user + '/packages';
|
||||
request(app)
|
||||
.get(url)
|
||||
.expect(function(res) {
|
||||
var data = res.body;
|
||||
data.user.name.should.equal(user);
|
||||
var map = {};
|
||||
data.packages.forEach(function(pkg) {
|
||||
map[pkg.name] = pkg;
|
||||
});
|
||||
map['@cnpmtest/list_by_user_module1'].should.be.an.Object;
|
||||
map['@cnpmtest/list_by_user_module1'].should.eql({
|
||||
name: '@cnpmtest/list_by_user_module1',
|
||||
description: '',
|
||||
version: '1.0.1',
|
||||
});
|
||||
|
||||
map['@cnpmtest/list_by_user_module2'].should.be.an.Object;
|
||||
map['@cnpmtest/list_by_user_module2'].should.eql({
|
||||
name: '@cnpmtest/list_by_user_module2',
|
||||
description: '',
|
||||
version: '2.0.0',
|
||||
});
|
||||
})
|
||||
.expect(200, done);
|
||||
});
|
||||
|
||||
it('should get empty packages list when user not exists', function (done) {
|
||||
var url = '/-/users/not-exist-username/packages';
|
||||
request(app)
|
||||
.get(url)
|
||||
.expect({
|
||||
user: {
|
||||
name: 'not-exist-username',
|
||||
},
|
||||
packages: [],
|
||||
})
|
||||
.expect(200, done);
|
||||
});
|
||||
});
|
||||
});
|
||||
54
test/controllers/registry/package/list_dependents.test.js
Normal file
54
test/controllers/registry/package/list_dependents.test.js
Normal file
@@ -0,0 +1,54 @@
|
||||
/**!
|
||||
* Copyright(c) cnpm and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
const pedding = require('pedding');
|
||||
const request = require('supertest');
|
||||
const mm = require('mm');
|
||||
const app = require('../../../../servers/registry');
|
||||
const utils = require('../../../utils');
|
||||
|
||||
describe('test/controllers/registry/package/list_dependents.test.js', function () {
|
||||
afterEach(mm.restore);
|
||||
|
||||
before(function (done) {
|
||||
done = pedding(2, done);
|
||||
const pkg = utils.getPackage('@cnpmtest/testmodule-list-dependents1', '1.0.0', utils.admin);
|
||||
pkg.versions['1.0.0'].dependencies = {
|
||||
'@cnpmtest/testmodule-list-dependents2': '~1.0.0',
|
||||
};
|
||||
request(app.listen())
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.send(pkg)
|
||||
.expect(201, done);
|
||||
|
||||
const pkg2 = utils.getPackage('@cnpmtest/testmodule-list-dependents2', '1.0.0', utils.admin);
|
||||
request(app.listen())
|
||||
.put('/' + pkg2.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.send(pkg2)
|
||||
.expect(201, done);
|
||||
});
|
||||
|
||||
it('should list package dependents', function (done) {
|
||||
request(app)
|
||||
.get('/-/package/@cnpmtest/testmodule-list-dependents2/dependents')
|
||||
.expect({
|
||||
dependents: [
|
||||
'@cnpmtest/testmodule-list-dependents1',
|
||||
],
|
||||
})
|
||||
.expect(200, done);
|
||||
});
|
||||
});
|
||||
@@ -5,7 +5,7 @@
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -23,14 +23,14 @@ var config = require('../../../../config');
|
||||
var packageService = require('../../../../services/package');
|
||||
var nfs = require('../../../../common/nfs');
|
||||
|
||||
describe('controllers/registry/package/remove.test.js', function () {
|
||||
describe('test/controllers/registry/package/remove.test.js', function () {
|
||||
afterEach(mm.restore);
|
||||
|
||||
before(function (done) {
|
||||
var pkg = utils.getPackage('@cnpmtest/testmodule-remove-1', '1.0.0', utils.admin);
|
||||
var pkg = utils.getPackage('@cnpmtest/testmodule-remove-1', '1.0.0', utils.otherUser);
|
||||
request(app.listen())
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.send(pkg)
|
||||
.expect(201, done);
|
||||
});
|
||||
@@ -56,47 +56,13 @@ describe('controllers/registry/package/remove.test.js', function () {
|
||||
.expect(404, done);
|
||||
});
|
||||
|
||||
it('should delete 403 when user is not admin on config.enablePrivate = true', function (done) {
|
||||
mm(config, 'enablePrivate', true);
|
||||
it('should delete 403 when user is not admin', function (done) {
|
||||
request(app)
|
||||
.del('/@cnpmtest/testmodule-remove-1/-rev/1')
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.expect({
|
||||
error: 'no_perms',
|
||||
reason: 'Private mode enable, only admin can publish this module'
|
||||
})
|
||||
.expect(403, done);
|
||||
});
|
||||
|
||||
it('should 400 when scope not exists', function (done) {
|
||||
request(app)
|
||||
.del('/@cnpm-not-exists/testmodule-remove-1/-rev/1')
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.expect({
|
||||
error: 'invalid scope',
|
||||
reason: 'scope @cnpm-not-exists not match legal scopes: @cnpm, @cnpmtest'
|
||||
})
|
||||
.expect(400, done);
|
||||
});
|
||||
|
||||
it('should 403 when delete non scoped package', function (done) {
|
||||
request(app)
|
||||
.del('/testmodule-remove-1/-rev/1')
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.expect({
|
||||
error: 'no_perms',
|
||||
reason: 'only allow publish with @cnpm, @cnpmtest scope(s)'
|
||||
})
|
||||
.expect(403, done);
|
||||
});
|
||||
|
||||
it('should 403 when user not maintainer', function (done) {
|
||||
request(app)
|
||||
.del('/@cnpmtest/testmodule-remove-1/-rev/1')
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.expect({
|
||||
error: 'forbidden user',
|
||||
reason: 'cnpmjstest101 not authorized to modify @cnpmtest/testmodule-remove-1'
|
||||
reason: 'Only administrators can unpublish module'
|
||||
})
|
||||
.expect(403, done);
|
||||
});
|
||||
|
||||
@@ -27,10 +27,10 @@ describe('controllers/registry/package/remove_version.test.js', function () {
|
||||
|
||||
var lastRev;
|
||||
before(function (done) {
|
||||
var pkg = utils.getPackage('@cnpmtest/testmodule-remove_version-1', '0.0.1', utils.admin);
|
||||
var pkg = utils.getPackage('@cnpmtest/testmodule-remove_version-1', '0.0.1', utils.otherUser);
|
||||
request(app.listen())
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.send(pkg)
|
||||
.expect(201, function (err, res) {
|
||||
should.not.exist(err);
|
||||
@@ -78,7 +78,7 @@ describe('controllers/registry/package/remove_version.test.js', function () {
|
||||
.expect(401, done);
|
||||
});
|
||||
|
||||
it('should 403 when auth error', function (done) {
|
||||
it('should 403 when not admin', function (done) {
|
||||
request(app)
|
||||
.del('/@cnpmtest/testmodule-remove_version-1/download/@cnpmtest/testmodule-remove_version-1-0.0.1.tgz/-rev/' + lastRev)
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
@@ -94,10 +94,10 @@ describe('controllers/registry/package/remove_version.test.js', function () {
|
||||
|
||||
describe('mock error', function () {
|
||||
before(function (done) {
|
||||
var pkg = utils.getPackage('@cnpmtest/testmodule-remove_version-1', '0.0.2', utils.admin);
|
||||
var pkg = utils.getPackage('@cnpmtest/testmodule-remove_version-1', '0.0.2', utils.otherUser);
|
||||
request(app.listen())
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.set('authorization', utils.otherUserAuth)
|
||||
.send(pkg)
|
||||
.expect(201, done);
|
||||
});
|
||||
|
||||
@@ -1,28 +1,16 @@
|
||||
/**!
|
||||
* cnpmjs.org - test/controllers/registry/package/save.test.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var assert = require('assert');
|
||||
var should = require('should');
|
||||
var request = require('supertest');
|
||||
var pedding = require('pedding');
|
||||
var mm = require('mm');
|
||||
var packageService = require('../../../../services/package');
|
||||
var app = require('../../../../servers/registry');
|
||||
var config = require('../../../../config');
|
||||
var utils = require('../../../utils');
|
||||
|
||||
describe('controllers/registry/package/save.test.js', function () {
|
||||
describe('test/controllers/registry/package/save.test.js', function () {
|
||||
afterEach(mm.restore);
|
||||
|
||||
describe('no @scoped package', function () {
|
||||
@@ -73,6 +61,28 @@ describe('controllers/registry/package/save.test.js', function () {
|
||||
});
|
||||
});
|
||||
|
||||
it('should publish new package and fire globalHook', done => {
|
||||
done = pedding(done, 2);
|
||||
mm(config, 'globalHook', function* (envelope) {
|
||||
console.log(envelope);
|
||||
assert(envelope.version === '1.0.1');
|
||||
assert(envelope.name === 'testmodule-new-2');
|
||||
assert(envelope.type === 'package');
|
||||
assert(envelope.event === 'package:publish');
|
||||
done();
|
||||
});
|
||||
var pkg = utils.getPackage('testmodule-new-2', '1.0.1', utils.admin);
|
||||
pkg.versions['1.0.1'].dependencies = {
|
||||
'bytetest-1': '~0.0.1',
|
||||
mocha: '~1.0.0'
|
||||
};
|
||||
request(app.listen())
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.send(pkg)
|
||||
.expect(201, done);
|
||||
});
|
||||
|
||||
it('should save dependents', function* () {
|
||||
var names = yield* packageService.listDependents('bytetest-1');
|
||||
names.should.length(2);
|
||||
@@ -288,11 +298,11 @@ describe('controllers/registry/package/save.test.js', function () {
|
||||
});
|
||||
|
||||
it('should save dependents', function* () {
|
||||
var names = yield* packageService.listDependents('bytetest2');
|
||||
var names = yield packageService.listDependents('bytetest2');
|
||||
names.should.length(2);
|
||||
names.should.eql(['@cnpmtest/testmodule-new-1', '@cnpmtest/testmodule-new-2']);
|
||||
|
||||
names = yield* packageService.listDependents('@cnpmtest/testmodule-new-1');
|
||||
names = yield packageService.listDependents('@cnpmtest/testmodule-new-1');
|
||||
names.should.length(0);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,34 +1,37 @@
|
||||
/**!
|
||||
* cnpmjs.org - test/controllers/registry/package/show.test.js
|
||||
*
|
||||
* Copyright(c) cnpmjs.org and other contributors.
|
||||
* MIT Licensed
|
||||
*
|
||||
* Authors:
|
||||
* fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Module dependencies.
|
||||
*/
|
||||
|
||||
var should = require('should');
|
||||
var request = require('supertest');
|
||||
var mm = require('mm');
|
||||
var app = require('../../../../servers/registry');
|
||||
var utils = require('../../../utils');
|
||||
|
||||
describe('controllers/registry/package/show.test.js', function () {
|
||||
describe('test/controllers/registry/package/show.test.js', function () {
|
||||
afterEach(mm.restore);
|
||||
|
||||
before(function (done) {
|
||||
before(function(done) {
|
||||
var pkg = utils.getPackage('@cnpmtest/testmodule-show', '0.0.1', utils.admin);
|
||||
request(app.listen())
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.send(pkg)
|
||||
.expect(201, function(err) {
|
||||
should.not.exist(err);
|
||||
pkg = utils.getPackage('@cnpmtest/testmodule-show', '1.1.0', utils.admin);
|
||||
request(app.listen())
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.send(pkg)
|
||||
.expect(201, done);
|
||||
});
|
||||
});
|
||||
|
||||
before(function(done) {
|
||||
var pkg = utils.getPackage('@cnpmtest/testmodule-only-beta', '1.0.0-beta.1', utils.admin);
|
||||
request(app.listen())
|
||||
.put('/' + pkg.name)
|
||||
.set('authorization', utils.adminAuth)
|
||||
.send(pkg)
|
||||
.expect(201, done);
|
||||
});
|
||||
|
||||
@@ -40,11 +43,86 @@ describe('controllers/registry/package/show.test.js', function () {
|
||||
var data = res.body;
|
||||
data.name.should.equal('@cnpmtest/testmodule-show');
|
||||
data.version.should.equal('0.0.1');
|
||||
data['dist-tags'].should.eql({
|
||||
latest: '1.1.0',
|
||||
});
|
||||
data.dist.tarball.should.containEql('/@cnpmtest/testmodule-show/download/@cnpmtest/testmodule-show-0.0.1.tgz');
|
||||
data._cnpm_publish_time.should.equal(data.publish_time);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should return max satisfied package with semver range', function (done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-show/^1.0.0')
|
||||
.expect(200, function (err, res) {
|
||||
should.not.exist(err);
|
||||
var data = res.body;
|
||||
data.name.should.equal('@cnpmtest/testmodule-show');
|
||||
data.version.should.equal('1.1.0');
|
||||
data['dist-tags'].should.eql({
|
||||
latest: '1.1.0',
|
||||
});
|
||||
data.dist.tarball.should.containEql('/@cnpmtest/testmodule-show/download/@cnpmtest/testmodule-show-1.1.0.tgz');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should return max satisfied package with complex semver range', function (done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-show/>1.2.0 <=2 || 0.0.1')
|
||||
.expect(200, function (err, res) {
|
||||
should.not.exist(err);
|
||||
var data = res.body;
|
||||
data.name.should.equal('@cnpmtest/testmodule-show');
|
||||
data.version.should.equal('0.0.1');
|
||||
data['dist-tags'].should.eql({
|
||||
latest: '1.1.0',
|
||||
});
|
||||
data.dist.tarball.should.containEql('/@cnpmtest/testmodule-show/download/@cnpmtest/testmodule-show-0.0.1.tgz');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should return max satisfied package with *', function (done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-show/*')
|
||||
.expect(200, function (err, res) {
|
||||
should.not.exist(err);
|
||||
var data = res.body;
|
||||
data.name.should.equal('@cnpmtest/testmodule-show');
|
||||
data.version.should.equal('1.1.0');
|
||||
data['dist-tags'].should.eql({
|
||||
latest: '1.1.0',
|
||||
});
|
||||
data.dist.tarball.should.containEql('/@cnpmtest/testmodule-show/download/@cnpmtest/testmodule-show-1.1.0.tgz');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should return the only beta version', function (done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-only-beta/*')
|
||||
.expect(200, function (err, res) {
|
||||
should.not.exist(err);
|
||||
var data = res.body;
|
||||
data.name.should.equal('@cnpmtest/testmodule-only-beta');
|
||||
data.version.should.equal('1.0.0-beta.1');
|
||||
data['dist-tags'].should.eql({
|
||||
latest: '1.0.0-beta.1',
|
||||
});
|
||||
data.dist.tarball.should.containEql('/@cnpmtest/testmodule-only-beta/download/@cnpmtest/testmodule-only-beta-1.0.0-beta.1.tgz');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should support jsonp', function (done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-show/0.0.1?callback=jsonp')
|
||||
.expect(/jsonp\(\{/)
|
||||
.expect(200, done);
|
||||
});
|
||||
|
||||
it('should return latest tag', function (done) {
|
||||
request(app.listen())
|
||||
.get('/@cnpmtest/testmodule-show/latest')
|
||||
@@ -52,7 +130,10 @@ describe('controllers/registry/package/show.test.js', function () {
|
||||
should.not.exist(err);
|
||||
var data = res.body;
|
||||
data.name.should.equal('@cnpmtest/testmodule-show');
|
||||
data.version.should.equal('0.0.1');
|
||||
data.version.should.equal('1.1.0');
|
||||
data['dist-tags'].should.eql({
|
||||
latest: '1.1.0',
|
||||
});
|
||||
done();
|
||||
});
|
||||
});
|
||||
@@ -71,6 +152,9 @@ describe('controllers/registry/package/show.test.js', function () {
|
||||
var data = res.body;
|
||||
data.name.should.equal('@cnpmtest/testmodule-show');
|
||||
data.version.should.equal('0.0.1');
|
||||
data['dist-tags'].should.eql({
|
||||
latest: '1.1.0',
|
||||
});
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user