@zeppos/zeus-cli 1.0.10 → 1.0.24

package/bin/cli.js

@@ -21,9 +21,12 @@ yargs_1["default"].usage('Usage: $0 <command> [args?]')
     .command('create', 'add a new project to current directory', proxy, index_1.create)
     // @ts-ignore
     .command('login', 'login to your account', proxy, index_1.login)
+    .command('logout', 'Sign out of your account', proxy, index_1.logout)
     .command('dev', 'run this project in development mode', proxy, index_1.run)
     .command('preview', 'preview this project in your device', proxy, index_1.buildPreview)
+    // @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,21 +21,22 @@ 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);
-var accountPrefix = "____" + lodash_1["default"].replace(loginUrl.host, /\./g, '_') + "__";
+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://" + LocalServerConfig.HOSTNAME + ":" + LocalServerConfig.PORT + "/")
+    PLATFORM_APP: 'com.huami.watch.hmwatchmanager'
 };
 exports.loginStorageKey = {
-    accountToken: accountPrefix + "token",
-    account: accountPrefix + "account"
+    accountToken: "".concat(accountPrefix, "token"),
+    account: "".concat(accountPrefix, "account"),
+    userid: "".concat(accountPrefix, "userid"),
+    cname: "".concat(accountPrefix, "cname")
 };

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

@@ -77,39 +77,83 @@ 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"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var login_1 = require("./login");
 var logger = __importStar(require("../utils/logger"));
-var storage_1 = require("./storage");
-var STUDIO_URL = 'https://studio.huami.com';
+var project_1 = require("../config/project");
+var chalk_1 = __importDefault(require("chalk"));
 var BuildMode;
 (function (BuildMode) {
     BuildMode["DEV"] = "development";
     BuildMode["PREVIEW"] = "preview";
     BuildMode["PROD"] = "production";
 })(BuildMode = exports.BuildMode || (exports.BuildMode = {}));
-function chooseBuildPackages() {
+var TransformType;
+(function (TransformType) {
+    TransformType["Default"] = "";
+    TransformType["Js"] = "js";
+    TransformType["C"] = "c";
+    TransformType["Bin"] = "bin";
+})(TransformType || (TransformType = {}));
+function handleExecCommandInErrorDir(mode) {
+    var curCommand = 'dev';
+    if (mode === BuildMode.PROD) {
+        curCommand = 'build';
+    }
+    else if (mode === BuildMode.PREVIEW) {
+        curCommand = 'preview';
+    }
+    logger.warn("The command ".concat(chalk_1["default"].yellow("zeus ".concat(curCommand)), " needs to be executed in the root of the project"));
+    process.exit(1);
+}
+function chooseBuildPackages(mode) {
     return __awaiter(this, void 0, void 0, function () {
-        var appJson, answers;
+        var appJson, targets, answers;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    appJson = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'));
-                    return [4 /*yield*/, inquirer_1["default"].prompt([
-                            {
-                                name: 'target',
-                                type: 'list',
-                                message: 'Which target would you like to build?',
-                                choices: Object.keys(lodash_1["default"].get(appJson, 'targets', {}))
-                            }
-                        ])];
+                    if (!mode) {
+                        mode = 'development';
+                    }
+                    appJson = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
+                    if (!appJson) {
+                        handleExecCommandInErrorDir(mode);
+                    }
+                    targets = Object.keys(lodash_1["default"].get(appJson, 'targets', {}));
+                    if (!!targets.length) return [3 /*break*/, 1];
+                    logger.error('please set at least one package');
+                    process.exit(1);
+                    return [3 /*break*/, 4];
                 case 1:
+                    if (!(targets.length === 1)) return [3 /*break*/, 2];
+                    return [2 /*return*/, [targets[0]]];
+                case 2: return [4 /*yield*/, inquirer_1["default"].prompt([
+                        {
+                            name: 'target',
+                            type: 'list',
+                            when: function () { return mode !== BuildMode.PROD; },
+                            message: 'Which target would you like to build?',
+                            choices: targets
+                        },
+                        {
+                            name: 'buildTargets',
+                            type: 'checkbox',
+                            when: function () { return mode === BuildMode.PROD; },
+                            choices: targets.map(function (item) { return ({
+                                name: item,
+                                value: item,
+                                checked: true
+                            }); }),
+                            message: 'Which targets would you like to build?'
+                        }
+                    ])];
+                case 3:
                     answers = _a.sent();
-                    return [2 /*return*/, [answers.target]];
+                    return [2 /*return*/, mode !== BuildMode.PROD ? [answers.target] : answers.buildTargets];
+                case 4: return [2 /*return*/];
             }
         });
     });
