@zeppos/zeus-cli 1.1.0-beta → 1.1.2

package/modules/bridge.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -59,65 +63,61 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.bridge = void 0;
+var chalk_1 = __importDefault(require("chalk"));
+var fs_1 = require("fs");
+var logger = __importStar(require("../utils/logger"));
 var project_1 = require("../config/project");
 var index_1 = require("../api/index");
-var logger = __importStar(require("../utils/logger"));
-var chalk_1 = __importDefault(require("chalk"));
-var inquirer_1 = __importDefault(require("inquirer"));
 var websocket_1 = __importDefault(require("./websocket"));
 var build_1 = require("./build");
 var common_1 = require("../utils/common");
-// TODO: 需要在项目根目录执行
+var login_1 = require("./login");
 var client;
 var hasConnectDevice = false;
 var choiredDevice;
-//  连接设备
-// TODO: 有多个连接的时候退不到可输入状态
-var connectDevice = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var debugConnectedDevice, optionalDeviceArr, len, clientId, answer;
+var connectDevice = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
+    var debugConnectedDevice, optionalDeviceArr, len, clientId_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 debugConnectedDevice = JSON.parse(project_1.____inner_global_variable.bridgeOptionalDevice);
                 optionalDeviceArr = Object.keys(debugConnectedDevice);
                 len = optionalDeviceArr.length;
-                if (!(len === 0)) return [3 /*break*/, 1];
-                logger.log(chalk_1["default"].yellow('No connectable online App or Simulator.'));
-                return [3 /*break*/, 4];
+                if (!(len === 0)) return [3, 1];
+                vorpal.log(chalk_1["default"].yellow('No connectable online App or Simulator.'));
+                return [3, 4];
             case 1:
-                clientId = debugConnectedDevice[optionalDeviceArr[0]];
+                clientId_1 = debugConnectedDevice[optionalDeviceArr[0]];
                 choiredDevice = optionalDeviceArr[0];
-                if (!(len > 1)) return [3 /*break*/, 3];
-                return [4 /*yield*/, inquirer_1["default"].prompt({
+                if (!(len > 1)) return [3, 3];
+                return [4, vorpal.activeCommand.prompt({
                         name: 'choiredDevice',
                         type: 'list',
                         choices: optionalDeviceArr,
                         message: 'Which online target would you like to connect?'
+                    }, function (result) {
+                        clientId_1 = debugConnectedDevice[result.choiredDevice];
+                        choiredDevice = result.choiredDevice;
+                        vorpal.delimiter('bridge$').show();
                     })];
             case 2:
-                answer = _a.sent();
-                clientId = debugConnectedDevice[answer.choiredDevice];
-                choiredDevice = answer.choiredDevice;
+                _a.sent();
                 _a.label = 3;
             case 3:
                 project_1.____inner_global_variable.bridgeChoiredDevice = choiredDevice;
-                // 发送连接请求
-                client.sendMessage({ clientId: clientId }, 'connectClient');
+                client.sendMessage({ clientId: clientId_1 }, 'connectClient');
                 hasConnectDevice = true;
                 _a.label = 4;
-            case 4: return [2 /*return*/];
+            case 4: return [2];
         }
     });
 }); };
 var connectBridgeWSCallback = function () {
-    // 创建：Vorpal
     var vorpal = require('vorpal')();
     vorpal.find('help').hidden();
     vorpal.find('exit').remove();
     vorpal.command('exit', 'Exits application.')
         .action(function () {
-        project_1.____inner_global_variable.bridgeOptionalDevice = '';
-        project_1.____inner_global_variable.bridgeChoiredDevice = '';
         process.exit(0);
     });
     vorpal
@@ -125,80 +125,114 @@ var connectBridgeWSCallback = function () {
         .show();
     vorpal["catch"]('[words...]', 'Catches incorrect commands.')
         .action(function (args, cb) {
-        logger.log("  - '".concat(args.words.join(' '), "' is not a valid command.Enter 'help' to view Commands."));
+        vorpal.log("  - '".concat(args.words.join(' '), "' is not a valid command.Enter 'help' to view Commands."));
         cb();
     });
     vorpal
         .command('connect', 'Connect the online App or Simulator for debugging.')
-        .action(function () { return __awaiter(void 0, void 0, void 0, function () {
+        .option('--anchovies')
+        .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
-            // TODO: 断开链接怎么监听，需要处理啥吗
-            connectDevice();
-            return [2 /*return*/];
+            connectDevice(vorpal);
+            cb();
+            return [2];
         });
     }); });
     vorpal
         .command('install', 'Install applications or watch face.')
