@zeppos/zeus-cli 1.1.8 → 1.2.0

package/bin/{cli.js → main.js}

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 "use strict";
+require("module-alias/register");
 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) {
@@ -40,13 +41,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+var lodash_1 = __importDefault(require("lodash"));
 var yargs_1 = __importDefault(require("yargs"));
 require("./post-command");
 var hideBin = require('yargs/helpers').hideBin;
 var argv = hideBin(process.argv);
 var pre_check_1 = require("../utils/pre-check");
 var index_1 = require("../index");
-var hm_analytics_1 = require("../utils/hm-analytics");
+var zeppos_app_utils_1 = require("zeppos-app-utils");
+var login = zeppos_app_utils_1.modules.login, logout = zeppos_app_utils_1.modules.logout, status = zeppos_app_utils_1.modules.status, modulesConfig = zeppos_app_utils_1.modules.config;
 var context = {};
 var proxy = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var res;
@@ -59,12 +62,13 @@ var proxy = function (args) { return __awaiter(void 0, void 0, void 0, function
             case 2:
                 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"));
                 return [2];
         }
     });
 }); };
-(0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_V');
-yargs_1["default"].usage('Usage: $0 <command> [args?]')
+(0, zeppos_app_utils_1.HM_Analytics)('ZEPP_CLI_V');
+yargs_1["default"].usage("Usage: ".concat(process.env.CMD_NAME, " <command> [args?]"))
     .demandCommand(1, 'A command is required. Pass --help to see all available commands and options.')
     .recommendCommands()
     .help()
@@ -73,13 +77,13 @@ yargs_1["default"].usage('Usage: $0 <command> [args?]')
     .group(['help', 'version'], "Base Options")
     .command('init', 'Init a new project in current directory.', proxy, index_1.create)
     .command('create <projectName>', 'Named the <projectName> project and add to the current directory.', proxy, index_1.create)
-    .command('login', 'Login to your account.', proxy, index_1.login)
-    .command('logout', 'Sign out of your account.', proxy, index_1.logout)
+    .command('login', 'Login to your account.', proxy, login)
+    .command('logout', 'Sign out of your account.', proxy, logout)
     .command('dev', 'Run this project in development mode.', proxy, index_1.run)
     .command('preview', 'Preview this project in your device.', proxy, index_1.buildPreview)
     .command('build', 'Build this project for production.', proxy, index_1.buildProd)
-    .command('status', 'View information such as login and emulator connection status.', proxy, index_1.status)
+    .command('status', 'View information such as login and emulator connection status.', proxy, status)
     .command('bridge', "Connect the online App or Simulator for development and debugging.", proxy, index_1.bridge)
-    .command('config', "Operation config value.\n    e.g.\n      set <key>=<value> [<key>=<value> ...]\n      get <key> [<key> ...]\n      delete <key> [<key> ...]\n      list [--json]", proxy, index_1.config)
+    .command('config', "Operation config value.\n    e.g.\n      set <key>=<value> [<key>=<value> ...]\n      get <key> [<key> ...]\n      delete <key> [<key> ...]\n      list [--json]", proxy, modulesConfig)
     .epilogue('For more information, see https://docs.zepp.com/')
     .parse(argv, context);

package/bin/post-command.js

@@ -1,8 +1,6 @@
 "use strict";
 exports.__esModule = true;
-var storage_1 = require("../modules/storage");
+var zeppos_app_utils_1 = require("zeppos-app-utils");
 var bin = require('../package.json').bin;
-var cmdName = Object.keys(bin || {})[0] || 'zeus';
-var account_env = storage_1.globalStorage.get('account_env') || 'production';
-process.env.CMD_NAME = cmdName;
-process.env.ACCOUNT_ENV = account_env;
+process.env.CMD_NAME = Object.keys(bin || {})[0] || 'zeus';
+process.env.ACCOUNT_ENV = zeppos_app_utils_1.globalStorage.get('account_env') || 'production';

package/index.js

@@ -18,7 +18,4 @@ __exportStar(require("./modules/help"), exports);
 __exportStar(require("./modules/run"), exports);
 __exportStar(require("./modules/build"), exports);
 __exportStar(require("./modules/create"), exports);
-__exportStar(require("./modules/login"), exports);
-__exportStar(require("./modules/config"), exports);
-__exportStar(require("./modules/status"), exports);
 __exportStar(require("./modules/bridge"), exports);

package/modules/bridge.js

@@ -64,13 +64,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.bridge = void 0;
 var chalk_1 = __importDefault(require("chalk"));
+var path = __importStar(require("path"));
 var fs_1 = require("fs");
-var logger = __importStar(require("../utils/logger"));
-var index_1 = require("../api/index");
-var websocket_1 = __importDefault(require("./websocket"));
+var zeppos_app_utils_1 = require("zeppos-app-utils");
 var build_1 = require("./build");
-var common_1 = require("../utils/common");
-var login_1 = require("./login");
+var zeppos_app_utils_2 = require("zeppos-app-utils");
 var client;
 var hasConnectDevice = false;
 var choiredDevice;
@@ -133,6 +131,7 @@ var connectWSCB = function () {
         .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             connectDevice(vorpal);
+            (0, zeppos_app_utils_2.HM_Analytics)("ZEPP_CLI_BRIDGE_CONNECT_C");
             cb();
             return [2];
         });
