@zeppos/zeus-cli 1.0.6 → 1.0.16

package/bin/cli.js

@@ -19,10 +19,13 @@ yargs_1["default"].usage('Usage: $0 <command> [args?]')
     .alias('v', 'version')
     .command('init', 'init a new project in current directory', proxy, index_1.create)
     .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)
-    .command('build', 'build this project for production', proxy, index_1.build)
+    // @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)
     .fail(index_1.help)
     .argv;

package/config/device.js

@@ -1,7 +1,7 @@
 "use strict";
-var _a;
+var _a, _b;
 exports.__esModule = true;
-exports.deviceTargets = exports.DeviceScreenType = exports.DeviceSource = exports.DevicePlatformName = exports.DeviceTarget = void 0;
+exports.deviceInternalCodename = exports.deviceTargets = exports.DeviceScreenType = exports.DeviceSource = exports.DevicePlatformName = exports.DeviceTarget = void 0;
 var DeviceTarget;
 (function (DeviceTarget) {
     DeviceTarget["MADRID"] = "madrid";
@@ -87,3 +87,11 @@ exports.deviceTargets = (_a = {},
         }
     },
     _a);
+exports.deviceInternalCodename = (_b = {},
+    _b[DeviceSource.MADRID] = DeviceTarget.MADRID,
+    _b[DeviceSource.MADRIDW] = DeviceTarget.MADRID,
+    _b[DeviceSource.VERONA] = DeviceTarget.VERONA,
+    _b[DeviceSource.VERONAW] = DeviceTarget.VERONA,
+    _b[DeviceSource.ZURICH] = DeviceTarget.ZURICH,
+    _b[DeviceSource.ZURICHW] = DeviceTarget.ZURICH,
+    _b);

