@zeppos/zeus-cli 1.8.0 → 1.8.1

package/bin/main.js

@@ -37,15 +37,6 @@ 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 };
 };
@@ -70,26 +61,19 @@ var yargsCmdBuilderFunc = function (cmdName, useProxy, yargs) {
     }
 };
 var yb = function (y) { return y; };
-var fetchDevices = 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 zeusVer;
-        if (force === void 0) { force = false; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    zeusVer = (0, index_1.zeusCurrentVersion)();
-                    return [4, devicesData(zeusVer, force)];
-                case 1: return [2, _a.sent()];
-            }
-        });
+var fetchDevices = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var zeusVer;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                zeusVer = (0, index_1.zeusCurrentVersion)();
+                return [4, devicesData(zeusVer)];
+            case 1: return [2, _a.sent()];
+        }
     });
-};
+}); };
 var cmdCache = function (argv) { return __awaiter(void 0, void 0, void 0, function () {
-    var _argv, _a, command, _b, subCommand, _c;
+    var _argv, _a, command, _b, subCommand, _c, zeusVer;
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
@@ -111,7 +95,9 @@ var cmdCache = function (argv) { return __awaiter(void 0, void 0, void 0, functi
             case 2:
                 _d.sent();
                 return [3, 6];
-            case 3: return [4, fetchDevices(true)];
+            case 3:
+                zeusVer = (0, index_1.zeusCurrentVersion)();
+                return [4, devicesData(zeusVer, true)];
             case 4:
                 _d.sent();
                 return [3, 6];

package/package.json

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

package/private-modules/zeppos-app-utils/dist/modules/fetchDevices.js

@@ -102,7 +102,7 @@ var fetchDevices = function () {
         args_1[_i] = arguments[_i];
     }
     return __awaiter(void 0, __spreadArray([], args_1, true), void 0, function (currentVersion, force) {
-        var localContent, generatedVersion, fetchAndSaveRemoteDevices, now;
+        var localContent, generatedVersion, now, fetchAndSaveRemoteDevices;
         if (currentVersion === void 0) { currentVersion = ''; }
         if (force === void 0) { force = false; }
         return __generator(this, function (_a) {
@@ -120,6 +120,7 @@ var fetchDevices = function () {
                         fs_extra_1.default.removeSync(LOCAL_CACHE_DEVICE_PATH);
                         localContent = {};
                     }
+                    now = Date.now().valueOf();
                     fetchAndSaveRemoteDevices = function () { return __awaiter(void 0, void 0, void 0, function () {
                         var spinner, prodDevices, betaDevices;
                         return __generator(this, function (_a) {
@@ -152,7 +153,6 @@ var fetchDevices = function () {
                     return [4, fetchAndSaveRemoteDevices()];
                 case 1: return [2, _a.sent()];
                 case 2:
-                    now = Date.now().valueOf();
                     if (!!((0, lodash_1.get)(localContent, 'expiredTime') > now)) return [3, 4];
                     return [4, fetchAndSaveRemoteDevices()];
                 case 3: return [2, _a.sent()];

package/utils/pre-check.js

@@ -84,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];
         }