@zeppos/zeus-cli 1.3.1 → 1.3.3

package/bin/main.js

@@ -51,6 +51,13 @@ var index_1 = require("../index");
 var zeppos_app_utils_1 = require("zeppos-app-utils");
 var login = zeppos_app_utils_1.modules.login, logout = zeppos_app_utils_1.modules.logout, status = zeppos_app_utils_1.modules.status, modulesConfig = zeppos_app_utils_1.modules.config;
 var context = {};
+var yargsCmdBuilderFunc = function (cmdName, useProxy, yargs) {
+    if (useProxy === void 0) { useProxy = false; }
+    useProxy && proxy(yargs);
+    if (cmdName in index_1.yargsCmdBuilders) {
+        return index_1.yargsCmdBuilders[cmdName](yargs);
+    }
+};
 var proxy = function (args) { return __awaiter(void 0, void 0, void 0, function () {
     var res;
     return __generator(this, function (_a) {
@@ -72,6 +79,8 @@ yargs_1["default"].usage("Usage: ".concat(process.env.CMD_NAME, " <command> [arg
     .demandCommand(1, 'A command is required. Pass --help to see all available commands and options.')
     .recommendCommands()
     .help()
+    .version(false)
+    .version((0, index_1.version)())
     .alias('h', 'help').describe('help', 'Display help information.')
     .alias('v', 'version').describe('version', 'Display version number.')
     .group(['help', 'version'], "Base Options")
@@ -79,7 +88,7 @@ yargs_1["default"].usage("Usage: ".concat(process.env.CMD_NAME, " <command> [arg
     .command('create <projectName>', 'Named the <projectName> project and add to the current directory.', proxy, index_1.create)
     .command('login', 'Login to your account.', proxy, login)
     .command('logout', 'Sign out of your account.', proxy, logout)
-    .command('dev', 'Run this project in development mode.', proxy, index_1.run)
+    .command('dev', 'Run this project in development mode. Use "zeus dev -h" to see more information', yargsCmdBuilderFunc.bind(null, 'dev', true), index_1.run)
     .command('preview', 'Preview this project in your device.', proxy, index_1.buildPreview)
     .command('build', 'Build this project for production.', proxy, index_1.buildProd)
     .command('status', 'View information such as login and emulator connection status.', proxy, status)

package/index.js

@@ -19,3 +19,5 @@ __exportStar(require("./modules/run"), exports);
 __exportStar(require("./modules/build"), exports);
 __exportStar(require("./modules/create"), exports);
 __exportStar(require("./modules/bridge"), exports);
+__exportStar(require("./modules/version"), exports);
+__exportStar(require("./modules/yargsCmdBuilders"), exports);

package/modules/bridge.js

@@ -137,21 +137,28 @@ var connectWSCB = function () {
         });
     }); });
     vorpal
-        .command('install', 'Install applications or watch face.')
+        .command('install', 'Install applications or watch faces.')
+        .option('-t, --target "<target>"', 'Setting the installation target')
+        .types({
+        string: ['t', 'target']
+    })
         .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var target;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (!hasConnectDevice) return [3, 2];
-                    return [4, (0, build_1.buildPreview)({ _: ['install', "".concat(choiredDevice.toLowerCase())], '$0': 'zeus' }, function (params) {
+                    target = ((_a = args === null || args === void 0 ? void 0 : args.options) === null || _a === void 0 ? void 0 : _a.target) || '';
+                    return [4, (0, build_1.buildPreview)({ _: ['install', "".concat(choiredDevice.toLowerCase())], '$0': 'zeus', target: target }, function (params) {
                             client.sendMessage(params, { method: 'packagePush' });
                         })];
                 case 1:
-                    _a.sent();
+                    _b.sent();
                     return [3, 3];
                 case 2:
                     vorpal.log(chalk_1["default"].yellow("No device is connected, please connect the device with the command width 'connect' first."));
-                    _a.label = 3;
+                    _b.label = 3;
                 case 3:
                     (0, zeppos_app_utils_2.HM_Analytics)("ZEPP_CLI_BRIDGE_INSTALL_C");
                     cb();

package/modules/build.js

@@ -112,11 +112,12 @@ var checkAppJson = function () {
 var chooseBuildTargetsV3Config = function (mode, args) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var apiLevel, platforms, usefulScreenTypes, usefulDeviceSource, targetDevices, deviceNames, answers;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var target, apiLevel, platforms, usefulScreenTypes, usefulDeviceSource, targetDevices, deviceNames, isValidDevice, answers, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     checkAppJson();
+                    target = args.target;
                     apiLevel = (0, lodash_1.get)(appJsonContent, 'runtime.apiVersion.minVersion', '1.0.0');
                     platforms = Object.values((0, lodash_1.get)(appJsonContent, 'targets', {})).reduce(function (list, item) {
                         return list.concat((0, lodash_1.get)(item, 'platforms', []));
@@ -140,16 +141,26 @@ var chooseBuildTargetsV3Config = function (mode, args) {
                         zeppos_app_utils_1.logger.error("The current project's API Level version is too high and there is no available device for debugging currently.");
                         process.exit(1);
                     }
-                    return [4, inquirer_1["default"].prompt([
-                            {
-                                name: 'device',
-                                type: 'list',
-                                message: 'Which device would you like to preview?',
-                                choices: deviceNames
-                            },
-                        ])];
-                case 1:
-                    answers = _a.sent();
+                    isValidDevice = deviceNames.includes(target);
+                    if (target && !isValidDevice) {
+                        zeppos_app_utils_1.logger.warn("'".concat(target, "' is not a valid device, it must be one of ").concat(JSON.stringify(deviceNames)));
+                    }
+                    if (!isValidDevice) return [3, 1];
+                    _a = target;
+                    return [3, 3];
+                case 1: return [4, inquirer_1["default"].prompt([
+                        {
+                            name: 'device',
+                            type: 'list',
+                            message: 'Which device would you like to preview?',
+                            choices: deviceNames
+                        },
+                    ])];
+                case 2:
+                    _a = _b.sent();
+                    _b.label = 3;
+                case 3:
+                    answers = _a;
                     return [2, {
                             sources: (0, lodash_1.get)(targetDevices, "[".concat(answers.device, "].platforms"), []).reduce(function (list, item) {
                                 list.push(Number(item.deviceSource));
@@ -205,6 +216,9 @@ var chooseBuildTargetsV2Config = function (mode, args) {
                                     if (bool) {
                                         args.target = promptTarget_1;
                                     }
+                                    else if (promptTarget_1) {
+                                        zeppos_app_utils_1.logger.warn("'".concat(promptTarget_1, "' is not a valid target, it must be one of ").concat(JSON.stringify(targets)));
+                                    }
                                     return mode !== BuildMode.PROD && !bool;
                                 },
                                 message: 'Which target would you like to preview?',

package/modules/version.js

@@ -0,0 +1,14 @@
+"use strict";
+var _a;
+exports.__esModule = true;
+exports.version = void 0;
+var appUtilPkg = require('zeppos-app-utils/package.json');
+var zeusVersion = require('../package.json').version;
+var zpmVersion = ((_a = appUtilPkg === null || appUtilPkg === void 0 ? void 0 : appUtilPkg.dependencies) === null || _a === void 0 ? void 0 : _a['@zeppos/zpm']) || '';
+function version() {
+    var versionNum = zpmVersion.match(/(\d+\.){2}\d+/);
+    var zpmVersionTip = Array.isArray(versionNum) ? "\u001B[2m(zpm v".concat(versionNum[0], ")\u001B[0m") : '';
+    var stdout = "".concat(zeusVersion, " ").concat(zpmVersionTip);
+    return stdout;
+}
+exports.version = version;

package/modules/yargsCmdBuilders.js

@@ -0,0 +1,15 @@
+"use strict";
+exports.__esModule = true;
+exports.yargsCmdBuilders = void 0;
+exports.yargsCmdBuilders = {
+    dev: function (yargs) {
+        return yargs
+            .usage('$0 dev -t, --target "<target>"')
+            .option('target', {
+            alias: 't',
+            type: 'string',
+            describe: 'Setting the preview target'
+        })
+            .help();
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",

package/private-modules/zeppos-app-utils/dist/config/device-server.js

@@ -33,7 +33,6 @@ var path = __importStar(require("path"));
 var fs = __importStar(require("fs"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var lodash_1 = require("lodash");
-var logger_1 = require("../logger");
 var LOCAL_CACHE_DEVICE_PATH = path.resolve(os.homedir(), ".zepp/.zeus_devices");
 var serverPath = 'https://upload-cdn.zepp.com/zeppos/devkit/zeus/devices.json';
 var DeviceScreenType;
@@ -66,9 +65,8 @@ if (!((0, lodash_1.get)(localContent, 'expiredTime') > now)) {
                 });
             }
         }
-    })["catch"](function () {
-        console.log();
-        logger_1.logger.error('[Fetch remote device list]: please check network status');
+    })["catch"](function (e) {
+        console.log(e);
         process.exit(1);
     });
 }

package/private-modules/zeppos-app-utils/dist/config/device.js

@@ -118,7 +118,7 @@ var DeviceScreenType;
     DeviceScreenType["B"] = "b";
 })(DeviceScreenType = exports.DeviceScreenType || (exports.DeviceScreenType = {}));
 exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
-    deviceName: 'GTR3 Pro',
+    deviceName: 'Amazfit GTR 3 Pro',
     platforms: [
         {
             name: DevicePlatformName.MADRID,
@@ -143,7 +143,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '1.99.99'
     }
 }, _a[DeviceTarget.VERONA] = {
-    deviceName: 'GTR3',
+    deviceName: 'Amazfit GTR 3',
     platforms: [
         {
             name: DevicePlatformName.VERONA,
@@ -164,7 +164,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '1.99.99'
     }
 }, _a[DeviceTarget.ZURICH] = {
-    deviceName: 'GTS3',
+    deviceName: 'Amazfit GTS 3',
     platforms: [
         {
             name: DevicePlatformName.ZURICH,
@@ -185,7 +185,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '1.99.99'
     }
 }, _a[DeviceTarget.TEIDE] = {
-    deviceName: 'T-Rex2',
+    deviceName: 'Amazfit T-Rex 2',
     platforms: [
         {
             name: DevicePlatformName.TEIDE,
@@ -206,7 +206,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '1.99.99'
     }
 }, _a[DeviceTarget.PROVENCE] = {
-    deviceName: 'GTS4 mini',
+    deviceName: 'Amazfit GTS 4 Mini',
     platforms: [
         {
             name: DevicePlatformName.PROVENCE,
@@ -252,7 +252,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '1.99.99'
     }
 }, _a[DeviceTarget.BERLIN] = {
-    deviceName: 'GTR 4',
+    deviceName: 'Amazfit GTR 4',
     platforms: [
         {
             name: DevicePlatformName.BERLIN,
@@ -273,7 +273,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '2.99.99'
     }
 }, _a[DeviceTarget.LILLE] = {
-    deviceName: 'GTS 4',
+    deviceName: 'Amazfit GTS 4',
     platforms: [
         {
             name: DevicePlatformName.LILLE,
@@ -294,7 +294,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '2.99.99'
     }
 }, _a[DeviceTarget.VIENNA] = {
-    deviceName: 'Falcon',
+    deviceName: 'Amazfit Falcon',
     platforms: [
         {
             name: DevicePlatformName.VIENNA,
@@ -315,7 +315,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '1.99.99'
     }
 }, _a[DeviceTarget.ANDES] = {
-    deviceName: 'T-Rex Ultra',
+    deviceName: 'Amazfit T-Rex Ultra',
     platforms: [
         {
             name: DevicePlatformName.ANDES,
@@ -361,7 +361,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         max: '3.99.99'
     }
 }, _a[DeviceTarget.SWIFT] = {
-    deviceName: 'Runner (Round)',
+    deviceName: 'Amazfit Cheetah (Round)',
     platforms: [
         {
             name: DevicePlatformName.SWIFT,
@@ -381,7 +381,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         min: '1.0.0'
     }
 }, _a[DeviceTarget.SWORDFISH] = {
-    deviceName: 'Runner (Square)',
+    deviceName: 'Amazfit Cheetah (Square)',
     platforms: [
         {
             name: DevicePlatformName.SWORDFISH_W,
@@ -397,7 +397,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         min: '1.0.0'
     }
 }, _a[DeviceTarget.CHEETAH] = {
-    deviceName: 'Runner Pro',
+    deviceName: 'Amazfit Cheetah Pro',
     platforms: [
         {
             name: DevicePlatformName.CHEETAH_W,
@@ -429,7 +429,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         min: '1.0.0'
     }
 }, _a[DeviceTarget.ETNA] = {
-    deviceName: 'GTR Shock',
+    deviceName: 'Amazfit Active Edge',
     platforms: [
         {
             name: DevicePlatformName.ETNA,
@@ -449,7 +449,7 @@ exports.deviceTargets = __assign((_a = {}, _a[DeviceTarget.MADRID] = {
         min: '1.0.0'
     }
 }, _a[DeviceTarget.ALTAI] = {
-    deviceName: 'Bip 5s',
+    deviceName: 'Amazfit Bip 5',
     platforms: [
         {
             name: DevicePlatformName.ALTAI,

package/private-modules/zeppos-app-utils/dist/modules/create/local-app.js

@@ -71,8 +71,10 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
         }
         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 (args.OSVersion !== 'v1') {
+            appID = Math.floor(Math.random() * 10001) + 20000;
+            lodash_1["default"].set(appJson, 'app.appId', appID);
+        }
         if (templateInfo.copyType !== TemplateCopyType.EDIT) {
             fs_extra_1["default"].writeJson(appJsonPath, appJson, {
                 spaces: 2,

package/private-modules/zeppos-app-utils/dist/public/template/os1.0/app/fetch-api/app.js

@@ -1,20 +1,27 @@
 import "./shared/device-polyfill";
 import { MessageBuilder } from "./shared/message";
 
-const appId = 27280;
-const messageBuilder = new MessageBuilder({ appId });
-
 App({
   globalData: {
-    messageBuilder: messageBuilder,
+    messageBuilder: null
   },
   onCreate(options) {
     console.log("app on create invoke");
-    messageBuilder.connect();
+    let appId;
+    if (!hmApp.packageInfo) {
+      // appId = XXX // Modify appId
+      throw new Error('Set appId,  appId needs to be the same as the configuration in app.json');
+    } else {
+      appId = hmApp.packageInfo().appId;
+    }
+    this.globalData.messageBuilder = new MessageBuilder({
+      appId,
+    });
+    this.globalData.messageBuilder.connect();
   },
 
   onDestroy(options) {
     console.log("app on destroy invoke");
-    messageBuilder.disConnect();
+    this.globalData.messageBuilder.disConnect();
   },
 });

package/private-modules/zeppos-app-utils/dist/public/template/os1.0/app/fetch-api/shared/message.js

@@ -207,7 +207,7 @@ export class MessageBuilder extends EventBus {
     hmBle &&
       hmBle.createConnect((index, data, size) => {
         // logger.warn('[RAW] [R] receive index=>%d size=>%d bin=>%s', index, size, this.bin2hex(data))
-        // console.log('createConnect-------', size)
+        console.log('createConnect-------', size)
         this.onFragmentData(data)
       })
 
@@ -384,7 +384,7 @@ export class MessageBuilder extends EventBus {
   sendBin(buf) {
     // hmBle 发送消息
     // logger.warn('[RAW] [S] send size=%d bin=%s', buf.byteLength, this.bin2hex(buf.buffer))
-    // console.log('sendBin-------', buf.byteLength)
+    console.log('sendBin-------', buf.byteLength)
     hmBle.send(buf.buffer, buf.byteLength)
   }
 

package/private-modules/zeppos-app-utils/dist/public/template/os1.0/app/todo-list/app.js

@@ -2,26 +2,27 @@ import './shared/device-polyfill'
 import { MessageBuilder } from './shared/message'
 
 const logger = DeviceRuntimeCore.HmLogger.getLogger('todo-list-app')
-const appDevicePort = 20
-const appSidePort = 0
-const appId = 20001
-const messageBuilder = new MessageBuilder({
-  appId,
-  appDevicePort,
-  appSidePort
-})
 
 App({
   globalData: {
-    messageBuilder: messageBuilder
+    messageBuilder: null
   },
   onCreate() {
-    logger.log('app onCreate invoked')
-    messageBuilder.connect()
+    logger.log('app onCreate invoked');
+    let appId;
+    if (!hmApp.packageInfo) {
+      // appid = XXX // Modify appId
+      throw new Error('Set appId,  appId needs to be the same as the configuration in app.json');
+    } else {
+      appId = hmApp.packageInfo().appId;
+    }
+    this.globalData.messageBuilder = new MessageBuilder({
+      appId,
+    });
+    this.globalData.messageBuilder.connect();
   },
-
   onDestroy() {
-    logger.log('app onDestroy invoked')
-    messageBuilder.disConnect()
+    logger.log('app onDestroy invoked');
+    this.globalData.messageBuilder.disConnect();
   }
 })

package/private-modules/zeppos-app-utils/dist/public/template/os3.0/app/empty/app.json

@@ -12,7 +12,7 @@
     "vender": "zepp",
     "description": "empty application"
   },
-  "permissions": ["device:os.bg_service"],
+  "permissions": [],
   "runtime": {
     "apiVersion": {
       "compatible": "3.0.0",
@@ -21,7 +21,7 @@
     }
   },
   "targets": {
-    "gt": {
+    "default": {
       "module": {
         "page": {
           "pages": [
@@ -33,9 +33,6 @@
         },
         "setting": {
           "path": "setting/index"
-        },
-        "app-service": {
-          "services": ["app-service/index"]
         }
       },
       "platforms": [

package/private-modules/zeppos-app-utils/dist/public/template/os3.0/app/empty/app-service/index.js

@@ -1,8 +0,0 @@
-AppService({
-    onInit(params) {
-        console.log('====service onInit=======>', new Date().getTime())
-    },
-    onEvent(params) {
-        console.log('index onEvent=', params)
-    }
-})