@zeppos/zeus-cli 1.1.0-beta → 1.1.0

package/api/index.js

@@ -76,6 +76,8 @@ var project_1 = require("../config/project");
 var logger = __importStar(require("../utils/logger"));
 var storage_1 = require("../modules/storage");
 // import { login } from '../modules/login'
+// import { bridge } from '../modules/bridge'
+// mark 调试时有用
 // process.on('exit', (code) => {
 //   console.log(`About to exit with code: ${code}`); 
 // }); 
@@ -133,7 +135,8 @@ var getConnectDevServerWebSocketCode = function () { return __awaiter(void 0, vo
         switch (_c.label) {
             case 0:
                 if (!exports.subRegionalHost) {
-                    message = project_1.ACCOUNT_ENV === 'production' ? "Login information is invalid,please login again with the command 'zeus login'" : "".concat(project_1.ACCOUNT_ENV, ":Login information is invalid,please login again with the command 'zeus login'.");
+                    storage_1.globalStorage.deleteStorage('____login');
+                    message = project_1.ACCOUNT_ENV === 'production' ? "Login information is invalid,please login again with the command 'zeus login'." : "".concat(project_1.ACCOUNT_ENV, ":Login information is invalid,please login again with the command 'zeus login'.");
                     throw new Error(message);
                 }
                 _c.label = 1;
@@ -153,8 +156,9 @@ var getConnectDevServerWebSocketCode = function () { return __awaiter(void 0, vo
                 message = (error_2 === null || error_2 === void 0 ? void 0 : error_2.response) && ((_a = error_2.response) === null || _a === void 0 ? void 0 : _a.data);
                 if ((message === null || message === void 0 ? void 0 : message.code) === 401 && ((_b = message === null || message === void 0 ? void 0 : message.data) === null || _b === void 0 ? void 0 : _b.code) === "0102") {
                     storage_1.globalStorage.deleteStorage('____login');
-                    // await login() TODO 不中断命令登录
-                    throw new Error("Invalid token,please login again with the command 'zeus login'.");
+                    // need login
+                    // await login()
+                    throw new Error("".concat(project_1.ACCOUNT_ENV === 'production' ? '' : 'test: ', "Invalid token,please login again with the command 'zeus login'."));
                 }
                 else {
                     msg = project_1.ACCOUNT_ENV === 'production' ? "GetConnectDevServerWebSocketCode error" : "".concat(project_1.ACCOUNT_ENV, ":getConnectDevServerWebSocketCode error ").concat(JSON.stringify(message));
@@ -170,7 +174,7 @@ var getConnectDevServerWebSocketCode = function () { return __awaiter(void 0, vo
 exports.getConnectDevServerWebSocketCode = getConnectDevServerWebSocketCode;
 // 上传表盘/应用接口
 var uploadPackage = function (form, length) { return __awaiter(void 0, void 0, void 0, function () {
-    var packageInfo, error_3;
+    var packageInfo, error_3, message;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -184,6 +188,12 @@ var uploadPackage = function (form, length) { return __awaiter(void 0, void 0, v
             case 2:
                 error_3 = _a.sent();
                 logger.error("".concat(error_3));
+                if (typeof error_3 === 'string') {
+                    message = error_3.includes('401') ? "Invalid token,please login again with the command 'zeus login'." : error_3;
+                    logger.error("".concat(message));
+                }
+                // need login
+                process.exit(1);
                 return [3 /*break*/, 3];
             case 3: return [2 /*return*/];
         }

package/config/project.js

@@ -28,7 +28,7 @@ if (!exports.ACCOUNT_ENV) {
     exports.ACCOUNT_ENV = 'production';
     storage_1.globalStorage.set((_a = {}, _a[exports.ACCOUNT_ENV_KEY] = exports.ACCOUNT_ENV, _a));
 }
-var curLoginURL = exports.ACCOUNT_ENV === 'production' ? 'https://user.huami.com/universalLogin/index.html#/login' : 'https://user-testing.huami.com/universalLogin/index.html#/login';
+var curLoginURL = exports.ACCOUNT_ENV === 'production' ? 'https://user.zepp.com/universalLogin/index.html#/login' : 'https://user-testing.zepp.com/universalLogin/index.html#/login';
 exports.analyticsHost = exports.ACCOUNT_ENV === 'production' ? 'https://api-analytics.huami.com' : 'https://api-analytics-test.huami.com';
 var loginUrl = new URL(curLoginURL);
 var accountPrefix = "____".concat(lodash_1["default"].replace(loginUrl.host, /\./g, '_'), "__");

package/modules/bridge.js

@@ -63,18 +63,17 @@ var project_1 = require("../config/project");
 var index_1 = require("../api/index");
 var logger = __importStar(require("../utils/logger"));
 var chalk_1 = __importDefault(require("chalk"));
-var inquirer_1 = __importDefault(require("inquirer"));
 var websocket_1 = __importDefault(require("./websocket"));
 var build_1 = require("./build");
 var common_1 = require("../utils/common");
-// TODO: 需要在项目根目录执行
+var project_2 = require("../config/project");
 var client;
 var hasConnectDevice = false;
 var choiredDevice;
 //  连接设备
 // TODO: 有多个连接的时候退不到可输入状态
-var connectDevice = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var debugConnectedDevice, optionalDeviceArr, len, clientId, answer;
+var connectDevice = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
+    var debugConnectedDevice, optionalDeviceArr, len, clientId_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -85,24 +84,26 @@ var connectDevice = function () { return __awaiter(void 0, void 0, void 0, funct
                 logger.log(chalk_1["default"].yellow('No connectable online App or Simulator.'));
                 return [3 /*break*/, 4];
             case 1:
-                clientId = debugConnectedDevice[optionalDeviceArr[0]];
+                clientId_1 = debugConnectedDevice[optionalDeviceArr[0]];
                 choiredDevice = optionalDeviceArr[0];
                 if (!(len > 1)) return [3 /*break*/, 3];
-                return [4 /*yield*/, inquirer_1["default"].prompt({
+                return [4 /*yield*/, vorpal.activeCommand.prompt({
                         name: 'choiredDevice',
                         type: 'list',
                         choices: optionalDeviceArr,
                         message: 'Which online target would you like to connect?'
+                    }, function (result) {
+                        clientId_1 = debugConnectedDevice[result.choiredDevice];
+                        choiredDevice = result.choiredDevice;
+                        vorpal.delimiter('bridge$').show();
                     })];
             case 2:
-                answer = _a.sent();
-                clientId = debugConnectedDevice[answer.choiredDevice];
-                choiredDevice = answer.choiredDevice;
+                _a.sent();
                 _a.label = 3;
             case 3:
                 project_1.____inner_global_variable.bridgeChoiredDevice = choiredDevice;
                 // 发送连接请求
-                client.sendMessage({ clientId: clientId }, 'connectClient');
+                client.sendMessage({ clientId: clientId_1 }, 'connectClient');
                 hasConnectDevice = true;
                 _a.label = 4;
             case 4: return [2 /*return*/];
@@ -130,16 +131,18 @@ var connectBridgeWSCallback = function () {
     });
     vorpal
         .command('connect', 'Connect the online App or Simulator for debugging.')
-        .action(function () { return __awaiter(void 0, void 0, void 0, function () {
+        .option('--anchovies')
+        .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             // TODO: 断开链接怎么监听，需要处理啥吗
-            connectDevice();
+            connectDevice(vorpal);
+            cb();
             return [2 /*return*/];
         });
     }); });
     vorpal
         .command('install', 'Install applications or watch face.')
-        .action(function () { return __awaiter(void 0, void 0, void 0, function () {
+        .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -153,19 +156,31 @@ var connectBridgeWSCallback = function () {
                 case 2:
                     logger.log(chalk_1["default"].yellow("No device is connected, please connect the device with the command width 'connect' first."));
                     _a.label = 3;
-                case 3: return [2 /*return*/];
+                case 3:
+                    cb();
+                    return [2 /*return*/];
             }
         });
     }); });
     // 卸载命令
     vorpal
-        .command('uninstall', 'Uninstall applications or watch face.')
-        .action(function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, appid, appname, apptype;
+        .command('uninstall [appid]', 'Uninstall applications or watch face.')
+        .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
+        var _a, appid, appName, appType;
         return __generator(this, function (_b) {
-            logger.info('Uninstalling');
-            _a = (0, common_1.getDeviceInfoFromAppJson)(), appid = _a.appId, appname = _a.appName, apptype = _a.appType;
-            client.sendMessage({ type: 'delete', appid: appid, appname: appname, apptype: apptype }, 'sysSettingPush');
+            if (!args.appid) {
+                logger.info('Uninstalling');
+                _a = (0, common_1.getDeviceInfoFromAppJson)(), appid = _a.appId, appName = _a.appName, appType = _a.appType;
+                client.sendMessage({ type: 'delete', appid: appid, appName: appName, appType: appType }, 'sysSettingPush');
+            }
+            else if (args.appid && typeof args.appid === 'number') {
+                logger.info('Uninstalling');
+                client.sendMessage({ type: 'delete', appid: args.appid }, 'sysSettingPush');
+            }
+            else if (args.appid) {
+                logger.info("invalid '".concat(args.appid, "', the 'uninstall' command should be followed by appid or blank."));
+            }
+            cb();
             return [2 /*return*/];
         });
     }); });
@@ -174,6 +189,7 @@ var disConnectBridgeWSCallback = function () {
     // 什么情况下会断开连接？
     hasConnectDevice = false;
     logger.log('= 断开连接 =');
+    process.exit(1);
 };
 var bridge = function () { return __awaiter(void 0, void 0, void 0, function () {
     var bridgeWebSocketURL, error_1;
@@ -192,7 +208,7 @@ var bridge = function () { return __awaiter(void 0, void 0, void 0, function ()
                     connectCb: connectBridgeWSCallback,
                     disconnectCb: disConnectBridgeWSCallback
                 });
-                logger.log("  - Enter 'help' to view the command.");
+                logger.log("".concat(project_2.ACCOUNT_ENV === 'production' ? '' : 'test:', "  - Enter 'help' to view the command."));
                 return [3 /*break*/, 3];
             case 2:
                 error_1 = _a.sent();

package/modules/build.js

@@ -145,7 +145,7 @@ function chooseBuildPackages(mode) {
                     answers = _c.sent();
                     // 存储 deviceSource
                     if (BuildMode.PROD) {
-                        storage_1.globalStorage.set((_b = {}, _b[project_1.buildStorageKey.targetDeviceToBuild] = [answers.target], _b));
+                        storage_1.globalStorage.set((_b = {}, _b[project_1.buildStorageKey.targetDeviceToBuild] = answers.target, _b));
                     }
                     return [2 /*return*/, mode !== BuildMode.PROD ? [answers.target] : answers.buildTargets];
                 case 4: return [2 /*return*/];
@@ -270,7 +270,7 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                 _a = args._, curCommand = _a[0], curBridgeTarget = _a[1];
                 form = new form_data_1["default"]();
                 buildMode = (curBridgeTarget && curBridgeTarget === 'simulator') ? BuildMode.DEV : BuildMode.PREVIEW;
-                logger.info('building...');
+                logger.info("".concat(project_1.ACCOUNT_ENV === 'production' ? '' : 'test:', " building..."));
                 return [4 /*yield*/, (0, exports.build)(buildMode, [], args)];
             case 1:
                 buildInfo = _b.sent();
@@ -294,15 +294,15 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                                 if (!(curCommand === 'preview')) return [3 /*break*/, 2];
                                 url = "".concat(protocol, "://").concat(api_1.subRegionalHost, "/custom/tools/app-dial/download/").concat(code);
                                 if (protocol && code) {
-                                    logger.info('generating preview qrcode...');
+                                    logger.info('Generating preview qrcode...');
                                     logger.success('Below within two hours,please use Zepp APP to scan the qrcode below to preview your app.');
                                     qrcode_terminal_1["default"].generate("".concat(protocol, "://").concat(api_1.subRegionalHost, "/custom/tools/app-dial/download/").concat(code), { small: true });
                                 }
                                 else {
                                     if (project_1.ACCOUNT_ENV === 'test') {
-                                        console.log('previewUrl', url);
+                                        console.log('test:previewUrl', url);
                                     }
-                                    logger.error('generating preview qrcode failed, please check your network.');
+                                    logger.error('Generating preview qrcode failed, please check your network.');
                                 }
                                 return [3 /*break*/, 4];
                             case 2:

package/modules/create/index.js

@@ -291,7 +291,9 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 });
                 logger.log('\n');
                 logger.success("project created successfully by \"".concat(choosePkg.name, "\" template.\n"));
-                shell.cd("".concat(projectName));
+                if (cmd === 'create') {
+                    shell.cd("".concat(projectName));
+                }
                 shell.exec('npm install');
                 return [4 /*yield*/, (0, sleep_1.sleep)(300)];
             case 4:

package/modules/login.js

@@ -74,7 +74,7 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
     return __generator(this, function (_h) {
         _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;
         if (apptoken && userid && cname) {
-            message = project_1.ACCOUNT_ENV === 'production' ? "have logged" : "have logged in ".concat(project_1.ACCOUNT_ENV, " with account: ").concat(userid);
+            message = project_1.ACCOUNT_ENV === 'production' ? "Have logged" : "test:Have logged with account:".concat(userid);
             logger.success(message);
             return [2 /*return*/, { apptoken: apptoken, userid: userid, cname: cname }];
         }
@@ -107,7 +107,7 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                                             _b[project_1.loginStorageKey.cname] = cname,
                                             _b[project_1.loginStorageKey.accountToken] = apptoken,
                                             _b));
-                                        message = project_1.ACCOUNT_ENV === 'production' ? 'Login success' : "Login success, ".concat(project_1.ACCOUNT_ENV, "\uFF0Cuserid:").concat(userid);
+                                        message = project_1.ACCOUNT_ENV === 'production' ? 'Login success' : "test:Login success with account:".concat(userid);
                                         logger.success(message);
                                         server.close();
                                         process.exit(0);
@@ -148,6 +148,58 @@ exports.login = login;
 var logout = function () {
     (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_LOGOUT_C');
     storage_1.globalStorage.deleteStorage('____login');
-    logger.success('Logged out');
+    logger.success("".concat(project_1.ACCOUNT_ENV === 'production' ? '' : 'test: ', "Logged out"));
+    process.exit(0);
 };
 exports.logout = logout;
+// const isLocal = false
+// if(isLocal) {
+//   const answer = await inquirer.prompt([
+//     {
+//       name: 'account',
+//       type: 'input',
+//       message: `Enter your account (Mobile/E-mail): ${accountInfo ? `(${accountInfo})` : ''}`
+//     },
+//     {
+//       name: 'password',
+//       type: 'password',
+//       message: 'Enter your password: ',
+//       mask: '*'
+//     }
+//   ])
+//   answer.account = answer.account || accountInfo
+//   const loginInfo = await loginByLocal(answer.account, answer.password).catch(() => {
+//     logger.error('logged in failed, please check your account and password')
+//     process.exit(1)
+//   })
+//   const token = _.get(loginInfo, 'token_info.app_token')
+//   if (token) {
+//     logger.success(`logged in with account: ${answer.account}`)
+//     storage.set(loginStorageKey.account, answer.account)
+//     storage.set(loginStorageKey.accountToken, token)
+//   }
+// }
+// export const callback = async ({ cname, apptoken, userid }: {cname: string, apptoken: string, userid: string}, fun: () => void) => {
+//   if(apptoken && cname) {
+//     const userInfoHost = cname && cname.split(',').filter((h: string) => h.indexOf('auth-') > -1)[0]
+//     const userInfoURL = `https://${userInfoHost}/v2/developer/account/center`
+//     const { userName: nickName = '' } = await getUserInfo(userInfoURL, apptoken)
+//     globalStorage.set({
+//       [loginStorageKey.nickName]: nickName,
+//       [loginStorageKey.userid]: userid,
+//       [loginStorageKey.cname]: cname,
+//       [loginStorageKey.accountToken]: apptoken
+//     })
+//     const message = ACCOUNT_ENV === 'production' ? 'Login success' : `test:Login success with account:${userid}`
+//     logger.success(message)
+//     if (fun) {
+//       // 暂时没有实现和调用
+//       await fun()
+//     } else {
+//       process.exit(0)
+//     }
+//   } else {
+//     console.log('cxa')
+//     process.exit(1)
+//   }
+// }

package/modules/status.js

@@ -70,7 +70,7 @@ var status = function () { return __awaiter(void 0, void 0, void 0, function ()
     return __generator(this, function (_q) {
         _a = storage_1.instanceStorage.getStorage(), _b = project_1.loginStorageKey.nickName, _c = _a[_b], nickName = _c === void 0 ? '' : _c, _d = project_1.loginStorageKey.accountToken, _e = _a[_d], apptoken = _e === void 0 ? '' : _e, _f = project_1.loginStorageKey.userid, _g = _a[_f], userid = _g === void 0 ? '' : _g, _h = project_1.loginStorageKey.cname, _j = _a[_h], cname = _j === void 0 ? '' : _j, _k = project_1.simulatorStorageKey.simulatorHost, _l = _a[_k], simulatorHost = _l === void 0 ? run_1.DEFAULT_HOST : _l, _m = project_1.simulatorStorageKey.simulatorPort, _o = _a[_m], simulatorPort = _o === void 0 ? run_1.DEFAULT_PORT : _o, _p = project_1.simulatorStorageKey.simulatorConnectStatus, simulatorConnectStatus = _a[_p];
         loginStatus = (apptoken && userid && cname) ? 'logged' : 'logout';
-        message = project_1.ACCOUNT_ENV === 'production' ? 'login status:' : "".concat(project_1.ACCOUNT_ENV, " login status: ");
+        message = project_1.ACCOUNT_ENV === 'production' ? 'login status:' : "".concat(project_1.ACCOUNT_ENV, ": login status: ");
         logger.log(message, chalk_1["default"].yellow(loginStatus));
         if (loginStatus === 'logged') {
             logger.log('nickName:', chalk_1["default"].yellow(nickName));
@@ -80,6 +80,7 @@ var status = function () { return __awaiter(void 0, void 0, void 0, function ()
         logger.log('simulator host:', chalk_1["default"].yellow(simulatorHost));
         logger.log('simulator port:', chalk_1["default"].yellow(simulatorPort));
         (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_STATUS_C');
+        process.exit(0);
         return [2 /*return*/];
     });
 }); };

package/modules/websocket.js

@@ -32,6 +32,7 @@ var WebSocketClass = /** @class */ (function () {
         this.msgEventIDs = {};
         this.handleListenMsgEventReturn = function (data) {
             var message = data.toString('utf8');
+            // mark 调试时有用
             // console.log('receivedMessage', message)
             var me = _this;
             // TODO: 优化判断字符串是纯字符串还是可转换成对象

package/package.json

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

package/utils/common.js

@@ -47,33 +47,60 @@ function getOptionalConnectDevice(connectDeviceArr) {
 }
 exports.getOptionalConnectDevice = getOptionalConnectDevice;
 function handleListenMsgEvent(msgEventName, data) {
-    var _a, _b;
+    var _a, _b, _c;
+    // mark 调试时有用
+    // console.log(msgEventName,data)
     switch (msgEventName) {
         // 客户端变更推送
         case 'sysEventPush':
-            var clients = data.params.clients;
-            var connectedDevice = getOptionalConnectDevice(clients);
-            project_1.____inner_global_variable.bridgeOptionalDevice = JSON.stringify(connectedDevice);
+            if (typeof data === 'string') {
+                logger.info(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);
+            }
             break;
         // 处理连接设备的返回
         case 'connectClient':
-            var _c = data.result, result = _c === void 0 ? '' : _c, _d = data.error, error = _d === void 0 ? {} : _d;
+            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;
                 logger.info("successfully connected to ".concat(choiredDevice, "."));
             }
             if (error && JSON.stringify(error) !== '{}') {
-                var _e = data.error, _f = _e.code, code = _f === void 0 ? 0 : _f, _g = _e.message, message = _g === void 0 ? '' : _g;
+                var _f = data.error, _g = _f.code, code = _g === void 0 ? 0 : _g, _h = _f.message, message = _h === void 0 ? '' : _h;
                 logger.error("".concat(code, ": ").concat(message));
             }
             break;
         // 监听sysSettingPush消息的返回，如uninstall删除设备(实际走的sysMessagePush)
         case 'sysSettingPush':
-            logger.info(typeof data === 'object' ? (_a = data === null || data === void 0 ? void 0 : data.params) === null || _a === void 0 ? void 0 : _a.content : data);
+            if (typeof data === 'string') {
+                logger.info(data);
+            }
+            else if (typeof data === 'object' && ((_b = data === null || data === void 0 ? void 0 : data.params) === null || _b === void 0 ? void 0 : _b.content)) {
+                logger.info(data.params.content);
+            }
             break;
         // 监听sysMessagePush消息的返回
         case 'sysMessagePush':
-            logger.info(typeof data === 'object' ? (_b = data === null || data === void 0 ? void 0 : data.params) === null || _b === void 0 ? void 0 : _b.content : data);
+            if (typeof data === 'string') {
+                logger.info(data);
+            }
+            else if (typeof data === 'object' && ((_c = data === null || data === void 0 ? void 0 : data.params) === null || _c === void 0 ? void 0 : _c.content)) {
+                logger.info(data.params.content);
+            }
+            break;
+        // 监听logPush消息的返回
+        case 'logPush':
+            if (typeof data === 'string') {
+                logger.info(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);
+                logger.info(str);
+            }
             break;
         default:
             break;