@zeppos/zeus-cli 1.1.3 → 1.1.6

package/api/index.js

@@ -153,8 +153,8 @@ var getConnectDevServerWebSocketCode = function () { return __awaiter(void 0, vo
                     throw new Error('401');
                 }
                 else {
-                    project_1.____inner_global_variable.bridgeOptionalDevice = '';
-                    project_1.____inner_global_variable.bridgeChoiredDevice = '';
+                    process.env._bridgeOptionalDevice = '';
+                    process.env._bridgeChoiredDevice = '';
                     throw new Error("GetConnectDevServerWebSocketCode error");
                 }
                 return [3, 4];
@@ -173,7 +173,9 @@ var uploadPackage = function (form, length) { return __awaiter(void 0, void 0, v
             case 1:
                 _c.trys.push([1, 3, , 4]);
                 return [4, axios_1["default"].post("https://".concat(_subRegionalHost, "/custom/tools/app-dial/upload?userid=").concat(_loginUserId), form, {
-                        headers: __assign(__assign({}, form.getHeaders()), { 'content-length': "".concat(length), apptoken: _loginAppToken })
+                        headers: __assign(__assign({}, form.getHeaders()), { 'content-length': "".concat(length), apptoken: _loginAppToken }),
+                        maxContentLength: Infinity,
+                        maxBodyLength: Infinity
                     })];
             case 2:
                 packageInfo = _c.sent();

package/config/device.js

@@ -7,6 +7,7 @@ var DeviceTarget;
     DeviceTarget["MADRID"] = "madrid";
     DeviceTarget["VERONA"] = "verona";
     DeviceTarget["ZURICH"] = "zurich";
+    DeviceTarget["TEIDE"] = "teide";
 })(DeviceTarget = exports.DeviceTarget || (exports.DeviceTarget = {}));
 var DevicePlatformName;
 (function (DevicePlatformName) {
@@ -16,6 +17,8 @@ var DevicePlatformName;
     DevicePlatformName["VERONAW"] = "gtr3-w";
     DevicePlatformName["ZURICH"] = "gts3";
     DevicePlatformName["ZURICHW"] = "gts3-w";
+    DevicePlatformName["TEIDE"] = "t-rex2";
+    DevicePlatformName["TEIDEW"] = "t-rex2-w";
 })(DevicePlatformName = exports.DevicePlatformName || (exports.DevicePlatformName = {}));
 var DeviceSource;
 (function (DeviceSource) {
@@ -25,6 +28,8 @@ var DeviceSource;
     DeviceSource[DeviceSource["VERONAW"] = 227] = "VERONAW";
     DeviceSource[DeviceSource["ZURICH"] = 224] = "ZURICH";
     DeviceSource[DeviceSource["ZURICHW"] = 225] = "ZURICHW";
+    DeviceSource[DeviceSource["TEIDE"] = 418] = "TEIDE";
+    DeviceSource[DeviceSource["TEIDEW"] = 419] = "TEIDEW";
 })(DeviceSource = exports.DeviceSource || (exports.DeviceSource = {}));
 var DeviceScreenType;
 (function (DeviceScreenType) {
@@ -86,6 +91,24 @@ exports.deviceTargets = (_a = {},
             height: 450
         }
     },
+    _a[DeviceTarget.TEIDE] = {
+        deviceName: 'T-Rex2',
+        platforms: [
+            {
+                name: DevicePlatformName.TEIDE,
+                deviceSource: DeviceSource.TEIDE
+            },
+            {
+                name: DevicePlatformName.TEIDEW,
+                deviceSource: DeviceSource.TEIDEW
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.R,
+            width: 454,
+            height: 454
+        }
+    },
     _a);
 exports.deviceInternalCodeName = (_b = {},
     _b[DeviceSource.MADRID] = DeviceTarget.MADRID,
@@ -94,4 +117,6 @@ exports.deviceInternalCodeName = (_b = {},
     _b[DeviceSource.VERONAW] = DeviceTarget.VERONA,
     _b[DeviceSource.ZURICH] = DeviceTarget.ZURICH,
     _b[DeviceSource.ZURICHW] = DeviceTarget.ZURICH,
+    _b[DeviceSource.TEIDE] = DeviceTarget.TEIDE,
+    _b[DeviceSource.TEIDEW] = DeviceTarget.TEIDE,
     _b);

package/config/project.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.simulatorStorageKey = exports.buildStorageKey = exports.____inner_global_variable = exports.analyticsKey = exports.loginStorageKey = exports.loginConfig = exports.analyticsHost = exports.gitignoreDefaultItem = exports.ACCOUNT_ENV_KEY = exports.TemplateCopyType = exports.AppSourceType = exports.AppType = void 0;
+exports.simulatorStorageKey = exports.analyticsKey = exports.loginStorageKey = exports.loginConfig = exports.analyticsHost = exports.gitignoreDefaultItem = exports.ACCOUNT_ENV_KEY = exports.TemplateCopyType = exports.AppSourceType = exports.AppType = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var AppType;
 (function (AppType) {
@@ -41,13 +41,6 @@ exports.loginStorageKey = {
 exports.analyticsKey = {
     id: "".concat(accountPrefix, "analyticsId")
 };
-exports.____inner_global_variable = {
-    bridgeOptionalDevice: '',
-    bridgeChoiredDevice: ''
-};
-exports.buildStorageKey = {
-    targetDeviceToBuild: "".concat(accountPrefix, "targetDeviceToBuild")
-};
 exports.simulatorStorageKey = {
     simulatorHost: 'simulator_host',
     simulatorPort: 'simulator_port',

package/modules/bridge.js

@@ -66,7 +66,6 @@ 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 websocket_1 = __importDefault(require("./websocket"));
 var build_1 = require("./build");
@@ -80,7 +79,7 @@ var connectDevice = function (vorpal) { return __awaiter(void 0, void 0, void 0,
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                debugConnectedDevice = JSON.parse(project_1.____inner_global_variable.bridgeOptionalDevice);
+                debugConnectedDevice = JSON.parse(process.env._bridgeOptionalDevice);
                 optionalDeviceArr = Object.keys(debugConnectedDevice);
                 len = optionalDeviceArr.length;
                 if (!(len === 0)) return [3, 1];
@@ -104,15 +103,15 @@ var connectDevice = function (vorpal) { return __awaiter(void 0, void 0, void 0,
                 _a.sent();
                 _a.label = 3;
             case 3:
-                project_1.____inner_global_variable.bridgeChoiredDevice = choiredDevice;
-                client.sendMessage({ clientId: clientId_1 }, 'connectClient');
+                process.env._bridgeChoiredDevice = choiredDevice;
+                client.sendMessage({ clientId: clientId_1 }, { method: 'connectClient' });
                 hasConnectDevice = true;
                 _a.label = 4;
             case 4: return [2];
         }
     });
 }); };
-var connectBridgeWSCallback = function () {
+var connectWSCB = function () {
     var vorpal = require('vorpal')();
     vorpal.find('help').hidden();
     vorpal.find('exit').remove();
@@ -146,7 +145,7 @@ var connectBridgeWSCallback = function () {
                 case 0:
                     if (!hasConnectDevice) return [3, 2];
                     return [4, (0, build_1.buildPreview)({ _: ['install', "".concat(choiredDevice.toLowerCase())], '$0': 'zeus' }, function (params) {
-                            client.sendMessage(params, 'packagePush');
+                            client.sendMessage(params, { method: 'packagePush' });
                         })];
                 case 1:
                     _a.sent();
@@ -170,14 +169,14 @@ var connectBridgeWSCallback = function () {
                     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'));
+                    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');
+                    client.sendMessage({ type: 'delete', appid: appid, appName: appName, appType: appType }, { method: 'sysSettingPush' });
                 }
             }
             else if (args.appid && typeof args.appid === 'number') {
-                vorpal.log(chalk_1["default"].blue('Uninstalling'));
-                client.sendMessage({ type: 'delete', appid: args.appid }, 'sysSettingPush');
+                vorpal.log(chalk_1["default"].blue('Uninstalling...'));
+                client.sendMessage({ type: 'delete', appid: args.appid }, { method: '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."));
@@ -186,8 +185,28 @@ var connectBridgeWSCallback = function () {
             return [2];
         });
     }); });
+    vorpal
+        .command('screenshot', 'Screenshot of the current watch device.').hidden()
+        .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."));
+                }
+            }
+            else {
+                vorpal.log(chalk_1["default"].yellow("No device is connected, please connect the device with the command width 'connect' first."));
+            }
+            cb();
+            return [2];
+        });
+    }); });
 };
