@zeppos/zeus-cli 1.1.1 → 1.1.2

package/modules/create/index.js

@@ -12,7 +12,11 @@ var __assign = (this && this.__assign) || function () {
 };
 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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -87,6 +91,7 @@ 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 shell = require('shelljs');
 var local_app_1 = require("./local-app");
 var yeoman_app_1 = require("./yeoman-app");
 var project_1 = require("../../config/project");
@@ -94,15 +99,14 @@ 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 hm_analytics_1 = require("../../utils/hm_analytics");
-var shell = require('shelljs');
+var hm_analytics_1 = require("../../utils/hm-analytics");
 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, beforeFiles, workDir, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generatorMate, generatorMateKeys, answer, choosePkg;
+    var cmd, _a, 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];
+                cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a;
                 cwdPath = (0, path_1.resolve)('./');
                 beforeFiles = [];
                 workDir = cwdPath;
@@ -171,7 +175,6 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 generatorMateKeys = Object.keys(generatorMate);
                 if (generatorMateKeys.length) {
                     if (localChoices.length) {
-                        // @ts-ignore
                         localChoices.push(new inquirer_1["default"].Separator());
                     }
                     generatorMateKeys.forEach(function (name) {
@@ -200,7 +203,7 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 watchfaceTemplateChoices.map(function (val, index) {
                     val.value = index;
                 });
-                return [4 /*yield*/, inquirer_1["default"].prompt([
+                return [4, inquirer_1["default"].prompt([
                         {
                             name: 'appType',
                             type: 'list',
@@ -230,7 +233,6 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                         {
                             name: 'withAppSide',
                             type: 'confirm',
-                            // when: (args) => !!args.appType,
                             when: function (args) { return args.template === 0 && args.appType.toLowerCase() === project_1.AppType.APP; },
                             message: 'Should this application contain a app-side component?'
                         },
@@ -243,7 +245,6 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                         {
                             name: 'buildTargets',
                             type: 'checkbox',
-                            // when: (args) => !!args.appType,
                             when: function (args) { return args.template === 0; },
                             choices: Object.keys(device_1.deviceTargets).map(function (platform) { return ({
                                 name: device_1.deviceTargets[platform].deviceName,
@@ -260,7 +261,7 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 answer.workDir = workDir;
                 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)];
+                return [4, (0, sleep_1.sleep)(100)];
             case 2:
                 _b.sent();
                 if (choosePkg.type === project_1.AppSourceType.YEOMAN) {
@@ -272,7 +273,7 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                     (0, local_app_1.createLocalApp)(__assign(__assign({}, answer), { templateInfo: choosePkg }));
                 }
                 logger.log('\n');
-                return [4 /*yield*/, (0, sleep_1.sleep)(50)];
+                return [4, (0, sleep_1.sleep)(50)];
             case 3:
                 _b.sent();
                 rd.eachFileSync(workDir, function (file) {
@@ -295,15 +296,15 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                     shell.cd("".concat(projectName));
                 }
                 shell.exec('npm install');
-                return [4 /*yield*/, (0, sleep_1.sleep)(300)];
+                return [4, (0, sleep_1.sleep)(300)];
             case 4:
                 _b.sent();
                 logger.log(chalk_1["default"].hex('#DB8C41')(font_icon_1["default"]));
-                return [4 /*yield*/, (0, sleep_1.sleep)(800)];
+                return [4, (0, sleep_1.sleep)(800)];
             case 5:
                 _b.sent();
                 logger.log('I\'m all done. Now you can start your application.');
-                return [2 /*return*/];
+                return [2];
         }
     });
 }); };

package/modules/create/local-app.js

@@ -58,7 +58,6 @@ 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");
-// 生成模板项目
 var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
     return __generator(this, function (_a) {
@@ -76,7 +75,7 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
                 spaces: 2,
                 EOL: os_1["default"].EOL
             });
-            return [2 /*return*/];
+            return [2];
         }
         defaultTarget = lodash_1["default"].get(appJson, 'targets.default');
         targets = {};
@@ -120,7 +119,7 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
                 EOL: os_1["default"].EOL
             });
         }
-        return [2 /*return*/];
+        return [2];
     });
 }); };
 exports.createLocalApp = createLocalApp;

package/modules/create/yeoman-app.js

