fix

Author: lisong

CHANGELOG.md

@@ -1 +1,12 @@
-# Changelog for code-push-server
+# Changelog for code-push-server
+
+## 0.3.0
+
+- 支持灰度发布
+- 适配`code-push app add` 命令，应用不在以名字区分平台，而是以类型区分平台
+  - 数据库表apps新增字段`os`,`platform`
+- 完善`code-push release/release-react/release-cordova` 命令
+  - 数据库表packages新增`is_disabled`,`rollout`字段
+- 适配`code-push patch`命令
+- 新增`log_report_download`,`log_report_deploy`日志表
+- 升级npm依赖包

README.md

@@ -19,7 +19,7 @@ CodePush Server is a CodePush progam server! microsoft CodePush cloud is slow in
 
 ## 正确使用code-push热更新
 
-- 苹果允许使用热更新[Apple's developer agreement](https://developer.apple.com/programs/ios/information/iOS_Program_Information_4_3_15.pdf), 但是规定不能弹框提示用户更新，影响用户体验。 而Google Play恰好相反，必须弹框告知用户更新。然而中国的android市场都必须关闭更新弹框，否则会在审核应用时以“请上传最新版本的二进制应用包”驳回应用。
+- 苹果App允许使用热更新[Apple's developer agreement](https://developer.apple.com/programs/ios/information/iOS_Program_Information_4_3_15.pdf), 为了不影响用户体验，规定必须使用静默更新。 Google Play不能使用静默更新，必须弹框告知用户App有更新。中国的android市场必须采用静默更新（如果弹框提示，App会被“请上传最新版本的二进制应用包”原因驳回）。
 - react-native 不同平台bundle包不一样，在使用code-push-server的时候必须创建不同的应用来区分(eg. CodePushDemo-ios 和 CodePushDemo-android)
 - react-native-code-push只更新资源文件,不会更新java和Objective C，所以npm升级依赖包版本的时候，如果依赖包使用的本地化实现, 这时候必须更改应用版本号(ios修改Info.plist中的CFBundleShortVersionString, android修改build.gradle中的versionName), 然后重新编译app发布到应用商店。
 - 推荐使用code-push release-react 命令发布应用，该命令合并了打包和发布命令(eg. code-push release-react CodePushDemo-ios ios -d Production)

app.js

@@ -111,7 +111,7 @@ if (app.get('env') === 'development') {
       res.send(err.message);
       log.debug(err);
     } else {
-      res.status(err.status || 500).send(`服务器繁忙，请稍后再试!`);
+      res.status(err.status || 500).send(err.message);
       log.error(err);
     }
   });

bin/db

@@ -93,13 +93,14 @@ if (command === 'init') {
             version_no = _.get(rs,'0.version', '0.0.1');
         } catch (e) {
         }