-        .action(function () { return __awaiter(void 0, void 0, void 0, function () {
+        .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!hasConnectDevice) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (0, build_1.buildPreview)({ _: ['install', "".concat(choiredDevice.toLowerCase())], '$0': 'zeus' }, function (params) {
+                    if (!hasConnectDevice) return [3, 2];
+                    return [4, (0, build_1.buildPreview)({ _: ['install', "".concat(choiredDevice.toLowerCase())], '$0': 'zeus' }, function (params) {
                             client.sendMessage(params, 'packagePush');
                         })];
                 case 1:
                     _a.sent();
-                    return [3 /*break*/, 3];
+                    return [3, 3];
                 case 2:
-                    logger.log(chalk_1["default"].yellow("No device is connected, please connect the device with the command width 'connect' first."));
+                    vorpal.log(chalk_1["default"].yellow("No device is connected, please connect the device with the command width 'connect' first."));
                     _a.label = 3;
-                case 3: return [2 /*return*/];
+                case 3:
+                    cb();
+                    return [2];
             }
         });
     }); });
-    // 卸载命令
     vorpal
-        .command('uninstall', 'Uninstall applications or watch face.')
-        .action(function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, appid, appname, apptype;
+        .command('uninstall [appid]', 'Uninstall applications or watch face.')
+        .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
+        var _a, appid, appName, appType;
         return __generator(this, function (_b) {
-            logger.info('Uninstalling');
-            _a = (0, common_1.getDeviceInfoFromAppJson)(), appid = _a.appId, appname = _a.appName, apptype = _a.appType;
-            client.sendMessage({ type: 'delete', appid: appid, appname: appname, apptype: apptype }, 'sysSettingPush');
-            return [2 /*return*/];
+            if (!args.appid) {
+                if (!(0, fs_1.existsSync)('./app.json')) {
+                    vorpal.log("".concat(chalk_1["default"].red('error'), " If the [appid] is blank, this command needs to be executed in the root of the project."));
+                }
+                else {
+                    vorpal.log(chalk_1["default"].blue('Uninstalling'));
+                    _a = (0, common_1.getDeviceInfoFromAppJson)(), appid = _a.appId, appName = _a.appName, appType = _a.appType;
+                    client.sendMessage({ type: 'delete', appid: appid, appName: appName, appType: appType }, 'sysSettingPush');
+                }
+            }
+            else if (args.appid && typeof args.appid === 'number') {
+                vorpal.log(chalk_1["default"].blue('Uninstalling'));
+                client.sendMessage({ type: 'delete', appid: args.appid }, 'sysSettingPush');
+            }
+            else if (args.appid) {
+                vorpal.log("".concat(chalk_1["default"].red('error'), " invalid '").concat(args.appid, "', the 'uninstall' command should be followed by appid or blank."));
+            }
+            cb();
+            return [2];
         });
     }); });
 };
 var disConnectBridgeWSCallback = function () {
-    // 什么情况下会断开连接？
     hasConnectDevice = false;
-    logger.log('= 断开连接 =');
+    logger.log('Disconnected');
+    process.exit(1);
 };