package/config/project.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 exports.__esModule = true;
-exports.TemplateCopyType = exports.AppSourceType = exports.AppType = void 0;
+exports.loginStorageKey = exports.loginConfig = exports.LocalServerConfig = exports.TemplateCopyType = exports.AppSourceType = exports.AppType = void 0;
+var lodash_1 = __importDefault(require("lodash"));
 var AppType;
 (function (AppType) {
     AppType["APP"] = "app";
@@ -16,3 +20,21 @@ 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.loginConfig = {
+    LOGIN_URL: loginURL,
+    PROJECT_NAME: 'zeppos_zeus_cli',
+    PLATFORM_APP: 'com.huami.watch.hmwatchmanager',
+    PROJECT_REDIRECT_URI: encodeURIComponent("http://" + LocalServerConfig.HOSTNAME + ":" + LocalServerConfig.PORT + "/")
+};
+exports.loginStorageKey = {
+    accountToken: accountPrefix + "token",
+    account: accountPrefix + "account"
+};

package/modules/build.js

@@ -69,23 +69,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.buildPreview = exports.buildDev = exports.build = exports.chooseBuildPackages = exports.BuildMode = void 0;
+exports.buildPreview = exports.buildProd = exports.buildDev = exports.build = exports.chooseBuildPackages = exports.BuildMode = void 0;
 // @ts-ignore
 var node_js_1 = require("@zeppos/zpm/lib/node.js");
-var os_1 = __importDefault(require("os"));
 var fs_1 = __importDefault(require("fs"));
+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 path_1 = require("path");
 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 md5_1 = require("../utils/md5");
 var logger = __importStar(require("../utils/logger"));
+var storage_1 = require("./storage");
+var project_1 = require("../config/project");
 var STUDIO_URL = 'https://studio.huami.com';
 var BuildMode;
 (function (BuildMode) {
@@ -99,7 +99,7 @@ function chooseBuildPackages() {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    appJson = fs_extra_1["default"].readJSONSync((0, path_1.resolve)('./app.json'));
+                    appJson = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'));
                     return [4 /*yield*/, inquirer_1["default"].prompt([
                             {
                                 name: 'target',
@@ -120,19 +120,11 @@ 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 buildTempDir, choosedPackages, buildOptions, buildInfo, distPath;
+        var workspace, choosedPackages, buildOptions, buildInfo_1, DistDir_1, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    buildTempDir = '';
-                    try {
-                        buildTempDir = path.join(os_1["default"].tmpdir(), "zepp-" + (0, md5_1.md5)(path.resolve('./')));
-                        fs_extra_1["default"].copySync('./', buildTempDir);
-                    }
-                    catch (err) {
-                        logger.error('failed to copy project to temp dir');
-                        logger.log(err);
-                    }
+                    workspace = path.resolve('./');
                     if (!(mode === BuildMode.PROD)) return [3 /*break*/, 1];
                     packages.length = 0;
                     return [3 /*break*/, 3];
@@ -149,7 +141,7 @@ var build = function (mode, packages) {
                     _a.label = 3;
                 case 3:
                     buildOptions = {
-                        path: buildTempDir,
+                        path: workspace,
                         targets: packages,
                         buildMode: mode,
                         jsc: '' // 不开启 js => c
@@ -157,16 +149,32 @@ var build = function (mode, packages) {
                     if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
                         buildOptions.png2vg = true;
                     }
-                    return [4 /*yield*/, (0, node_js_1.start)(buildOptions)];
+                    _a.label = 4;
                 case 4:
-                    buildInfo = _a.sent();
-                    if (buildInfo) {
-                        distPath = path.join('./', 'dist');
-                        fs_extra_1["default"].emptyDirSync(distPath);
-                        fs_extra_1["default"].copySync(path.join(buildTempDir, 'dist'), distPath);
-                        fs_extra_1["default"].removeSync(buildTempDir);
+                    _a.trys.push([4, 9, , 10]);
+                    if (!(mode === BuildMode.DEV)) return [3 /*break*/, 6];
+                    return [4 /*yield*/, (0, node_js_1.startWithoutDist)(buildOptions)];
+                case 5:
+                    _a.sent();
+                    return [2 /*return*/, (0, node_js_1.getZpkBuf)(packages[0])];
+                case 6: return [4 /*yield*/, (0, node_js_1.start)(buildOptions)];
+                case 7:
+                    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_1)) {
+                                fs_extra_1["default"].removeSync(file);
+                            }
+                        });
                     }
-                    return [2 /*return*/, buildInfo];
+                    return [2 /*return*/, buildInfo_1];
+                case 8: return [3 /*break*/, 10];
+                case 9:
+                    error_1 = _a.sent();
+                    logger.error(error_1);
+                    return [3 /*break*/, 10];
+                case 10: return [2 /*return*/];
             }
         });
     });
@@ -176,11 +184,29 @@ 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);
+};
+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 userToken, form, buildInfo;
+    var storage, isWatchFaceProject, userToken, form, buildInfo;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, login_1.login)(args)];
+            case 0:
+                storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
+                isWatchFaceProject = checkIsWatchFaceProject();
+                // TODO: preview 支持打包表盘
+                if (isWatchFaceProject) {
+                    logger.info('coming soon');
+                    return [2 /*return*/];
+                }
+                return [4 /*yield*/, (0, login_1.login)(args)];
             case 1:
                 userToken = _a.sent();
                 form = new form_data_1["default"]();

package/modules/config.js

@@ -64,7 +64,7 @@ var chalk_1 = __importDefault(require("chalk"));
 var storage_1 = require("./storage");
 var logger = __importStar(require("../utils/logger"));
 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);
@@ -79,26 +79,69 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
             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: " + chalk_1["default"].yellow("zeus config " + method + " <key>"));