-var disConnectBridgeWSCallback = function () {
+var disConnectWSCB = function () {
     hasConnectDevice = false;
     logger.log('Disconnected');
     process.exit(1);
@@ -203,8 +222,8 @@ var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function
                 bridgeWebSocketURL = _a.sent();
                 client = new websocket_1["default"]({
                     url: "".concat(bridgeWebSocketURL, "?type=development&name=CLI"),
-                    connectCb: connectBridgeWSCallback,
-                    disconnectCb: disConnectBridgeWSCallback
+                    connectWSCB: connectWSCB,
+                    disConnectWSCB: disConnectWSCB
                 });
                 logger.log("  - Enter 'help' to view the command.");
                 return [3, 6];

package/modules/build.js

@@ -67,7 +67,7 @@ var node_js_1 = require("@zeppos/zpm/lib/node.js");
 var fs_1 = __importDefault(require("fs"));
 var rd = __importStar(require("rd"));
 var path = __importStar(require("path"));
-var lodash_1 = __importDefault(require("lodash"));
+var lodash_1 = require("lodash");
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var form_data_1 = __importDefault(require("form-data"));
 var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
@@ -100,65 +100,75 @@ function handleExecCommandInErrorDir(mode) {
 function chooseBuildPackages(mode) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(this, void 0, void 0, function () {
-        var targets, answers;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var targets, _a, promptTarget_1, answers;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (!appJsonContent) {
                         handleExecCommandInErrorDir(mode);
                     }
-                    targets = Object.keys(lodash_1["default"].get(appJsonContent, 'targets', {}));
+                    targets = Object.keys((0, lodash_1.get)(appJsonContent, 'targets', {}));
                     if (!!targets.length) return [3, 1];
                     logger.error('Please set at least one package.');
                     process.exit(1);
                     return [3, 4];
                 case 1:
                     if (!(targets.length === 1)) return [3, 2];
-                    storage_1.globalStorage.set((_a = {}, _a[project_1.buildStorageKey.targetDeviceToBuild] = targets[0], _a));
                     return [2, [targets[0]]];
-                case 2: return [4, inquirer_1["default"].prompt([
-                        {
-                            name: 'target',
-                            type: 'list',
-                            when: function () { return mode !== BuildMode.PROD; },
-                            message: 'Which target would you like to preview?',
-                            choices: targets
-                        },
-                        {
-                            name: 'buildTargets',
-                            type: 'checkbox',
-                            when: function () { return mode === BuildMode.PROD; },
-                            choices: targets.map(function (item) { return ({
-                                name: item,
-                                value: item,
-                                checked: true
-                            }); }),
-                            message: 'Which targets would you like to build?'
-                        }
-                    ])];
+                case 2:
+                    _a = process.env._targetDeviceToBuild, promptTarget_1 = _a === void 0 ? '' : _a;
+                    return [4, inquirer_1["default"].prompt([
+                            {
+                                name: 'target',
+                                type: 'list',
+                                when: function (args) {
+                                    var bool = targets.includes(promptTarget_1);
+                                    if (bool) {
+                                        args.target = promptTarget_1;
+                                    }
+                                    return mode !== BuildMode.PROD && !bool;
+                                },
+                                message: 'Which target would you like to preview?',
+                                choices: targets
+                            },
+                            {
+                                name: 'target',
+                                type: 'checkbox',
+                                when: function (args) {
+                                    var arr = typeof promptTarget_1 === 'string' ? (0, lodash_1.intersection)(targets, promptTarget_1.split(',')) : [];
+                                    var bool = !!arr.length;
+                                    if (bool) {
+                                        args.target = arr;
+                                    }
+                                    return mode === BuildMode.PROD && !bool;
+                                },
+                                choices: targets.map(function (item) { return ({
+                                    name: item,
+                                    value: item,
+                                    checked: true
+                                }); }),
+                                message: 'Which targets would you like to build?'
+                            }
+                        ])];
                 case 3:
-                    answers = _c.sent();
-                    if (BuildMode.PROD) {
-                        storage_1.globalStorage.set((_b = {}, _b[project_1.buildStorageKey.targetDeviceToBuild] = answers.target, _b));
-                    }
-                    return [2, mode !== BuildMode.PROD ? [answers.target] : answers.buildTargets];
+                    answers = _b.sent();
+                    return [2, typeof answers.target === 'string' ? [answers.target] : answers.target];
                 case 4: return [2];
             }
         });
     });
 }
 exports.chooseBuildPackages = chooseBuildPackages;