-var bridge = function () { return __awaiter(void 0, void 0, void 0, function () {
+var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var bridgeWebSocketURL, error_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, (0, index_1.getConnectDevServerWebSocketCode)()
-                    // 第二步：连 WebSocket
-                ];
+                _a.trys.push([0, 2, , 6]);
+                return [4, (0, index_1.getConnectDevServerWebSocketCode)()];
             case 1:
                 bridgeWebSocketURL = _a.sent();
-                // 第二步：连 WebSocket
                 client = new websocket_1["default"]({
                     url: "".concat(bridgeWebSocketURL, "?type=development&name=CLI"),
                     connectCb: connectBridgeWSCallback,
                     disconnectCb: disConnectBridgeWSCallback
                 });
                 logger.log("  - Enter 'help' to view the command.");
-                return [3 /*break*/, 3];
+                return [3, 6];
             case 2:
                 error_1 = _a.sent();
+                if (!((error_1 === null || error_1 === void 0 ? void 0 : error_1.message) === '401')) return [3, 4];
+                logger.warn("Login information is invalid. Please login again, or end this service and login again with the command 'zeus login'.");
+                return [4, (0, login_1.login)().then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    args._loginAppToken = res.appToken;
+                                    process.env._loginAppToken = res.appToken;
+                                    return [4, (0, exports.bridge)(args)];
+                                case 1:
+                                    _a.sent();
+                                    return [2];
+                            }
+                        });
+                    }); })];
+            case 3:
+                _a.sent();
+                return [3, 5];
+            case 4:
                 logger.error(error_1 === null || error_1 === void 0 ? void 0 : error_1.message);
-                return [3 /*break*/, 3];
-            case 3: return [2 /*return*/];
+                _a.label = 5;
+            case 5: return [3, 6];
+            case 6: return [2];
         }
     });
 }); };

package/modules/build.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -59,7 +63,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.buildPreview = exports.buildProd = exports.buildDev = exports.build = exports.chooseBuildPackages = exports.BuildMode = void 0;
-// @ts-ignore
 var node_js_1 = require("@zeppos/zpm/lib/node.js");
 var fs_1 = __importDefault(require("fs"));
 var rd = __importStar(require("rd"));
@@ -71,10 +74,12 @@ var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var logger = __importStar(require("../utils/logger"));
 var project_1 = require("../config/project");
-var hm_analytics_1 = require("../utils/hm_analytics");
+var hm_analytics_1 = require("../utils/hm-analytics");
 var api_1 = require("../api");
 var storage_1 = require("./storage");
 var common_1 = require("../utils/common");
+var login_1 = require("./login");
+var appJsonContent = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
 var BuildMode;
 (function (BuildMode) {
     BuildMode["DEV"] = "development";
@@ -89,37 +94,30 @@ var TransformType;
     TransformType["Bin"] = "bin";
 })(TransformType || (TransformType = {}));
 function handleExecCommandInErrorDir(mode) {
-    // let curCommand = 'dev'
-    // if (mode === BuildMode.PROD) {
-    //   curCommand = 'build'
-    // } else if (mode === BuildMode.PREVIEW) {
-    //   curCommand = 'preview'
-    // }
     logger.warn("This command needs to be executed in the root of the project.");
     process.exit(1);
 }
 function chooseBuildPackages(mode) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(this, void 0, void 0, function () {
-        var appJson, targets, answers;
+        var targets, answers;
         var _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    appJson = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
-                    if (!appJson) {
+                    if (!appJsonContent) {
                         handleExecCommandInErrorDir(mode);
                     }
-                    targets = Object.keys(lodash_1["default"].get(appJson, 'targets', {}));
-                    if (!!targets.length) return [3 /*break*/, 1];
-                    logger.error('please set at least one package.');
+                    targets = Object.keys(lodash_1["default"].get(appJsonContent, 'targets', {}));
+                    if (!!targets.length) return [3, 1];
+                    logger.error('Please set at least one package.');
                     process.exit(1);
-                    return [3 /*break*/, 4];
+                    return [3, 4];
                 case 1:
-                    if (!(targets.length === 1)) return [3 /*break*/, 2];
+                    if (!(targets.length === 1)) return [3, 2];
                     storage_1.globalStorage.set((_a = {}, _a[project_1.buildStorageKey.targetDeviceToBuild] = targets[0], _a));
-                    return [2 /*return*/, [targets[0]]];
-                case 2: return [4 /*yield*/, inquirer_1["default"].prompt([
+                    return [2, [targets[0]]];
+                case 2: return [4, inquirer_1["default"].prompt([
                         {
                             name: 'target',
                             type: 'list',
@@ -138,17 +136,14 @@ function chooseBuildPackages(mode) {
                             }); }),
                             message: 'Which targets would you like to build?'
                         }
-                    ])
-                    // 存储 deviceSource
-                ];
+                    ])];
                 case 3:
                     answers = _c.sent();
