@aiot-toolkit/emulator 2.0.2-beta.3 → 2.0.2-beta.4

package/lib/instance/miwear.d.ts

@@ -5,6 +5,7 @@ import CommonInstance from './common';
  * 针对 vela4.0 的镜像
  */
 declare class MiwearInstance extends CommonInstance {
+    private params;
     private appPathInEmulator;
     private debugSocket?;
     private reconnectCount;
@@ -19,7 +20,7 @@ declare class MiwearInstance extends CommonInstance {
     startupQuickApp(options: IStartOptions): Promise<void>;
     /** 将快应用安装到应用列表 */
     installRpkToAppList(rpkPath: string, targetDir: string): Promise<void>;
-    initDebugSocket(): Promise<void> | undefined;
+    initDebugSocket(): Promise<void>;
     /** 通知模拟器更新 */
     handleUpdate(): Promise<void>;
     /** 创建server */

package/lib/instance/miwear.js

@@ -35,7 +35,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const JavascriptDefaultCompileOption_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/JavascriptDefaultCompileOption"));
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const adbMiwt = __importStar(require("@miwt/adb"));
 const child_process_1 = require("child_process");
@@ -55,6 +54,7 @@ const MAX_RECONNECT_COUNT = 8;
 class MiwearInstance extends common_1.default {
     constructor(params) {
         super(params);
+        this.params = params;
         this.appPathInEmulator = '/data/quickapp/app';
         this.reconnectCount = 0;
     }
@@ -155,8 +155,6 @@ class MiwearInstance extends common_1.default {
                         ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
                         resolve();
                     }, 8000);
-                    ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
-                    resolve();
                 }
             });
         });
