@zeppos/zeus-cli 1.1.3 → 1.1.4

package/api/index.js

@@ -173,7 +173,9 @@ var uploadPackage = function (form, length) { return __awaiter(void 0, void 0, v
             case 1:
                 _c.trys.push([1, 3, , 4]);
                 return [4, axios_1["default"].post("https://".concat(_subRegionalHost, "/custom/tools/app-dial/upload?userid=").concat(_loginUserId), form, {
-                        headers: __assign(__assign({}, form.getHeaders()), { 'content-length': "".concat(length), apptoken: _loginAppToken })
+                        headers: __assign(__assign({}, form.getHeaders()), { 'content-length': "".concat(length), apptoken: _loginAppToken }),
+                        maxContentLength: Infinity,
+                        maxBodyLength: Infinity
                     })];
             case 2:
                 packageInfo = _c.sent();

package/config/device.js

@@ -7,6 +7,7 @@ var DeviceTarget;
     DeviceTarget["MADRID"] = "madrid";
     DeviceTarget["VERONA"] = "verona";
     DeviceTarget["ZURICH"] = "zurich";
+    DeviceTarget["TEIDE"] = "teide";
 })(DeviceTarget = exports.DeviceTarget || (exports.DeviceTarget = {}));
 var DevicePlatformName;
 (function (DevicePlatformName) {
@@ -16,6 +17,8 @@ var DevicePlatformName;
     DevicePlatformName["VERONAW"] = "gtr3-w";
     DevicePlatformName["ZURICH"] = "gts3";
     DevicePlatformName["ZURICHW"] = "gts3-w";
+    DevicePlatformName["TEIDE"] = "teide";
+    DevicePlatformName["TEIDEW"] = "teide-w";
 })(DevicePlatformName = exports.DevicePlatformName || (exports.DevicePlatformName = {}));
 var DeviceSource;
 (function (DeviceSource) {
@@ -25,6 +28,8 @@ var DeviceSource;
     DeviceSource[DeviceSource["VERONAW"] = 227] = "VERONAW";
     DeviceSource[DeviceSource["ZURICH"] = 224] = "ZURICH";
     DeviceSource[DeviceSource["ZURICHW"] = 225] = "ZURICHW";
+    DeviceSource[DeviceSource["TEIDE"] = 418] = "TEIDE";
+    DeviceSource[DeviceSource["TEIDEW"] = 419] = "TEIDEW";
 })(DeviceSource = exports.DeviceSource || (exports.DeviceSource = {}));
 var DeviceScreenType;
 (function (DeviceScreenType) {
@@ -86,6 +91,24 @@ exports.deviceTargets = (_a = {},
             height: 450
         }
     },
+    _a[DeviceTarget.TEIDE] = {
+        deviceName: 'TEIDE',
+        platforms: [
+            {
+                name: DevicePlatformName.TEIDE,
+                deviceSource: DeviceSource.TEIDE
+            },
+            {
+                name: DevicePlatformName.TEIDEW,
+                deviceSource: DeviceSource.TEIDEW
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.R,
+            width: 454,
+            height: 454
+        }
+    },
     _a);
 exports.deviceInternalCodeName = (_b = {},
     _b[DeviceSource.MADRID] = DeviceTarget.MADRID,
@@ -94,4 +117,6 @@ exports.deviceInternalCodeName = (_b = {},
     _b[DeviceSource.VERONAW] = DeviceTarget.VERONA,
     _b[DeviceSource.ZURICH] = DeviceTarget.ZURICH,
     _b[DeviceSource.ZURICHW] = DeviceTarget.ZURICH,
+    _b[DeviceSource.TEIDE] = DeviceTarget.TEIDE,
+    _b[DeviceSource.TEIDEW] = DeviceTarget.TEIDE,
     _b);

package/modules/bridge.js

@@ -105,14 +105,14 @@ var connectDevice = function (vorpal) { return __awaiter(void 0, void 0, void 0,
                 _a.label = 3;
             case 3:
                 project_1.____inner_global_variable.bridgeChoiredDevice = choiredDevice;
-                client.sendMessage({ clientId: clientId_1 }, 'connectClient');
+                client.sendMessage({ clientId: clientId_1 }, { method: 'connectClient' });
                 hasConnectDevice = true;
                 _a.label = 4;
             case 4: return [2];
         }
     });
 }); };