-                    // 存储 deviceSource
                     if (BuildMode.PROD) {
-                        storage_1.globalStorage.set((_b = {}, _b[project_1.buildStorageKey.targetDeviceToBuild] = [answers.target], _b));
+                        storage_1.globalStorage.set((_b = {}, _b[project_1.buildStorageKey.targetDeviceToBuild] = answers.target, _b));
                     }
-                    return [2 /*return*/, mode !== BuildMode.PROD ? [answers.target] : answers.buildTargets];
-                case 4: return [2 /*return*/];
+                    return [2, mode !== BuildMode.PROD ? [answers.target] : answers.buildTargets];
+                case 4: return [2];
             }
         });
     });
@@ -163,13 +158,13 @@ var build = function (mode, packages, buildConfigOption) {
             switch (_b.label) {
                 case 0:
                     workspace = path.resolve('./');
-                    if (!!packages.length) return [3 /*break*/, 2];
-                    return [4 /*yield*/, chooseBuildPackages(mode)];
+                    if (!!packages.length) return [3, 2];
+                    return [4, chooseBuildPackages(mode)];
                 case 1:
                     choosePackages = _b.sent();
                     if (!choosePackages || !choosePackages.length) {
                         logger.error('please choose at least one package.');
-                        return [2 /*return*/];
+                        return [2];
                     }
                     packages.push.apply(packages, choosePackages);
                     _b.label = 2;
@@ -178,7 +173,7 @@ var build = function (mode, packages, buildConfigOption) {
                         path: workspace,
                         targets: packages,
                         buildMode: mode,
-                        jsc: TransformType.Default // 不开启 js => c
+                        jsc: TransformType.Default
                     };
                     if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
                         _a = buildConfigOption || {}, js2c = _a.js2c, js2bin = _a.js2bin, png2vg = _a.png2vg, prune = _a.prune;
@@ -203,8 +198,8 @@ var build = function (mode, packages, buildConfigOption) {
                 case 3:
                     _b.trys.push([3, 8, , 9]);
                     curTarget = (buildConfigOption ? buildConfigOption._ : [''])[0];
-                    if (!(mode !== BuildMode.DEV || (mode === BuildMode.DEV && curTarget === 'install'))) return [3 /*break*/, 5];
-                    return [4 /*yield*/, (0, node_js_1.start)(buildOptions)];
+                    if (!(mode !== BuildMode.DEV || (mode === BuildMode.DEV && curTarget === 'install'))) return [3, 5];
+                    return [4, (0, node_js_1.start)(buildOptions)];
                 case 4:
                     buildInfo_1 = _b.sent();
                     if (buildInfo_1) {
@@ -215,19 +210,19 @@ var build = function (mode, packages, buildConfigOption) {
                             }
                         });
                     }
-                    return [2 /*return*/, buildInfo_1];
+                    return [2, buildInfo_1];
                 case 5:
-                    if (!(mode === BuildMode.DEV)) return [3 /*break*/, 7];
-                    return [4 /*yield*/, (0, node_js_1.startWithoutDist)(buildOptions)];
+                    if (!(mode === BuildMode.DEV)) return [3, 7];
+                    return [4, (0, node_js_1.startWithoutDist)(buildOptions)];
                 case 6:
                     _b.sent();
-                    return [2 /*return*/, (0, node_js_1.getZpkBuf)(packages[0])];
-                case 7: return [3 /*break*/, 9];
+                    return [2, (0, node_js_1.getZpkBuf)(packages[0])];
+                case 7: return [3, 9];
                 case 8:
                     error_1 = _b.sent();
                     logger.error(error_1);
-                    return [3 /*break*/, 9];
-                case 9: return [2 /*return*/];
+                    return [3, 9];
+                case 9: return [2];
             }
         });
     });