@@ -67,7 +67,7 @@ var createYeomanApp = function (args) { return __awaiter(void 0, void 0, void 0,
         env = args.env, templateInfo = args.templateInfo;
         info = resolveGenerator(templateInfo);
         env.run(info.prettyName);
-        return [2 /*return*/];
+        return [2];
     });
 }); };
 exports.createYeomanApp = createYeomanApp;

package/modules/help.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -59,7 +63,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.help = void 0;
-var lodash_1 = __importDefault(require("lodash"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var path = __importStar(require("path"));
 var logger = __importStar(require("../utils/logger"));
@@ -67,7 +70,7 @@ var help = function () { return __awaiter(void 0, void 0, void 0, function () {
     var pkg, cmd;
     return __generator(this, function (_a) {
         pkg = fs_extra_1["default"].readJSONSync(path.resolve(__dirname, '../package.json'));
-        cmd = lodash_1["default"].get(Object.keys(pkg.bin || {}), '[0]', 'zeus');
+        cmd = process.env.CMD_NAME;
         logger.log("Usage: ".concat(cmd, " <command> [args?]"));
         logger.log('');
         logger.log("".concat(cmd, " init            init a new project in current directory"));
@@ -83,7 +86,7 @@ var help = function () { return __awaiter(void 0, void 0, void 0, function () {
         logger.log('');
         logger.log('');
         logger.log("".concat(cmd, "@").concat(pkg.version, " ").concat(path.resolve(__dirname, '../')));
-        return [2 /*return*/];
+        return [2];
     });
 }); };
 exports.help = help;

package/modules/login.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -59,147 +63,110 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.logout = exports.login = void 0;
-var open = require('open');
-var http = require('http');
-var url = require('url');
-var querystring = require('querystring');
+var open_1 = __importDefault(require("open"));
+var http_1 = __importDefault(require("http"));
+var url_1 = __importDefault(require("url"));
+var qs_1 = __importDefault(require("qs"));
+var lodash_1 = __importDefault(require("lodash"));
 var get_port_1 = __importDefault(require("get-port"));
-var index_1 = require("../api/index");
+var stoppable_1 = __importDefault(require("stoppable"));
 var storage_1 = require("./storage");
 var logger = __importStar(require("../utils/logger"));
 var project_1 = require("../config/project");
-var hm_analytics_1 = require("../utils/hm_analytics");
+var hm_analytics_1 = require("../utils/hm-analytics");
+var loginCallbackServer = function (cb) { return __awaiter(void 0, void 0, void 0, function () {
+    var callbackPath, port, server;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                callbackPath = '/login/callback';
+                return [4, (0, get_port_1["default"])()];
+            case 1:
+                port = _a.sent();
+                server = (0, stoppable_1["default"])(http_1["default"].createServer(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
+                    var reqUrl, query, appToken, userId, cname;
+                    return __generator(this, function (_a) {
+                        reqUrl = req.url || '';
+                        if (lodash_1["default"].startsWith(reqUrl, callbackPath)) {
+                            res.statusCode = 200;
+                            res.setHeader('Content-Type', 'text/html');
+                            res.end("<!DOCTYPE html>\n      <html>\n        <head> \n          <meta charset=\"utf-8\"> \n          <title>Login | Zepp Health</title>\n          <style>html,iframe,body,div{margin: 0;padding: 0;border: 0;outline: 0;font-size: 0;vertical-align: baseline;background: transparent;}</style>\n        </head> \n        <body>\n          <iframe src=\"https://upload-cdn.huami.com/tposts/4436118\" style=\"width: 100vw; height: 100vh;\"></iframe>\n        </body>\n      </html>");
+                            query = url_1["default"].parse(reqUrl, true).query;
+                            appToken = query.apptoken, userId = query.userid, cname = query.cname;
+                            cb && cb({
+                                appToken: appToken,
+                                userId: userId,
+                                cname: cname
+                            });
+                            server.stop();
+                        }
+                        return [2];
+                    });
+                }); }));
+                server.listen(port);
+                return [2, Promise.resolve("http://localhost:".concat(port).concat(callbackPath))];
+        }
+    });
+}); };
 var login = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, _c, apptoken, _d, _e, userid, _f, _g, cname, message, loginInfo;
