Release 2.6.1

feat(sync): monitor sync status

History.md

@@ -1,4 +1,24 @@
 
+2.6.1 / 2016-01-12
+==================
+
+  * fix: source registry is not cnpm, ignore check status
+
+2.6.0 / 2016-01-12
+==================
+
+  * feat(sync): monitor sync status
+  * chore(package): update agentkeepalive to version 2.0.3
+  * fix SequelizeDatabaseError: ER_NO_SUCH_TABLE: Table 'qnpm.total' doesn't exist\nreproduce this bug:\nthe first startup of cnpmjs.org
+  * chore(package): update moment to version 2.11.0
+  * chore(package): update xss to version 0.2.10
+  * chore(package): update pg-hstore to version 2.3.2
+  * chore(package): update mini-logger to version 1.1.0
+  * chore(package): update urllib to version 2.6.0
+  * fix: row.package will json parse error
+  * remove bluebird
+  * chore(package): update utility to version 1.6.0
+
 2.5.1 / 2015-12-02
 ==================
 

Makefile

@@ -112,7 +112,7 @@ autod: install
 	@node_modules/.bin/autod -w \
 		--prefix "~" \
 		--exclude public,view,docs,backup,coverage \
-		--dep bluebird,mysql \
+		--dep mysql \
 		--keep should,supertest,should-http,chunkstream,mm,pedding
 	@$(MAKE) install
 

bin/cli.js

@@ -83,9 +83,10 @@ function start(options) {
   debug('save config %s to %s', configJSON, configfile);
 
   // if sqlite db file not exists, init first
-  initDatabase();
+  initDatabase(function() {
+    require('../dispatch');
+  });
 
-  require('../dispatch');
   fs.writeFileSync(path.join(dataDir, 'pid'), process.pid + '');
 }
 
@@ -105,7 +106,7 @@ function stop(options) {
   }
 }
 
-function initDatabase() {
+function initDatabase(callback) {
   var models = require('../models');
 
   models.sequelize.sync({ force: false })
@@ -117,6 +118,7 @@ function initDatabase() {
           throw err;
         } else {
           console.log('[models/init_script.js] `sqlite` sequelize sync and init success');
+          callback();
         }
       });
     })

controllers/registry/package/list.js

@@ -1,11 +1,9 @@
-/**!
- * cnpmjs.org - controllers/registry/package/list.js
- *
- * Copyright(c) fengmk2 and other contributors.
+/**
+ * Copyright(c) cnpm and other contributors.
  * MIT Licensed
  *
  * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
+ *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
  */
 
 'use strict';
