@zeppos/zeus-cli 1.0.22 → 1.0.24

package/bin/cli.js

@@ -27,5 +27,6 @@ yargs_1["default"].usage('Usage: $0 <command> [args?]')
     // @ts-ignore
     .command('build', 'build this project for production', proxy, index_1.buildProd)
     .command('config', 'set or get the config value', proxy, index_1.config)
+    .command('status', 'view information such as login and emulator connection status', proxy, index_1.status)
     .fail(index_1.help)
     .argv;

package/config/project.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.loginStorageKey = exports.loginConfig = exports.LocalServerConfig = exports.TemplateCopyType = exports.AppSourceType = exports.AppType = void 0;
+exports.loginStorageKey = exports.loginConfig = exports.ACCOUNT_ENV = exports.ACCOUNT_ENV_KEY = exports.TemplateCopyType = exports.AppSourceType = exports.AppType = void 0;
 var lodash_1 = __importDefault(require("lodash"));
+var storage_1 = require("../modules/storage");
 var AppType;
 (function (AppType) {
     AppType["APP"] = "app";
@@ -20,19 +21,18 @@ var TemplateCopyType;
     TemplateCopyType["CLONE"] = "clone";
     TemplateCopyType["EDIT"] = "edit";
 })(TemplateCopyType = exports.TemplateCopyType || (exports.TemplateCopyType = {}));
-var LocalServerConfig;
-(function (LocalServerConfig) {
-    LocalServerConfig["HOSTNAME"] = "localhost";
-    LocalServerConfig[LocalServerConfig["PORT"] = 8086] = "PORT";
-})(LocalServerConfig = exports.LocalServerConfig || (exports.LocalServerConfig = {}));
-var loginURL = 'https://user.huami.com/universalLogin/index.html#/login';
-var loginUrl = new URL(loginURL);
+exports.ACCOUNT_ENV_KEY = 'account_env';
+var storage = new storage_1.Storage({ cmd: '' });
+exports.ACCOUNT_ENV = storage.get(exports.ACCOUNT_ENV_KEY) ? storage.get(exports.ACCOUNT_ENV_KEY) : storage.set(exports.ACCOUNT_ENV_KEY, 'production');
+var loginTestURL = 'https://user-testing.huami.com/universalLogin/index.html#/login';
+var loginProURL = 'https://user.huami.com/universalLogin/index.html#/login';
+var curLoginURL = exports.ACCOUNT_ENV === 'production' ? loginProURL : loginTestURL;
+var loginUrl = new URL(curLoginURL);
 var accountPrefix = "____".concat(lodash_1["default"].replace(loginUrl.host, /\./g, '_'), "__");
 exports.loginConfig = {
-    LOGIN_URL: loginURL,
+    LOGIN_URL: curLoginURL,
     PROJECT_NAME: 'zeppos_zeus_cli',
-    PLATFORM_APP: 'com.huami.watch.hmwatchmanager',
-    PROJECT_REDIRECT_URI: encodeURIComponent("http://".concat(LocalServerConfig.HOSTNAME, ":").concat(LocalServerConfig.PORT, "/"))
+    PLATFORM_APP: 'com.huami.watch.hmwatchmanager'
 };
 exports.loginStorageKey = {
     accountToken: "".concat(accountPrefix, "token"),

package/index.js

@@ -16,3 +16,4 @@ __exportStar(require("./modules/build"), exports);
 __exportStar(require("./modules/create"), exports);
 __exportStar(require("./modules/login"), exports);
 __exportStar(require("./modules/config"), exports);
+__exportStar(require("./modules/status"), exports);

package/modules/build.js

@@ -83,7 +83,6 @@ var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var login_1 = require("./login");
 var logger = __importStar(require("../utils/logger"));
-var storage_1 = require("./storage");
 var project_1 = require("../config/project");
 var chalk_1 = __importDefault(require("chalk"));
 var BuildMode;
@@ -188,7 +187,9 @@ var build = function (mode, packages) {
                     };
                     if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
                         Object.assign(buildOptions, {
-                            png2vg: true
+                            png2vg: true,
+                            jsc: TransformType.C,
+                            prune: true // js转成bin之后删除js脚本（开启转 bin 之后，需要在 win 上 preview 验证一下转 C 是否正常）
                         });
                     }
                     _a.label = 3;