-var connectBridgeWSCallback = function () {
+var connectWSCB = function () {
     var vorpal = require('vorpal')();
     vorpal.find('help').hidden();
     vorpal.find('exit').remove();
@@ -146,7 +146,7 @@ var connectBridgeWSCallback = function () {
                 case 0:
                     if (!hasConnectDevice) return [3, 2];
                     return [4, (0, build_1.buildPreview)({ _: ['install', "".concat(choiredDevice.toLowerCase())], '$0': 'zeus' }, function (params) {
-                            client.sendMessage(params, 'packagePush');
+                            client.sendMessage(params, { method: 'packagePush' });
                         })];
                 case 1:
                     _a.sent();
@@ -170,14 +170,14 @@ var connectBridgeWSCallback = function () {
                     vorpal.log("".concat(chalk_1["default"].red('error'), " If the [appid] is blank, this command needs to be executed in the root of the project."));
                 }
                 else {
-                    vorpal.log(chalk_1["default"].blue('Uninstalling'));
+                    vorpal.log(chalk_1["default"].blue('Uninstalling...'));
                     _a = (0, common_1.getDeviceInfoFromAppJson)(), appid = _a.appId, appName = _a.appName, appType = _a.appType;
-                    client.sendMessage({ type: 'delete', appid: appid, appName: appName, appType: appType }, 'sysSettingPush');
+                    client.sendMessage({ type: 'delete', appid: appid, appName: appName, appType: appType }, { method: 'sysSettingPush' });
                 }
             }
             else if (args.appid && typeof args.appid === 'number') {
-                vorpal.log(chalk_1["default"].blue('Uninstalling'));
-                client.sendMessage({ type: 'delete', appid: args.appid }, 'sysSettingPush');
+                vorpal.log(chalk_1["default"].blue('Uninstalling...'));
+                client.sendMessage({ type: 'delete', appid: args.appid }, { method: 'sysSettingPush' });
             }
             else if (args.appid) {
                 vorpal.log("".concat(chalk_1["default"].red('error'), " invalid '").concat(args.appid, "', the 'uninstall' command should be followed by appid or blank."));
@@ -186,8 +186,28 @@ var connectBridgeWSCallback = function () {
             return [2];
         });
     }); });
+    vorpal
+        .command('screenshot', 'Screenshot of the current watch device.').hidden()
+        .action(function (args, cb) { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            if (hasConnectDevice) {
+                if (choiredDevice.indexOf('app') > -1) {
+                    vorpal.log(chalk_1["default"].blue('Waiting...'));
+                    client.sendMessage({ type: 'screenshot' }, { method: 'sysSettingPush' });
+                }
+                else {
+                    vorpal.log(chalk_1["default"].yellow("Only the connected device is an app that can use the screenshot command."));
+                }
+            }
+            else {
+                vorpal.log(chalk_1["default"].yellow("No device is connected, please connect the device with the command width 'connect' first."));
+            }
+            cb();
+            return [2];
+        });
+    }); });
 };
