@zeppos/zeus-cli 1.1.5 → 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];

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,7 +103,7 @@ 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;
+                process.env._bridgeChoiredDevice = choiredDevice;
                 client.sendMessage({ clientId: clientId_1 }, { method: 'connectClient' });
                 hasConnectDevice = true;
                 _a.label = 4;

package/modules/build.js

@@ -97,14 +97,12 @@ function handleExecCommandInErrorDir(mode) {
     logger.warn("This command needs to be executed in the root of the project.");
     process.exit(1);
 }
-function chooseBuildPackages(mode, buildConfigOption) {
+function chooseBuildPackages(mode) {
     if (mode === void 0) { mode = 'development'; }
-    if (buildConfigOption === void 0) { buildConfigOption = {}; }
     return __awaiter(this, void 0, void 0, function () {
         var targets, _a, promptTarget_1, answers;
-        var _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (!appJsonContent) {
                         handleExecCommandInErrorDir(mode);
@@ -116,10 +114,9 @@ function chooseBuildPackages(mode, buildConfigOption) {
                     return [3, 4];
                 case 1:
                     if (!(targets.length === 1)) return [3, 2];
-                    storage_1.globalStorage.set((_b = {}, _b[project_1.buildStorageKey.targetDeviceToBuild] = targets[0], _b));
                     return [2, [targets[0]]];
                 case 2:
-                    _a = buildConfigOption.target, promptTarget_1 = _a === void 0 ? '' : _a;
+                    _a = process.env._targetDeviceToBuild, promptTarget_1 = _a === void 0 ? '' : _a;
                     return [4, inquirer_1["default"].prompt([
                             {
                                 name: 'target',
@@ -154,8 +151,7 @@ function chooseBuildPackages(mode, buildConfigOption) {
                             }
                         ])];
                 case 3:
-                    answers = _d.sent();
-                    storage_1.globalStorage.set((_c = {}, _c[project_1.buildStorageKey.targetDeviceToBuild] = answers.target, _c));
+                    answers = _b.sent();
                     return [2, typeof answers.target === 'string' ? [answers.target] : answers.target];
                 case 4: return [2];
             }
@@ -163,17 +159,17 @@ function chooseBuildPackages(mode, buildConfigOption) {
     });
 }
 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];
-                    return [4, chooseBuildPackages(mode, buildConfigOption)];
+                    process.env._targetDeviceToBuild = (buildConfigOption === null || buildConfigOption === void 0 ? void 0 : buildConfigOption.target) || '';
+                    packages = [];
+                    return [4, chooseBuildPackages(mode)];
                 case 1:
                     choosePackages = _b.sent();
                     if (!choosePackages || !choosePackages.length) {
@@ -181,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,
@@ -208,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 (args, packages) {
+var buildDev = function (args) {
     (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_DEV_C');
-    return (0, exports.build)(BuildMode.DEV, packages, args);
+    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) {
@@ -273,7 +278,7 @@ 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 = (0, lodash_1.get)(appJsonContent, 'app.appType');
@@ -283,28 +288,28 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                 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 () {
@@ -315,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);
@@ -326,7 +331,7 @@ 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('Please use Zepp APP to scan the following qrcode to preview your application within two hours.');
+                                    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 });
                                 }
@@ -336,10 +341,10 @@ 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) {
@@ -360,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/run.js

@@ -79,7 +79,7 @@ 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 simulatorHost, simulatorPort, _a, promptSimulatorHost, _b, promptSimulatorPort, answer, hasStarted, packages, simulatorWebSocketURL, simulator, refreshSimulator, gitignorePath, gitignore, ignored;
+    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) {
@@ -127,9 +127,6 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                         _c));
                 }
                 hasStarted = false;
-                return [4, (0, build_1.chooseBuildPackages)('development', args)];
-            case 2:
-                packages = _d.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 () {
@@ -138,13 +135,13 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                         switch (_b.label) {
                             case 0:
                                 logger.info('rebuilding...');
-                                return [4, (0, build_1.buildDev)(args, 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, devices = _a.deviceSourceArr;
+                                    _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, devices);
                                 }

package/package.json

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

package/utils/common.js

@@ -31,8 +31,6 @@ 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);
@@ -58,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) !== '{}') {
@@ -94,7 +92,9 @@ 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;
@@ -114,8 +114,8 @@ function handleListenMsgEvent(msgEventName, data) {
     }
 }
 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,