@@ -242,7 +237,7 @@ var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, funct
     var buildInfo;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.build)(BuildMode.PROD, [], args)];
+            case 0: return [4, (0, exports.build)(BuildMode.PROD, [], args)];
             case 1:
                 buildInfo = _a.sent();
                 if (buildInfo) {
@@ -251,76 +246,95 @@ var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, funct
                 else {
                     (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_BUILD_C', { res: '0' });
                 }
-                return [2 /*return*/, buildInfo];
+                return [2, buildInfo];
         }
     });
 }); };
 exports.buildProd = buildProd;
-var checkIsWatchFaceProject = function () {
-    var appJsonPath = path.resolve('./app.json');
-    var appJsonContent = fs_extra_1["default"].readJsonSync(appJsonPath);
-    var appType = lodash_1["default"].get(appJsonContent, 'app.appType');
-    return appType === project_1.AppType.WATCHFACE;
-};
 var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, curCommand, curBridgeTarget, form, buildMode, buildInfo, isWatchFaceProject;
+    var _a, curCommand, curBridgeTarget, buildMode, buildInfo, appType, isWatchFaceProject, form;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 _a = args._, curCommand = _a[0], curBridgeTarget = _a[1];
-                form = new form_data_1["default"]();
                 buildMode = (curBridgeTarget && curBridgeTarget === 'simulator') ? BuildMode.DEV : BuildMode.PREVIEW;
                 logger.info('building...');
-                return [4 /*yield*/, (0, exports.build)(buildMode, [], args)];
+                return [4, (0, exports.build)(buildMode, [], args)];
             case 1:
                 buildInfo = _b.sent();
-                isWatchFaceProject = checkIsWatchFaceProject();
+                appType = lodash_1["default"].get(appJsonContent, 'app.appType');
+                isWatchFaceProject = appType === project_1.AppType.WATCHFACE;
                 logger.info('getting package...');
