Release 2.14.0

and skip JSONResponseFormatError and 504 server error

.travis.yml

@@ -2,9 +2,9 @@ sudo: false
 language: node_js
 node_js:
   - '4'
-  - '5'
+  - '6'
 addons:
   - postgresql: '9.3'
 script: 'make test-travis-all'
 after_script:
-  - "npm i codecov && codecov"
+  - 'npm i codecov && codecov'

AUTHORS

@@ -7,5 +7,5 @@ alsotang <alsotang@gmail.com> (https://github.com/alsotang)
 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)
 

History.md

@@ -1,4 +1,79 @@
 
+2.14.0 / 2016-08-04
+==================
+
+  * feat: password may contains ":" (#999)
+  * fix: limit sync fails email notice (#1006)
+
+2.13.0 / 2016-07-26
+==================
+
+  * feat: enable maxrequests middleware (#1003)
+
+2.12.2 / 2016-07-11
+==================
+
+  * fix: getModuleByRange don't list all packages (#990)
+  * fix: should show new version package count (#984)
+
+2.12.1 / 2016-07-01
+==================
+
+  * fix: make sure chagnes stream destroy (#982)
+  * chore(package): update semver to version 5.2.0 (#978)
+  * deps: use ^ instead of ~ (#976)
+  * chore(package): update mini-logger to version 1.1.1 (#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
 ==================
 

LICENSE.txt

@@ -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

Makefile

@@ -4,15 +4,8 @@ TIMEOUT = 30000
 MOCHA_OPTS =
 DB = sqlite
 
-install:
-	@npm install --build-from-source --registry=https://registry.npm.taobao.org \
-		--disturl=https://npm.taobao.org/mirrors/node
-
-install-production production:
-	@NODE_ENV=production $(MAKE) install
-
-jshint: install
-	@-node_modules/.bin/jshint ./
+jshint:
+	@node_modules/.bin/jshint .
 
 init-database:
 	@node test/init_db.js
@@ -25,7 +18,7 @@ init-pg:
 	@psql -c 'DROP DATABASE IF EXISTS cnpmjs_test;'
 	@psql -c 'CREATE DATABASE cnpmjs_test;'
 
-test: install init-database
+test: init-database
 	@NODE_ENV=test DB=${DB} node_modules/.bin/mocha \
 		--reporter $(REPORTER) \
 		--timeout $(TIMEOUT) \
@@ -47,7 +40,7 @@ test-pg: init-pg
 
 test-all: test-sqlite test-mysql
 
-test-cov cov: install init-database
+test-cov cov: init-database
 	@NODE_ENV=test DB=${DB} node \
 		node_modules/.bin/istanbul cover \
 		node_modules/.bin/_mocha \
@@ -67,7 +60,7 @@ test-cov-sqlite:
 test-cov-mysql: init-mysql
 	@$(MAKE) test-cov DB=mysql
 
-test-travis: install init-database
+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 \
@@ -93,20 +86,19 @@ test-travis-pg:
 	@psql -c 'CREATE DATABASE cnpmjs_test;' -U postgres
 	@DB_PORT=5432 DB_USER=postgres $(MAKE) test-travis DB=postgres
 
-test-travis-all: test-travis-sqlite test-travis-mysql test-travis-pg
+test-travis-all: jshint test-travis-sqlite test-travis-mysql test-travis-pg
 
 dev:
 	@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 mysql \
 		--keep should,supertest,should-http,chunkstream,mm,pedding
-	@$(MAKE) install
 
 .PHONY: test

README.md

@@ -3,18 +3,21 @@ cnpmjs.org
 
 [![NPM version][npm-image]][npm-url]
 [![build status][travis-image]][travis-url]
-[![Test coverage][cov-image]][cov-url]
+[![Test coverage][codecov-image]][codecov-url]
 [![David deps][david-image]][david-url]
+[![Known Vulnerabilities][snyk-image]][snyk-url]
 [![npm download][download-image]][download-url]
 
 [npm-image]: http://cnpmjs.org/badge/v/cnpmjs.org.svg?style=flat-square
 [npm-url]: http://cnpmjs.org/package/cnpmjs.org
 [travis-image]: https://img.shields.io/travis/cnpm/cnpmjs.org.svg?style=flat-square
 [travis-url]: https://travis-ci.org/cnpm/cnpmjs.org
-[cov-image]: http://codecov.io/github/cnpm/cnpmjs.org/coverage.svg?branch=master
-[cov-url]: http://codecov.io/github/cnpm/cnpmjs.org?branch=master
+[codecov-image]: https://codecov.io/gh/cnpm/cnpmjs.org/branch/master/graph/badge.svg
+[codecov-url]: https://codecov.io/gh/cnpm/cnpmjs.org
 [david-image]: https://img.shields.io/david/cnpm/cnpmjs.org.svg?style=flat-square
 [david-url]: https://david-dm.org/cnpm/cnpmjs.org
+[snyk-image]: https://snyk.io/test/npm/cnpmjs.org/badge.svg?style=flat-square
+[snyk-url]: https://snyk.io/test/npm/cnpmjs.org
 [download-image]: https://img.shields.io/npm/dm/cnpmjs.org.svg?style=flat-square
 [download-url]: https://npmjs.org/package/cnpmjs.org
 
@@ -111,7 +114,7 @@ Tips: make sure your code is following the [node-style-guide](https://github.com
 
 ## Sponsors
 
-- [![阿里云](https://static.aliyun.com/images/www-summerwind/logo.gif)](https://www.aliyun.com?from=cnpmjs.org) (2016.2 - now)
+- [![阿里云](https://static.aliyun.com/images/www-summerwind/logo.gif)](http://click.aliyun.com/m/4288/) (2016.2 - now)
 - [![UCloud云计算](https://www.ucloud.cn/static/style/images/about/logo.png)](http://www.ucloud.cn?sem=sdk-CNPMJS) (2015.3 - 2016.3)
 
 ## License

common/logger.js

@@ -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);
 };

config/index.js

@@ -1,18 +1,5 @@
-/**
- * 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');
@@ -26,6 +13,7 @@ var dataDir = path.join(process.env.HOME || root, '.cnpmjs.org');
 
 var config = {
   version: version,
+  dataDir: dataDir,
 
   /**
    * Cluster mode
@@ -93,7 +81,7 @@ 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
@@ -209,11 +197,17 @@ var config = {
   // sync devDependencies or not, default is false
   syncDevDependencies: false,
 
+  // changes streaming sync
+  syncChangesStream: false,
+  handleSyncRegistry: 'http://127.0.0.1:7001',
+
   // badge subject on http://shields.io/
   badgePrefixURL: 'https://img.shields.io/badge',
   badgeSubject: 'cnpm',
 
   // custom user service, @see https://github.com/cnpm/cnpmjs.org/wiki/Use-Your-Own-User-Authorization
+  // when you not intend to ingegrate with your company's user system, then use null, it would
+  // use the default cnpm user system
   userService: null,
 
   // always-auth https://docs.npmjs.com/misc/config#always-auth

controllers/registry/package/list.js

@@ -1,11 +1,3 @@
-/**
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
 /**
@@ -99,7 +91,7 @@ module.exports = function* list() {
       this.status = 404;
       this.body = {
         error: 'not_found',
-        reason: 'document not found'
+        reason: 'document not found',
       };
       return;
     }

controllers/sync_module_worker.js

@@ -1,18 +1,5 @@
-/**!
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 var debug = require('debug')('cnpmjs.org:sync_module_worker');
 var co = require('co');
 var gather = require('co-gather');
@@ -72,6 +59,7 @@ function SyncModuleWorker(options) {
 
   this.successes = [];
   this.fails = [];
+  this.updates = [];
 }
 
 util.inherits(SyncModuleWorker, EventEmitter);
@@ -140,7 +128,7 @@ SyncModuleWorker.prototype.start = function () {
     // sync upstream
     if (that.syncUpstreamFirst) {
       try {
-        yield* that.syncUpstream(that.startName);
+        yield that.syncUpstream(that.startName);
       } catch (err) {
         logger.error(err);
       }
@@ -193,7 +181,7 @@ 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);
   });
 };
 
@@ -313,13 +301,13 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
   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);
+    yield this._doneOne(concurrencyId, name, true);
     return;
   }
 
   // get from npm
   try {
-    var result = yield* npmSerivce.request('/' + name.replace('/', '%2f'));
+    var result = yield npmSerivce.request('/' + name.replace('/', '%2f'));
     pkg = result.data;
     status = result.status;
   } catch (err) {
@@ -346,7 +334,7 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
   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);
+    yield that._doneOne(concurrencyId, name, true);
     return;
   }
 
@@ -354,31 +342,36 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
 
   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);
 };
 
 function* _listStarUsers(modName) {
-  var users = yield* packageService.listStarUserNames(modName);
+  var users = yield packageService.listStarUserNames(modName);
   var userMap = {};
   users.forEach(function (user) {
     userMap[user] = true;
@@ -676,7 +669,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',
@@ -936,7 +929,7 @@ 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;
@@ -958,6 +951,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;
     }
 
@@ -974,6 +968,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;
     }
 
@@ -984,6 +979,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;
     }
 
@@ -1002,8 +998,9 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
       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);
+    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
@@ -1047,7 +1044,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
     }
 
     mod.package.dist = dist;
-    var r = yield* packageService.saveModule(mod);
+    var r = yield packageService.saveModule(mod);
 
     that.log('    [%s:%s] done, insertId: %s, author: %s, version: %s, '
       + 'size: %d, publish_time: %j, publish on cnpm: %s',

controllers/total.js

@@ -1,18 +1,5 @@
-/**!
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.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');

controllers/web/package/show.js

@@ -1,18 +1,5 @@
-/**!
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 var debug = require('debug')('cnpmjs.org:controllers:web:package:show');
 var bytes = require('bytes');
 var giturl = require('giturl');
@@ -183,6 +170,17 @@ module.exports = function* show(next) {
     }
   }
 
+  if (pkg._publish_on_cnpm) {
+    pkg.isPrivate = true;
+  } else {
+    pkg.isPrivate = false;
+    // add security check badge
+    pkg.snyk = {
+      badge: `https://snyk.io/test/npm/${pkg.name}/badge.svg?style=flat-square`,
+      url: `https://snyk.io/test/npm/${pkg.name}`,
+    };
+  }
+
   yield this.render('package', {
     title: 'Package - ' + pkg.name,
     package: pkg,

dispatch.js

@@ -1,18 +1,5 @@
-/**!
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com>
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 var childProcess = require('child_process');
 var path = require('path');
 var util = require('util');

docs/network.puml

@@ -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

docs/web/readme.md

@@ -4,10 +4,10 @@ So `cnpm` is meaning: **Company npm**.
 
 ## Registry
 
-- Our public registry: [r.cnpmjs.org](//r.cnpmjs.org), syncing from [registry.npmjs.org](https://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 in China, please visit [the China 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">
@@ -145,11 +145,11 @@ $ cnpm info cnpm
 
 Release [History](/history).
 
-## npm and cnpm relation
+## npmjs.org, cnpmjs.org and npm.taobao.org relation
 
-![npm&cnpm](https://dn-cnpm.qbox.me/cnpm-npm-relation.png)
+[![npm&cnpm](https://dn-cnpm.qbox.me/network.png)](https://dn-cnpm.qbox.me/network.png)
 
 ## Sponsors
 
-- [![阿里云](https://static.aliyun.com/images/www-summerwind/logo.gif)](https://www.aliyun.com?from=cnpmjs.org) (2016.2 - now)
+- [![阿里云](https://static.aliyun.com/images/www-summerwind/logo.gif)](http://click.aliyun.com/m/4288/) (2016.2 - now)
 - [![UCloud云计算](https://www.ucloud.cn/static/style/images/about/logo.png)](http://www.ucloud.cn?sem=sdk-CNPMJS) (2015.3 - 2016.3)

middleware/auth.js

@@ -34,13 +34,14 @@ module.exports = function () {
       return yield* unauthorized.call(this, next);
     }
 
-    authorization = new Buffer(authorization, 'base64').toString().split(':');
-    if (authorization.length !== 2) {
-      return yield* unauthorized.call(this, next);
+    authorization = new Buffer(authorization, 'base64').toString();
+    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 {

middleware/proxy_to_npm.js

@@ -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;

middleware/sync_by_install.js

@@ -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;
 };

package.json

@@ -1,9 +1,10 @@
 {
   "name": "cnpmjs.org",
-  "version": "2.9.2",
+  "version": "2.14.0",
   "description": "Private npm registry and web for Enterprise, base on MySQL and Simple Store Service",
   "main": "index.js",
   "scripts": {
+    "dev": "DEBUG=cnpm* node dispatch.js",
     "test": "make jshint && make test",
     "start": "./bin/nodejsctl start && cp History.md docs/web/history.md",
     "status": "./bin/nodejsctl status",
@@ -13,46 +14,50 @@
     "cnpmjs.org": "bin/cli.js"
   },
   "dependencies": {
-    "agentkeepalive": "~2.0.3",
-    "bytes": "~2.3.0",
-    "cfork": "~1.4.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",
+    "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.0.1",
-    "humanize-number": "~0.0.2",
-    "is-type-of": "~1.0.0",
-    "kcors": "~1.1.0",
-    "koa": "~1.2.0",
-    "koa-limit": "~1.0.2",
-    "koa-markdown": "~2.0.1",
-    "koa-middlewares": "~2.1.0",
-    "koa-mock": "~1.5.0",
-    "koa-safe-jsonp": "~0.3.0",
-    "markdown-it": "~3.0.6",
-    "mime": "~1.3.4",
-    "mini-logger": "~1.1.0",
-    "mkdirp": "~0.5.0",
-    "moment": "~2.12.0",
-    "mysql": "~2.10.2",
-    "nodemailer": "~1.3.0",
-    "semver": "~5.1.0",
-    "sequelize": "~3.20.0",
-    "thunkify-wrap": "~1.0.4",
-    "treekill": "~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",
+    "semver": "^5.2.0",
+    "sequelize": "^3.23.4",
+    "thunkify-wrap": "^1.0.4",
+    "treekill": "^1.0.0",
     "tunnel-agent": "^0.4.0",
-    "urllib": "~2.8.0",
-    "utility": "~1.6.0",
-    "xss": "~0.2.10"
+    "urllib": "^2.11.0",
+    "utility": "^1.8.0",
+    "xss": "^0.2.13"
   },
   "devDependencies": {
     "autod": "*",
@@ -64,12 +69,13 @@
     "mocha": "*",
     "node-dev": "*",
     "pedding": "*",
-    "pg": "~4.4.2",
-    "pg-hstore": "~2.3.2",
-    "should": "~7.1.0",
+    "pg": "5",
+    "pg-hstore": "2",
+    "should": "8",
     "should-http": "*",
     "sqlite3": "*",
-    "supertest": "*",
+    "supertest": "1",
+    "supertest-as-promised": "3",
     "thunk-mocha": "1"
   },
   "homepage": "https://github.com/cnpm/cnpmjs.org",

public/css/github-markdown.css

@@ -453,6 +453,7 @@
   font-size: 85%;
   line-height: 1.45;
   background-color: #f7f7f7;
+  color:#333;
   border-radius: 3px;
 }
 

public/css/main.css

@@ -201,6 +201,12 @@ pre code {
   font-size: 28px;
   line-height: 48px;
 }
+
+.pack-ver a.badge-link {
+  font-size: inherit;
+  border-bottom: 0px;
+}
+
 .pack-lastup {
   font-size: 14px;
   display: inline-block;

servers/registry.js

@@ -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();
@@ -28,25 +13,27 @@ var staticCache = require('../middleware/static');
 var notFound = require('../middleware/registry_not_found');
 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(middlewares.bodyParser({jsonLimit: config.jsonLimit}));
+app.use(middlewares.bodyParser({ jsonLimit: config.jsonLimit }));
 app.use(cors({
-  allowMethods: 'GET,HEAD'
+  allowMethods: 'GET,HEAD',
 }));
 app.use(auth());
 app.use(proxyToNpm());
 app.use(notFound);
 
 if (config.enableCompress) {
-  app.use(middlewares.compress({threshold: 150}));
+  app.use(middlewares.compress({ threshold: 150 }));
 }
 app.use(middlewares.conditional());
 app.use(middlewares.etag());

servers/web.js

@@ -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 <m@fengmk2.com> (http://fengmk2.com)
- */
-
-"use strict";
-
-/**
- * Module dependencies.
- */
+'use strict';
 
 var opensearch = require('../middleware/opensearch');
 var notFound = require('../middleware/web_not_found');
@@ -32,6 +17,7 @@ var path = require('path');
 var http = require('http');
 var koa = require('koa');
 var fs = require('fs');
+var maxrequests = require('koa-maxrequests');
 
 var app = koa();
 
@@ -39,6 +25,7 @@ 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'));

services/package.js

@@ -75,7 +75,7 @@ exports.getModuleByTag = function* (name, tag) {
 };
 
 exports.getModuleByRange = function* (name, range) {
-  var rows = yield exports.listModulesByName(name);
+  var rows = yield exports.listModulesByName(name, [ 'id', 'version' ]);
   var versionMap = {};
   var versions = rows.map(function(row) {
     versionMap[row.version] = row;
@@ -85,7 +85,12 @@ exports.getModuleByRange = function* (name, range) {
   });
 
   var version = semver.maxSatisfying(versions, range);
-  return versionMap[version];
+  if (!versionMap[version]) {
+    return null;
+  }
+
+  var id = versionMap[version].id;
+  return yield exports.getModuleById(id);
 };
 
 exports.getLatestModule = function* (name) {
@@ -241,12 +246,13 @@ exports.listAllPublicModuleNames = function* () {
   });
 };
 
-exports.listModulesByName = function* (moduleName) {
+exports.listModulesByName = function* (moduleName, attributes) {
   var mods = yield Module.findAll({
     where: {
       name: moduleName
     },
-    order: [ ['id', 'DESC'] ]
+    order: [ ['id', 'DESC'] ],
+    attributes,
   });
 
   for (var mod of mods) {

sync/changes_stream_syncer.js

@@ -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 = 'https://replicate.npmjs.com';
+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), () => {});
+}

sync/index.js

@@ -1,36 +1,23 @@
-/**
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+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) {
@@ -38,34 +25,72 @@ 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);
 
 function onerror(err) {
   logger.error(err);
 }
 
-//set sync_status = 0 at first
+// set sync_status = 0 at first
 co(function* () {
   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 syncFn = co.wrap(function* () {
-  debug('mode: %s, syncing: %s', config.syncModel, syncing);
-  if (!syncing) {
+if (sync) {
+  // 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
+ */
+
+if (config.syncPopular) {
+  const sync = require('./sync_popular');
+  let syncing = false;
+  const syncFn = co.wrap(function*() {
+    if (syncing) {
+      return;
+    }
     syncing = true;
-    debug('start syncing');
-    var data;
-    var error;
+    logger.syncInfo('Start syncing popular modules...');
+    let data;
+    let error;
     try {
       data = yield sync();
     } catch (err) {
@@ -73,79 +98,60 @@ var syncFn = co.wrap(function* () {
       error.message += ' (sync package error)';
       logger.syncError(error);
     }
-    data && logger.syncInfo(data);
+
+    if (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();
-});
-
-if (sync) {
   syncFn().catch(onerror);
-  setInterval(function () {
-    syncFn().catch(onerror);
-  }, syncInterval);
+  setInterval(() => syncFn().catch(onerror), ms(config.syncPopularInterval));
 }
 
-/**
- * sync popular modules
- */
+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;
+  });
 
-var startSyncPopular = require('./sync_popular');
-var syncingPopular = false;
-var syncPopularFn = co.wrap(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) {
-  syncPopularFn().catch(onerror);
-  setInterval(function () {
-    syncPopularFn().catch(onerror);
-  }, ms(config.syncPopularInterval));
-} else {
-  logger.syncInfo('sync popular module disable');
+  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 error
-    if (err.status === 503) {
+    // ignore 503, 504 error
+    // 504: Gateway Time-out
+    if (err.status === 503 || err.status === 504) {
+      return;
+    }
+    if (err.name === 'JSONResponseFormatError') {
       return;
     }
     subject = 'Sync Error';
@@ -159,6 +165,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';
@@ -169,7 +179,7 @@ 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);
       }
@@ -182,8 +192,8 @@ function* checkSyncStatus() {
   if (!config.sourceNpmRegistryIsCNpm) {
     return;
   }
-  var total = yield totalService.getTotalInfo();
-  var lastSyncTime;
+  const total = yield totalService.getTotalInfo();
+  let lastSyncTime;
   if (config.syncModel === 'all') {
     lastSyncTime = total.last_sync_time;
   } else if (config.syncModel === 'exist') {
@@ -193,11 +203,13 @@ function* checkSyncStatus() {
   if (!lastSyncTime) {
     return;
   }
-  var diff = Date.now() - lastSyncTime;
-  var oneDay = 3600000 * 24;
-  if (diff > oneDay) {
-    var err = new Error('Last sync time is expired in ' + diff + ' ms, lastSyncTime: ' + new Date(lastSyncTime));
-    err.name = 'SyncExpriedError';
+  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());
   }
 }

sync/status.js

@@ -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,7 +22,7 @@ Status.prototype.log = function (syncDone) {
     lastSyncModule: this.lastSyncModule,
   };
   co(function* () {
-    yield* Total.updateSyncNum(params);
+    yield Total.updateSyncNum(params);
   }).catch(function () {});
 };
 

sync/sync_all.js

@@ -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)
- *  fengmk2 <m@fengmk2.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 var thunkify = require('thunkify-wrap');
 var config = require('../config');
 var Status = require('./status');
@@ -72,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,
   };
 };

sync/sync_exist.js

@@ -1,17 +1,5 @@
-/*!
- * 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 thunkify = require('thunkify-wrap');
@@ -31,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;
 }
@@ -48,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
@@ -74,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',

sync/sync_popular.js

@@ -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');

sync/sync_since.js

@@ -1,19 +1,5 @@
-/**!
- * sync packages since by some days ago
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <m@fengmk2.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 const thunkify = require('thunkify-wrap');
 const co = require('co');
 const ms = require('humanize-ms');

test/controllers/registry/module/scope_package.test.js

@@ -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);
   });
 

test/controllers/sync_module_worker.test.js

@@ -1,11 +1,3 @@
-/**!
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
 /**
@@ -69,6 +61,7 @@ describe('test/controllers/sync_module_worker.test.js', function () {
     var worker = new SyncModuleWorker({
       name: '@sindresorhus/df',
       username: 'fengmk2',
+      noDep: true,
     });
     worker.start();
     var end = thunkify.event(worker, 'end');

test/controllers/web/package/show.test.js

@@ -1,28 +1,14 @@
-/*!
- * cnpmjs.org - test/controllers/web/package/show.test.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 should = require('should');
-var request = require('supertest');
+var request = require('supertest-as-promised');
 var mm = require('mm');
 var config = require('../../../../config');
 var app = require('../../../../servers/web');
 var registry = require('../../../../servers/registry');
 var utils = require('../../../utils');
 
-describe('controllers/web/package/show.test.js', function () {
+describe('controllers/web/package/show.test.js', () => {
   before(function (done) {
     var pkg = utils.getPackage('@cnpmtest/testmodule-web-show', '0.0.1', utils.admin);
     pkg.versions['0.0.1'].dependencies = {
@@ -113,17 +99,17 @@ describe('controllers/web/package/show.test.js', function () {
     });
   });
 
-  describe('unpublished package', function () {
-    before(function (done) {
-      utils.sync('tfs', done);
+  describe('unpublished package', () => {
+    before(done => {
+      utils.sync('mk2testmodule', done);
     });
 
-    it('should display unpublished info', function (done) {
+    it('should display unpublished info', () => {
       mm(config, 'syncModel', 'all');
-      request(app)
-      .get('/package/moduletest1')
-      .expect(200)
-      .expect(/This package has been unpublished\./, done);
+      return request(app)
+        .get('/package/mk2testmodule')
+        .expect(200)
+        .expect(/This package has been unpublished\./);
     });
   });
 
@@ -149,20 +135,22 @@ describe('controllers/web/package/show.test.js', function () {
     });
   });
 
-  describe('show npm package', function () {
-    before(function (done) {
+  describe('show npm package', () => {
+    before(done => {
       mm(config, 'syncModel', 'exists');
       utils.sync('pedding', done);
     });
 
-    it('should show pedding package info and contributors', function (done) {
+    it('should show pedding package info and contributors', () => {
       mm(config, 'syncModel', 'exists');
-      request(app)
-      .get('/package/pedding')
-      .expect(200)
-      // https://github.com/cnpm/cnpmjs.org/issues/497
-      .expect(/by <a href="\/\~fengmk2">fengmk2<\/a>/)
-      .expect(/pedding/, done);
+      return request(app)
+        .get('/package/pedding')
+        .expect(200)
+        // https://github.com/cnpm/cnpmjs.org/issues/497
+        .expect(/by <a href="\/\~fengmk2">fengmk2<\/a>/)
+        // snyk link
+        .expect(/<a class="badge-link" href="https:\/\/snyk\.io\/test\/npm\/pedding" target="_blank"><img title="Known Vulnerabilities" src="https:\/\/snyk\.io\/test\/npm\/pedding\/badge\.svg\?style=flat-square"><\/a>/)
+        .expect(/pedding/);
     });
   });
 });

test/init.js

@@ -1,13 +1,3 @@
-/**!
- * cnpmjs.org - test/init.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
 /**

test/init_db.js

@@ -1,13 +1,3 @@
-/**!
- * cnpmjs.org - test/init_db.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
 /**
@@ -22,7 +12,7 @@ var config = require('../config');
 
 // init db first
 var initscript = path.join(__dirname, '..', 'models', 'init_script.js');
-var cmd = ['node', '--harmony', initscript, 'true',
+var cmd = ['node', initscript, 'true',
   config.database.dialect, config.database.port, config.database.username].join(' ');
 console.log('$ %s', cmd);
 var stdout = childProcess.execSync(cmd);
@@ -35,6 +25,7 @@ var usernames = [
   'cnpmjstest101',
   'cnpmjstest102',
   'cnpmjstest103',
+  ['cnpmjstest104', 'cnpmjs:test104'],
   'cnpmjstest10', // admin
   'cnpmjstestAdmin2', // other admin
   'cnpmjstestAdmin3', // other admin
@@ -43,6 +34,13 @@ var usernames = [
 
 var count = usernames.length;
 usernames.forEach(function (name) {
+  var pass;
+  if (Array.isArray(name)) {
+    name = name[0];
+    pass = name[1];
+  } else {
+    pass = name;
+  }
   var user = User.build({
     name: name,
     email: 'fengmk2@gmail.com',
@@ -50,7 +48,7 @@ usernames.forEach(function (name) {
     rev: '1',
   });
   user.salt = crypto.randomBytes(30).toString('hex');
-  user.password_sha = User.createPasswordSha(name, user.salt);
+  user.password_sha = User.createPasswordSha(pass, user.salt);
   user.save().then(function () {
     count--;
     if (count === 0) {

test/middleware/auth.test.js

@@ -53,6 +53,13 @@ describe('middleware/auth.test.js', function () {
       .expect(200, done);
     });
 
+    it('should pass with authorization (password contains ":") and check ok', function (done) {
+      request(app)
+      .get('/-/user/org.couchdb.user:cnpmjstest104')
+      .set('authorization', 'basic ' + new Buffer('cnpmjstest104:cnpmjs:test104').toString('base64'))
+      .expect(200, done);
+    });
+
     describe('config.customUserService = true', function () {
       beforeEach(function () {
         mm(config, 'customUserService', true);

test/middleware/proxy_to_npm.test.js

@@ -1,13 +1,3 @@
-/**!
- * cnpmjs.org - test/middleware/proxy_to_npm.test.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
 /**
@@ -19,44 +9,51 @@ var mm = require('mm');
 var app = require('../../servers/registry');
 var config = require('../../config');
 
-describe('middleware/proxy_to_npm.test.js', function () {
-  beforeEach(function () {
+describe('test/middleware/proxy_to_npm.test.js', () => {
+  beforeEach(() => {
     mm(config, 'syncModel', 'none');
   });
 
   afterEach(mm.restore);
 
-  describe('package', function () {
-    it('should proxy to source registry when package not exists', function (done) {
+  describe('package', () => {
+    it('should proxy to source registry when package not exists', done => {
       request(app.listen())
       .get('/ms')
       .expect('location', config.sourceNpmRegistry + '/ms')
       .expect(302, done);
     });
 
-    it('should proxy to source registry when package is not local', function (done) {
+    it('should proxy to source registry when package is not local', done => {
       request(app.listen())
       .get('/baidu?write=true')
       .expect('location', config.sourceNpmRegistry + '/baidu?write=true')
       .expect(302, done);
     });
 
-    it('should not proxy to source registry when package is scoped', function (done) {
+    it('should not proxy to source registry when package is private scoped', done => {
       request(app.listen())
-      .get('/@scoped/test-package-name')
+      .get('/@cnpmtest/test-package-name')
       .expect(404, done);
     });
+
+    it('should proxy to source registry when package is public scoped', done => {
+      request(app.listen())
+      .get('/@jkroso/type')
+      .expect('Location', 'https://registry.npmjs.com/@jkroso/type')
+      .expect(302, done);
+    });
   });
 
-  describe('dist-tags', function () {
-    it('should proxy to source registry when package not exists', function (done) {
+  describe('dist-tags', () => {
+    it('should proxy to source registry when package not exists', done => {
       request(app.listen())
       .get('/-/package/ms/dist-tags')
       .expect('location', config.sourceNpmRegistry + '/-/package/ms/dist-tags')
       .expect(302, done);
     });
 
-    it('should dont proxy scoped package', function (done) {
+    it('should dont proxy scoped package', done => {
       request(app.listen())
       .get('/-/package/@scoped/ms/dist-tags')
       .expect(404, done);

test/middleware/sync_by_install.test.js

@@ -0,0 +1,34 @@
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var request = require('supertest');
+var app = require('../../servers/registry');
+var mm = require('mm');
+var config = require('../../config');
+var userService = require('../../services/user');
+
+describe('test/middleware/sync_by_install.test.js', () => {
+  afterEach(mm.restore);
+
+  it('should ignore sync on install private scoped package', done => {
+    request(app.listen())
+    .get('/@cnpmtest/foo')
+    .set('User-Agent', 'node/v4.4.4')
+    .expect({
+      error: 'not_found',
+      reason: 'document not found',
+    })
+    .expect(404, done);
+  });
+
+  it('should sync and redirect to npmjs.com on install public scoped package', done => {
+    request(app.listen())
+    .get('/@jkroso/type')
+    .set('User-Agent', 'node/v4.4.4')
+    .expect('Location', 'https://registry.npmjs.com/@jkroso/type')
+    .expect(302, done);
+  });
+});

view/web/package.html

@@ -15,13 +15,16 @@
       <% } %>
       <div class="pack-ver">
         <img title="<%= package.version %>" src="/badge/v/<%= package.name %>.svg?style=flat-square">
-        <% if (package.engines) {%>
+        <% if (package.engines) { %>
           <% for (var k in package.engines) {
             var engine = package.engines[k];
           %>
             <img title="<%= engine.title %>" src="<%- engine.badgeURL %>">
         <% }
-        }%>
+        } %>
+        <% if (package.snyk) { %>
+        <a class="badge-link" href="<%= package.snyk.url %>" target="_blank"><img title="Known Vulnerabilities" src="<%- package.snyk.badge %>"></a>
+        <% } %>
       </div>
       <div class="pack-repo">
         <% if (package.fromNow) { %>
@@ -52,14 +55,19 @@
 
         <% if (package.license || package.repository || package.bugs.url) {%> &middot; <% } %>
 
-        <% if (!package._publish_on_cnpm) { %>
+        <% if (!package.isPrivate) { %>
         <a href="https://www.npmjs.org/package/<%= package.name %>" target="_blank">Original npm</a>
         <% } %>
+
+        <% if (package.dist.tarball) { %>
+          &middot;
+          <a href="<%= package.dist.tarball %>" target="_blank">Tarball</a>
+        <% } %>
       </div>
       <div class="pack-install">
         <pre class="sh">$ <%- config.npmClientName %> install <%= package.name %> <% if (package.preferGlobal) { %>-g<% } %></pre>
         <div class="pack-sync">
-          <% if (package._publish_on_cnpm) { %>
+          <% if (package.isPrivate) { %>
             Private package
           <% } else { %>
             <a href="/sync/<%= package.name %>" target="_blank">SYNC</a> missed versions from

worker.js

@@ -1,18 +1,5 @@
-/**!
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com>
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 var graceful = require('graceful');
 var registry = require('./servers/registry');
 var web = require('./servers/web');