@zeppos/zeus-cli 1.0.8 → 1.0.22

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'));
@@ -81,9 +105,9 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
             defaultAssetsPath_1 = (0, path_1.resolve)(workDir, './assets/default');
             buildTargets.forEach(function (type) {
                 var _a = device_1.deviceTargets[type], deviceName = _a.deviceName, platforms = _a.platforms, screen = _a.screen;
-                var pkgName = screen.width + "x" + screen.height + "-" + lodash_1["default"].kebabCase(lodash_1["default"].toLower(deviceName));
+                var pkgName = "".concat(screen.width, "x").concat(screen.height, "-").concat(lodash_1["default"].kebabCase(lodash_1["default"].toLower(deviceName)));
                 lodash_1["default"].set(targets, pkgName, __assign(__assign({}, defaultTarget), { platforms: platforms, designWidth: screen.width }));
-                fs_extra_1["default"].copySync(defaultAssetsPath_1, (0, path_1.resolve)(workDir, "./assets/" + pkgName));
+                fs_extra_1["default"].copySync(defaultAssetsPath_1, (0, path_1.resolve)(workDir, "./assets/".concat(pkgName)));
             });
             fs_extra_1["default"].removeSync(defaultAssetsPath_1);
             lodash_1["default"].set(appJson, 'targets', targets);

package/modules/help.js