+                form = new form_data_1["default"]();
                 form.append('file', fs_1["default"].createReadStream("./dist/".concat(buildInfo)));
                 form.append('app_type', isWatchFaceProject ? '1' : '2');
                 form.getLength(function (err, length) { return __awaiter(void 0, void 0, void 0, function () {
-                    var uploadPackageReturnInfo, _a, protocol, code, url, _b, deviceSource, appId, appName, appType, deviceSourceArr, targetDeviceInternalName, packageInfo, downloadPackageReturn, url, preview;
+                    var _a, _subRegionalHost, _accountEnv, protocol, code, res, error_2, url, _b, deviceSource, appId, appName, appType_1, deviceSourceArr, targetDeviceInternalName, packageInfo, url, preview, downloadPackageReturn;
                     return __generator(this, function (_c) {
                         switch (_c.label) {
                             case 0:
                                 if (err) {
                                     logger.error('getting package failed.');
-                                    return [2 /*return*/];
+                                    return [2];
                                 }
-                                return [4 /*yield*/, (0, api_1.uploadPackage)(form, length)];
+                                _a = process.env, _subRegionalHost = _a._subRegionalHost, _accountEnv = _a._accountEnv;
+                                protocol = '';
+                                code = '';
+                                _c.label = 1;
                             case 1:
-                                uploadPackageReturnInfo = _c.sent();
-                                _a = lodash_1["default"].get(uploadPackageReturnInfo, 'data', {}), protocol = _a.protocol, code = _a.code;
-                                if (!(curCommand === 'preview')) return [3 /*break*/, 2];
-                                url = "".concat(protocol, "://").concat(api_1.subRegionalHost, "/custom/tools/app-dial/download/").concat(code);
+                                _c.trys.push([1, 3, , 7]);
+                                return [4, (0, api_1.uploadPackage)(form, length)];
+                            case 2:
+                                res = _c.sent();
+                                protocol = res.protocol;
+                                code = res.code;
+                                return [3, 7];
+                            case 3:
+                                error_2 = _c.sent();
+                                if (!((error_2 === null || error_2 === void 0 ? void 0 : error_2.message) === '401')) return [3, 5];
+                                logger.warn("Login information is invalid. Please login again, or end this service and login again with the command 'zeus login'.");
+                                return [4, (0, login_1.login)().then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
+                                        return __generator(this, function (_a) {
+                                            args._loginAppToken = res.appToken;
+                                            process.env._loginAppToken = res.appToken;
+                                            return [2, (0, exports.buildPreview)(args, cb)];
+                                        });
+                                    }); })];
+                            case 4:
+                                _c.sent();
+                                return [3, 6];
+                            case 5:
+                                logger.error(error_2 === null || error_2 === void 0 ? void 0 : error_2.message);
+                                return [2];
+                            case 6: return [3, 7];
+                            case 7:
+                                if (!(curCommand === 'preview')) return [3, 8];
+                                url = "".concat(protocol, "://").concat(_subRegionalHost, "/custom/tools/app-dial/download/").concat(code);
                                 if (protocol && code) {
-                                    logger.info('generating preview qrcode...');
+                                    logger.info('Generating preview qrcode...');
                                     logger.success('Below within two hours,please use Zepp APP to scan the qrcode below to preview your app.');
-                                    qrcode_terminal_1["default"].generate("".concat(protocol, "://").concat(api_1.subRegionalHost, "/custom/tools/app-dial/download/").concat(code), { small: true });
+                                    qrcode_terminal_1["default"].generate(url, { small: true });
                                 }
                                 else {
-                                    if (project_1.ACCOUNT_ENV === 'test') {
-                                        console.log('previewUrl', url);
-                                    }
-                                    logger.error('generating preview qrcode failed, please check your network.');
+                                    logger.error('Generating preview qrcode failed, please check your network.');
                                 }
-                                return [3 /*break*/, 4];
-                            case 2:
-                                if (!(curCommand === 'install')) return [3 /*break*/, 4];
-                                _b = (0, common_1.getDeviceInfoFromAppJson)(), deviceSource = _b.deviceSource, appId = _b.appId, appName = _b.appName, appType = _b.appType, deviceSourceArr = _b.deviceSourceArr, targetDeviceInternalName = _b.targetDeviceInternalName;
-                                return [4 /*yield*/, (0, api_1.downloadPackage)(code, deviceSource, appType)];
-                            case 3:
+                                return [3, 10];
+                            case 8:
+                                if (!(curCommand === 'install')) return [3, 10];
+                                _b = (0, common_1.getDeviceInfoFromAppJson)(), deviceSource = _b.deviceSource, appId = _b.appId, appName = _b.appName, appType_1 = _b.appType, deviceSourceArr = _b.deviceSourceArr, targetDeviceInternalName = _b.targetDeviceInternalName;
+                                return [4, (0, api_1.downloadPackage)(code, deviceSource, appType_1)];
+                            case 9:
                                 packageInfo = _c.sent();
-                                downloadPackageReturn = lodash_1["default"].get(packageInfo, 'data', {});
                                 url = packageInfo;
                                 preview = '';
                                 if (isWatchFaceProject) {
+                                    downloadPackageReturn = lodash_1["default"].get(packageInfo, 'data', {});
                                     url = downloadPackageReturn.url;
                                     preview = downloadPackageReturn.preview;
                                 }
                                 if (cb) {
                                     cb({
-                                        appType: appType,
+                                        appType: appType_1,
                                         url: url,
                                         preview: preview,
                                         appid: appId,
@@ -331,12 +345,12 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                                         target: targetDeviceInternalName
                                     });
                                 }
-                                _c.label = 4;
-                            case 4: return [2 /*return*/];
+                                _c.label = 10;
+                            case 10: return [2];
                         }
                     });
                 }); });