+        };
         switch (method) {
-            case 'set':
+            case 'set': {
+                if (!values.length) {
+                    logger.error("Please enter the data in the format: " + 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 {
+                        storage.set(key, value);
+                        logger.success("config: " + key + "=" + 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(curKey + "=" + 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: " + curKey + " deleted");
+                    }
                 });
                 break;
-            case 'list':
+            }
+            case 'list': {
                 config_1 = storage.getAll();
                 Object.keys(config_1).forEach(function (key) {
                     if (lodash_1["default"].startsWith(key, '____')) {
@@ -114,6 +157,7 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
                     });
                 }
                 break;
+            }
             default:
                 break;
         }

package/modules/create/index.js

@@ -97,7 +97,7 @@ var sleep_1 = require("../../utils/sleep");
 var yeoman_environment_1 = __importDefault(require("yeoman-environment"));
 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, env, generagtorMate, generagtorMateKeys, answer, choosedPkg;
+    var _a, cmd, projectName, cwdPath, workDir, beforeFiles, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generagtorMate, generagtorMateKeys, answer, choosePkg;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -125,6 +125,8 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 }
                 localTemplates = (0, fs_1.readdirSync)(TEMPLATE_DIR);
                 localChoices = [];
+                watchfaceTemplateChoices = [];
+                appTemplateChoices = [];
                 if (!lodash_1["default"].isEmpty(localTemplates)) {
                     localTemplates.forEach(function (dirName) {
                         var dirPath = TEMPLATE_DIR + "/" + dirName;
@@ -139,8 +141,20 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                                 localChoices.unshift(Object.assign(chooseItem, {
                                     copyType: project_1.TemplateCopyType.EDIT
                                 }));
+                                watchfaceTemplateChoices.unshift(Object.assign(chooseItem, {
+                                    copyType: project_1.TemplateCopyType.EDIT
+                                }));
+                                appTemplateChoices.unshift(Object.assign(chooseItem, {
+                                    copyType: project_1.TemplateCopyType.EDIT
+                                }));
                             }
                             else {
+                                if (dirName === 'hello-world') {
+                                    appTemplateChoices.push(chooseItem);
+                                }
+                                if (dirName === 'timer') {
+                                    watchfaceTemplateChoices.push(chooseItem);
+                                }
                                 localChoices.push(chooseItem);
                             }
                         }
@@ -161,34 +175,58 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                                 name: name,
                                 type: project_1.AppSourceType.YEOMAN
                             });
+                            appTemplateChoices.push({
+                                name: name,
+                                type: project_1.AppSourceType.YEOMAN
+                            });
+                            watchfaceTemplateChoices.push({
+                                name: name,
+                                type: project_1.AppSourceType.YEOMAN
+                            });
                         }
                     });
                 }
                 localChoices.map(function (val, index) {
                     val.value = index;
                 });
+                appTemplateChoices.map(function (val, index) {
+                    val.value = index;
+                });
+                watchfaceTemplateChoices.map(function (val, index) {
+                    val.value = index;
+                });
                 return [4 /*yield*/, inquirer_1["default"].prompt([
+                        {
+                            name: 'appType',
+                            type: 'list',
+                            message: 'What type of application do you want to create?',
+                            choices: Object.keys(project_1.AppType)
+                        },
                         {
                             name: 'template',
                             type: 'list',
+                            when: function (args) { return args.appType.toLowerCase() === project_1.AppType.APP; },
                             message: 'Which template do you want to use?',
                             choices: __spreadArray([
                                 new inquirer_1["default"].Separator(),
                                 new inquirer_1["default"].Separator('Choose a template')
-                            ], localChoices, true)
+                            ], appTemplateChoices, true)
+                        },
+                        {
+                            name: 'template',
+                            type: 'list',
+                            when: function (args) { return args.appType.toLowerCase() === project_1.AppType.WATCHFACE; },
+                            message: 'Which template do you want to use?',
+                            choices: __spreadArray([
+                                new inquirer_1["default"].Separator(),
+                                new inquirer_1["default"].Separator('Choose a template')
+                            ], watchfaceTemplateChoices, true)
                         },
-                        // {
-                        //   name: 'appType',
-                        //   type: 'list',
-                        //   when: (args) => args.template === 0,
-                        //   message: 'What type of application should be created?',
-                        //   choices: Object.keys(AppType)
-                        // },
                         {
                             name: 'withAppSide',
                             type: 'confirm',
                             // when: (args) => !!args.appType,
-                            when: function (args) { return args.template === 0; },
+                            when: function (args) { return args.template === 0 && args.appType.toLowerCase() === project_1.AppType.APP; },
                             message: 'Should this application contain a app-side component?'
                         },
                         {
@@ -204,7 +242,8 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                             when: function (args) { return args.template === 0; },
                             choices: Object.keys(device_1.deviceTargets).map(function (platform) { return ({
                                 name: device_1.deviceTargets[platform].deviceName,
-                                value: platform
+                                value: platform,
+                                checked: platform === Object.keys(device_1.deviceTargets)[0]
                             }); }),
                             "default": Object.keys(device_1.deviceTargets)[0],
                             message: 'Which platforms of this application should be built?'
@@ -214,18 +253,18 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 answer = _b.sent();
                 answer.appType = answer.appType || project_1.AppType.APP;
                 answer.workDir = workDir;
-                choosedPkg = localChoices[answer.template];
+                choosePkg = answer.appType.toLowerCase() === project_1.AppType.APP ? appTemplateChoices[answer.template] : watchfaceTemplateChoices[answer.template];
                 logger.info('fetching template...');
                 return [4 /*yield*/, (0, sleep_1.sleep)(100)];
             case 2:
                 _b.sent();
-                if (choosedPkg.type === project_1.AppSourceType.YEOMAN) {
-                    logger.info(lodash_1["default"].upperFirst(cmd) + " application using yeoman template \"" + choosedPkg.name + "\".");
-                    (0, yeoman_app_1.createYeomanApp)(__assign(__assign({}, answer), { env: env, templateInfo: generagtorMate[choosedPkg.name] }));
+                if (choosePkg.type === project_1.AppSourceType.YEOMAN) {
+                    logger.info(lodash_1["default"].upperFirst(cmd) + " application using yeoman template \"" + choosePkg.name + "\".");
+                    (0, yeoman_app_1.createYeomanApp)(__assign(__assign({}, answer), { env: env, templateInfo: generagtorMate[choosePkg.name] }));
                 }
                 else {
-                    logger.info(lodash_1["default"].upperFirst(cmd) + " application using local template \"" + choosedPkg.name + "\".");
-                    (0, local_app_1.createLocalApp)(__assign(__assign({}, answer), { templateInfo: localChoices[answer.template] }));
+                    logger.info(lodash_1["default"].upperFirst(cmd) + " application using local template \"" + choosePkg.name + "\".");
+                    (0, local_app_1.createLocalApp)(__assign(__assign({}, answer), { templateInfo: choosePkg }));
                 }
                 logger.log('\n');
                 return [4 /*yield*/, (0, sleep_1.sleep)(50)];
@@ -246,7 +285,7 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                     }
                 });
                 logger.log('\n');