+    var _a, _b, _c, apptoken, _d, _e, userid, _f, _g, cname, loginPromiseResolve, loginPromiseReject, loginPromise, loginCallbackUrl, error_1;
     return __generator(this, function (_h) {
-        _a = storage_1.instanceStorage.getStorage(), _b = project_1.loginStorageKey.accountToken, _c = _a[_b], apptoken = _c === void 0 ? '' : _c, _d = project_1.loginStorageKey.userid, _e = _a[_d], userid = _e === void 0 ? '' : _e, _f = project_1.loginStorageKey.cname, _g = _a[_f], cname = _g === void 0 ? '' : _g;
-        if (apptoken && userid && cname) {
-            message = project_1.ACCOUNT_ENV === 'production' ? "Have logged" : "test:Have logged with account:".concat(userid);
-            logger.success(message);
-            return [2 /*return*/, { apptoken: apptoken, userid: userid, cname: cname }];
-        }
-        loginInfo = function () { return __awaiter(void 0, void 0, void 0, function () {
-            var server, HOSTNAME, PORT, PROJECT_REDIRECT_URI, error_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        server = http.createServer(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-                            var arg, params, apptoken, userid, cname, userInfoHost, userInfoURL, _a, nickName, message;
-                            var _b;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0:
-                                        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 && cname)) return [3 /*break*/, 2];
-                                        userInfoHost = cname && cname.split(',').filter(function (h) { return h.indexOf('auth-') > -1; })[0];
-                                        userInfoURL = "https://".concat(userInfoHost, "/v2/developer/account/center");
-                                        return [4 /*yield*/, (0, index_1.getUserInfo)(userInfoURL, apptoken)];
-                                    case 1:
-                                        _a = (_c.sent()).userName, nickName = _a === void 0 ? '' : _a;
-                                        storage_1.globalStorage.set((_b = {},
-                                            _b[project_1.loginStorageKey.nickName] = nickName,
-                                            _b[project_1.loginStorageKey.userid] = userid,
-                                            _b[project_1.loginStorageKey.cname] = cname,
-                                            _b[project_1.loginStorageKey.accountToken] = apptoken,
-                                            _b));
-                                        message = project_1.ACCOUNT_ENV === 'production' ? 'Login success' : "test:Login success with account:".concat(userid);
-                                        logger.success(message);
-                                        server.close();
-                                        process.exit(0);
-                                        _c.label = 2;
-                                    case 2: 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);
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        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 3:
-                        _a.sent();
-                        logger.info('The login page has been opened in the default browser.');
-                        return [3 /*break*/, 5];
-                    case 4:
-                        error_1 = _a.sent();
-                        logger.error('Unknown error, the default browser failed to open the login page.');
-                        process.exit(1);
-                        return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
+        switch (_h.label) {
+            case 0:
+                _a = storage_1.instanceStorage.getStorage(), _b = project_1.loginStorageKey.accountToken, _c = _a[_b], apptoken = _c === void 0 ? '' : _c, _d = project_1.loginStorageKey.userid, _e = _a[_d], userid = _e === void 0 ? '' : _e, _f = project_1.loginStorageKey.cname, _g = _a[_f], cname = _g === void 0 ? '' : _g;
+                if (apptoken && userid && cname) {
+                    logger.success("Have logged");
+                    return [2, { apptoken: apptoken, userid: userid, cname: cname }];
                 }
-            });
-        }); };
-        (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_LOGIN_C');
-        loginInfo();
-        return [2 /*return*/];
+                loginPromise = new Promise(function (resolve, reject) {
+                    loginPromiseResolve = resolve;
+                    loginPromiseReject = reject;
+                });
+                return [4, loginCallbackServer(function (loginInfo) {
+                        var _a;
+                        var appToken = loginInfo.appToken, userId = loginInfo.userId, cname = loginInfo.cname;
+                        if (appToken && cname) {
+                            storage_1.globalStorage.set((_a = {},
+                                _a[project_1.loginStorageKey.accountToken] = appToken,
+                                _a[project_1.loginStorageKey.userid] = userId,
+                                _a[project_1.loginStorageKey.cname] = cname,
+                                _a));
+                            logger.success('Login success');
+                            loginPromiseResolve(loginInfo);
+                        }
+                        else {
+                            loginPromiseReject();
+                        }
+                    })];
+            case 1:
+                loginCallbackUrl = _h.sent();
+                _h.label = 2;
+            case 2:
+                _h.trys.push([2, 4, , 5]);
+                return [4, (0, open_1["default"])("".concat(project_1.loginConfig.LOGIN_URL, "?").concat(qs_1["default"].stringify({
+                        project_name: project_1.loginConfig.PROJECT_NAME,
+                        platform_app: project_1.loginConfig.PLATFORM_APP,
+                        project_redirect_uri: loginCallbackUrl
+                    })))];
+            case 3:
+                _h.sent();
+                logger.info('The login page has been opened in the default browser.');
+                return [3, 5];
+            case 4:
+                error_1 = _h.sent();
+                logger.error('Unknown error, the default browser failed to open the login page.');
+                process.exit(1);
+                return [3, 5];
+            case 5:
+                (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_LOGIN_C');
+                return [2, loginPromise];
+        }
     });
 }); };
 exports.login = login;
 var logout = function () {
     (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_LOGOUT_C');
     storage_1.globalStorage.deleteStorage('____login');
-    logger.success("".concat(project_1.ACCOUNT_ENV === 'production' ? '' : 'test: ', "Logged out"));
-    process.exit(0);
+    logger.success('Logged out');
 };
 exports.logout = logout;
-// const isLocal = false
-// if(isLocal) {
-//   const answer = await inquirer.prompt([
-//     {
-//       name: 'account',
-//       type: 'input',
-//       message: `Enter your account (Mobile/E-mail): ${accountInfo ? `(${accountInfo})` : ''}`
-//     },
-//     {
-//       name: 'password',
-//       type: 'password',
-//       message: 'Enter your password: ',
-//       mask: '*'
-//     }
-//   ])
-//   answer.account = answer.account || accountInfo
-//   const loginInfo = await loginByLocal(answer.account, answer.password).catch(() => {
-//     logger.error('logged in failed, please check your account and password')
-//     process.exit(1)
-//   })
-//   const token = _.get(loginInfo, 'token_info.app_token')
-//   if (token) {
-//     logger.success(`logged in with account: ${answer.account}`)
-//     storage.set(loginStorageKey.account, answer.account)
-//     storage.set(loginStorageKey.accountToken, token)
-//   }
-// }
-// export const callback = async ({ cname, apptoken, userid }: {cname: string, apptoken: string, userid: string}, fun: () => void) => {
-//   if(apptoken && cname) {
-//     const userInfoHost = cname && cname.split(',').filter((h: string) => h.indexOf('auth-') > -1)[0]
-//     const userInfoURL = `https://${userInfoHost}/v2/developer/account/center`
-//     const { userName: nickName = '' } = await getUserInfo(userInfoURL, apptoken)
-//     globalStorage.set({
-//       [loginStorageKey.nickName]: nickName,
-//       [loginStorageKey.userid]: userid,
-//       [loginStorageKey.cname]: cname,
-//       [loginStorageKey.accountToken]: apptoken
-//     })
-//     const message = ACCOUNT_ENV === 'production' ? 'Login success' : `test:Login success with account:${userid}`
-//     logger.success(message)
-//     if (fun) {
-//       // 暂时没有实现和调用
-//       await fun()
-//     } else {
-//       process.exit(0)
-//     }
-//   } else {
-//     console.log('cxa')
-//     process.exit(1)
-//   }
-// }

package/modules/run.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -64,6 +68,8 @@ var chalk_1 = __importDefault(require("chalk"));
 var path = __importStar(require("path"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var chokidar_1 = __importDefault(require("chokidar"));
+var fs_extra_1 = __importDefault(require("fs-extra"));
+var parse_gitignore_1 = __importDefault(require("parse-gitignore"));
 var logger = __importStar(require("../utils/logger"));
 var build_1 = require("./build");
 var storage_1 = require("./storage");
@@ -73,14 +79,14 @@ var project_1 = require("../config/project");
 exports.DEFAULT_HOST = '127.0.0.1';
 exports.DEFAULT_PORT = '7650';
 var run = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, simulatorHost, _c, _d, simulatorPort, answer, hasStarted, packages, simulatorWebSocketURL, simulator, refreshSimulator;
+    var _a, _b, simulatorHost, _c, _d, simulatorPort, answer, hasStarted, packages, simulatorWebSocketURL, simulator, refreshSimulator, gitignorePath, gitignore, ignored;
     var _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
                 _a = storage_1.instanceStorage.getStorage(), _b = project_1.simulatorStorageKey.simulatorHost, simulatorHost = _a[_b], _c = project_1.simulatorStorageKey.simulatorPort, _d = _a[_c], simulatorPort = _d === void 0 ? exports.DEFAULT_PORT : _d;
-                if (!!simulatorHost) return [3 /*break*/, 2];
-                return [4 /*yield*/, inquirer_1["default"].prompt([
+                if (!!simulatorHost) return [3, 2];
+                return [4, inquirer_1["default"].prompt([
                         {
                             name: 'host',
                             type: 'input',
@@ -101,7 +107,7 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                 _f.label = 2;
             case 2:
                 hasStarted = false;
-                return [4 /*yield*/, (0, build_1.chooseBuildPackages)()];
+                return [4, (0, build_1.chooseBuildPackages)()];
             case 3:
                 packages = _f.sent();
                 simulatorWebSocketURL = "http://".concat(simulatorHost, ":").concat(simulatorPort);
@@ -112,7 +118,7 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                         switch (_b.label) {
                             case 0:
                                 logger.info('rebuilding...');
-                                return [4 /*yield*/, (0, build_1.buildDev)(packages)];
+                                return [4, (0, build_1.buildDev)(packages)];
                             case 1:
                                 zpkBuffer = _b.sent();
                                 if (zpkBuffer) {
@@ -129,19 +135,35 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                                     hasStarted = true;
                                     logger.log(chalk_1["default"].green("[".concat(args['$0'], "] watching the changes in this project...")));
                                 }
-                                return [2 /*return*/];
+                                return [2];
                         }
                     });
                 }); }, 1000);
+                gitignorePath = path.resolve('.gitignore');
+                fs_extra_1["default"].ensureFileSync(gitignorePath);
+                gitignore = (0, parse_gitignore_1["default"])(fs_extra_1["default"].readFileSync(gitignorePath));
+                if (!gitignore.length) {
+                    fs_extra_1["default"].writeFileSync(gitignorePath, project_1.gitignoreDefaultItem.join('\n'));
+                    gitignore = project_1.gitignoreDefaultItem;
+                }
+                ignored = lodash_1["default"].union([
+                    '.gitignore',
+                    'jsconfig.json',
+                    'dist/*',
+                    'node_modules/**',
+                    '.git/**',
+                    'yarn.lock',
+                    'package-lock.json'
+                ], gitignore);
                 chokidar_1["default"].watch('.', {
-                    ignored: ['dist/*']
+                    ignored: ignored
                 }).on('all', function (_type, path) {
                     if (!lodash_1["default"].startsWith(path, 'dist')) {
                         hasStarted && logger.log(path, chalk_1["default"].green(' changed'));
                         refreshSimulator();
                     }
                 });
-                return [2 /*return*/];
+                return [2];
         }
     });
 }); };

