@zeppos/zeus-cli 1.0.16 → 1.0.18

package/config/project.js

@@ -36,5 +36,7 @@ exports.loginConfig = {
 };
 exports.loginStorageKey = {
     accountToken: accountPrefix + "token",
-    account: accountPrefix + "account"
+    account: accountPrefix + "account",
+    userid: accountPrefix + "userid",
+    cname: accountPrefix + "cname"
 };

package/modules/build.js

@@ -77,7 +77,6 @@ var rd = __importStar(require("rd"));
 var path = __importStar(require("path"));
 var lodash_1 = __importDefault(require("lodash"));
 var axios_1 = __importDefault(require("axios"));
-var url_1 = require("url");
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var form_data_1 = __importDefault(require("form-data"));
 var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
@@ -86,7 +85,6 @@ var login_1 = require("./login");
 var logger = __importStar(require("../utils/logger"));
 var storage_1 = require("./storage");
 var project_1 = require("../config/project");
-var STUDIO_URL = 'https://studio.huami.com';
 var BuildMode;
 (function (BuildMode) {
     BuildMode["DEV"] = "development";
@@ -195,29 +193,25 @@ var checkIsWatchFaceProject = function () {
     return appType === project_1.AppType.WATCHFACE;
 };
 var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var storage, isWatchFaceProject, userToken, form, buildInfo;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var storage, isWatchFaceProject, _a, apptoken, userid, cname, form, buildInfo;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
                 isWatchFaceProject = checkIsWatchFaceProject();
-                // TODO: preview 支持打包表盘
-                if (isWatchFaceProject) {
-                    logger.info('coming soon');
-                    return [2 /*return*/];
-                }
                 return [4 /*yield*/, (0, login_1.login)(args)];
             case 1:
-                userToken = _a.sent();
+                _a = _b.sent(), apptoken = _a.apptoken, userid = _a.userid, cname = _a.cname;
                 form = new form_data_1["default"]();
                 logger.info('building preview...');
                 return [4 /*yield*/, (0, exports.build)(BuildMode.PREVIEW)];
             case 2:
-                buildInfo = _a.sent();
+                buildInfo = _b.sent();
                 logger.info('getting preview package...');
-                form.append('uploadFile', fs_1["default"].createReadStream("./dist/" + buildInfo));
+                form.append('file', fs_1["default"].createReadStream("./dist/" + buildInfo));
+                form.append('app_type', isWatchFaceProject ? '1' : '2');
                 form.getLength(function (err, length) { return __awaiter(void 0, void 0, void 0, function () {
-                    var previewInfo, _a, prtcl, path, studioUrl;
+                    var host, previewInfo, _a, protocol, code;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
@@ -226,15 +220,15 @@ var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, fu
                                     return [2 /*return*/];
                                 }
                                 logger.info('generating preview qrcode...');
-                                return [4 /*yield*/, axios_1["default"].post(STUDIO_URL + "/upload/package/preview", form, {
-                                        headers: __assign(__assign({}, form.getHeaders()), { 'content-length': "" + length, apptoken: userToken })
+                                host = cname.split(',').filter(function (h) { return h.indexOf('api-mifit') > -1; })[0];
+                                return [4 /*yield*/, axios_1["default"].post("https://" + host + "/custom/tools/app-dial/upload?userid=" + userid, form, {
+                                        headers: __assign(__assign({}, form.getHeaders()), { 'content-length': "" + length, apptoken: apptoken })
                                     })];
                             case 1:
                                 previewInfo = _b.sent();
-                                _a = lodash_1["default"].get(previewInfo, 'data.data', {}), prtcl = _a.prtcl, path = _a.path;
-                                if (prtcl && path) {
-                                    studioUrl = new url_1.URL(STUDIO_URL);
-                                    qrcode_terminal_1["default"].generate(prtcl + "://" + studioUrl.host + path, { small: true });
+                                _a = lodash_1["default"].get(previewInfo, 'data', {}), protocol = _a.protocol, code = _a.code;
+                                if (protocol && code) {
+                                    qrcode_terminal_1["default"].generate(protocol + "://" + host + "/custom/tools/app-dial/download/" + code, { small: true });
                                     logger.success('please use Zepp APP to scan the qrcode below to preview your app.');
                                 }
                                 else {

package/modules/login.js

@@ -122,17 +122,19 @@ var loginByLocal = function (account, password) { return __awaiter(void 0, void
     });
 }); };
 var login = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var storage, accountInfo, historyToken, isLocal, answer, loginInfo, token_1, token;
+    var storage, accountInfo, apptoken, userid, cname, isLocal, answer, loginInfo_1, token, loginInfo;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
                 accountInfo = storage.get(project_1.loginStorageKey.account);
-                historyToken = storage.get(project_1.loginStorageKey.accountToken);
-                if (!lodash_1["default"].get(args, 'relogin') && historyToken) {
+                apptoken = storage.get(project_1.loginStorageKey.accountToken);
+                userid = storage.get(project_1.loginStorageKey.userid);
+                cname = storage.get(project_1.loginStorageKey.cname);
+                if (!lodash_1["default"].get(args, 'relogin') && apptoken && userid && cname) {
                     // logger.success(`have logged in with account: ${accountInfo}`)
                     logger.success("Has logged");
-                    return [2 /*return*/, historyToken];
+                    return [2 /*return*/, { apptoken: apptoken, userid: userid, cname: cname }];
                 }
                 isLocal = false;
                 if (!isLocal) return [3 /*break*/, 3];
@@ -157,12 +159,12 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                         process.exit(1);
                     })];
             case 2:
-                loginInfo = _a.sent();
-                token_1 = lodash_1["default"].get(loginInfo, 'token_info.app_token');
-                if (token_1) {
+                loginInfo_1 = _a.sent();
+                token = lodash_1["default"].get(loginInfo_1, 'token_info.app_token');
+                if (token) {
                     logger.success("logged in with account: " + answer.account);
                     storage.set(project_1.loginStorageKey.account, answer.account);
-                    storage.set(project_1.loginStorageKey.accountToken, token_1);
+                    storage.set(project_1.loginStorageKey.accountToken, token);
                 }
                 _a.label = 3;
             case 3: return [4 /*yield*/, new Promise(function (resolve) { return __awaiter(void 0, void 0, void 0, function () {
@@ -173,13 +175,15 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                                 server = http.createServer(function (req, res) {
                                     var arg = url.parse(req.url).query;
                                     var params = querystring.parse(arg);
-                                    var appToken = params['apptoken'];
+                                    var apptoken = params.apptoken, userid = params.userid, cname = params.cname;
                                     res.statusCode = 200;
                                     res.setHeader('Content-Type', 'text/plain');
                                     res.end('Login is successful, please return to the operation interface manually');
-                                    if (appToken) {
-                                        resolve(appToken);
-                                        storage.set(project_1.loginStorageKey.accountToken, appToken);
+                                    if (apptoken) {
+                                        resolve({ apptoken: apptoken, userid: userid, cname: cname });
+                                        storage.set(project_1.loginStorageKey.userid, userid);
+                                        storage.set(project_1.loginStorageKey.cname, cname);
+                                        storage.set(project_1.loginStorageKey.accountToken, apptoken);
                                         logger.success('logger success');
                                         server.close();
                                         // 在执行 preview 命令需要登录时不退出程序
@@ -199,8 +203,8 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                     });
                 }); })];
             case 4:
-                token = _a.sent();
-                return [2 /*return*/, token];
+                loginInfo = _a.sent();
+                return [2 /*return*/, loginInfo];
         }
     });
 }); };
@@ -209,6 +213,8 @@ var logout = function () {
     var storage = new storage_1.Storage({ cmd: '' });
     storage["delete"](project_1.loginStorageKey.accountToken);
     storage["delete"](project_1.loginStorageKey.account);
+    storage["delete"](project_1.loginStorageKey.userid);
+    storage["delete"](project_1.loginStorageKey.cname);
     logger.success('Logged out');
 };
 exports.logout = logout;

package/package.json

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