@zeppos/zeus-cli 1.1.2 → 1.1.3

package/README.md

@@ -15,4 +15,4 @@ The Zeus CLI can help you install the development application to your device, wh
 
 ### Help
 
-For more help, please visit [Zepp Open Platform](https://dev.huami.com/) or [ZeppOS Docs](https://docs.zepp.com/)
+For more help, please visit [Zepp Developer](https://developer.zepp.com/) or [Zepp OS Docs](https://docs.zepp.com/)

package/modules/status.js

@@ -71,39 +71,38 @@ var storage_1 = require("./storage");
 var project_1 = require("../config/project");
 var run_1 = require("./run");
 var hm_analytics_1 = require("../utils/hm-analytics");
-var login_1 = require("./login");
 var status = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, _c, apptoken, _d, _e, userid, _f, _g, cname, _h, _j, simulatorHost, _k, _l, simulatorPort, _m, simulatorConnectStatus, loginStatus, userInfoHost, userInfoURL, nickName, res, error_1, res;
+    var _a, _b, _c, apptoken, _d, _e, userid, _f, _g, cname, _h, _j, simulatorHost, _k, _l, simulatorPort, _m, simulatorConnectStatus, loginStatus, userInfoHost, userInfoURL, nickName, res, error_1;
     return __generator(this, function (_o) {
         switch (_o.label) {
             case 0:
                 _a = storage_1.instanceStorage.getStorage(), _b = project_1.loginStorageKey.accountToken, _c = _a[_b], apptoken = _c === void 0 ? '' : _c, _d = project_1.loginStorageKey.userid, _e = _a[_d], userid = _e === void 0 ? '' : _e, _f = project_1.loginStorageKey.cname, _g = _a[_f], cname = _g === void 0 ? '' : _g, _h = project_1.simulatorStorageKey.simulatorHost, _j = _a[_h], simulatorHost = _j === void 0 ? run_1.DEFAULT_HOST : _j, _k = project_1.simulatorStorageKey.simulatorPort, _l = _a[_k], simulatorPort = _l === void 0 ? run_1.DEFAULT_PORT : _l, _m = project_1.simulatorStorageKey.simulatorConnectStatus, simulatorConnectStatus = _a[_m];
                 loginStatus = !!(apptoken && userid && cname);
-                if (!loginStatus) return [3, 6];
+                if (!loginStatus) return [3, 5];
                 userInfoHost = lodash_1["default"].split(lodash_1["default"].toString(cname), ',').filter(function (h) { return h.indexOf('auth-') > -1; })[0];
                 userInfoURL = "https://".concat(userInfoHost, "/v2/developer/account/center");
                 nickName = '';
                 _o.label = 1;
             case 1:
-                _o.trys.push([1, 3, , 5]);
+                _o.trys.push([1, 3, , 4]);
                 return [4, (0, index_1.getUserInfo)(userInfoURL, apptoken)];
             case 2:
                 res = _o.sent();
                 nickName = res.userName;
-                logger.log('login status:', chalk_1["default"].yellow(loginStatus ? 'logged' : 'no login'));
-                return [3, 5];
+                logger.log('login status:', chalk_1["default"].yellow('logged'));
+                return [3, 4];
             case 3:
                 error_1 = _o.sent();
-                logger.log('login status:', chalk_1["default"].yellow('no login - invalid token'));
-                return [4, (0, login_1.login)()];
+                logger.log('login status:', chalk_1["default"].keyword('orange')('no login - invalid token, you can login again with the command `zeus login`'));
+                args._loginAppToken = '';
+                process.env._loginAppToken = '';
+                return [3, 4];
             case 4:
-                res = _o.sent();
-                args._loginAppToken = res.appToken;
-                process.env._loginAppToken = res.appToken;
-                return [2, (0, exports.status)(args)];
-            case 5:
                 logger.log('nickName:', chalk_1["default"].yellow(nickName || '-'));
                 logger.log('userID:', chalk_1["default"].yellow(userid));
+                return [3, 6];
+            case 5:
+                logger.log('login status:', chalk_1["default"].yellow('no login'));
                 _o.label = 6;
             case 6:
                 logger.log('simulator connect status:', chalk_1["default"].yellow(simulatorConnectStatus ? simulatorConnectStatus : 'disconnected'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",
@@ -41,7 +41,7 @@
     "webpack": "^5.52.0"
   },
   "dependencies": {
-    "@zeppos/zpm": "^2.3.9",
+    "@zeppos/zpm": "^2.3.10",
     "axios": "^0.23.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",

package/utils/hm-analytics.js

@@ -45,7 +45,8 @@ var HM_Analytics = function (event_id, options) {
     var eventPackageStr = Buffer.from(JSON.stringify(eventPackage)).toString('base64');
     axios_1["default"].post("".concat(project_1.analyticsHost, "/api/v5/server/collect"), eventPackageStr, {
         headers: {
-            appid: analytics_app_id
+            appid: analytics_app_id,
+            'content-type': 'text/plain'
         },
         timeout: 300
     })["catch"](function (_error) {