@zeppos/zeus-cli 1.0.7 → 1.0.18

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,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, 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',
@@ -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);
+                    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(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:
+                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,16 +63,22 @@ 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"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var chokidar_1 = __importDefault(require("chokidar"));
-var compressing = __importStar(require("compressing"));
 var logger = __importStar(require("../utils/logger"));
 var build_1 = require("./build");
 var storage_1 = require("./storage");
 var simulator_1 = require("./simulator");
+var device_1 = require("../config/device");
 var DEFAULT_HOST = '127.0.0.1';
 var DEFAULT_PORT = '7650';
+var getDeviceInternalCodename = function (curTarget) {
+    var _a;
+    var appJsonFilePath = path.resolve('./app.json');
+    var appJsonContent = JSON.parse(fs_1["default"].readFileSync(appJsonFilePath, 'utf-8'));
+    var _b = ((_a = appJsonContent === null || appJsonContent === void 0 ? void 0 : appJsonContent.targets[curTarget]) === null || _a === void 0 ? void 0 : _a.platforms[0]).deviceSource, deviceSource = _b === void 0 ? 229 : _b;
+    return device_1.deviceInternalCodename[deviceSource];
+};
 var run = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var storage, simulatorHost, simulatorPort, answer, hasStarted, packages, simulator, refreshSimulator;
     return __generator(this, function (_a) {
@@ -108,43 +114,51 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                 packages = _a.sent();
                 simulator = new simulator_1.Simulator("http://" + simulatorHost + ":" + simulatorPort);
                 refreshSimulator = lodash_1["default"].debounce(function () { return __awaiter(void 0, void 0, void 0, function () {
-                    var zabName, zabPath, uzipZabPath, zabFileList, zabBuffer, zpkFileName, projectName;
+                    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) {
-                                        zabBuffer = Buffer.from(fs_1["default"].readFileSync(path.resolve(uzipZabPath, "./" + zpkFileName)));
-                                    }
-                                }
-                                projectName = process.cwd().split('/').slice(-1)[0];
-                                if (zabBuffer.length) {
+                                zpkBuffer = _a.sent();
+                                if (zpkBuffer) {
+                                    logger.info('rebuild done');
                                     logger.info('refrshing simulator...');
-                                    simulator.upload(zabBuffer, projectName);
+                                    targetDeviceInternalName = getDeviceInternalCodename(packages[0]);
+                                    projectName = process.cwd().split('/').slice(-1)[0];
+                                    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..."));

package/modules/simulator.js

@@ -41,12 +41,13 @@ var Simulator = /** @class */ (function () {
     Simulator.prototype.emit = function (space, jsonData) {
         this.socket.emit(space, jsonData);
     };
-    Simulator.prototype.upload = function (data, projectName) {
+    Simulator.prototype.upload = function (data, projectName, target) {
         var dataArr = this.uint8ToArray(new Uint8Array(data));
         var message = this.encodeMessage({
+            target: target,
+            projectName: projectName,
             size: data.byteLength,
-            data: dataArr,
-            projectName: projectName
+            data: dataArr
         });
         this.sendMessage(message);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.0.7",
+  "version": "1.0.18",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",
@@ -37,7 +37,7 @@
     "webpack": "^5.52.0"
   },
   "dependencies": {
-    "@zeppos/zpm": "^2.1.32",
+    "@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
+}

package/public/template/timer/shared/buffer.js

@@ -0,0 +1,11 @@
+import { getGlobal } from './global'
+
+let globalNS = getGlobal()
+
+if (!globalNS.Buffer) {
+  if (typeof Buffer !== 'undefined') {
+    globalNS.Buffer = Buffer
+  } else {
+    globalNS.Buffer = DeviceRuntimeCore.Buffer
+  }
+}

package/public/template/timer/shared/device-polyfill.js

@@ -0,0 +1,3 @@
+import './logger'
+import './buffer'
+import './setTimeout'

package/public/template/timer/shared/global.js

@@ -0,0 +1,17 @@
+
+export function getGlobal () {
+  if (typeof self !== 'undefined') {
+    return self
+  }
+  if (typeof window !== 'undefined') {
+    return window
+  }
+  if (typeof global !== 'undefined') {
+    return global
+  }
+  if (typeof globalThis !== 'undefined') {
+    return globalThis
+  }
+
+  throw new Error('unable to locate global object')
+}

package/public/template/timer/shared/js-module.js

@@ -0,0 +1,27 @@
+export function isHmUIDefined() {
+  return typeof hmUI !== 'undefined'
+}
+
+export function isHmBleDefined() {
+  return typeof hmBle !== 'undefined'
+}
+
+export function isHmTimerDefined() {
+  return typeof timer !== 'undefined'
+}
+
+export function isHmFsDefined() {
+  return typeof hmFS !== 'undefined'
+}
+
+export function isHmAppDefined() {
+  return typeof hmApp !== 'undefined'
+}
+
+export function isHmSensorDefined() {
+  return typeof hmSensor !== 'undefined'
+}
+
+export function isHmSettingDefined() {
+  return typeof hmSetting !== 'undefined'
+}

package/public/template/timer/shared/logger.js

@@ -0,0 +1,21 @@
+import { getGlobal } from './global'
+
+let globalNS = getGlobal()
+
+if (!globalNS.Logger) {
+  if (typeof DeviceRuntimeCore !== 'undefined') {
+    globalNS.Logger = DeviceRuntimeCore.HmLogger
+  } else {
+    if (typeof Logger !== 'undefined') {
+
+    }
+    // console.connect = () => {
+    //   // pass
+    // }
+    // globalNS.Logger = {
+    //   getLogger() {
+    //     return console
+    //   },
+    // }
+  }
+}