-var build = function (mode, packages, buildConfigOption) {
+var build = function (mode, buildConfigOption) {
     if (mode === void 0) { mode = BuildMode.PROD; }
-    if (packages === void 0) { packages = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var workspace, choosePackages, buildOptions, _a, js2c, js2bin, png2vg, prune, curJscMode, curTarget, buildInfo_1, DistDir_1, error_1;
+        var workspace, packages, choosePackages, buildOptions, _a, js2c, js2bin, png2vg, prune, curJscMode, curOpt, productName_1, DistDir_1, appId, name_1, newName_1, error_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     workspace = path.resolve('./');
-                    if (!!packages.length) return [3, 2];
+                    process.env._targetDeviceToBuild = (buildConfigOption === null || buildConfigOption === void 0 ? void 0 : buildConfigOption.target) || '';
+                    packages = [];
                     return [4, chooseBuildPackages(mode)];
                 case 1:
                     choosePackages = _b.sent();
@@ -167,8 +177,9 @@ var build = function (mode, packages, buildConfigOption) {
                         return [2];
                     }
                     packages.push.apply(packages, choosePackages);
-                    _b.label = 2;
-                case 2:
+                    if (!process.env._targetDeviceToBuild) {
+                        process.env._targetDeviceToBuild = packages[0];
+                    }
                     buildOptions = {
                         path: workspace,
                         targets: packages,
@@ -194,50 +205,58 @@ var build = function (mode, packages, buildConfigOption) {
                             jsc: curJscMode
                         });
                     }
-                    _b.label = 3;
-                case 3:
-                    _b.trys.push([3, 8, , 9]);
-                    curTarget = (buildConfigOption ? buildConfigOption._ : [''])[0];
-                    if (!(mode !== BuildMode.DEV || (mode === BuildMode.DEV && curTarget === 'install'))) return [3, 5];
+                    _b.label = 2;
+                case 2:
+                    _b.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 4:
-                    buildInfo_1 = _b.sent();
-                    if (buildInfo_1) {
+                case 3:
+                    productName_1 = _b.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) {
-                            if (file !== path.join(DistDir_1, buildInfo_1)) {
+                            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;
                     }
-                    return [2, buildInfo_1];
-                case 5:
-                    if (!(mode === BuildMode.DEV)) return [3, 7];
+                    return [2, productName_1];
+                case 4:
+                    if (!(mode === BuildMode.DEV)) return [3, 6];
                     return [4, (0, node_js_1.startWithoutDist)(buildOptions)];
-                case 6:
+                case 5:
                     _b.sent();
                     return [2, (0, node_js_1.getZpkBuf)(packages[0])];
-                case 7: return [3, 9];
-                case 8:
+                case 6: return [3, 8];
+                case 7:
                     error_1 = _b.sent();
                     logger.error(error_1);
-                    return [3, 9];
-                case 9: return [2];
+                    return [3, 8];
+                case 8: return [2];
             }
         });
     });
 };
 exports.build = build;
