@zeppos/zeus-cli 1.7.10 → 1.8.1

package/utils/pre-check.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -35,10 +35,19 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearDevicesCache = exports.initVariable = exports.checkVersion = void 0;
 var path_1 = __importDefault(require("path"));
 var os_1 = __importDefault(require("os"));
@@ -52,8 +61,8 @@ var _a = require('../package.json'), userVersion = _a.version, userName = _a.nam
 var versionCheckTimeKey = '____inner_version_check_time';
 var versionKey = '____inner_version';
 var _b = zeppos_app_utils_1.instanceStorage.getStorage(), _c = versionCheckTimeKey, userVersionCheckTime = _b[_c], _d = versionKey, originVersion = _b[_d], _e = loginStorageKey.accountToken, _f = _b[_e], apptoken = _f === void 0 ? '' : _f, _g = loginStorageKey.userid, _h = _b[_g], userid = _h === void 0 ? '' : _h, _j = loginStorageKey.cname, _k = _b[_j], cname = _k === void 0 ? '' : _k, _l = _b.account_env, _accountEnv = _l === void 0 ? 'production' : _l;
-var LOCAL_CACHE_DEVICE_PATH = path_1["default"].resolve(os_1["default"].homedir(), ".zepp/.zeus_devices");
-var LOCAL_VERSION_PATH = path_1["default"].resolve(os_1["default"].homedir(), ".zepp/.zeus_version");
+var LOCAL_CACHE_DEVICE_PATH = path_1.default.resolve(os_1.default.homedir(), ".zepp/.zeus_devices");
+var LOCAL_VERSION_PATH = path_1.default.resolve(os_1.default.homedir(), ".zepp/.zeus_version");
 var dayMS = 24 * 60 * 60 * 1000;
 var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
     var versions, versionList, error_1;
@@ -62,7 +71,7 @@ var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0,
         switch (_b.label) {
             case 0:
                 _b.trys.push([0, 2, , 3]);
-                return [4, (0, package_json_1["default"])(userName, { allVersions: true })];
+                return [4, (0, package_json_1.default)(userName, { allVersions: true })];
             case 1:
                 versions = (_b.sent()).versions;
                 versionList = Object.keys(versions).filter(function (val) { return !val.includes('beta'); });
@@ -75,7 +84,6 @@ var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0,
                 return [3, 3];
             case 2:
                 error_1 = _b.sent();
-                console.log('');
                 return [3, 3];
             case 3: return [2];
         }