package/modules/simulator.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -24,7 +28,7 @@ var socket_io_client_1 = require("socket.io-client");
 var logger = __importStar(require("../utils/logger"));
 var storage_1 = require("./storage");
 var project_1 = require("../config/project");
-var Simulator = /** @class */ (function () {
+var Simulator = (function () {
     function Simulator(url, options) {
         this.previewId = 1;
         this.previewMethod = 'ide.simulator.preview';

package/modules/status.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -59,29 +63,55 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.status = void 0;
+var lodash_1 = __importDefault(require("lodash"));
 var chalk_1 = __importDefault(require("chalk"));
 var logger = __importStar(require("../utils/logger"));
+var index_1 = require("../api/index");
 var storage_1 = require("./storage");
 var project_1 = require("../config/project");
 var run_1 = require("./run");
-var hm_analytics_1 = require("../utils/hm_analytics");
-var status = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, _c, nickName, _d, _e, apptoken, _f, _g, userid, _h, _j, cname, _k, _l, simulatorHost, _m, _o, simulatorPort, _p, simulatorConnectStatus, loginStatus, message;
-    return __generator(this, function (_q) {
-        _a = storage_1.instanceStorage.getStorage(), _b = project_1.loginStorageKey.nickName, _c = _a[_b], nickName = _c === void 0 ? '' : _c, _d = project_1.loginStorageKey.accountToken, _e = _a[_d], apptoken = _e === void 0 ? '' : _e, _f = project_1.loginStorageKey.userid, _g = _a[_f], userid = _g === void 0 ? '' : _g, _h = project_1.loginStorageKey.cname, _j = _a[_h], cname = _j === void 0 ? '' : _j, _k = project_1.simulatorStorageKey.simulatorHost, _l = _a[_k], simulatorHost = _l === void 0 ? run_1.DEFAULT_HOST : _l, _m = project_1.simulatorStorageKey.simulatorPort, _o = _a[_m], simulatorPort = _o === void 0 ? run_1.DEFAULT_PORT : _o, _p = project_1.simulatorStorageKey.simulatorConnectStatus, simulatorConnectStatus = _a[_p];
-        loginStatus = (apptoken && userid && cname) ? 'logged' : 'logout';
-        message = project_1.ACCOUNT_ENV === 'production' ? 'login status:' : "".concat(project_1.ACCOUNT_ENV, ": login status: ");
-        logger.log(message, chalk_1["default"].yellow(loginStatus));
-        if (loginStatus === 'logged') {
-            logger.log('nickName:', chalk_1["default"].yellow(nickName));
-            logger.log('userID:', chalk_1["default"].yellow(userid));
+var hm_analytics_1 = require("../utils/hm-analytics");
+var login_1 = require("./login");
+var status = function (args) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b, _c, apptoken, _d, _e, userid, _f, _g, cname, _h, _j, simulatorHost, _k, _l, simulatorPort, _m, simulatorConnectStatus, loginStatus, userInfoHost, userInfoURL, nickName, res, error_1, res;
+    return __generator(this, function (_o) {
+        switch (_o.label) {
+            case 0:
+                _a = storage_1.instanceStorage.getStorage(), _b = project_1.loginStorageKey.accountToken, _c = _a[_b], apptoken = _c === void 0 ? '' : _c, _d = project_1.loginStorageKey.userid, _e = _a[_d], userid = _e === void 0 ? '' : _e, _f = project_1.loginStorageKey.cname, _g = _a[_f], cname = _g === void 0 ? '' : _g, _h = project_1.simulatorStorageKey.simulatorHost, _j = _a[_h], simulatorHost = _j === void 0 ? run_1.DEFAULT_HOST : _j, _k = project_1.simulatorStorageKey.simulatorPort, _l = _a[_k], simulatorPort = _l === void 0 ? run_1.DEFAULT_PORT : _l, _m = project_1.simulatorStorageKey.simulatorConnectStatus, simulatorConnectStatus = _a[_m];
+                loginStatus = !!(apptoken && userid && cname);
+                if (!loginStatus) return [3, 6];
+                userInfoHost = lodash_1["default"].split(lodash_1["default"].toString(cname), ',').filter(function (h) { return h.indexOf('auth-') > -1; })[0];
+                userInfoURL = "https://".concat(userInfoHost, "/v2/developer/account/center");
+                nickName = '';
+                _o.label = 1;
+            case 1:
+                _o.trys.push([1, 3, , 5]);
+                return [4, (0, index_1.getUserInfo)(userInfoURL, apptoken)];
+            case 2:
+                res = _o.sent();
+                nickName = res.userName;
+                logger.log('login status:', chalk_1["default"].yellow(loginStatus ? 'logged' : 'no login'));
+                return [3, 5];
+            case 3:
+                error_1 = _o.sent();
+                logger.log('login status:', chalk_1["default"].yellow('no login - invalid token'));
+                return [4, (0, login_1.login)()];
+            case 4:
+                res = _o.sent();
+                args._loginAppToken = res.appToken;
+                process.env._loginAppToken = res.appToken;
+                return [2, (0, exports.status)(args)];
+            case 5:
+                logger.log('nickName:', chalk_1["default"].yellow(nickName || '-'));
+                logger.log('userID:', chalk_1["default"].yellow(userid));
+                _o.label = 6;
+            case 6:
+                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));
+                (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_STATUS_C');
+                return [2];
         }
-        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));
-        (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_STATUS_C');
-        process.exit(0);
-        return [2 /*return*/];
     });
 }); };
 exports.status = status;