-var buildDev = function (packages) {
+var buildDev = function (args) {
     (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_DEV_C');
-    return (0, exports.build)(BuildMode.DEV, packages);
+    return (0, exports.build)(BuildMode.DEV, args);
 };
 exports.buildDev = buildDev;
 var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var 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.build)(BuildMode.PROD, args)];
             case 1:
                 buildInfo = _a.sent();
                 if (buildInfo) {
@@ -259,38 +278,38 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 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)];
+                return [4, (0, exports.build)(buildMode, args)];
             case 1:
                 buildInfo = _b.sent();
-                appType = lodash_1["default"].get(appJsonContent, 'app.appType');
+                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 _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) {
+                    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];
                                 }
-                                _a = process.env, _subRegionalHost = _a._subRegionalHost, _accountEnv = _a._accountEnv;
+                                _subRegionalHost = process.env._subRegionalHost;
                                 protocol = '';
                                 code = '';
-                                _c.label = 1;
+                                _b.label = 1;
                             case 1:
-                                _c.trys.push([1, 3, , 7]);
+                                _b.trys.push([1, 3, , 7]);
                                 return [4, (0, api_1.uploadPackage)(form, length)];
                             case 2:
-                                res = _c.sent();
+                                res = _b.sent();
                                 protocol = res.protocol;
                                 code = res.code;
                                 return [3, 7];
                             case 3:
-                                error_2 = _c.sent();
+                                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 () {
@@ -301,7 +320,7 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                                         });
                                     }); })];
                             case 4:
-                                _c.sent();
+                                _b.sent();
                                 return [3, 6];
                             case 5:
                                 logger.error(error_2 === null || error_2 === void 0 ? void 0 : error_2.message);
@@ -312,8 +331,9 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                                 url = "".concat(protocol, "://").concat(_subRegionalHost, "/custom/tools/app-dial/download/").concat(code);
                                 if (protocol && code) {
                                     logger.info('Generating preview qrcode...');
-                                    logger.success('Below within two hours,please use Zepp APP to scan the qrcode below to preview your app.');
+                                    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.');
@@ -321,14 +341,14 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                                 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;
+                                _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 = _c.sent();
+                                packageInfo = _b.sent();
                                 url = packageInfo;
                                 preview = '';
                                 if (isWatchFaceProject) {
-                                    downloadPackageReturn = lodash_1["default"].get(packageInfo, 'data', {});
+                                    downloadPackageReturn = (0, lodash_1.get)(packageInfo, 'data', {});
                                     url = downloadPackageReturn.url;
                                     preview = downloadPackageReturn.preview;
                                 }
@@ -345,7 +365,7 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                                         target: targetDeviceInternalName
                                     });
                                 }
-                                _c.label = 10;
+                                _b.label = 10;
                             case 10: return [2];
                         }
                     });

package/modules/create/index.js

