aiot-toolkit 2.0.2-beta.16 → 2.0.2-beta.18

package/lib/builder/XtsBuilder.js

@@ -47,8 +47,8 @@ class XtsBuilder {
         return fs_1.default.existsSync(path_1.default.resolve(projectPath, 'app/app.xts'));
     }
     build(projectPath, options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const watch = options.watch || false;
             shared_utils_1.ColorConsole.success('Start build...\n', { word: 'ProjectPath: ', style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.SUCCESS) }, projectPath, '\n', { word: 'buildOptions: ', style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.SUCCESS) }, JSON.stringify(options));
             const compilerOptions = {
@@ -61,7 +61,7 @@ class XtsBuilder {
                 const preWorks = config.beforeCompile || [];
                 for (let item of preWorks) {
                     try {
-                        yield item(context, [], config, compilerOptions);
+                        yield item({ context, config, compilerOption: compilerOptions });
                     }
                     catch (error) {
                         // 报错 prework的item error
@@ -70,7 +70,7 @@ class XtsBuilder {
                 const follWorks = config.afterCompile || [];
                 for (let item of follWorks) {
                     try {
-                        yield item.worker(context, config, compilerOptions);
+                        yield item.worker({ context, config, compilerOption: compilerOptions });
                     }
                     catch (error) {
                         // 报错 prework的item error

package/lib/starter/androidRouter/PackageRouter.js

@@ -27,13 +27,13 @@ class PackageRouter {
         this.param = param;
         this.routeList = [
             {
-                path: '/qrcode',
+                path: '/qrcode', // 获取二维码图片
                 handler: (ctx, next) => {
                     return this.handlerQrCode(ctx, next);
                 }
             },
             {
-                path: '/bundle',
+                path: '/bundle', // 获取 rpk 包
                 handler: (ctx, next) => {
                     this.recordDevice(ctx);
                     return this.handlerDownLoadRpk(ctx, next);

package/lib/utils/AdbUtils.d.ts

@@ -4,7 +4,6 @@
 declare class AdbUtils {
     static connect(ip: string, port: string): Promise<boolean>;
     static getAllConnectedDevices(): Promise<string[]>;
-    static getUSBConnectedDevices(): Promise<string[]>;
     static installApk(sn: string, apkPath: string): Promise<{
         status: boolean;
         msg: string;

package/lib/utils/AdbUtils.js

@@ -31,13 +31,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const adbMiwt = __importStar(require("@miwt/adb"));
-const adb_commander_1 = __importDefault(require("adb-commander"));
 /**
  * AdbUtils
  */
@@ -56,13 +52,6 @@ class AdbUtils {
             return res.map(({ sn }) => sn);
         });
     }
-    // 获取USB连接的设备
-    static getUSBConnectedDevices() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield adb_commander_1.default.deviceList();
-            return res.deviceList;
-        });
-    }
     // 安装设备
     static installApk(sn, apkPath) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/utils/DeviceUtil.js

@@ -55,7 +55,7 @@ class DeviceUtil {
                 // 1. 判断设备是否连接
                 yield this.connectDevice(ip);
                 // 2. 获取连接的设备
-                const deviceList = yield AdbUtils_1.default.getUSBConnectedDevices();
+                const deviceList = yield AdbUtils_1.default.getAllConnectedDevices();
                 const finalDeviceList = deviceList.length > 0
                     ? yield this.queryDevice(deviceList, 'Install Quickapp debugger or previewer ')
                     : [];
@@ -152,8 +152,8 @@ class DeviceUtil {
      * @param orderText
      * @returns
      */
-    static queryDevice(deviceList, orderText = '') {
-        return __awaiter(this, void 0, void 0, function* () {
+    static queryDevice(deviceList_1) {
+        return __awaiter(this, arguments, void 0, function* (deviceList, orderText = '') {
             if (!deviceList || deviceList.length === 0) {
                 shared_utils_1.ColorConsole.throw(`No device is connected yet, please confirm and try again`);
                 return;
@@ -271,8 +271,8 @@ class DeviceUtil {
      * @param apkPath
      * @returns
      */
-    static installApk(deviceList = [], apkPath) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static installApk() {
+        return __awaiter(this, arguments, void 0, function* (deviceList = [], apkPath) {
             try {
                 const newDeviceListPromiseArray = Array.from(deviceList, (deviceSn) => {
                     return AdbUtils_1.default.installApk(deviceSn, apkPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2-beta.16",
+  "version": "2.0.2-beta.18",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -21,18 +21,17 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.16",
-    "@aiot-toolkit/commander": "2.0.2-beta.16",
-    "@aiot-toolkit/emulator": "2.0.2-beta.16",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.16",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.18",
+    "@aiot-toolkit/commander": "2.0.2-beta.18",
+    "@aiot-toolkit/emulator": "2.0.2-beta.18",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.18",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
-    "adb-commander": "^0.1.9",
     "adm-zip": "^0.5.10",
     "axios": "^1.7.4",
     "cli-progress": "^3.12.0",
     "dayjs": "^1.11.10",
-    "file-lane": "2.0.2-beta.16",
+    "file-lane": "2.0.2-beta.18",
     "fs-extra": "^11.2.0",
     "koa-router": "^12.0.1",
     "lodash": "^4.17.21",
@@ -49,5 +48,5 @@
     "@types/semver": "^7.5.8",
     "@types/ws": "^8.5.10"
   },
-  "gitHead": "785701c64914f50acd18ab71ea41b2f5a2cd161c"
+  "gitHead": "b73a79ef04edac808f316bf8b8fb1718422daa1c"
 }