@@ -119,47 +163,61 @@ var build = function (mode, packages) {
     if (mode === void 0) { mode = BuildMode.PROD; }
     if (packages === void 0) { packages = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var workspace, choosedPackages, buildOptions, buildInfo, DistDir_1;
+        var workspace, choosePackages, buildOptions, buildInfo_1, DistDir_1, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     workspace = path.resolve('./');
-                    if (!(mode === BuildMode.PROD)) return [3 /*break*/, 1];
-                    packages.length = 0;
-                    return [3 /*break*/, 3];
+                    if (!!packages.length) return [3 /*break*/, 2];
+                    return [4 /*yield*/, chooseBuildPackages(mode)];
                 case 1:
-                    if (!!packages.length) return [3 /*break*/, 3];
-                    return [4 /*yield*/, chooseBuildPackages()];
-                case 2:
-                    choosedPackages = _a.sent();
-                    if (!choosedPackages || !choosedPackages.length) {
+                    choosePackages = _a.sent();
+                    if (!choosePackages || !choosePackages.length) {
                         logger.error('please choose at least one package');
                         return [2 /*return*/];
                     }
-                    packages.push.apply(packages, choosedPackages);
-                    _a.label = 3;
-                case 3:
+                    packages.push.apply(packages, choosePackages);
+                    _a.label = 2;
+                case 2:
                     buildOptions = {
                         path: workspace,
                         targets: packages,
                         buildMode: mode,
-                        jsc: '' // 不开启 js => c
+                        jsc: TransformType.Default // 不开启 js => c
                     };
                     if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
-                        buildOptions.png2vg = true;
+                        Object.assign(buildOptions, {
+                            png2vg: true,
+                            jsc: TransformType.C,
+                            prune: true // js转成bin之后删除js脚本（开启转 bin 之后，需要在 win 上 preview 验证一下转 C 是否正常）
+                        });
                     }
-                    return [4 /*yield*/, (0, node_js_1.start)(buildOptions)];
+                    _a.label = 3;
+                case 3:
+                    _a.trys.push([3, 8, , 9]);
+                    if (!(mode === BuildMode.DEV)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, (0, node_js_1.startWithoutDist)(buildOptions)];
                 case 4:
-                    buildInfo = _a.sent();
-                    if (buildInfo) {
+                    _a.sent();
+                    return [2 /*return*/, (0, node_js_1.getZpkBuf)(packages[0])];
+                case 5: return [4 /*yield*/, (0, node_js_1.start)(buildOptions)];
+                case 6:
+                    buildInfo_1 = _a.sent();
+                    if (buildInfo_1) {
                         DistDir_1 = path.join(workspace, 'dist');
                         rd.eachFileSync(DistDir_1, function (file) {
-                            if (file !== path.join(DistDir_1, buildInfo)) {
+                            if (file !== path.join(DistDir_1, buildInfo_1)) {
                                 fs_extra_1["default"].removeSync(file);
                             }
                         });
                     }
-                    return [2 /*return*/, buildInfo];
+                    return [2 /*return*/, buildInfo_1];
+                case 7: return [3 /*break*/, 9];
+                case 8:
+                    error_1 = _a.sent();
+                    logger.error(error_1);
+                    return [3 /*break*/, 9];
+                case 9: return [2 /*return*/];
             }
         });
     });
@@ -169,28 +227,34 @@ var buildDev = function (packages) {
     return (0, exports.build)(BuildMode.DEV, packages);
 };
 exports.buildDev = buildDev;