@@ -237,12 +238,10 @@ var checkIsWatchFaceProject = function () {
     return appType === project_1.AppType.WATCHFACE;
 };
 var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var storage, _a, apptoken, userid, cname, form, buildInfo, isWatchFaceProject;
+    var _a, apptoken, userid, cname, form, buildInfo, isWatchFaceProject;
     return __generator(this, function (_b) {
         switch (_b.label) {
-            case 0:
-                storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
-                return [4 /*yield*/, (0, login_1.login)(args)];
+            case 0: return [4 /*yield*/, (0, login_1.login)(args)];
             case 1:
                 _a = _b.sent(), apptoken = _a.apptoken, userid = _a.userid, cname = _a.cname;
                 form = new form_data_1["default"]();

package/modules/config.js

@@ -63,6 +63,7 @@ var lodash_1 = __importDefault(require("lodash"));
 var chalk_1 = __importDefault(require("chalk"));
 var storage_1 = require("./storage");
 var logger = __importStar(require("../utils/logger"));
+var project_1 = require("../config/project");
 var config = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var cmd, _a, space, _b, method, values, allowedMethods, storage, commonHandleNotKeyTips, config_1;
     return __generator(this, function (_c) {
@@ -102,6 +103,10 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
                         logger.error('please input <key>');
                     }
                     else {
+                        // 切换登录环境时清除原有 token
+                        if (key === project_1.ACCOUNT_ENV_KEY && storage.get(project_1.ACCOUNT_ENV_KEY) !== value) {
+                            storage["delete"](project_1.loginStorageKey.accountToken);
+                        }
                         storage.set(key, value);
                         logger.success("config: ".concat(key, "=").concat(value));
                     }

package/modules/create/index.js

@@ -87,6 +87,7 @@ var fs = __importStar(require("fs"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var path_1 = require("path");
 var fs_1 = require("fs");
+var yeoman_environment_1 = __importDefault(require("yeoman-environment"));
 var local_app_1 = require("./local-app");
 var yeoman_app_1 = require("./yeoman-app");
 var project_1 = require("../../config/project");
@@ -94,15 +95,16 @@ var device_1 = require("../../config/device");
 var font_icon_1 = __importDefault(require("../../font-icon"));
 var logger = __importStar(require("../../utils/logger"));
 var sleep_1 = require("../../utils/sleep");
-var yeoman_environment_1 = __importDefault(require("yeoman-environment"));
+var shell = require('shelljs');
 var TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template');
 var create = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, cmd, projectName, cwdPath, workDir, beforeFiles, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generagtorMate, generagtorMateKeys, answer, choosePkg;
+    var _a, cmd, projectName, cwdPath, beforeFiles, workDir, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generatorMate, generatorMateKeys, answer, choosePkg;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 _a = args._ || [], cmd = _a[0], projectName = _a[1];
                 cwdPath = (0, path_1.resolve)('./');
+                beforeFiles = [];
                 workDir = cwdPath;
                 if (cmd === 'create') {
                     if (projectName) {
@@ -117,7 +119,6 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                         process.exit(1);
                     }
                 }
-                beforeFiles = [];
                 if (fs.existsSync(workDir)) {
                     rd.eachFileSync(workDir, function (file) {
                         beforeFiles.push(file);
@@ -162,14 +163,14 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 }
                 env = yeoman_environment_1["default"].createEnv();
                 env.lookup();
-                generagtorMate = env.getGeneratorsMeta();
-                generagtorMateKeys = Object.keys(generagtorMate);
-                if (generagtorMateKeys.length) {
+                generatorMate = env.getGeneratorsMeta();
+                generatorMateKeys = Object.keys(generatorMate);
+                if (generatorMateKeys.length) {
                     if (localChoices.length) {
                         // @ts-ignore
                         localChoices.push(new inquirer_1["default"].Separator());
                     }
-                    generagtorMateKeys.forEach(function (name) {
+                    generatorMateKeys.forEach(function (name) {
                         if (/:(app|all)$/.test(name)) {
                             localChoices.push({
                                 name: name,
@@ -260,7 +261,7 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 _b.sent();
                 if (choosePkg.type === project_1.AppSourceType.YEOMAN) {
                     logger.info("".concat(lodash_1["default"].upperFirst(cmd), " application using yeoman template \"").concat(choosePkg.name, "\"."));
-                    (0, yeoman_app_1.createYeomanApp)(__assign(__assign({}, answer), { env: env, templateInfo: generagtorMate[choosePkg.name] }));
+                    (0, yeoman_app_1.createYeomanApp)(__assign(__assign({}, answer), { env: env, templateInfo: generatorMate[choosePkg.name] }));
                 }
                 else {
                     logger.info("".concat(lodash_1["default"].upperFirst(cmd), " application using local template \"").concat(choosePkg.name, "\"."));
@@ -286,6 +287,8 @@ 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));
+                shell.exec('npm install');
                 return [4 /*yield*/, (0, sleep_1.sleep)(300)];
             case 4:
                 _b.sent();

package/modules/create/local-app.js

@@ -55,6 +55,7 @@ var os_1 = __importDefault(require("os"));
 var lodash_1 = __importDefault(require("lodash"));
 var path_1 = require("path");
 var fs_extra_1 = __importDefault(require("fs-extra"));
+var fs_1 = __importDefault(require("fs"));
 var project_1 = require("../../config/project");
 var device_1 = require("../../config/device");
 // 生成模板项目
@@ -63,6 +64,9 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
     return __generator(this, function (_a) {
         workDir = args.workDir, templateInfo = args.templateInfo, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets, appType = args.appType;
         fs_extra_1["default"].copySync(templateInfo.path, workDir);
+        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, '../../public/template/jsconfig.json'), "".concat(workDir, "/jsconfig.json"));
+        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, '../../public/template/package.json'), "".concat(workDir, "/package.json"));
+        fs_1["default"].writeFileSync("".concat(workDir, "/global.d.ts"), '/// <reference path="node_modules/@zeppos/device-types/index.d.ts" />');
         appJsonPath = (0, path_1.resolve)(workDir, './app.json');
         appJson = fs_extra_1["default"].readJsonSync(appJsonPath);
         appID = Math.floor(Math.random() * 10001) + 20000;

package/modules/help.js

@@ -78,6 +78,7 @@ var help = function () { return __awaiter(void 0, void 0, void 0, function () {
         logger.log("".concat(cmd, " preview         preview this project in your device"));
         logger.log("".concat(cmd, " build           build this project for production"));
         logger.log("".concat(cmd, " config <term>   set or get the config value"));
+        logger.log("".concat(cmd, " status          view information such as login and emulator connection status"));
         logger.log('');
         logger.log('');
         logger.log("".concat(cmd, "@").concat(pkg.version, " ").concat(path.resolve(__dirname, '../')));

package/modules/login.js

@@ -59,68 +59,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.logout = exports.login = void 0;
-var qs_1 = __importDefault(require("qs"));
 var lodash_1 = __importDefault(require("lodash"));
-var axios_1 = __importDefault(require("axios"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var storage_1 = require("./storage");
 var logger = __importStar(require("../utils/logger"));
 var project_1 = require("../config/project");
+var login_1 = require("../utils/login");
+var get_port_1 = __importDefault(require("get-port"));
 var open = require('open');
 var http = require('http');
 var url = require('url');
 var querystring = require('querystring');
-var REGIST_URL = 'https://api-user.huami.com';
-var LOGIN_URL = 'https://account.huami.com';
-var postForm = function (url, data) {
-    return (0, axios_1["default"])({
-        method: 'POST',
-        headers: {
-            'content-type': 'application/x-www-form-urlencoded'
-        },
-        data: qs_1["default"].stringify(data),
-        url: url
-    });
-};
-var loginByLocal = function (account, password) { return __awaiter(void 0, void 0, void 0, function () {
-    var data, checkInfo, loginInfo;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                data = {
-                    client_id: 'HuaMi',
-                    country_code: 'zh-CN',
-                    json_response: 'true',
-                    name: '',
-                    password: password,
-                    phoneOrEmail: account,
-                    redirect_uri: 'https://s3-us-west-2.amazonaws.com/hm-registration/successsignin.html',
-                    state: 'REDIRECTION',
-                    token: 'access'
-                };
-                if (/^[1][0-9]{10}$/.test(account)) {
-                    data.phoneOrEmail = encodeURIComponent("+86".concat(account));
-                }
-                data.name = data.phoneOrEmail.split('@')[0];
-                return [4 /*yield*/, postForm("".concat(REGIST_URL, "/registrations/").concat(data.phoneOrEmail, "/tokens"), data)];
-            case 1:
-                checkInfo = _a.sent();
-                return [4 /*yield*/, postForm("".concat(LOGIN_URL, "/v2/client/login"), {
-                        app_name: 'com.huami.webapp',
-                        app_version: '4.3.0',
-                        code: lodash_1["default"].get(checkInfo, 'data.access', ''),
-                        country_code: 'zh-cn',
-                        device_id: '02:00:00:00:00:00',
-                        device_model: 'web',
-                        grant_type: 'access_token',
-                        third_name: 'huami'
-                    })];
-            case 2:
-                loginInfo = (_a.sent()).data;
-                return [2 /*return*/, loginInfo];
-        }
-    });
-}); };
 var login = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var storage, accountInfo, apptoken, userid, cname, isLocal, answer, loginInfo_1, token, loginInfo;
     return __generator(this, function (_a) {
@@ -154,7 +103,7 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
             case 1:
                 answer = _a.sent();
                 answer.account = answer.account || accountInfo;
-                return [4 /*yield*/, loginByLocal(answer.account, answer.password)["catch"](function () {
+                return [4 /*yield*/, (0, login_1.loginByLocal)(answer.account, answer.password)["catch"](function () {
                         logger.error('logged in failed, please check your account and password');
                         process.exit(1);
                     })];
@@ -168,34 +117,43 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                 }
                 _a.label = 3;
             case 3: return [4 /*yield*/, new Promise(function (resolve) { return __awaiter(void 0, void 0, void 0, function () {
-                    var server;
+                    var server, HOSTNAME, PORT, PROJECT_REDIRECT_URI;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                server = http.createServer(function (req, res) {
-                                    var arg = url.parse(req.url).query;
-                                    var params = querystring.parse(arg);
-                                    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: 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 命令需要登录时不退出程序
-                                        if (!args) {
-                                            process.exit(1);
+                                server = http.createServer(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
+                                    var arg, params, apptoken, userid, cname;
+                                    return __generator(this, function (_a) {
+                                        arg = url.parse(req.url).query;
+                                        params = querystring.parse(arg);
+                                        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: 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 命令需要登录时不退出程序
+                                            if (!args) {
+                                                process.exit(1);
+                                            }
                                         }
-                                    }
-                                });
-                                server.listen(project_1.LocalServerConfig.PORT, project_1.LocalServerConfig.HOSTNAME);
-                                // 打开浏览器的登录页面
-                                return [4 /*yield*/, open("".concat(project_1.loginConfig.LOGIN_URL, "?project_name=").concat(project_1.loginConfig.PROJECT_NAME, "&platform_app=").concat(project_1.loginConfig.PLATFORM_APP, "&project_redirect_uri=").concat(project_1.loginConfig.PROJECT_REDIRECT_URI))];
+                                        return [2 /*return*/];
+                                    });
+                                }); });
+                                HOSTNAME = 'localhost';
+                                return [4 /*yield*/, (0, get_port_1["default"])({ port: 8086 })];
                             case 1:
+                                PORT = _a.sent();
+                                PROJECT_REDIRECT_URI = encodeURIComponent("http://".concat(HOSTNAME, ":").concat(PORT, "/"));
+                                server.listen(PORT, HOSTNAME);
+                                // 打开浏览器的登录页面
+                                return [4 /*yield*/, open("".concat(project_1.loginConfig.LOGIN_URL, "?project_name=").concat(project_1.loginConfig.PROJECT_NAME, "&platform_app=").concat(project_1.loginConfig.PLATFORM_APP, "&project_redirect_uri=").concat(PROJECT_REDIRECT_URI))];
+                            case 2:
                                 // 打开浏览器的登录页面
                                 _a.sent();
                                 return [2 /*return*/];

package/modules/run.js

@@ -58,7 +58,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.run = void 0;
+exports.run = exports.DEFAULT_PORT = exports.DEFAULT_HOST = void 0;
 var fs_1 = __importDefault(require("fs"));
 var lodash_1 = __importDefault(require("lodash"));
 var chalk_1 = __importDefault(require("chalk"));
@@ -72,8 +72,8 @@ var build_1 = require("./build");
 var storage_1 = require("./storage");
 var simulator_1 = require("./simulator");
 var device_1 = require("../config/device");
-var DEFAULT_HOST = '127.0.0.1';
-var DEFAULT_PORT = '7650';
+exports.DEFAULT_HOST = '127.0.0.1';
+exports.DEFAULT_PORT = '7650';
 var getDeviceInternalCodename = function (curTarget) {
     var _a;
     var appJsonFilePath = path.resolve('./app.json');
@@ -88,24 +88,24 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
             case 0:
                 storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
                 simulatorHost = storage.get('simulator_host');
-                simulatorPort = storage.get('simulator_port') || DEFAULT_PORT;
+                simulatorPort = storage.get('simulator_port') || exports.DEFAULT_PORT;
                 if (!!simulatorHost) return [3 /*break*/, 2];
                 return [4 /*yield*/, inquirer_1["default"].prompt([
                         {
                             name: 'host',
                             type: 'input',
-                            message: "simulator host (".concat(DEFAULT_HOST, "):")
+                            message: "simulator host (".concat(exports.DEFAULT_HOST, "):")
                         },
                         {
                             name: 'port',
                             type: 'input',
-                            message: "simulator port (".concat(DEFAULT_PORT, "):")
+                            message: "simulator port (".concat(exports.DEFAULT_PORT, "):")
                         }
                     ])];
             case 1:
                 answer = _a.sent();
-                simulatorHost = answer.host || DEFAULT_HOST;
-                simulatorPort = answer.port || DEFAULT_PORT;
+                simulatorHost = answer.host || exports.DEFAULT_HOST;
+                simulatorPort = answer.port || exports.DEFAULT_PORT;
                 storage.set('simulator_host', simulatorHost);
                 storage.set('simulator_port', simulatorPort);
                 _a.label = 2;
@@ -126,7 +126,7 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                                 zpkBuffer = _a.sent();
                                 if (zpkBuffer) {
                                     logger.info('rebuild done');
-                                    logger.info('refrshing simulator...');
+                                    logger.info('refreshing simulator...');
                                     targetDeviceInternalName = getDeviceInternalCodename(packages[0]);
                                     projectName = path.parse(process.cwd()).base;
                                     simulator.upload(zpkBuffer, projectName, targetDeviceInternalName);

package/modules/simulator.js

@@ -22,6 +22,8 @@ exports.__esModule = true;
 exports.Simulator = void 0;
 var socket_io_client_1 = require("socket.io-client");
 var logger = __importStar(require("../utils/logger"));
+var storage_1 = require("./storage");
+var storage = new storage_1.Storage({ cmd: '' });
 var Simulator = /** @class */ (function () {
     function Simulator(url, options) {
         this.previewId = 1;
@@ -29,9 +31,11 @@ var Simulator = /** @class */ (function () {
         logger.info('connecting to simulator');
         this.socket = (0, socket_io_client_1.io)(url, options || {});
         this.socket.on('connect', function () {
+            storage.set('____simulator_connect_status', 'connected');
             logger.success('simulator connected');
         });
         this.socket.on('disconnect', function () {
+            storage.set('____simulator_connect_status', 'disconnected');
             logger.error('simulator disconnected, please restart the simulator');
         });
     }

package/modules/status.js

@@ -0,0 +1,98 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+exports.status = void 0;
+var chalk_1 = __importDefault(require("chalk"));
+var logger = __importStar(require("../utils/logger"));
+var storage_1 = require("./storage");
+var project_1 = require("../config/project");
+var login_1 = require("../utils/login");
+var run_1 = require("./run");
+var status = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var storage, apptoken, userid, cname, host, loginStatus, userInfo, _a, userName, simulatorHost, simulatorPort, simulatorConnectStatus;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                storage = new storage_1.Storage({ cmd: '' });
+                apptoken = storage.get(project_1.loginStorageKey.accountToken);
+                userid = storage.get(project_1.loginStorageKey.userid);
+                cname = storage.get(project_1.loginStorageKey.cname);
+                host = cname.split(',').filter(function (h) { return h.indexOf('api-mifit') > -1; })[0];
+                loginStatus = (apptoken && userid && cname) ? 'logged' : 'logout';
+                return [4 /*yield*/, (0, login_1.getUserInfo)(host, userid, apptoken)];
+            case 1:
+                userInfo = _b.sent();
+                _a = (userInfo || {}).userName, userName = _a === void 0 ? '' : _a;
+                simulatorHost = storage.get('simulator_host') || run_1.DEFAULT_HOST;
+                simulatorPort = storage.get('simulator_port') || run_1.DEFAULT_PORT;
+                simulatorConnectStatus = storage.get('____simulator_connect_status');
+                logger.log('login status:', chalk_1["default"].yellow(loginStatus));
+                if (loginStatus === 'logged') {
+                    logger.log('nickName:', chalk_1["default"].yellow(userName));
+                    logger.log('userID:', chalk_1["default"].yellow(userid));
+                }
+                logger.log('simulator connect status:', chalk_1["default"].yellow(simulatorConnectStatus ? simulatorConnectStatus : 'disconnected'));
+                logger.log('simulator host:', chalk_1["default"].yellow(simulatorHost));
+                logger.log('simulator port:', chalk_1["default"].yellow(simulatorPort));
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.status = status;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",
@@ -37,7 +37,7 @@
     "webpack": "^5.52.0"
   },
   "dependencies": {
-    "@zeppos/zpm": "^2.1.48",
+    "@zeppos/zpm": "^2.1.49",
     "axios": "^0.23.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
@@ -46,6 +46,7 @@
     "findup-sync": "^4.0.0",
     "form-data": "^4.0.0",
     "fs-extra": "^10.0.0",
+    "get-port": "5.1.1",
     "inquirer": "^8.1.2",
     "lodash": "^4.17.21",
     "npm-keyword": "^6.1.0",
@@ -53,6 +54,7 @@
     "qrcode-terminal": "^0.12.0",
     "qs": "^6.10.1",
     "rd": "^2.0.1",
+    "shelljs": "^0.8.4",
     "socket.io-client": "^4.3.0",
     "update-notifier": "^5.1.0",
     "yargs": "^17.1.1",

package/public/template/empty/app.js

@@ -1,32 +1,10 @@
 App({
-  globalData: {
-
-  },
+  globalData: {},
   onCreate(options) {
     console.log('app on create invoke')
   },
 
-  onShow(options) {
-    console.log('app on show invoke')
-  },
-
-  onHide(options) {
-    console.log('app on hide invoke')
-  },
-
   onDestroy(options) {
-    console.log('app on destory invoke')
-  },
-
-  onError(error) {
-    console.log('app on error invoke')
-  },
-
-  onPageNotFound(obj) {
-    console.log('app on page not found invoke')
-  },
-
-  onUnhandledRejection(obj) {
-    console.log('app on un handle rejection invoke')
+    console.log('app on destroy invoke')
   }
 })

package/public/template/hello-world/app.js

@@ -1,32 +1,10 @@
 App({
-  globalData: {
-
-  },
+  globalData: {},
   onCreate(options) {
     console.log('app on create invoke')
   },
 
-  onShow(options) {
-    console.log('app on show invoke')
-  },
-
-  onHide(options) {
-    console.log('app on hide invoke')
-  },
-
   onDestroy(options) {
-    console.log('app on destory invoke')
-  },
-
-  onError(error) {
-    console.log('app on error invoke')
-  },
-
-  onPageNotFound(obj) {
-    console.log('app on page not found invoke')
-  },
-
-  onUnhandledRejection(obj) {
-    console.log('app on un handle rejection invoke')
+    console.log('app on destroy invoke')
   }
 })

package/public/template/hello-world/page/gtr3/home/index.page.js

@@ -1,16 +1,18 @@
-import { textStyle } from './index.style'
+import { TEXT_STYLE } from './index.style'
 
 const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
 Page({
   build() {
     logger.debug('page build invoked')
-    h.text(textStyle)
+    hmUI.createWidget(hmUI.widget.TEXT, {
+      ...TEXT_STYLE,
+    })
   },
   onInit() {
     logger.debug('page onInit invoked')
   },
 
-  onDestory() {
-    logger.debug('page onDestory invoked')
+  onDestroy() {
+    logger.debug('page onDestroy invoked')
   },
 })

package/public/template/hello-world/page/gtr3/home/index.style.js

@@ -1,32 +1,15 @@
 import { gettext } from "i18n"
-import { assets } from './../../../utils/index'
 
-const image = assets('image')
+export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
 
-export const textStyle = {
-  attrs: {
-    text: gettext('appName')
-  },
-  styles: {
-    x: 42,
-    y: 246,
-    w: 480 - 42 * 2,
-    h: 138,
-    color: 0xFFFFFF,
-    text_size: 36,
-    align_h: h.ALIGN.CENTER_H,
-    text_style: hmUI.text_style.WRAP
-  }
-}
-
-export const imageStyle = {
-  attrs: {
-    src: image('logo.png')
-  },
-  styles: {
-    x: 115,
-    y: 100,
-    w: 250,
-    h: 56,
-  },
+export const TEXT_STYLE = {
+  text: gettext('appName'),
+  x: px(42),
+  y: px(200),
+  w: DEVICE_WIDTH - px(42) * 2,
+  h: px(100),
+  color: 0xffffff,
+  text_size: px(36),
+  align_h: hmUI.align.CENTER_H,
+  text_style: hmUI.text_style.WRAP,
 }

package/public/template/hello-world/page/gtr3-pro/home/index.page.js

@@ -1,16 +1,18 @@
-import { textStyle } from './index.style'
+import { TEXT_STYLE } from './index.style'
 
 const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
 Page({
   build() {
     logger.debug('page build invoked')
-    h.text(textStyle)
+    hmUI.createWidget(hmUI.widget.TEXT, {
+      ...TEXT_STYLE,
+    })
   },
   onInit() {
     logger.debug('page onInit invoked')
   },
 
-  onDestory() {
-    logger.debug('page onDestory invoked')
+  onDestroy() {
+    logger.debug('page onDestroy invoked')
   },
 })

package/public/template/hello-world/page/gtr3-pro/home/index.style.js

@@ -1,32 +1,15 @@
 import { gettext } from "i18n"
-import { assets } from './../../../utils/index'
 
-const image = assets('image')
+export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
 
-export const textStyle = {
-  attrs: {
-    text: gettext('appName')
-  },
-  styles: {
-    x: 42,
-    y: 246,
-    w: 480 - 42 * 2,
-    h: 138,
-    color: 0xFFFFFF,
-    text_size: 36,
-    align_h: h.ALIGN.CENTER_H,
-    text_style: hmUI.text_style.WRAP
-  }
-}
-
-export const imageStyle = {
-  attrs: {
-    src: image('logo.png')
-  },
-  styles: {
-    x: 115,
-    y: 100,
-    w: 250,
-    h: 56,
-  },
+export const TEXT_STYLE = {
+  text: gettext('appName'),
+  x: px(42),
+  y: px(200),
+  w: DEVICE_WIDTH - px(42) * 2,
+  h: px(100),
+  color: 0xffffff,
+  text_size: px(36),
+  align_h: hmUI.align.CENTER_H,
+  text_style: hmUI.text_style.WRAP,
 }

package/public/template/hello-world/page/gts3/home/index.page.js

@@ -1,16 +1,19 @@
-import { textStyle } from './index.style'
+import { TEXT_STYLE } from './index.style'
 
 const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
+
 Page({
   build() {
     logger.debug('page build invoked')
-    h.text(textStyle)
+    hmUI.createWidget(hmUI.widget.TEXT, {
+      ...TEXT_STYLE,
+    })
   },
   onInit() {
     logger.debug('page onInit invoked')
   },
 
-  onDestory() {
-    logger.debug('page onDestory invoked')
+  onDestroy() {
+    logger.debug('page onDestroy invoked')
   },
 })

package/public/template/hello-world/page/gts3/home/index.style.js

@@ -1,32 +1,15 @@
 import { gettext } from "i18n"
-import { assets } from './../../../utils/index'
 
-const image = assets('image')
+export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
 
-export const textStyle = {
-  attrs: {
-    text: gettext('appName')
-  },
-  styles: {
-    x: 42,
-    y: 246,
-    w: 480 - 42 * 2,
-    h: 138,
-    color: 0xFFFFFF,
-    text_size: 36,
-    align_h: h.ALIGN.CENTER_H,
-    text_style: hmUI.text_style.WRAP
-  }
+export const TEXT_STYLE = {
+  text: gettext('appName'),
+  x: 42,
+  y: 200,
+  w: DEVICE_WIDTH - 42 * 2,
+  h: 100,
+  color: 0xffffff,
+  text_size: 36,
+  align_h: hmUI.align.CENTER_H,
+  text_style: hmUI.text_style.WRAP,
 }
-
-export const imageStyle = {
-  attrs: {
-    src: image('logo.png')
-  },
-  styles: {
-    x: 115,
-    y: 100,
-    w: 250,
-    h: 56,
-  },
-}

package/public/template/jsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "checkJs": true
+  },
+  "exclude": [
+    "node_modules",
+    "**/node_modules/*"
+  ],
+  "files": [
+    "node_modules/@zeppos/device-types/index.d.ts"
+  ]
+}

package/public/template/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "empty",
+  "version": "1.0.0",
+  "description": "",
+  "main": "app.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@zeppos/device-types": "^1.0.0"
+  }
+}

package/public/template/timer/app.js

@@ -3,8 +3,5 @@ import './shared/device-polyfill'
 App({
   globalData: {},
   onCreate(options) {},
-  onDestroy(options) {},
-  onError(error) {},
-  onPageNotFound(obj) {},
-  onUnhandledRejection(obj) {},
+  onDestroy(options) {}
 })

package/public/template/timer/watchface/round/index.js

@@ -432,7 +432,7 @@ WatchFace({
     this.init_view()
   },
 
-  onDestory() {
-    logger.log('index page.js on destory invoke')
+  onDestroy() {
+    logger.log('index page.js on destroy invoke')
   },
 })

package/utils/login.js

@@ -0,0 +1,126 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+exports.getUserInfo = exports.loginByLocal = void 0;
+var axios_1 = __importDefault(require("axios"));
+var lodash_1 = __importDefault(require("lodash"));
+var qs_1 = __importDefault(require("qs"));
+var project_1 = require("../config/project");
+var REGISTER_TEST_URL = 'https://api-mifit-staging.huami.com';
+var REGISTER_PRO_URL = 'https://api-user.huami.com';
+var CUR_REGISTER_URL = project_1.ACCOUNT_ENV === 'test' ? REGISTER_TEST_URL : REGISTER_PRO_URL;
+var LOGIN_URL = 'https://account.huami.com';
+var postForm = function (url, data) {
+    return (0, axios_1["default"])({
+        method: 'POST',
+        headers: {
+            'content-type': 'application/x-www-form-urlencoded'
+        },
+        data: qs_1["default"].stringify(data),
+        url: url
+    });
+};
+var loginByLocal = function (account, password) { return __awaiter(void 0, void 0, void 0, function () {
+    var data, checkInfo, loginInfo;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                data = {
+                    client_id: 'HuaMi',
+                    country_code: 'zh-CN',
+                    json_response: 'true',
+                    name: '',
+                    password: password,
+                    phoneOrEmail: account,
+                    redirect_uri: 'https://s3-us-west-2.amazonaws.com/hm-registration/successsignin.html',
+                    state: 'REDIRECTION',
+                    token: 'access'
+                };
+                if (/^[1][0-9]{10}$/.test(account)) {
+                    data.phoneOrEmail = encodeURIComponent("+86".concat(account));
+                }
+                data.name = data.phoneOrEmail.split('@')[0];
+                return [4 /*yield*/, postForm("".concat(CUR_REGISTER_URL, "/registrations/").concat(data.phoneOrEmail, "/tokens"), data)];
+            case 1:
+                checkInfo = _a.sent();
+                return [4 /*yield*/, postForm("".concat(LOGIN_URL, "/v2/client/login"), {
+                        app_name: 'com.huami.webapp',
+                        app_version: '4.3.0',
+                        code: lodash_1["default"].get(checkInfo, 'data.access', ''),
+                        country_code: 'zh-cn',
+                        device_id: '02:00:00:00:00:00',
+                        device_model: 'web',
+                        grant_type: 'access_token',
+                        third_name: 'huami'
+                    })];
+            case 2:
+                loginInfo = (_a.sent()).data;
+                return [2 /*return*/, loginInfo];
+        }
+    });
+}); };
+exports.loginByLocal = loginByLocal;
+var getUserInfo = function (host, userid, apptoken) { return __awaiter(void 0, void 0, void 0, function () {
+    var userInfo, data, error_1;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, axios_1["default"].get("https://".concat(host, "/v1/soc/user/").concat(userid), {
+                        headers: {
+                            app_token: apptoken,
+                            'Content-Type': 'application/json',
+                            user_id: userid,
+                            app_name: 'com.huami.webapp'
+                        }
+                    })];
+            case 1:
+                userInfo = _a.sent();
+                data = userInfo.data.data;
+                return [2 /*return*/, data];
+            case 2:
+                error_1 = _a.sent();
+                return [3 /*break*/, 3];
+            case 3: return [2 /*return*/];
+        }
+    });
+}); };
+exports.getUserInfo = getUserInfo;