@@ -130,6 +128,10 @@ module.exports = function* list() {
   for (var i = 0; i < rows.length; i++) {
     var row = rows[i];
     var pkg = row.package;
+    // pkg is string ... ignore it
+    if (typeof pkg === 'string') {
+      continue;
+    }
     common.setDownloadURL(pkg, this);
     pkg._cnpm_publish_time = row.publish_time;
     versions[pkg.version] = pkg;

controllers/registry/user_package.js

@@ -42,15 +42,10 @@ exports.list = function* () {
   }
 
   var data = yield tasks;
-
-  var keys = Object.keys(data);
-  for (var k = 0; k < keys.length; k++) {
-    var key = keys[k];
-    // make empty object as undefined
-    if (data[key].length === 0) {
-      data[key] = undefined;
+  for (var k in data) {
+    if (data[k].length === 0) {
+      data[k] = undefined;
     }
   }
-
   this.body = data;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmjs.org",
-  "version": "2.5.1",
+  "version": "2.6.1",
   "description": "Private npm registry and web for Enterprise, base on MySQL and Simple Store Service",
   "main": "index.js",
   "scripts": {
@@ -13,8 +13,7 @@
     "cnpmjs.org": "bin/cli.js"
   },
   "dependencies": {
-    "agentkeepalive": "~1.2.0",
-    "bluebird": "~3.0.6",
+    "agentkeepalive": "~2.0.3",
     "bytes": "~2.2.0",
     "cfork": "~1.4.0",
     "co": "~4.6.0",
@@ -39,12 +38,11 @@
     "koa-middlewares": "~2.1.0",
     "koa-mock": "~1.5.0",
     "koa-safe-jsonp": "~0.3.0",
-    "lodash": "^3.10.1",
     "markdown-it": "~3.0.6",
     "mime": "~1.3.4",
-    "mini-logger": "~1.0.0",
+    "mini-logger": "~1.1.0",
     "mkdirp": "~0.5.0",
-    "moment": "~2.10.6",
+    "moment": "~2.11.0",
     "mysql": "~2.5.4",
     "nodemailer": "~1.3.0",
     "semver": "~5.1.0",
@@ -52,9 +50,9 @@
     "thunkify-wrap": "~1.0.4",
     "treekill": "~1.0.0",
     "tunnel-agent": "^0.4.0",
-    "urllib": "~2.5.0",
+    "urllib": "~2.6.0",
     "utility": "~1.6.0",
-    "xss": "~0.2.8"
+    "xss": "~0.2.10"
   },
   "devDependencies": {
     "autod": "*",
@@ -68,7 +66,7 @@
     "node-dev": "*",
     "pedding": "*",
     "pg": "~4.4.2",
-    "pg-hstore": "~2.3.1",
+    "pg-hstore": "~2.3.2",
     "should": "~7.1.0",
     "should-http": "*",
     "sqlite3": "*",

servers/registry.js

@@ -15,7 +15,6 @@
  * Module dependencies.
  */
 
-global.Promise = require('bluebird');
 var koa = require('koa');
 var app = module.exports = koa();
 var http = require('http');

servers/web.js

@@ -15,7 +15,6 @@
  * Module dependencies.
  */
 
-global.Promise = require('bluebird');
 var opensearch = require('../middleware/opensearch');
 var notFound = require('../middleware/web_not_found');
 var staticCache = require('../middleware/static');

services/package.js

@@ -1,4 +1,4 @@
-/**!
+/**
  * Copyright(c) cnpm and other contributors.
  * MIT Licensed
  *
@@ -12,8 +12,6 @@
  * Module dependencies.
  */
 
-var _ = require('lodash');
-
 var models = require('../models');
 var common = require('./common');
 var Tag = models.Tag;
@@ -221,11 +219,11 @@ exports.listPublicModuleNamesSince = function* (start) {
 exports.listAllPublicModuleNames = function* () {
   var sql = 'SELECT DISTINCT(name) AS name FROM tag ORDER BY name';
   var rows = yield models.query(sql);
-  return _.chain(rows).filter(function (row) {
+  return rows.filter(function (row) {
     return !common.isPrivatePackage(row.name);
   }).map(function (row) {
     return row.name;
-  }).value();
+  });
 };
 
 exports.listModulesByName = function* (moduleName) {
@@ -235,10 +233,11 @@ exports.listModulesByName = function* (moduleName) {
     },
     order: [ ['id', 'DESC'] ]
   });
-  return _.chain(mods).map(function (mod) {
+
+  for (var mod of mods) {
     parseRow(mod);
-    return mod;
-  }).value();
+  }
+  return mods;
 };
 
 exports.getModuleLastModified = function* (name) {

services/total.js

@@ -1,11 +1,9 @@
-/**!
- * cnpmjs.org - services/total.js
- *
- * Copyright(c) fengmk2 and other contributors.
+/**
+ * Copyright(c) cnpm and other contributors.
  * MIT Licensed
  *
  * Authors:
- *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)
+ *   fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
  */
 
 'use strict';

sync/index.js

@@ -1,11 +1,10 @@
-/**!
- * cnpmjs.org - sync/index.js
- *
- * Copyright(c) cnpmjs.org and other contributors.
+/**
+ * Copyright(c) cnpm and other contributors.
  * MIT Licensed
  *
  * Authors:
  *  dead_horse <dead_horse@qq.com> (http://deadhorse.me)
+ *  fengmk2 <fengmk2@gmail.com> (http://fengmk2.com)
  */
 
 'use strict';
@@ -14,7 +13,6 @@
  * Module dependencies.
  */
 
-global.Promise = require('bluebird');
 var debug = require('debug')('cnpmjs.org:sync:index');
 var co = require('co');
 var ms = require('humanize-ms');
@@ -49,7 +47,8 @@ function onerror(err) {
 
 //set sync_status = 0 at first
 co(function* () {
-  yield* totalService.updateSyncStatus(0);
+  yield totalService.updateSyncStatus(0);
+  yield checkSyncStatus();
 }).catch(onerror);
 
 var syncInterval = ms(config.syncInterval);
@@ -68,7 +67,7 @@ var syncFn = co.wrap(function* () {
     var data;
     var error;
     try {
-      data = yield* sync();
+      data = yield sync();
     } catch (err) {
       error = err;
       error.message += ' (sync package error)';
@@ -80,6 +79,9 @@ var syncFn = co.wrap(function* () {
     }
     syncing = false;
   }
+
+  // check last_sync_time and last_exist_sync_time
+  yield checkSyncStatus();
 });
 
 if (sync) {
@@ -104,7 +106,7 @@ var syncPopularFn = co.wrap(function* syncPopular() {
   var data;
   var error;
   try {
-    data = yield* startSyncPopular();
+    data = yield startSyncPopular();
   } catch (err) {
     error = err;
     error.message += ' (sync package error)';
@@ -174,3 +176,27 @@ function sendMailToAdmin(err, result, syncTime) {
     });
   }
 }
+
+function* checkSyncStatus() {
+  // if source registry not cnpm, ignore it. e.g.: cnpmjs.org source registry is npmjs.org
+  if (!config.sourceNpmRegistryIsCNpm) {
+    return;
+  }
+  var total = yield totalService.getTotalInfo();
+  var lastSyncTime;
+  if (config.syncModel === 'all') {
+    lastSyncTime = total.last_sync_time;
+  } else if (config.syncModel === 'exist') {
+    lastSyncTime = total.last_exist_sync_time;
+  }
+  debug('checkSyncStatus start, lastSyncTime: %s, syncInterval: %s', lastSyncTime, syncInterval);
+  if (!lastSyncTime) {
+    return;
+  }
+  var diff = Date.now() - lastSyncTime;
+  if (diff > syncInterval * 2) {
+    var err = new Error('Last sync time is expired in ' + diff + ' ms, lastSyncTime: ' + new Date(lastSyncTime));
+    err.name = 'SyncExpriedError';
+    sendMailToAdmin(err, null, new Date());
+  }
+}