@@ -68,18 +68,19 @@ var help = function () { return __awaiter(void 0, void 0, void 0, function () {
     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');
-        logger.log("Usage: " + cmd + " <command> [args?]");
+        logger.log("Usage: ".concat(cmd, " <command> [args?]"));
         logger.log('');
-        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 + " 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");
-        logger.log(cmd + " config <term>   set or get the config value");
+        logger.log("".concat(cmd, " init            init a new project in current directory"));
+        logger.log("".concat(cmd, " create <foo>    add the <foo> project to current directory"));
+        logger.log("".concat(cmd, " login           login to your account"));
+        logger.log("".concat(cmd, " logout          Sign out of your account"));
+        logger.log("".concat(cmd, " dev             run this project in development mode"));
+        logger.log("".concat(cmd, " preview         preview this project in your device"));
+        logger.log("".concat(cmd, " build           build this project for production"));
+        logger.log("".concat(cmd, " config <term>   set or get the config value"));
         logger.log('');
         logger.log('');
-        logger.log(cmd + "@" + pkg.version + " " + path.resolve(__dirname, '../'));
+        logger.log("".concat(cmd, "@").concat(pkg.version, " ").concat(path.resolve(__dirname, '../')));
         return [2 /*return*/];
     });
 }); };

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) {
@@ -95,13 +99,13 @@ var loginByLocal = function (account, password) { return __awaiter(void 0, void
                     token: 'access'
                 };
                 if (/^[1][0-9]{10}$/.test(account)) {
-                    data.phoneOrEmail = encodeURIComponent("+86" + account);
+                    data.phoneOrEmail = encodeURIComponent("+86".concat(account));
                 }
                 data.name = data.phoneOrEmail.split('@')[0];
-                return [4 /*yield*/, postForm(REGIST_URL + "/registrations/" + data.phoneOrEmail + "/tokens", data)];
+                return [4 /*yield*/, postForm("".concat(REGIST_URL, "/registrations/").concat(data.phoneOrEmail, "/tokens"), data)];
             case 1:
                 checkInfo = _a.sent();
-                return [4 /*yield*/, postForm(LOGIN_URL + "/v2/client/login", {
+                return [4 /*yield*/, postForm("".concat(LOGIN_URL, "/v2/client/login"), {
                         app_name: 'com.huami.webapp',
                         app_version: '4.3.0',
                         code: lodash_1["default"].get(checkInfo, 'data.access', ''),
@@ -118,28 +122,27 @@ 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, apptoken, userid, cname, isLocal, answer, loginInfo_1, token, loginInfo;
     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);
+                apptoken = storage.get(project_1.loginStorageKey.accountToken);
+                userid = storage.get(project_1.loginStorageKey.userid);
+                cname = storage.get(project_1.loginStorageKey.cname);
+                if (!lodash_1["default"].get(args, 'relogin') && apptoken && userid && cname) {
+                    // logger.success(`have logged in with account: ${accountInfo}`)
+                    logger.success("Has logged");
+                    return [2 /*return*/, { apptoken: apptoken, userid: userid, cname: cname }];
                 }
+                isLocal = false;
+                if (!isLocal) return [3 /*break*/, 3];
                 return [4 /*yield*/, inquirer_1["default"].prompt([
                         {
                             name: 'account',
                             type: 'input',
-                            message: "Enter your account (Mobile/E-mail): " + (accountInfo ? "(" + accountInfo + ")" : '')
+                            message: "Enter your account (Mobile/E-mail): ".concat(accountInfo ? "(".concat(accountInfo, ")") : '')
                         },
                         {
                             name: 'password',
@@ -156,15 +159,62 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                         process.exit(1);
                     })];
             case 2:
-                loginInfo = _a.sent();
-                token = lodash_1["default"].get(loginInfo, 'token_info.app_token');
+                loginInfo_1 = _a.sent();
+                token = lodash_1["default"].get(loginInfo_1, 'token_info.app_token');
                 if (token) {
-                    logger.success("logged in with account: " + answer.account);
-                    storage.set(accountKey, answer.account);
-                    storage.set(accountTokenKey, token);
+                    logger.success("logged in with account: ".concat(answer.account));
+                    storage.set(project_1.loginStorageKey.account, answer.account);
+                    storage.set(project_1.loginStorageKey.accountToken, token);
                 }
-                return [2 /*return*/, token];
+                _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, userid = params.userid, cname = params.cname;
+                                    res.statusCode = 200;
+                                    res.setHeader('Content-Type', 'text/plain');
+                                    res.end('Login is successful, please return to the operation interface manually');
+                                    if (apptoken) {
+                                        resolve({ apptoken: apptoken, userid: userid, cname: cname });
+                                        storage.set(project_1.loginStorageKey.userid, userid);
+                                        storage.set(project_1.loginStorageKey.cname, cname);
+                                        storage.set(project_1.loginStorageKey.accountToken, apptoken);
+                                        logger.success('logger success');
+                                        server.close();
+                                        // 在执行 preview 命令需要登录时不退出程序
+                                        if (!args) {
+                                            process.exit(1);
+                                        }
+                                    }
+                                });
+                                server.listen(project_1.LocalServerConfig.PORT, project_1.LocalServerConfig.HOSTNAME);
+                                // 打开浏览器的登录页面
+                                return [4 /*yield*/, open("".concat(project_1.loginConfig.LOGIN_URL, "?project_name=").concat(project_1.loginConfig.PROJECT_NAME, "&platform_app=").concat(project_1.loginConfig.PLATFORM_APP, "&project_redirect_uri=").concat(project_1.loginConfig.PROJECT_REDIRECT_URI))];
+                            case 1:
+                                // 打开浏览器的登录页面
+                                _a.sent();
+                                return [2 /*return*/];
+                        }
+                    });
+                }); })];
+            case 4:
+                loginInfo = _a.sent();
+                return [2 /*return*/, loginInfo];
         }
     });
 }); };
 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);
+    storage["delete"](project_1.loginStorageKey.userid);
+    storage["delete"](project_1.loginStorageKey.cname);
+    logger.success('Logged out');
+};
+exports.logout = logout;

package/modules/run.js

@@ -63,10 +63,10 @@ var fs_1 = __importDefault(require("fs"));
 var lodash_1 = __importDefault(require("lodash"));
 var chalk_1 = __importDefault(require("chalk"));
 var path = __importStar(require("path"));
-var fs_extra_1 = __importDefault(require("fs-extra"));
+// import fsExtra from 'fs-extra'
 var inquirer_1 = __importDefault(require("inquirer"));
 var chokidar_1 = __importDefault(require("chokidar"));
-var compressing = __importStar(require("compressing"));
+// import * as compressing from 'compressing'
 var logger = __importStar(require("../utils/logger"));
 var build_1 = require("./build");
 var storage_1 = require("./storage");
@@ -94,12 +94,12 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                         {
                             name: 'host',
                             type: 'input',
-                            message: "simulator host (" + DEFAULT_HOST + "):"
+                            message: "simulator host (".concat(DEFAULT_HOST, "):")
                         },
                         {
                             name: 'port',
                             type: 'input',
-                            message: "simulator port (" + DEFAULT_PORT + "):"
+                            message: "simulator port (".concat(DEFAULT_PORT, "):")
                         }
                     ])];
             case 1:
@@ -114,50 +114,56 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                 return [4 /*yield*/, (0, build_1.chooseBuildPackages)()];
             case 3:
                 packages = _a.sent();
-                simulator = new simulator_1.Simulator("http://" + simulatorHost + ":" + simulatorPort);
+                simulator = new simulator_1.Simulator("http://".concat(simulatorHost, ":").concat(simulatorPort));
                 refreshSimulator = lodash_1["default"].debounce(function () { return __awaiter(void 0, void 0, void 0, function () {
-                    var zabName, zabPath, uzipZabPath, zabFileList, zabBuffer, zpkFileName, zpkPath, projectName, targetDeviceInternalName;
+                    var zpkBuffer, targetDeviceInternalName, projectName;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
                                 logger.info('rebuilding...');
                                 return [4 /*yield*/, (0, build_1.buildDev)(packages)];
                             case 1:
-                                zabName = _a.sent();
-                                zabPath = path.resolve("./dist/" + zabName);
-                                if (!fs_1["default"].existsSync(zabPath)) return [3 /*break*/, 3];
-                                logger.info('rebuild done');
-                                uzipZabPath = path.resolve(zabPath, '../zab');
-                                logger.info('getting device package...');
-                                return [4 /*yield*/, compressing.zip.uncompress(zabPath, uzipZabPath)];
-                            case 2:
-                                _a.sent();
-                                zabFileList = fs_1["default"].readdirSync(uzipZabPath);
-                                zabBuffer = Buffer.alloc(0);
-                                if (packages.length === 1) {
-                                    zpkFileName = lodash_1["default"].find(zabFileList, function (fileName) {
-                                        return lodash_1["default"].startsWith(fileName, packages[0] + ".");
-                                    });
-                                    if (zpkFileName) {
-                                        zpkPath = path.resolve(uzipZabPath, "./" + zpkFileName);
-                                        zabBuffer = Buffer.from(fs_1["default"].readFileSync(zpkPath));
-                                    }
-                                }
-                                projectName = process.cwd().split('/').slice(-1)[0];
-                                if (zabBuffer.length) {
+                                zpkBuffer = _a.sent();
+                                if (zpkBuffer) {
+                                    logger.info('rebuild done');
                                     logger.info('refrshing simulator...');
                                     targetDeviceInternalName = getDeviceInternalCodename(packages[0]);
-                                    simulator.upload(zabBuffer, projectName, targetDeviceInternalName);
+                                    projectName = path.parse(process.cwd()).base;
+                                    simulator.upload(zpkBuffer, projectName, targetDeviceInternalName);
                                 }
                                 else {
-                                    logger.error('can\'t find device package, pleace check the build result');
+                                    logger.error('build error');
                                 }
-                                fs_extra_1["default"].removeSync(uzipZabPath);
-                                _a.label = 3;
-                            case 3:
+                                // const zabPath = path.resolve(`./dist/${zabName}`)
+                                // if (fs.existsSync(zabPath)) {
+                                //   logger.info('rebuild done')
+                                //   const uzipZabPath = path.resolve(zabPath, '../zab')
+                                //   logger.info('getting device package...')
+                                //   await compressing.zip.uncompress(zabPath, uzipZabPath)
+                                //   const zabFileList = fs.readdirSync(uzipZabPath)
+                                //   let zabBuffer: Buffer = Buffer.alloc(0)
+                                //   if (packages.length === 1) {
+                                //     const zpkFileName = _.find(zabFileList, (fileName) => {
+                                //       return _.startsWith(fileName, `${packages[0]}.`)
+                                //     })
+                                //     if (zpkFileName) {
+                                //       const zpkPath = path.resolve(uzipZabPath, `./${zpkFileName}`)
+                                //       zabBuffer = Buffer.from(fs.readFileSync(zpkPath))
+                                //     }
+                                //   }
+                                //   const projectName = process.cwd().split('/').slice(-1)[0]
+                                //   if (zabBuffer.length) {
+                                //     logger.info('refrshing simulator...')
+                                //     const targetDeviceInternalName = getDeviceInternalCodename(packages[0])
+                                //     simulator.upload(zabBuffer, projectName, targetDeviceInternalName)
+                                //   } else {
+                                //     logger.error('can\'t find device package, pleace check the build result')
+                                //   }
+                                //   fsExtra.removeSync(uzipZabPath)
+                                // }
                                 if (!hasStarted) {
                                     hasStarted = true;
-                                    logger.log(chalk_1["default"].green("[" + args['$0'] + "] watching the changes in this project..."));
+                                    logger.log(chalk_1["default"].green("[".concat(args['$0'], "] watching the changes in this project...")));
                                 }
                                 return [2 /*return*/];
                         }

package/modules/storage.js

@@ -26,7 +26,7 @@ var Storage = /** @class */ (function () {
         this._dataTime = 0;
         var homePath = os_1["default"].homedir();
         var cmdName = 'zeus';
-        this._filePath = path_1["default"].resolve(homePath, ".zepp/." + cmdName);
+        this._filePath = path_1["default"].resolve(homePath, ".zepp/.".concat(cmdName));
         this._dataTimeout = timeout || 1000 * 60;
         this._dataEditTimeout = editTimeout || 1000;
         this._data = {};
@@ -49,7 +49,7 @@ var Storage = /** @class */ (function () {
         var _this = this;
         var dotenvArray = [];
         Object.keys(this._data).forEach(function (key) {
-            dotenvArray.push(key + "=" + _this._data[key]);
+            dotenvArray.push("".concat(key, "=").concat(_this._data[key]));
         });
         fs_1["default"].writeFileSync(this._filePath, dotenvArray.join('\n'));
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.0.8",
+  "version": "1.0.22",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",
@@ -37,7 +37,7 @@
     "webpack": "^5.52.0"
   },
   "dependencies": {
-    "@zeppos/zpm": "^2.1.37",
+    "@zeppos/zpm": "^2.1.48",
     "axios": "^0.23.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
@@ -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/empty/app.js

@@ -14,7 +14,7 @@ App({
     console.log('app on hide invoke')
   },
 
-  onDestory(options) {
+  onDestroy(options) {
     console.log('app on destory invoke')
   },
 

package/public/template/empty/app.json

@@ -26,14 +26,7 @@
         "page": {
           "pages": [
             "pages/index"
-          ],
-          "window": {
-            "navigationBarBackgroundColor": "#ffffff",
-            "navigationBarTextStyle": "black",
-            "navigationBarTitleText": "empty",
-            "backgroundColor": "#eeeeee",
-            "backgroundTextStyle": "light"
-          }
+          ]
         },
         "app-side": {
           "path": "app-side/index"

package/public/template/empty/watchface/index.js

@@ -0,0 +1,13 @@
+WatchFace({
+  onInit() {
+    console.log('index page.js on init invoke')
+  },
+
+  build() {
+    console.log('index page.js on build invoke')
+  },
+
+  onDestroy() {
+    console.log('index page.js on destroy invoke')
+  },
+})

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

@@ -14,7 +14,7 @@ App({
     console.log('app on hide invoke')
   },
 
-  onDestory(options) {
+  onDestroy(options) {
     console.log('app on destory invoke')
   },
 

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

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

package/public/template/timer/app.js

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

package/public/template/timer/app.json

@@ -0,0 +1,50 @@
+{
+  "configVersion": "v2",
+  "app": {
+    "appId": 10013,
+    "appName": "计时器",
+    "appType": "watchface",
+    "version": {
+      "code": 1,
+      "name": "1.0"
+    },
+    "vender": "zepp",
+    "description": "默认表盘",
+    "icon": "images/preview.png"
+  },
+  "permissions": ["gps"],
+  "runtime": {
+    "apiVersion": {
+      "compatible": "1.0.0",
+      "target": "1.0.1",
+      "minVersion": "1.0.0"
+    }
+  },
+  "targets": {
+    "gtr-3-pro": {
+      "module": {
+        "watchface": {
+          "path": "watchface/gtr-3-pro/index",
+          "main": 1,
+          "editable": 1,
+          "lockscreen": 1
+        }
+      },
+      "platforms": [{
+        "name": "madrid",
+        "deviceSource": 229
+      }, {
+        "name": "madridw",
+        "deviceSource": 230
+      }],
+      "designWidth": 480
+    }
+  },
+  "i18n": {
+    "en-US": {
+      "name": "timer"
+    }
+  },
+  "defaultLanguage": "en-US",
+  "debug": false
+}