-var buildProd = function (packages) {
-    return (0, exports.build)(BuildMode.PROD, packages);
+var buildProd = function () {
+    return (0, exports.build)(BuildMode.PROD, []);
 };
 exports.buildProd = buildProd;
+var checkIsWatchFaceProject = function () {
+    var appJsonPath = path.resolve('./app.json');
+    var appJsonContent = fs_extra_1["default"].readJsonSync(appJsonPath);
+    var appType = lodash_1["default"].get(appJsonContent, 'app.appType');
+    return appType === project_1.AppType.WATCHFACE;
+};
 var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var storage, userToken, form, buildInfo;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
-                return [4 /*yield*/, (0, login_1.login)(args)];
+    var _a, apptoken, userid, cname, form, buildInfo, isWatchFaceProject;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: 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();
+                isWatchFaceProject = checkIsWatchFaceProject();
                 logger.info('getting preview package...');
-                form.append('uploadFile', fs_1["default"].createReadStream("./dist/" + buildInfo));
+                form.append('file', fs_1["default"].createReadStream("./dist/".concat(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:
@@ -199,15 +263,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://".concat(host, "/custom/tools/app-dial/upload?userid=").concat(userid), form, {
+                                        headers: __assign(__assign({}, form.getHeaders()), { 'content-length': "".concat(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("".concat(protocol, "://").concat(host, "/custom/tools/app-dial/download/").concat(code), { small: true });
                                     logger.success('please use Zepp APP to scan the qrcode below to preview your app.');
                                 }
                                 else {

package/modules/config.js

@@ -63,42 +63,90 @@ 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, config_1;
+    var cmd, _a, space, _b, method, values, allowedMethods, storage, commonHandleNotKeyTips, config_1;
     return __generator(this, function (_c) {
         cmd = lodash_1["default"].get(args, '$0');
         _a = lodash_1["default"].get(args, '_', []), space = _a[0], _b = _a[1], method = _b === void 0 ? '' : _b, values = _a.slice(2);
         allowedMethods = ['get', 'set', 'delete', 'list'];
         if (!lodash_1["default"].includes(allowedMethods, method)) {
-            logger.error("invalid method: " + method);
+            logger.error("invalid method: ".concat(method));
             logger.log(chalk_1["default"].yellow('try to use one of the following:'));
-            logger.log("- " + cmd + " " + space + " set <key>=<value> [<key>=<value> ...]");
-            logger.log("- " + cmd + " " + space + " get <key> [<key> ...]");
-            logger.log("- " + cmd + " " + space + " delete <key> [<key> ...]");
-            logger.log("- " + cmd + " " + space + " list [--json]");
+            logger.log("- ".concat(cmd, " ").concat(space, " set <key>=<value> [<key>=<value> ...]"));
+            logger.log("- ".concat(cmd, " ").concat(space, " get <key> [<key> ...]"));
+            logger.log("- ".concat(cmd, " ").concat(space, " delete <key> [<key> ...]"));
+            logger.log("- ".concat(cmd, " ").concat(space, " list [--json]"));
             process.exit(1);
         }
         storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
+        commonHandleNotKeyTips = function (method) {
+            logger.error("Please enter the data in the format: ".concat(chalk_1["default"].yellow("zeus config ".concat(method, " <key>"))));
+        };
         switch (method) {
-            case 'set':
+            case 'set': {
+                if (!values.length) {
+                    logger.error("Please enter the data in the format: ".concat(chalk_1["default"].yellow('zeus config set <key>=<value>')));
+                    break;
+                }
                 values.forEach(function (info) {
-                    var _a = info.split('='), key = _a[0], value = _a[1];
-                    storage.set(key, value);
-                    logger.info("config: " + key + "=" + value);
+                    var _a = info.split('='), _b = _a[0], key = _b === void 0 ? '' : _b, _c = _a[1], value = _c === void 0 ? '' : _c;
+                    key = key.trim();
+                    value = value.trim();
+                    if (!info.includes('=')) {
+                        logger.error('Please enter the data in the format <key>=<value>');
+                    }
+                    else if (value === '') {
+                        logger.error('please input <value>');
+                    }
+                    else if (key === '') {
+                        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));
+                    }
                 });
                 break;
-            case 'get':
+            }
+            case 'get': {
+                if (!values.length) {
+                    commonHandleNotKeyTips('get');
+                    break;
+                }
                 values.forEach(function (key) {
-                    logger.log(key + "=" + storage.get(key));
+                    var curKey = key.trim();
+                    if (!storage.has(key) || !key) {
+                        logger.error('The <key> does not exist');
+                    }
+                    else {
+                        logger.log("".concat(curKey, "=").concat(storage.get(curKey)));
+                    }
                 });
                 break;
-            case 'delete':
+            }
+            case 'delete': {
+                if (!values.length) {
+                    commonHandleNotKeyTips('delete');
+                    break;
+                }
                 values.forEach(function (key) {
-                    storage["delete"](key);
-                    logger.info("config: " + key + " deleted");
+                    var curKey = key.trim();
+                    if (!storage.has(key) || !key) {
+                        logger.error('The <key> does not exist');
+                    }
+                    else {
+                        storage["delete"](curKey);
+                        logger.success("config: ".concat(curKey, " deleted"));
+                    }
                 });
                 break;
-            case 'list':
+            }
+            case 'list': {
                 config_1 = storage.getAll();
                 Object.keys(config_1).forEach(function (key) {
                     if (lodash_1["default"].startsWith(key, '____')) {
@@ -110,10 +158,11 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
                 }
                 else {
                     Object.keys(config_1).forEach(function (key) {
-                        logger.log(key + "=" + config_1[key]);
+                        logger.log("".concat(key, "=").concat(config_1[key]));
                     });
                 }
                 break;
+            }
             default:
                 break;
         }