@@ -154,6 +153,7 @@ var connectWSCB = function () {
                     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:
+                    (0, zeppos_app_utils_2.HM_Analytics)("ZEPP_CLI_BRIDGE_INSTALL_C");
                     cb();
                     return [2];
             }
@@ -170,7 +170,7 @@ var connectWSCB = function () {
                 }
                 else {
                     vorpal.log(chalk_1["default"].blue('Uninstalling...'));
-                    _a = (0, common_1.getDeviceInfoFromAppJson)(), appid = _a.appId, appName = _a.appName, appType = _a.appType;
+                    _a = (0, zeppos_app_utils_2.getInfoFromAppJson)(path.resolve('./app.json')).app, appid = _a.appId, appName = _a.appName, appType = _a.appType;
                     client.sendMessage({ type: 'delete', appid: appid, appName: appName, appType: appType }, { method: 'sysSettingPush' });
                 }
             }
@@ -181,26 +181,23 @@ var connectWSCB = function () {
             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."));
             }
+            (0, zeppos_app_utils_2.HM_Analytics)("ZEPP_CLI_BRIDGE_UNINSTALL_C");
             cb();
             return [2];
         });
     }); });
     vorpal
-        .command('screenshot', 'Screenshot of the current watch device.').hidden()
+        .command('screenshot', 'Screenshot of the current watch device, OS 2.0-enabled devices only.')
         .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             if (hasConnectDevice) {
-                if (choiredDevice.indexOf('app') > -1) {
-                    vorpal.log(chalk_1["default"].blue('Waiting...'));
-                    client.sendMessage({ type: 'screenshot' }, { method: 'sysSettingPush' });
-                }
-                else {
-                    vorpal.log(chalk_1["default"].yellow("Only the connected device is an app that can use the screenshot command."));
-                }
+                vorpal.log(chalk_1["default"].blue('Waiting...'));
+                client.sendMessage({ type: 'screenshot' }, { method: 'sysSettingPush' });
             }
             else {
                 vorpal.log(chalk_1["default"].yellow("No device is connected, please connect the device with the command width 'connect' first."));
             }
+            (0, zeppos_app_utils_2.HM_Analytics)("ZEPP_CLI_BRIDGE_SCREENSHOT_C");
             cb();
             return [2];
         });