@@ -83,7 +83,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.create = void 0;
-var lodash_1 = __importDefault(require("lodash"));
+var lodash_1 = require("lodash");
 var chalk_1 = __importDefault(require("chalk"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var rd = __importStar(require("rd"));
@@ -102,11 +102,11 @@ var sleep_1 = require("../../utils/sleep");
 var hm_analytics_1 = require("../../utils/hm-analytics");
 var TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template');
 var create = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var cmd, _a, projectName, cwdPath, beforeFiles, workDir, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generatorMate, generatorMateKeys, answer, choosePkg;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var cmd, _a, projectName, _b, promptAppType, _c, promptTemplate, _d, promptWithAppSide, _e, promptWithSettings, _f, promptBuildTargets, cwdPath, beforeFiles, workDir, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generatorMate, generatorMateKeys, answer, choosePkg;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
-                cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a;
+                cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a, _b = args.appType, promptAppType = _b === void 0 ? '' : _b, _c = args.template, promptTemplate = _c === void 0 ? '' : _c, _d = args.withAppSide, promptWithAppSide = _d === void 0 ? false : _d, _e = args.withSettings, promptWithSettings = _e === void 0 ? false : _e, _f = args.buildTargets, promptBuildTargets = _f === void 0 ? [] : _f;
                 cwdPath = (0, path_1.resolve)('./');
                 beforeFiles = [];
                 workDir = cwdPath;
@@ -136,13 +136,13 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 localChoices = [];
                 watchfaceTemplateChoices = [];
                 appTemplateChoices = [];
-                if (!lodash_1["default"].isEmpty(localTemplates)) {
+                if (!(0, lodash_1.isEmpty)(localTemplates)) {
                     localTemplates.forEach(function (dirName) {
                         var dirPath = "".concat(TEMPLATE_DIR, "/").concat(dirName);
                         var dirStat = (0, fs_1.lstatSync)(dirPath);
                         if (dirStat.isDirectory()) {
                             var chooseItem = {
-                                name: lodash_1["default"].startCase(dirName),
+                                name: (0, lodash_1.startCase)(dirName),
                                 path: dirPath,
                                 type: project_1.AppSourceType.LOCAL
                             };
@@ -207,45 +207,92 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                         {
                             name: 'appType',
                             type: 'list',
+                            when: function (args) {
+                                var bool = !promptAppType || !Object.values(project_1.AppType).includes(promptAppType);
+                                if (!bool) {
+                                    args.appType = promptAppType.toUpperCase();
+                                }
+                                return bool;
+                            },
                             message: 'What type of application do you want to create?',
                             choices: Object.keys(project_1.AppType)
                         },
                         {
                             name: 'template',
                             type: 'list',
-                            when: function (args) { return args.appType.toLowerCase() === project_1.AppType.APP; },
-                            message: 'Which template do you want to use?',
+                            when: function (args) {
+                                var isApp = args.appType.toLowerCase() === project_1.AppType.APP;
+                                var objMap = appTemplateChoices.find(function (val) {
+                                    var name = val.name === 'Hello World' ? 'Hello_World' : val.name;
+                                    return name === promptTemplate;
+                                });
+                                if (isApp && objMap) {
+                                    args.template = objMap.value;
+                                }
+                                return isApp && !objMap;
+                            },
+                            message: 'Which app template do you want to use?',
                             choices: __spreadArray([
                                 new inquirer_1["default"].Separator(),
-                                new inquirer_1["default"].Separator('Choose a template')
+                                new inquirer_1["default"].Separator('Choose a app template')
                             ], appTemplateChoices, true)
                         },
                         {
                             name: 'template',
                             type: 'list',
-                            when: function (args) { return args.appType.toLowerCase() === project_1.AppType.WATCHFACE; },
-                            message: 'Which template do you want to use?',
+                            when: function (args) {
+                                var isWatchFace = args.appType.toLowerCase() === project_1.AppType.WATCHFACE;
+                                var objMap = watchfaceTemplateChoices.find(function (val) { return val.name === promptTemplate; });
+                                if (isWatchFace && objMap) {
+                                    args.template = objMap.value;
+                                }
+                                return isWatchFace && !objMap;
+                            },
+                            message: 'Which watchface template do you want to use?',
                             choices: __spreadArray([
                                 new inquirer_1["default"].Separator(),
-                                new inquirer_1["default"].Separator('Choose a template')
+                                new inquirer_1["default"].Separator('Choose a watchface template')
                             ], watchfaceTemplateChoices, true)
                         },
                         {
                             name: 'withAppSide',
                             type: 'confirm',
-                            when: function (args) { return args.template === 0 && args.appType.toLowerCase() === project_1.AppType.APP; },
+                            when: function (args) {
+                                var isApp = args.appType.toLowerCase() === project_1.AppType.APP;
+                                var isEmpty = args.template === 0;
+                                if (isApp && isEmpty && promptWithAppSide) {
+                                    args.withAppSide = promptWithAppSide === 'no' ? false : true;
+                                    return false;
+                                }
+                                return isApp && isEmpty;
+                            },
                             message: 'Should this application contain a app-side component?'
                         },
                         {
                             name: 'withSettings',
                             type: 'confirm',
-                            when: function (args) { return args.withAppSide; },
+                            when: function (args) {
+                                var withAppSide = args.withAppSide;
+                                if (withAppSide && promptWithSettings) {
+                                    args.withSettings = promptWithSettings === 'no' ? false : true;
+                                    return false;
+                                }
+                                return withAppSide;
+                            },
                             message: 'Should this application contain a settings component?'
                         },
                         {
                             name: 'buildTargets',
                             type: 'checkbox',
-                            when: function (args) { return args.template === 0; },
+                            when: function (args) {
+                                var bool = args.template === 0;
+                                var tarArr = typeof promptBuildTargets === 'string' ? (0, lodash_1.intersection)(Object.keys(device_1.deviceTargets), promptBuildTargets.split(',')) : [];
+                                if (bool && tarArr.length) {
+                                    args.buildTargets = tarArr;
+                                    return false;
+                                }
+                                return bool;
+                            },
                             choices: Object.keys(device_1.deviceTargets).map(function (platform) { return ({
                                 name: device_1.deviceTargets[platform].deviceName,
                                 value: platform,
@@ -256,28 +303,28 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                         },
                     ])];
             case 1:
-                answer = _b.sent();
+                answer = _g.sent();
                 answer.appType = answer.appType || project_1.AppType.APP;
                 answer.workDir = workDir;
                 choosePkg = answer.appType.toLowerCase() === project_1.AppType.APP ? appTemplateChoices[answer.template] : watchfaceTemplateChoices[answer.template];
                 logger.info('fetching template...');
                 return [4, (0, sleep_1.sleep)(100)];
             case 2:
-                _b.sent();
+                _g.sent();
                 if (choosePkg.type === project_1.AppSourceType.YEOMAN) {
-                    logger.info("".concat(lodash_1["default"].upperFirst(cmd), " application using yeoman template \"").concat(choosePkg.name, "\"."));
+                    logger.info("".concat((0, lodash_1.upperFirst)(cmd), " application using yeoman template \"").concat(choosePkg.name, "\"."));
                     (0, yeoman_app_1.createYeomanApp)(__assign(__assign({}, answer), { env: env, templateInfo: generatorMate[choosePkg.name] }));
                 }
                 else {
-                    logger.info("".concat(lodash_1["default"].upperFirst(cmd), " application using local template \"").concat(choosePkg.name, "\"."));
+                    logger.info("".concat((0, lodash_1.upperFirst)(cmd), " application using local template \"").concat(choosePkg.name, "\"."));
                     (0, local_app_1.createLocalApp)(__assign(__assign({}, answer), { templateInfo: choosePkg }));
                 }
                 logger.log('\n');
                 return [4, (0, sleep_1.sleep)(50)];
             case 3:
-                _b.sent();
+                _g.sent();
                 rd.eachFileSync(workDir, function (file) {
-                    if (lodash_1["default"].endsWith(file, '.DS_Store')) {
+                    if ((0, lodash_1.endsWith)(file, '.DS_Store')) {
                         fs_extra_1["default"].remove(file);
                     }
                     else {
@@ -298,11 +345,11 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 shell.exec('npm install');
                 return [4, (0, sleep_1.sleep)(300)];
             case 4:
-                _b.sent();
+                _g.sent();
                 logger.log(chalk_1["default"].hex('#DB8C41')(font_icon_1["default"]));
                 return [4, (0, sleep_1.sleep)(800)];
             case 5:
-                _b.sent();
+                _g.sent();
                 logger.log('I\'m all done. Now you can start your application.');
                 return [2];
         }

package/modules/run.js

@@ -79,54 +79,71 @@ var project_1 = require("../config/project");
 exports.DEFAULT_HOST = '127.0.0.1';
 exports.DEFAULT_PORT = '7650';
 var run = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, simulatorHost, _c, _d, simulatorPort, answer, hasStarted, packages, simulatorWebSocketURL, simulator, refreshSimulator, gitignorePath, gitignore, ignored;
-    var _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var simulatorHost, simulatorPort, _a, promptSimulatorHost, _b, promptSimulatorPort, answer, hasStarted, simulatorWebSocketURL, simulator, refreshSimulator, gitignorePath, gitignore, ignored;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                _a = storage_1.instanceStorage.getStorage(), _b = project_1.simulatorStorageKey.simulatorHost, simulatorHost = _a[_b], _c = project_1.simulatorStorageKey.simulatorPort, _d = _a[_c], simulatorPort = _d === void 0 ? exports.DEFAULT_PORT : _d;
-                if (!!simulatorHost) return [3, 2];
+                fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
+                simulatorHost = '';
+                simulatorPort = '';
+                _a = args.simulatorHost, promptSimulatorHost = _a === void 0 ? '' : _a, _b = args.simulatorPort, promptSimulatorPort = _b === void 0 ? exports.DEFAULT_PORT : _b;
+                if (!promptSimulatorHost) {
+                    simulatorHost = storage_1.instanceStorage.getStorage()[project_1.simulatorStorageKey.simulatorHost];
+                    simulatorPort = storage_1.instanceStorage.getStorage()[project_1.simulatorStorageKey.simulatorPort] || exports.DEFAULT_PORT;
+                }
                 return [4, inquirer_1["default"].prompt([
                         {
                             name: 'host',
                             type: 'input',
+                            when: function (args) {
+                                if (promptSimulatorHost) {
+                                    args.host = promptSimulatorHost;
+                                }
+                                return !promptSimulatorHost && !simulatorHost;
+                            },
+                            "default": exports.DEFAULT_HOST,
                             message: "simulator host (".concat(exports.DEFAULT_HOST, "):")
                         },
                         {
                             name: 'port',
                             type: 'input',
+                            when: function (args) {
+                                if (promptSimulatorPort) {
+                                    args.port = promptSimulatorPort;
+                                }
+                                return !promptSimulatorPort && !simulatorPort;
+                            },
+                            "default": exports.DEFAULT_PORT,
                             message: "simulator port (".concat(exports.DEFAULT_PORT, "):")
                         }
                     ])];
             case 1:
-                answer = _f.sent();
-                storage_1.globalStorage.set((_e = {},
-                    _e[project_1.simulatorStorageKey.simulatorHost] = answer.host || exports.DEFAULT_HOST,
-                    _e[project_1.simulatorStorageKey.simulatorPort] = answer.port || exports.DEFAULT_PORT,
-                    _e));
-                _f.label = 2;
-            case 2:
+                answer = _d.sent();
+                if (!simulatorHost) {
+                    storage_1.globalStorage.set((_c = {},
+                        _c[project_1.simulatorStorageKey.simulatorHost] = answer.host || exports.DEFAULT_HOST,
+                        _c[project_1.simulatorStorageKey.simulatorPort] = answer.port || exports.DEFAULT_PORT,
+                        _c));
+                }
                 hasStarted = false;
-                return [4, (0, build_1.chooseBuildPackages)()];
-            case 3:
-                packages = _f.sent();
                 simulatorWebSocketURL = "http://".concat(simulatorHost, ":").concat(simulatorPort);
                 simulator = new simulator_1.Simulator(simulatorWebSocketURL);
                 refreshSimulator = lodash_1["default"].debounce(function () { return __awaiter(void 0, void 0, void 0, function () {
-                    var zpkBuffer, _a, targetDeviceInternalName, appId, projectName;
+                    var zpkBuffer, _a, targetDeviceInternalName, appId, devices, projectName;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
                                 logger.info('rebuilding...');
-                                return [4, (0, build_1.buildDev)(packages)];
+                                return [4, (0, build_1.buildDev)(args)];
                             case 1:
                                 zpkBuffer = _b.sent();
                                 if (zpkBuffer) {
                                     logger.info('rebuild done');
                                     logger.info('refreshing simulator...');
-                                    _a = (0, common_1.getDeviceInfoFromAppJson)(packages[0]), targetDeviceInternalName = _a.targetDeviceInternalName, appId = _a.appId;
+                                    _a = (0, common_1.getDeviceInfoFromAppJson)(), targetDeviceInternalName = _a.targetDeviceInternalName, appId = _a.appId, devices = _a.deviceSourceArr;
                                     projectName = path.parse(process.cwd()).base;
-                                    simulator.upload(zpkBuffer, projectName, targetDeviceInternalName, appId);
+                                    simulator.upload(zpkBuffer, projectName, targetDeviceInternalName, appId, devices);
                                 }
                                 else {
                                     logger.error('build error');

package/modules/simulator.js

@@ -51,14 +51,15 @@ var Simulator = (function () {
     Simulator.prototype.emit = function (space, jsonData) {
         this.socket.emit(space, jsonData);
     };
-    Simulator.prototype.upload = function (data, projectName, target, appid) {
+    Simulator.prototype.upload = function (data, projectName, target, appid, devices) {
         var dataArr = this.uint8ToArray(new Uint8Array(data));
         var message = this.encodeMessage({
             target: target,
             projectName: projectName,
             appid: appid,
             size: data.byteLength,
-            data: dataArr
+            data: dataArr,
+            devices: devices
         });
         this.sendMessage(message);
     };

package/modules/websocket.js

@@ -31,7 +31,7 @@ var ws_1 = __importDefault(require("ws"));
 var common_1 = require("../utils/common");
 var WebSocketClass = (function () {
     function WebSocketClass(_a) {
-        var url = _a.url, connectCb = _a.connectCb, disconnectCb = _a.disconnectCb;
+        var url = _a.url, connectWSCB = _a.connectWSCB, disConnectWSCB = _a.disConnectWSCB;
         var _this = this;
         this.msgEventIDs = {};
         this.handleListenMsgEventReturn = function (data) {
@@ -60,11 +60,11 @@ var WebSocketClass = (function () {
         };
         this.socket = new ws_1["default"](url);
         this.socket.on('open', function () {
-            connectCb();
+            connectWSCB();
             _this.listenEvent();
         });
         this.socket.on('close', function () {
-            disconnectCb();
+            disConnectWSCB();
         });
         this.socket.on('error', function (error) {
             logger.error(error);
@@ -79,23 +79,32 @@ var WebSocketClass = (function () {
     WebSocketClass.prototype.uint8ToArray = function (source) {
         return Array.prototype.slice.call(source);
     };
-    WebSocketClass.prototype.sendMessage = function (params, method) {
+    WebSocketClass.prototype.sendMessage = function (params, options) {
+        if (options === void 0) { options = {}; }
         var msgParams;
         var msg = params;
+        var _a = options.method, method = _a === void 0 ? '' : _a;
         if (method) {
             msgParams = {
                 method: method,
                 params: params,
                 jsonrpc: '2.0',
-                id: this.createMsgEventID(method)
+                id: this.createMsgEventID(method, params === null || params === void 0 ? void 0 : params.type)
             };
             msg = JSON.stringify(msgParams);
         }
         this.socket.send(msg, { binary: false });
     };
-    WebSocketClass.prototype.createMsgEventID = function (method) {
-        var id = Math.round(Math.random() * 100);
-        this.msgEventIDs[method] = id;
+    WebSocketClass.prototype.createMsgEventID = function (method, type) {
+        var id = parseInt('' + Math.random() * 10000);
+        var prop = method;
+        var typeMap = {
+            'screenshot': 'screenShot'
+        };
+        if (type && typeMap[type]) {
+            prop = typeMap[type];
+        }
+        this.msgEventIDs[prop] = id;
         return id;
     };
     return WebSocketClass;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",

package/public/template/hello-world/app.json

@@ -84,6 +84,14 @@
         {
           "name": "gtr3-w",
           "deviceSource": 227
+        },
+        {
+          "name": "t-rex2",
+          "deviceSource": 418
+        },
+        {
+          "name": "t-rex2-w",
+          "deviceSource": 419
         }
       ],
       "designWidth": 454
@@ -120,6 +128,39 @@
         }
       ],
       "designWidth": 390
+    },
+    "teide": {
+      "module": {
+        "page": {
+          "pages": [
+            "page/t-rex2/home/index.page"
+          ],
+          "window": {
+            "navigationBarBackgroundColor": "#ffffff",
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "Hello World",
+            "backgroundColor": "#eeeeee",
+            "backgroundTextStyle": "light"
+          }
+        },
+        "app-side": {
+          "path": "app-side/index"
+        },
+        "setting": {
+          "path": "setting/index"
+        }
+      },
+      "platforms": [
+        {
+          "name": "t-rex2",
+          "deviceSource": 418
+        },
+        {
+          "name": "t-rex2-w",
+          "deviceSource": 419
+        }
+      ],
+      "designWidth": 454
     }
   },
   "i18n": {

package/utils/common.js

@@ -29,9 +29,8 @@ exports.__esModule = true;
 exports.getDeviceInfoFromAppJson = exports.handleListenMsgEvent = exports.getOptionalConnectDevice = exports.uint8ToArray = void 0;
 var path = __importStar(require("path"));
 var fs_1 = __importDefault(require("fs"));
+var os_1 = __importDefault(require("os"));
 var logger = __importStar(require("./logger"));
-var storage_1 = require("../modules/storage");
-var project_1 = require("../config/project");
 var device_1 = require("../config/device");
 function uint8ToArray(source) {
     return Array.prototype.slice.call(source);
@@ -57,13 +56,13 @@ function handleListenMsgEvent(msgEventName, data) {
             }
             else if (typeof data === 'object' && ((_a = data === null || data === void 0 ? void 0 : data.params) === null || _a === void 0 ? void 0 : _a.clients)) {
                 var connectedDevice = getOptionalConnectDevice(data.params.clients);
-                project_1.____inner_global_variable.bridgeOptionalDevice = JSON.stringify(connectedDevice);
+                process.env._bridgeOptionalDevice = JSON.stringify(connectedDevice);
             }
             break;
         case 'connectClient':
             var _d = data.result, result = _d === void 0 ? '' : _d, _e = data.error, error = _e === void 0 ? {} : _e;
             if (result && result === 'success') {
-                var choiredDevice = project_1.____inner_global_variable.bridgeChoiredDevice;
+                var choiredDevice = process.env._bridgeChoiredDevice;
                 logger.info("successfully connected to ".concat(choiredDevice, "."));
             }
             if (error && JSON.stringify(error) !== '{}') {
@@ -93,17 +92,30 @@ function handleListenMsgEvent(msgEventName, data) {
             }
             else if (typeof data === 'object' && (data === null || data === void 0 ? void 0 : data.params)) {
                 var _j = data.params, level = _j.level, time = _j.time, message = _j.message;
-                var str = "[".concat(level.toUpperCase() || 'DEBUG', " - ").concat(new Date(time).toLocaleTimeString(), "] ").concat(message);
+                var timeString = time.toString();
+                var fTime = Number(timeString.length > 13 ? timeString.substr(0, 13) : timeString);
+                var str = "[".concat(level.toUpperCase() || 'DEBUG', "-").concat(new Date(fTime).toLocaleTimeString(), ".").concat(new Date(fTime).getMilliseconds(), "] ").concat(message);
                 logger.info(str);
             }
             break;
+        case 'screenShot':
+            var path_1 = "".concat(os_1["default"].homedir(), "/desktop/screenShot.png");
+            fs_1["default"].writeFile(path_1, Buffer.from(data.result, 'hex'), function (err) {
+                if (err) {
+                    logger.log('screenShot error', err);
+                }
+                else {
+                    logger.success("screenShot path:".concat(path_1));
+                }
+            });
+            break;
         default:
             break;
     }
 }
 exports.handleListenMsgEvent = handleListenMsgEvent;
-var getDeviceInfoFromAppJson = function (curTarget) {
-    var _curTarget = curTarget ? curTarget : storage_1.globalStorage.get(project_1.buildStorageKey.targetDeviceToBuild);
+var getDeviceInfoFromAppJson = function () {
+    var _curTarget = process.env._targetDeviceToBuild;
     var appJsonFilePath = path.resolve('./app.json');
     var appJsonContent = JSON.parse(fs_1["default"].readFileSync(appJsonFilePath, 'utf-8'));
     var targets = appJsonContent.targets;

package/utils/pre-check.js

@@ -148,6 +148,7 @@ var initVariable = function (args) { return __awaiter(void 0, void 0, void 0, fu
                 _a.label = 2;
             case 2:
                 __env = {
+                    _targetDeviceToBuild: '',
                     _loginAppToken: apptoken,
                     _loginUserId: userid,
                     _loginCname: cname,