@@ -193,13 +191,16 @@ class MiwearInstance extends common_1.default {
     }
     /** 在goldfish中启动快应用 */
     startupQuickApp(options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { package: appPackageName } = this.projectInfo;
-            const releaseDir = path_1.default.resolve(this.projectPath, JavascriptDefaultCompileOption_1.default.releasePath || 'dist');
+            const releaseDir = this.isRpk
+                ? path_1.default.resolve(this.projectPath, '../')
+                : path_1.default.resolve(this.projectPath, ((_a = this.params.compilerOption) === null || _a === void 0 ? void 0 : _a.releasePath) || 'dist');
             const files = fs_extra_1.default
                 .readdirSync(releaseDir)
                 .filter(item => item.includes(appPackageName) && item.endsWith('.rpk'));
-            if (files.length < 0) {
+            if (files.length === 0) {
                 ColorConsole_1.default.error(`### Emulator the rpk does not exist`);
             }
             const rpkPath = path_1.default.resolve(releaseDir, files[0]);
@@ -221,7 +222,6 @@ class MiwearInstance extends common_1.default {
             try {
                 const sn = `127.0.0.1:${this.adbPort}`;
                 const { package: packageName } = this.projectInfo;
-                const rpkName = path_1.default.basename(rpkPath);
                 // 1. 查询应用是否已经安装，如果安装了，则先卸载
                 const lsCmd = `adb -s ${sn} shell ls ${this.appPathInEmulator}`;
                 const res = yield adbMiwt.execAdbCmdAsync(lsCmd);
@@ -234,7 +234,7 @@ class MiwearInstance extends common_1.default {
                 }
                 // 2. adb push应用的rpk
                 const targetPath = `${targetDir}/${packageName}.rpk`;
-                const pushCmd = `adb -s ${sn} push ${rpkPath} ${targetPath}`;
+                const pushCmd = `adb -s ${sn} push "${rpkPath}" ${targetPath}`;
                 ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
                 yield adbMiwt.execAdbCmdAsync(pushCmd);
                 yield (0, utils_1.sleep)(100);
@@ -243,38 +243,42 @@ class MiwearInstance extends common_1.default {
                 ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
                 adbMiwt.execAdbCmdAsync(installCmd);
             }
-            catch (e) { }
+            catch (e) {
+                ColorConsole_1.default.error(`### Emulator ### ${e.message}`);
+            }
         });
     }
     initDebugSocket() {
-        if (this.debugSocket && this.debugSocket.OPEN) {
-            return Promise.resolve();
-        }
-        this.debugSocket = new ws_1.default(`ws://localhost:${this.debugPort}`);
-        this.debugSocket.onopen = () => {
-            ColorConsole_1.default.info(`### Emulator debugSocket connect success`);
-            return Promise.resolve();
-        };
-        this.debugSocket.onerror = (e) => {
-            var _a;
-            // 重连机制
-            (_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.terminate();
-            if (this.reconnectCount < MAX_RECONNECT_COUNT) {
-                ColorConsole_1.default.info(`### Emulator the ${this.reconnectCount + 1}th time to reconnect debug server`);
-                this.reconnectCount++;
-                setTimeout(() => this.initDebugSocket(), 2000);
+        return new Promise((resolve, reject) => {
+            if (this.debugSocket && this.debugSocket.OPEN) {
+                return resolve();
             }
-            else {
+            this.debugSocket = new ws_1.default(`ws://localhost:${this.debugPort}`);
+            this.debugSocket.onopen = () => {
+                ColorConsole_1.default.info(`### Emulator debugSocket connect success`);
+                return resolve();
+            };
+            this.debugSocket.onerror = (errorEvent) => {
+                var _a;
+                // 重连机制
+                (_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.terminate();
+                if (this.reconnectCount < MAX_RECONNECT_COUNT) {
+                    ColorConsole_1.default.info(`### Emulator the ${this.reconnectCount + 1}th time to reconnect debug server`);
+                    this.reconnectCount++;
+                    setTimeout(() => this.initDebugSocket(), 2000);
+                }
+                else {
+                    this.debugSocket = undefined;
+                    this.reconnectCount = 0;
+                    return reject(`### Emulator debugSocket connect failed, ${errorEvent.message}`);
+                }
+            };
+            this.debugSocket.onclose = (closeEvent) => {
                 this.debugSocket = undefined;
                 this.reconnectCount = 0;
-                return Promise.reject(`### Emulator debugSocket connect failed`);
-            }
-        };
-        this.debugSocket.onclose = (e) => {
-            this.debugSocket = undefined;
-            this.reconnectCount = 0;
-            ColorConsole_1.default.log(`### Emulator debugSocket connect close: ${e.data}`);
-        };
+                ColorConsole_1.default.log(`### Emulator debugSocket connect close: ${closeEvent.reason}`);
+            };
+        });
     }
     /** 通知模拟器更新 */
     handleUpdate() {
@@ -286,12 +290,13 @@ class MiwearInstance extends common_1.default {
                 // 1. 将整包重新推到miwear中（TODO：增量更新）
                 const sn = `127.0.0.1:${this.adbPort}`;
                 const { package: appPackageName } = this.projectInfo;
-                // windows平台adb push时无法使用通配符，需另外处理
-                if (os_1.default.platform() === 'win32') {
+                // windows平台adb push时无法使用通配符，需另外处理; 
+                // 项目路径包含空格时，无法通过加引号来使用 * 通配符
+                if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
                     const rmCmd = `adb -s ${sn} shell rm -r ${this.appPathInEmulator}/${appPackageName}`;
                     yield adbMiwt.execAdbCmdAsync(rmCmd);
                     const sourcePath = path_1.default.resolve(this.projectPath, './build');
-                    const pushCmd = `adb -s ${sn} push ${sourcePath} ${this.appPathInEmulator}/${appPackageName}`;
+                    const pushCmd = `adb -s ${sn} push "${sourcePath}" ${this.appPathInEmulator}/${appPackageName}`;
                     yield adbMiwt.execAdbCmdAsync(pushCmd);
                 }
                 else {

package/lib/static/constants.d.ts

@@ -6,14 +6,17 @@ export declare const defaultSkinHome: string;
 export declare const defaultQuickappHome: string;
 export declare const defaultToolsHome: string;
 export declare const defaultVncPort = 5900;
-export declare const emulatorEnvVersion: {
+export declare const VelaImageVersionList: {
+    label: string;
+    value: string;
+    time: string;
+}[];
+export declare const EmulatorEnvVersion: {
     name: string;
     emulator: string;
     qa: string;
     skins: string;
-    'system-images': {
-        release: string;
-        dev: string;
-    };
+    'system-images': string;
     tools: string;
+    modem_simulator: string;
 };

package/lib/static/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emulatorEnvVersion = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultQuickappHome = exports.defaultSkinHome = exports.defaultEmulatorHome = exports.defaultImageHome = exports.defaultAvdHome = exports.defaultSDKHome = void 0;
+exports.EmulatorEnvVersion = exports.VelaImageVersionList = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultQuickappHome = exports.defaultSkinHome = exports.defaultEmulatorHome = exports.defaultImageHome = exports.defaultAvdHome = exports.defaultSDKHome = void 0;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 exports.defaultSDKHome = path_1.default.resolve(os_1.default.homedir(), '.export');
@@ -14,14 +14,24 @@ exports.defaultSkinHome = path_1.default.resolve(exports.defaultSDKHome, 'skins'
 exports.defaultQuickappHome = path_1.default.resolve(exports.defaultSDKHome, 'qa');
 exports.defaultToolsHome = path_1.default.resolve(exports.defaultSDKHome, 'tools');
 exports.defaultVncPort = 5900;
-exports.emulatorEnvVersion = {
+exports.VelaImageVersionList = [
+    {
+        label: 'vela正式版（4.0）',
+        value: 'vela-release-4.0',
+        time: '2024-03-28T04:11:00'
+    },
+    {
+        label: 'vela开发版（dev, 0.0.2）',
+        value: 'vela-dev-0.0.2',
+        time: '2023-12-04T16:31:00',
+    },
+];
+exports.EmulatorEnvVersion = {
     name: '模拟器资源版本管理',
-    emulator: '0.0.1',
+    emulator: '0.0.3',
     qa: '0.0.1',
     skins: '0.0.1',
-    'system-images': {
-        release: '4.0',
-        dev: '0.0.2'
-    },
-    tools: '0.0.2'
+    'system-images': exports.VelaImageVersionList[0].value,
+    tools: '0.0.2',
+    modem_simulator: '0.0.1'
 };

package/lib/typing/Instance.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" />
+import IJavascriptCompileOption from "@aiot-toolkit/aiotpack/lib/compiler/javascript/interface/IJavascriptCompileOption";
 import { IAvdResourcePaths } from "./Avd";
 export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
     projectPath: string;
     sourceRoot?: string;
+    compilerOption?: Partial<IJavascriptCompileOption>;
 }
 export interface IStartOptions {
     avdName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.3",
+  "version": "2.0.2-beta.4",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,10 +35,10 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.3",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.3",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.4",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.4",
     "find-process": "^1.4.7",
     "portfinder": "^1.0.32"
   },
-  "gitHead": "8bfdd8895ffd8fc4aa1465779def5ab4392a7a4b"
+  "gitHead": "656add8e64d8101b9f3886957c5b9ae23e2e854f"
 }