-                return [2 /*return*/];
+                return [2];
         }
     });
 }); };

package/modules/config.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -63,20 +67,20 @@ var lodash_1 = __importDefault(require("lodash"));
 var chalk_1 = __importDefault(require("chalk"));
 var storage_1 = require("./storage");
 var logger = __importStar(require("../utils/logger"));
-var hm_analytics_1 = require("../utils/hm_analytics");
+var hm_analytics_1 = require("../utils/hm-analytics");
 var config = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var cmd, _a, space, _b, method, values, allowedMethods, commonHandleNotKeyTips, config_1;
+    var cliName, _a, cmd, _b, method, values, allowedMethods, commonHandleNotKeyTips, config_1;
     return __generator(this, function (_c) {
-        cmd = lodash_1["default"].get(args, '$0');
-        _a = lodash_1["default"].get(args, '_', []), space = _a[0], _b = _a[1], method = _b === void 0 ? '' : _b, values = _a.slice(2);
+        cliName = process.env.CMD_NAME;
+        _a = lodash_1["default"].get(args, '_', []), cmd = _a[0], _b = _a[1], method = _b === void 0 ? '' : _b, values = _a.slice(2);
         allowedMethods = ['get', 'set', 'delete', 'list'];
         if (!lodash_1["default"].includes(allowedMethods, method)) {
-            logger.error("invalid method: ".concat(method));
+            logger.error("invalid method: '".concat(method, "'"));
             logger.log(chalk_1["default"].yellow('try to use one of the following:'));
-            logger.log("- ".concat(cmd, " ").concat(space, " set <key>=<value> [<key>=<value> ...]"));
-            logger.log("- ".concat(cmd, " ").concat(space, " get <key> [<key> ...]"));
-            logger.log("- ".concat(cmd, " ").concat(space, " delete <key> [<key> ...]"));
-            logger.log("- ".concat(cmd, " ").concat(space, " list [--json]"));
+            logger.log("- ".concat(cliName, " ").concat(cmd, " set <key>=<value> [<key>=<value> ...]"));
+            logger.log("- ".concat(cliName, " ").concat(cmd, " get <key> [<key> ...]"));
+            logger.log("- ".concat(cliName, " ").concat(cmd, " delete <key> [<key> ...]"));
+            logger.log("- ".concat(cliName, " ").concat(cmd, " list [--json]"));
             process.exit(0);
         }
         commonHandleNotKeyTips = function (method) {
@@ -103,7 +107,6 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
                         logger.error('please input <key>');
                     }
                     else {
-                        // TODO 需要知道 <key> 有那些，以便验证是否处理的没有遗漏
                         storage_1.globalStorage.set((_a = {}, _a[key] = value, _a));
                         logger.success("config: ".concat(key, "=").concat(value));
                     }
@@ -116,7 +119,6 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
                 }
                 values.forEach(function (key) {
                     var curKey = key.trim();
-                    // TODO 需要知道 <key> 有那些，以便验证是否处理的没有遗漏
                     if (!storage_1.globalStorage.has(key) || !key) {
                         logger.error('The <key> does not exist');
                     }
@@ -132,7 +134,6 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
                 }
                 values.forEach(function (key) {
                     var curKey = key.trim();
-                    // TODO 需要知道 <key> 有那些，以便验证是否处理的没有遗漏
                     if (!storage_1.globalStorage.has(key) || !key) {
                         logger.error('The <key> does not exist');
                     }
@@ -163,7 +164,7 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
         }
         (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_CONFIG_C');
         process.exit(0);
-        return [2 /*return*/];
+        return [2];
     });
 }); };
 exports.config = config;