@zeppos/zeus-cli 1.0.8 → 1.0.10

package/bin/cli.js

@@ -19,6 +19,7 @@ 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('dev', 'run this project in development mode', proxy, index_1.run)
     .command('preview', 'preview this project in your device', proxy, index_1.buildPreview)

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

@@ -84,6 +84,7 @@ 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 BuildMode;
 (function (BuildMode) {
@@ -173,10 +174,12 @@ var buildProd = function (packages) {
 };
 exports.buildProd = buildProd;
 var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var userToken, form, buildInfo;
+    var storage, 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') });
+                return [4 /*yield*/, (0, login_1.login)(args)];
             case 1:
                 userToken = _a.sent();
                 form = new form_data_1["default"]();

package/modules/login.js

@@ -60,12 +60,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 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,22 @@ 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);
+                accountInfo = storage.get(project_1.loginStorageKey.account);
                 if (!lodash_1["default"].get(args, 'relogin')) {
-                    historyToken = storage.get(accountTokenKey);
+                    historyToken = storage.get(project_1.loginStorageKey.accountToken);
                     if (historyToken) {
-                        logger.success("have logged in with account: " + accountInfo);
+                        // 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,12 +160,45 @@ 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();
+                                        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];
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",
@@ -49,6 +49,7 @@
     "inquirer": "^8.1.2",
     "lodash": "^4.17.21",
     "npm-keyword": "^6.1.0",
+    "open": "^8.4.0",
     "qrcode-terminal": "^0.12.0",
     "qs": "^6.10.1",
     "rd": "^2.0.1",

package/public/template/hello-world/page/i18n/en-US.po

@@ -0,0 +1,3 @@
+
+msgid "appName"
+msgstr "HelloWorld"

package/public/template/hello-world/i18n/en-US.po

@@ -1,2 +0,0 @@
-msgid "appName"
-msgstr "HelloWorld"