-                logger.success("project created successfully by \"" + choosedPkg.name + "\" template.\n");
+                logger.success("project created successfully by \"" + choosePkg.name + "\" template.\n");
                 return [4 /*yield*/, (0, sleep_1.sleep)(300)];
             case 4:
                 _b.sent();

package/modules/create/local-app.js

@@ -57,18 +57,42 @@ var path_1 = require("path");
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var project_1 = require("../../config/project");
 var device_1 = require("../../config/device");
+// 生成模板项目
 var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appJsonPath, appJson, defaultTarget, targets, defaultAssetsPath_1;
+    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
     return __generator(this, function (_a) {
-        workDir = args.workDir, templateInfo = args.templateInfo, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets;
+        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);
+        appJsonPath = (0, path_1.resolve)(workDir, './app.json');
+        appJson = fs_extra_1["default"].readJsonSync(appJsonPath);
+        appID = Math.floor(Math.random() * 10001) + 20000;
+        lodash_1["default"].set(appJson, 'app.appId', appID);
         if (templateInfo.copyType !== project_1.TemplateCopyType.EDIT) {
+            fs_extra_1["default"].writeJson(appJsonPath, appJson, {
+                spaces: 2,
+                EOL: os_1["default"].EOL
+            });
             return [2 /*return*/];
         }
-        appJsonPath = (0, path_1.resolve)(workDir, './app.json');
-        appJson = fs_extra_1["default"].readJsonSync(appJsonPath);
         defaultTarget = lodash_1["default"].get(appJson, 'targets.default');
         targets = {};
+        if (appType.toLowerCase() === project_1.AppType.WATCHFACE) {
+            defaultWatchFaceConfig = {
+                "path": "watchface/index",
+                "main": 1,
+                "editable": 0,
+                "lockscreen": 0,
+                "photoscreen": 0
+            };
+            lodash_1["default"].set(appJson, 'app.appType', project_1.AppType.WATCHFACE);
+            lodash_1["default"].set(appJson, 'app.description', 'empty watchface');
+            lodash_1["default"].unset(defaultTarget, 'module.page');
+            lodash_1["default"].set(defaultTarget, 'module.watchface', defaultWatchFaceConfig);
+            fs_extra_1["default"].remove((0, path_1.resolve)(workDir, './pages'));
+        }
+        else {
+            fs_extra_1["default"].remove((0, path_1.resolve)(workDir, './watchface'));
+        }
         if (!withAppSide) {
             lodash_1["default"].unset(defaultTarget, 'module.app-side');
             fs_extra_1["default"].remove((0, path_1.resolve)(workDir, './app-side'));

package/modules/help.js

@@ -73,6 +73,7 @@ var help = function () { return __awaiter(void 0, void 0, void 0, function () {
         logger.log(cmd + " init            init a new project in current directory");
         logger.log(cmd + " create <foo>    add the <foo> project to current directory");
         logger.log(cmd + " login           login to your account");
+        logger.log(cmd + " logout          Sign out of your account");
         logger.log(cmd + " dev             run this project in development mode");
         logger.log(cmd + " preview         preview this project in your device");
         logger.log(cmd + " build           build this project for production");

package/modules/login.js

@@ -58,14 +58,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.login = void 0;
+exports.logout = exports.login = void 0;
 var qs_1 = __importDefault(require("qs"));
-var url_1 = require("url");
 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 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) {
@@ -118,23 +122,20 @@ var loginByLocal = function (account, password) { return __awaiter(void 0, void
     });
 }); };
 var login = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var loginUrl, storage, accountPrefix, accountTokenKey, accountKey, accountInfo, historyToken, answer, loginInfo, token;
+    var storage, accountInfo, historyToken, isLocal, answer, loginInfo, token_1, token;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                loginUrl = new url_1.URL(LOGIN_URL);
                 storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
-                accountPrefix = "____" + lodash_1["default"].replace(loginUrl.host, /\./g, '_') + "__";
-                accountTokenKey = accountPrefix + "token";
-                accountKey = accountPrefix + "account";
-                accountInfo = storage.get(accountKey);
-                if (!lodash_1["default"].get(args, 'relogin')) {
-                    historyToken = storage.get(accountTokenKey);
-                    if (historyToken) {
-                        logger.success("have logged in with account: " + accountInfo);
-                        return [2 /*return*/, historyToken];
-                    }
+                accountInfo = storage.get(project_1.loginStorageKey.account);
+                historyToken = storage.get(project_1.loginStorageKey.accountToken);
+                if (!lodash_1["default"].get(args, 'relogin') && historyToken) {
+                    // logger.success(`have logged in with account: ${accountInfo}`)
+                    logger.success("Has logged");
+                    return [2 /*return*/, historyToken];
                 }
+                isLocal = false;
+                if (!isLocal) return [3 /*break*/, 3];
                 return [4 /*yield*/, inquirer_1["default"].prompt([
                         {
                             name: 'account',
@@ -157,14 +158,57 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                     })];
             case 2:
                 loginInfo = _a.sent();
-                token = lodash_1["default"].get(loginInfo, 'token_info.app_token');
-                if (token) {
+                token_1 = lodash_1["default"].get(loginInfo, 'token_info.app_token');
+                if (token_1) {
                     logger.success("logged in with account: " + answer.account);
-                    storage.set(accountKey, answer.account);
-                    storage.set(accountTokenKey, token);
+                    storage.set(project_1.loginStorageKey.account, answer.account);
+                    storage.set(project_1.loginStorageKey.accountToken, token_1);
                 }
+                _a.label = 3;
+            case 3: return [4 /*yield*/, new Promise(function (resolve) { return __awaiter(void 0, void 0, void 0, function () {
+                    var server;
+                    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'];
+                                    res.statusCode = 200;
+                                    res.setHeader('Content-Type', 'text/plain');
+                                    res.end('Login is successful, please return to the operation interface manually');
+                                    if (appToken) {
+                                        resolve(appToken);
+                                        storage.set(project_1.loginStorageKey.accountToken, appToken);
+                                        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(project_1.loginConfig.LOGIN_URL + "?project_name=" + project_1.loginConfig.PROJECT_NAME + "&platform_app=" + project_1.loginConfig.PLATFORM_APP + "&project_redirect_uri=" + project_1.loginConfig.PROJECT_REDIRECT_URI)];
+                            case 1:
+                                // 打开浏览器的登录页面
+                                _a.sent();
+                                return [2 /*return*/];
+                        }
+                    });
+                }); })];
+            case 4:
+                token = _a.sent();
                 return [2 /*return*/, token];
         }
     });
 }); };
 exports.login = login;
+var logout = function () {
+    var storage = new storage_1.Storage({ cmd: '' });
+    storage["delete"](project_1.loginStorageKey.accountToken);
+    storage["delete"](project_1.loginStorageKey.account);
+    logger.success('Logged out');
+};
+exports.logout = logout;