-        if (version_no == '0.2.15') {
+        if (version_no == '0.3.0') {
             console.log('Everything up-to-date.');
             process.exit(0);
         }
         var allSqlFile = [
-            {version:'0.2.14', 'path':path.resolve(__dirname, '../sql/codepush-v0.2.14.sql')},
-            {version:'0.2.15', 'path':path.resolve(__dirname, '../sql/codepush-v0.2.15.sql')}
+            {version:'0.2.14', 'path':path.resolve(__dirname, '../sql/codepush-v0.2.14-patch.sql')},
+            {version:'0.2.15', 'path':path.resolve(__dirname, '../sql/codepush-v0.2.15-patch.sql')},
+            {version:'0.3.0', 'path':path.resolve(__dirname, '../sql/codepush-v0.3.0-patch.sql')}
         ];
         for (var i = 0; i < allSqlFile.length; i++) {
             if(!_.gt(allSqlFile[i]['version'], version_no)) {

config/config.js

@@ -66,7 +66,9 @@ config.development = {
     // storageType which is your binary package files store. options value is ("local" | "qiniu" | "s3")
     storageType: process.env.STORAGE_TYPE || "local",
     // options value is (true | false), when it's true, it will cache updateCheck results in redis.
-    updateCheckCache: false
+    updateCheckCache: false,
+    // options value is (true | false), when it's true, it will cache rollout results in redis
+    rolloutClientUniqueIdCache: false,
   },
   // Config for smtp email，register module need validate user email project source https://github.com/nodemailer/nodemailer
   smtpConfig:{

config/config.test.js

@@ -25,7 +25,8 @@ config.test = {
     diffNums: 3,
     dataDir: os.tmpdir(),
     storageType: "local",
-    updateCheckCache: true
+    updateCheckCache: true,
+    rolloutClientUniqueIdCache: false,
   },
   smtpConfig: false,
   redis: {

config/config.testwin.js

@@ -25,7 +25,8 @@ config.test = {
     diffNums: 3,
     dataDir: os.tmpdir(),
     storageType: "local",
-    updateCheckCache: true
+    updateCheckCache: true,
+    rolloutClientUniqueIdCache: false,
   },
   smtpConfig: false,
   redis: {

core/const.js

@@ -34,5 +34,8 @@ define("IS_DISABLED_NO", 0);
 define("RELEAS_EMETHOD_PROMOTE", 'Promote');
 define("RELEAS_EMETHOD_UPLOAD", 'Upload');
 
+define("DEPLOYMENT_SUCCEEDED", 1);
+define("DEPLOYMENT_FAILED", 2);
+
 
 

core/services/client-manager.js

@@ -5,6 +5,9 @@ var _ = require('lodash');
 var common = require('../utils/common');
 var factory = require('../utils/factory');
 var AppError = require('../app-error');
+var config    = require('../config');
+var log4js = require('log4js');
+var log = log4js.getLogger("cps:ClientManager");
 
 var proto = module.exports = function (){
   function ClientManager() {
@@ -15,6 +18,7 @@ var proto = module.exports = function (){
 };
 
 const UPDATE_CHECK = "UPDATE_CHECK";
+const CHOSEN_MAN = "CHOSEN_MAN";
 const EXPIRED = 600;
 
 proto.getUpdateCheckCacheKey = function(deploymentKey, appVersion, label, packageHash) {
@@ -37,9 +41,9 @@ proto.clearUpdateCheckCache = function(deploymentKey, appVersion, label, package
   .finally(() => client.quit());
 }
 
-proto.updateCheckFromCache = function(deploymentKey, appVersion, label, packageHash) {
+proto.updateCheckFromCache = function(deploymentKey, appVersion, label, packageHash, clientUniqueId) {
   const self = this;
-  var updateCheckCache = _.get(require('../config'), 'common.updateCheckCache', false);
+  var updateCheckCache = _.get(config, 'common.updateCheckCache', false);
   if (updateCheckCache === false) {
     return self.updateCheck(deploymentKey, appVersion, label, packageHash);
   }
@@ -49,14 +53,16 @@ proto.updateCheckFromCache = function(deploymentKey, appVersion, label, packageH
   .then((data) => {
     if (data) {
       try {
+        log.debug('updateCheckFromCache read from catch');
         var obj = JSON.parse(data);
         return obj;
       } catch (e) {
       }
     }
-    return self.updateCheck(deploymentKey, appVersion, label, packageHash)
+    return self.updateCheck(deploymentKey, appVersion, label, packageHash, clientUniqueId)
     .then((rs) => {
       try {
+        log.debug('updateCheckFromCache read from db');
         var strRs = JSON.stringify(rs);
         client.setexAsync(redisCacheKey, EXPIRED, strRs);
       } catch (e) {
@@ -67,7 +73,51 @@ proto.updateCheckFromCache = function(deploymentKey, appVersion, label, packageH
   .finally(() => client.quit());
 }
 
-proto.updateCheck = function(deploymentKey, appVersion, label, packageHash) {
+proto.getChosenManCacheKey = function(deploymentKey, appVersion, clientUniqueId, rollout) {
+  return [CHOSEN_MAN, deploymentKey, appVersion, clientUniqueId, rollout].join(':');
+}
+
+proto.random = function(rollout) {
+  var r = Math.ceil(Math.random()*10000);
+  if (r < rollout * 100) {
+    return Promise.resolve(true);
+  } else {
+    return Promise.resolve(false);
+  }
+}
+
+proto.chosenMan = function (rollout, deploymentKey, appVersion, clientUniqueId) {
+  var self = this;
+  if (rollout >= 100) {
+    return Promise.resolve(true);
+  }
+  var rolloutClientUniqueIdCache = _.get(config, 'common.rolloutClientUniqueIdCache', false);
+  if (rolloutClientUniqueIdCache === false) {
+    return self.random(rollout);
+  } else {
+    var client = factory.getRedisClient("default");
+    var redisCacheKey = self.getChosenManCacheKey(deploymentKey, appVersion, clientUniqueId, rollout);
+    return client.getAsync(redisCacheKey)
+    .then((data) => {
+      if (data == 1) {
+        return true;
+      } else if (data == 2) {
+        return false;
+      } else {
+        return self.random(rollout)
+        .then((r)=>{
+           return client.setexAsync(redisCacheKey, 60*60*24*7, r ? 1:2)
+            .then(()=>{
+              return r;
+            });
+        });
+      }
+    })
+    .finally(() => client.quit());
+  }
+}
+
+proto.updateCheck = function(deploymentKey, appVersion, label, packageHash, clientUniqueId) {
   var rs = {
     downloadURL: "",
     downloadUrl: "",
@@ -79,15 +129,17 @@ proto.updateCheck = function(deploymentKey, appVersion, label, packageHash) {
     label: "",
     packageSize: 0,
     updateAppVersion: false,
-    shouldRunBinaryVersion: false
+    shouldRunBinaryVersion: false,
+    rollout: 100
   };
+  var self = this;
   if (_.isEmpty(deploymentKey) || _.isEmpty(appVersion)) {
     return Promise.reject(new AppError.AppError("please input deploymentKey and appVersion"))
   }
   return models.Deployments.findOne({where: {deployment_key: deploymentKey}})
   .then((dep) => {
     if (_.isEmpty(dep)) {
-      throw new AppError.AppError('does not found deployment');
+      throw new AppError.AppError('Not found deployment, check deployment key is right.');
     }
     return models.DeploymentsVersions.findOne({where: {deployment_id: dep.id, app_version: appVersion}});
   })
@@ -101,22 +153,20 @@ proto.updateCheck = function(deploymentKey, appVersion, label, packageHash) {
       if (packages
         && _.eq(packages.deployment_id, deploymentsVersions.deployment_id)
         && !_.eq(packages.package_hash, packageHash)) {
-        rs.downloadURL = common.getBlobDownloadUrl(_.get(packages, 'blob_url'));
-        rs.downloadUrl = common.getBlobDownloadUrl(_.get(packages, 'blob_url'));
+        rs.downloadUrl = rs.downloadURL = common.getBlobDownloadUrl(_.get(packages, 'blob_url'));
         rs.description = _.get(packages, 'description', '');
-        rs.isAvailable = true;
+        rs.isAvailable = _.eq(packages.is_disabled, 1) ? false : true;
         rs.isMandatory = _.eq(packages.is_mandatory, 1) ? true : false;
         rs.appVersion = appVersion;
         rs.packageHash = _.get(packages, 'package_hash', '');
         rs.label = _.get(packages, 'label', '');
         rs.packageSize = _.get(packages, 'size', 0);
-        rs.shouldRunBinaryVersion = false;
+        rs.rollout = _.get(packages, 'rollout', 100);
       }
       return packages;
     })
-
     .then((packages) => {
-      //差异化更新
+      //增量更新
       if (!_.isEmpty(packages) && !_.eq(_.get(packages, 'package_hash', ""), packageHash)) {
         return models.PackagesDiff.findOne({where: {package_id:packages.id, diff_against_package_hash: packageHash}})
         .then((diffPackage) => {
@@ -159,24 +209,45 @@ proto.getPackagesInfo = function (deploymentKey, label) {
 proto.reportStatusDownload = function(deploymentKey, label, clientUniqueId) {
   return this.getPackagesInfo(deploymentKey, label)
   .then((packages) => {
-    return models.PackagesMetrics.addOneOnDownloadById(packages.id);
+    return Promise.all([
+      models.PackagesMetrics.addOneOnDownloadById(packages.id),
+      models.LogReportDownload.create({
+        package_id: packages.id,
+        client_unique_id: clientUniqueId
+      })
+    ]);
   });
 };
 
 proto.reportStatusDeploy = function (deploymentKey, label, clientUniqueId, others) {
   return this.getPackagesInfo(deploymentKey, label)
   .then((packages) => {
+    var constConfig = require('../const');
     var status =  _.get(others, "status");
     var packageId = packages.id;
     if (_.eq(status, "DeploymentSucceeded")) {
       return Promise.all([
+        models.LogReportDeploy.create({
+          package_id: packageId,
+          client_unique_id: clientUniqueId,
+          previous_label: _.get(others, 'previousLabelOrAppVersion'),
+          previous_deployment_key: _.get(others, 'previousDeploymentKey'),
+          status: constConfig.DEPLOYMENT_SUCCEEDED
+        }),
         models.PackagesMetrics.addOneOnInstalledById(packageId),
         models.PackagesMetrics.addOneOnActiveById(packageId),
       ]);
     } else if (_.eq(status, "DeploymentFailed")) {
       return Promise.all([
+        models.LogReportDeploy.create({
+          package_id: packageId,
+          client_unique_id: clientUniqueId,
+          previous_label: _.get(others, 'previousLabelOrAppVersion'),
+          previous_deployment_key: _.get(others, 'previousDeploymentKey'),
+          status: constConfig.DEPLOYMENT_FAILED
+        }),
         models.PackagesMetrics.addOneOnInstalledById(packageId),
-        models.PackagesMetrics.addOneOnFailedById(packageId)
+        models.PackagesMetrics.addOneOnFailedById(packageId),
       ]);
     }else {
       return;

core/services/package-manager.js

@@ -12,8 +12,8 @@ var common = require('../utils/common');
 var os = require('os');
 var path = require('path');
 var AppError = require('../app-error');
-var log4js = require('log4js');
 var constConfig = require('../const');
+var log4js = require('log4js');
 var log = log4js.getLogger("cps:PackageManager");
 
 var proto = module.exports = function (){
@@ -459,15 +459,15 @@ proto.promotePackage = function (sourceDeploymentId, destDeploymentId, params) {
       originalLabel: packages.label,
       originalDeployment: sourceDeployment.name
     };
-    if (_.isBoolean(isMandatory)) {
-      create_params.is_mandatory = params.isMandatory ? constConfig.IS_MANDATORY_YES : constConfig.IS_MANDATORY_NO;
+    if (_.isBoolean(params.isMandatory)) {
+      create_params.isMandatory = params.isMandatory ? constConfig.IS_MANDATORY_YES : constConfig.IS_MANDATORY_NO;
     } else {
-      create_params.is_mandatory = packages.is_mandatory
+      create_params.isMandatory = packages.is_mandatory
     }
-    if (_.isBoolean(isDisabled)) {
-      create_params.is_disabled = params.isDisabled ? constConfig.IS_DISABLED_YES : constConfig.IS_DISABLED_NO;
+    if (_.isBoolean(params.isDisabled)) {
+      create_params.isMandatory = params.isDisabled ? constConfig.IS_DISABLED_YES : constConfig.IS_DISABLED_NO;
     } else {
-      create_params.is_disabled = packages.is_disabled
+      create_params.isMandatory = packages.is_disabled
     }
     return self.createPackage(destDeploymentId, deploymentsVersions.app_version, packages.package_hash, packages.manifest_blob_url, packages.blob_url, create_params);
   });
@@ -509,8 +509,8 @@ proto.rollbackPackage = function (deploymentVersionId, targetLabel, rollbackUid)
         releaseMethod: 'Rollback',
         releaseUid: rollbackUid,
         isMandatory: rollbackPackage.is_mandatory,
-        isDisabled: packages.is_disabled,
-        rollout: packages.rollout,
+        isDisabled: rollbackPackage.is_disabled,
+        rollout: rollbackPackage.rollout,
         size: rollbackPackage.size,
         description: rollbackPackage.description,
         originalLabel: rollbackPackage.label,