@@ -88,7 +96,7 @@ var checkVersion = function () { return __awaiter(void 0, void 0, void 0, functi
             case 0:
                 if (userVersion !== '' && userVersion.endsWith('-beta'))
                     return [2];
-                if (!(!originVersion || !userVersionCheckTime || (+new Date() - Number(userVersionCheckTime) > 3 * dayMS))) return [3, 2];
+                if (!(!originVersion || !userVersionCheckTime || +new Date() - Number(userVersionCheckTime) > 3 * dayMS)) return [3, 2];
                 return [4, checkOriginVersion()];
             case 1:
                 _a.sent();
@@ -97,7 +105,7 @@ var checkVersion = function () { return __awaiter(void 0, void 0, void 0, functi
                 originVersionCode = (0, tools_1.versionToCode)(originVersion);
                 userVersionCode = (0, tools_1.versionToCode)(userVersion);
                 if (originVersionCode - userVersionCode >= 100) {
-                    zeppos_app_utils_1.logger.log(chalk_1["default"].hex('#DB8C41')(zeppos_app_utils_1.config.updateVersion));
+                    zeppos_app_utils_1.logger.log(chalk_1.default.hex('#DB8C41')(zeppos_app_utils_1.config.updateVersion));
                 }
                 return [2];
         }
@@ -109,15 +117,18 @@ var initVariable = function (args) { return __awaiter(void 0, void 0, void 0, fu
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                _argv = (args === null || args === void 0 ? void 0 : args.argv) || { _: [], $0: 'zeus' };
+                _argv = (args === null || args === void 0 ? void 0 : args.argv) || args || { _: [], $0: 'zeus' };
                 command = _argv._[0];
                 if (!['bridge', 'preview'].includes(command)) return [3, 2];
                 if (!(!apptoken || !userid || !cname)) return [3, 2];
-                return [4, zeppos_app_utils_1.modules.login().then(function (res) {
+                return [4, zeppos_app_utils_1.modules
+                        .login()
+                        .then(function (res) {
                         apptoken = res.appToken;
                         cname = res.cname;
                         userid = res.userId;
-                    })["catch"](function (err) {
+                    })
+                        .catch(function (err) {
                         console.log('catch', err === null || err === void 0 ? void 0 : err.message);
                     })];
             case 1:
@@ -134,7 +145,7 @@ var initVariable = function (args) { return __awaiter(void 0, void 0, void 0, fu
                     _cliName: _argv.$0,
                     _accountEnv: _accountEnv,
                     _npmName: userName,
-                    _subRegionalHost: ''
+                    _subRegionalHost: '',
                 };
                 if (cname) {
                     __env._subRegionalHost = cname.split(',').filter(function (h) { return h.indexOf('api-mifit') > -1; })[0];
@@ -145,23 +156,34 @@ var initVariable = function (args) { return __awaiter(void 0, void 0, void 0, fu
     });
 }); };
 exports.initVariable = initVariable;
-var clearDevicesCache = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var cleanCacheAndWriteVersion, installedVersion;
-    return __generator(this, function (_a) {
-        cleanCacheAndWriteVersion = function () {
-            fs_extra_1["default"].removeSync(LOCAL_CACHE_DEVICE_PATH);
-            fs_extra_1["default"].outputFileSync(LOCAL_VERSION_PATH, userVersion);
-        };
-        if (!fs_extra_1["default"].pathExistsSync(LOCAL_VERSION_PATH)) {
-            cleanCacheAndWriteVersion();
-            return [2];
-        }
-        installedVersion = fs_extra_1["default"].readFileSync(LOCAL_VERSION_PATH, 'utf8');
-        if ((0, tools_1.versionToCode)(userVersion) > (0, tools_1.versionToCode)(installedVersion)) {
-            cleanCacheAndWriteVersion();
+var clearDevicesCache = function () {
+    var args_1 = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args_1[_i] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([], args_1, true), void 0, function (force) {
+        var cleanCacheAndWriteVersion, installedVersion;
+        if (force === void 0) { force = false; }
+        return __generator(this, function (_a) {
+            cleanCacheAndWriteVersion = function () {
+                fs_extra_1.default.removeSync(LOCAL_CACHE_DEVICE_PATH);
+                fs_extra_1.default.outputFileSync(LOCAL_VERSION_PATH, userVersion);
+            };
+            if (force) {
+                cleanCacheAndWriteVersion();
+                return [2];
+            }
+            if (!fs_extra_1.default.pathExistsSync(LOCAL_VERSION_PATH)) {
+                cleanCacheAndWriteVersion();
+                return [2];
+            }
+            installedVersion = fs_extra_1.default.readFileSync(LOCAL_VERSION_PATH, 'utf8');
+            if ((0, tools_1.versionToCode)(userVersion) > (0, tools_1.versionToCode)(installedVersion)) {
+                cleanCacheAndWriteVersion();
+                return [2];
+            }
             return [2];
-        }
-        return [2];
+        });
     });
-}); };
+};
 exports.clearDevicesCache = clearDevicesCache;

package/utils/tools.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.seriesExecTasks = exports.isProjectRootDir = exports.compareVersion = exports.versionToCode = void 0;
 var fs_1 = __importDefault(require("fs"));
 var zeppos_app_utils_1 = require("zeppos-app-utils");
@@ -57,7 +57,7 @@ var compareVersion = function (version1, version2) {
 exports.compareVersion = compareVersion;
 var isProjectRootDir = function () {
     var currentDir = process.cwd();
-    var isExist = fs_1["default"].existsSync("".concat(currentDir, "/app.json"));
+    var isExist = fs_1.default.existsSync("".concat(currentDir, "/app.json"));
     if (!isExist) {
         zeppos_app_utils_1.logger.error("You must execute the Zeus command in the project's root directory.");
         process.exit(1);