@zeppos/zeus-cli 1.5.9 → 1.5.13

package/bin/main.js

@@ -63,11 +63,14 @@ var proxy = function (args) { return __awaiter(void 0, void 0, void 0, function
     var res;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4, (0, pre_check_1.checkVersion)()];
+            case 0: return [4, (0, pre_check_1.clearDevicesCache)()];
             case 1:
                 _a.sent();
-                return [4, (0, pre_check_1.initVariable)(args)];
+                return [4, (0, pre_check_1.checkVersion)()];
             case 2:
+                _a.sent();
+                return [4, (0, pre_check_1.initVariable)(args)];
+            case 3:
                 res = _a.sent();
                 Object.assign(context, res);
                 (0, zeppos_app_utils_1.HM_Analytics)("ZEPP_CLI_".concat(lodash_1["default"].toUpper(lodash_1["default"].get(args.argv, '_[0]')), "_C"));

package/modules/build.js

@@ -147,7 +147,7 @@ var chooseBuildTargetsV3Config = function (mode, args) {
                         zeppos_app_utils_1.logger.warn("'".concat(target, "' is not a valid device, it must be one of ").concat(JSON.stringify(deviceNames)));
                     }
                     if (!isValidDevice) return [3, 1];
-                    _a = target;
+                    _a = { device: target };
                     return [3, 3];
                 case 1: return [4, inquirer_1["default"].prompt([
                         {
@@ -264,31 +264,32 @@ var chooseBuildTargetsV2Config = function (mode, args) {
 var chooseBuildPackages = function (mode, args) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var configVersion, result, _a, _b, _c, _d, _e, _f;
-        var _g;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        var configVersion, result, _a, sources, _b, _c, _d, _e, _f, _g;
+        var _h;
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
                     configVersion = (0, lodash_1.toLower)((0, lodash_1.get)(appJsonContent, 'configVersion'));
                     result = {};
                     if (!(configVersion === 'v3')) return [3, 3];
-                    if (!(mode !== BuildMode.PROD)) return [3, 2];
-                    _b = (_a = Object).assign;
-                    _c = [result];
+                    _a = args.sources, sources = _a === void 0 ? [] : _a;
+                    if (!(mode !== BuildMode.PROD && (sources.length <= 0))) return [3, 2];
+                    _c = (_b = Object).assign;
+                    _d = [result];
                     return [4, chooseBuildTargetsV3Config(mode, args)];
                 case 1:
-                    _b.apply(_a, _c.concat([_h.sent()]));
-                    _h.label = 2;
+                    _c.apply(_b, _d.concat([_j.sent()]));
+                    _j.label = 2;
                 case 2: return [3, 5];
                 case 3:
-                    _e = (_d = Object).assign;
-                    _f = [result];
-                    _g = {};
+                    _f = (_e = Object).assign;
+                    _g = [result];
+                    _h = {};
                     return [4, chooseBuildTargetsV2Config(mode, args)];
                 case 4:
-                    _e.apply(_d, _f.concat([(_g.targets = _h.sent(),
-                            _g)]));
-                    _h.label = 5;
+                    _f.apply(_e, _g.concat([(_h.targets = _j.sent(),
+                            _h)]));
+                    _j.label = 5;
                 case 5: return [2, result];
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.5.9",
+  "version": "1.5.13",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",
@@ -21,7 +21,7 @@
     "qrcode-terminal": "^0.12.0",
     "vorpal": "^1.12.0",
     "yargs": "^17.5.1",
-    "@zeppos/zpm": "^3.0.19",
+    "@zeppos/zpm": "^3.0.23",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -39,6 +39,8 @@
     "shelljs": "^0.8.5",
     "socket.io-client": "^4.5.1",
     "stoppable": "^1.1.0",
+    "tweetnacl": "^1.0.3",
+    "tweetnacl-util": "^0.15.1",
     "update-notifier": "5.1.0",
     "uuid": "^8.3.2",
     "ws": "^8.8.0",

package/private-modules/zeppos-app-utils/dist/config/device.js

@@ -5,12 +5,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.getDeviceConf = exports.DeviceScreenType = void 0;
 var lodash_1 = require("lodash");
+var tweetnacl_util_1 = require("tweetnacl-util");
+var tweetnacl_1 = require("tweetnacl");
 var path_1 = __importDefault(require("path"));
 var os_1 = __importDefault(require("os"));
 var fs_1 = __importDefault(require("fs"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var tools_1 = require("../tools/tools");
 var LOCAL_CACHE_DEVICE_PATH = path_1["default"].resolve(os_1["default"].homedir(), ".zepp/.zeus_devices");
+var pkgInfo = require(path_1["default"].join(__dirname, '../../package.json'));
+var isBeta = pkgInfo.dependencies['@zeppos/zpm'].indexOf('-beta') !== -1;
+var u8Array = function (str) { return new Uint8Array(str.split(',').map(function (s) { return parseInt(s, 10); })); };
+var sharedKey = '18,53,81,26,124,228,216,202,47,58,73,19,245,186,86,169,180,116,161,250,36,203,127,120,133,126,203,121,143,100,17,44';
+var decrypt = function (str, key) {
+    var messageWithNonceAsUint8Array = (0, tweetnacl_util_1.decodeBase64)(str);
+    var nonce = messageWithNonceAsUint8Array.slice(0, tweetnacl_1.box.nonceLength);
+    var message = messageWithNonceAsUint8Array.slice(tweetnacl_1.box.nonceLength, str.length);
+    var decrypted = tweetnacl_1.box.open.after(message, nonce, key);
+    if (!decrypted) {
+        throw new Error('Could not decrypt message');
+    }
+    return (0, tweetnacl_util_1.encodeUTF8)(decrypted);
+};
 var DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";
@@ -22,6 +38,13 @@ var shapeMap = {
     round: DeviceScreenType.R,
     bar: DeviceScreenType.B
 };
+function getDeviceList(localContent) {
+    var deviceChannel = isBeta ? 'devices_beta' : 'devices';
+    var deviceList = (0, lodash_1.get)(localContent, deviceChannel, []);
+    if (!isBeta)
+        return deviceList;
+    return deviceList.map(function (d) { return JSON.parse(decrypt(d, u8Array(sharedKey))); });
+}
 function getDeviceInfo() {
     var localContent = {};
     if (fs_1["default"].existsSync(LOCAL_CACHE_DEVICE_PATH)) {
@@ -30,7 +53,7 @@ function getDeviceInfo() {
         }
         catch (_e) { }
     }
-    var deviceList = (0, lodash_1.get)(localContent, 'devices', []);
+    var deviceList = getDeviceList(localContent);
     var deviceGroup = (0, lodash_1.groupBy)(deviceList, 'productName');
     var deviceInfo = {};
     Object.values(deviceGroup).forEach(function (devices) {

package/private-modules/zeppos-app-utils/dist/modules/fetchDevices.js

@@ -22,6 +22,42 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -37,43 +73,66 @@ var config_1 = require("../config");
 var accountEnv = (0, config_1.getLocalConfig)().account_env;
 var LOCAL_CACHE_DEVICE_PATH = path.resolve(os.homedir(), ".zepp/.zeus_devices");
 var serverPath = accountEnv === 'test' ? 'https://upload-testing-cdn.huami.com/zeppos/devkit/zeus/devices.json' : 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
+var serverPathBeta = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.beta.json';
 var DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";
     DeviceScreenType["S"] = "s";
     DeviceScreenType["B"] = "b";
 })(DeviceScreenType = exports.DeviceScreenType || (exports.DeviceScreenType = {}));
-var fetchDevices = function () {
-    var localContent = {};
-    if (fs.existsSync(LOCAL_CACHE_DEVICE_PATH)) {
-        try {
-            localContent = fs_extra_1["default"].readJsonSync(LOCAL_CACHE_DEVICE_PATH);
+var fetchDevicesData = function (cdnUrl) {
+    if (cdnUrl === void 0) { cdnUrl = ''; }
+    return new Promise(function (resolve, reject) {
+        if (cdnUrl === '') {
+            reject(new Error('CDN URL is missing'));
+            process.exit(1);
         }
-        catch (_e) { }
-    }
-    var now = Date.now().valueOf();
-    return new Promise(function (resolve) {
-        if (!((0, lodash_1.get)(localContent, 'expiredTime') > now)) {
-            axios_1["default"].get(serverPath).then(function (res) {
-                if (res.status === 200) {
-                    var data = res.data;
-                    if (!(0, lodash_1.isEmpty)(data)) {
-                        fs_extra_1["default"].writeJsonSync(LOCAL_CACHE_DEVICE_PATH, {
-                            devices: data,
-                            expiredTime: now + 2 * 60 * 60 * 1000
-                        });
-                        resolve({});
+        axios_1["default"].get(cdnUrl).then(function (res) {
+            if (res.status === 200) {
+                var data = res.data;
+                resolve(data);
+            }
+        })["catch"](function (e) {
+            console.log(e);
+            resolve([]);
+            process.exit(1);
+        });
+    });
+};
+var fetchDevices = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var localContent, now, prodDevices, betaDevices;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                localContent = {};
+                if (fs.existsSync(LOCAL_CACHE_DEVICE_PATH)) {
+                    try {
+                        localContent = fs_extra_1["default"].readJsonSync(LOCAL_CACHE_DEVICE_PATH);
                     }
+                    catch (_e) { }
                 }
-            })["catch"](function (e) {
-                console.log(e);
-                resolve({});
-                process.exit(1);
-            });
-        }
-        else {
-            resolve({});
+                now = Date.now().valueOf();
+                if (!!((0, lodash_1.get)(localContent, 'expiredTime') > now)) return [3, 3];
+                return [4, fetchDevicesData(serverPath)];
+            case 1:
+                prodDevices = _a.sent();
+                return [4, fetchDevicesData(serverPathBeta)];
+            case 2:
+                betaDevices = _a.sent();
+                if (!(0, lodash_1.isEmpty)(prodDevices) || !(0, lodash_1.isEmpty)(betaDevices)) {
+                    fs_extra_1["default"].writeJsonSync(LOCAL_CACHE_DEVICE_PATH, {
+                        devices: prodDevices,
+                        devices_beta: betaDevices,
+                        expiredTime: now + 2 * 60 * 60 * 1000
+                    });
+                }
+                else {
+                    return [2, {}];
+                }
+                return [3, 4];
+            case 3: return [2, {}];
+            case 4: return [2];
         }
     });
-};
+}); };
 exports.fetchDevices = fetchDevices;

package/private-modules/zeppos-app-utils/package.json

@@ -13,7 +13,7 @@
     "dev": "nodemon -e ts,tsx --exec \"rm -rf dist && tsc && ts-node build.ts\" --ignore types/ --ignore dist/"
   },
   "dependencies": {
-    "@zeppos/zpm": "^3.0.19",
+    "@zeppos/zpm": "^3.0.23",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -31,6 +31,8 @@
     "shelljs": "^0.8.5",
     "socket.io-client": "^4.5.1",
     "stoppable": "^1.1.0",
+    "tweetnacl": "^1.0.3",
+    "tweetnacl-util": "^0.15.1",
     "update-notifier": "5.1.0",
     "uuid": "^8.3.2",
     "ws": "^8.8.0",

package/utils/pre-check.js

@@ -39,9 +39,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.initVariable = exports.checkVersion = void 0;
+exports.clearDevicesCache = exports.initVariable = exports.checkVersion = void 0;
+var path_1 = __importDefault(require("path"));
+var os_1 = __importDefault(require("os"));
+var fs_extra_1 = __importDefault(require("fs-extra"));
 var chalk_1 = __importDefault(require("chalk"));
-var packageJson = require('package-json');
+var package_json_1 = __importDefault(require("package-json"));
 var zeppos_app_utils_1 = require("zeppos-app-utils");
 var tools_1 = require("./tools");
 var loginStorageKey = zeppos_app_utils_1.config.getLocalConfig().loginStorageKey;
@@ -49,6 +52,8 @@ var _a = require('../package.json'), userVersion = _a.version, userName = _a.nam
 var versionCheckTimeKey = '____inner_version_check_time';
 var versionKey = '____inner_version';
 var _b = zeppos_app_utils_1.instanceStorage.getStorage(), _c = versionCheckTimeKey, userVersionCheckTime = _b[_c], _d = versionKey, originVersion = _b[_d], _e = loginStorageKey.accountToken, _f = _b[_e], apptoken = _f === void 0 ? '' : _f, _g = loginStorageKey.userid, _h = _b[_g], userid = _h === void 0 ? '' : _h, _j = loginStorageKey.cname, _k = _b[_j], cname = _k === void 0 ? '' : _k, _l = _b.account_env, _accountEnv = _l === void 0 ? 'production' : _l;
+var LOCAL_CACHE_DEVICE_PATH = path_1["default"].resolve(os_1["default"].homedir(), ".zepp/.zeus_devices");
+var LOCAL_VERSION_PATH = path_1["default"].resolve(os_1["default"].homedir(), ".zepp/.zeus_version");
 var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
     var versions, versionList, error_1;
     var _a;
@@ -56,7 +61,7 @@ var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0,
         switch (_b.label) {
             case 0:
                 _b.trys.push([0, 2, , 3]);
-                return [4, packageJson(userName, { allVersions: true })];
+                return [4, (0, package_json_1["default"])(userName, { allVersions: true })];
             case 1:
                 versions = (_b.sent()).versions;
                 versionList = Object.keys(versions).filter(function (val) { return !val.includes('beta'); });
@@ -78,15 +83,21 @@ var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0,
 var checkVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
     var originVersionCode, userVersionCode;
     return __generator(this, function (_a) {
-        if (!originVersion || !userVersionCheckTime || (+new Date() - Number(userVersionCheckTime) > 24 * 60 * 60 * 1000)) {
-            checkOriginVersion();
-        }
-        originVersionCode = (0, tools_1.versionToCode)(originVersion);
-        userVersionCode = (0, tools_1.versionToCode)(userVersion);
-        if (originVersionCode - userVersionCode >= 100) {
-            zeppos_app_utils_1.logger.log(chalk_1["default"].hex('#DB8C41')(zeppos_app_utils_1.config.updateVersion));
+        switch (_a.label) {
+            case 0:
+                if (!(!originVersion || !userVersionCheckTime || (+new Date() - Number(userVersionCheckTime) > 24 * 60 * 60 * 1000))) return [3, 2];
+                return [4, checkOriginVersion()];
+            case 1:
+                _a.sent();
+                _a.label = 2;
+            case 2:
+                originVersionCode = (0, tools_1.versionToCode)(originVersion);
+                userVersionCode = (0, tools_1.versionToCode)(userVersion);
+                if (originVersionCode - userVersionCode >= 100) {
+                    zeppos_app_utils_1.logger.log(chalk_1["default"].hex('#DB8C41')(zeppos_app_utils_1.config.updateVersion));
+                }
+                return [2];
         }
-        return [2];
     });
 }); };
 exports.checkVersion = checkVersion;
@@ -131,3 +142,23 @@ var initVariable = function (args) { return __awaiter(void 0, void 0, void 0, fu
     });
 }); };
 exports.initVariable = initVariable;
+var clearDevicesCache = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var cleanCacheAndWriteVersion, installedVersion;
+    return __generator(this, function (_a) {
+        cleanCacheAndWriteVersion = function () {
+            fs_extra_1["default"].removeSync(LOCAL_CACHE_DEVICE_PATH);
+            fs_extra_1["default"].outputFileSync(LOCAL_VERSION_PATH, userVersion);
+        };
+        if (!fs_extra_1["default"].pathExistsSync(LOCAL_VERSION_PATH)) {
+            cleanCacheAndWriteVersion();
+            return [2];
+        }
+        installedVersion = fs_extra_1["default"].readFileSync(LOCAL_VERSION_PATH, 'utf8');
+        if ((0, tools_1.versionToCode)(userVersion) > (0, tools_1.versionToCode)(installedVersion)) {
+            cleanCacheAndWriteVersion();
+            return [2];
+        }
+        return [2];
+    });
+}); };
+exports.clearDevicesCache = clearDevicesCache;

package/utils/tools.js

@@ -45,6 +45,8 @@ var zeppos_app_utils_1 = require("zeppos-app-utils");
 var versionToCode = function (version) {
     if (!version)
         return 0;
+    if (version.endsWith('-beta'))
+        version = version.replace('-beta', '');
     var _a = version.split('.').map(function (val) { return Number(val); }), _b = _a[0], p0 = _b === void 0 ? 0 : _b, _c = _a[1], p1 = _c === void 0 ? 0 : _c, _d = _a[2], p2 = _d === void 0 ? 0 : _d;
     return p0 * 10000 + p1 * 100 + p2;
 };