f

.autod.conf.js

@@ -0,0 +1,35 @@
+'ues strict';
+
+module.exports = {
+  write: true,
+  prefix: '^',
+  devprefix: '^',
+  registry: 'https://r.cnpmjs.org',
+  exclude: [
+    'test/fixtures',
+    'examples',
+    'docs',
+    'public',
+  ],
+  dep: [
+    'mysql',
+    'egg',
+    'koa-router',
+  ],
+  devdep: [
+    'autod',
+    'autod-egg',
+    'eslint',
+    'eslint-config-egg',
+    'egg-bin',
+    'egg-mock',
+  ],
+  keep: [
+  ],
+  semver: [
+    'changes-stream@1',
+    'nodemailer@1',
+    'koa-router@3',
+    'supertest@2',
+  ],
+};

.eslintignore

@@ -0,0 +1,6 @@
+test/fixtures
+test/mocks
+examples/**/app/public
+logs
+run
+public/

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "eslint-config-egg"
+}

.jshintignore

@@ -1,7 +0,0 @@
-node_modules/
-coverage/
-.tmp/
-.git/
-tools/
-public/
-test/

.jshintrc

@@ -1,95 +0,0 @@
-{
-    // JSHint Default Configuration File (as on JSHint website)
-    // See http://jshint.com/docs/ for more details
-
-    "maxerr"        : 50,       // {int} Maximum error before stopping
-
-    // Enforcing
-    "bitwise"       : true,     // true: Prohibit bitwise operators (&, |, ^, etc.)
-    "camelcase"     : false,    // true: Identifiers must be in camelCase
-    "curly"         : true,     // true: Require {} for every new block or scope
-    "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
-    "forin"         : false,    // true: Require filtering for..in loops with obj.hasOwnProperty()
-    "immed"         : false,    // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
-    "indent"        : false,    // {int} Number of spaces to use for indentation
-    "latedef"       : false,    // true: Require variables/functions to be defined before being used
-    "newcap"        : false,    // true: Require capitalization of all constructor functions e.g. `new F()`
-    "noarg"         : true,     // true: Prohibit use of `arguments.caller` and `arguments.callee`
-    "noempty"       : true,     // true: Prohibit use of empty blocks
-    "nonew"         : false,    // true: Prohibit use of constructors for side-effects (without assignment)
-    "plusplus"      : false,    // true: Prohibit use of `++` & `--`
-    "quotmark"      : false,    // Quotation mark consistency:
-                                //   false    : do nothing (default)
-                                //   true     : ensure whatever is used is consistent
-                                //   "single" : require single quotes
-                                //   "double" : require double quotes
-    "undef"         : true,     // true: Require all non-global variables to be declared (prevents global leaks)
-    "unused"        : true,     // true: Require all defined variables be used
-    "strict"        : true,     // true: Requires all functions run in ES5 Strict Mode
-    "trailing"      : false,    // true: Prohibit trailing whitespaces
-    "maxparams"     : false,    // {int} Max number of formal params allowed per function
-    "maxdepth"      : false,    // {int} Max depth of nested blocks (within functions)
-    "maxstatements" : false,    // {int} Max number statements per function
-    "maxcomplexity" : false,    // {int} Max cyclomatic complexity per function
-    "maxlen"        : false,    // {int} Max number of characters per line
-
-    // Relaxing
-    "asi"           : false,     // true: Tolerate Automatic Semicolon Insertion (no semicolons)
-    "boss"          : true,      // true: Tolerate assignments where comparisons would be expected
-    "debug"         : false,     // true: Allow debugger statements e.g. browser breakpoints.
-    "eqnull"        : false,     // true: Tolerate use of `== null`
-    "es5"           : false,     // true: Allow ES5 syntax (ex: getters and setters)
-    "esnext"        : true,      // true: Allow ES.next (ES6) syntax (ex: `const`)
-    "moz"           : false,     // true: Allow Mozilla specific syntax (extends and overrides esnext features)
-                                 // (ex: `for each`, multiple try/catch, function expression…)
-    "evil"          : false,     // true: Tolerate use of `eval` and `new Function()`
-    "expr"          : true,      // true: Tolerate `ExpressionStatement` as Programs
-    "funcscope"     : false,     // true: Tolerate defining variables inside control statements"
-    "globalstrict"  : false,     // true: Allow global "use strict" (also enables 'strict')
-    "iterator"      : false,     // true: Tolerate using the `__iterator__` property
-    "lastsemic"     : false,     // true: Tolerate omitting a semicolon for the last statement of a 1-line block
-    "laxbreak"      : true,      // true: Tolerate possibly unsafe line breakings
-    "laxcomma"      : false,     // true: Tolerate comma-first style coding
-    "loopfunc"      : false,     // true: Tolerate functions being defined in loops
-    "multistr"      : true,      // true: Tolerate multi-line strings
-    "proto"         : false,     // true: Tolerate using the `__proto__` property
-    "scripturl"     : false,     // true: Tolerate script-targeted URLs
-    "smarttabs"     : false,     // true: Tolerate mixed tabs/spaces when used for alignment
-    "shadow"        : true,      // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
-    "sub"           : false,     // true: Tolerate using `[]` notation when it can still be expressed in dot notation
-    "supernew"      : false,     // true: Tolerate `new function () { ... };` and `new Object;`
-    "validthis"     : true,      // true: Tolerate using this in a non-constructor function
-
-    // Environments
-    "browser"       : true,     // Web Browser (window, document, etc)
-    "couch"         : false,    // CouchDB
-    "devel"         : true,     // Development/debugging (alert, confirm, etc)
-    "dojo"          : false,    // Dojo Toolkit
-    "jquery"        : false,    // jQuery
-    "mootools"      : false,    // MooTools
-    "node"          : true,     // Node.js
-    "nonstandard"   : false,    // Widely adopted globals (escape, unescape, etc)
-    "prototypejs"   : false,    // Prototype and Scriptaculous
-    "rhino"         : false,    // Rhino
-    "worker"        : false,    // Web Workers
-    "wsh"           : false,    // Windows Scripting Host
-    "yui"           : false,    // Yahoo User Interface
-    "noyield"       : true,     // allow generators without a yield
-
-    // Legacy
-    "nomen"         : false,    // true: Prohibit dangling `_` in variables
-    "onevar"        : false,    // true: Allow only one `var` statement per function
-    "passfail"      : false,    // true: Stop on first error
-    "white"         : false,    // true: Check against strict whitespace and indentation rules
-
-    // Custom Globals
-    "globals"       : {         // additional predefined global variables
-      // mocha
-      "describe": true,
-      "it": true,
-      "before": true,
-      "afterEach": true,
-      "beforeEach": true,
-      "after": true
-    }
-}

.node-dev.json

@@ -1,3 +0,0 @@
-{
-  "notify": false
-}

.travis.yml

@@ -1,11 +1,11 @@
 sudo: false
 language: node_js
 node_js:
-  - '4'
   - '6'
   - '7'
 addons:
   - postgresql: '9.3'
-script: 'make test-travis-all'
+script:
+  - TEST_TIMEOUT=60000 CNPM_SOURCE_NPM=https://registry.npmjs.org CNPM_SOURCE_NPM_ISCNPM=false npm run test-all
 after_script:
-  - 'npm i codecov && codecov'
+  - npm i codecov && codecov

History.md

@@ -983,7 +983,7 @@
   * npm publish dont contains .jshint*
   * npm test run jshint
   * Add jshint check: $ make jshint
-  * use `yield* next` instead of `yield next`
+  * use `yield next` instead of `yield next`
   * replace dist.u.qiniudn.com with cnpmjs.org/dist
 
 0.3.5 / 2014-03-05

Makefile

@@ -1,104 +0,0 @@
-TESTS = $(shell ls -S `find test -type f -name "*.test.js" -print`)
-REPORTER = spec
-TIMEOUT = 30000
-MOCHA_OPTS =
-DB = sqlite
-
-jshint:
-	@node_modules/.bin/jshint .
-
-init-database:
-	@node test/init_db.js
-
-init-mysql:
-	@mysql -uroot -e 'DROP DATABASE IF EXISTS cnpmjs_test;'
-	@mysql -uroot -e 'CREATE DATABASE cnpmjs_test;'
-
-init-pg:
-	@psql -c 'DROP DATABASE IF EXISTS cnpmjs_test;'
-	@psql -c 'CREATE DATABASE cnpmjs_test;'
-
-test: init-database
-	@NODE_ENV=test DB=${DB} node_modules/.bin/mocha \
-		--reporter $(REPORTER) \
-		--timeout $(TIMEOUT) \
-		--require should \
-		--require should-http \
-		--require thunk-mocha \
-		--require ./test/init.js \
-		$(MOCHA_OPTS) \
-		$(TESTS)
-
-test-sqlite:
-	@$(MAKE) test DB=sqlite
-
-test-mysql: init-mysql
-	@$(MAKE) test DB=mysql
-
-test-pg: init-pg
-	@DB_PORT=5432 DB_USER=$(USER) $(MAKE) test DB=postgres
-
-test-all: test-sqlite test-mysql
-
-test-cov cov: init-database
-	@NODE_ENV=test DB=${DB} node \
-		node_modules/.bin/istanbul cover \
-		node_modules/.bin/_mocha \
-		-- -u exports \
-		--reporter $(REPORTER) \
-		--timeout $(TIMEOUT) \
-		--require should \
-		--require should-http \
-		--require thunk-mocha \
-		--require ./test/init.js \
-		$(MOCHA_OPTS) \
-		$(TESTS)
-
-test-cov-sqlite:
-	@$(MAKE) test-cov DB=sqlite
-
-test-cov-mysql: init-mysql
-	@$(MAKE) test-cov DB=mysql
-
-test-travis: 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 \
-		-- -u exports \
-		--reporter dot \
-		--timeout $(TIMEOUT) \
-		--require should \
-		--require should-http \
-		--require thunk-mocha \
-		--require ./test/init.js \
-		$(MOCHA_OPTS) \
-		$(TESTS)
-
-test-travis-sqlite:
-	@$(MAKE) test-travis DB=sqlite
-
-test-travis-mysql: init-mysql
-	@$(MAKE) test-travis DB=mysql
-
-test-travis-pg:
-	@psql -c 'DROP DATABASE IF EXISTS cnpmjs_test;' -U postgres
-	@psql -c 'CREATE DATABASE cnpmjs_test;' -U postgres
-	@DB_PORT=5432 DB_USER=postgres $(MAKE) test-travis DB=postgres
-
-test-travis-all: jshint test-travis-sqlite test-travis-mysql test-travis-pg
-
-dev:
-	@NODE_ENV=development node node_modules/.bin/node-dev dispatch.js
-
-contributors:
-	@node_modules/.bin/contributors -f plain -o AUTHORS
-
-autod:
-	@node_modules/.bin/autod -w \
-		--prefix "~" \
-		--exclude public,view,docs,backup,coverage \
-		--dep mysql \
-		--keep should,supertest,should-http,chunkstream,mm,pedding
-
-.PHONY: test

bin/change_password.js

@@ -1,24 +1,24 @@
-"use strict";
+'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');
+const UserModel = require('../models').User;
+const co = require('co');
+const utility = require('utility');
 
-var username = process.argv[2];
-var newPassword = process.argv[3];
+const username = process.argv[2];
+const newPassword = process.argv[3];
 
