@zeppos/zeus-cli 1.0.7 → 1.0.8

package/config/device.js

@@ -1,7 +1,7 @@
 "use strict";
-var _a;
+var _a, _b;
 exports.__esModule = true;
-exports.deviceTargets = exports.DeviceScreenType = exports.DeviceSource = exports.DevicePlatformName = exports.DeviceTarget = void 0;
+exports.deviceInternalCodename = exports.deviceTargets = exports.DeviceScreenType = exports.DeviceSource = exports.DevicePlatformName = exports.DeviceTarget = void 0;
 var DeviceTarget;
 (function (DeviceTarget) {
     DeviceTarget["MADRID"] = "madrid";
@@ -87,3 +87,11 @@ exports.deviceTargets = (_a = {},
         }
     },
     _a);
+exports.deviceInternalCodename = (_b = {},
+    _b[DeviceSource.MADRID] = DeviceTarget.MADRID,
+    _b[DeviceSource.MADRIDW] = DeviceTarget.MADRID,
+    _b[DeviceSource.VERONA] = DeviceTarget.VERONA,
+    _b[DeviceSource.VERONAW] = DeviceTarget.VERONA,
+    _b[DeviceSource.ZURICH] = DeviceTarget.ZURICH,
+    _b[DeviceSource.ZURICHW] = DeviceTarget.ZURICH,
+    _b);

package/modules/build.js

@@ -72,19 +72,17 @@ exports.__esModule = true;
 exports.buildPreview = exports.buildProd = exports.buildDev = exports.build = exports.chooseBuildPackages = exports.BuildMode = void 0;
 // @ts-ignore
 var node_js_1 = require("@zeppos/zpm/lib/node.js");
-var os_1 = __importDefault(require("os"));
 var fs_1 = __importDefault(require("fs"));
+var rd = __importStar(require("rd"));
 var path = __importStar(require("path"));
 var lodash_1 = __importDefault(require("lodash"));
 var axios_1 = __importDefault(require("axios"));
 var url_1 = require("url");
 var fs_extra_1 = __importDefault(require("fs-extra"));
-var path_1 = require("path");
 var form_data_1 = __importDefault(require("form-data"));
 var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var login_1 = require("./login");
-var md5_1 = require("../utils/md5");
 var logger = __importStar(require("../utils/logger"));
 var STUDIO_URL = 'https://studio.huami.com';
 var BuildMode;
@@ -99,7 +97,7 @@ function chooseBuildPackages() {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    appJson = fs_extra_1["default"].readJSONSync((0, path_1.resolve)('./app.json'));
+                    appJson = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'));
                     return [4 /*yield*/, inquirer_1["default"].prompt([
                             {
                                 name: 'target',
@@ -120,19 +118,11 @@ var build = function (mode, packages) {
     if (mode === void 0) { mode = BuildMode.PROD; }
     if (packages === void 0) { packages = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var buildTempDir, choosedPackages, buildOptions, buildInfo, distPath;
+        var workspace, choosedPackages, buildOptions, buildInfo, DistDir_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    buildTempDir = '';
-                    try {
-                        buildTempDir = path.join(os_1["default"].tmpdir(), "zepp-" + (0, md5_1.md5)(path.resolve('./')));
-                        fs_extra_1["default"].copySync('./', buildTempDir);
-                    }
-                    catch (err) {
-                        logger.error('failed to copy project to temp dir');
-                        logger.log(err);
-                    }
+                    workspace = path.resolve('./');
                     if (!(mode === BuildMode.PROD)) return [3 /*break*/, 1];
                     packages.length = 0;
                     return [3 /*break*/, 3];
@@ -149,7 +139,7 @@ var build = function (mode, packages) {
                     _a.label = 3;
                 case 3:
                     buildOptions = {
-                        path: buildTempDir,
+                        path: workspace,
                         targets: packages,
                         buildMode: mode,
                         jsc: '' // 不开启 js => c
@@ -161,10 +151,12 @@ var build = function (mode, packages) {
                 case 4:
                     buildInfo = _a.sent();
                     if (buildInfo) {
-                        distPath = path.join('./', 'dist');
-                        fs_extra_1["default"].emptyDirSync(distPath);
-                        fs_extra_1["default"].copySync(path.join(buildTempDir, 'dist'), distPath);
-                        fs_extra_1["default"].removeSync(buildTempDir);
+                        DistDir_1 = path.join(workspace, 'dist');
+                        rd.eachFileSync(DistDir_1, function (file) {
+                            if (file !== path.join(DistDir_1, buildInfo)) {
+                                fs_extra_1["default"].removeSync(file);
+                            }
+                        });
                     }
                     return [2 /*return*/, buildInfo];
             }

package/modules/run.js

@@ -71,8 +71,16 @@ 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,7 +116,7 @@ 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 zabName, zabPath, uzipZabPath, zabFileList, zabBuffer, zpkFileName, zpkPath, projectName, targetDeviceInternalName;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -131,13 +139,15 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                                         return lodash_1["default"].startsWith(fileName, packages[0] + ".");
                                     });
                                     if (zpkFileName) {
-                                        zabBuffer = Buffer.from(fs_1["default"].readFileSync(path.resolve(uzipZabPath, "./" + zpkFileName)));
+                                        zpkPath = path.resolve(uzipZabPath, "./" + zpkFileName);
+                                        zabBuffer = Buffer.from(fs_1["default"].readFileSync(zpkPath));
                                     }
                                 }
                                 projectName = process.cwd().split('/').slice(-1)[0];
                                 if (zabBuffer.length) {
                                     logger.info('refrshing simulator...');
-                                    simulator.upload(zabBuffer, projectName);
+                                    targetDeviceInternalName = getDeviceInternalCodename(packages[0]);
+                                    simulator.upload(zabBuffer, projectName, targetDeviceInternalName);
                                 }
                                 else {
                                     logger.error('can\'t find device package, pleace check the build result');

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.8",
   "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.37",
     "axios": "^0.23.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",