-var disConnectBridgeWSCallback = function () {
+var disConnectWSCB = function () {
     hasConnectDevice = false;
     logger.log('Disconnected');
     process.exit(1);
@@ -203,8 +223,8 @@ var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function
                 bridgeWebSocketURL = _a.sent();
                 client = new websocket_1["default"]({
                     url: "".concat(bridgeWebSocketURL, "?type=development&name=CLI"),
-                    connectCb: connectBridgeWSCallback,
-                    disconnectCb: disConnectBridgeWSCallback
+                    connectWSCB: connectWSCB,
+                    disConnectWSCB: disConnectWSCB
                 });
                 logger.log("  - Enter 'help' to view the command.");
                 return [3, 6];

package/modules/run.js

@@ -113,7 +113,7 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                 simulatorWebSocketURL = "http://".concat(simulatorHost, ":").concat(simulatorPort);
                 simulator = new simulator_1.Simulator(simulatorWebSocketURL);
                 refreshSimulator = lodash_1["default"].debounce(function () { return __awaiter(void 0, void 0, void 0, function () {
-                    var zpkBuffer, _a, targetDeviceInternalName, appId, projectName;
+                    var zpkBuffer, _a, targetDeviceInternalName, appId, devices, projectName;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
@@ -124,9 +124,9 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                                 if (zpkBuffer) {
                                     logger.info('rebuild done');
                                     logger.info('refreshing simulator...');
-                                    _a = (0, common_1.getDeviceInfoFromAppJson)(packages[0]), targetDeviceInternalName = _a.targetDeviceInternalName, appId = _a.appId;
+                                    _a = (0, common_1.getDeviceInfoFromAppJson)(packages[0]), targetDeviceInternalName = _a.targetDeviceInternalName, appId = _a.appId, devices = _a.deviceSourceArr;
                                     projectName = path.parse(process.cwd()).base;
-                                    simulator.upload(zpkBuffer, projectName, targetDeviceInternalName, appId);
+                                    simulator.upload(zpkBuffer, projectName, targetDeviceInternalName, appId, devices);
                                 }
                                 else {
                                     logger.error('build error');

package/modules/simulator.js

@@ -51,14 +51,15 @@ var Simulator = (function () {
     Simulator.prototype.emit = function (space, jsonData) {
         this.socket.emit(space, jsonData);
     };
-    Simulator.prototype.upload = function (data, projectName, target, appid) {
+    Simulator.prototype.upload = function (data, projectName, target, appid, devices) {
         var dataArr = this.uint8ToArray(new Uint8Array(data));
         var message = this.encodeMessage({
             target: target,
             projectName: projectName,
             appid: appid,
             size: data.byteLength,
-            data: dataArr
+            data: dataArr,
+            devices: devices
         });
         this.sendMessage(message);
     };

package/modules/websocket.js

@@ -31,7 +31,7 @@ var ws_1 = __importDefault(require("ws"));
 var common_1 = require("../utils/common");
 var WebSocketClass = (function () {
     function WebSocketClass(_a) {
-        var url = _a.url, connectCb = _a.connectCb, disconnectCb = _a.disconnectCb;
+        var url = _a.url, connectWSCB = _a.connectWSCB, disConnectWSCB = _a.disConnectWSCB;
         var _this = this;
         this.msgEventIDs = {};
         this.handleListenMsgEventReturn = function (data) {
@@ -60,11 +60,11 @@ var WebSocketClass = (function () {
         };
         this.socket = new ws_1["default"](url);
         this.socket.on('open', function () {
-            connectCb();
+            connectWSCB();
             _this.listenEvent();
         });
         this.socket.on('close', function () {
-            disconnectCb();
+            disConnectWSCB();
         });
         this.socket.on('error', function (error) {
             logger.error(error);
@@ -79,23 +79,32 @@ var WebSocketClass = (function () {
     WebSocketClass.prototype.uint8ToArray = function (source) {
         return Array.prototype.slice.call(source);
     };
-    WebSocketClass.prototype.sendMessage = function (params, method) {
+    WebSocketClass.prototype.sendMessage = function (params, options) {
+        if (options === void 0) { options = {}; }
         var msgParams;
         var msg = params;
+        var _a = options.method, method = _a === void 0 ? '' : _a;
         if (method) {
             msgParams = {
                 method: method,
                 params: params,
                 jsonrpc: '2.0',
-                id: this.createMsgEventID(method)
+                id: this.createMsgEventID(method, params === null || params === void 0 ? void 0 : params.type)
             };
             msg = JSON.stringify(msgParams);
         }
         this.socket.send(msg, { binary: false });
     };
-    WebSocketClass.prototype.createMsgEventID = function (method) {
-        var id = Math.round(Math.random() * 100);
-        this.msgEventIDs[method] = id;
+    WebSocketClass.prototype.createMsgEventID = function (method, type) {
+        var id = parseInt('' + Math.random() * 10000);
+        var prop = method;
+        var typeMap = {
+            'screenshot': 'screenShot'
+        };
+        if (type && typeMap[type]) {
+            prop = typeMap[type];
+        }
+        this.msgEventIDs[prop] = id;
         return id;
     };
     return WebSocketClass;

package/package.json

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

package/utils/common.js

@@ -29,6 +29,7 @@ exports.__esModule = true;
 exports.getDeviceInfoFromAppJson = exports.handleListenMsgEvent = exports.getOptionalConnectDevice = exports.uint8ToArray = void 0;
 var path = __importStar(require("path"));
 var fs_1 = __importDefault(require("fs"));
+var os_1 = __importDefault(require("os"));
 var logger = __importStar(require("./logger"));
 var storage_1 = require("../modules/storage");
 var project_1 = require("../config/project");
@@ -97,6 +98,17 @@ function handleListenMsgEvent(msgEventName, data) {
                 logger.info(str);
             }
             break;
+        case 'screenShot':
+            var path_1 = "".concat(os_1["default"].homedir(), "/desktop/screenShot.png");
+            fs_1["default"].writeFile(path_1, Buffer.from(data.result, 'hex'), function (err) {
+                if (err) {
+                    logger.log('screenShot error', err);
+                }
+                else {
+                    logger.success("screenShot path:".concat(path_1));
+                }
+            });
+            break;
         default:
             break;
     }