-co(function * () {
-  var user = yield UserModel.find({where: {name: username}});
-  var salt = user.salt;
+co(function* () {
+  let user = yield UserModel.find({ where: { name: username } });
+  const salt = user.salt;
   console.log(`user original password_sha: ${user.password_sha}`);
-  var newPasswordSha = utility.sha1(newPassword + salt);
+  const newPasswordSha = utility.sha1(newPassword + salt);
   user.password_sha = newPasswordSha;
   user = yield user.save();
   console.log(`change user password successful!! user new password_sha: ${user.password_sha}`);
   process.exit(0);
-}).catch(function (e) {
+}).catch(function(e) {
   console.log(e);
 });

bin/cli.js

@@ -1,26 +1,14 @@
 #!/usr/bin/env node
 
-/**!
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <m@fengmk2.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var debug = require('debug')('cnpmjs.org:cli');
-var program = require('commander');
-var path = require('path');
-var fs = require('fs');
-var mkdirp = require('mkdirp');
-var treekill = require('treekill');
-var version = require('../package.json').version;
+const debug = require('debug')('cnpmjs.org:cli');
+const program = require('commander');
+const path = require('path');
+const fs = require('fs');
+const mkdirp = require('mkdirp');
+const treekill = require('treekill');
+const version = require('../package.json').version;
 
 function list(val) {
   return val.split(',');
@@ -49,11 +37,11 @@ program.parse(process.argv);
 
 function start(options) {
   stop(options);
-  var dataDir = options.dataDir || path.join(process.env.HOME, '.cnpmjs.org');
+  const dataDir = options.dataDir || path.join(process.env.HOME, '.cnpmjs.org');
   mkdirp.sync(dataDir);
 
-  var configfile = path.join(dataDir, 'config.json');
-  var config = {};
+  const configfile = path.join(dataDir, 'config.json');
+  let config = {};
   if (fs.existsSync(configfile)) {
     try {
       config = require(configfile);
@@ -64,12 +52,12 @@ function start(options) {
   // config.enableCluster = !!options.cluster;
   if (options.admins) {
     config.admins = {};
-    for (var i = 0; i < options.admins.length; i++) {
+    for (let i = 0; i < options.admins.length; i++) {
       config.admins[options.admins[i]] = options.admins[i] + '@localhost.com';
     }
   }
   if (options.scopes) {
-    config.scopes = options.scopes.map(function (name) {
+    config.scopes = options.scopes.map(function(name) {
       if (name[0] !== '@') {
         name = '@' + name;
       }
@@ -77,7 +65,7 @@ function start(options) {
     });
   }
 
-  var configJSON = JSON.stringify(config, null, 2);
+  const configJSON = JSON.stringify(config, null, 2);
   fs.writeFileSync(configfile, configJSON);
 
   debug('save config %s to %s', configJSON, configfile);
@@ -91,11 +79,11 @@ function start(options) {
 }
 
 function stop(options) {
-  var dataDir = options.dataDir || path.join(process.env.HOME, '.cnpmjs.org');
-  var pidfile = path.join(dataDir, 'pid');
+  const dataDir = options.dataDir || path.join(process.env.HOME, '.cnpmjs.org');
+  const pidfile = path.join(dataDir, 'pid');
   if (fs.existsSync(pidfile)) {
-    var pid = Number(fs.readFileSync(pidfile, 'utf8'));
-    treekill(pid, function (err) {
+    const pid = Number(fs.readFileSync(pidfile, 'utf8'));
+    treekill(pid, function(err) {
       if (err) {
         console.log(err);
         throw err;
@@ -107,11 +95,11 @@ function stop(options) {
 }
 
 function initDatabase(callback) {
-  var models = require('../models');
+  const models = require('../models');
 
   models.sequelize.sync({ force: false })
-    .then(function () {
-      models.Total.init(function (err) {
+    .then(function() {
+      models.Total.init(function(err) {
         if (err) {
           console.error('[models/init_script.js] sequelize init fail');
           console.error(err);
@@ -122,7 +110,7 @@ function initDatabase(callback) {
         }
       });
     })
-    .catch(function (err) {
+    .catch(function(err) {
       console.error('[models/init_script.js] sequelize sync fail');
       console.error(err);
       throw err;

common/logger.js

@@ -10,20 +10,20 @@ const config = require('../config');
 const mail = require('./mail');
 
 const isTEST = process.env.NODE_ENV === 'test';
-const categories = ['sync_info', 'sync_error'];
+const categories = [ 'sync_info', 'sync_error' ];
 
 const logger = module.exports = Logger({
-  categories: categories,
+  categories,
   dir: config.logdir,
   duration: '1d',
   format: '[{category}.]YYYY-MM-DD[.log]',
   stdout: config.debug && !isTEST,
-  errorFormater: errorFormater,
+  errorFormater,
   seperator: os.EOL,
 });
 
 const to = [];
-for (var user in config.admins) {
+for (const user in config.admins) {
   to.push(config.admins[user]);
 }
 
@@ -33,7 +33,7 @@ function errorFormater(err) {
   return msg.text;
 }
 
-logger.syncInfo = function () {
+logger.syncInfo = function() {
   const args = [].slice.call(arguments);
   if (typeof args[0] === 'string') {
     args[0] = util.format('[%s][%s] ', utility.logDate(), process.pid) + args[0];
@@ -44,7 +44,7 @@ logger.syncInfo = function () {
   logger.sync_info.apply(logger, args);
 };
 
-logger.syncError =function () {
+logger.syncError = function() {
   const args = [].slice.call(arguments);
   if (typeof args[0] === 'string') {
     args[0] = util.format('[%s][%s] ', utility.logDate(), process.pid) + args[0];

common/mail.js

@@ -1,25 +1,11 @@
-/**!
- * cnpmjs.org - common/mail.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const nodemailer = require('nodemailer');
+const utility = require('utility');
+const os = require('os');
+const mailConfig = require('../config').mail;
 
-var nodemailer = require('nodemailer');
-var utility = require('utility');
-var os = require('os');
-var mailConfig = require('../config').mail;
-
-var smtpConfig;
+let smtpConfig;
 if (mailConfig.auth) {
   // new style
   smtpConfig = mailConfig;
@@ -33,12 +19,12 @@ if (mailConfig.auth) {
     debug: mailConfig.debug,
     auth: {
       user: mailConfig.user,
-      pass: mailConfig.pass
-    }
+      pass: mailConfig.pass,
+    },
   };
 }
 
-var transport;
+let transport;
 
 /**
  * Send notice email with mail level and appname.
@@ -49,15 +35,16 @@ var transport;
  * @param {String} html
  * @param {Function(err, result)} callback
  */
+
 exports.notice = function sendLogMail(to, level, subject, html, callback) {
   subject = '[' + mailConfig.appname + '] [' + level + '] [' + os.hostname() + '] ' + subject;
   html = String(html);
   exports.send(to, subject, html.replace(/\n/g, '<br/>'), callback);
 };
 
-var LEVELS = [ 'log', 'warn', 'error' ];
-LEVELS.forEach(function (level) {
-  exports[level] = function (to, subject, html, callback) {
+const LEVELS = [ 'log', 'warn', 'error' ];
+LEVELS.forEach(function(level) {
+  exports[level] = function(to, subject, html, callback) {
     exports.notice(to, level, subject, html, callback);
   };
 });
@@ -69,7 +56,8 @@ LEVELS.forEach(function (level) {
  * @param {String} html
  * @param {Function(err, result)} callback
  */
-exports.send = function (to, subject, html, callback) {
+
+exports.send = function(to, subject, html, callback) {
   callback = callback || utility.noop;
 
   if (mailConfig.enable === false) {
@@ -81,14 +69,14 @@ exports.send = function (to, subject, html, callback) {
     transport = nodemailer.createTransport(smtpConfig);
   }
 
-  var message = {
+  const message = {
     from: mailConfig.from || mailConfig.sender,
-    to: to,
-    subject: subject,
-    html: html,
+    to,
+    subject,
+    html,
   };
 
-  transport.sendMail(message, function (err, result) {
+  transport.sendMail(message, function(err, result) {
     callback(err, result);
   });
 };

common/markdown.js

@@ -14,19 +14,19 @@
  * Module dependencies.
  */
 
-var xss = require('xss');
-var MarkdownIt = require('markdown-it');
+const xss = require('xss');
+const MarkdownIt = require('markdown-it');
 
 // allow class attr on code
-xss.whiteList.code = ['class'];
+xss.whiteList.code = [ 'class' ];
 
-var md = new MarkdownIt({
+const md = new MarkdownIt({
   html: true,
   linkify: true,
 });
 
-exports.render = function (content, filterXss) {
-  var html = md.render(content);
+exports.render = function(content, filterXss) {
+  let html = md.render(content);
   if (filterXss !== false) {
     html = xss(html);
   }

common/nfs.js

@@ -1,4 +1,4 @@
-/*!
+/* !
  * Copyright(c) cnpmjs.org and other contributors.
  * MIT Licensed
  *
@@ -12,6 +12,6 @@
  * Module dependencies.
  */
 
-var config = require('../config');
+const config = require('../config');
 
 module.exports = config.nfs;

common/sequelize.js

@@ -14,9 +14,9 @@
  * Module dependencies.
  */
 
-var Sequelize = require('sequelize');
-var DataTypes = require('sequelize/lib/data-types');
-var config = require('../config');
+const Sequelize = require('sequelize');
+const DataTypes = require('sequelize/lib/data-types');
+const config = require('../config');
 
 if (config.mysqlServers && config.database.dialect === 'sqlite') {
   // https://github.com/cnpm/cnpmjs.org/wiki/Migrating-from-1.x-to-2.x
@@ -34,7 +34,7 @@ if (config.mysqlServers && config.database.dialect === 'sqlite') {
   // mysqlQueryTimeout: 5000,
 
   console.warn('[WARNNING] your config.js was too old, please @see https://github.com/cnpm/cnpmjs.org/wiki/Migrating-from-1.x-to-2.x');
-  var server = config.mysqlServers[0];
+  const server = config.mysqlServers[0];
   config.database = {
     db: config.mysqlDatabase,
     username: server.user,
@@ -45,13 +45,13 @@ if (config.mysqlServers && config.database.dialect === 'sqlite') {
     pool: {
       maxConnections: config.mysqlMaxConnections || 10,
       minConnections: 0,
-      maxIdleTime: 30000
+      maxIdleTime: 30000,
     },
     logging: !!process.env.SQL_DEBUG,
   };
 }
 
-var database = config.database;
+const database = config.database;
 
 // sync database before app start, defaul is false
 database.syncFirst = false;
@@ -70,6 +70,6 @@ database.define = {
   collate: 'utf8_general_ci',
 };
 
-var sequelize = new Sequelize(database.db, database.username, database.password, database);
+const sequelize = new Sequelize(database.db, database.username, database.password, database);
 
 module.exports = sequelize;

common/urllib.js

@@ -14,43 +14,43 @@
  * Module dependencies.
  */
 
-var urlparse = require('url').parse;
-var urllib = require('urllib');
-var HttpAgent = require('agentkeepalive');
-var HttpsAgent = require('agentkeepalive').HttpsAgent;
-var config = require('../config');
+const urlparse = require('url').parse;
+const urllib = require('urllib');
+const HttpAgent = require('agentkeepalive');
+const HttpsAgent = require('agentkeepalive').HttpsAgent;
+const config = require('../config');
 
-var httpAgent;
-var httpsAgent;
+let httpAgent;
+let httpsAgent;
 
 if (config.httpProxy) {
-  var tunnel = require('tunnel-agent');
-  var urlinfo = urlparse(config.httpProxy);
+  const tunnel = require('tunnel-agent');
+  const urlinfo = urlparse(config.httpProxy);
   if (urlinfo.protocol === 'http:') {
     httpAgent = tunnel.httpOverHttp({
       proxy: {
         host: urlinfo.hostname,
-        port: urlinfo.port
-      }
+        port: urlinfo.port,
+      },
     });
     httpsAgent = tunnel.httpsOverHttp({
       proxy: {
         host: urlinfo.hostname,
-        port: urlinfo.port
-      }
+        port: urlinfo.port,
+      },
     });
   } else if (urlinfo.protocol === 'https:') {
     httpAgent = tunnel.httpOverHttps({
       proxy: {
         host: urlinfo.hostname,
-        port: urlinfo.port
-      }
+        port: urlinfo.port,
+      },
     });
     httpsAgent = tunnel.httpsOverHttps({
       proxy: {
         host: urlinfo.hostname,
-        port: urlinfo.port
-      }
+        port: urlinfo.port,
+      },
     });
   } else {
     throw new TypeError('httpProxy format error: ' + config.httpProxy);
@@ -58,17 +58,17 @@ if (config.httpProxy) {
 } else {
   httpAgent = new HttpAgent({
     timeout: 0,
-    keepAliveTimeout: 15000
+    keepAliveTimeout: 15000,
   });
   httpsAgent = new HttpsAgent({
     timeout: 0,
-    keepAliveTimeout: 15000
+    keepAliveTimeout: 15000,
   });
 }
 
-var client = urllib.create({
+const client = urllib.create({
   agent: httpAgent,
-  httpsAgent: httpsAgent
+  httpsAgent,
 });
 
 module.exports = client;

config/index.js

@@ -1,19 +1,19 @@
 'use strict';
 
-var mkdirp = require('mkdirp');
-var copy = require('copy-to');
-var path = require('path');
-var fs = require('fs');
-var os = require('os');
+const mkdirp = require('mkdirp');
+const copy = require('copy-to');
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
 
-var version = require('../package.json').version;
+const version = require('../package.json').version;
 
-var root = path.dirname(__dirname);
-var dataDir = path.join(process.env.HOME || root, '.cnpmjs.org');
+const root = path.dirname(__dirname);
+const dataDir = path.join(process.env.HOME || root, '.cnpmjs.org');
 
-var config = {
-  version: version,
-  dataDir: dataDir,
+const config = {
+  version,
+  dataDir,
 
   /**
    * Cluster mode
@@ -77,8 +77,8 @@ var config = {
     service: 'gmail',
     auth: {
       user: 'address@gmail.com',
-      pass: 'your password'
-    }
+      pass: 'your password',
+    },
   },
 
   logoURL: 'https://os.alipayobjects.com/rmsportal/oygxuIUkkrRccUz.jpg', // cnpm logo image url
@@ -117,7 +117,7 @@ var config = {
     pool: {
       maxConnections: 10,
       minConnections: 0,
-      maxIdleTime: 30000
+      maxIdleTime: 30000,
     },
 
     // the storage engine for 'sqlite'
@@ -129,7 +129,7 @@ var config = {
 
   // package tarball store in local filesystem by default
   nfs: require('fs-cnpm')({
-    dir: path.join(dataDir, 'nfs')
+    dir: path.join(dataDir, 'nfs'),
   }),
   // if set true, will 302 redirect to `nfs.url(dist.key)`
   downloadRedirectToNFS: false,
@@ -224,7 +224,7 @@ var config = {
 };
 
 if (process.env.NODE_ENV !== 'test') {
-  var customConfig;
+  let customConfig;
   if (process.env.NODE_ENV === 'development') {
     customConfig = path.join(root, 'config', 'config.js');
   } else {
@@ -245,7 +245,7 @@ mkdirp.sync(config.uploadDir);
 
 module.exports = config;
 
-config.loadConfig = function (customConfig) {
+config.loadConfig = function(customConfig) {
   if (!customConfig) {
     return;
   }

controllers/registry/package/deprecate.js

@@ -14,7 +14,7 @@
  * Module dependencies.
  */
 
-var packageService = require('../../../services/package');
+const packageService = require('../../../services/package');
 
 module.exports = deprecateVersions;
 
@@ -22,28 +22,28 @@ module.exports = deprecateVersions;
  * @see https://github.com/cnpm/cnpmjs.org/issues/415
  */
 function* deprecateVersions() {
-  var body = this.request.body;
-  var name = this.params.name || this.params[0];
+  const body = this.request.body;
+  const name = this.params.name || this.params[0];
 
-  var tasks = [];
-  for (var version in body.versions) {
+  const tasks = [];
+  for (const version in body.versions) {
     tasks.push(packageService.getModule(name, version));
   }
-  var rs = yield tasks;
+  const rs = yield tasks;
 
-  var updateTasks = [];
-  for (var i = 0; i < rs.length; i++) {
-    var row = rs[i];
+  const updateTasks = [];
+  for (let i = 0; i < rs.length; i++) {
+    const row = rs[i];
     if (!row) {
       // some version not exists
       this.status = 400;
       this.body = {
         error: 'version_error',
-        reason: 'Some versions: ' + JSON.stringify(Object.keys(body.versions)) + ' not found'
+        reason: 'Some versions: ' + JSON.stringify(Object.keys(body.versions)) + ' not found',
       };
       return;
     }
-    var data = body.versions[row.package.version];
+    const data = body.versions[row.package.version];
     if (typeof data.deprecated === 'string') {
       row.package.deprecated = data.deprecated;
       updateTasks.push(packageService.updateModulePackage(row.id, row.package));
@@ -51,10 +51,10 @@ function* deprecateVersions() {
   }
   yield updateTasks;
   // update last modified
-  yield* packageService.updateModuleLastModified(name);
+  yield packageService.updateModuleLastModified(name);
 
   this.status = 201;
   this.body = {
-    ok: true
+    ok: true,
   };
 }

controllers/registry/package/dist_tag.js

@@ -1,20 +1,20 @@
 'use strict';
 
-var packageService = require('../../../services/package');
+const packageService = require('../../../services/package');
 
 function ok() {
   return {
-    ok: "dist-tags updated"
+    ok: 'dist-tags updated',
   };
 }
 
 // GET /-/package/:pkg/dist-tags -- returns the package's dist-tags
 exports.index = function* () {
-  var name = this.params.name || this.params[0];
-  var rows = yield packageService.listModuleTags(name);
-  var tags = {};
-  for (var i = 0; i < rows.length; i++) {
-    var row = rows[i];
+  const name = this.params.name || this.params[0];
+  const rows = yield packageService.listModuleTags(name);
+  const tags = {};
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i];
     tags[row.tag] = row.version;
   }
   this.body = tags;
@@ -22,17 +22,17 @@ exports.index = function* () {
 
 // PUT /-/package/:pkg/dist-tags -- Set package's dist-tags to provided object body (removing missing)
 exports.save = function* () {
-  var name = this.params.name || this.params[0];
+  const name = this.params.name || this.params[0];
   yield packageService.removeModuleTags(name);
-  yield* exports.update.call(this);
+  yield exports.update.call(this);
 };
 
 // POST /-/package/:pkg/dist-tags -- Add/modify dist-tags from provided object body (merge)
 exports.update = function* () {
-  var name = this.params.name || this.params[0];
-  var tags = this.request.body;
-  for (var tag in tags) {
-    var version = tags[tag];
+  const name = this.params.name || this.params[0];
+  const tags = this.request.body;
+  for (const tag in tags) {
+    const version = tags[tag];
     yield packageService.addModuleTag(name, tag, version);
   }
   this.status = 201;
@@ -42,16 +42,16 @@ exports.update = function* () {
 // PUT /-/package/:pkg/dist-tags/:tag -- Set package's dist-tags[tag] to provided string body
 // POST /-/package/:pkg/dist-tags/:tag -- Same as PUT /-/package/:pkg/dist-tags/:tag
 exports.set = function* () {
-  var name = this.params.name || this.params[0];
-  var tag = this.params.tag || this.params[1];
-  var version = this.request.body;
+  const name = this.params.name || this.params[0];
+  const tag = this.params.tag || this.params[1];
+  const version = this.request.body;
   // make sure version exists
-  var pkg = yield packageService.getModule(name, version);
+  const pkg = yield packageService.getModule(name, version);
   if (!pkg) {
     this.status = 400;
     this.body = {
       error: 'version_error',
-      reason: name + '@' + version + ' not exists'
+      reason: name + '@' + version + ' not exists',
     };
     return;
   }
@@ -63,8 +63,8 @@ exports.set = function* () {
 
 // DELETE /-/package/:pkg/dist-tags/:tag -- Remove tag from dist-tags
 exports.destroy = function* () {
-  var name = this.params.name || this.params[0];
-  var tag = this.params.tag || this.params[1];
+  const name = this.params.name || this.params[0];
+  const tag = this.params.tag || this.params[1];
   if (tag === 'latest') {
     this.status = 400;
     this.body = {

controllers/registry/package/download.js

@@ -1,39 +1,27 @@
-/**!
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const debug = require('debug')('cnpmjs.org:controllers:registry:download');
+const mime = require('mime');
+const utility = require('utility');
+const defer = require('co-defer');
+const is = require('is-type-of');
+const nfs = require('../../../common/nfs');
+const logger = require('../../../common/logger');
+const common = require('../../../lib/common');
+const downloadAsReadStream = require('../../utils').downloadAsReadStream;
+const packageService = require('../../../services/package');
+const downloadTotalService = require('../../../services/download_total');
+const config = require('../../../config');
 
-var debug = require('debug')('cnpmjs.org:controllers:registry:download');
-var mime = require('mime');
-var utility = require('utility');
-var defer = require('co-defer');
-var is = require('is-type-of');
-var nfs = require('../../../common/nfs');
-var logger = require('../../../common/logger');
-var common = require('../../../lib/common');
-var downloadAsReadStream = require('../../utils').downloadAsReadStream;
-var packageService = require('../../../services/package');
-var downloadTotalService = require('../../../services/download_total');
-var config = require('../../../config');
-
-var _downloads = {};
+let _downloads = {};
 
 module.exports = function* download(next) {
-  var name = this.params.name || this.params[0];
-  var filename = this.params.filename || this.params[1];
-  var version = filename.slice(name.length + 1, -4);
-  var row = yield packageService.getModule(name, version);
+  const name = this.params.name || this.params[0];
+  const filename = this.params.filename || this.params[1];
+  const version = filename.slice(name.length + 1, -4);
+  const row = yield packageService.getModule(name, version);
   // can not get dist
-  var url = null;
+  let url = null;
 
   if (typeof nfs.url === 'function') {
     if (is.generatorFunction(nfs.url)) {
@@ -47,7 +35,7 @@ module.exports = function* download(next) {
 
   if (!row || !row.package || !row.package.dist) {
     if (!url) {
-      return yield* next;
+      return yield next;
     }
     this.status = 302;
     this.set('Location', url);
@@ -63,7 +51,7 @@ module.exports = function* download(next) {
     return;
   }
 
-  var dist = row.package.dist;
+  const dist = row.package.dist;
   if (!dist.key) {
     // try to use nsf.url() first
     url = url || dist.tarball;
@@ -86,10 +74,10 @@ module.exports = function* download(next) {
 
 defer.setInterval(function* () {
   // save download count
-  var totals = [];
-  for (var name in _downloads) {
-    var count = _downloads[name];
-    totals.push([name, count]);
+  const totals = [];
+  for (const name in _downloads) {
+    const count = _downloads[name];
+    totals.push([ name, count ]);
   }
   _downloads = {};
 
@@ -99,13 +87,13 @@ defer.setInterval(function* () {
 
   debug('save download total: %j', totals);
 
-  var date = utility.YYYYMMDD();
-  for (var i = 0; i < totals.length; i++) {
-    var item = totals[i];
-    var name = item[0];
-    var count = item[1];
+  const date = utility.YYYYMMDD();
+  for (let i = 0; i < totals.length; i++) {
+    const item = totals[i];
+    const name = item[0];
+    const count = item[1];
     try {
-      yield* downloadTotalService.plusModuleTotal({ name: name, date: date, count: count });
+      yield downloadTotalService.plusModuleTotal({ name, date, count });
     } catch (err) {
       if (err.name !== 'SequelizeUniqueConstraintError') {
         err.message += '; name: ' + name + ', count: ' + count + ', date: ' + date;

controllers/registry/package/download_total.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var DownloadTotal = require('../../../services/download_total');
-var DATE_REG = /^\d{4}-\d{2}-\d{2}$/;
+const DownloadTotal = require('../../../services/download_total');
+const DATE_REG = /^\d{4}-\d{2}-\d{2}$/;
 
 module.exports = function* downloadTotal() {
-  var range = this.params.range || this.params[0] || '';
-  var name = this.params.name || this.params[1];
+  let range = this.params.range || this.params[0] || '';
+  const name = this.params.name || this.params[1];
 
   range = range.split(':');
   if (range.length !== 2
@@ -14,7 +14,7 @@ module.exports = function* downloadTotal() {
     this.status = 400;
     this.body = {
       error: 'range_error',
-      reason: 'range must be YYYY-MM-DD:YYYY-MM-DD style'
+      reason: 'range must be YYYY-MM-DD:YYYY-MM-DD style',
     };
     return;
   }
@@ -25,42 +25,42 @@ module.exports = function* downloadTotal() {
 };
 
 function* getPackageTotal(name, start, end) {
-  var res = yield DownloadTotal.getModuleTotal(name, start, end);
-  var downloads = res.map(function (row) {
+  const res = yield DownloadTotal.getModuleTotal(name, start, end);
+  const downloads = res.map(function(row) {
     return {
       day: row.date,
-      downloads: row.count
+      downloads: row.count,
     };
   });
 
-  downloads.sort(function (a, b) {
+  downloads.sort(function(a, b) {
     return a.day > b.day ? 1 : -1;
   });
 
   return {
-    downloads: downloads,
+    downloads,
     package: name,
-    start: start,
-    end: end
+    start,
+    end,
   };
 }
 
 function* getTotal(start, end) {
-  var res = yield DownloadTotal.getTotal(start, end);
-  var downloads = res.map(function (row) {
+  const res = yield DownloadTotal.getTotal(start, end);
+  const downloads = res.map(function(row) {
     return {
       day: row.date,
-      downloads: row.count
+      downloads: row.count,
     };
   });
 
-  downloads.sort(function (a, b) {
+  downloads.sort(function(a, b) {
     return a.day > b.day ? 1 : -1;
   });
 
   return {
-    downloads: downloads,
-    start: start,
-    end: end
+    downloads,
+    start,
+    end,
   };
 }

controllers/registry/package/list.js

@@ -1,35 +1,31 @@
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var debug = require('debug')('cnpmjs.org:controllers:registry:package:list');
-var packageService = require('../../../services/package');
-var common = require('../../../lib/common');
-var SyncModuleWorker = require('../../sync_module_worker');
-var config = require('../../../config');
+const debug = require('debug')('cnpmjs.org:controllers:registry:package:list');
+const packageService = require('../../../services/package');
+const common = require('../../../lib/common');
+const SyncModuleWorker = require('../../sync_module_worker');
+const config = require('../../../config');
 
 /**
  * list all version of a module
  * GET /:name
  */
+
 module.exports = function* list() {
-  var orginalName = this.params.name || this.params[0];
-  var name = orginalName;
-  var rs = yield [
+  const orginalName = this.params.name || this.params[0];
+  const name = orginalName;
+  const rs = yield [
     packageService.getModuleLastModified(name),
-    packageService.listModuleTags(name)
+    packageService.listModuleTags(name),
   ];
-  var modifiedTime = rs[0];
-  var tags = rs[1];
+  let modifiedTime = rs[0];
+  const tags = rs[1];
 
   debug('show %s(%s), last modified: %s, tags: %j', name, orginalName, modifiedTime, tags);
   if (modifiedTime) {
     // find out the latest modfied time
     // because update tags only modfied tag, wont change module gmt_modified
-    for (var i = 0; i < tags.length; i++) {
-      var tag = tags[i];
+    for (const tag of tags) {
       if (tag.gmt_modified > modifiedTime) {
         modifiedTime = tag.gmt_modified;
       }
@@ -44,21 +40,20 @@ module.exports = function* list() {
     }
   }
 
-  var r = yield [
+  const r = yield [
     packageService.listModulesByName(name),
     packageService.listStarUserNames(name),
     packageService.listMaintainers(name),
   ];
-  var rows = r[0];
-  var starUsers = r[1];
-  var maintainers = r[2];
+  const rows = r[0];
+  let starUsers = r[1];
+  const maintainers = r[2];
 
   debug('show %s got %d rows, %d tags, %d star users, maintainers: %j',
     name, rows.length, tags.length, starUsers.length, maintainers);
 
-  var starUserMap = {};
-  for (var i = 0; i < starUsers.length; i++) {
-    var starUser = starUsers[i];
+  const starUserMap = {};
+  for (const starUser of starUsers) {
     if (starUser[0] !== '"' && starUser[0] !== "'") {
       starUserMap[starUser] = true;
     }
@@ -67,7 +62,7 @@ module.exports = function* list() {
 
   if (rows.length === 0) {
     // check if unpublished
-    var unpublishedInfo = yield* packageService.getUnpublishedModule(name);
+    const unpublishedInfo = yield packageService.getUnpublishedModule(name);
     debug('show unpublished %j', unpublishedInfo);
     if (unpublishedInfo) {
       this.status = 404;
@@ -78,7 +73,7 @@ module.exports = function* list() {
           modified: unpublishedInfo.package.time,
           unpublished: unpublishedInfo.package,
         },
-        _attachments: {}
+        _attachments: {},
       };
       return;
     }
@@ -97,29 +92,27 @@ module.exports = function* list() {
     }
 
     // start sync
-    var logId = yield* SyncModuleWorker.sync(name, 'sync-by-install');
+    const logId = yield SyncModuleWorker.sync(name, 'sync-by-install');
     debug('start sync %s, get log id %s', name, logId);
 
     return this.redirect(config.officialNpmRegistry + this.url);
   }
 
-  var latestMod = null;
-  var readme = null;
+  let latestMod = null;
+  let readme = null;
   // set tags
-  var distTags = {};
-  for (var i = 0; i < tags.length; i++) {
-    var t = tags[i];
+  const distTags = {};
+  for (const t of tags) {
     distTags[t.tag] = t.version;
   }
 
   // set versions and times
-  var versions = {};
-  var times = {};
-  var attachments = {};
-  var createdTime = null;
-  for (var i = 0; i < rows.length; i++) {
-    var row = rows[i];
-    var pkg = row.package;
+  const versions = {};
+  let times = {};
+  const attachments = {};
+  let createdTime = null;
+  for (const row of rows) {
+    const pkg = row.package;
     // pkg is string ... ignore it
     if (typeof pkg === 'string') {
       continue;
@@ -130,7 +123,7 @@ module.exports = function* list() {
 
     versions[pkg.version] = pkg;
 
-    var t = times[pkg.version] = row.publish_time ? new Date(row.publish_time) : row.gmt_modified;
+    const t = times[pkg.version] = row.publish_time ? new Date(row.publish_time) : row.gmt_modified;
     if ((!distTags.latest && !latestMod) || distTags.latest === pkg.version) {
       latestMod = row;
       readme = pkg.readme;
@@ -147,11 +140,11 @@ module.exports = function* list() {
   }
 
   if (modifiedTime && createdTime) {
-    var ts = {
+    const ts = {
       modified: modifiedTime,
       created: createdTime,
     };
-    for (var t in times) {
+    for (const t in times) {
       ts[t] = times[t];
     }
     times = ts;
@@ -161,8 +154,8 @@ module.exports = function* list() {
     latestMod = rows[0];
   }
 
-  var rev = String(latestMod.id);
-  var pkg = latestMod.package;
+  const rev = String(latestMod.id);
+  const pkg = latestMod.package;
 
   if (tags.length === 0) {
     // some sync error reason, will cause tags missing
@@ -170,19 +163,19 @@ module.exports = function* list() {
     distTags.latest = pkg.version;
   }
 
-  var info = {
+  const info = {
     _id: orginalName,
     _rev: rev,
     name: orginalName,
     description: pkg.description,
-    "dist-tags": distTags,
+    'dist-tags': distTags,
     maintainers: pkg.maintainers,
     time: times,
     users: starUsers,
     author: pkg.author,
     repository: pkg.repository,
-    versions: versions,
-    readme: readme,
+    versions,
+    readme,
     _attachments: attachments,
   };
 

controllers/registry/package/list_all.js

@@ -1,29 +1,15 @@
-/**!
- * cnpmjs.org - controllers/registry/package/list_all.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var packageService = require('../../../services/package');
+const packageService = require('../../../services/package');
 
 // GET /-/all
 // List all packages names
 // https://github.com/npm/npm-registry-client/blob/master/lib/get.js#L86
 module.exports = function* () {
-  var updated = Date.now();
-  var names = yield* packageService.listAllPublicModuleNames();
-  var result = { _updated: updated };
-  names.forEach(function (name) {
+  const updated = Date.now();
+  const names = yield packageService.listAllPublicModuleNames();
+  const result = { _updated: updated };
+  names.forEach(function(name) {
     result[name] = true;
   });
   this.body = result;

controllers/registry/package/list_by_user.js

@@ -16,7 +16,7 @@
 
 const packageService = require('../../../services/package');
 
-module.exports = function*() {
+module.exports = function* () {
   const username = this.params.user;
   const packages = yield packageService.listModulesByUser(username);
 
@@ -24,6 +24,6 @@ module.exports = function*() {
     user: {
       name: username,
     },
-    packages: packages,
+    packages,
   };
 };

controllers/registry/package/list_dependents.js

@@ -16,11 +16,11 @@
 
 const packageService = require('../../../services/package');
 
-module.exports = function*() {
+module.exports = function* () {
   const name = this.params.name || this.params[0];
   const dependents = yield packageService.listDependents(name);
 
   this.body = {
-    dependents: dependents,
+    dependents,
   };
 };

controllers/registry/package/list_shorts.js

@@ -12,7 +12,7 @@
  * Module dependencies.
  */
 
-var packageService = require('../../../services/package');
+const packageService = require('../../../services/package');
 
 // GET /-/short
 // List all packages names only

controllers/registry/package/list_since.js

@@ -1,43 +1,43 @@
 'use strict';
 
-var packageService = require('../../../services/package');
+const packageService = require('../../../services/package');
 
-var A_WEEK_MS = 3600000 * 24 * 7;
+const A_WEEK_MS = 3600000 * 24 * 7;
 
 // GET /-/all/since?stale=update_after&startkey={key}
 // List packages names since startkey
 // https://github.com/npm/npm-registry-client/blob/master/lib/get.js#L89
 module.exports = function* listSince() {
-  var query = this.query;
+  const query = this.query;
   if (query.stale !== 'update_after') {
     this.status = 400;
     this.body = {
       error: 'query_parse_error',
-      reason: 'Invalid value for `stale`.'
+      reason: 'Invalid value for `stale`.',
     };
     return;
   }
 
-  var startkey = Number(query.startkey);
+  let startkey = Number(query.startkey);
   if (!startkey) {
     this.status = 400;
     this.body = {
       error: 'query_parse_error',
-      reason: 'Invalid value for `startkey`.'
+      reason: 'Invalid value for `startkey`.',
     };
     return;
   }
 
-  var updated = Date.now();
+  const updated = Date.now();
   if (updated - startkey > A_WEEK_MS) {
     startkey = updated - A_WEEK_MS;
     console.warn('[%s] list modules since time out of range: query: %j, ip: %s',
       Date(), query, this.ip);
   }
 
-  var names = yield packageService.listPublicModuleNamesSince(startkey);
-  var result = { _updated: updated };
-  names.forEach(function (name) {
+  const names = yield packageService.listPublicModuleNamesSince(startkey);
+  const result = { _updated: updated };
+  names.forEach(function(name) {
     result[name] = true;
   });
 

controllers/registry/package/remove.js

@@ -14,25 +14,25 @@
  * Module dependencies.
  */
 
-var debug = require('debug')('cnpmjs.org:controllers:registry:package:remove');
-var urlparse = require('url').parse;
-var packageService = require('../../../services/package');
-var totalService = require('../../../services/total');
-var nfs = require('../../../common/nfs');
-var logger = require('../../../common/logger');
+const debug = require('debug')('cnpmjs.org:controllers:registry:package:remove');
+const urlparse = require('url').parse;
+const packageService = require('../../../services/package');
+const totalService = require('../../../services/total');
+const nfs = require('../../../common/nfs');
+const logger = require('../../../common/logger');
 
 // DELETE /:name/-rev/:rev
 // https://github.com/npm/npm-registry-client/blob/master/lib/unpublish.js#L25
 module.exports = function* remove(next) {
-  var name = this.params.name || this.params[0];
-  var rev = this.params.rev || this.params[1];
+  const name = this.params.name || this.params[0];
+  const rev = this.params.rev || this.params[1];
   debug('remove all the module with name: %s, id: %s', name, rev);
 
-  var mods = yield* packageService.listModulesByName(name);
+  const mods = yield packageService.listModulesByName(name);
   debug('removeAll module %s: %d', name, mods.length);
-  var mod = mods[0];
+  const mod = mods[0];
   if (!mod) {
-    return yield* next;
+    return yield next;
   }
 
   yield [
@@ -41,11 +41,11 @@ module.exports = function* remove(next) {
     totalService.plusDeleteModule(),
   ];
 
-  var keys = [];
-  for (var i = 0; i < mods.length; i++) {
-    var row = mods[i];
-    var dist = row.package.dist;
-    var key = dist.key;
+  const keys = [];
+  for (let i = 0; i < mods.length; i++) {
+    const row = mods[i];
+    const dist = row.package.dist;
+    let key = dist.key;
     if (!key) {
       key = urlparse(dist.tarball).pathname;
     }
@@ -53,7 +53,7 @@ module.exports = function* remove(next) {
   }
 
   try {
-    yield keys.map(function (key) {
+    yield keys.map(function(key) {
       return nfs.remove(key);
     });
   } catch (err) {
@@ -61,7 +61,7 @@ module.exports = function* remove(next) {
   }
 
   // remove the maintainers
-  yield* packageService.removeAllMaintainers(name);
+  yield packageService.removeAllMaintainers(name);
 
   this.body = { ok: true };
 };

controllers/registry/package/remove_version.js

@@ -14,45 +14,45 @@
  * Module dependencies.
  */
 
-var debug = require('debug')('cnpmjs.org:controllers:registry:package:remove_version');
-var packageService = require('../../../services/package');
-var nfs = require('../../../common/nfs');
-var logger = require('../../../common/logger');
-var getCDNKey = require('../../../lib/common').getCDNKey;
+const debug = require('debug')('cnpmjs.org:controllers:registry:package:remove_version');
+const packageService = require('../../../services/package');
+const nfs = require('../../../common/nfs');
+const logger = require('../../../common/logger');
+const getCDNKey = require('../../../lib/common').getCDNKey;
 
 // DELETE /:name/download/:filename/-rev/:rev
 // https://github.com/npm/npm-registry-client/blob/master/lib/unpublish.js#L97
 module.exports = function* removeOneVersion(next) {
-  var name = this.params.name || this.params[0];
-  var filename = this.params.filename || this.params[1];
-  var id = Number(this.params.rev || this.params[2]);
+  const name = this.params.name || this.params[0];
+  const filename = this.params.filename || this.params[1];
+  const id = Number(this.params.rev || this.params[2]);
   // cnpmjs.org-2.0.0.tgz
-  var version = filename.split(name + '-')[1];
+  let version = filename.split(name + '-')[1];
   if (version) {
     // 2.0.0.tgz
     version = version.substring(0, version.lastIndexOf('.tgz'));
   }
   if (!version) {
-    return yield* next;
+    return yield next;
   }
 
   debug('remove tarball with filename: %s, version: %s, revert to => rev id: %s', filename, version, id);
 
   if (isNaN(id)) {
-    return yield* next;
+    return yield next;
   }
 
-  var rs = yield [
+  const rs = yield [
     packageService.getModuleById(id),
     packageService.getModule(name, version),
   ];
-  var revertTo = rs[0];
-  var mod = rs[1]; // module need to delete
+  const revertTo = rs[0];
+  const mod = rs[1]; // module need to delete
   if (!mod || mod.name !== name) {
-    return yield* next;
+    return yield next;
   }
 
-  var key = mod.package && mod.package.dist && mod.package.dist.key;
+  let key = mod.package && mod.package.dist && mod.package.dist.key;
   if (!key) {
     key = getCDNKey(mod.name, filename);
   }
@@ -68,7 +68,7 @@ module.exports = function* removeOneVersion(next) {
     logger.error(err);
   }
   // remove version from table
-  yield* packageService.removeModulesByNameAndVersions(name, [version]);
+  yield packageService.removeModulesByNameAndVersions(name, [ version ]);
   debug('removed %s@%s', name, version);
   this.body = { ok: true };
 };

controllers/registry/package/save.js

@@ -1,26 +1,12 @@
-/**!
- * cnpmjs.org - controllers/registry/package/save.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var debug = require('debug')('cnpmjs.org:controllers:registry:package:save');
-var crypto = require('crypto');
-var deprecateVersions = require('./deprecate');
-var packageService = require('../../../services/package');
-var common = require('../../../lib/common');
-var nfs = require('../../../common/nfs');
-var config = require('../../../config');
+const debug = require('debug')('cnpmjs.org:controllers:registry:package:save');
+const crypto = require('crypto');
+const deprecateVersions = require('./deprecate');
+const packageService = require('../../../services/package');
+const common = require('../../../lib/common');
+const nfs = require('../../../common/nfs');
+const config = require('../../../config');
 
 // old flows:
 // 1. add()
@@ -37,63 +23,63 @@ module.exports = function* save(next) {
   //    { content_type: 'application/octet-stream',
   //      data: 'H4sIAAAAA
   //      length: 9883
-  var pkg = this.request.body;
-  var username = this.user.name;
-  var name = this.params.name || this.params[0];
-  var filename = Object.keys(pkg._attachments || {})[0];
-  var version = Object.keys(pkg.versions || {})[0];
+  const pkg = this.request.body;
+  const username = this.user.name;
+  const name = this.params.name || this.params[0];
+  const filename = Object.keys(pkg._attachments || {})[0];
+  const version = Object.keys(pkg.versions || {})[0];
   if (!version) {
     this.status = 400;
     this.body = {
       error: 'version_error',
-      reason: 'package.versions is empty'
+      reason: 'package.versions is empty',
     };
     return;
   }
 
   // check maintainers
-  var result = yield* packageService.authMaintainer(name, username);
+  const result = yield packageService.authMaintainer(name, username);
   if (!result.isMaintainer) {
     this.status = 403;
     this.body = {
       error: 'forbidden user',
       reason: username + ' not authorized to modify ' + name +
-        ', please contact maintainers: ' + result.maintainers.join(', ')
+        ', please contact maintainers: ' + result.maintainers.join(', '),
     };
     return;
   }
 
   if (!filename) {
-    var hasDeprecated = false;
-    for (var v in pkg.versions) {
-      var row = pkg.versions[v];
+    let hasDeprecated = false;
+    for (const v in pkg.versions) {
+      const row = pkg.versions[v];
       if (typeof row.deprecated === 'string') {
         hasDeprecated = true;
         break;
       }
     }
     if (hasDeprecated) {
-      return yield* deprecateVersions.call(this, next);
+      return yield deprecateVersions.call(this, next);
     }
 
     this.status = 400;
     this.body = {
       error: 'attachment_error',
-      reason: 'package._attachments is empty'
+      reason: 'package._attachments is empty',
     };
     return;
   }
 
-  var attachment = pkg._attachments[filename];
-  var versionPackage = pkg.versions[version];
-  var maintainers = versionPackage.maintainers;
+  const attachment = pkg._attachments[filename];
+  const versionPackage = pkg.versions[version];
+  const maintainers = versionPackage.maintainers;
 
   // should never happened in normal request
   if (!maintainers) {
     this.status = 400;
     this.body = {
       error: 'maintainers error',
-      reason: 'request body need maintainers'
+      reason: 'request body need maintainers',
     };
     return;
   }
@@ -103,31 +89,31 @@ module.exports = function* save(next) {
 
   // make sure user in auth is in maintainers
   // should never happened in normal request
-  var m = maintainers.filter(function (maintainer) {
+  const m = maintainers.filter(function(maintainer) {
     return maintainer.name === username;
   });
   if (m.length === 0) {
     this.status = 403;
     this.body = {
       error: 'maintainers error',
-      reason: username + ' does not in maintainer list'
+      reason: username + ' does not in maintainer list',
     };
     return;
   }
 
   // TODO: add this info into some table
   versionPackage._publish_on_cnpm = true;
-  var distTags = pkg['dist-tags'] || {};
-  var tags = []; // tag, version
-  for (var t in distTags) {
-    tags.push([t, distTags[t]]);
+  const distTags = pkg['dist-tags'] || {};
+  const tags = []; // tag, version
+  for (const t in distTags) {
+    tags.push([ t, distTags[t] ]);
   }
 
   if (tags.length === 0) {
     this.status = 400;
     this.body = {
       error: 'invalid',
-      reason: 'dist-tags should not be empty'
+      reason: 'dist-tags should not be empty',
     };
     return;
   }
@@ -135,20 +121,19 @@ module.exports = function* save(next) {
   debug('%s publish new %s:%s, attachment size: %s, maintainers: %j, distTags: %j',
     username, name, version, attachment.length, versionPackage.maintainers, distTags);
 
-  var exists = yield* packageService.getModule(name, version);
-  var shasum;
+  const exists = yield packageService.getModule(name, version);
+  let shasum;
   if (exists) {
     this.status = 403;
     this.body = {
       error: 'forbidden',
-      reason: 'cannot modify pre-existing version: ' + version
+      reason: 'cannot modify pre-existing version: ' + version,
     };
     return;
   }
 
   // upload attachment
-  var tarballBuffer;
-  tarballBuffer = new Buffer(attachment.data, 'base64');
+  const tarballBuffer = new Buffer(attachment.data, 'base64');
 
   if (tarballBuffer.length !== attachment.length) {
     this.status = 403;
@@ -162,10 +147,10 @@ module.exports = function* save(next) {
 
   if (!distTags.latest) {
     // need to check if latest tag exists or not
-    var latest = yield* packageService.getModuleByTag(name, 'latest');
+    const latest = yield packageService.getModuleByTag(name, 'latest');
     if (!latest) {
       // auto add latest
-      tags.push(['latest', tags[0][1]]);
+      tags.push([ 'latest', tags[0][1] ]);
       debug('auto add latest tag: %j', tags);
     }
   }
@@ -174,16 +159,16 @@ module.exports = function* save(next) {
   shasum.update(tarballBuffer);
   shasum = shasum.digest('hex');
 
-  var options = {
+  const options = {
     key: common.getCDNKey(name, filename),
-    shasum: shasum
+    shasum,
   };
-  var uploadResult = yield nfs.uploadBuffer(tarballBuffer, options);
+  const uploadResult = yield nfs.uploadBuffer(tarballBuffer, options);
   debug('upload %j', uploadResult);
 
-  var dist = {
-    shasum: shasum,
-    size: attachment.length
+  const dist = {
+    shasum,
+    size: attachment.length,
   };
 
   // if nfs upload return a key, record it
@@ -194,42 +179,42 @@ module.exports = function* save(next) {
     dist.tarball = uploadResult.key;
   }
 
-  var mod = {
-    name: name,
-    version: version,
+  const mod = {
+    name,
+    version,
     author: username,
-    package: versionPackage
+    package: versionPackage,
   };
 
   mod.package.dist = dist;
-  yield* addDepsRelations(mod.package);
+  yield addDepsRelations(mod.package);
 
-  var addResult = yield* packageService.saveModule(mod);
+  const addResult = yield packageService.saveModule(mod);
   debug('%s module: save file to %s, size: %d, sha1: %s, dist: %j, version: %s',
     addResult.id, dist.tarball, dist.size, shasum, dist, version);
 
   if (tags.length) {
-    yield tags.map(function (tag) {
+    yield tags.map(function(tag) {
       // tag: [tagName, version]
       return packageService.addModuleTag(name, tag[0], tag[1]);
     });
   }
 
   // ensure maintainers exists
-  var maintainerNames = maintainers.map(function (item) {
+  const maintainerNames = maintainers.map(function(item) {
     return item.name;
   });
-  yield* packageService.addPrivateModuleMaintainers(name, maintainerNames);
+  yield packageService.addPrivateModuleMaintainers(name, maintainerNames);
 
   this.status = 201;
   this.body = {
     ok: true,
-    rev: String(addResult.id)
+    rev: String(addResult.id),
   };
 };
 
 function* addDepsRelations(pkg) {
-  var dependencies = Object.keys(pkg.dependencies || {});
+  let dependencies = Object.keys(pkg.dependencies || {});
   if (dependencies.length > config.maxDependencies) {
     dependencies = dependencies.slice(0, config.maxDependencies);
   }

controllers/registry/package/show.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var debug = require('debug')('cnpmjs.org:controllers:registry:package:show');
-var semver = require('semver');
-var packageService = require('../../../services/package');
-var setDownloadURL = require('../../../lib/common').setDownloadURL;
-var SyncModuleWorker = require('../../sync_module_worker');
-var config = require('../../../config');
+const debug = require('debug')('cnpmjs.org:controllers:registry:package:show');
+const semver = require('semver');
+const packageService = require('../../../services/package');
+const setDownloadURL = require('../../../lib/common').setDownloadURL;
+const SyncModuleWorker = require('../../sync_module_worker');
+const config = require('../../../config');
 
 /**
  * [deprecate] api
@@ -16,14 +16,14 @@ var config = require('../../../config');
  * GET /:name/:tag
  */
 module.exports = function* show() {
-  var name = this.params.name || this.params[0];
-  var tag = this.params.version || this.params[1];
+  const name = this.params.name || this.params[0];
+  let tag = this.params.version || this.params[1];
   if (tag === '*') {
     tag = 'latest';
   }
-  var version = semver.valid(tag);
-  var range = semver.validRange(tag);
-  var mod;
+  const version = semver.valid(tag);
+  const range = semver.validRange(tag);
+  let mod;
   if (version) {
     mod = yield packageService.getModule(name, version);
   } else if (range) {
@@ -36,18 +36,18 @@ module.exports = function* show() {
     setDownloadURL(mod.package, this);
     mod.package._cnpm_publish_time = mod.publish_time;
     mod.package.publish_time = mod.package.publish_time || mod.publish_time;
-    var rs = yield [
+    const rs = yield [
       packageService.listMaintainers(name),
       packageService.listModuleTags(name),
     ];
-    var maintainers = rs[0];
+    const maintainers = rs[0];
     if (maintainers.length > 0) {
       mod.package.maintainers = maintainers;
     }
-    var tags = rs[1];
-    var distTags = {};
-    for (var i = 0; i < tags.length; i++) {
-      var t = tags[i];
+    const tags = rs[1];
+    const distTags = {};
+    for (let i = 0; i < tags.length; i++) {
+      const t = tags[i];
       distTags[t.tag] = t.version;
     }
     // show tags for npminstall faster download
@@ -61,13 +61,13 @@ module.exports = function* show() {
     this.status = 404;
     this.jsonp = {
       error: 'not exist',
-      reason: 'version not found: ' + version
+      reason: 'version not found: ' + version,
     };
     return;
   }
 
   // start sync
-  var logId = yield SyncModuleWorker.sync(name, 'sync-by-install');
+  const logId = yield SyncModuleWorker.sync(name, 'sync-by-install');
   debug('start sync %s, get log id %s', name, logId);
 
   this.redirect(config.officialNpmRegistry + this.url);

controllers/registry/package/tag.js

@@ -1,69 +1,55 @@
-/**!
- * cnpmjs.org - controllers/registry/package/tag.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var debug = require('debug')('cnpmjs.org:controllers:registry:package:tag');
-var semver = require('semver');
-var util = require('util');
-var packageService = require('../../../services/package');
+const debug = require('debug')('cnpmjs.org:controllers:registry:package:tag');
+const semver = require('semver');
+const util = require('util');
+const packageService = require('../../../services/package');
 
 // PUT /:name/:tag
 // https://github.com/npm/npm-registry-client/blob/master/lib/tag.js#L4
 // this.request("PUT", uri+"/"+tagName, { body : JSON.stringify(version) }, cb)
 module.exports = function* tag() {
-  var version = this.request.body;
-  var name = this.params.name || this.params[0];
-  var tag = this.params.tag || this.params[1];
+  const version = this.request.body;
+  const name = this.params.name || this.params[0];
+  const tag = this.params.tag || this.params[1];
   debug('tag %j to %s/%s', version, name, tag);
 
   if (!version) {
     this.status = 400;
     this.body = {
       error: 'version_missed',
-      reason: 'version not found'
+      reason: 'version not found',
     };
     return;
   }
 
   if (!semver.valid(version)) {
     this.status = 403;
-    var reason = util.format('setting tag %s to invalid version: %s: %s/%s',
+    const reason = util.format('setting tag %s to invalid version: %s: %s/%s',
       tag, version, name, tag);
     this.body = {
       error: 'forbidden',
-      reason: reason
+      reason,
     };
     return;
   }
 
-  var mod = yield* packageService.getModule(name, version);
+  const mod = yield packageService.getModule(name, version);
   if (!mod) {
     this.status = 403;
-    var reason = util.format('setting tag %s to unknown version: %s: %s/%s',
+    const reason = util.format('setting tag %s to unknown version: %s: %s/%s',
       tag, version, name, tag);
     this.body = {
       error: 'forbidden',
-      reason: reason
+      reason,
     };
     return;
   }
 
-  var row = yield* packageService.addModuleTag(name, tag, version);
+  const row = yield packageService.addModuleTag(name, tag, version);
   this.status = 201;
   this.body = {
     ok: true,
-    modified: row.gmt_modified
+    modified: row.gmt_modified,
   };
 };

controllers/registry/package/update.js

@@ -1,65 +1,51 @@
-/**!
- * cnpmjs.org - controllers/registry/package/update.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var debug = require('debug')('cnpmjs.org:controllers:registry:package:update');
-var packageService = require('../../../services/package');
-var userService = require('../../../services/user');
-var config = require('../../../config');
+const debug = require('debug')('cnpmjs.org:controllers:registry:package:update');
+const packageService = require('../../../services/package');
+const userService = require('../../../services/user');
+const config = require('../../../config');
 
 // PUT /:name/-rev/:rev
 //
 // * remove with versions, then will `DELETE /:name/download/:filename/-rev/:rev`
 // * ...
 module.exports = function* update(next) {
-  var name = this.params.name || this.params[0];
+  const name = this.params.name || this.params[0];
   debug('update module %s, %s, %j', this.url, name, this.request.body);
 
-  var body = this.request.body;
+  const body = this.request.body;
   if (body.versions) {
-    yield* updateVersions.call(this, next);
+    yield updateVersions.call(this, next);
   } else if (body.maintainers) {
-    yield* updateMaintainers.call(this, next);
+    yield updateMaintainers.call(this, next);
   } else {
-    yield* next;
+    yield next;
   }
 };
 
 // update with versions
 // https://github.com/npm/npm-registry-client/blob/master/lib/unpublish.js#L63
 function* updateVersions(next) {
-  var name = this.params.name || this.params[0];
+  const name = this.params.name || this.params[0];
   // left versions
-  var versions = this.request.body.versions;
+  const versions = this.request.body.versions;
 
   // step1: list all the versions
-  var mods = yield* packageService.listModulesByName(name);
+  const mods = yield packageService.listModulesByName(name);
   debug('removeWithVersions module %s, left versions %j, %s mods',
     name, Object.keys(versions), mods && mods.length);
   if (!mods || !mods.length) {
-    return yield* next;
+    return yield next;
   }
 
   // step3: calculate which versions need to remove and
   // which versions need to remain
-  var removeVersions = [];
-  var removeVersionMaps = {};
-  var remainVersions = [];
+  const removeVersions = [];
+  const removeVersionMaps = {};
+  const remainVersions = [];
 
-  for (var i = 0; i < mods.length; i++) {
-    var v = mods[i].version;
+  for (let i = 0; i < mods.length; i++) {
+    const v = mods[i].version;
     if (!versions[v]) {
       removeVersions.push(v);
       removeVersionMaps[v] = true;
@@ -78,11 +64,11 @@ function* updateVersions(next) {
 
   // step 4: remove all the versions which need to remove
   // let removeTar do remove versions from module table
-  var tags = yield* packageService.listModuleTags(name);
+  const tags = yield packageService.listModuleTags(name);
 
-  var removeTags = [];
-  var latestRemoved = false;
-  tags.forEach(function (tag) {
+  const removeTags = [];
+  let latestRemoved = false;
+  tags.forEach(function(tag) {
     // this tag need be removed
     if (removeVersionMaps[tag.version]) {
       removeTags.push(tag.id);
@@ -95,28 +81,28 @@ function* updateVersions(next) {
   debug('remove tags: %j', removeTags);
   if (removeTags.length) {
     // step 5: remove all the tags
-    yield* packageService.removeModuleTagsByIds(removeTags);
+    yield packageService.removeModuleTagsByIds(removeTags);
     if (latestRemoved && remainVersions[0]) {
       debug('latest tags removed, generate a new latest tag with new version: %s',
         remainVersions[0]);
       // step 6: insert new latest tag
-      yield* packageService.addModuleTag(name, 'latest', remainVersions[0]);
+      yield packageService.addModuleTag(name, 'latest', remainVersions[0]);
     }
   }
 
   // step 7: update last modified, make sure etag change
-  yield* packageService.updateModuleLastModified(name);
+  yield packageService.updateModuleLastModified(name);
 
   this.status = 201;
   this.body = { ok: true };
 }
 
 function* updateMaintainers() {
-  var name = this.params.name || this.params[0];
-  var body = this.request.body;
+  const name = this.params.name || this.params[0];
+  const body = this.request.body;
   debug('updateMaintainers module %s, %j', name, body);
 
-  var usernames = body.maintainers.map(function (user) {
+  const usernames = body.maintainers.map(function(user) {
     return user.name;
   });
 
@@ -124,35 +110,32 @@ function* updateMaintainers() {
     this.status = 403;
     this.body = {
       error: 'invalid operation',
-      reason: 'Can not remove all maintainers'
+      reason: 'Can not remove all maintainers',
     };
     return;
   }
 
   if (config.customUserService) {
     // ensure new authors are vaild
-    var maintainers = yield* packageService.listMaintainerNamesOnly(name);
-    var map = {};
-    var newNames = [];
-    for (var i = 0; i < maintainers.length; i++) {
-      map[maintainers[i]] = 1;
+    const maintainers = yield packageService.listMaintainerNamesOnly(name);
+    const map = {};
+    const newNames = [];
+    for (const maintainer of maintainers) {
+      map[maintainer] = 1;
     }
-    for (var i = 0; i < usernames.length; i++) {
-      var username = usernames[i];
+    for (const username of usernames) {
       if (map[username] !== 1) {
         newNames.push(username);
       }
     }
     if (newNames.length > 0) {
-      var users = yield* userService.list(newNames);
-      var map = {};
-      for (var i = 0; i < users.length; i++) {
-        var user = users[i];
+      const users = yield userService.list(newNames);
+      const map = {};
+      for (const user of users) {
         map[user.login] = 1;
       }
-      var invailds = [];
-      for (var i = 0; i < newNames.length; i++) {
-        var username = newNames[i];
+      const invailds = [];
+      for (const username of newNames) {
         if (map[username] !== 1) {
           invailds.push(username);
         }
@@ -161,14 +144,14 @@ function* updateMaintainers() {
         this.status = 403;
         this.body = {
           error: 'invalid user name',
-          reason: 'User: `' + invailds.join(', ') + '` not exists'
+          reason: 'User: `' + invailds.join(', ') + '` not exists',
         };
         return;
       }
     }
   }
 
-  var r = yield* packageService.updatePrivateModuleMaintainers(name, usernames);
+  const r = yield packageService.updatePrivateModuleMaintainers(name, usernames);
   debug('result: %j', r);
 
   this.status = 201;

controllers/registry/user/add.js

@@ -15,9 +15,9 @@
  * Module dependencies.
  */
 
-var ensurePasswordSalt = require('./common').ensurePasswordSalt;
-var userService = require('../../../services/user');
-var config = require('../../../config');
+const ensurePasswordSalt = require('./common').ensurePasswordSalt;
+const userService = require('../../../services/user');
+const config = require('../../../config');
 
 // npm 1.4.4
 // add new user first
@@ -53,9 +53,9 @@ var config = require('../../../config');
 //   roles: [],
 //   date: '2014-03-15T02:39:25.696Z' }
 module.exports = function* addUser() {
-  var name = this.params.name;
-  var body = this.request.body || {};
-  var user = {
+  const name = this.params.name;
+  const body = this.request.body || {};
+  const user = {
     name: body.name,
     // salt: body.salt,
     // password_sha: body.password_sha,
@@ -70,19 +70,19 @@ module.exports = function* addUser() {
     this.status = 422;
     this.body = {
       error: 'paramError',
-      reason: 'params missing, name, email or password missing.'
+      reason: 'params missing, name, email or password missing.',
     };
     return;
   }
 
-  var loginedUser;
+  let loginedUser;
   try {
-    loginedUser = yield* userService.authAndSave(body.name, body.password);
+    loginedUser = yield userService.authAndSave(body.name, body.password);
   } catch (err) {
     this.status = err.status || 500;
     this.body = {
       error: err.name,
-      reason: err.message
+      reason: err.message,
     };
     return;
   }
@@ -91,7 +91,7 @@ module.exports = function* addUser() {
     this.body = {
       ok: true,
       id: 'org.couchdb.user:' + loginedUser.login,
-      rev: Date.now() + '-' + loginedUser.login
+      rev: Date.now() + '-' + loginedUser.login,
     };
     return;
   }
@@ -101,28 +101,28 @@ module.exports = function* addUser() {
     this.status = 401;
     this.body = {
       error: 'unauthorized',
-      reason: 'Login fail, please check your login name and password'
+      reason: 'Login fail, please check your login name and password',
     };
     return;
   }
 
-  var existUser = yield* userService.get(name);
+  const existUser = yield userService.get(name);
   if (existUser) {
     this.status = 409;
     this.body = {
       error: 'conflict',
-      reason: 'User ' + name + ' already exists.'
+      reason: 'User ' + name + ' already exists.',
     };
     return;
   }
 
   // add new user
-  var result = yield* userService.add(user);
+  const result = yield userService.add(user);
   this.etag = '"' + result.rev + '"';
   this.status = 201;
   this.body = {
     ok: true,
     id: 'org.couchdb.user:' + name,
-    rev: result.rev
+    rev: result.rev,
   };
 };

controllers/registry/user/common.js

@@ -14,10 +14,10 @@
  * Module dependencies.
  */
 
-var crypto = require('crypto');
-var utility = require('utility');
+const crypto = require('crypto');
+const utility = require('utility');
 
-exports.ensurePasswordSalt = function (user, body) {
+exports.ensurePasswordSalt = function(user, body) {
   if (!user.password_sha && body.password) {
     // create password_sha on server
     user.salt = crypto.randomBytes(30).toString('hex');

controllers/registry/user/show.js

@@ -15,17 +15,17 @@
  * Module dependencies.
  */
 
-var userService = require('../../../services/user');
+const userService = require('../../../services/user');
 
 // GET /-/user/org.couchdb.user::name
 module.exports = function* show(next) {
-  var name = this.params.name;
-  var user = yield* userService.getAndSave(name);
+  const name = this.params.name;
+  const user = yield userService.getAndSave(name);
   if (!user) {
-    return yield* next;
+    return yield next;
   }
 
-  var data = user.json;
+  let data = user.json;
   if (!data) {
     data = {
       _id: 'org.couchdb.user:' + user.name,
@@ -53,7 +53,7 @@ module.exports = function* show(next) {
       fullname: data.name || data.login,
       homepage: data.html_url,
       scopes: data.scopes,
-      site_admin: data.site_admin
+      site_admin: data.site_admin,
     };
   }
 

controllers/registry/user/update.js

@@ -15,9 +15,9 @@
  * Module dependencies.
  */
 
-var debug = require('debug')('cnpmjs.org:controllers:registry:user:update');
-var ensurePasswordSalt = require('./common').ensurePasswordSalt;
-var userService = require('../../../services/user');
+const debug = require('debug')('cnpmjs.org:controllers:registry:user:update');
+const ensurePasswordSalt = require('./common').ensurePasswordSalt;
+const userService = require('../../../services/user');
 
 // logined before update, no need to auth user again
 // { name: 'admin',
@@ -37,10 +37,10 @@ var userService = require('../../../services/user');
 //    admin: true,
 //    scopes: [ '@cnpm', '@cnpmtest' ] } }
 module.exports = function* updateUser(next) {
-  var name = this.params.name;
-  var rev = this.params.rev;
+  const name = this.params.name;
+  const rev = this.params.rev;
   if (!name || !rev) {
-    return yield* next;
+    return yield next;
   }
   debug('update: %s, rev: %s, user.name: %s', name, rev, this.user.name);
 
@@ -49,13 +49,13 @@ module.exports = function* updateUser(next) {
     this.status = 401;
     this.body = {
       error: 'unauthorized',
-      reason: 'Name is incorrect.'
+      reason: 'Name is incorrect.',
     };
     return;
   }
 
-  var body = this.request.body || {};
-  var user = {
+  const body = this.request.body || {};
+  const user = {
     name: body.name,
     // salt: body.salt,
     // password_sha: body.password_sha,
@@ -73,17 +73,17 @@ module.exports = function* updateUser(next) {
     this.status = 422;
     this.body = {
       error: 'paramError',
-      reason: 'params missing, name, email or password missing.'
+      reason: 'params missing, name, email or password missing.',
     };
     return;
   }
 
-  var result = yield* userService.update(user);
+  const result = yield userService.update(user);
   if (!result) {
     this.status = 409;
     this.body = {
       error: 'conflict',
-      reason: 'Document update conflict.'
+      reason: 'Document update conflict.',
     };
     return;
   }
@@ -92,6 +92,6 @@ module.exports = function* updateUser(next) {
   this.body = {
     ok: true,
     id: 'org.couchdb.user:' + user.name,
-    rev: result.rev
+    rev: result.rev,
   };
 };

controllers/registry/user_package.js

@@ -14,35 +14,35 @@
  * Module dependencies.
  */
 
-var packageService = require('../../services/package');
+const packageService = require('../../services/package');
 
 // GET /-/by-user/:user
 exports.list = function* () {
-  var users = this.params.user.split('|');
+  const users = this.params.user.split('|');
   if (users.length > 20) {
     this.status = 400;
     this.body = {
       error: 'bad_request',
-      reason: 'reach max user names limit, must <= 20 user names'
+      reason: 'reach max user names limit, must <= 20 user names',
     };
     return;
   }
 
-  var firstUser = users[0];
+  const firstUser = users[0];
   if (!firstUser) {
     // params.user = '|'
     this.body = {};
     return;
   }
 
-  var tasks = {};
-  for (var i = 0; i < users.length; i++) {
-    var username = users[i];
+  const tasks = {};
+  for (let i = 0; i < users.length; i++) {
+    const username = users[i];
     tasks[username] = packageService.listPublicModuleNamesByUser(username);
   }
 
-  var data = yield tasks;
-  for (var k in data) {
+  const data = yield tasks;
+  for (const k in data) {
     if (data[k].length === 0) {
       data[k] = undefined;
     }

controllers/sync.js

@@ -14,67 +14,67 @@
  * Module dependencies.
  */
 
-var debug = require('debug')('cnpmjs.org:controllers:sync');
-var Log = require('../services/module_log');
-var SyncModuleWorker = require('./sync_module_worker');
-var config = require('../config');
+const debug = require('debug')('cnpmjs.org:controllers:sync');
+const Log = require('../services/module_log');
+const SyncModuleWorker = require('./sync_module_worker');
+const config = require('../config');
 
 exports.sync = function* () {
-  var username = this.user.name || 'anonymous';
-  var name = this.params.name || this.params[0];
-  var type = 'package';
+  const username = this.user.name || 'anonymous';
+  let name = this.params.name || this.params[0];
+  let type = 'package';
   if (name.indexOf(':') > 0) {
     // user:fengmk2
     // package:pedding
-    var splits = name.split(':');
+    const splits = name.split(':');
     type = splits[0];
     name = splits[1];
   }
-  var publish = this.query.publish === 'true';
-  var noDep = this.query.nodeps === 'true';
+  const publish = this.query.publish === 'true';
+  const noDep = this.query.nodeps === 'true';
   debug('sync %s with query: %j', name, this.query);
   if (type === 'package' && publish && !this.user.isAdmin) {
     this.status = 403;
     this.body = {
       error: 'no_perms',
-      reason: 'Only admin can publish'
+      reason: 'Only admin can publish',
     };
     return;
   }
 
-  var options = {
-    type: type,
-    publish: publish,
-    noDep: noDep,
+  const options = {
+    type,
+    publish,
+    noDep,
     syncUpstreamFirst: config.sourceNpmRegistryIsCNpm,
   };
 
-  var logId = yield* SyncModuleWorker.sync(name, username, options);
+  const logId = yield SyncModuleWorker.sync(name, username, options);
   debug('sync %s got log id %j', name, logId);
 
   this.status = 201;
   this.body = {
     ok: true,
-    logId: logId
+    logId,
   };
 };
 
 exports.getSyncLog = function* (next) {
-  var logId = Number(this.params.id || this.params[1]);
-  var offset = Number(this.query.offset) || 0;
+  const logId = Number(this.params.id || this.params[1]);
+  const offset = Number(this.query.offset) || 0;
 
   if (!logId) { // NaN
     this.status = 404;
     return;
   }
-  var row = yield* Log.get(logId);
+  const row = yield Log.get(logId);
   if (!row) {
-    return yield* next;
+    return yield next;
   }
 
-  var log = row.log.trim();
+  let log = row.log.trim();
   if (offset > 0) {
     log = log.split('\n').slice(offset).join('\n');
   }
-  this.body = {ok: true, log: log};
+  this.body = { ok: true, log };
 };

controllers/sync_module_worker.js

@@ -1,30 +1,30 @@
 'use strict';
 
-var debug = require('debug')('cnpmjs.org:sync_module_worker');
-var co = require('co');
-var gather = require('co-gather');
-var defer = require('co-defer');
-var thunkify = require('thunkify-wrap');
-var EventEmitter = require('events').EventEmitter;
-var util = require('util');
-var fs = require('fs');
-var path = require('path');
-var crypto = require('crypto');
-var sleep = require('co-sleep');
-var utility = require('utility');
-var urlparse = require('url').parse;
-var urllib = require('../common/urllib');
-var config = require('../config');
-var nfs = require('../common/nfs');
-var logger = require('../common/logger');
-var common = require('../lib/common');
-var npmSerivce = require('../services/npm');
-var packageService = require('../services/package');
-var logService = require('../services/module_log');
-var User = require('../models').User;
-var os = require('os');
+const debug = require('debug')('cnpmjs.org:sync_module_worker');
+const co = require('co');
+const gather = require('co-gather');
+const defer = require('co-defer');
+const thunkify = require('thunkify-wrap');
+const EventEmitter = require('events').EventEmitter;
+const util = require('util');
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+const sleep = require('ko-sleep');
+const utility = require('utility');
+const urlparse = require('url').parse;
+const urllib = require('../common/urllib');
+const config = require('../config');
+const nfs = require('../common/nfs');
+const logger = require('../common/logger');
+const common = require('../lib/common');
+const npmSerivce = require('../services/npm');
+const packageService = require('../services/package');
+const logService = require('../services/module_log');
+const User = require('../models').User;
+const os = require('os');
 
-var USER_AGENT = 'sync.cnpmjs.org/' + config.version +
+const USER_AGENT = 'sync.cnpmjs.org/' + config.version +
   ' hostname/' + os.hostname() +
   ' syncModel/' + config.syncModel +
   ' syncInterval/' + config.syncInterval +
@@ -37,7 +37,7 @@ function SyncModuleWorker(options) {
   this._log = '';
   this._loging = false;
   if (!Array.isArray(options.name)) {
-    options.name = [options.name];
+    options.name = [ options.name ];
   }
 
   this.type = options.type || 'package';
@@ -51,7 +51,7 @@ function SyncModuleWorker(options) {
 
   this.syncingNames = {};
   this.nameMap = {};
-  this.names.forEach(function (name) {
+  this.names.forEach(function(name) {
     this.nameMap[name] = true;
   }.bind(this));
   this.noDep = options.noDep === true; // do not sync dependences
@@ -66,7 +66,7 @@ util.inherits(SyncModuleWorker, EventEmitter);
 
 module.exports = SyncModuleWorker;
 
-SyncModuleWorker.prototype.finish = function () {
+SyncModuleWorker.prototype.finish = function() {
   debug('syncingNames: %j', this.syncingNames);
   if (this._finished || Object.keys(this.syncingNames).length > 0) {
     return;
@@ -83,10 +83,10 @@ SyncModuleWorker.prototype.finish = function () {
 };
 
 // log(format, arg1, arg2, ...)
-SyncModuleWorker.prototype.log = function () {
-  var str = '[' + utility.YYYYMMDDHHmmss() + '] ' + util.format.apply(util, arguments);
+SyncModuleWorker.prototype.log = function() {
+  const str = '[' + utility.YYYYMMDDHHmmss() + '] ' + util.format.apply(util, arguments);
   debug(str);
-  var logId = this._logId;
+  const logId = this._logId;
   if (logId) {
     if (this._log) {
       this._log += '\n';
@@ -96,22 +96,22 @@ SyncModuleWorker.prototype.log = function () {
   }
 };
 
-SyncModuleWorker.prototype._saveLog = function () {
-  var that = this;
+SyncModuleWorker.prototype._saveLog = function() {
+  const that = this;
   if (that._loging) {
     return;
   }
   that._loging = true;
-  var logstr = that._log;
+  const logstr = that._log;
   that._log = '';
   co(function* () {
-    yield* logService.append(that._logId, logstr);
-  }).then(function () {
+    yield logService.append(that._logId, logstr);
+  }).then(function() {
     that._loging = false;
     if (that._log) {
       that._saveLog();
     }
-  }).catch(function (err) {
+  }).catch(function(err) {
     logger.error(err);
     that._loging = false;
     if (that._log) {
@@ -120,10 +120,10 @@ SyncModuleWorker.prototype._saveLog = function () {
   });
 };
 
-SyncModuleWorker.prototype.start = function () {
+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;
+  const that = this;
   co(function* () {
     // sync upstream
     if (that.syncUpstreamFirst) {
@@ -139,27 +139,27 @@ SyncModuleWorker.prototype.start = function () {
       return;
     }
 
-    var arr = [];
-    for (var i = 0; i < that.concurrency; i++) {
+    const arr = [];
+    for (let i = 0; i < that.concurrency; i++) {
       arr.push(that.next(i));
     }
     yield arr;
-  }).catch(function (err) {
+  }).catch(function(err) {
     logger.error(err);
   });
 };
 
-SyncModuleWorker.prototype.pushSuccess = function (name) {
+SyncModuleWorker.prototype.pushSuccess = function(name) {
   this.successes.push(name);
   this.emit('success', name);
 };
 
-SyncModuleWorker.prototype.pushFail = function (name) {
+SyncModuleWorker.prototype.pushFail = function(name) {
   this.fails.push(name);
   this.emit('fail', name);
 };
 
-SyncModuleWorker.prototype.add = function (name) {
+SyncModuleWorker.prototype.add = function(name) {
   if (this.nameMap[name]) {
     return;
   }
@@ -178,7 +178,7 @@ SyncModuleWorker.prototype._doneOne = function* (concurrencyId, name, success) {
     this.pushFail(name);
   }
   delete this.syncingNames[name];
-  var that = this;
+  const that = this;
   // relase the stack: https://github.com/cnpm/cnpmjs.org/issues/328
   defer.setImmediate(function* () {
     yield that.next(concurrencyId);
@@ -193,19 +193,19 @@ SyncModuleWorker.prototype.syncUpstream = function* (name) {
       config.sourceNpmRegistry);
     return;
   }
-  var syncname = name;
+  let syncname = name;
   if (this.type === 'user') {
     syncname = this.type + ':' + syncname;
   }
-  var url = config.sourceNpmRegistry + '/' + syncname + '/sync';
+  let url = config.sourceNpmRegistry + '/' + syncname + '/sync';
   if (this.noDep) {
     url += '?nodeps=true';
   }
-  var r = yield urllib.request(url, {
+  const r = yield urllib.request(url, {
     method: 'put',
     timeout: 20000,
     headers: {
-      'content-length': 0
+      'content-length': 0,
     },
     dataType: 'json',
     gzip: true,
@@ -216,15 +216,16 @@ SyncModuleWorker.prototype.syncUpstream = function* (name) {
       url, r.status, r.data);
   }
 
-  var logURL = config.sourceNpmRegistry + '/' + name + '/sync/log/' + r.data.logId;
-  var offset = 0;
+  const logURL = config.sourceNpmRegistry + '/' + name + '/sync/log/' + r.data.logId;
+  let offset = 0;
   this.log('----------------- Syncing upstream %s -------------------', logURL);
 
-  var count = 0;
+  let count = 0;
+  /* eslint no-constant-condition: 0 */
   while (true) {
     count++;
-    var synclogURL = logURL + '?offset=' + offset;
-    var rs = yield urllib.request(synclogURL, {
+    const synclogURL = logURL + '?offset=' + offset;
+    const rs = yield urllib.request(synclogURL, {
       timeout: 20000,
       dataType: 'json',
       gzip: true,
@@ -236,8 +237,8 @@ SyncModuleWorker.prototype.syncUpstream = function* (name) {
       break;
     }
 
-    var data = rs.data;
-    var syncDone = false;
+    const data = rs.data;
+    let syncDone = false;
     if (data.log && data.log.indexOf('[done] Sync') >= 0) {
       syncDone = true;
       data.log = data.log.replace('[done] Sync', '[Upstream done] Sync');
@@ -266,10 +267,10 @@ SyncModuleWorker.prototype.syncUpstream = function* (name) {
 };
 
 SyncModuleWorker.prototype.syncUser = function* () {
-  for (var i = 0; i < this.names.length; i++) {
-    var username = this.names[i];
+  for (let i = 0; i < this.names.length; i++) {
+    const username = this.names[i];
     try {
-      var user = yield _saveNpmUser(username);
+      const user = yield _saveNpmUser(username);
       this.pushSuccess(username);
       this.log('[c#%s] [%s] sync success: %j', 0, username, user);
     } catch (err) {
@@ -281,21 +282,21 @@ SyncModuleWorker.prototype.syncUser = function* () {
 };
 
 SyncModuleWorker.prototype.next = function* (concurrencyId) {
+  const name = this.names.shift();
+  if (!name) {
+    return setImmediate(this.finish.bind(this));
+  }
+
   if (config.syncModel === 'none') {
     this.log('[c#%d] [%s] syncModel is none, ignore',
       concurrencyId, name);
     return this.finish();
   }
 
-  var name = this.names.shift();
-  if (!name) {
-    return setImmediate(this.finish.bind(this));
-  }
-
-  var that = this;
+  const that = this;
   that.syncingNames[name] = true;
-  var pkg = null;
-  var status = 0;
+  let pkg = null;
+  let status = 0;
 
   this.log('----------------- Syncing %s -------------------', name);
 
@@ -312,13 +313,13 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
   // try to sync from official replicate when source npm registry is not cnpmjs.org
   const registry = config.sourceNpmRegistryIsCNpm ? config.sourceNpmRegistry : config.officialNpmReplicate;
   try {
-    var result = yield npmSerivce.request(packageUrl, { registry: registry });
+    const result = yield npmSerivce.request(packageUrl, { registry });
     pkg = result.data;
     status = result.status;
   } catch (err) {
     // if 404
     if (!err.res || err.res.statusCode !== 404) {
-      var errMessage = err.name + ': ' + err.message;
+      const errMessage = err.name + ': ' + err.message;
       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);
@@ -326,7 +327,7 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
     }
   }
 
-  var unpublishedInfo = null;
+  let unpublishedInfo = null;
   if (status === 404) {
     // check if it's unpublished
     // ignore too long package name, see https://github.com/cnpm/cnpmjs.org/issues/1066
@@ -358,7 +359,7 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
     return yield that._doneOne(concurrencyId, name, true);
   }
 
-  var versions;
+  let versions;
   try {
     versions = yield that._sync(name, pkg);
   } catch (err) {
@@ -378,24 +379,24 @@ SyncModuleWorker.prototype.next = function* (concurrencyId) {
 };
 
 function* _listStarUsers(modName) {
-  var users = yield packageService.listStarUserNames(modName);
-  var userMap = {};
-  users.forEach(function (user) {
+  const users = yield packageService.listStarUserNames(modName);
+  const userMap = {};
+  users.forEach(function(user) {
     userMap[user] = true;
   });
   return userMap;
 }
 
 function* _saveNpmUser(username) {
-  var user = yield npmSerivce.getUser(username);
+  const user = yield npmSerivce.getUser(username);
   if (!user) {
-    var existsUser = yield User.findByName(username);
+    const existsUser = yield User.findByName(username);
     if (existsUser && existsUser.isNpmUser) {
       // delete it
       yield User.destroy({
         where: {
           name: username,
-        }
+        },
       });
       return { exists: true, deleted: true, isNpmUser: true };
     }
@@ -407,14 +408,14 @@ function* _saveNpmUser(username) {
 
 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);
+  const mods = yield packageService.listModulesByName(name);
   this.log('  [%s] start unpublished %d versions from local cnpm registry',
     name, mods.length);
   if (common.isLocalModule(mods)) {
@@ -423,18 +424,18 @@ SyncModuleWorker.prototype._unpublished = function* (name, unpublishedInfo) {
     return [];
   }
 
-  var r = yield* packageService.saveUnpublishedModule(name, unpublishedInfo);
+  const 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)];
-  var keys = [];
-  for (var i = 0; i < mods.length; i++) {
-    var row = mods[i];
-    var dist = row.package.dist;
-    var key = dist.key;
+  yield [ packageService.removeModulesByName(name), packageService.removeModuleTags(name) ];
+  const keys = [];
+  for (let i = 0; i < mods.length; i++) {
+    const row = mods[i];
+    const dist = row.package.dist;
+    let key = dist.key;
     if (!key) {
       key = urlparse(dist.tarball).pathname;
     }
@@ -443,7 +444,7 @@ SyncModuleWorker.prototype._unpublished = function* (name, unpublishedInfo) {
 
   if (keys.length > 0) {
     try {
-      yield keys.map(function (key) {
+      yield keys.map(function(key) {
         return nfs.remove(key);
       });
     } catch (err) {
@@ -456,18 +457,17 @@ SyncModuleWorker.prototype._unpublished = function* (name, unpublishedInfo) {
 };
 
 SyncModuleWorker.prototype._sync = function* (name, pkg) {
-  var that = this;
-  var hasModules = false;
-  var result = yield [
+  const that = this;
+  const result = yield [
     packageService.listModulesByName(name),
     packageService.listModuleTags(name),
     _listStarUsers(name),
     packageService.listPublicModuleMaintainers(name),
   ];
-  var moduleRows = result[0];
-  var tagRows = result[1];
-  var existsStarUsers = result[2];
-  var existsNpmMaintainers = result[3];
+  const moduleRows = result[0];
+  const tagRows = result[1];
+  const existsStarUsers = result[2];
+  const existsNpmMaintainers = result[3];
 
   if (common.isLocalModule(moduleRows)) {
     // publish on cnpm, dont sync this version package
@@ -475,11 +475,10 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
     return [];
   }
 
-  hasModules = moduleRows.length > 0;
-  var map = {};
-  var localVersionNames = [];
-  for (var i = 0; i < moduleRows.length; i++) {
-    var r = moduleRows[i];
+  const map = {};
+  const localVersionNames = [];
+  for (let i = 0; i < moduleRows.length; i++) {
+    const r = moduleRows[i];
     if (!r.package || !r.package.dist) {
       // package json parse error
       continue;
@@ -491,9 +490,9 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
     localVersionNames.push(r.version);
   }
 
-  var tags = {};
-  for (var i = 0; i < tagRows.length; i++) {
-    var r = tagRows[i];
+  const tags = {};
+  for (let i = 0; i < tagRows.length; i++) {
+    const r = tagRows[i];
     if (!r.module_id) {
       // no module_id, need to sync tags
       continue;
@@ -501,59 +500,54 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
     tags[r.tag] = r.version;
   }
 
-  var missingVersions = [];
-  var missingTags = [];
-  var missingDescriptions = [];
-  var missingReadmes = [];
-  var missingStarUsers = [];
-  var npmUsernames = {};
-  var missingDeprecateds = [];
+  const missingVersions = [];
+  const missingTags = [];
+  const missingDescriptions = [];
+  const missingReadmes = [];
+  const missingStarUsers = [];
+  const npmUsernames = {};
+  const missingDeprecateds = [];
   // [[user, 'add or remove'], ...]
-  var diffNpmMaintainers = [];
+  const diffNpmMaintainers = [];
 
   // find out new maintainers
-  var pkgMaintainers = pkg.maintainers || [];
+  const pkgMaintainers = pkg.maintainers || [];
   if (Array.isArray(pkgMaintainers)) {
-    var existsMap = {};
-    var originalMap = {};
-    for (var i = 0; i < existsNpmMaintainers.length; i++) {
-      var user = existsNpmMaintainers[i];
+    const existsMap = {};
+    const originalMap = {};
+    for (const user of existsNpmMaintainers) {
       existsMap[user] = true;
     }
-    for (var i = 0; i < pkgMaintainers.length; i++) {
-      var item = pkgMaintainers[i];
+    for (const item of pkgMaintainers) {
       originalMap[item.name] = item;
       npmUsernames[item.name.toLowerCase()] = 1;
     }
 
     // find add users
-    for (var i = 0; i < pkgMaintainers.length; i++) {
-      var item = pkgMaintainers[i];
+    for (const item of pkgMaintainers) {
       if (!existsMap[item.name]) {
-        diffNpmMaintainers.push([item.name, 'add']);
+        diffNpmMaintainers.push([ item.name, 'add' ]);
       }
     }
 
     // find remove users
-    for (var i = 0; i < existsNpmMaintainers.length; i++) {
-      var user = existsNpmMaintainers[i];
+    for (const user of existsNpmMaintainers) {
       if (!originalMap[user]) {
-        diffNpmMaintainers.push([user, 'remove']);
+        diffNpmMaintainers.push([ user, 'remove' ]);
       }
     }
   }
 
   // find out all user names
-  for (var v in pkg.versions) {
-    var p = pkg.versions[v];
-    var maintainers = p.maintainers || [];
+  for (const v in pkg.versions) {
+    const p = pkg.versions[v];
+    let maintainers = p.maintainers || [];
     if (!Array.isArray(maintainers)) {
       // http://r.cnpmjs.org/jasmine-node
       // TODO: "maintainers": "Martin H膫陇ger <martin.haeger@gmail.com>",
-      maintainers = [maintainers];
+      maintainers = [ maintainers ];
     }
-    for (var i = 0; i < maintainers.length; i++) {
-      var m = maintainers[i];
+    for (const m of maintainers) {
       if (m.name) {
         npmUsernames[m.name.toLowerCase()] = 1;
       }
@@ -561,8 +555,8 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
   }
 
   // get the missing star users
-  var starUsers = pkg.users || {};
-  for (var k in starUsers) {
+  const starUsers = pkg.users || {};
+  for (const k in starUsers) {
     if (!existsStarUsers[k]) {
       missingStarUsers.push(k);
     }
@@ -570,25 +564,24 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
   }
   that.log('  [%s] found %d missing star users', name, missingStarUsers.length);
 
-  var times = pkg.time || {};
+  const times = pkg.time || {};
   pkg.versions = pkg.versions || {};
-  var remoteVersionNames = Object.keys(pkg.versions);
-  var remoteVersionNameMap = {};
+  const remoteVersionNames = Object.keys(pkg.versions);
+  const remoteVersionNameMap = {};
 
   // find out missing versions
-  for (var i = 0; i < remoteVersionNames.length; i++) {
-    var v = remoteVersionNames[i];
+  for (const v of remoteVersionNames) {
     remoteVersionNameMap[v] = v;
-    var exists = map[v] || {};
-    var version = pkg.versions[v];
+    const exists = map[v] || {};
+    const version = pkg.versions[v];
     if (!version || !version.dist || !version.dist.tarball) {
       continue;
     }
-    //patch for readme
+    // patch for readme
     if (!version.readme) {
       version.readme = pkg.readme;
     }
-    var publish_time = times[v];
+    const publish_time = times[v];
     version.publish_time = publish_time ? Date.parse(publish_time) : null;
     if (!version.maintainers || !version.maintainers[0]) {
       version.maintainers = pkg.maintainers;
@@ -605,7 +598,7 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
           // * make sure description exists
           missingDescriptions.push({
             id: exists.id,
-            description: version.description
+            description: version.description,
           });
         }
 
@@ -613,7 +606,7 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
           // * make sure readme exists
           missingReadmes.push({
             id: exists.id,
-            readme: version.readme
+            readme: version.readme,
           });
         }
 
@@ -621,7 +614,7 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
           // need to sync deprecated field
           missingDeprecateds.push({
             id: exists.id,
-            deprecated: version.deprecated
+            deprecated: version.deprecated,
           });
         }
         if (exists.package.deprecated && !version.deprecated) {
@@ -638,25 +631,24 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
   }
 
   // find out deleted versions
-  var deletedVersionNames = [];
-  for (var i = 0; i < localVersionNames.length; i++) {
-    var v = localVersionNames[i];
+  const deletedVersionNames = [];
+  for (const v of localVersionNames) {
     if (!remoteVersionNameMap[v]) {
       deletedVersionNames.push(v);
     }
   }
 
   // find out missing tags
-  var sourceTags = pkg['dist-tags'] || {};
-  for (var t in sourceTags) {
-    var sourceTagVersion = sourceTags[t];
+  const sourceTags = pkg['dist-tags'] || {};
+  for (const t in sourceTags) {
+    const sourceTagVersion = sourceTags[t];
     if (sourceTagVersion && tags[t] !== sourceTagVersion) {
-      missingTags.push([t, sourceTagVersion]);
+      missingTags.push([ t, sourceTagVersion ]);
     }
   }
   // find out deleted tags
-  var deletedTags = [];
-  for (var t in tags) {
+  const deletedTags = [];
+  for (const t in tags) {
     if (!sourceTags[t]) {
       // not in remote tags, delete it from local registry
       deletedTags.push(t);
@@ -666,19 +658,19 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
   if (missingVersions.length === 0) {
     that.log('  [%s] all versions are exists', name);
   } else {
-    missingVersions.sort(function (a, b) {
+    missingVersions.sort(function(a, b) {
       return a.publish_time - b.publish_time;
     });
     that.log('  [%s] %d versions need to sync', name, missingVersions.length);
   }
 
-  var syncedVersionNames = [];
-  var syncIndex = 0;
+  const syncedVersionNames = [];
+  let syncIndex = 0;
 
   // sync missing versions
   while (missingVersions.length) {
-    var index = syncIndex++;
-    var syncModule = missingVersions.shift();
+    const index = syncIndex++;
+    const syncModule = missingVersions.shift();
     if (!syncModule.dist.tarball) {
       continue;
     }
@@ -709,13 +701,13 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
       return;
     }
     that.log('  [%s] saving %d descriptions', name, missingDescriptions.length);
-    var res = yield gather(missingDescriptions.map(function (item) {
+    const res = yield gather(missingDescriptions.map(function(item) {
       return packageService.updateModuleDescription(item.id, item.description);
     }));
 
-    for (var i = 0; i < res.length; i++) {
-      var item = missingDescriptions[i];
-      var r = res[i];
+    for (let i = 0; i < res.length; i++) {
+      const item = missingDescriptions[i];
+      const r = res[i];
       if (r.error) {
         that.log('    save error, id: %s, description: %s, error: %s',
           item.id, item.description, r.error.message);
@@ -729,7 +721,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);
     }
@@ -739,13 +731,13 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
     }
     that.log('  [%s] adding %d tags', name, missingTags.length);
     // sync tags
-    var res = yield gather(missingTags.map(function (item) {
+    const res = yield gather(missingTags.map(function(item) {
       return packageService.addModuleTag(name, item[0], item[1]);
     }));
 
-    for (var i = 0; i < res.length; i++) {
-      var item = missingTags[i];
-      var r = res[i];
+    for (let i = 0; i < res.length; i++) {
+      const item = missingTags[i];
+      const r = res[i];
       if (r.error) {
         that.log('    add tag %s:%s error, error: %s',
           item.id, item.description, r.error.message);
@@ -763,13 +755,13 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
     }
     that.log('  [%s] saving %d readmes', name, missingReadmes.length);
 
-    var res = yield gather(missingReadmes.map(function (item) {
+    const res = yield gather(missingReadmes.map(function(item) {
       return packageService.updateModuleReadme(item.id, item.readme);
     }));
 
-    for (var i = 0; i < res.length; i++) {
-      var item = missingReadmes[i];
-      var r = res[i];
+    for (let i = 0; i < res.length; i++) {
+      const item = missingReadmes[i];
+      const r = res[i];
       if (r.error) {
         that.log('    save error, id: %s, error: %s', item.id, r.error.message);
       } else {
@@ -778,21 +770,21 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
     }
   }
 
-  function *syncDeprecateds() {
+  function* syncDeprecateds() {
     if (missingDeprecateds.length === 0) {
       return;
     }
     that.log('  [%s] saving %d Deprecated fields', name, missingDeprecateds.length);
 
-    var res = yield gather(missingDeprecateds.map(function (item) {
+    const res = yield gather(missingDeprecateds.map(function(item) {
       return packageService.updateModulePackageFields(item.id, {
-        deprecated: item.deprecated
+        deprecated: item.deprecated,
       });
     }));
 
-    for (var i = 0; i < res.length; i++) {
-      var item = missingDeprecateds[i];
-      var r = res[i];
+    for (let i = 0; i < res.length; i++) {
+      const item = missingDeprecateds[i];
+      const r = res[i];
       if (r.error) {
         that.log('    save error, id: %s, error: %s', item.id, r.error.message);
       } else {
@@ -802,18 +794,18 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
   }
 
   function* syncMissingUsers() {
-    var missingUsers = [];
-    var names = Object.keys(npmUsernames);
+    const missingUsers = [];
+    const names = Object.keys(npmUsernames);
     if (names.length === 0) {
       return;
     }
-    var rows = yield* User.listByNames(names);
-    var map = {};
-    rows.forEach(function (r) {
+    const rows = yield User.listByNames(names);
+    const map = {};
+    rows.forEach(function(r) {
       map[r.name] = r;
     });
-    names.forEach(function (username) {
-      var r = map[username];
+    names.forEach(function(username) {
+      const r = map[username];
       if (!r || !r.json) {
         if (username[0] !== '"' && username[0] !== "'") {
           missingUsers.push(username);
@@ -828,12 +820,12 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
 
     that.log('  [%s] saving %d/%d missing npm users: %j',
       name, missingUsers.length, names.length, missingUsers);
-    var res = yield gather(missingUsers.map(function (username) {
+    const res = yield gather(missingUsers.map(function(username) {
       return _saveNpmUser(username);
     }));
 
-    for (var i = 0; i < res.length; i++) {
-      var r = res[i];
+    for (let i = 0; i < res.length; i++) {
+      const r = res[i];
       if (r.error) {
         that.log('    save npm user error, %s', r.error.message);
       }
@@ -847,12 +839,12 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
     }
 
     that.log('  [%s] saving %d star users', name, missingStarUsers.length);
-    var res = yield gather(missingStarUsers.map(function (username) {
+    const res = yield gather(missingStarUsers.map(function(username) {
       return packageService.addStar(name, username);
     }));
 
-    for (var i = 0; i < res.length; i++) {
-      var r = res[i];
+    for (let i = 0; i < res.length; i++) {
+      const r = res[i];
       if (r.error) {
         that.log('    add star user error, %s', r.error.stack);
       }
@@ -867,12 +859,12 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
 
     that.log('  [%s] syncing %d diff package maintainers: %j',
       name, diffNpmMaintainers.length, diffNpmMaintainers);
-    var res = yield gather(diffNpmMaintainers.map(function (item) {
+    const res = yield gather(diffNpmMaintainers.map(function(item) {
       return _saveMaintainer(name, item[0], item[1]);
     }));
 
-    for (var i = 0; i < res.length; i++) {
-      var r = res[i];
+    for (let i = 0; i < res.length; i++) {
+      const r = res[i];
       if (r.error) {
         that.log('    save package maintainer error, %s', r.error.stack);
       }
@@ -891,30 +883,30 @@ SyncModuleWorker.prototype._sync = function* (name, pkg) {
   return syncedVersionNames;
 };
 
-SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePackage) {
-  var delay = Date.now() - sourcePackage.publish_time;
+SyncModuleWorker.prototype._syncOneVersion = function* (versionIndex, sourcePackage) {
+  const 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;
-  var filename = path.basename(downurl);
-  var filepath = common.getTarballFilepath(filename);
-  var ws = fs.createWriteStream(filepath);
+  const that = this;
+  const username = this.username;
+  const downurl = sourcePackage.dist.tarball;
+  const filename = path.basename(downurl);
+  const filepath = common.getTarballFilepath(filename);
+  const ws = fs.createWriteStream(filepath);
 
-  var options = {
+  let options = {
     writeStream: ws,
     followRedirect: true,
     timeout: 600000, // 10 minutes download
     headers: {
-      'user-agent': USER_AGENT
+      'user-agent': USER_AGENT,
     },
     gzip: true,
   };
 
-  var dependencies = Object.keys(sourcePackage.dependencies || {});
-  var devDependencies = [];
+  let dependencies = Object.keys(sourcePackage.dependencies || {});
+  let devDependencies = [];
   if (this.syncDevDependencies) {
     devDependencies = Object.keys(sourcePackage.devDependencies || {});
   }
@@ -937,25 +929,25 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
   }
 
   if (!that.noDep) {
-    for (var i = 0; i < dependencies.length; i++) {
-      that.add(dependencies[i]);
+    for (const dep of dependencies) {
+      that.add(dep);
     }
 
-    for (var i = 0; i < devDependencies.length; i++) {
-      that.add(devDependencies[i]);
+    for (const dep of devDependencies) {
+      that.add(dep);
     }
   }
 
   // add module dependence
   yield packageService.addDependencies(sourcePackage.name, dependencies);
 
-  var shasum = crypto.createHash('sha1');
-  var dataSize = 0;
+  let shasum = crypto.createHash('sha1');
+  let dataSize = 0;
 
   try {
     // get tarball
     logger.syncInfo('[sync_module_worker] downloading %j to %j', downurl, filepath);
-    var r;
+    let r;
     try {
       r = yield urllib.request(downurl, options);
     } catch (err) {
@@ -963,7 +955,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
       throw err;
     }
 
-    var statusCode = r.status || -1;
+    const statusCode = r.status || -1;
     // https://github.com/cnpm/cnpmjs.org/issues/325
     // if (statusCode === 404) {
     //   shasum = sourcePackage.dist.shasum;
@@ -973,7 +965,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
     // }
 
     if (statusCode !== 200) {
-      var err = new Error('Download ' + downurl + ' fail, status: ' + statusCode);
+      const err = new Error('Download ' + downurl + ' fail, status: ' + statusCode);
       err.name = 'DownloadTarballError';
       err.data = sourcePackage;
       logger.syncInfo('[sync_module_worker] %s', err.message);
@@ -981,16 +973,16 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
     }
 
     // read and check
-    var rs = fs.createReadStream(filepath);
-    rs.on('data', function (data) {
+    const rs = fs.createReadStream(filepath);
+    rs.on('data', function(data) {
       shasum.update(data);
       dataSize += data.length;
     });
-    var end = thunkify.event(rs);
+    const end = thunkify.event(rs);
     yield end(); // after end event emit
 
     if (dataSize === 0) {
-      var err = new Error('Download ' + downurl + ' file size is zero');
+      const err = new Error('Download ' + downurl + ' file size is zero');
       err.name = 'DownloadTarballSizeZeroError';
       err.data = sourcePackage;
       logger.syncInfo('[sync_module_worker] %s', err.message);
@@ -1000,7 +992,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
     // check shasum
     shasum = shasum.digest('hex');
     if (shasum !== sourcePackage.dist.shasum) {
-      var err = new Error('Download ' + downurl + ' shasum:' + shasum +
+      const err = new Error('Download ' + downurl + ' shasum:' + shasum +
         ' not match ' + sourcePackage.dist.shasum);
       err.name = 'DownloadTarballShasumError';
       err.data = sourcePackage;
@@ -1011,11 +1003,11 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
     options = {
       key: common.getCDNKey(sourcePackage.name, filename),
       size: dataSize,
-      shasum: shasum
+      shasum,
     };
     // upload to NFS
     logger.syncInfo('[sync_module_worker] uploading %j to nfs', options);
-    var result;
+    let result;
     try {
       result = yield nfs.upload(filepath, options);
     } catch (err) {
@@ -1023,28 +1015,28 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
       throw err;
     }
     logger.syncInfo('[sync_module_worker] uploaded, saving %j to database', result);
-    var r = yield afterUpload(result);
+    const uploadResult = yield afterUpload(result);
     logger.syncInfo('[sync_module_worker] sync %s@%s done!',
       sourcePackage.name, sourcePackage.version);
-    return r;
+    return uploadResult;
   } finally {
     // remove tmp file whatever
     fs.unlink(filepath, utility.noop);
   }
 
-  function *afterUpload(result) {
-    //make sure sync module have the correct author info
-    //only if can not get maintainers, use the username
-    var author = username;
+  function* afterUpload(result) {
+    // make sure sync module have the correct author info
+    // only if can not get maintainers, use the username
+    let author = username;
     if (Array.isArray(sourcePackage.maintainers)) {
       author = sourcePackage.maintainers[0].name || username;
     }
 
-    var mod = {
+    const mod = {
       version: sourcePackage.version,
       name: sourcePackage.name,
       package: sourcePackage,
-      author: author,
+      author,
       publish_time: sourcePackage.publish_time,
     };
 
@@ -1055,8 +1047,8 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
       mod.package._publish_on_cnpm = true;
     }
 
-    var dist = {
-      shasum: shasum,
+    const dist = {
+      shasum,
       size: dataSize,
       noattachment: dataSize === 0,
     };
@@ -1069,7 +1061,7 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
     }
 
     mod.package.dist = dist;
-    var r = yield packageService.saveModule(mod);
+    const 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',
@@ -1085,12 +1077,12 @@ SyncModuleWorker.prototype._syncOneVersion = function *(versionIndex, sourcePack
 
 SyncModuleWorker.sync = function* (name, username, options) {
   options = options || {};
-  var result = yield logService.create({name: name, username: username});
-  var worker = new SyncModuleWorker({
+  const result = yield logService.create({ name, username });
+  const worker = new SyncModuleWorker({
     logId: result.id,
     type: options.type,
-    name: name,
-    username: username,
+    name,
+    username,
     noDep: options.noDep,
     publish: options.publish,
     syncUpstreamFirst: options.syncUpstreamFirst,

controllers/total.js

@@ -15,7 +15,7 @@ module.exports = function* showTotal() {
     return;
   }
 
-  const r = yield [Total.get(), getDownloadTotal()];
+  const r = yield [ Total.get(), getDownloadTotal() ];
   const total = r[0];
   const download = r[1];
 

controllers/utils.js

@@ -14,25 +14,25 @@
  * Module dependencies.
  */
 
-var debug = require('debug')('cnpmjs.org:controllers:utils');
-var path = require('path');
-var fs = require('fs');
-var utility = require('utility');
-var ms = require('humanize-ms');
-var moment = require('moment');
-var downloadTotalService = require('../services/download_total');
-var nfs = require('../common/nfs');
-var config = require('../config');
+const debug = require('debug')('cnpmjs.org:controllers:utils');
+const path = require('path');
+const fs = require('fs');
+const utility = require('utility');
+const ms = require('humanize-ms');
+const moment = require('moment');
+const downloadTotalService = require('../services/download_total');
+const nfs = require('../common/nfs');
+const config = require('../config');
 
-var DOWNLOAD_TIMEOUT = ms('10m');
+const DOWNLOAD_TIMEOUT = ms('10m');
 
 exports.downloadAsReadStream = function* (key) {
-  var options = { timeout: DOWNLOAD_TIMEOUT };
+  const options = { timeout: DOWNLOAD_TIMEOUT };
   if (nfs.createDownloadStream) {
     return yield nfs.createDownloadStream(key, options);
   }
 
-  var tmpPath = path.join(config.uploadDir,
+  const tmpPath = path.join(config.uploadDir,
     utility.randomString() + key.replace(/\//g, '-'));
   function cleanup() {
     debug('cleanup %s', tmpPath);
@@ -46,32 +46,32 @@ exports.downloadAsReadStream = function* (key) {
     cleanup();
     throw err;
   }
-  var tarball = fs.createReadStream(tmpPath);
+  const tarball = fs.createReadStream(tmpPath);
   tarball.once('error', cleanup);
   tarball.once('end', cleanup);
   return tarball;
 };
 
 exports.getDownloadTotal = function* (name) {
-  var end = moment();
-  var start = end.clone().subtract(1, 'months').startOf('month');
-  var lastday = end.clone().subtract(1, 'days').format('YYYY-MM-DD');
-  var lastweekStart = end.clone().subtract(1, 'weeks').startOf('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('isoweek').format('YYYY-MM-DD');
+  let end = moment();
+  let start = end.clone().subtract(1, 'months').startOf('month');
+  const lastday = end.clone().subtract(1, 'days').format('YYYY-MM-DD');
+  let lastweekStart = end.clone().subtract(1, 'weeks').startOf('isoweek');
+  const lastweekEnd = lastweekStart.clone().endOf('isoweek').format('YYYY-MM-DD');
+  const lastmonthEnd = start.clone().endOf('month').format('YYYY-MM-DD');
+  const thismonthStart = end.clone().startOf('month').format('YYYY-MM-DD');
+  const thisweekStart = end.clone().startOf('isoweek').format('YYYY-MM-DD');
   start = start.format('YYYY-MM-DD');
   end = end.format('YYYY-MM-DD');
   lastweekStart = lastweekStart.format('YYYY-MM-DD');
-  var method = name ? 'getModuleTotal' : 'getTotal';
-  var args = [start, end];
+  const method = name ? 'getModuleTotal' : 'getTotal';
+  const args = [ start, end ];
   if (name) {
     args.unshift(name);
   }
 
-  var rows = yield* downloadTotalService[method].apply(downloadTotalService, args);
-  var download = {
+  const rows = yield downloadTotalService[method].apply(downloadTotalService, args);
+  const download = {
     today: 0,
     thisweek: 0,
     thismonth: 0,
@@ -80,8 +80,8 @@ exports.getDownloadTotal = function* (name) {
     lastmonth: 0,
   };
 
-  for (var i = 0; i < rows.length; i++) {
-    var r = rows[i];
+  for (let i = 0; i < rows.length; i++) {
+    const r = rows[i];
     if (r.date === end) {
       download.today += r.count;
     }
@@ -105,11 +105,11 @@ exports.getDownloadTotal = function* (name) {
   return download;
 };
 
-exports.setLicense = function (pkg) {
-  var license;
+exports.setLicense = function(pkg) {
+  let license;
   license = pkg.license || pkg.licenses || pkg.licence || pkg.licences;
   if (!license) {
-    return ;
+    return;
   }
 
   if (Array.isArray(license)) {
@@ -119,7 +119,7 @@ exports.setLicense = function (pkg) {
   if (typeof license === 'object') {
     pkg.license = {
       name: license.name || license.type,
-      url: license.url
+      url: license.url,
     };
   }
 
@@ -127,38 +127,38 @@ exports.setLicense = function (pkg) {
     if (license.match(/(http|https)(:\/\/)/ig)) {
       pkg.license = {
         name: license,
-        url: license
+        url: license,
       };
     } else {
       pkg.license = {
         url: exports.getOssLicenseUrlFromName(license),
-        name: license
+        name: license,
       };
     }
   }
 };
 
-exports.getOssLicenseUrlFromName = function (name) {
-  var base = 'http://opensource.org/licenses/';
+exports.getOssLicenseUrlFromName = function(name) {
+  const base = 'http://opensource.org/licenses/';
 
-  var licenseMap = {
-    'bsd': 'BSD-2-Clause',
-    'mit': 'MIT',
-    'x11': 'MIT',
+  const licenseMap = {
+    bsd: 'BSD-2-Clause',
+    mit: 'MIT',
+    x11: 'MIT',
     'mit/x11': 'MIT',
     'apache 2.0': 'Apache-2.0',
-    'apache2': 'Apache-2.0',
+    apache2: 'Apache-2.0',
     'apache 2': 'Apache-2.0',
     'apache-2': 'Apache-2.0',
-    'apache': 'Apache-2.0',
-    'gpl': 'GPL-3.0',
-    'gplv3': 'GPL-3.0',
-    'gplv2': 'GPL-2.0',
-    'gpl3': 'GPL-3.0',
-    'gpl2': 'GPL-2.0',
-    'lgpl': 'LGPL-2.1',
+    apache: 'Apache-2.0',
+    gpl: 'GPL-3.0',
+    gplv3: 'GPL-3.0',
+    gplv2: 'GPL-2.0',
+    gpl3: 'GPL-3.0',
+    gpl2: 'GPL-2.0',
+    lgpl: 'LGPL-2.1',
     'lgplv2.1': 'LGPL-2.1',
-    'lgplv2': 'LGPL-2.1'
+    lgplv2: 'LGPL-2.1',
   };
 
   return licenseMap[name.toLowerCase()] ?

controllers/web/badge.js

@@ -14,18 +14,18 @@
  * Module dependencies.
  */
 
-var utility = require('utility');
-var util = require('util');
-var config = require('../../config');
-var packageService = require('../../services/package');
-var DownloadTotal = require('../../services/download_total');
+const utility = require('utility');
+const util = require('util');
+const config = require('../../config');
+const packageService = require('../../services/package');
+const DownloadTotal = require('../../services/download_total');
 
 exports.version = function* () {
-  var color = 'lightgrey';
-  var version = 'invalid';
-  var name = this.params[0];
-  var tag = this.query.tag || 'latest';
-  var info = yield* packageService.getModuleByTag(name, tag);
+  let color = 'lightgrey';
+  let version = 'invalid';
+  const name = this.params[0];
+  const tag = this.query.tag || 'latest';
+  const info = yield packageService.getModuleByTag(name, tag);
   if (info) {
     version = info.version;
     if (/^0\.0\./.test(version)) {
@@ -40,23 +40,23 @@ exports.version = function* () {
     }
   }
 
-  var subject = config.badgeSubject.replace(/\-/g, '--');
+  let subject = config.badgeSubject.replace(/\-/g, '--');
   if (this.query.subject) {
     subject = this.query.subject.replace(/\-/g, '--');
   }
   version = version.replace(/\-/g, '--');
-  var style = this.query.style || 'flat-square';
-  var url = util.format(config.badgePrefixURL + '/%s-%s-%s.svg?style=%s',
+  const style = this.query.style || 'flat-square';
+  const url = util.format(config.badgePrefixURL + '/%s-%s-%s.svg?style=%s',
     utility.encodeURIComponent(subject), version, color, utility.encodeURIComponent(style));
   this.redirect(url);
 };
 
 exports.downloads = function* () {
   // https://dn-img-shields-io.qbox.me/badge/downloads-100k/month-brightgreen.svg?style=flat-square
-  var name = this.params[0];
-  var count = yield DownloadTotal.getTotalByName(name);
-  var style = this.query.style || 'flat-square';
-  var url = util.format(config.badgePrefixURL + '/downloads-%s-brightgreen.svg?style=%s',
+  const name = this.params[0];
+  const count = yield DownloadTotal.getTotalByName(name);
+  const style = this.query.style || 'flat-square';
+  const url = util.format(config.badgePrefixURL + '/downloads-%s-brightgreen.svg?style=%s',
     count, utility.encodeURIComponent(style));
   this.redirect(url);
 };

controllers/web/package/list_privates.js

@@ -15,13 +15,13 @@
  * Module dependencies.
  */
 
-var packageService = require('../../../services/package');
-var config = require('../../../config');
+const packageService = require('../../../services/package');
+const config = require('../../../config');
 
 module.exports = function* listPrivates() {
-  var tasks = {};
-  for (var i = 0; i < config.scopes.length; i++) {
-    var scope = config.scopes[i];
+  const tasks = {};
+  for (let i = 0; i < config.scopes.length; i++) {
+    const scope = config.scopes[i];
     tasks[scope] = packageService.listPrivateModulesByScope(scope);
   }
 
@@ -29,9 +29,9 @@ module.exports = function* listPrivates() {
     tasks['no scoped'] = packageService.listModules(config.privatePackages);
   }
 
-  var scopes = yield tasks;
+  const scopes = yield tasks;
   yield this.render('private', {
     title: 'private packages',
-    scopes: scopes
+    scopes,
   });
 };

controllers/web/package/search.js

@@ -15,26 +15,26 @@
  * Module dependencies.
  */
 
-var debug = require('debug')('cnpmjs.org:controllers:web:package:search');
-var packageService = require('../../../services/package');
+const debug = require('debug')('cnpmjs.org:controllers:web:package:search');
+const packageService = require('../../../services/package');
 
 module.exports = function* search() {
-  var params = this.params;
-  var word = params.word || params[0];
-  var limit = Number(this.query.limit) || 100;
+  const params = this.params;
+  const word = params.word || params[0];
+  let limit = Number(this.query.limit) || 100;
 
   if (limit > 10000) {
     limit = 10000;
   }
 
   debug('search %j', word);
-  var result = yield* packageService.search(word, {
-    limit: limit
+  const result = yield packageService.search(word, {
+    limit,
   });
 
-  var match = null;
-  for (var i = 0; i < result.searchMatchs.length; i++) {
-    var p = result.searchMatchs[i];
+  let match = null;
+  for (let i = 0; i < result.searchMatchs.length; i++) {
+    const p = result.searchMatchs[i];
     if (p.name === word) {
       match = p;
       break;
@@ -45,7 +45,7 @@ module.exports = function* search() {
   if (this.query && this.query.type === 'json') {
     this.jsonp = {
       keyword: word,
-      match: match,
+      match,
       packages: result.searchMatchs,
       keywords: result.keywordMatchs,
     };
@@ -54,7 +54,7 @@ module.exports = function* search() {
   yield this.render('search', {
     title: 'Keyword - ' + word,
     keyword: word,
-    match: match,
+    match,
     packages: result.searchMatchs,
     keywords: result.keywordMatchs,
   });

controllers/web/package/search_range.js

@@ -15,35 +15,35 @@
  * Module dependencies.
  */
 
-var packageService = require('../../../services/package');
+const packageService = require('../../../services/package');
 
 module.exports = function* searchRange() {
-  var startKey = this.query.startkey || '';
+  let startKey = this.query.startkey || '';
   if (startKey[0] === '"') {
     startKey = startKey.substring(1);
   }
   if (startKey[startKey.length - 1] === '"') {
     startKey = startKey.substring(0, startKey.length - 1);
   }
-  var limit = Number(this.query.limit) || 20;
-  var result = yield* packageService.search(startKey, {limit: limit});
+  const limit = Number(this.query.limit) || 20;
+  const result = yield packageService.search(startKey, { limit });
 
-  var packages = result.searchMatchs.concat(result.keywordMatchs);
+  const packages = result.searchMatchs.concat(result.keywordMatchs);
 
-  var rows = [];
-  for (var i = 0; i < packages.length; i++) {
-    var p = packages[i];
-    var row = {
+  const rows = [];
+  for (let i = 0; i < packages.length; i++) {
+    const p = packages[i];
+    const row = {
       key: p.name,
       count: 1,
       value: {
         name: p.name,
         description: p.description,
-      }
+      },
     };
     rows.push(row);
   }
   this.body = {
-    rows: rows
+    rows,
   };
 };

controllers/web/package/show.js

@@ -1,77 +1,77 @@
 'use strict';
 
-var debug = require('debug')('cnpmjs.org:controllers:web:package:show');
-var bytes = require('bytes');
-var giturl = require('giturl');
-var moment = require('moment');
-var semver = require('semver');
-var gravatar = require('gravatar');
-var humanize = require('humanize-number');
-var config = require('../../../config');
-var utils = require('../../utils');
-var setDownloadURL = require('../../../lib/common').setDownloadURL;
-var renderMarkdown = require('../../../common/markdown').render;
-var packageService = require('../../../services/package');
+const debug = require('debug')('cnpmjs.org:controllers:web:package:show');
+const bytes = require('bytes');
+const giturl = require('giturl');
+const moment = require('moment');
+const semver = require('semver');
+const gravatar = require('gravatar');
+const humanize = require('humanize-number');
+const config = require('../../../config');
+const utils = require('../../utils');
+const setDownloadURL = require('../../../lib/common').setDownloadURL;
+const renderMarkdown = require('../../../common/markdown').render;
+const packageService = require('../../../services/package');
 
 module.exports = function* show(next) {
-  var params = this.params;
+  const params = this.params;
   // normal: {name: $name, version: $version}
   // scope: [$name, $version]
-  var orginalName = params.name || params[0];
-  var name = orginalName;
-  var tag = params.version || params[1];
+  const orginalName = params.name || params[0];
+  const name = orginalName;
+  const tag = params.version || params[1];
   debug('display %s with %j', name, params);
 
-  var getPackageMethod;
-  var getPackageArgs;
-  var version = semver.valid(tag || '');
+  let getPackageMethod;
+  let getPackageArgs;
+  const version = semver.valid(tag || '');
   if (version) {
     getPackageMethod = 'getModule';
-    getPackageArgs = [name, version];
+    getPackageArgs = [ name, version ];
   } else {
     getPackageMethod = 'getModuleByTag';
-    getPackageArgs = [name, tag || 'latest'];
+    getPackageArgs = [ name, tag || 'latest' ];
   }
 
-  var pkg = yield packageService[getPackageMethod].apply(packageService, getPackageArgs);
+  let pkg = yield packageService[getPackageMethod].apply(packageService, getPackageArgs);
   if (!pkg || !pkg.package) {
     // check if unpublished
-    var unpublishedInfo = yield* packageService.getUnpublishedModule(name);
+    const unpublishedInfo = yield packageService.getUnpublishedModule(name);
     debug('show unpublished %j', unpublishedInfo);
     if (unpublishedInfo) {
-      var data = {
-        name: name,
-        unpublished: unpublishedInfo.package
+      const data = {
+        name,
+        unpublished: unpublishedInfo.package,
       };
       data.unpublished.time = new Date(data.unpublished.time);
       if (data.unpublished.maintainers) {
-        for (var i = 0; i < data.unpublished.maintainers.length; i++) {
-          var maintainer = data.unpublished.maintainers[i];
+        for (let i = 0; i < data.unpublished.maintainers.length; i++) {
+          const maintainer = data.unpublished.maintainers[i];
           if (maintainer.email) {
-            maintainer.gravatar = gravatar.url(maintainer.email, {s: '50', d: 'retro'}, true);
+            maintainer.gravatar = gravatar.url(maintainer.email, { s: '50', d: 'retro' }, true);
           }
         }
       }
       yield this.render('package_unpublished', {
         package: data,
-        title: 'Package - ' + name
+        title: 'Package - ' + name,
       });
       return;
     }
 
-    return yield* next;
+    return yield next;
   }
 
-  var r = yield [
+  const r = yield [
     utils.getDownloadTotal(name),
     packageService.listDependents(name),
     packageService.listStarUserNames(name),
-    packageService.listMaintainers(name)
+    packageService.listMaintainers(name),
   ];
-  var download = r[0];
-  var dependents = r[1];
-  var users = r[2];
-  var maintainers = r[3];
+  const download = r[0];
+  const dependents = r[1];
+  const users = r[2];
+  const maintainers = r[3];
 
   pkg.package.fromNow = moment(pkg.publish_time).fromNow();
   pkg = pkg.package;
@@ -91,10 +91,10 @@ module.exports = function* show(next) {
   }
 
   if (pkg.maintainers) {
-    for (var i = 0; i < pkg.maintainers.length; i++) {
-      var maintainer = pkg.maintainers[i];
+    for (let i = 0; i < pkg.maintainers.length; i++) {
+      const maintainer = pkg.maintainers[i];
       if (maintainer.email) {
-        maintainer.gravatar = gravatar.url(maintainer.email, {s: '50', d: 'retro'}, true);
+        maintainer.gravatar = gravatar.url(maintainer.email, { s: '50', d: 'retro' }, true);
       }
     }
   }
@@ -102,7 +102,7 @@ module.exports = function* show(next) {
   if (pkg._npmUser) {
     pkg.lastPublishedUser = pkg._npmUser;
     if (pkg.lastPublishedUser.email) {
-      pkg.lastPublishedUser.gravatar = gravatar.url(pkg.lastPublishedUser.email, {s: '50', d: 'retro'}, true);
+      pkg.lastPublishedUser.gravatar = gravatar.url(pkg.lastPublishedUser.email, { s: '50', d: 'retro' }, true);
     }
   }
 
@@ -118,7 +118,7 @@ module.exports = function* show(next) {
 
   utils.setLicense(pkg);
 
-  for (var k in download) {
+  for (const k in download) {
     download[k] = humanize(download[k]);
   }
   setDownloadURL(pkg, this, config.registryHost);
@@ -143,12 +143,12 @@ module.exports = function* show(next) {
   //   "node3": ">= 0.6.9",
   // };
   if (pkg.engines) {
-    for (var k in pkg.engines) {
-      var engine = String(pkg.engines[k] || '').trim();
-      var color = 'blue';
+    for (const k in pkg.engines) {
+      const engine = String(pkg.engines[k] || '').trim();
+      let color = 'blue';
       if (k.indexOf('node') === 0) {
         color = 'yellowgreen';
-        var version = /(\d+\.\d+\.\d+)/.exec(engine);
+        let version = /(\d+\.\d+\.\d+)/.exec(engine);
         if (version) {
           version = version[0];
           if (/^0\.11\.\d+/.test(version)) {
@@ -184,6 +184,6 @@ module.exports = function* show(next) {
   yield this.render('package', {
     title: 'Package - ' + pkg.name,
     package: pkg,
-    download: download
+    download,
   });
 };

controllers/web/show_sync.js

@@ -16,19 +16,19 @@
  */
 
 module.exports = function* showSync() {
-  var name = this.params.name || this.params[0] || this.query.name;
+  let name = this.params.name || this.params[0] || this.query.name;
   if (!name) {
     return this.redirect('/');
   }
-  var type = 'package';
+  let type = 'package';
   if (name.indexOf(':') > 0) {
-    var splits = name.split(':');
+    const splits = name.split(':');
     name = splits[1];
     type = splits[0];
   }
   yield this.render('sync', {
-    type: type,
-    name: name,
+    type,
+    name,
     title: 'Sync ' + type + ' - ' + name,
   });
 };

controllers/web/user/show.js

@@ -1,41 +1,25 @@
-/**!
- * cnpmjs.org - controllers/web/user/show.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var config = require('../../../config');
-var packageService = require('../../../services/package');
-var userService = require('../../../services/user');
-var common = require('../../../lib/common');
+const config = require('../../../config');
+const packageService = require('../../../services/package');
+const userService = require('../../../services/user');
+const common = require('../../../lib/common');
 
 module.exports = function* showUser(next) {
-  var name = this.params.name;
-  var isAdmin = common.isAdmin(name);
-  var scopes = config.scopes || [];
-  var user;
-  var r = yield [packageService.listModulesByUser(name), userService.getAndSave(name)];
-  var packages = r[0];
-  var user = r[1];
+  const name = this.params.name;
+  const isAdmin = common.isAdmin(name);
+  const scopes = config.scopes || [];
+  const r = yield [ packageService.listModulesByUser(name), userService.getAndSave(name) ];
+  const packages = r[0];
+  let user = r[1];
   if (!user && !packages.length) {
-    return yield* next;
+    return yield next;
   }
 
   user = user || {};
 
-  var data = {
-    name: name,
+  const data = {
+    name,
     email: user.email,
     json: user.json || {},
     isNpmUser: user.isNpmUser,
@@ -44,7 +28,7 @@ module.exports = function* showUser(next) {
   if (data.json.login) {
     // custom user format
     // convert to npm user format
-    var json = data.json;
+    const json = data.json;
     data.json = {
       _id: 'org.couchdb.user:' + user.name,
       _rev: user.rev,
@@ -56,16 +40,16 @@ module.exports = function* showUser(next) {
       avatar: json.avatar_url,
       fullname: json.name || json.login,
       homepage: json.html_url,
-      im: json.im_url
+      im: json.im_url,
     };
   }
 
   yield this.render('profile', {
     title: 'User - ' + name,
-    packages: packages,
+    packages,
     user: data,
     lastModified: user.gmt_modified,
-    isAdmin: isAdmin,
-    scopes: scopes
+    isAdmin,
+    scopes,
   });
 };

dispatch.js

@@ -1,12 +1,12 @@
 'use strict';
 
-var childProcess = require('child_process');
-var path = require('path');
-var util = require('util');
-var cfork = require('cfork');
-var config = require('./config');
-var workerPath = path.join(__dirname, 'worker.js');
-var syncPath = path.join(__dirname, 'sync');
+const childProcess = require('child_process');
+const path = require('path');
+const util = require('util');
+const cfork = require('cfork');
+const config = require('./config');
+const workerPath = path.join(__dirname, 'worker.js');
+const syncPath = path.join(__dirname, 'sync');
 
 console.log('Starting cnpmjs.org ...\ncluster: %s\nadmins: %j\nscopes: %j\nsourceNpmRegistry: %s\nsyncModel: %s',
   config.enableCluster, config.admins, config.scopes, config.sourceNpmRegistry, config.syncModel);
@@ -27,14 +27,17 @@ function forkWorker() {
   cfork({
     exec: workerPath,
     count: config.numCPUs,
-  }).on('fork', function (worker) {
+  })
+  .on('fork', worker => {
     console.log('[%s] [worker:%d] new worker start', Date(), worker.process.pid);
-  }).on('disconnect', function (worker) {
+  })
+  .on('disconnect', worker => {
     console.error('[%s] [master:%s] wroker:%s disconnect, suicide: %s, state: %s.',
       Date(), process.pid, worker.process.pid, worker.suicide, worker.state);
-  }).on('exit', function (worker, code, signal) {
-    var exitCode = worker.process.exitCode;
-    var err = new Error(util.format('worker %s died (code: %s, signal: %s, suicide: %s, state: %s)',
+  })
+  .on('exit', (worker, code, signal) => {
+    const exitCode = worker.process.exitCode;
+    const err = new Error(util.format('worker %s died (code: %s, signal: %s, suicide: %s, state: %s)',
       worker.process.pid, exitCode, signal, worker.suicide, worker.state));
     err.name = 'WorkerDiedError';
     console.error('[%s] [master:%s] wroker exit: %s', Date(), process.pid, err.stack);
@@ -42,9 +45,9 @@ function forkWorker() {
 }
 
 function forkSyncer() {
-  var syncer = childProcess.fork(syncPath);
-  syncer.on('exit', function (code, signal) {
-    var err = new Error(util.format('syncer %s died (code: %s, signal: %s, stdout: %s, stderr: %s)',
+  const syncer = childProcess.fork(syncPath);
+  syncer.on('exit', (code, signal) => {
+    const err = new Error(util.format('syncer %s died (code: %s, signal: %s, stdout: %s, stderr: %s)',
       syncer.pid, code, signal, syncer.stdout, syncer.stderr));
     err.name = 'SyncerWorkerDiedError';
     console.error('[%s] [master:%s] syncer exit: %s: %s',

index.js

@@ -1,28 +1,16 @@
-/**!
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var config = require('./config');
+const config = require('./config');
 
 exports.loadConfig = config.loadConfig;
 exports.config = config;
 
-exports.startWorker = function (customConfig) {
+exports.startWorker = function(customConfig) {
   config.loadConfig(customConfig);
   require('./worker');
 };
 
-exports.startSync = function (customConfig) {
+exports.startSync = function(customConfig) {
   config.loadConfig(customConfig);
   require('./sync');
 };

lib/common.js

@@ -1,32 +1,18 @@
-/**!
- * cnpmjs.org - lib/common.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const crypto = require('crypto');
+const path = require('path');
+const config = require('../config');
+const util = require('util');
 
-var crypto = require('crypto');
-var path = require('path');
-var config = require('../config');
-var util = require('util');
-
-exports.getTarballFilepath = function (filename) {
+exports.getTarballFilepath = function(filename) {
   // ensure download file path unique
   // TODO: not only .tgz, and also other extname
-  var name = filename.replace(/\.tgz$/, '.' + crypto.randomBytes(16).toString('hex') + '.tgz');
+  const name = filename.replace(/\.tgz$/, '.' + crypto.randomBytes(16).toString('hex') + '.tgz');
   return path.join(config.uploadDir, name);
 };
 
-exports.getCDNKey = function (name, filename) {
+exports.getCDNKey = function(name, filename) {
   // if name is scope package name, need to auto fix filename as a scope package file name
   // e.g.: @scope/foo, filename: foo-1.0.0.tgz => filename: @scope/foo-1.0.0.tgz
   if (name[0] === '@' && filename[0] !== '@') {
@@ -35,7 +21,7 @@ exports.getCDNKey = function (name, filename) {
   return '/' + name + '/-/' + filename;
 };
 
-exports.setDownloadURL = function (pkg, ctx, host) {
+exports.setDownloadURL = function(pkg, ctx, host) {
   if (pkg.dist) {
     host = host || config.registryHost || ctx.host;
     pkg.dist.tarball = util.format('%s://%s/%s/download/%s-%s.tgz',
@@ -44,27 +30,27 @@ exports.setDownloadURL = function (pkg, ctx, host) {
   }
 };
 
-exports.isAdmin = function (username) {
+exports.isAdmin = function(username) {
   return typeof config.admins[username] === 'string';
 };
 
-exports.isMaintainer = function (user, maintainers) {
+exports.isMaintainer = function(user, maintainers) {
   if (user.isAdmin) {
     return true;
   }
 
-  var username = user.name;
+  const username = user.name;
   maintainers = maintainers || [];
-  var match = maintainers.filter(function (item) {
+  const match = maintainers.filter(function(item) {
     return item.name === username;
   });
 
   return match.length > 0;
 };
 
-exports.isLocalModule = function (mods) {
-  for (var i = 0; i < mods.length; i++) {
-    var r = mods[i];
+exports.isLocalModule = function(mods) {
+  for (let i = 0; i < mods.length; i++) {
+    const r = mods[i];
     if (r.package && r.package._publish_on_cnpm) {
       return true;
     }
@@ -72,7 +58,7 @@ exports.isLocalModule = function (mods) {
   return false;
 };
 
-exports.isPrivateScopedPackage = function (name) {
+exports.isPrivateScopedPackage = function(name) {
   if (name[0] !== '@') {
     return false;
   }

middleware/auth.js

@@ -1,51 +1,37 @@
-/**!
- * cnpmjs.org - middleware/auth.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var debug = require('debug')('cnpmjs.org:middleware:auth');
-var UserService = require('../services/user');
-var config = require('../config');
+const debug = require('debug')('cnpmjs.org:middleware:auth');
+const UserService = require('../services/user');
+const config = require('../config');
 
 /**
  * Parse the request authorization
  * get the real user
  */
 
-module.exports = function () {
+module.exports = function() {
   return function* auth(next) {
     this.user = {};
 
-    var authorization = (this.get('authorization') || '').split(' ')[1] || '';
+    let authorization = (this.get('authorization') || '').split(' ')[1] || '';
     authorization = authorization.trim();
     debug('%s %s with %j', this.method, this.url, authorization);
     if (!authorization) {
-      return yield* unauthorized.call(this, next);
+      return yield unauthorized.call(this, next);
     }
 
     authorization = new Buffer(authorization, 'base64').toString();
-    var pos = authorization.indexOf(':');
+    const pos = authorization.indexOf(':');
     if (pos === -1) {
-       return yield* unauthorized.call(this, next);
+      return yield unauthorized.call(this, next);
     }
 
-    var username = authorization.slice(0, pos);
-    var password = authorization.slice(pos + 1);
+    const username = authorization.slice(0, pos);
+    const password = authorization.slice(pos + 1);
 
-    var row;
+    let row;
     try {
-      row = yield* UserService.auth(username, password);
+      row = yield UserService.auth(username, password);
     } catch (err) {
       // do not response error here
       // many request do not need login
@@ -54,27 +40,27 @@ module.exports = function () {
 
     if (!row) {
       debug('auth fail user: %j, headers: %j', row, this.header);
-      return yield* unauthorized.call(this, next);
+      return yield unauthorized.call(this, next);
     }
 
     this.user.name = row.login;
     this.user.isAdmin = row.site_admin;
     this.user.scopes = row.scopes;
     debug('auth pass user: %j, headers: %j', this.user, this.header);
-    yield* next;
+    yield next;
   };
 };
 
 function* unauthorized(next) {
   if (!config.alwaysAuth || this.method !== 'GET') {
-    return yield* next;
+    return yield next;
   }
   this.status = 401;
   this.set('WWW-Authenticate', 'Basic realm="sample"');
-  if (this.accepts(['html', 'json']) === 'json') {
+  if (this.accepts([ 'html', 'json' ]) === 'json') {
     this.body = {
       error: 'unauthorized',
-      reason: 'login first'
+      reason: 'login first',
     };
   } else {
     this.body = 'login first';

middleware/block.js

@@ -1,28 +1,15 @@
-/**!
- * cnpmjs.org - middleware/block.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-module.exports = function () {
+module.exports = () => {
   return function* block(next) {
-    var ua = String(this.get('user-agent')).toLowerCase();
+    const ua = String(this.get('user-agent')).toLowerCase();
     if (ua === 'ruby') {
       this.status = 403;
-      return this.body = {
-        message: 'forbidden Ruby user-agent, ip: ' + this.ip
+      this.body = {
+        message: 'forbidden Ruby user-agent, ip: ' + this.ip,
       };
+      return;
     }
-    yield* next;
+    yield next;
   };
 };

middleware/editable.js

@@ -1,42 +1,28 @@
-/**!
- * cnpmjs.org - middleware/editable.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var packageService = require('../services/package');
+const packageService = require('../services/package');
 
 // admin or module's maintainer can modified the module
 module.exports = function* editable(next) {
-  var username = this.user && this.user.name;
-  var moduleName = this.params.name || this.params[0];
+  const username = this.user && this.user.name;
+  const moduleName = this.params.name || this.params[0];
   if (username && moduleName) {
     if (this.user.isAdmin) {
-      return yield* next;
+      return yield next;
     }
-    var isMaintainer = yield* packageService.isMaintainer(moduleName, username);
+    const isMaintainer = yield packageService.isMaintainer(moduleName, username);
     if (isMaintainer) {
-      return yield* next;
+      return yield next;
     }
   }
 
   this.status = 403;
-  var message = 'not authorized to modify ' + moduleName;
+  let message = 'not authorized to modify ' + moduleName;
   if (username) {
     message = username + ' ' + message;
   }
   this.body = {
     error: 'forbidden user',
-    reason: message
+    reason: message,
   };
 };

middleware/exists_package.js

@@ -1,28 +1,16 @@
-/**!
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var packageService = require('../services/package');
+const packageService = require('../services/package');
 
 module.exports = function* (next) {
-  var name = this.params.name || this.params[0];
-  var pkg = yield packageService.getLatestModule(name);
+  const name = this.params.name || this.params[0];
+  const pkg = yield packageService.getLatestModule(name);
   if (pkg) {
-    return yield* next;
+    return yield next;
   }
   this.status = 404;
   this.body = {
     error: 'not_found',
-    reason: 'document not found'
+    reason: 'document not found',
   };
 };

middleware/limit.js

@@ -1,27 +1,13 @@
-/**!
- * cnpmjs.org - middleware/limit.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const config = require('../config');
+const limit = require('koa-limit');
 
-var config = require('../config');
-var limit = require('koa-limit');
-
-var limitConfig = config.limit;
+const limitConfig = config.limit;
 
 if (!limitConfig.enable) {
-  module.exports = function *ignoreLimit(next) {
-    yield *next;
+  module.exports = function* ignoreLimit(next) {
+    yield next;
   };
 } else {
   module.exports = limit(limitConfig);

middleware/login.js

@@ -1,31 +1,17 @@
-/*!
- * cnpmjs.org - middleware/login.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const http = require('http');
 
-var http = require('http');
-
-module.exports = function *login(next) {
+module.exports = function* login(next) {
   if (this.user.error) {
-    var status = this.user.error.status;
+    const status = this.user.error.status;
     this.status = http.STATUS_CODES[status]
       ? status
       : 500;
 
     this.body = {
       error: this.user.error.name,
-      reason: this.user.error.message
+      reason: this.user.error.message,
     };
     return;
   }
@@ -34,9 +20,9 @@ module.exports = function *login(next) {
     this.status = 401;
     this.body = {
       error: 'unauthorized',
-      reason: 'Login first'
+      reason: 'Login first',
     };
     return;
   }
-  yield *next;
+  yield next;
 };

middleware/opensearch.js

@@ -1,32 +1,19 @@
-/**!
- * cnpmjs.org - middleware/opensearch.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const template = `<?xml version="1.0" encoding="UTF-8"?>
+ <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+   <ShortName>CNPM</ShortName>
+   <Description>Search packages in CNPM.</Description>
+   <Tags>CNPM</Tags>
+    <Url method="get" type="text/html" template="http://{{host}}/browse/keyword/{searchTerms}"/>
+ </OpenSearchDescription>`;
 
-var template = '<?xml version="1.0" encoding="UTF-8"?>\
- <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">\
-   <ShortName>CNPM</ShortName>\
-   <Description>Search packages in CNPM.</Description>\
-   <Tags>CNPM</Tags>\
-    <Url method="get" type="text/html" template="http://${host}/browse/keyword/{searchTerms}"/>\
- </OpenSearchDescription>';
-
-module.exports = function *opensearch(next) {
+module.exports = function* opensearch(next) {
   if (this.path === '/opensearch.xml') {
     this.type = 'text/xml';
     this.charset = 'utf-8';
-    this.body = template.replace('${host}', this.host);
+    this.body = template.replace('{{host}}', this.host);
+    return;
   }
-  yield *next;
+  yield next;
 };

middleware/proxy_to_npm.js

@@ -1,15 +1,11 @@
 'use strict';
 
-/**
- * Module dependencies.
- */
+const debug = require('debug')('cnpmjs.org:middleware:proxy_to_npm');
+const config = require('../config');
 
-var debug = require('debug')('cnpmjs.org:middleware:proxy_to_npm');
-var config = require('../config');
-
-module.exports = function (options) {
-  var redirectUrl = config.sourceNpmRegistry;
-  var proxyUrls = [
+module.exports = function(options) {
+  let redirectUrl = config.sourceNpmRegistry;
+  let proxyUrls = [
     // /:pkg, dont contains scoped package
     /^\/[\w\-\.]+$/,
     // /-/package/:pkg/dist-tags
@@ -31,9 +27,9 @@ module.exports = function (options) {
       return yield next;
     }
 
-    var pathname = this.path;
-    var match;
-    for (var i = 0; i < proxyUrls.length; i++) {
+    const pathname = this.path;
+    let match;
+    for (let i = 0; i < proxyUrls.length; i++) {
       match = proxyUrls[i].test(pathname);
       if (match) {
         break;
@@ -43,7 +39,7 @@ module.exports = function (options) {
       return yield next;
     }
 
-    var url = redirectUrl + this.url;
+    const url = redirectUrl + this.url;
     debug('proxy to %s', url);
     this.redirect(url);
   };

middleware/publishable.js

@@ -1,24 +1,10 @@
-/**!
- * cnpmjs.org - middleware/publishable.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const util = require('util');
+const config = require('../config');
+const debug = require('debug')('cnpmjs.org:middlewares/publishable');
 
-var util = require('util');
-var config = require('../config');
-var debug = require('debug')('cnpmjs.org:middlewares/publishable');
-
-module.exports = function *publishable(next) {
+module.exports = function* publishable(next) {
   // admins always can publish and unpublish
   if (this.user.isAdmin) {
     return yield next;
@@ -29,7 +15,7 @@ module.exports = function *publishable(next) {
     this.status = 403;
     this.body = {
       error: 'no_perms',
-      reason: 'Private mode enable, only admin can publish this module'
+      reason: 'Private mode enable, only admin can publish this module',
     };
     return;
   }
@@ -37,7 +23,7 @@ module.exports = function *publishable(next) {
   // public mode, normal user have permission to publish `scoped package`
   // and only can publish with scopes in `ctx.user.scopes`, default is `config.scopes`
 
-  var name = this.params.name || this.params[0];
+  const name = this.params.name || this.params[0];
 
   // check if is private package list in config
   if (config.privatePackages && config.privatePackages.indexOf(name) !== -1) {
@@ -66,13 +52,13 @@ function checkScope(name, ctx) {
     return false;
   }
 
-  var scope = name.split('/')[0];
+  const scope = name.split('/')[0];
   if (ctx.user.scopes.indexOf(scope) === -1) {
     debug('assert scope  %s error', name);
     ctx.status = 400;
     ctx.body = {
       error: 'invalid scope',
-      reason: util.format('scope %s not match legal scopes: %s', scope, ctx.user.scopes.join(', '))
+      reason: util.format('scope %s not match legal scopes: %s', scope, ctx.user.scopes.join(', ')),
     };
     return false;
   }
@@ -89,13 +75,13 @@ function assertNoneScope(name, ctx) {
   if (ctx.user.scopes.length === 0) {
     ctx.body = {
       error: 'no_perms',
-      reason: 'can\'t publish non-scoped package, please set `config.scopes`'
+      reason: 'can\'t publish non-scoped package, please set `config.scopes`',
     };
     return;
   }
 
   ctx.body = {
     error: 'no_perms',
-    reason: 'only allow publish with ' + ctx.user.scopes.join(', ') + ' scope(s)'
+    reason: 'only allow publish with ' + ctx.user.scopes.join(', ') + ' scope(s)',
   };
 }

middleware/registry_not_found.js

@@ -15,7 +15,7 @@
  */
 
 module.exports = function* notFound(next) {
-  yield* next;
+  yield next;
 
   if (this.status && this.status !== 404) {
     return;
@@ -27,6 +27,6 @@ module.exports = function* notFound(next) {
   this.status = 404;
   this.body = {
     error: 'not_found',
-    reason: 'document not found'
+    reason: 'document not found',
   };
 };

middleware/static.js

@@ -1,30 +1,16 @@
-/**!
- * cnpmjs.org - middleware/static.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const path = require('path');
+const middlewares = require('koa-middlewares');
+const config = require('../config');
 
-var path = require('path');
-var middlewares = require('koa-middlewares');
-var config = require('../config');
-
-var staticDir = path.join(path.dirname(__dirname), 'public');
+const staticDir = path.join(path.dirname(__dirname), 'public');
 
 module.exports = middlewares.staticCache(staticDir, {
-  buffer: config.debug ? false : true,
+  buffer: !config.debug,
   maxAge: config.debug ? 0 : 60 * 60 * 24 * 7,
   alias: {
-    '/favicon.ico': '/favicon.png'
+    '/favicon.ico': '/favicon.png',
   },
   gzip: config.enableCompress,
 });

middleware/sync_by_install.js

@@ -1,18 +1,6 @@
-/**
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var config = require('../config');
+const config = require('../config');
 
 /**
  * {Boolean} this.allowSync  -  allow sync triggle by cnpm install
@@ -25,7 +13,7 @@ module.exports = function* syncByInstall(next) {
     return yield next;
   }
   // request not by node, consider it request from web, don't sync
-  var ua = this.get('user-agent');
+  const ua = this.get('user-agent');
   if (!ua || ua.indexOf('node') < 0) {
     return yield next;
   }
@@ -35,11 +23,11 @@ module.exports = function* syncByInstall(next) {
     return yield next;
   }
 
-  var name = this.params.name || this.params[0];
+  const name = this.params.name || this.params[0];
 
   // private scoped package don't sync
   if (name && name[0] === '@') {
-    var scope = name.split('/')[0];
+    const scope = name.split('/')[0];
     if (config.scopes.indexOf(scope) >= 0) {
       return yield next;
     }

middleware/unpublishable.js

@@ -1,16 +1,6 @@
-/**!
- * 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) {
+module.exports = function* unpublishable(next) {
   // only admin user can unpublish
   if (!this.user.isAdmin) {
     this.status = 403;

middleware/web_not_found.js

@@ -1,23 +1,9 @@
-/**!
- * cnpmjs.org - middleware/web_not_found.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
- * MIT Licensed
- *
- * Authors:
- *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var debug = require('debug')('cnpmjs.org:middleware:web_not_found');
+const debug = require('debug')('cnpmjs.org:middleware:web_not_found');
 
 module.exports = function* notFound(next) {
-  yield* next;
+  yield next;
 
   if (this.status && this.status !== 404) {
     return;
@@ -26,7 +12,7 @@ module.exports = function* notFound(next) {
     return;
   }
 
-  var m = /^\/([\w\-\.]+)\/?$/.exec(this.path);
+  let m = /^\/([\w\-\.]+)\/?$/.exec(this.path);
   if (!m) {
     // scoped packages
     m = /^\/(@[\w\-\.]+\/[\w\-\.]+)$/.exec(this.path);
@@ -38,16 +24,16 @@ module.exports = function* notFound(next) {
 
   // package not found
   m = /\/package\/([\w\-\_\.]+)\/?$/.exec(this.url);
-  var name = null;
-  var title = '404: Page Not Found';
+  let name = null;
+  let title = '404: Page Not Found';
   if (m) {
     name = m[1];
     title = name + ' Not Found';
   }
 
   this.status = 404;
-  yield* this.render('404', {
-    title: title,
-    name: name
+  yield this.render('404', {
+    title,
+    name,
   });
 };

models/_module_maintainer_class_methods.js

@@ -1,32 +1,18 @@
-/**!
- * cnpmjs.org - models/_module_maintainer_class_methods.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 /**
  * list all module names by user
  * @param {String} user
  */
 
 exports.listModuleNamesByUser = function* (user) {
-  var rows = yield this.findAll({
-    attributrs: ['name'],
+  const rows = yield this.findAll({
+    attributrs: [ 'name' ],
     where: {
-      user: user
-    }
+      user,
+    },
   });
-  return rows.map(function (row) {
+  return rows.map(function(row) {
     return row.name;
   });
 };
@@ -37,13 +23,13 @@ exports.listModuleNamesByUser = function* (user) {
  */
 
 exports.listMaintainers = function* (name) {
-  var rows = yield this.findAll({
-    attributrs: ['user'],
+  const rows = yield this.findAll({
+    attributrs: [ 'user' ],
     where: {
-      name: name
-    }
+      name,
+    },
   });
-  return rows.map(function (row) {
+  return rows.map(function(row) {
     return row.user;
   });
 };
@@ -55,16 +41,16 @@ exports.listMaintainers = function* (name) {
  */
 
 exports.addMaintainer = function* (name, user) {
-  var row = yield this.find({
+  let row = yield this.find({
     where: {
-      user: user,
-      name: name
-    }
+      user,
+      name,
+    },
   });
   if (!row) {
     row = yield this.build({
-      user: user,
-      name: name
+      user,
+      name,
     }).save();
   }
   return row;
@@ -77,7 +63,7 @@ exports.addMaintainer = function* (name, user) {
  */
 
 exports.addMaintainers = function* (name, users) {
-  return yield users.map(function (user) {
+  return yield users.map(function(user) {
     return this.addMaintainer(name, user);
   }.bind(this));
 };
@@ -91,16 +77,16 @@ exports.addMaintainers = function* (name, users) {
 exports.removeMaintainers = function* (name, users) {
   // removeMaintainers(name, oneUserName)
   if (typeof users === 'string') {
-    users = [users];
+    users = [ users ];
   }
   if (users.length === 0) {
     return;
   }
   yield this.destroy({
     where: {
-      name: name,
+      name,
       user: users,
-    }
+    },
   });
 };
 
@@ -112,8 +98,8 @@ exports.removeMaintainers = function* (name, users) {
 exports.removeAllMaintainers = function* (name) {
   yield this.destroy({
     where: {
-      name: name
-    }
+      name,
+    },
   });
 };
 
@@ -131,17 +117,17 @@ exports.updateMaintainers = function* (name, users) {
   if (users.length === 0) {
     return {
       add: [],
-      remove: []
+      remove: [],
     };
   }
-  var exists = yield* this.listMaintainers(name);
+  const exists = yield this.listMaintainers(name);
 
-  var addUsers = users.filter(function (username) {
+  const addUsers = users.filter(function(username) {
     // add user which in `users` but do not in `exists`
     return exists.indexOf(username) === -1;
   });
 
-  var removeUsers = exists.filter(function (username) {
+  const removeUsers = exists.filter(function(username) {
     // remove user which in `exists` by not in `users`
     return users.indexOf(username) === -1;
   });
@@ -153,7 +139,6 @@ exports.updateMaintainers = function* (name, users) {
 
   return {
     add: addUsers,
-    remove: removeUsers
+    remove: removeUsers,
   };
 };
-

models/download_total.js

@@ -1,13 +1,3 @@
-/**!
- * cnpmjs.org - models/download_total.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
 /**
@@ -56,7 +46,7 @@
 //  KEY `date` (`date`)
 // ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module download total info';
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('DownloadTotal', {
     name: {
       type: DataTypes.STRING(100),
@@ -260,14 +250,14 @@ module.exports = function (sequelize, DataTypes) {
     indexes: [
       {
         unique: true,
-        fields: ['name', 'date']
+        fields: [ 'name', 'date' ],
       },
       {
-        fields: ['date']
-      }
+        fields: [ 'date' ],
+      },
     ],
     classMethods: {
 
-    }
+    },
   });
 };

models/index.js

@@ -12,15 +12,15 @@
  * Module dependencies.
  */
 
-var path = require('path');
-var sequelize = require('../common/sequelize');
+const path = require('path');
+const sequelize = require('../common/sequelize');
 
 function load(name) {
   return sequelize.import(path.join(__dirname, name));
 }
 
 module.exports = {
-  sequelize: sequelize,
+  sequelize,
   Module: load('module'),
   ModuleLog: load('module_log'),
   ModuleStar: load('module_star'),
@@ -35,16 +35,16 @@ module.exports = {
   Total: load('total'),
   DownloadTotal: load('download_total'),
 
-  query: function* (sql, args) {
-    var options = { replacements: args };
-    var data = yield this.sequelize.query(sql, options);
+  * query(sql, args) {
+    const options = { replacements: args };
+    const data = yield this.sequelize.query(sql, options);
     if (/select /i.test(sql)) {
       return data[0];
     }
     return data[1];
   },
-  queryOne: function* (sql, args) {
-    var rows = yield* this.query(sql, args);
+  * queryOne(sql, args) {
+    const rows = yield this.query(sql, args);
     return rows && rows[0];
-  }
+  },
 };

models/init_script.js

@@ -14,33 +14,33 @@
  * Module dependencies.
  */
 
-var config = require('../config');
+const config = require('../config');
 
 config.database.logging = console.log;
 
 // $ node --harmony models/init_script.js <force> <dialect> <port> <username>
-var force = process.argv[2] === 'true';
-var dialect = process.argv[3];
+const force = process.argv[2] === 'true';
+const dialect = process.argv[3];
 if (dialect) {
   config.database.dialect = dialect;
 }
-var port = process.argv[4];
+const port = process.argv[4];
 if (port) {
   config.database.port = parseInt(port);
 }
-var username = process.argv[5];
+const username = process.argv[5];
 if (username) {
   config.database.username = username;
 }
 
-var models = require('./');
+const models = require('./');
 
 models.sequelize.sync({
-  force: force,
+  force,
   logging: console.log,
- })
-  .then(function () {
-    models.Total.init(function (err) {
+})
+  .then(function() {
+    models.Total.init(function(err) {
       if (err) {
         console.error('[models/init_script.js] sequelize init fail');
         console.error(err);
@@ -52,7 +52,7 @@ models.sequelize.sync({
       }
     });
   })
-  .catch(function (err) {
+  .catch(function(err) {
     console.error('[models/init_script.js] sequelize sync fail');
     console.error(err);
     process.exit(1);

models/module.js

@@ -1,19 +1,5 @@
-/**!
- * cnpmjs.org - models/module.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 /*
 CREATE TABLE IF NOT EXISTS `module` (
   `id` INTEGER NOT NULL auto_increment ,
@@ -38,22 +24,22 @@ CREATE INDEX `module_publish_time` ON `module` (`publish_time`);
 CREATE INDEX `module_author` ON `module` (`author`);
 */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('Module', {
     author: {
       type: DataTypes.STRING(100),
       allowNull: false,
-      comment: 'first maintainer name'
+      comment: 'first maintainer name',
     },
     name: {
       type: DataTypes.STRING(100),
       allowNull: false,
-      comment: 'module name'
+      comment: 'module name',
     },
     version: {
       type: DataTypes.STRING(30),
       allowNull: false,
-      comment: 'module version'
+      comment: 'module version',
     },
     description: {
       type: DataTypes.LONGTEXT,
@@ -78,31 +64,31 @@ module.exports = function (sequelize, DataTypes) {
     publish_time: {
       type: DataTypes.BIGINT(20),
       allowNull: true,
-    }
+    },
   }, {
     tableName: 'module',
     comment: 'module info',
     indexes: [
       {
         unique: true,
-        fields: ['name', 'version']
+        fields: [ 'name', 'version' ],
       },
       {
-        fields: ['gmt_modified']
+        fields: [ 'gmt_modified' ],
       },
       {
-        fields: ['publish_time']
+        fields: [ 'publish_time' ],
       },
       {
-        fields: ['author']
-      }
+        fields: [ 'author' ],
+      },
     ],
     classMethods: {
-      findByNameAndVersion: function* (name, version) {
+      * findByNameAndVersion(name, version) {
         return yield this.find({
-          where: { name: name, version: version }
+          where: { name, version },
         });
-      }
-    }
+      },
+    },
   });
 };

models/module_deps.js

@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `module_deps` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module deps';
  */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('ModuleDependency', {
     name: {
       type: DataTypes.STRING(100),
@@ -36,8 +36,8 @@ module.exports = function (sequelize, DataTypes) {
     dependent: {
       field: 'deps',
       type: DataTypes.STRING(100),
-      comment: '`name` is depended by `deps`. `deps` == depend => `name`'
-    }
+      comment: '`name` is depended by `deps`. `deps` == depend => `name`',
+    },
   }, {
     tableName: 'module_deps',
     comment: 'module deps',
@@ -46,13 +46,13 @@ module.exports = function (sequelize, DataTypes) {
     indexes: [
       {
         unique: true,
-        fields: ['name', 'deps']
+        fields: [ 'name', 'deps' ],
       },
       {
-        fields: ['deps']
-      }
+        fields: [ 'deps' ],
+      },
     ],
     classMethods: {
-    }
+    },
   });
 };

models/module_keyword.js

@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS `module_keyword` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module keyword';
  */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('ModuleKeyword', {
     keyword: {
       type: DataTypes.STRING(100),
@@ -41,7 +41,7 @@ module.exports = function (sequelize, DataTypes) {
     description: {
       type: DataTypes.LONGTEXT,
       allowNull: true,
-    }
+    },
   }, {
     tableName: 'module_keyword',
     comment: 'module keyword',
@@ -49,21 +49,21 @@ module.exports = function (sequelize, DataTypes) {
     indexes: [
       {
         unique: true,
-        fields: ['keyword', 'name']
+        fields: [ 'keyword', 'name' ],
       },
       {
-        fields: ['name']
-      }
+        fields: [ 'name' ],
+      },
     ],
     classMethods: {
-      findByKeywordAndName: function* (keyword, name) {
+      * findByKeywordAndName(keyword, name) {
         return yield this.find({
           where: {
-            keyword: keyword,
-            name: name
-          }
+            keyword,
+            name,
+          },
         });
-      }
-    }
+      },
+    },
   });
 };

models/module_log.js

@@ -27,12 +27,12 @@ CREATE TABLE IF NOT EXISTS `module_log` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module sync log';
  */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('ModuleLog', {
     username: {
       type: DataTypes.STRING(100),
       allowNull: false,
-      comment: 'user name'
+      comment: 'user name',
     },
     name: {
       type: DataTypes.STRING(100),
@@ -40,17 +40,17 @@ module.exports = function (sequelize, DataTypes) {
       comment: 'module name',
     },
     log: {
-      type: DataTypes.LONGTEXT
-    }
+      type: DataTypes.LONGTEXT,
+    },
   }, {
     tableName: 'module_log',
     comment: 'module sync log',
     indexes: [
       {
-        fields: ['name']
-      }
+        fields: [ 'name' ],
+      },
     ],
     classMethods: {
-    }
+    },
   });
 };

models/module_maintainer.js

@@ -26,18 +26,18 @@ CREATE TABLE IF NOT EXISTS `module_maintainer` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='private module maintainers';
  */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('ModuleMaintainer', {
     user: {
       type: DataTypes.STRING(100),
       allowNull: false,
-      comment: 'user name'
+      comment: 'user name',
     },
     name: {
       type: DataTypes.STRING(100),
       allowNull: false,
       comment: 'module name',
-    }
+    },
   }, {
     tableName: 'module_maintainer',
     comment: 'private module maintainers',
@@ -45,11 +45,11 @@ module.exports = function (sequelize, DataTypes) {
     indexes: [
       {
         unique: true,
-        fields: ['user', 'name']
+        fields: [ 'user', 'name' ],
       },
       {
-        fields: ['name']
-      }
+        fields: [ 'name' ],
+      },
     ],
     classMethods: require('./_module_maintainer_class_methods'),
   });

models/module_star.js

@@ -26,18 +26,18 @@ CREATE TABLE IF NOT EXISTS `module_star` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module star';
  */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('ModuleStar', {
     user: {
       type: DataTypes.STRING(100),
       allowNull: false,
-      comment: 'user name'
+      comment: 'user name',
     },
     name: {
       type: DataTypes.STRING(100),
       allowNull: false,
       comment: 'module name',
-    }
+    },
   }, {
     tableName: 'module_star',
     comment: 'module star',
@@ -45,13 +45,13 @@ module.exports = function (sequelize, DataTypes) {
     indexes: [
       {
         unique: true,
-        fields: ['user', 'name']
+        fields: [ 'user', 'name' ],
       },
       {
-        fields: ['name']
-      }
+        fields: [ 'name' ],
+      },
     ],
     classMethods: {
-    }
+    },
   });
 };

models/module_unpublished.js

@@ -14,7 +14,7 @@
  * Module dependencies.
  */
 
-var utils = require('./utils');
+const utils = require('./utils');
 
 /*
 CREATE TABLE IF NOT EXISTS `module_unpublished` (
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS `module_unpublished` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module unpublished info';
  */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('ModuleUnpublished', {
     name: {
       type: DataTypes.STRING(100),
@@ -41,47 +41,47 @@ module.exports = function (sequelize, DataTypes) {
       comment: 'base info: tags, time, maintainers, description, versions',
       get: utils.JSONGetter('package'),
       set: utils.JSONSetter('package'),
-    }
+    },
   }, {
     tableName: 'module_unpublished',
     comment: 'module unpublished info',
     indexes: [
       {
         unique: true,
-        fields: ['name']
+        fields: [ 'name' ],
       },
       {
-        fields: ['gmt_modified']
-      }
+        fields: [ 'gmt_modified' ],
+      },
     ],
     classMethods: {
-      findByName: function* (name) {
+      * findByName(name) {
         return yield this.find({
           where: {
-            name: name
-          }
+            name,
+          },
         });
       },
-      save: function* (name, pkg) {
-        var row = yield this.find({
+      * save(name, pkg) {
+        let row = yield this.find({
           where: {
-            name: name
-          }
+            name,
+          },
         });
         if (row) {
           row.package = pkg;
           if (row.changed()) {
-            row = yield row.save(['package']);
+            row = yield row.save([ 'package' ]);
           }
           return row;
         }
 
         row = this.build({
-          name: name,
+          name,
           package: pkg,
         });
         return yield row.save();
-      }
-    }
+      },
+    },
   });
 };

models/npm_module_maintainer.js

@@ -26,18 +26,18 @@ CREATE TABLE IF NOT EXISTS `npm_module_maintainer` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='npm original module maintainers';
  */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('NpmModuleMaintainer', {
     user: {
       type: DataTypes.STRING(100),
       allowNull: false,
-      comment: 'user name'
+      comment: 'user name',
     },
     name: {
       type: DataTypes.STRING(100),
       allowNull: false,
       comment: 'module name',
-    }
+    },
   }, {
     tableName: 'npm_module_maintainer',
     comment: 'npm original module maintainers',
@@ -45,11 +45,11 @@ module.exports = function (sequelize, DataTypes) {
     indexes: [
       {
         unique: true,
-        fields: ['user', 'name']
+        fields: [ 'user', 'name' ],
       },
       {
-        fields: ['name']
-      }
+        fields: [ 'name' ],
+      },
     ],
     classMethods: require('./_module_maintainer_class_methods'),
   });

models/tag.js

@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS `tag` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module tag';
  */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('Tag', {
     name: {
       type: DataTypes.STRING(100),
@@ -49,24 +49,24 @@ module.exports = function (sequelize, DataTypes) {
     module_id: {
       type: DataTypes.BIGINT(20),
       allowNull: false,
-      comment: 'module id'
-    }
+      comment: 'module id',
+    },
   }, {
     tableName: 'tag',
     comment: 'module tag',
     indexes: [
       {
         unique: true,
-        fields: ['name', 'tag']
+        fields: [ 'name', 'tag' ],
       },
       {
-        fields: ['gmt_modified']
-      }
+        fields: [ 'gmt_modified' ],
+      },
     ],
     classMethods: {
-      findByNameAndTag: function* (name, tag) {
-        return yield this.find({ where: { name: name, tag: tag } });
-      }
-    }
+      * findByNameAndTag(name, tag) {
+        return yield this.find({ where: { name, tag } });
+      },
+    },
   });
 };

models/total.js

@@ -1,19 +1,5 @@
-/**!
- * cnpmjs.org - models/total.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 // CREATE TABLE IF NOT EXISTS `total` (
 //  `name` varchar(100) NOT NULL COMMENT 'total name',
 //  `gmt_modified` datetime NOT NULL COMMENT 'modified time',
@@ -32,12 +18,12 @@
 // INSERT INTO total(name, gmt_modified) VALUES('total', now())
 //   ON DUPLICATE KEY UPDATE gmt_modified=now();
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('Total', {
     name: {
       type: DataTypes.STRING(100),
       primaryKey: true,
-      comment: 'total name'
+      comment: 'total name',
     },
     module_delete: {
       type: DataTypes.BIGINT(20),
@@ -97,14 +83,14 @@ module.exports = function (sequelize, DataTypes) {
     comment: 'total info',
     createdAt: false,
     classMethods: {
-      init: function (callback) {
-        var that = this;
+      init(callback) {
+        const that = this;
         that.find({
-          where: { name: 'total' }
-        }).then(function (row) {
+          where: { name: 'total' },
+        }).then(function(row) {
           if (!row) {
-            that.build({name: 'total'}).save()
-              .then(function () {
+            that.build({ name: 'total' }).save()
+              .then(function() {
                 callback();
               })
               .catch(callback);
@@ -112,7 +98,7 @@ module.exports = function (sequelize, DataTypes) {
           }
           callback();
         }).catch(callback);
-      }
-    }
+      },
+    },
   });
 };

models/user.js

@@ -14,8 +14,8 @@
  * Module dependencies.
  */
 
-var utility = require('utility');
-var utils = require('./utils');
+const utility = require('utility');
+const utils = require('./utils');
 
 /*
 CREATE TABLE IF NOT EXISTS `user` (
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS `user` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='user base info';
 */
 
-module.exports = function (sequelize, DataTypes) {
+module.exports = function(sequelize, DataTypes) {
   return sequelize.define('User', {
     name: {
       type: DataTypes.STRING(100),
@@ -83,65 +83,65 @@ module.exports = function (sequelize, DataTypes) {
       allowNull: false,
       defaultValue: false,
       comment: 'user sync from npm or not, 1: true, other: false',
-    }
+    },
   }, {
     tableName: 'user',
     comment: 'user base info',
     indexes: [
       {
         unique: true,
-        fields: ['name']
+        fields: [ 'name' ],
       },
       {
-        fields: ['gmt_modified']
-      }
+        fields: [ 'gmt_modified' ],
+      },
     ],
     classMethods: {
       // utils
-      createPasswordSha: function (password, salt) {
+      createPasswordSha(password, salt) {
         return utility.sha1(password + salt);
       },
 
       // read
-      auth: function* (name, password) {
-        var user = yield* this.findByName(name);
+      * auth(name, password) {
+        let user = yield this.findByName(name);
         if (user) {
-          var sha = this.createPasswordSha(password, user.salt);
+          const sha = this.createPasswordSha(password, user.salt);
           if (user.password_sha !== sha) {
             user = null;
           }
         }
         return user;
       },
-      findByName: function* (name) {
-        return yield this.find({ where: { name: name } });
+      * findByName(name) {
+        return yield this.find({ where: { name } });
       },
-      listByNames: function* (names) {
+      * listByNames(names) {
         if (!names || names.length === 0) {
           return [];
         }
         return yield this.findAll({
           where: {
             name: {
-              in: names
-            }
-          }
+              in: names,
+            },
+          },
         });
       },
-      search: function* (query, options) {
+      * search(query, options) {
         return yield this.findAll({
           where: {
             name: {
-              like: query + '%'
-            }
+              like: query + '%',
+            },
           },
-          limit: options.limit
+          limit: options.limit,
         });
       },
 
       // write
-      saveNpmUser: function* (data) {
-        var user = yield* this.findByName(data.name);
+      * saveNpmUser(data) {
+        let user = yield this.findByName(data.name);
         if (!user) {
           user = this.build({
             isNpmUser: true,
@@ -160,20 +160,20 @@ module.exports = function (sequelize, DataTypes) {
         }
         return user;
       },
-      saveCustomUser: function* (data) {
-        var name = data.user.login;
-        var user = yield* this.findByName(name);
+      * saveCustomUser(data) {
+        const name = data.user.login;
+        let user = yield this.findByName(name);
         if (!user) {
           user = this.build({
             isNpmUser: false,
-            name: name,
+            name,
           });
         }
 
-        var rev = '1-' + data.user.login;
-        var salt = data.salt || '0';
-        var passwordSha = data.password_sha || '0';
-        var ip = data.ip || '0';
+        const rev = '1-' + data.user.login;
+        const salt = data.salt || '0';
+        const passwordSha = data.password_sha || '0';
+        const ip = data.ip || '0';
 
         user.isNpmUser = false;
         user.email = data.user.email;
@@ -189,48 +189,48 @@ module.exports = function (sequelize, DataTypes) {
       },
 
       // add cnpm user
-      add: function* (user) {
-        var roles = user.roles || [];
+      * add(user) {
+        let roles = user.roles || [];
         try {
           roles = JSON.stringify(roles);
         } catch (e) {
           roles = '[]';
         }
-        var rev = '1-' + utility.md5(JSON.stringify(user));
+        const rev = '1-' + utility.md5(JSON.stringify(user));
 
-        var row = this.build({
-          rev: rev,
+        const row = this.build({
+          rev,
           name: user.name,
           email: user.email,
           salt: user.salt,
           password_sha: user.password_sha,
           ip: user.ip,
-          roles: roles,
+          roles,
           isNpmUser: false,
         });
 
         return yield row.save();
       },
 
-      update: function* (user) {
-        var rev = user.rev || user._rev;
-        var revNo = Number(rev.split('-', 1));
+      * update(user) {
+        const rev = user.rev || user._rev;
+        let revNo = Number(rev.split('-', 1));
         if (!revNo) {
-          var err = new Error(rev + ' format error');
+          const err = new Error(rev + ' format error');
           err.name = 'RevFormatError';
-          err.data = {user: user};
+          err.data = { user };
           throw err;
         }
         revNo++;
-        var newRev = revNo + '-' + utility.md5(JSON.stringify(user));
-        var roles = user.roles || [];
+        const newRev = revNo + '-' + utility.md5(JSON.stringify(user));
+        let roles = user.roles || [];
         try {
           roles = JSON.stringify(roles);
         } catch (e) {
           roles = '[]';
         }
 
-        var row = yield* this.findByName(user.name);
+        const row = yield this.findByName(user.name);
         if (!row) {
           return null;
         }
@@ -243,8 +243,8 @@ module.exports = function (sequelize, DataTypes) {
         row.roles = roles;
         row.isNpmUser = false;
 
-        return yield row.save(['rev', 'email', 'salt', 'password_sha', 'ip', 'roles', 'isNpmUser']);
-      }
-    }
+        return yield row.save([ 'rev', 'email', 'salt', 'password_sha', 'ip', 'roles', 'isNpmUser' ]);
+      },
+    },
   });
 };

models/utils.js

@@ -14,9 +14,9 @@
  * Module dependencies.
  */
 
-exports.JSONGetter = function (propertyName) {
+exports.JSONGetter = function(propertyName) {
   return function JSONGetter() {
-    var value = this.getDataValue(propertyName);
+    let value = this.getDataValue(propertyName);
     if (value && typeof value === 'string') {
       value = JSON.parse(value);
     }
@@ -24,7 +24,7 @@ exports.JSONGetter = function (propertyName) {
   };
 };
 
-exports.JSONSetter = function (propertyName) {
+exports.JSONSetter = function(propertyName) {
   return function JSONSetter(value) {
     if (typeof value !== 'string') {
       value = JSON.stringify(value);

package.json

@@ -5,78 +5,87 @@
   "main": "index.js",
   "scripts": {
     "dev": "DEBUG=cnpm* node dispatch.js",
-    "test": "make jshint && make test",
+    "test": "npm run lint && egg-bin test",
+    "test-local": "egg-bin test",
+    "cov": "egg-bin cov",
+    "test-mysql": "DB=mysql npm run cov",
+    "test-postgres": "DB_PORT=5432 DB_USER=postgres DB=postgres npm run cov",
+    "test-all": "npm run lint && npm run cov && npm run test-mysql && npm run test-postgres",
     "start": "./bin/nodejsctl start && cp History.md docs/web/history.md",
     "status": "./bin/nodejsctl status",
-    "stop": "./bin/nodejsctl stop"
+    "stop": "./bin/nodejsctl stop",
+    "autod": "autod",
+    "lint": "eslint ."
   },
   "bin": {
     "cnpmjs.org": "bin/cli.js"
   },
   "dependencies": {
-    "agentkeepalive": "^2.2.0",
+    "agentkeepalive": "^3.0.0",
     "await-event": "^1.0.0",
     "bytes": "^2.4.0",
-    "cfork": "^1.5.1",
+    "cfork": "^1.6.0",
     "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",
+    "debug": "^2.6.0",
+    "egg": "^0.11.0",
     "error-formater": "^1.0.3",
     "fs-cnpm": "^1.2.0",
     "giturl": "^1.0.0",
-    "graceful": "^1.0.0",
-    "gravatar": "^1.5.0",
+    "graceful": "^1.0.1",
+    "gravatar": "^1.6.0",
     "humanize-ms": "^1.2.0",
     "humanize-number": "^0.0.2",
     "is-type-of": "^1.0.0",
-    "kcors": "^1.2.1",
-    "koa": "^1.2.0",
+    "kcors": "^1.3.1",
+    "ko-sleep": "^1.0.2",
+    "koa": "^1.2.4",
     "koa-limit": "^1.0.2",
     "koa-markdown": "^2.0.1",
     "koa-maxrequests": "^1.0.0",
     "koa-middlewares": "^2.1.0",
     "koa-mock": "^1.6.1",
+    "koa-router": "^3.8.0",
     "koa-safe-jsonp": "^0.3.1",
-    "markdown-it": "^3.0.6",
+    "markdown-it": "^8.2.2",
     "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",
+    "mkdirp": "^0.5.1",
+    "moment": "^2.17.1",
+    "mysql": "^2.13.0",
+    "mz": "^2.6.0",
+    "nodemailer": "^1.11.0",
     "normalize-registry-metadata": "^1.1.2",
-    "semver": "^5.2.0",
-    "sequelize": "^3.23.4",
+    "semver": "^5.3.0",
+    "sequelize": "^3.30.2",
     "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"
+    "tunnel-agent": "^0.4.3",
+    "urllib": "^2.20.0",
+    "utility": "^1.9.0",
+    "xss": "^0.3.3"
   },
   "devDependencies": {
-    "autod": "*",
-    "chunkstream": "*",
+    "autod": "^2.7.1",
+    "autod-egg": "^1.0.0",
+    "chunkstream": "^0.0.1",
     "contributors": "*",
-    "istanbul": "*",
-    "jshint": "*",
-    "mm": "*",
-    "mocha": "*",
-    "node-dev": "*",
-    "pedding": "*",
+    "egg-bin": "^2.0.2",
+    "egg-mock": "^2.4.0",
+    "eslint": "^3.15.0",
+    "eslint-config-egg": "^3.2.0",
+    "mm": "^2.1.0",
+    "pedding": "^1.1.0",
     "pg": "5",
     "pg-hstore": "2",
-    "should": "8",
-    "should-http": "*",
+    "runscript": "^1.2.0",
+    "should": "^11.2.0",
     "sqlite3": "*",
-    "supertest": "2",
-    "thunk-mocha": "1"
+    "supertest": "2"
   },
   "homepage": "https://github.com/cnpm/cnpmjs.org",
   "repository": {
@@ -96,10 +105,10 @@
     "registry"
   ],
   "engines": {
-    "node": ">= 4.3.1"
+    "node": ">= 6.9.0"
   },
   "author": [
-    "fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)",
+    "fengmk2 <fengmk2@gmail.com> (https://fengmk2.com)",
     "dead_horse <dead_horse@qq.com> (http://deadhorse.me)"
   ],
   "license": "MIT"

public/js/readme.js

@@ -1,19 +1,19 @@
-$(function () {
+$(function() {
   function humanize(n, options) {
     options = options || {};
-    var d = options.delimiter || ',';
-    var s = options.separator || '.';
+    const d = options.delimiter || ',';
+    const s = options.separator || '.';
     n = n.toString().split('.');
     n[0] = n[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1' + d);
     return n.join(s);
   }
 
-  $.getJSON('/total', function (data) {
+  $.getJSON('/total', function(data) {
     $('#total-packages').html(humanize(data.doc_count));
     $('#total-versions').html(humanize(data.doc_version_count));
     $('#total-deletes').html(humanize(data.doc_del_count));
 
-    var downloads = $('table.downloads');
+    const downloads = $('table.downloads');
     downloads.find('td.count:eq(3)').html(humanize(data.download.today));
     downloads.find('td.count:eq(4)').html(humanize(data.download.thisweek));
     downloads.find('td.count:eq(5)').html(humanize(data.download.thismonth));

routes/registry.js

@@ -1,42 +1,42 @@
 'use strict';
 
-var limit = require('../middleware/limit');
-var login = require('../middleware/login');
-var publishable = require('../middleware/publishable');
-var syncByInstall = require('../middleware/sync_by_install');
-var editable = require('../middleware/editable');
-var existsPackage = require('../middleware/exists_package');
-var unpublishable = require('../middleware/unpublishable');
+const limit = require('../middleware/limit');
+const login = require('../middleware/login');
+const publishable = require('../middleware/publishable');
+const syncByInstall = require('../middleware/sync_by_install');
+const editable = require('../middleware/editable');
+const existsPackage = require('../middleware/exists_package');
+const unpublishable = require('../middleware/unpublishable');
 
-var showTotal = require('../controllers/total');
+const showTotal = require('../controllers/total');
 
-var listAll = require('../controllers/registry/package/list_all');
-var listShorts = require('../controllers/registry/package/list_shorts');
-var listSince = require('../controllers/registry/package/list_since');
-var listAllVersions = require('../controllers/registry/package/list');
-var listDependents = require('../controllers/registry/package/list_dependents');
-var getOneVersion = require('../controllers/registry/package/show');
-var savePackage = require('../controllers/registry/package/save');
-var tag = require('../controllers/registry/package/tag');
-var removePackage = require('../controllers/registry/package/remove');
-var removeOneVersion = require('../controllers/registry/package/remove_version');
-var updatePackage = require('../controllers/registry/package/update');
-var downloadPackage = require('../controllers/registry/package/download');
-var downloadTotal = require('../controllers/registry/package/download_total');
-var listPackagesByUser = require('../controllers/registry/package/list_by_user');
+const listAll = require('../controllers/registry/package/list_all');
+const listShorts = require('../controllers/registry/package/list_shorts');
+const listSince = require('../controllers/registry/package/list_since');
+const listAllVersions = require('../controllers/registry/package/list');
+const listDependents = require('../controllers/registry/package/list_dependents');
+const getOneVersion = require('../controllers/registry/package/show');
+const savePackage = require('../controllers/registry/package/save');
+const tag = require('../controllers/registry/package/tag');
+const removePackage = require('../controllers/registry/package/remove');
+const removeOneVersion = require('../controllers/registry/package/remove_version');
+const updatePackage = require('../controllers/registry/package/update');
+const downloadPackage = require('../controllers/registry/package/download');
+const downloadTotal = require('../controllers/registry/package/download_total');
+const listPackagesByUser = require('../controllers/registry/package/list_by_user');
 
-var addUser = require('../controllers/registry/user/add');
-var showUser = require('../controllers/registry/user/show');
-var updateUser = require('../controllers/registry/user/update');
+const addUser = require('../controllers/registry/user/add');
+const showUser = require('../controllers/registry/user/show');
+const updateUser = require('../controllers/registry/user/update');
 
-var sync = require('../controllers/sync');
-var userPackage = require('../controllers/registry/user_package');
-var tags = require('../controllers/registry/package/dist_tag');
+const sync = require('../controllers/sync');
+const userPackage = require('../controllers/registry/user_package');
+const tags = require('../controllers/registry/package/dist_tag');
 
 function routes(app) {
 
   function* jsonp(next) {
-    yield* next;
+    yield next;
     if (this.body) {
       this.jsonp = this.body;
     }

routes/web.js

@@ -1,14 +1,14 @@
 'use strict';
 
-var showPackage = require('../controllers/web/package/show');
-var searchPackage = require('../controllers/web/package/search');
-var searchRange = require('../controllers/web/package/search_range');
-var listPrivates = require('../controllers/web/package/list_privates');
-var showSync = require('../controllers/web/show_sync');
-var showUser = require('../controllers/web/user/show');
-var sync = require('../controllers/sync');
-var showTotal = require('../controllers/total');
-var badge = require('../controllers/web/badge');
+const showPackage = require('../controllers/web/package/show');
+const searchPackage = require('../controllers/web/package/search');
+const searchRange = require('../controllers/web/package/search_range');
+const listPrivates = require('../controllers/web/package/list_privates');
+const showSync = require('../controllers/web/show_sync');
+const showUser = require('../controllers/web/user/show');
+const sync = require('../controllers/sync');
+const showTotal = require('../controllers/total');
+const badge = require('../controllers/web/badge');
 
 function routes(app) {
   app.get('/total', showTotal);

servers/registry.js

@@ -1,19 +1,20 @@
 'use strict';
 
-var koa = require('koa');
-var app = module.exports = koa();
-var http = require('http');
-var middlewares = require('koa-middlewares');
-var routes = require('../routes/registry');
-var logger = require('../common/logger');
-var config = require('../config');
-var block = require('../middleware/block');
-var auth = require('../middleware/auth');
-var staticCache = require('../middleware/static');
-var notFound = require('../middleware/registry_not_found');
-var cors = require('kcors');
-var proxyToNpm = require('../middleware/proxy_to_npm');
-var maxrequests = require('koa-maxrequests');
+const koa = require('koa');
+let app = module.exports = koa();
+const http = require('http');
+const middlewares = require('koa-middlewares');
+const router = require('koa-router');
+const routes = require('../routes/registry');
+const logger = require('../common/logger');
+const config = require('../config');
+const block = require('../middleware/block');
+const auth = require('../middleware/auth');
+const staticCache = require('../middleware/static');
+const notFound = require('../middleware/registry_not_found');
+const cors = require('kcors');
+const proxyToNpm = require('../middleware/proxy_to_npm');
+const maxrequests = require('koa-maxrequests');
 
 app.use(maxrequests());
 app.use(block());
@@ -22,7 +23,7 @@ app.use(middlewares.rt({ headerName: 'X-ReadTime' }));
 app.use(middlewares.rewrite('/favicon.ico', '/favicon.png'));
 app.use(staticCache);
 
-app.keys = ['todokey', config.sessionSecret];
+app.keys = [ 'todokey', config.sessionSecret ];
 app.proxy = true;
 app.use(middlewares.bodyParser({ jsonLimit: config.jsonLimit }));
 app.use(cors({
@@ -42,14 +43,14 @@ app.use(middlewares.etag());
  * Routes
  */
 
-app.use(middlewares.router(app));
+app.use(router(app));
 routes(app);
 
 /**
  * Error handler
  */
 
-app.on('error', function (err, ctx) {
+app.on('error', function(err, ctx) {
   console.log(err);
   console.log(err.stack);
   err.url = err.url || ctx.request.url;

servers/web.js

@@ -1,73 +1,74 @@
 'use strict';
 
-var opensearch = require('../middleware/opensearch');
-var notFound = require('../middleware/web_not_found');
-var staticCache = require('../middleware/static');
-var middlewares = require('koa-middlewares');
-var markdownMiddleware = require('koa-markdown');
-var block = require('../middleware/block');
-var logger = require('../common/logger');
-var renderMarkdown = require('../common/markdown').render;
-var auth = require('../middleware/auth');
-var proxyToNpm = require('../middleware/proxy_to_npm');
-var routes = require('../routes/web');
-var config = require('../config');
-var jsonp = require('koa-safe-jsonp');
-var path = require('path');
-var http = require('http');
-var koa = require('koa');
-var fs = require('fs');
-var maxrequests = require('koa-maxrequests');
+const opensearch = require('../middleware/opensearch');
+const notFound = require('../middleware/web_not_found');
+const staticCache = require('../middleware/static');
+const middlewares = require('koa-middlewares');
+const router = require('koa-router');
+const markdownMiddleware = require('koa-markdown');
+const block = require('../middleware/block');
+const logger = require('../common/logger');
+const renderMarkdown = require('../common/markdown').render;
+const auth = require('../middleware/auth');
+const proxyToNpm = require('../middleware/proxy_to_npm');
+const routes = require('../routes/web');
+const config = require('../config');
+const jsonp = require('koa-safe-jsonp');
+const path = require('path');
+const http = require('http');
+const koa = require('koa');
+const fs = require('fs');
+const maxrequests = require('koa-maxrequests');
 
-var app = koa();
+let app = koa();
 
 jsonp(app);
 
-var rootdir = path.dirname(__dirname);
+const rootdir = path.dirname(__dirname);
 
 app.use(maxrequests());
 app.use(block());
-app.use(middlewares.rt({headerName: 'X-ReadTime'}));
+app.use(middlewares.rt({ headerName: 'X-ReadTime' }));
 app.use(middlewares.rewrite('/favicon.ico', '/favicon.png'));
 app.use(staticCache);
 
 if (config.pagemock) {
   app.use(require('koa-mock')({
-    datadir: path.join(rootdir, 'test', 'mocks')
+    datadir: path.join(rootdir, 'test', 'mocks'),
   }));
 }
 
 app.use(opensearch);
-app.keys = ['todokey', config.sessionSecret];
+app.keys = [ 'todokey', config.sessionSecret ];
 app.proxy = true;
 app.use(proxyToNpm({
-  isWeb: true
+  isWeb: true,
 }));
 app.use(middlewares.bodyParser());
 app.use(auth());
 app.use(notFound);
 
 if (config.enableCompress) {
-  app.use(middlewares.compress({threshold: 150}));
+  app.use(middlewares.compress({ threshold: 150 }));
 }
 
 app.use(middlewares.conditional());
 app.use(middlewares.etag());
 
-var viewDir = path.join(rootdir, 'view', 'web');
-var docDir = path.join(rootdir, 'docs', 'web');
+const viewDir = path.join(rootdir, 'view', 'web');
+const docDir = path.join(rootdir, 'docs', 'web');
 
-var layoutFile = path.join(viewDir, '_layout.html');
-var footer = config.customFooter || fs.readFileSync(path.join(viewDir, 'footer.html'), 'utf8');
-var layout = fs.readFileSync(path.join(viewDir, 'layout.html'), 'utf8')
+const layoutFile = path.join(viewDir, '_layout.html');
+const footer = config.customFooter || fs.readFileSync(path.join(viewDir, 'footer.html'), 'utf8');
+const layout = fs.readFileSync(path.join(viewDir, 'layout.html'), 'utf8')
   .replace('{{footer}}', footer)
   .replace('{{logoURL}}', config.logoURL)
   .replace('{{adBanner}}', config.adBanner || '');
 fs.writeFileSync(layoutFile, layout);
 
 // custom web readme home page support
-var readmeFile = path.join(docDir, '_readme.md');
-var readmeContent;
+const readmeFile = path.join(docDir, '_readme.md');
+let readmeContent;
 if (config.customReadmeFile) {
   readmeContent = fs.readFileSync(config.customReadmeFile, 'utf8');
 } else {
@@ -83,13 +84,13 @@ app.use(markdownMiddleware({
   bodyHolder: '<%- locals.body %>',
   indexName: '_readme',
   cache: true,
-  render: function (content) {
+  render(content) {
     return renderMarkdown(content, false);
   },
 }));
 
-var locals = {
-  config: config
+const locals = {
+  config,
 };
 
 middlewares.ejs(app, {
@@ -98,20 +99,21 @@ middlewares.ejs(app, {
   layout: '_layout',
   cache: config.viewCache,
   debug: config.debug,
-  locals: locals
+  locals,
 });
 
 /**
  * Routes
  */
-app.use(middlewares.router(app));
+
+app.use(router(app));
 routes(app);
 
 /**
  * Error handler
  */
 
-app.on('error', function (err, ctx) {
+app.on('error', function(err, ctx) {
   err.url = err.url || ctx.request.url;
   console.log(err);
   console.log(err.stack);

services/common.js

@@ -1,25 +1,11 @@
-/**!
- * cnpmjs.org - services/common.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var config = require('../config');
-var isPrivateScopedPackage = require('../lib/common').isPrivateScopedPackage;
+const config = require('../config');
+const isPrivateScopedPackage = require('../lib/common').isPrivateScopedPackage;
 
 config.privatePackages = config.privatePackages || [];
 
-exports.isPrivatePackage = function (name) {
+exports.isPrivatePackage = function(name) {
   if (isPrivateScopedPackage(name)) {
     return true;
   }

services/default_user_service.js

@@ -1,24 +1,9 @@
-/**!
- * cnpmjs.org - services/default_user_service.js
- *
- * Copyright(c) fengmk2 and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var gravatar = require('gravatar');
-// var User = require('../proxy/user');
-var User = require('../models').User;
-var isAdmin = require('../lib/common').isAdmin;
-var config = require('../config');
+const gravatar = require('gravatar');
+const User = require('../models').User;
+const isAdmin = require('../lib/common').isAdmin;
+const config = require('../config');
 
 // User: https://github.com/cnpm/cnpmjs.org/wiki/Use-Your-Own-User-Authorization#user-data-structure
 // {
@@ -35,7 +20,7 @@ var config = require('../config');
 module.exports = DefaultUserService;
 
 function convertToUser(row) {
-  var user = {
+  let user = {
     login: row.name,
     email: row.email,
     name: row.name,
@@ -46,7 +31,7 @@ function convertToUser(row) {
     scopes: config.scopes,
   };
   if (row.json) {
-    var data = row.json;
+    const data = row.json;
     if (data.login) {
       // custom user
       user = data;
@@ -67,23 +52,23 @@ function convertToUser(row) {
     }
   }
   if (!user.avatar_url) {
-    user.avatar_url = gravatar.url(user.email, {s: '50', d: 'retro'}, true);
+    user.avatar_url = gravatar.url(user.email, { s: '50', d: 'retro' }, true);
   }
   return user;
 }
 
 function DefaultUserService() {}
 
-var proto = DefaultUserService.prototype;
+const proto = DefaultUserService.prototype;
 
 /**
  * Auth user with login name and password
  * @param  {String} login    login name
  * @param  {String} password login password
- * @return {User}
+ * @return {User} user
  */
 proto.auth = function* (login, password) {
-  var row = yield* User.auth(login, password);
+  const row = yield User.auth(login, password);
   if (!row) {
     return null;
   }
@@ -93,10 +78,10 @@ proto.auth = function* (login, password) {
 /**
  * Get user by login name
  * @param  {String} login  login name
- * @return {User}
+ * @return {User} user
  */
 proto.get = function* (login) {
-  var row = yield User.findByName(login);
+  const row = yield User.findByName(login);
   if (!row) {
     return null;
   }
@@ -106,12 +91,12 @@ proto.get = function* (login) {
 /**
  * List users
  * @param  {Array<String>} logins  login names
- * @return {Array<User>}
+ * @return {Array<User>} users
  */
 proto.list = function* (logins) {
-  var rows = yield* User.listByNames(logins);
-  var users = [];
-  rows.forEach(function (row) {
+  const rows = yield User.listByNames(logins);
+  const users = [];
+  rows.forEach(function(row) {
     users.push(convertToUser(row));
   });
   return users;
@@ -122,7 +107,7 @@ proto.list = function* (logins) {
  * @param  {String} query  query keyword
  * @param  {Object} [options] optional query params
  *  - {Number} limit match users count, default is `20`
- * @return {Array<User>}
+ * @return {Array<User>} users
  */
 proto.search = function* (query, options) {
   options = options || {};
@@ -131,9 +116,9 @@ proto.search = function* (query, options) {
     options.limit = 20;
   }
 
-  var rows = yield* User.search(query, options);
-  var users = [];
-  rows.forEach(function (row) {
+  const rows = yield User.search(query, options);
+  const users = [];
+  rows.forEach(function(row) {
     users.push(convertToUser(row));
   });
   return users;

services/download_total.js

@@ -1,47 +1,35 @@
-/**!
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
-var utility = require('utility');
-var DownloadTotal = require('../models').DownloadTotal;
+const utility = require('utility');
+const DownloadTotal = require('../models').DownloadTotal;
 
 exports.getModuleTotal = function* (name, start, end) {
-  var startMonth = parseYearMonth(start);
-  var endMonth = parseYearMonth(end);
-  var rows = yield DownloadTotal.findAll({
+  const startMonth = parseYearMonth(start);
+  const endMonth = parseYearMonth(end);
+  const rows = yield DownloadTotal.findAll({
     where: {
       date: {
         gte: startMonth,
-        lte: endMonth
+        lte: endMonth,
       },
-      name: name
-    }
+      name,
+    },
   });
   return formatRows(rows, start, end);
 };
 
 exports.getTotalByName = function* (name) {
-  var rows = yield DownloadTotal.findAll({
+  const rows = yield DownloadTotal.findAll({
     where: {
-      name: 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];
+  let count = 0;
+  rows.forEach(function(row) {
+    for (let i = 1; i <= 31; i++) {
+      const day = i < 10 ? '0' + i : String(i);
+      const field = 'd' + day;
+      let val = row[field];
       if (typeof val === 'string') {
         val = utility.toSafeNumber(val);
       }
@@ -52,13 +40,13 @@ exports.getTotalByName = function* (name) {
 };
 
 exports.plusModuleTotal = function* (data) {
-  var yearMonth = parseYearMonth(data.date);
+  const yearMonth = parseYearMonth(data.date);
   // all module download total
-  var row = yield DownloadTotal.find({
+  let row = yield DownloadTotal.find({
     where: {
       name: '__all__',
-      date: yearMonth
-    }
+      date: yearMonth,
+    },
   });
   if (!row) {
     row = DownloadTotal.build({
@@ -66,7 +54,7 @@ exports.plusModuleTotal = function* (data) {
       date: yearMonth,
     });
   }
-  var field = 'd' + data.date.substring(8, 10);
+  let field = 'd' + data.date.substring(8, 10);
   if (typeof row[field] === 'string') {
     // pg bigint is string...
     row[field] = utility.toSafeNumber(row[field]);
@@ -80,7 +68,7 @@ exports.plusModuleTotal = function* (data) {
     where: {
       name: data.name,
       date: yearMonth,
-    }
+    },
   });
   if (!row) {
     row = DownloadTotal.build({
@@ -88,7 +76,7 @@ exports.plusModuleTotal = function* (data) {
       date: yearMonth,
     });
   }
-  var field = 'd' + data.date.substring(8, 10);
+  field = 'd' + data.date.substring(8, 10);
   if (typeof row[field] === 'string') {
     // pg bigint is string...
     row[field] = utility.toSafeNumber(row[field]);
@@ -109,25 +97,25 @@ function parseYearMonth(date) {
 }
 
 function formatRows(rows, startDate, endDate) {
-  var dates = [];
-  rows.forEach(function (row) {
-    var date = String(row.date);
-    var month = date.substring(4, 6);
-    var year = date.substring(0, 4);
-    var yearMonth = year + '-' + month;
-    for (var i = 1; i <= 31; i++) {
-      var day = i < 10 ? '0' + i : String(i);
-      var field = 'd' + day;
-      var d = yearMonth + '-' + day;
-      var count = row[field];
+  const dates = [];
+  rows.forEach(function(row) {
+    const date = String(row.date);
+    const month = date.substring(4, 6);
+    const year = date.substring(0, 4);
+    const yearMonth = year + '-' + month;
+    for (let i = 1; i <= 31; i++) {
+      const day = i < 10 ? '0' + i : String(i);
+      const field = 'd' + day;
+      const d = yearMonth + '-' + day;
+      let count = row[field];
       if (typeof count === 'string') {
         count = utility.toSafeNumber(count);
       }
       if (count > 0 && d >= startDate && d <= endDate) {
         dates.push({
           name: row.name,
-          count: count,
-          date: d
+          count,
+          date: d,
         });
       }
     }

services/module_log.js

@@ -14,26 +14,26 @@
  * Module dependencies.
  */
 
-var models = require('../models');
-var ModuleLog = models.ModuleLog;
+const models = require('../models');
+const ModuleLog = models.ModuleLog;
 
 exports.create = function* (data) {
-  var row = ModuleLog.build({
+  const row = ModuleLog.build({
     name: data.name,
     username: data.username || 'anonymous',
-    log: ''
+    log: '',
   });
   return yield row.save();
 };
 
-var ONE_MB = 1024 * 1024;
+const ONE_MB = 1024 * 1024;
 
 exports.append = function* (id, log) {
   if (!log) {
     return null;
   }
 
-  var row = yield* exports.get(id);
+  const row = yield exports.get(id);
   if (!row) {
     return null;
   }
@@ -46,7 +46,7 @@ exports.append = function* (id, log) {
   if (row.log.length >= ONE_MB) {
     row.log = '...\n' + row.log.substring(ONE_MB / 2);
   }
-  return yield row.save(['log']);
+  return yield row.save([ 'log' ]);
 };
 
 exports.get = function* (id) {

services/npm.js

@@ -1,24 +1,24 @@
 'use strict';
 
-var ms = require('humanize-ms');
-var cleanNpmMetadata = require('normalize-registry-metadata');
-var urllib = require('../common/urllib');
-var config = require('../config');
+const ms = require('humanize-ms');
+const cleanNpmMetadata = require('normalize-registry-metadata');
+const urllib = require('../common/urllib');
+const config = require('../config');
 
-var USER_AGENT = 'npm_service.cnpmjs.org/' + config.version + ' ' + urllib.USER_AGENT;
+const USER_AGENT = 'npm_service.cnpmjs.org/' + config.version + ' ' + urllib.USER_AGENT;
 
 function* request(url, options) {
   options = options || {};
   options.dataType = options.dataType || 'json';
   options.timeout = options.timeout || 120000;
   options.headers = {
-    'user-agent': USER_AGENT
+    'user-agent': USER_AGENT,
   };
   options.gzip = true;
   options.followRedirect = true;
-  var registry = options.registry || config.sourceNpmRegistry;
+  const registry = options.registry || config.sourceNpmRegistry;
   url = registry + url;
-  var r;
+  let r;
   try {
     r = yield urllib.request(url, options);
     // https://github.com/npm/registry/issues/87#issuecomment-261450090
@@ -26,8 +26,8 @@ function* request(url, options) {
       cleanNpmMetadata(r.data);
     }
   } catch (err) {
-    var statusCode = err.status || -1;
-    var data = err.data || '[empty]';
+    const statusCode = err.status || -1;
+    const data = err.data || '[empty]';
     if (err.name === 'JSONResponseFormatError' && statusCode >= 500) {
       err.name = 'NPMServerError';
       err.status = statusCode;
@@ -41,9 +41,9 @@ function* request(url, options) {
 exports.request = request;
 
 exports.getUser = function* (name) {
-  var url = '/-/user/org.couchdb.user:' + name;
-  var r = yield* request(url);
-  var data = r.data;
+  const url = '/-/user/org.couchdb.user:' + name;
+  const r = yield request(url);
+  let data = r.data;
   if (data && !data.name) {
     // 404
     data = null;
@@ -52,8 +52,8 @@ exports.getUser = function* (name) {
 };
 
 exports.get = function* (name) {
-  var r = yield* request('/' + name);
-  var data = r.data;
+  const r = yield request('/' + name);
+  let data = r.data;
   if (r.status === 404) {
     data = null;
   }
@@ -61,9 +61,9 @@ exports.get = function* (name) {
 };
 
 exports.fetchUpdatesSince = function* (lastSyncTime, timeout) {
-  var lastModified = lastSyncTime - ms('10m');
-  var data = yield exports.getAllSince(lastModified, timeout);
-  var result = {
+  const lastModified = lastSyncTime - ms('10m');
+  const data = yield exports.getAllSince(lastModified, timeout);
+  const result = {
     lastModified: lastSyncTime,
     names: [],
   };
@@ -72,10 +72,10 @@ exports.fetchUpdatesSince = function* (lastSyncTime, timeout) {
   }
   if (Array.isArray(data)) {
     // support https://registry.npmjs.org/-/all/static/today.json
-    var maxModified;
-    data.forEach(function (pkg) {
+    let maxModified;
+    data.forEach(function(pkg) {
       if (pkg.time && pkg.time.modified) {
-        var modified = Date.parse(pkg.time.modified);
+        const modified = Date.parse(pkg.time.modified);
         if (modified >= lastModified) {
           result.names.push(pkg.name);
         }
@@ -101,28 +101,28 @@ exports.fetchUpdatesSince = function* (lastSyncTime, timeout) {
 };
 
 exports.fetchAllPackagesSince = function* (timestamp) {
-  var r = yield request('/-/all/static/all.json', {
+  const r = yield request('/-/all/static/all.json', {
     registry: 'http://registry.npmjs.org',
-    timeout: 600000
+    timeout: 600000,
   });
   // {"_updated":1441520402174,"0":{"name":"0","dist-tags
   // "time":{"modified":"2014-06-17T06:38:43.495Z"}
-  var data = r.data;
-  var result = {
+  const data = r.data;
+  const result = {
     lastModified: timestamp,
     lastModifiedName: null,
     names: [],
   };
-  var maxModified;
-  for (var key in data) {
+  let maxModified;
+  for (const key in data) {
     if (key === '_updated') {
       continue;
     }
-    var pkg = data[key];
+    const pkg = data[key];
     if (!pkg.time || !pkg.time.modified) {
       continue;
     }
-    var modified = Date.parse(pkg.time.modified);
+    const modified = Date.parse(pkg.time.modified);
     if (modified >= timestamp) {
       result.names.push(pkg.name);
     }
@@ -138,22 +138,22 @@ exports.fetchAllPackagesSince = function* (timestamp) {
 };
 
 exports.getAllSince = function* (startkey, timeout) {
-  var r = yield* request('/-/all/since?stale=update_after&startkey=' + startkey, {
-    timeout: timeout || 300000
+  const r = yield request('/-/all/since?stale=update_after&startkey=' + startkey, {
+    timeout: timeout || 300000,
   });
   return r.data;
 };
 
 exports.getAllToday = function* (timeout) {
-  var r = yield* request('/-/all/static/today.json', {
-    timeout: timeout || 300000
+  const 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', {
+  const r = yield request('/-/short', {
     timeout: timeout || 300000,
     // registry.npmjs.org/-/short is 404 now therefore have a fallback
     registry: config.sourceNpmRegistryIsCNpm ? config.sourceNpmRegistry : 'http://r.cnpmjs.org',
@@ -162,27 +162,27 @@ exports.getShort = function* (timeout) {
 };
 
 exports.getPopular = function* (top, timeout) {
-  var r = yield* request('/-/_view/dependedUpon?group_level=1', {
+  const r = yield request('/-/_view/dependedUpon?group_level=1', {
     registry: config.officialNpmRegistry,
-    timeout: timeout || 120000
+    timeout: timeout || 120000,
   });
   if (!r.data || !r.data.rows || !r.data.rows.length) {
     return [];
   }
 
   // deps number must >= 100
-  var rows = r.data.rows.filter(function (a) {
+  const rows = r.data.rows.filter(function(a) {
     return a.value >= 100;
   });
 
-  return rows.sort(function (a, b) {
+  return rows.sort(function(a, b) {
     return b.value - a.value;
   })
   .slice(0, top)
-  .map(function (r) {
-    return [r.key && r.key[0] && r.key[0].trim(), r.value];
+  .map(function(r) {
+    return [ r.key && r.key[0] && r.key[0].trim(), r.value ];
   })
-  .filter(function (r) {
+  .filter(function(r) {
     return r[0];
   });
 };

services/package.js

@@ -1,20 +1,20 @@
 'use strict';
 
-var semver = require('semver');
-var models = require('../models');
-var common = require('./common');
-var Tag = models.Tag;
-var User = models.User;
-var Module = models.Module;
-var ModuleStar = models.ModuleStar;
-var ModuleKeyword = models.ModuleKeyword;
-var PrivateModuleMaintainer = models.ModuleMaintainer;
-var ModuleDependency = models.ModuleDependency;
-var ModuleUnpublished = models.ModuleUnpublished;
-var NpmModuleMaintainer = models.NpmModuleMaintainer;
+const semver = require('semver');
+const models = require('../models');
+const common = require('./common');
+const Tag = models.Tag;
+const User = models.User;
+const Module = models.Module;
+const ModuleStar = models.ModuleStar;
+const ModuleKeyword = models.ModuleKeyword;
+const PrivateModuleMaintainer = models.ModuleMaintainer;
+const ModuleDependency = models.ModuleDependency;
+const ModuleUnpublished = models.ModuleUnpublished;
+const NpmModuleMaintainer = models.NpmModuleMaintainer;
 
 // module
-var _parseRow = function (row) {
+const _parseRow = function(row) {
   if (row.package.indexOf('%7B%22') === 0) {
     // now store package will encodeURIComponent() after JSON.stringify
     row.package = decodeURIComponent(row.package);
@@ -43,72 +43,72 @@ function stringifyPackage(pkg) {
 }
 
 exports.getModuleById = function* (id) {
-  var row = yield Module.findById(Number(id));
+  const row = yield Module.findById(Number(id));
   parseRow(row);
   return row;
 };
 
 exports.getModule = function* (name, version) {
-  var row = yield* Module.findByNameAndVersion(name, version);
+  const row = yield Module.findByNameAndVersion(name, version);
   parseRow(row);
   return row;
 };
 
 exports.getModuleByTag = function* (name, tag) {
-  var tag = yield* Tag.findByNameAndTag(name, tag);
-  if (!tag) {
+  const item = yield Tag.findByNameAndTag(name, tag);
+  if (!item) {
     return null;
   }
-  return yield* exports.getModule(tag.name, tag.version);
+  return yield exports.getModule(item.name, item.version);
 };
 
 exports.getModuleByRange = function* (name, range) {
-  var rows = yield exports.listModulesByName(name, [ 'id', 'version' ]);
-  var versionMap = {};
-  var versions = rows.map(function(row) {
+  const rows = yield exports.listModulesByName(name, [ 'id', 'version' ]);
+  const versionMap = {};
+  const 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);
+  const version = semver.maxSatisfying(versions, range);
   if (!versionMap[version]) {
     return null;
   }
 
-  var id = versionMap[version].id;
+  const 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
 
 exports.listPrivateModulesByScope = function* (scope) {
-  var tags = yield Tag.findAll({
+  const tags = yield Tag.findAll({
     where: {
       tag: 'latest',
       name: {
-        like: scope + '/%'
-      }
-    }
+        like: scope + '/%',
+      },
+    },
   });
 
   if (tags.length === 0) {
     return [];
   }
 
-  var ids = tags.map(function (tag) {
+  const ids = tags.map(function(tag) {
     return tag.module_id;
   });
 
   return yield Module.findAll({
     where: {
-      id: ids
-    }
+      id: ids,
+    },
   });
 };
 
@@ -118,55 +118,55 @@ exports.listModules = function* (names) {
   }
 
   // fetch latest module tags
-  var tags = yield Tag.findAll({
+  const tags = yield Tag.findAll({
     where: {
       name: names,
-      tag: 'latest'
-    }
+      tag: 'latest',
+    },
   });
   if (tags.length === 0) {
     return [];
   }
 
-  var ids = tags.map(function (tag) {
+  const ids = tags.map(function(tag) {
     return tag.module_id;
   });
 
-  var rows = yield Module.findAll({
+  const rows = yield Module.findAll({
     where: {
-      id: ids
+      id: ids,
     },
     attributes: [
       'name', 'description', 'version',
-    ]
+    ],
   });
   return rows;
 };
 
 exports.listModulesByUser = function* (username) {
-  var names = yield* exports.listModuleNamesByUser(username);
-  return yield* exports.listModules(names);
+  const names = yield exports.listModuleNamesByUser(username);
+  return yield exports.listModules(names);
 };
 
 exports.listModuleNamesByUser = function* (username) {
-  var sql = 'SELECT distinct(name) AS name FROM module WHERE author=?;';
-  var rows = yield* models.query(sql, [username]);
-  var map = {};
-  var names = rows.map(function (r) {
+  const sql = 'SELECT distinct(name) AS name FROM module WHERE author=?;';
+  const rows = yield models.query(sql, [ username ]);
+  const map = {};
+  const names = rows.map(function(r) {
     return r.name;
   });
 
   // find from npm module maintainer table
-  var moduleNames = yield* NpmModuleMaintainer.listModuleNamesByUser(username);
-  moduleNames.forEach(function (name) {
+  let moduleNames = yield NpmModuleMaintainer.listModuleNamesByUser(username);
+  moduleNames.forEach(function(name) {
     if (!map[name]) {
       names.push(name);
     }
   });
 
   // find from private module maintainer table
-  moduleNames = yield* PrivateModuleMaintainer.listModuleNamesByUser(username);
-  moduleNames.forEach(function (name) {
+  moduleNames = yield PrivateModuleMaintainer.listModuleNamesByUser(username);
+  moduleNames.forEach(function(name) {
     if (!map[name]) {
       names.push(name);
     }
@@ -175,19 +175,19 @@ exports.listModuleNamesByUser = function* (username) {
 };
 
 exports.listPublicModulesByUser = function* (username) {
-  var names = yield* exports.listPublicModuleNamesByUser(username);
-  return yield* exports.listModules(names);
+  const names = yield exports.listPublicModuleNamesByUser(username);
+  return yield exports.listModules(names);
 };
 
 // return user all public package names
 exports.listPublicModuleNamesByUser = function* (username) {
-  var sql = 'SELECT distinct(name) AS name FROM module WHERE author=?;';
-  var rows = yield* models.query(sql, [username]);
-  var map = {};
-  var names = rows.map(function (r) {
+  const sql = 'SELECT distinct(name) AS name FROM module WHERE author=?;';
+  const rows = yield models.query(sql, [ username ]);
+  const map = {};
+  const names = rows.map(function(r) {
     return r.name;
-  }).filter(function (name) {
-    var matched = name[0] !== '@';
+  }).filter(function(name) {
+    const matched = name[0] !== '@';
     if (matched) {
       map[name] = 1;
     }
@@ -195,8 +195,8 @@ exports.listPublicModuleNamesByUser = function* (username) {
   });
 
   // find from npm module maintainer table
-  var moduleNames = yield* NpmModuleMaintainer.listModuleNamesByUser(username);
-  moduleNames.forEach(function (name) {
+  const moduleNames = yield NpmModuleMaintainer.listModuleNamesByUser(username);
+  moduleNames.forEach(function(name) {
     if (!map[name]) {
       names.push(name);
     }
@@ -209,77 +209,77 @@ exports.listPublicModuleNamesSince = function* listPublicModuleNamesSince(start)
   if (!(start instanceof Date)) {
     start = new Date(Number(start));
   }
-  var rows = yield Tag.findAll({
-    attributes: ['name'],
+  const rows = yield Tag.findAll({
+    attributes: [ 'name' ],
     where: {
       gmt_modified: {
-        gt: start
-      }
+        gt: start,
+      },
     },
   });
-  var names = {};
-  for (var i = 0; i < rows.length; i++) {
+  const names = {};
+  for (let i = 0; i < rows.length; i++) {
     names[rows[i].name] = 1;
   }
   return Object.keys(names);
 };
 
 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) {
+  const sql = 'SELECT DISTINCT(name) AS name FROM tag ORDER BY name';
+  const rows = yield models.query(sql);
+  return rows.filter(function(row) {
     return !common.isPrivatePackage(row.name);
-  }).map(function (row) {
+  }).map(function(row) {
     return row.name;
   });
 };
 
 exports.listModulesByName = function* (moduleName, attributes) {
-  var mods = yield Module.findAll({
+  const mods = yield Module.findAll({
     where: {
-      name: moduleName
+      name: moduleName,
     },
-    order: [ ['id', 'DESC'] ],
+    order: [[ 'id', 'DESC' ]],
     attributes,
   });
 
-  for (var mod of mods) {
+  for (const mod of mods) {
     parseRow(mod);
   }
   return mods;
 };
 
 exports.getModuleLastModified = function* (name) {
-  var mod = yield Module.find({
+  const mod = yield Module.find({
     where: {
-      name: name,
+      name,
     },
     order: [
-      ['gmt_modified', 'DESC']
+      [ 'gmt_modified', 'DESC' ],
     ],
-    attributes: [ 'gmt_modified' ]
+    attributes: [ 'gmt_modified' ],
   });
   return mod && mod.gmt_modified || null;
 };
 
 // module:update
 exports.saveModule = function* (mod) {
-  var keywords = mod.package.keywords;
+  let keywords = mod.package.keywords;
   if (typeof keywords === 'string') {
-    keywords = [keywords];
+    keywords = [ keywords ];
   }
-  var pkg = stringifyPackage(mod.package);
-  var description = mod.package && mod.package.description || '';
-  var dist = mod.package.dist || {};
+  const pkg = stringifyPackage(mod.package);
+  const description = mod.package && mod.package.description || '';
+  const dist = mod.package.dist || {};
   // dist.tarball = '';
   // dist.shasum = '';
   // dist.size = 0;
-  var publish_time = mod.publish_time || Date.now();
-  var item = yield* Module.findByNameAndVersion(mod.name, mod.version);
+  const publish_time = mod.publish_time || Date.now();
+  let item = yield Module.findByNameAndVersion(mod.name, mod.version);
   if (!item) {
     item = Module.build({
       name: mod.name,
-      version: mod.version
+      version: mod.version,
     });
   }
   item.publish_time = publish_time;
@@ -294,18 +294,18 @@ exports.saveModule = function* (mod) {
   if (item.changed()) {
     item = yield item.save();
   }
-  var result = {
+  const result = {
     id: item.id,
-    gmt_modified: item.gmt_modified
+    gmt_modified: item.gmt_modified,
   };
 
   if (!Array.isArray(keywords)) {
     return result;
   }
 
-  var words = [];
-  for (var i = 0; i < keywords.length; i++) {
-    var w = keywords[i];
+  const words = [];
+  for (let i = 0; i < keywords.length; i++) {
+    let w = keywords[i];
     if (typeof w === 'string') {
       w = w.trim();
       if (w) {
@@ -316,62 +316,62 @@ 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.updateModulePackage = function* (id, pkg) {
-  var mod = yield Module.findById(Number(id));
+  const mod = yield Module.findById(Number(id));
   if (!mod) {
     // not exists
     return null;
   }
   mod.package = stringifyPackage(pkg);
-  return yield mod.save(['package']);
+  return yield mod.save([ 'package' ]);
 };
 
 exports.updateModulePackageFields = function* (id, fields) {
-  var mod = yield exports.getModuleById(id);
+  const mod = yield exports.getModuleById(id);
   if (!mod) {
     return null;
   }
-  var pkg = mod.package || {};
-  for (var k in fields) {
+  const pkg = mod.package || {};
+  for (const k in fields) {
     pkg[k] = fields[k];
   }
   return yield exports.updateModulePackage(id, pkg);
 };
 
 exports.updateModuleReadme = function* (id, readme) {
-  var mod = yield* exports.getModuleById(id);
+  const mod = yield exports.getModuleById(id);
   if (!mod) {
     return null;
   }
-  var pkg = mod.package || {};
+  const 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);
+  const mod = yield exports.getModuleById(id);
   if (!mod) {
     return null;
   }
   mod.description = description;
   // also need to update package.description
-  var pkg = mod.package || {};
+  const pkg = mod.package || {};
   pkg.description = description;
   mod.package = stringifyPackage(pkg);
 
-  return yield mod.save(['description', 'package']);
+  return yield mod.save([ 'description', 'package' ]);
 };
 
 exports.updateModuleLastModified = function* (name) {
-  var row = yield Module.find({
-    where: { name: name },
-    order: [ [ 'gmt_modified', 'DESC' ] ],
+  const row = yield Module.find({
+    where: { name },
+    order: [[ 'gmt_modified', 'DESC' ]],
   });
   if (!row) {
     return null;
@@ -384,33 +384,33 @@ exports.updateModuleLastModified = function* (name) {
 exports.removeModulesByName = function* (name) {
   yield Module.destroy({
     where: {
-      name: name
-    }
+      name,
+    },
   });
 };
 
 exports.removeModulesByNameAndVersions = function* (name, versions) {
   yield Module.destroy({
     where: {
-      name: name,
-      version: versions
-    }
+      name,
+      version: versions,
+    },
   });
 };
 
 // tags
 
 exports.addModuleTag = function* (name, tag, version) {
-  var mod = yield* exports.getModule(name, version);
+  const mod = yield exports.getModule(name, version);
   if (!mod) {
     return null;
   }
 
-  var row = yield* Tag.findByNameAndTag(name, tag);
+  let row = yield Tag.findByNameAndTag(name, tag);
   if (!row) {
     row = Tag.build({
-      name: name,
-      tag: tag
+      name,
+      tag,
     });
   }
   row.module_id = mod.id;
@@ -426,60 +426,60 @@ exports.getModuleTag = function* (name, tag) {
 };
 
 exports.removeModuleTags = function* (name) {
-  return yield Tag.destroy({where: {name: name}});
+  return yield Tag.destroy({ where: { name } });
 };
 
 exports.removeModuleTagsByIds = function* (ids) {
-  return yield Tag.destroy({where: {id: ids}});
+  return yield Tag.destroy({ where: { id: ids } });
 };
 
 exports.removeModuleTagsByNames = function* (moduleName, tagNames) {
   return yield Tag.destroy({
     where: {
       name: moduleName,
-      tag: tagNames
-    }
+      tag: tagNames,
+    },
   });
 };
 
 exports.listModuleTags = function* (name) {
-  return yield Tag.findAll({ where: { name: name } });
+  return yield Tag.findAll({ where: { name } });
 };
 
 // dependencies
 
 // name => dependency
 exports.addDependency = function* (name, dependency) {
-  var row = yield ModuleDependency.find({
+  const row = yield ModuleDependency.find({
     where: {
       name: dependency,
-      dependent: name
-    }
+      dependent: name,
+    },
   });
   if (row) {
     return row;
   }
   return yield ModuleDependency.build({
     name: dependency,
-    dependent: name
+    dependent: name,
   }).save();
 };
 
 exports.addDependencies = function* (name, dependencies) {
-  var tasks = [];
-  for (var i = 0; i < dependencies.length; i++) {
+  const tasks = [];
+  for (let i = 0; i < dependencies.length; i++) {
     tasks.push(exports.addDependency(name, dependencies[i]));
   }
   return yield tasks;
 };
 
 exports.listDependents = function* (dependency) {
-  var items = yield ModuleDependency.findAll({
+  const items = yield ModuleDependency.findAll({
     where: {
-      name: dependency
-    }
+      name: dependency,
+    },
   });
-  return items.map(function (item) {
+  return items.map(function(item) {
     return item.dependent;
   });
 };
@@ -487,26 +487,26 @@ exports.listDependents = function* (dependency) {
 // maintainers
 
 exports.listPublicModuleMaintainers = function* (name) {
-  return yield* NpmModuleMaintainer.listMaintainers(name);
+  return yield NpmModuleMaintainer.listMaintainers(name);
 };
 
 exports.addPublicModuleMaintainer = function* (name, user) {
-  return yield* NpmModuleMaintainer.addMaintainer(name, user);
+  return yield NpmModuleMaintainer.addMaintainer(name, user);
 };
 
 exports.removePublicModuleMaintainer = function* (name, user) {
-  return yield* NpmModuleMaintainer.removeMaintainers(name, user);
+  return yield NpmModuleMaintainer.removeMaintainers(name, user);
 };
 
 // only can add to cnpm maintainer table
 exports.addPrivateModuleMaintainers = function* (name, usernames) {
-  return yield* PrivateModuleMaintainer.addMaintainers(name, usernames);
+  return yield PrivateModuleMaintainer.addMaintainers(name, usernames);
 };
 
 exports.updatePrivateModuleMaintainers = function* (name, usernames) {
-  var result = yield* PrivateModuleMaintainer.updateMaintainers(name, usernames);
+  const result = yield PrivateModuleMaintainer.updateMaintainers(name, usernames);
   if (result.add.length > 0 || result.remove.length > 0) {
-    yield* exports.updateModuleLastModified(name);
+    yield exports.updateModuleLastModified(name);
   }
   return result;
 };
@@ -516,23 +516,23 @@ function* getMaintainerModel(name) {
 }
 
 exports.listMaintainers = function* (name) {
-  var mod = yield* getMaintainerModel(name);
-  var usernames = yield* mod.listMaintainers(name);
+  const mod = yield getMaintainerModel(name);
+  const usernames = yield mod.listMaintainers(name);
   if (usernames.length === 0) {
     return usernames;
   }
-  var users = yield* User.listByNames(usernames);
-  return users.map(function (user) {
+  const users = yield User.listByNames(usernames);
+  return users.map(function(user) {
     return {
       name: user.name,
-      email: user.email
+      email: user.email,
     };
   });
 };
 
 exports.listMaintainerNamesOnly = function* (name) {
-  var mod = yield* getMaintainerModel(name);
-  return yield* mod.listMaintainers(name);
+  const mod = yield getMaintainerModel(name);
+  return yield mod.listMaintainers(name);
 };
 
 exports.removeAllMaintainers = function* (name) {
@@ -543,24 +543,24 @@ exports.removeAllMaintainers = function* (name) {
 };
 
 exports.authMaintainer = function* (packageName, username) {
-  var mod = yield* getMaintainerModel(packageName);
-  var rs = yield [
+  const mod = yield getMaintainerModel(packageName);
+  const rs = yield [
     mod.listMaintainers(packageName),
-    exports.getLatestModule(packageName)
+    exports.getLatestModule(packageName),
   ];
-  var maintainers = rs[0];
-  var latestMod = rs[1];
+  let maintainers = rs[0];
+  const latestMod = rs[1];
   if (maintainers.length === 0) {
     // if not found maintainers, try to get from latest module package info
-    var ms = latestMod && latestMod.package && latestMod.package.maintainers;
+    const ms = latestMod && latestMod.package && latestMod.package.maintainers;
     if (ms && ms.length > 0) {
-      maintainers = ms.map(function (user) {
+      maintainers = ms.map(function(user) {
         return user.name;
       });
     }
   }
 
-  var isMaintainer = false;
+  let isMaintainer = false;
   if (latestMod && !latestMod.package._publish_on_cnpm) {
     // no one can update public package maintainers
     // public package only sync from source npm registry
@@ -573,20 +573,20 @@ exports.authMaintainer = function* (packageName, username) {
   }
 
   return {
-    isMaintainer: isMaintainer,
-    maintainers: maintainers
+    isMaintainer,
+    maintainers,
   };
 };
 
 exports.isMaintainer = function* (name, username) {
-  var result = yield* exports.authMaintainer(name, username);
+  const result = yield exports.authMaintainer(name, username);
   return result.isMaintainer;
 };
 
 // module keywords
 
 exports.addKeyword = function* (data) {
-  var item = yield ModuleKeyword.findByKeywordAndName(data.keyword, data.name);
+  let item = yield ModuleKeyword.findByKeywordAndName(data.keyword, data.name);
   if (!item) {
     item = ModuleKeyword.build(data);
   }
@@ -600,12 +600,12 @@ exports.addKeyword = function* (data) {
 };
 
 exports.addKeywords = function* (name, description, keywords) {
-  var tasks = [];
-  keywords.forEach(function (keyword) {
+  const tasks = [];
+  keywords.forEach(function(keyword) {
     tasks.push(exports.addKeyword({
-      name: name,
-      keyword: keyword,
-      description: description
+      name,
+      keyword,
+      description,
     }));
   });
   return yield tasks;
@@ -615,41 +615,41 @@ exports.addKeywords = function* (name, description, keywords) {
 
 exports.search = function* (word, options) {
   options = options || {};
-  var limit = options.limit || 100;
-  word = word.replace(/^%/, ''); //ignore prefix %
+  const limit = options.limit || 100;
+  word = word.replace(/^%/, ''); // ignore prefix %
 
   // search flows:
   // 1. prefix search by name
   // 2. like search by name
   // 3. keyword equal search
-  var ids = {};
+  let ids = {};
 
-  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++) {
-    ids[rows[i].module_id] = 1;
+  const sql = `SELECT module_id FROM tag WHERE LOWER(name) LIKE LOWER(?) AND tag='latest'
+    ORDER BY name LIMIT ?;`;
+  let rows = yield models.query(sql, [ word + '%', limit ]);
+  for (const row of rows) {
+    ids[row.module_id] = 1;
   }
 
   if (rows.length < 20) {
-    rows = yield* models.query(sql, [ '%' + word + '%', limit ]);
-    for (var i = 0; i < rows.length; i++) {
-      ids[rows[i].module_id] = 1;
+    rows = yield models.query(sql, [ '%' + word + '%', limit ]);
+    for (const row of rows) {
+      ids[row.module_id] = 1;
     }
   }
 
-  var keywordRows = yield ModuleKeyword.findAll({
+  const keywordRows = yield ModuleKeyword.findAll({
     attributes: [ 'name', 'description' ],
     where: {
-      keyword: word
+      keyword: word,
     },
-    limit: limit,
-    order: [ [ 'id', 'DESC' ] ]
+    limit,
+    order: [[ 'id', 'DESC' ]],
   });
 
-  var data = {
+  const data = {
     keywordMatchs: keywordRows,
-    searchMatchs: []
+    searchMatchs: [],
   };
 
   ids = Object.keys(ids);
@@ -657,9 +657,9 @@ exports.search = function* (word, options) {
     data.searchMatchs = yield Module.findAll({
       attributes: [ 'name', 'description' ],
       where: {
-        id: ids
+        id: ids,
       },
-      order: 'name'
+      order: 'name',
     });
   }
 
@@ -669,19 +669,19 @@ exports.search = function* (word, options) {
 // module star
 
 exports.addStar = function* add(name, user) {
-  var row = yield ModuleStar.find({
+  let row = yield ModuleStar.find({
     where: {
-      name: name,
-      user: user
-    }
+      name,
+      user,
+    },
   });
   if (row) {
     return row;
   }
 
   row = ModuleStar.build({
-    name: name,
-    user: user
+    name,
+    user,
   });
   return yield row.save();
 };
@@ -689,39 +689,39 @@ exports.addStar = function* add(name, user) {
 exports.removeStar = function* (name, user) {
   return yield ModuleStar.destroy({
     where: {
-      name: name,
-      user: user
-    }
+      name,
+      user,
+    },
   });
 };
 
 exports.listStarUserNames = function* (moduleName) {
-  var rows = yield ModuleStar.findAll({
+  const rows = yield ModuleStar.findAll({
     where: {
-      name: moduleName
-    }
+      name: moduleName,
+    },
   });
-  return rows.map(function (row) {
+  return rows.map(function(row) {
     return row.user;
   });
 };
 
 exports.listUserStarModuleNames = function* (user) {
-  var rows = yield ModuleStar.findAll({
+  const rows = yield ModuleStar.findAll({
     where: {
-      user: user
-    }
+      user,
+    },
   });
-  return rows.map(function (row) {
+  return rows.map(function(row) {
     return row.name;
   });
 };
 
 // unpublish info
 exports.saveUnpublishedModule = function* (name, pkg) {
-  return yield* ModuleUnpublished.save(name, pkg);
+  return yield ModuleUnpublished.save(name, pkg);
 };
 
 exports.getUnpublishedModule = function* (name) {
-  return yield* ModuleUnpublished.findByName(name);
+  return yield ModuleUnpublished.findByName(name);
 };

services/total.js

@@ -1,24 +1,12 @@
-/**
- * Copyright(c) cnpm and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
+const config = require('../config');
+const models = require('../models');
+const Total = models.Total;
 
-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;';
+const TOTAL_MODULE_SQL = 'SELECT count(distinct(name)) AS count FROM module;';
+const TOTAL_VERSION_SQL = 'SELECT count(name) AS count FROM module;';
+let 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;';
@@ -30,7 +18,7 @@ exports.get = function* () {
   //   GROUP BY TABLE_NAME \
   //   ORDER BY data_length DESC \
   //   LIMIT 0, 200';
-  var rs = yield [
+  const rs = yield [
     // models.query(DB_SIZE_SQL, [config.db]),
     models.queryOne(TOTAL_MODULE_SQL),
     models.queryOne(TOTAL_VERSION_SQL),
@@ -39,16 +27,16 @@ exports.get = function* () {
   ];
 
   // var sizes = rs[0];
-  var mc = rs[0];
-  var vc = rs[1];
-  var uc = rs[2];
-  var info = rs[3] || {};
+  const mc = rs[0];
+  const vc = rs[1];
+  const uc = rs[2];
+  const info = rs[3] || {};
 
   if (typeof info.module_delete === 'string') {
     info.module_delete = Number(info.module_delete);
   }
 
-  var total = {
+  const total = {
     data_tables: {},
     disk_size: 0,
     data_size: 0,
@@ -89,10 +77,10 @@ exports.get = function* () {
 };
 
 exports.getTotalInfo = function* () {
-  var row = yield Total.find({
+  const row = yield Total.find({
     where: {
-      name: 'total'
-    }
+      name: 'total',
+    },
   });
   if (row && typeof row.module_delete === 'string') {
     row.module_delete = Number(row.module_delete);
@@ -101,37 +89,37 @@ exports.getTotalInfo = function* () {
 };
 
 exports.plusDeleteModule = function* () {
-  var sql = 'UPDATE total SET module_delete=module_delete+1 WHERE name=\'total\'';
-  return yield* models.query(sql);
+  const 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\'';
-  return yield* models.query(sql, [Number(time)]);
+  const 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\'';
-  return yield* models.query(sql, [Number(time)]);
+  const 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\'';
-  return yield* models.query(sql, [status]);
+  const sql = 'UPDATE total SET sync_status=? WHERE name=\'total\'';
+  return yield models.query(sql, [ status ]);
 };
 
 exports.updateSyncNum = function* (params) {
-  var args = [
+  const args = [
     params.syncStatus,
     params.need || 0,
     params.success || 0,
     params.fail || 0,
     params.left || 0,
-    params.lastSyncModule
+    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);
+  const 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);
 };

services/user.js

@@ -14,11 +14,11 @@
  * Module dependencies.
  */
 
-var config = require('../config');
-var User = require('../models').User;
+const config = require('../config');
+const User = require('../models').User;
 
 if (!config.userService) {
-  var DefaultUserService = require('./default_user_service');
+  const DefaultUserService = require('./default_user_service');
   config.userService = new DefaultUserService();
   config.customUserService = false;
 } else {
@@ -38,57 +38,57 @@ function convertUser(user) {
 }
 
 exports.auth = function* (login, password) {
-  var user = yield* config.userService.auth(login, password);
+  const user = yield config.userService.auth(login, password);
   return convertUser(user);
 };
 
 exports.get = function* (login) {
-  var user = yield* config.userService.get(login);
+  const user = yield config.userService.get(login);
   return convertUser(user);
 };
 
 exports.list = function* (logins) {
-  var users = yield* config.userService.list(logins);
+  const users = yield config.userService.list(logins);
   return users.map(convertUser);
 };
 
 exports.search = function* (query, options) {
-  var users = yield* config.userService.search(query, options);
+  const users = yield config.userService.search(query, options);
   return users.map(convertUser);
 };
 
 exports.getAndSave = function* (login) {
   if (config.customUserService) {
-    var user = yield* exports.get(login);
+    const user = yield exports.get(login);
     if (user) {
-      var data = {
-        user: user
+      const data = {
+        user,
       };
-      yield* User.saveCustomUser(data);
+      yield User.saveCustomUser(data);
     }
   }
-  return yield* User.findByName(login);
+  return yield User.findByName(login);
 };
 
 exports.authAndSave = function* (login, password) {
-  var user = yield* exports.auth(login, password);
+  const user = yield exports.auth(login, password);
   if (user) {
     if (config.customUserService) {
       // make sure sync user meta to cnpm database
-      var data = {
+      const data = {
         rev: Date.now() + '-' + user.login,
-        user: user
+        user,
       };
-      yield* User.saveCustomUser(data);
+      yield User.saveCustomUser(data);
     }
   }
   return user;
 };
 
 exports.add = function* (user) {
-  return yield* User.add(user);
+  return yield User.add(user);
 };
 
 exports.update = function* (user) {
-  return yield* User.update(user);
+  return yield User.update(user);
 };

sync/index.js

@@ -18,6 +18,8 @@ switch (config.syncModel) {
   case 'exist':
     sync = require('./sync_exist');
     break;
+  default:
+    break;
 }
 
 if (!sync && config.enableCluster) {
@@ -47,7 +49,7 @@ if (!syncInterval || syncInterval < minSyncInterval) {
 if (sync) {
   // the same time only sync once
   let syncing = false;
-  const syncFn = co.wrap(function*() {
+  const syncFn = co.wrap(function* () {
     debug('mode: %s, syncing: %s', config.syncModel, syncing);
     if (!syncing) {
       syncing = true;
@@ -83,7 +85,7 @@ if (sync) {
 if (config.syncPopular) {
   const sync = require('./sync_popular');
   let syncing = false;
-  const syncFn = co.wrap(function*() {
+  const syncFn = co.wrap(function* () {
     if (syncing) {
       return;
     }
@@ -115,7 +117,7 @@ if (config.syncPopular) {
 if (config.syncChangesStream) {
   const sync = require('./changes_stream_syncer');
   let syncing = false;
-  const syncFn = co.wrap(function*() {
+  const syncFn = co.wrap(function* () {
     if (syncing) {
       return;
     }
@@ -137,7 +139,7 @@ if (config.syncChangesStream) {
 function sendMailToAdmin(err, result, syncTime) {
   result = result || {};
   const to = [];
-  for (var name in config.admins) {
+  for (const 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.',

sync/status.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var debug = require('debug')('cnpmjs.org:sync:status');
-var co = require('co');
-var Total = require('../services/total');
+const debug = require('debug')('cnpmjs.org:sync:status');
+const co = require('co');
+const Total = require('../services/total');
 
 function Status(options) {
   this.need = options.need;
@@ -12,8 +12,8 @@ function Status(options) {
   this.left = options.need;
 }
 
-Status.prototype.log = function (syncDone) {
-  var params = {
+Status.prototype.log = function(syncDone) {
+  const params = {
     syncStatus: syncDone ? 0 : 1,
     need: this.need,
     success: this.successes,
@@ -23,43 +23,43 @@ Status.prototype.log = function (syncDone) {
   };
   co(function* () {
     yield Total.updateSyncNum(params);
-  }).catch(function () {});
+  }).catch(function() {});
 };
 
-Status.prototype.start = function () {
+Status.prototype.start = function() {
   if (this.started) {
     return;
   }
   this.started = true;
-  //every 30s log it into mysql
+  // every 30s log it into mysql
   this.timer = setInterval(this.log.bind(this), 30000);
 };
 
-Status.prototype.stop = function () {
+Status.prototype.stop = function() {
   this.log(true);
   clearInterval(this.timer);
   this.timer = null;
   this.started = false;
 };
 
-Status.init = function (options, worker) {
-  var status = new Status(options);
+Status.init = function(options, worker) {
+  const status = new Status(options);
   status.start();
-  worker.on('success', function (moduleName) {
+  worker.on('success', function(moduleName) {
     debug('sync [%s] success', moduleName);
     status.lastSyncModule = moduleName;
     status.successes++;
     status.left--;
   });
-  worker.on('fail', function () {
+  worker.on('fail', function() {
     status.fails++;
     status.left--;
   });
-  worker.on('add', function () {
+  worker.on('add', function() {
     status.left++;
   });
 
-  worker.on('end', function () {
+  worker.on('end', function() {
     status.stop();
   });
 };

sync/sync_all.js

@@ -1,44 +1,45 @@
 'use strict';
 
-var thunkify = require('thunkify-wrap');
-var config = require('../config');
-var Status = require('./status');
-var npmService = require('../services/npm');
-var totalService = require('../services/total');
-var SyncModuleWorker = require('../controllers/sync_module_worker');
-var logger = require('../common/logger');
+const thunkify = require('thunkify-wrap');
+const config = require('../config');
+const Status = require('./status');
+const npmService = require('../services/npm');
+const totalService = require('../services/total');
+const SyncModuleWorker = require('../controllers/sync_module_worker');
+const logger = require('../common/logger');
 
 /**
  * when sync from official at the first time
  * get all packages by short and restart from last synced module
- * @param {String} lastSyncModule
+ * @param {String} lastSyncModule - last sync module name
+ * @return {Array} module names
  */
 function* getFirstSyncPackages(lastSyncModule) {
-  var pkgs = yield* npmService.getShort();
+  const pkgs = yield npmService.getShort();
   if (!lastSyncModule) {
     return pkgs;
   }
   // start from last success
-  var lastIndex = pkgs.indexOf(lastSyncModule);
+  const lastIndex = pkgs.indexOf(lastSyncModule);
   if (lastIndex > 0) {
     return pkgs.slice(lastIndex);
   }
 }
 
 module.exports = function* sync() {
-  var syncTime = Date.now();
-  var info = yield* totalService.getTotalInfo();
+  let syncTime = Date.now();
+  const info = yield totalService.getTotalInfo();
   if (!info) {
     throw new Error('can not found total info');
   }
 
-  var packages;
+  let packages;
   logger.syncInfo('Last sync time %s', new Date(info.last_sync_time));
   if (!info.last_sync_time) {
     logger.syncInfo('First time sync all packages from official registry');
-    packages = yield* getFirstSyncPackages(info.last_sync_module);
+    packages = yield getFirstSyncPackages(info.last_sync_module);
   } else {
-    var result = yield npmService.fetchUpdatesSince(info.last_sync_time);
+    const result = yield npmService.fetchUpdatesSince(info.last_sync_time);
     syncTime = result.lastModified;
     packages = result.names;
   }
@@ -50,7 +51,7 @@ module.exports = function* sync() {
   }
   logger.syncInfo('Total %d packages to sync: %j', packages.length, packages);
 
-  var worker = new SyncModuleWorker({
+  const worker = new SyncModuleWorker({
     username: 'admin',
     name: packages,
     noDep: true,
@@ -61,12 +62,12 @@ module.exports = function* sync() {
     need: packages.length,
   }, worker);
   worker.start();
-  var end = thunkify.event(worker);
+  const end = thunkify.event(worker);
   yield end();
 
   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
+  // only when all succss, set last sync time
   if (!worker.fails.length) {
     yield totalService.setLastSyncTime(syncTime);
   }