@@ -208,7 +205,7 @@ var connectWSCB = function () {
 };
 var disConnectWSCB = function () {
     hasConnectDevice = false;
-    logger.log('Disconnected');
+    zeppos_app_utils_1.logger.log('Disconnected');
     process.exit(1);
 };
 var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function () {
@@ -217,21 +214,21 @@ var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function
         switch (_a.label) {
             case 0:
                 _a.trys.push([0, 2, , 6]);
-                return [4, (0, index_1.getConnectDevServerWebSocketCode)()];
+                return [4, zeppos_app_utils_1.api.getConnectDevServerWebSocketCode()];
             case 1:
                 bridgeWebSocketURL = _a.sent();
-                client = new websocket_1["default"]({
+                client = new zeppos_app_utils_1.WebSocketClass({
                     url: "".concat(bridgeWebSocketURL, "?type=development&name=CLI"),
                     connectWSCB: connectWSCB,
                     disConnectWSCB: disConnectWSCB
                 });
-                logger.log("  - Enter 'help' to view the command.");
+                zeppos_app_utils_1.logger.log("  - Enter 'help' to view the command.");
                 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 () {
+                zeppos_app_utils_1.logger.warn("Login information is invalid. Please login again, or end this service and login again with the command 'zeus login'.");
+                return [4, zeppos_app_utils_1.modules.login().then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -248,7 +245,7 @@ var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function
                 _a.sent();
                 return [3, 5];
             case 4:
-                logger.error(error_1 === null || error_1 === void 0 ? void 0 : error_1.message);
+                zeppos_app_utils_1.logger.error(error_1 === null || error_1 === void 0 ? void 0 : error_1.message);
                 _a.label = 5;
             case 5: return [3, 6];
             case 6: return [2];

package/modules/build.js

@@ -62,23 +62,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.buildPreview = exports.buildProd = exports.buildDev = exports.build = exports.chooseBuildPackages = exports.BuildMode = void 0;
-var node_js_1 = require("@zeppos/zpm/lib/node.js");
-var fs_1 = __importDefault(require("fs"));
-var rd = __importStar(require("rd"));
+exports.buildPreview = exports.buildProd = exports.chooseBuildPackages = exports.BuildMode = void 0;
 var path = __importStar(require("path"));
-var lodash_1 = require("lodash");
 var fs_extra_1 = __importDefault(require("fs-extra"));
-var form_data_1 = __importDefault(require("form-data"));
+var lodash_1 = require("lodash");
+var dayjs_1 = __importDefault(require("dayjs"));
 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 api_1 = require("../api");
-var storage_1 = require("./storage");
-var common_1 = require("../utils/common");
-var login_1 = require("./login");
+var zeppos_app_utils_1 = require("zeppos-app-utils");
+var AppType = zeppos_app_utils_1.config.AppType, OSV2Devices = zeppos_app_utils_1.config.OSV2Devices;
 var appJsonContent = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
 var BuildMode;
 (function (BuildMode) {
@@ -86,36 +78,48 @@ var BuildMode;
     BuildMode["PREVIEW"] = "preview";
     BuildMode["PROD"] = "production";
 })(BuildMode = exports.BuildMode || (exports.BuildMode = {}));
-var TransformType;
-(function (TransformType) {
-    TransformType["Default"] = "";
-    TransformType["Js"] = "js";
-    TransformType["C"] = "c";
-    TransformType["Bin"] = "bin";
-})(TransformType || (TransformType = {}));
-function handleExecCommandInErrorDir(mode) {
-    logger.warn("This command needs to be executed in the root of the project.");
-    process.exit(1);
-}
-function chooseBuildPackages(mode) {
+var isV2ApiVersion = function (appJson) {
+    var minVersion = (0, lodash_1.get)(appJson, 'runtime.apiVersion.minVersion', '');
+    var minVersionArr = minVersion.split('.');
+    return parseInt("0".concat(minVersionArr[0]), 10) >= 2;
+};
+var chooseBuildPackages = function (mode, args) {
     if (mode === void 0) { mode = 'development'; }
-    return __awaiter(this, void 0, void 0, function () {
-        var targets, _a, promptTarget_1, answers;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var jsonTargets_1, unsupportedTargets_1, targets, returnRes, _a, promptTarget_1, answers;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     if (!appJsonContent) {
-                        handleExecCommandInErrorDir(mode);
+                        zeppos_app_utils_1.logger.warn("This command needs to be executed in the root of the project.");
+                        process.exit(1);
+                    }
+                    if (isV2ApiVersion(appJsonContent)) {
+                        jsonTargets_1 = (0, lodash_1.get)(appJsonContent, 'targets', {});
+                        unsupportedTargets_1 = [];
+                        Object.keys(jsonTargets_1).forEach(function (target) {
+                            var notV2Index = (0, lodash_1.findIndex)((0, lodash_1.get)(jsonTargets_1, "".concat(target, ".platforms"), []), function (o) {
+                                return !OSV2Devices.includes(o.deviceSource);
+                            });
+                            if (notV2Index > -1) {
+                                (0, lodash_1.unset)(appJsonContent, "targets[".concat(target, "]"));
+                                unsupportedTargets_1.push(target);
+                            }
+                        });
+                        unsupportedTargets_1.length && zeppos_app_utils_1.logger.warn("Unsupported targets(".concat(unsupportedTargets_1.join(', '), ") have been removed."));
                     }
                     targets = Object.keys((0, lodash_1.get)(appJsonContent, 'targets', {}));
+                    returnRes = [];
                     if (!!targets.length) return [3, 1];
-                    logger.error('Please set at least one package.');
+                    zeppos_app_utils_1.logger.error('Please set at least one package.');
                     process.exit(1);
                     return [3, 4];
                 case 1:
                     if (!(targets.length === 1)) return [3, 2];
-                    return [2, [targets[0]]];
+                    returnRes = [targets[0]];
+                    return [3, 4];
                 case 2:
+                    process.env._targetDeviceToBuild = (args === null || args === void 0 ? void 0 : args.target) || '';
                     _a = process.env._targetDeviceToBuild, promptTarget_1 = _a === void 0 ? '' : _a;
                     return [4, inquirer_1["default"].prompt([
                             {
@@ -152,218 +156,85 @@ function chooseBuildPackages(mode) {
                         ])];
                 case 3:
                     answers = _b.sent();
-                    return [2, typeof answers.target === 'string' ? [answers.target] : answers.target];
-                case 4: return [2];
-            }
-        });
-    });
-}
-exports.chooseBuildPackages = chooseBuildPackages;
-var build = function (mode, buildConfigOption) {
-    if (mode === void 0) { mode = BuildMode.PROD; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var workspace, packages, choosePackages, buildOptions, _a, js2c, _b, js2bin, _c, png2vg, _d, prune, curOpt, productName_1, DistDir_1, appId, name_1, newName_1, error_1;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
-                case 0:
-                    workspace = path.resolve('./');
-                    process.env._targetDeviceToBuild = (buildConfigOption === null || buildConfigOption === void 0 ? void 0 : buildConfigOption.target) || '';
-                    packages = [];
-                    return [4, chooseBuildPackages(mode)];
-                case 1:
-                    choosePackages = _e.sent();
-                    if (!choosePackages || !choosePackages.length) {
-                        logger.error('please choose at least one package.');
-                        return [2];
-                    }
-                    packages.push.apply(packages, choosePackages);
+                    returnRes = typeof answers.target === 'string' ? [answers.target] : answers.target;
+                    _b.label = 4;
+                case 4:
                     if (!process.env._targetDeviceToBuild) {
-                        process.env._targetDeviceToBuild = packages[0];
-                    }
-                    buildOptions = {
-                        path: workspace,
-                        targets: packages,
-                        buildMode: mode,
-                        jsc: TransformType.Default
-                    };
-                    if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
-                        _a = buildConfigOption || {}, js2c = _a.js2c, _b = _a.js2bin, js2bin = _b === void 0 ? true : _b, _c = _a.png2vg, png2vg = _c === void 0 ? true : _c, _d = _a.prune, prune = _d === void 0 ? true : _d;
-                        js2c = !!((js2c === 'true') || (js2c === true));
-                        js2bin = !!((js2bin === 'true') || (js2bin === true));
-                        png2vg = !!((png2vg === 'true') || (png2vg === true));
-                        prune = !!((prune === 'true') || (prune === true));
-                        js2c && Object.assign(buildOptions, { jsc: TransformType.C });
-                        js2bin && Object.assign(buildOptions, { jsc: TransformType.Bin });
-                        Object.assign(buildOptions, {
-                            png2vg: png2vg,
-                            prune: prune
-                        });
-                    }
-                    _e.label = 2;
-                case 2:
-                    _e.trys.push([2, 7, , 8]);
-                    curOpt = (buildConfigOption ? buildConfigOption._ : [''])[0];
-                    if (!(mode !== BuildMode.DEV || (mode === BuildMode.DEV && curOpt === 'install'))) return [3, 4];
-                    return [4, (0, node_js_1.start)(buildOptions)];
-                case 3:
-                    productName_1 = _e.sent();
-                    if (productName_1) {
-                        DistDir_1 = path.join(workspace, 'dist');
-                        appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
-                        name_1 = productName_1.replace(/[\s]/g, '_').split('.zab');
-                        newName_1 = "".concat(appId, "-").concat(name_1[0], ".zab");
-                        rd.eachFileSync(DistDir_1, function (file) {
-                            var oldName = path.join(DistDir_1, productName_1);
-                            if (file !== oldName) {
-                                fs_extra_1["default"].removeSync(file);
-                            }
-                            else {
-                                fs_1["default"].renameSync(oldName, path.join(DistDir_1, newName_1));
-                            }
-                        });
-                        productName_1 = newName_1;
+                        process.env._targetDeviceToBuild = returnRes[0];
                     }
-                    return [2, productName_1];
-                case 4:
-                    if (!(mode === BuildMode.DEV)) return [3, 6];
-                    return [4, (0, node_js_1.startWithoutDist)(buildOptions)];
-                case 5:
-                    _e.sent();
-                    return [2, (0, node_js_1.getZpkBuf)(packages[0])];
-                case 6: return [3, 8];
-                case 7:
-                    error_1 = _e.sent();
-                    logger.error(error_1);
-                    return [3, 8];
-                case 8: return [2];
+                    return [2, returnRes];
             }
         });
     });
 };
-exports.build = build;
-var buildDev = function (args) {
-    (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_DEV_C');
-    return (0, exports.build)(BuildMode.DEV, args);
-};
-exports.buildDev = buildDev;
+exports.chooseBuildPackages = chooseBuildPackages;
 var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var buildInfo;
+    var packages, appId, buildInfo;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4, (0, exports.build)(BuildMode.PROD, args)];
+            case 0: return [4, (0, exports.chooseBuildPackages)(BuildMode.PROD, args)];
             case 1:
+                packages = _a.sent();
+                appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
+                return [4, zeppos_app_utils_1.modules.build(path.resolve('./'), BuildMode.PROD, args, packages, appId)];
+            case 2:
                 buildInfo = _a.sent();
                 if (buildInfo) {
-                    (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_BUILD_C', { res: '1' });
+                    (0, zeppos_app_utils_1.HM_Analytics)('ZEPP_CLI_BUILD_C', { res: '1' });
                 }
                 else {
-                    (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_BUILD_C', { res: '0' });
+                    (0, zeppos_app_utils_1.HM_Analytics)('ZEPP_CLI_BUILD_C', { res: '0' });
                 }
                 return [2, buildInfo];
         }
     });
 }); };
 exports.buildProd = buildProd;
-var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, curCommand, curBridgeTarget, buildMode, buildInfo, appType, isWatchFaceProject, form;
+var buildPreview = function (args, callback) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, curCommand, curBridgeTarget, buildMode, appType, appId, packages, buildInfo;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 _a = args._, curCommand = _a[0], curBridgeTarget = _a[1];
                 buildMode = (curBridgeTarget && curBridgeTarget === 'simulator') ? BuildMode.DEV : BuildMode.PREVIEW;
-                logger.info('building...');
-                return [4, (0, exports.build)(buildMode, args)];
+                zeppos_app_utils_1.logger.info('building...');
+                appType = (0, lodash_1.get)(appJsonContent, 'app.appType');
+                appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
+                return [4, (0, exports.chooseBuildPackages)(buildMode, args)];
             case 1:
+                packages = _b.sent();
+                return [4, zeppos_app_utils_1.modules.build(path.resolve('./'), buildMode, args, packages, appId)];
+            case 2:
                 buildInfo = _b.sent();
-                appType = (0, lodash_1.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 _subRegionalHost, protocol, code, res, error_2, url, _a, deviceSource, appId, appName, appType_1, deviceSourceArr, targetDeviceInternalName, packageInfo, url, preview, downloadPackageReturn;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
-                            case 0:
-                                if (err) {
-                                    logger.error('getting package failed.');
-                                    return [2];
-                                }
-                                _subRegionalHost = process.env._subRegionalHost;
-                                protocol = '';
-                                code = '';
-                                _b.label = 1;
-                            case 1:
-                                _b.trys.push([1, 3, , 7]);
-                                return [4, (0, api_1.uploadPackage)(form, length)];
-                            case 2:
-                                res = _b.sent();
-                                protocol = res.protocol;
-                                code = res.code;
-                                return [3, 7];
-                            case 3:
-                                error_2 = _b.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:
-                                _b.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.success("Please use Zepp APP to scan the following qrcode to preview your ".concat(isWatchFaceProject ? 'WatchFace' : 'application', " within two hours."));
-                                    qrcode_terminal_1["default"].generate(url, { small: true });
-                                    storage_1.globalStorage.set({ ____preview_url: url });
-                                }
-                                else {
-                                    logger.error('Generating preview qrcode failed, please check your network.');
-                                }
-                                return [3, 10];
-                            case 8:
-                                if (!(curCommand === 'install')) return [3, 10];
-                                _a = (0, common_1.getDeviceInfoFromAppJson)(), deviceSource = _a.deviceSource, appId = _a.appId, appName = _a.appName, appType_1 = _a.appType, deviceSourceArr = _a.deviceSourceArr, targetDeviceInternalName = _a.targetDeviceInternalName;
-                                return [4, (0, api_1.downloadPackage)(code, deviceSource, appType_1)];
-                            case 9:
-                                packageInfo = _b.sent();
-                                url = packageInfo;
-                                preview = '';
-                                if (isWatchFaceProject) {
-                                    downloadPackageReturn = (0, lodash_1.get)(packageInfo, 'data', {});
-                                    url = downloadPackageReturn.url;
-                                    preview = downloadPackageReturn.preview;
-                                }
-                                if (cb) {
-                                    cb({
-                                        appType: appType_1,
-                                        url: url,
-                                        preview: preview,
-                                        appid: appId,
-                                        name: appName,
-                                        "debugger": true,
-                                        updatedTime: Math.round(new Date().getTime() / 1000),
-                                        devices: deviceSourceArr,
-                                        target: targetDeviceInternalName
-                                    });
-                                }
-                                _b.label = 10;
-                            case 10: return [2];
-                        }
-                    });
-                }); });
+                zeppos_app_utils_1.logger.info('getting package...');
+                return [4, zeppos_app_utils_1.modules.previewBuild(path.resolve('./'), args, "./dist/".concat(buildInfo), appType, curCommand).then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    if (!(res.type === 'preview')) return [3, 1];
+                                    zeppos_app_utils_1.logger.info('Generating preview QR code...');
+                                    zeppos_app_utils_1.logger.success("Please use Zepp APP to scan the following QR code to preview your ".concat(appType === AppType.WATCHFACE ? 'WatchFace' : 'application', "."));
+                                    zeppos_app_utils_1.logger.success("The QR code will expire on ".concat((0, dayjs_1["default"])().add(2, 'hour').format('YYYY-MM-DD HH:mm:ss'), "."));
+                                    qrcode_terminal_1["default"].generate(res.url, { small: true });
+                                    callback && callback(res);
+                                    return [3, 4];
+                                case 1:
+                                    if (!(res === 'reTry')) return [3, 3];
+                                    return [4, (0, exports.buildPreview)(args)];
+                                case 2:
+                                    _a.sent();
+                                    return [3, 4];
+                                case 3:
+                                    callback && callback(res);
+                                    _a.label = 4;
+                                case 4: return [2];
+                            }
+                        });
+                    }); })["catch"](function () {
+                        zeppos_app_utils_1.logger.error('Generating preview qrcode failed, please check your network.');
+                    })];
+            case 3:
+                _b.sent();
                 return [2];
         }
     });