npm - aiot-toolkit - Versions diffs - 2.0.1-alpha.11 → 2.0.1-alpha.13 - Mend

aiot-toolkit 2.0.1-alpha.11 → 2.0.1-alpha.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

package/lib/bin.js +24 -30
package/lib/bin.js.map +1 -1
package/lib/builder/UxBuilder.d.ts +1 -0
package/lib/builder/UxBuilder.js +20 -7
package/lib/builder/UxBuilder.js.map +1 -1
package/lib/builder/XtsBuilder.js +3 -11
package/lib/builder/XtsBuilder.js.map +1 -1
package/lib/starter/IStarter.d.ts +23 -0
package/lib/starter/IStarter.js +47 -0
package/lib/starter/IStarter.js.map +1 -0
package/lib/starter/UxStarter.d.ts +10 -0
package/lib/starter/UxStarter.js +138 -0
package/lib/starter/UxStarter.js.map +1 -0
package/lib/starter/XtsStarter.d.ts +9 -0
package/lib/starter/XtsStarter.js +18 -0
package/lib/starter/XtsStarter.js.map +1 -0
package/lib/utils/AdbUtils.js +2 -9
package/lib/utils/AdbUtils.js.map +1 -1
package/lib/utils/DeviceUtil.d.ts +1 -1
package/lib/utils/DeviceUtil.js +22 -91
package/lib/utils/DeviceUtil.js.map +1 -1
package/lib/utils/RequestUtils.js +4 -17
package/lib/utils/RequestUtils.js.map +1 -1
package/lib/utils/VelaAvdUtils.js +15 -56
package/lib/utils/VelaAvdUtils.js.map +1 -1
package/package.json +10 -7
package/lib/starter/GoldfishStarter.d.ts +0 -9
package/lib/starter/GoldfishStarter.js +0 -108
package/lib/starter/GoldfishStarter.js.map +0 -1

package/lib/utils/AdbUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["utils/AdbUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA~~,6DAAsD;AACtD~~,+FAAsE;AACtE,mDAAoC;AACpC,kEAAwC;AAExC;;GAEG;AACH,MAAM,QAAQ;IACZ,OAAO;IACP,MAAM,CAAO,OAAO,CAAC,EAAU,EAAE,IAAY;;YAC3C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,IAAI,EAAE,CAAC,CAAA;YAC5E,OAAO,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QAC/C,CAAC;KAAA;IACD,uBAAuB;IACvB,MAAM,CAAO,sBAAsB;;YACjC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAA;YACzC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;QAChC,CAAC;KAAA;IACD,aAAa;IACb,MAAM,CAAO,sBAAsB;;YACjC,MAAM,GAAG,GAAG,MAAM,uBAAY,CAAC,UAAU,EAAE,CAAA;YAC3C,OAAO,GAAG,CAAC,UAAU,CAAA;QACvB,CAAC;KAAA;IACD,OAAO;IACP,MAAM,CAAO,UAAU,CAAC,EAAU,EAAE,OAAe;;YACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;YACpD,OAAO,MAAM,CAAA;QACf,CAAC;KAAA;IACD,QAAQ;IACR,MAAM,CAAO,aAAa,CAAC,QAAgB;;YACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CACjC,UAAU,QAAQ,uDAAuD,CAC1E,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBAC1C,oBAAoB;gBACpB,sBAAY,CAAC,GAAG,CAAC~~;oBACf~~,~~OAAO~~,EAAE,~~IAAI;iBACd,~~CAAC,CAAA;~~YACJ~~,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBAC1C,oBAAoB;gBACpB,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAC9B,sBAAY,CAAC,~~GAAG,CAAC;wBACf,~~KAAK,~~EAAE,wBAAS,~~CAAC,~~KAAK;wBACtB~~,~~OAAO~~,EAAE,~~IAAI;qBACd,~~CAAC,CAAA;~~oBACF,OAAO,CAAC,IAAI,EAAE,CAAA~~;~~iBACf;~~YACH,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACxB,WAAW;gBACX,OAAO,CAAC,OAAO,EAAE,CAAA;YACnB,CAAC,CAAC,CAAA;QACJ,CAAC;KAAA;CACF;AACD,kBAAe,QAAQ,CAAA","file":"AdbUtils.js","sourcesContent":["import ~~{ LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport~~ ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport * as adbMiwt from '@miwt/adb'\nimport adbCommander from 'adb-commander'\n\n/*\n AdbUtils\n */\nclass AdbUtils {\n // 连接设备\n static async connect(ip: string, port: string) {\n const adbConnet = await adbMiwt.execAdbCmdAsync(`adb connect ${ip}:${port}`)\n return adbConnet.indexOf('connected to') >= 0\n }\n // 获取所有已连接的设备(包含无线连接设备)\n static async getAllConnectedDevices() {\n const res = await adbMiwt.getAdbDevices()\n return res.map(({ sn }) => sn)\n }\n // 获取USB连接的设备\n static async getUSBConnectedDevices() {\n const res = await adbCommander.deviceList()\n return res.deviceList\n }\n // 安装设备\n static async installApk(sn: string, apkPath: string) {\n const result = await adbMiwt.installApk(sn, apkPath)\n return result\n }\n // 启动调试器\n static async startDebugger(deviceSn: string) {\n const adbShell = adbMiwt.execAdbCmd(\n `adb -s ${deviceSn} shell am start -n \"org.hapjs.debugger/.MainActivity\"`\n )\n adbShell.stdout.on('data', (data: string) => {\n // 监听stderr事件，获取输出内容\n ColorConsole.log({~~\n message:~~ data\n })\n })\n adbShell.stderr.on('data', (data: string) => {\n // 监听stderr事件，获取输出内容\n if (data.indexOf('Error') >= 0) {\n ColorConsole.~~log~~(~~{\n level:~~ ~~LOG_LEVEL.Error,\n message:~~ data\n })\n ~~process.exit()\n~~ }\n })\n adbShell.on('close', () => {\n // 处理命令正常结束\n Promise.resolve()\n })\n }\n}\nexport default AdbUtils\n"],"sourceRoot":"../../src"}
1	+ {"version":3,"sources":["utils/AdbUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+FAAsE;AACtE,mDAAoC;AACpC,kEAAwC;AAExC;;GAEG;AACH,MAAM,QAAQ;IACZ,OAAO;IACP,MAAM,CAAO,OAAO,CAAC,EAAU,EAAE,IAAY;;YAC3C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,IAAI,EAAE,CAAC,CAAA;YAC5E,OAAO,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QAC/C,CAAC;KAAA;IACD,uBAAuB;IACvB,MAAM,CAAO,sBAAsB;;YACjC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAA;YACzC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;QAChC,CAAC;KAAA;IACD,aAAa;IACb,MAAM,CAAO,sBAAsB;;YACjC,MAAM,GAAG,GAAG,MAAM,uBAAY,CAAC,UAAU,EAAE,CAAA;YAC3C,OAAO,GAAG,CAAC,UAAU,CAAA;QACvB,CAAC;KAAA;IACD,OAAO;IACP,MAAM,CAAO,UAAU,CAAC,EAAU,EAAE,OAAe;;YACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;YACpD,OAAO,MAAM,CAAA;QACf,CAAC;KAAA;IACD,QAAQ;IACR,MAAM,CAAO,aAAa,CAAC,QAAgB;;YACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CACjC,UAAU,QAAQ,uDAAuD,CAC1E,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBAC1C,oBAAoB;gBACpB,sBAAY,CAAC,GAAG,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAA;YACnD,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBAC1C,oBAAoB;gBACpB,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAC9B,sBAAY,CAAC,KAAK,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAA;iBACpD;YACH,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACxB,WAAW;gBACX,OAAO,CAAC,OAAO,EAAE,CAAA;YACnB,CAAC,CAAC,CAAA;QACJ,CAAC;KAAA;CACF;AACD,kBAAe,QAAQ,CAAA","file":"AdbUtils.js","sourcesContent":["import ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport * as adbMiwt from '@miwt/adb'\nimport adbCommander from 'adb-commander'\n\n/*\n AdbUtils\n */\nclass AdbUtils {\n // 连接设备\n static async connect(ip: string, port: string) {\n const adbConnet = await adbMiwt.execAdbCmdAsync(`adb connect ${ip}:${port}`)\n return adbConnet.indexOf('connected to') >= 0\n }\n // 获取所有已连接的设备(包含无线连接设备)\n static async getAllConnectedDevices() {\n const res = await adbMiwt.getAdbDevices()\n return res.map(({ sn }) => sn)\n }\n // 获取USB连接的设备\n static async getUSBConnectedDevices() {\n const res = await adbCommander.deviceList()\n return res.deviceList\n }\n // 安装设备\n static async installApk(sn: string, apkPath: string) {\n const result = await adbMiwt.installApk(sn, apkPath)\n return result\n }\n // 启动调试器\n static async startDebugger(deviceSn: string) {\n const adbShell = adbMiwt.execAdbCmd(\n `adb -s ${deviceSn} shell am start -n \"org.hapjs.debugger/.MainActivity\"`\n )\n adbShell.stdout.on('data', (data: string) => {\n // 监听stderr事件，获取输出内容\n ColorConsole.log(`### startDebugger ### ${data}`)\n })\n adbShell.stderr.on('data', (data: string) => {\n // 监听stderr事件，获取输出内容\n if (data.indexOf('Error') >= 0) {\n ColorConsole.throw(`### startDebugger ### ${data}`)\n }\n })\n adbShell.on('close', () => {\n // 处理命令正常结束\n Promise.resolve()\n })\n }\n}\nexport default AdbUtils\n"],"sourceRoot":"../../src"}

package/lib/utils/DeviceUtil.d.ts CHANGED Viewed

@@ -10,7 +10,7 @@ declare class DeviceUtil {
      * 获取连接上的所有设备数组，供IDE使用
      * @returns
      */
-    static getAllConnectedDevices(): Promise<string[]>;
+    static getAllConnectedDevices(): Promise<string[] | undefined> | undefined;
     /**
      * 安装调试器、预览版
      * @param options

package/lib/utils/DeviceUtil.js CHANGED Viewed

@@ -31,28 +31,16 @@ class DeviceUtil {
         try {
             return AdbUtils_1.default.getAllConnectedDevices().then((deviceList) => {
                 if (deviceList.length > 0) {
-                    ColorConsole_1.default.log({
-                        message: `Devices connected via adb： ${deviceList.join(', ')}.`
-                    });
+                    ColorConsole_1.default.info(`Devices connected via adb： ${deviceList.join(', ')}.`);
                     return Promise.resolve(deviceList);
                 }
                 else {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        message: `No device is currently connected, please check the following preparations in turn：\n  1. Whether the device is started;\n  2. Whether in the same LAN WI-FI;\n  3. Whether the device can be connected to the computer via USB;`,
-                        isOnlyPrintError: true
-                    });
-                    process.exit();
+                    ColorConsole_1.default.throw(`No device is currently connected, please check the following preparations in turn：\n  1. Whether the device is started;\n  2. Whether in the same LAN WI-FI;\n  3. Whether the device can be connected to the computer via USB;`);
                 }
             });
         }
         catch (error) {
-            ColorConsole_1.default.log({
-                level: shared_utils_1.LOG_LEVEL.Error,
-                message: 'Error getting connection information of adb device',
-                isOnlyPrintError: true
-            });
-            process.exit();
+            ColorConsole_1.default.throw('Error getting connection information of adb device');
         }
     }
     /**
@@ -75,11 +63,7 @@ class DeviceUtil {
                 connectDeviceList = finalDeviceList ? [...finalDeviceList] : [];
                 // 若connectDeviceList为空，应该warn并结束程序
                 connectDeviceList.length <= 0 &&
-                    ColorConsole_1.default.log({
-                        message: 'No device requires debugger or previewer installation',
-                        level: shared_utils_1.LOG_LEVEL.Warn
-                    }) &&
-                    process.exit();
+                    ColorConsole_1.default.throw('No device requires debugger or previewer installation');
                 // 3. 下载并获取调试器、预览器地址
                 const debuggerPath = yield this.downloadApk(options, true);
                 const previewPath = yield this.downloadApk(options, false);
@@ -89,7 +73,7 @@ class DeviceUtil {
                 return Promise.resolve('All devices successfully installed the Quickapp debugger and previewer');
             }
             catch (error) {
-                return Promise.reject(new Error(`Failed to install debugger, error message：${error.message}`));
+                return Promise.reject(new Error(`Failed to install debugger, error message：${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`));
             }
         });
     }
@@ -122,21 +106,14 @@ class DeviceUtil {
                     }
                 }
                 if (ip.length === 0) {
-                    ColorConsole_1.default.log({
-                        message: `Since no ip address is entered, the connected device will be connected`
-                    });
+                    ColorConsole_1.default.log(`Since no ip address is entered, the connected device will be connected`);
                     return Promise.resolve();
                 }
                 const ips = ip.trim().split(',');
                 const invalidIps = ips.filter((ip) => !this.ipRegExp.test(ip));
                 if (invalidIps && invalidIps.length) {
                     invalidIps.map((ip) => {
-                        ColorConsole_1.default.log({
-                            message: `ip: ${ip} is invalid IP`,
-                            level: shared_utils_1.LOG_LEVEL.Error,
-                            isOnlyPrintError: true
-                        });
-                        process.exit();
+                        ColorConsole_1.default.throw(`ip: `, { word: ip, style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw) }, ` is invalid IP`);
                     });
                 }
                 else {
@@ -147,26 +124,16 @@ class DeviceUtil {
                         });
                         return AdbUtils_1.default.connect(ip, devicePort)
                             .then(() => {
-                            ColorConsole_1.default.log({
-                                level: shared_utils_1.LOG_LEVEL.Success,
-                                message: `wifi connection ip: The device with ip of "${ip}" succeeded`
-                            });
+                            ColorConsole_1.default.success(`wifi connection ip: The device with ip of "${ip}" succeeded`);
                             return Promise.resolve();
                         })
                             .catch((err) => {
-                            ColorConsole_1.default.log({
-                                level: shared_utils_1.LOG_LEVEL.Error,
-                                message: err,
-                                isOnlyPrintError: true
-                            });
-                            process.exit();
+                            ColorConsole_1.default.throw(`${err}`);
                         });
                     }));
                     return Promise.all(newDeviceListPromiseArray)
                         .then(() => {
-                        ColorConsole_1.default.log({
-                            message: 'All new WIFI devices are connected'
-                        });
+                        ColorConsole_1.default.log(`All new WIFI devices are connected`);
                         return Promise.resolve();
                     })
                         .catch(() => {
@@ -187,10 +154,7 @@ class DeviceUtil {
     static queryDevice(deviceList, orderText = '') {
         return __awaiter(this, void 0, void 0, function* () {
             if (!deviceList || deviceList.length === 0) {
-                ColorConsole_1.default.log({
-                    message: `No device is connected yet, please confirm and try again`,
-                    level: shared_utils_1.LOG_LEVEL.Error
-                });
+                ColorConsole_1.default.throw(`No device is connected yet, please confirm and try again`);
                 return;
             }
             const ALL_TEXT = 'All connected devices';
@@ -228,29 +192,20 @@ class DeviceUtil {
             const apkPath = path_1.default.join(__dirname, './apk/', fileName);
             if (fs_1.default.existsSync(apkPath)) {
                 // apk已下载
-                ColorConsole_1.default.log({
-                    message: 'The installation package has been downloaded, now use the cache file to install'
-                });
+                ColorConsole_1.default.log(`The installation package has been downloaded, now use the cache file to install`);
                 return apkPath;
             }
             else {
                 try {
                     const result = yield RequestUtils_1.default.downloadFile(url, fileName);
                     // 打印出成功信息
-                    ColorConsole_1.default.log({
-                        message: `Success to download, ${result}`,
-                        level: shared_utils_1.LOG_LEVEL.Success
-                    });
+                    ColorConsole_1.default.success(`Success to download, ${result}`);
                     return apkPath;
                 }
                 catch (error) {
                     // 打印出错误
-                    ColorConsole_1.default.log({
-                        message: `Failed to download the installation package, ${error}`,
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        isOnlyPrintError: true
-                    });
-                    process.exit();
+                    ColorConsole_1.default.throw(`Failed to download the installation package, ${error}`);
+                    return '';
                 }
             }
         });
@@ -272,11 +227,7 @@ class DeviceUtil {
                 let countTime = 0;
                 let data;
                 const sleep = () => {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        message: `Error when the device gets running platforms,request again after 3s delay`,
-                        isOnlyPrintError: true
-                    });
+                    ColorConsole_1.default.error(`Error when the device gets running platforms,request again after 3s delay`);
                     return new Promise((resolve) => setTimeout(resolve, 3000));
                 };
                 const requestPlatform = () => __awaiter(this, void 0, void 0, function* () {
@@ -291,27 +242,17 @@ class DeviceUtil {
                         const dataObj = JSON.parse(data);
                         if (!dataObj.availablePlatforms) {
                             // 请求结果不存在平台信息，报错，结束程序
-                            ColorConsole_1.default.log({
-                                level: shared_utils_1.LOG_LEVEL.Error,
-                                message: `the request result no avaliable platform `
-                            });
-                            process.exit();
+                            ColorConsole_1.default.throw(`The request result no avaliable platform `);
                         }
                         else {
                             // 打印请求的平台信息
                             const availablePlatforms = dataObj.availablePlatforms;
-                            ColorConsole_1.default.log({
-                                message: `The Quickapp engine list of device "${deviceSn}" is：${availablePlatforms.join(',')}`
-                            });
+                            ColorConsole_1.default.log(`The Quickapp engine list of device "${deviceSn}" is：${availablePlatforms.join(',')}`);
                         }
                     }
                     else {
                         //请求失败，结束程序
-                        ColorConsole_1.default.log({
-                            level: shared_utils_1.LOG_LEVEL.Error,
-                            message: `the device gets running platforms error`
-                        });
-                        process.exit();
+                        ColorConsole_1.default.throw(`The device gets running platforms error`);
                     }
                 });
                 // 先打开调试器，才能获取运行平台
@@ -319,10 +260,7 @@ class DeviceUtil {
                 yield requestPlatform();
             }
             catch (error) {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: `Error getting the list of Quickapp engines on the device, error message：${error.message}`
-                });
+                ColorConsole_1.default.throw(`Error getting the list of Quickapp engines on the device`);
             }
         });
     }
@@ -341,17 +279,10 @@ class DeviceUtil {
                 const apkName = path_1.default.basename(apkPath);
                 return Promise.all(newDeviceListPromiseArray)
                     .then(() => {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `All devices installed ${apkName}`
-                    });
+                    ColorConsole_1.default.success(`All devices installed ${apkName}`);
                 })
                     .catch(() => {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        message: `Installed ${apkName} failed`
-                    });
-                    process.exit();
+                    ColorConsole_1.default.throw(`Installed ${apkName} failed`);
                 });
             }
             catch (error) { }

package/lib/utils/DeviceUtil.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["utils/DeviceUtil.ts"],"names":[],"mappings":"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","file":"DeviceUtil.js","sourcesContent":["import { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport { checkbox, input, select } from '@inquirer/prompts'\nimport fs from 'fs'\nimport path from 'path'\nimport { IGetAvailablePlatform, IInstallApkAndDbg } from '../interface/CommandInterface'\nimport AdbUtils from './AdbUtils'\nimport RequestUtils from './RequestUtils'\n\n/*\n DeviceUtil\n /\nclass DeviceUtil {\n static ipRegExp =\n /^(?:(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)$/\n static CLIENT_PORT = 39517\n static quickapp_url = 'https://statres.quickapp.cn/quickapp/quickapptool/release/platform/'\n /\n 获取连接上的所有设备数组，供IDE使用\n * @returns\n /\n static getAllConnectedDevices() {\n try {\n return AdbUtils.getAllConnectedDevices().then((deviceList) => {\n if (deviceList.length > 0) {\n ColorConsole.log({\n message: `Devices connected via adb： ${deviceList.join(', ')}.`\n })\n return Promise.resolve(deviceList)\n } else {\n ColorConsole.log({\n level: LOG_LEVEL.Error,\n message: `No device is currently connected, please check the following preparations in turn：\\n 1. Whether the device is started;\\n 2. Whether in the same LAN WI-FI;\\n 3. Whether the device can be connected to the computer via USB;`,\n isOnlyPrintError: true\n })\n process.exit()\n }\n })\n } catch (error) {\n ColorConsole.log({\n level: LOG_LEVEL.Error,\n message: 'Error getting connection information of adb device',\n isOnlyPrintError: true\n })\n process.exit()\n }\n }\n /\n 安装调试器、预览版\n * @param options\n * @returns\n /\n static async installDbgAndMkp(options: IInstallApkAndDbg) {\n try {\n const { ip = '' } = options\n let connectDeviceList: string[] = [ip]\n // 1. 判断设备是否连接\n await this.connectDevice(ip)\n // 2. 获取连接的设备\n const deviceList = await AdbUtils.getUSBConnectedDevices()\n const finalDeviceList =\n deviceList.length > 0\n ? await this.queryDevice(deviceList, 'Install Quickapp debugger or previewer ')\n : []\n connectDeviceList = finalDeviceList ? [...finalDeviceList] : []\n // 若connectDeviceList为空，应该warn并结束程序\n connectDeviceList.length <= 0 &&\n ColorConsole.log({\n message: 'No device requires debugger or previewer installation',\n level: LOG_LEVEL.Warn\n }) &&\n process.exit()\n // 3. 下载并获取调试器、预览器地址\n const debuggerPath = await this.downloadApk(options, true)\n const previewPath = await this.downloadApk(options, false)\n // // 4. 安装调试器\n await this.installApk(connectDeviceList, debuggerPath)\n await this.installApk(connectDeviceList, previewPath)\n return Promise.resolve(\n 'All devices successfully installed the Quickapp debugger and previewer'\n )\n } catch (error) {\n return Promise.reject(\n new Error(`Failed to install debugger, error message：${(error as Error).message}`)\n )\n }\n }\n /\n 如果是TV等AIOT设备，需要通过IP连接\n * 1. 若ip为空，则询问是否要连接新设备\n * 2. 无需连接新设备，返回\n * 3. 连接新设备，输入ip值（可输入多个ip，以逗号隔断）\n * 4. 判断输入值，空则输出info并返回\n * 5. 处理ip，输入每个ip设备的端口号，尝试连接，给出连接结果\n * @param ip\n /\n static async connectDevice(ip: string) {\n try {\n if (!ip) {\n const WIFI_TEXT = 'Yes, connect a new wifi device'\n const connectType = await select({\n message:\n '(USB devices will automatically connect) Choose whether to connect to a new wifi device, and fill in its IP address later:',\n choices: [{ value: WIFI_TEXT }, { value: 'Skip, keep connected device' }]\n })\n if (connectType === WIFI_TEXT) {\n const deviceIp = await input({\n message:\n 'Please enter the IP address of the device under wifi(eg:192.168.1.1),make sure that the computer and the device are under the same wifi。If you need to enter multiple IPs, please separate them with \",\":'\n })\n ip = deviceIp\n } else {\n return Promise.resolve()\n }\n }\n if (ip.length === 0) {\n ColorConsole.log({\n message: `Since no ip address is entered, the connected device will be connected`\n })\n return Promise.resolve()\n }\n const ips = ip.trim().split(',')\n const invalidIps = ips.filter((ip) => !this.ipRegExp.test(ip))\n if (invalidIps && invalidIps.length) {\n invalidIps.map((ip) => {\n ColorConsole.log({\n message: `ip: ${ip} is invalid IP`,\n level: LOG_LEVEL.Error,\n isOnlyPrintError: true\n })\n process.exit()\n })\n } else {\n const newDeviceListPromiseArray = Array.from(ips, async (ip) => {\n const devicePort = await input({\n message: `Please enter the port of the IP(${ip})`,\n default: '5555'\n })\n return AdbUtils.connect(ip, devicePort)\n .then(() => {\n ColorConsole.log({\n level: LOG_LEVEL.Success,\n message: `wifi connection ip: The device with ip of \"${ip}\" succeeded`\n })\n return Promise.resolve()\n })\n .catch((err) => {\n ColorConsole.log({\n level: LOG_LEVEL.Error,\n message: err,\n isOnlyPrintError: true\n })\n process.exit()\n })\n })\n return Promise.all(newDeviceListPromiseArray)\n .then(() => {\n ColorConsole.log({\n message: 'All new WIFI devices are connected'\n })\n return Promise.resolve()\n })\n .catch(() => {\n // 在抛出错误前已经弹出错误日志了，故这里直接退出\n process.exit()\n })\n }\n } catch {}\n }\n /\n 选择一个或者多个设备\n * @param deviceList\n * @param orderText\n * @returns\n /\n static async queryDevice(deviceList: string[] \| undefined, orderText: string = '') {\n if (!deviceList \|\| deviceList.length === 0) {\n ColorConsole.log({\n message: `No device is connected yet, please confirm and try again`,\n level: LOG_LEVEL.Error\n })\n return\n }\n const ALL_TEXT = 'All connected devices'\n const deviceListObj = deviceList.map((device) => {\n return {\n value: device\n }\n })\n // 可选一台或多台设备\n const chooseDevices = await checkbox({\n message: `Please select the device that needs to execute command \"${orderText}\":`,\n choices: [{ value: ALL_TEXT }, ...deviceListObj]\n })\n return chooseDevices[0] === ALL_TEXT ? deviceList : chooseDevices\n }\n /\n 下载apk\n * @param options\n * @param isQuickAppDebugger\n * @returns\n /\n static async downloadApk(options: IInstallApkAndDbg, isQuickAppDebugger: boolean) {\n const { apkVersion } = options\n let fileName = ''\n let newVersion = apkVersion \|\| 'v1100'\n if (isQuickAppDebugger) {\n fileName = `quickapp_debugger_${newVersion}.apk`\n } else {\n fileName = `quickapp_platform_preview_release_${newVersion}.apk`\n }\n const url = `${this.quickapp_url}${fileName}`\n const apkPath = path.join(__dirname, './apk/', fileName)\n if (fs.existsSync(apkPath)) {\n // apk已下载\n ColorConsole.log({\n message: 'The installation package has been downloaded, now use the cache file to install'\n })\n return apkPath\n } else {\n try {\n const result = await RequestUtils.downloadFile(url, fileName)\n // 打印出成功信息\n ColorConsole.log({\n message: `Success to download, ${result}`,\n level: LOG_LEVEL.Success\n })\n return apkPath\n } catch (error) {\n // 打印出错误\n ColorConsole.log({\n message: `Failed to download the installation package, ${error}`,\n level: LOG_LEVEL.Error,\n isOnlyPrintError: true\n })\n process.exit()\n }\n }\n }\n /\n 获取设备上的快应用框架（需要先安装调试器）\n * 1. 请求获取平台信息\n * 2. 若获取结果为空或者undefined，则等待3s再次请求\n * 3. 若获取结果不为空，但属性availablePlatforms为空，则等待3s再次请求\n * 4. 若请求次数超过3次，则结束请求\n * 5. 否则打印获取结果\n * @param options\n /\n static async getAvailablePlatform(options: IGetAvailablePlatform) {\n try {\n const { ip, port, sn: deviceSn } = options\n let client = { ip, port }\n let countTime = 0\n let data\n\n const sleep = () => {\n ColorConsole.log({\n level: LOG_LEVEL.Error,\n message: `Error when the device gets running platforms,request again after 3s delay`,\n isOnlyPrintError: true\n })\n return new Promise((resolve) => setTimeout(resolve, 3000))\n }\n const requestPlatform = async () => {\n do {\n if (countTime > 0) {\n // 等待3s\n await sleep()\n }\n data = await RequestUtils.sendReq(client, '/availablePlatforms')\n } while (++countTime < 3 && (!data \|\| (data && !JSON.parse(data).availablePlatforms)))\n if (data) {\n const dataObj = JSON.parse(data)\n if (!dataObj.availablePlatforms) {\n // 请求结果不存在平台信息，报错，结束程序\n ColorConsole.log({\n level: LOG_LEVEL.Error,\n message: `the request result no avaliable platform `\n })\n process.exit()\n } else {\n // 打印请求的平台信息\n const availablePlatforms = dataObj.availablePlatforms\n ColorConsole.log({\n message: `The Quickapp engine list of device \"${deviceSn}\" is：${availablePlatforms.join(\n ','\n )}`\n })\n }\n } else {\n //请求失败，结束程序\n ColorConsole.log({\n level: LOG_LEVEL.Error,\n message: `the device gets running platforms error`\n })\n process.exit()\n }\n }\n // 先打开调试器，才能获取运行平台\n await AdbUtils.startDebugger(deviceSn)\n await requestPlatform()\n } catch (error) {\n ColorConsole.log({\n level: LOG_LEVEL.Error,\n message: `Error getting the list of Quickapp engines on the device, error message：${\n (error as Error).message\n }`\n })\n }\n }\n /\n 给设备列表中的每个设备安装apk\n * @param deviceList\n * @param apkPath\n * @returns\n */\n static async installApk(deviceList: string[] = [], apkPath: string) {\n try {\n const newDeviceListPromiseArray = Array.from(deviceList, (deviceSn) => {\n return AdbUtils.installApk(deviceSn, apkPath)\n })\n const apkName = path.basename(apkPath)\n return Promise.all(newDeviceListPromiseArray)\n .then(() => {\n ColorConsole.log({\n level: LOG_LEVEL.Success,\n message: `All devices installed ${apkName}`\n })\n })\n .catch(() => {\n ColorConsole.log({\n level: LOG_LEVEL.Error,\n message: `Installed ${apkName} failed`\n })\n process.exit()\n })\n } catch (error) {}\n }\n}\nexport default DeviceUtil\n"],"sourceRoot":"../../src"}
1	+ {"version":3,"sources":["utils/DeviceUtil.ts"],"names":[],"mappings":"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","file":"DeviceUtil.js","sourcesContent":["import { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport { checkbox, input, select } from '@inquirer/prompts'\nimport fs from 'fs'\nimport path from 'path'\nimport { IGetAvailablePlatform, IInstallApkAndDbg } from '../interface/CommandInterface'\nimport AdbUtils from './AdbUtils'\nimport RequestUtils from './RequestUtils'\n\n/*\n DeviceUtil\n /\nclass DeviceUtil {\n static ipRegExp =\n /^(?:(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)$/\n static CLIENT_PORT = 39517\n static quickapp_url = 'https://statres.quickapp.cn/quickapp/quickapptool/release/platform/'\n /\n 获取连接上的所有设备数组，供IDE使用\n * @returns\n /\n static getAllConnectedDevices() {\n try {\n return AdbUtils.getAllConnectedDevices().then((deviceList) => {\n if (deviceList.length > 0) {\n ColorConsole.info(`Devices connected via adb： ${deviceList.join(', ')}.`)\n return Promise.resolve(deviceList)\n } else {\n ColorConsole.throw(\n `No device is currently connected, please check the following preparations in turn：\\n 1. Whether the device is started;\\n 2. Whether in the same LAN WI-FI;\\n 3. Whether the device can be connected to the computer via USB;`\n )\n }\n })\n } catch (error) {\n ColorConsole.throw('Error getting connection information of adb device')\n }\n }\n /\n 安装调试器、预览版\n * @param options\n * @returns\n /\n static async installDbgAndMkp(options: IInstallApkAndDbg) {\n try {\n const { ip = '' } = options\n let connectDeviceList: string[] = [ip]\n // 1. 判断设备是否连接\n await this.connectDevice(ip)\n // 2. 获取连接的设备\n const deviceList = await AdbUtils.getUSBConnectedDevices()\n const finalDeviceList =\n deviceList.length > 0\n ? await this.queryDevice(deviceList, 'Install Quickapp debugger or previewer ')\n : []\n connectDeviceList = finalDeviceList ? [...finalDeviceList] : []\n // 若connectDeviceList为空，应该warn并结束程序\n connectDeviceList.length <= 0 &&\n ColorConsole.throw('No device requires debugger or previewer installation')\n // 3. 下载并获取调试器、预览器地址\n const debuggerPath = await this.downloadApk(options, true)\n const previewPath = await this.downloadApk(options, false)\n // // 4. 安装调试器\n await this.installApk(connectDeviceList, debuggerPath)\n await this.installApk(connectDeviceList, previewPath)\n return Promise.resolve(\n 'All devices successfully installed the Quickapp debugger and previewer'\n )\n } catch (error) {\n return Promise.reject(\n new Error(\n `Failed to install debugger, error message：${error?.toString() \|\| 'unknown error'}`\n )\n )\n }\n }\n /\n 如果是TV等AIOT设备，需要通过IP连接\n * 1. 若ip为空，则询问是否要连接新设备\n * 2. 无需连接新设备，返回\n * 3. 连接新设备，输入ip值（可输入多个ip，以逗号隔断）\n * 4. 判断输入值，空则输出info并返回\n * 5. 处理ip，输入每个ip设备的端口号，尝试连接，给出连接结果\n * @param ip\n /\n static async connectDevice(ip: string) {\n try {\n if (!ip) {\n const WIFI_TEXT = 'Yes, connect a new wifi device'\n const connectType = await select({\n message:\n '(USB devices will automatically connect) Choose whether to connect to a new wifi device, and fill in its IP address later:',\n choices: [{ value: WIFI_TEXT }, { value: 'Skip, keep connected device' }]\n })\n if (connectType === WIFI_TEXT) {\n const deviceIp = await input({\n message:\n 'Please enter the IP address of the device under wifi(eg:192.168.1.1),make sure that the computer and the device are under the same wifi。If you need to enter multiple IPs, please separate them with \",\":'\n })\n ip = deviceIp\n } else {\n return Promise.resolve()\n }\n }\n if (ip.length === 0) {\n ColorConsole.log(`Since no ip address is entered, the connected device will be connected`)\n return Promise.resolve()\n }\n const ips = ip.trim().split(',')\n const invalidIps = ips.filter((ip) => !this.ipRegExp.test(ip))\n if (invalidIps && invalidIps.length) {\n invalidIps.map((ip) => {\n ColorConsole.throw(\n `ip: `,\n { word: ip, style: ColorConsole.getStyle(LOG_LEVEL.Throw) },\n ` is invalid IP`\n )\n })\n } else {\n const newDeviceListPromiseArray = Array.from(ips, async (ip) => {\n const devicePort = await input({\n message: `Please enter the port of the IP(${ip})`,\n default: '5555'\n })\n return AdbUtils.connect(ip, devicePort)\n .then(() => {\n ColorConsole.success(`wifi connection ip: The device with ip of \"${ip}\" succeeded`)\n return Promise.resolve()\n })\n .catch((err) => {\n ColorConsole.throw(`${err}`)\n })\n })\n return Promise.all(newDeviceListPromiseArray)\n .then(() => {\n ColorConsole.log(`All new WIFI devices are connected`)\n return Promise.resolve()\n })\n .catch(() => {\n // 在抛出错误前已经弹出错误日志了，故这里直接退出\n process.exit()\n })\n }\n } catch {}\n }\n /\n 选择一个或者多个设备\n * @param deviceList\n * @param orderText\n * @returns\n /\n static async queryDevice(deviceList: string[] \| undefined, orderText: string = '') {\n if (!deviceList \|\| deviceList.length === 0) {\n ColorConsole.throw(`No device is connected yet, please confirm and try again`)\n return\n }\n const ALL_TEXT = 'All connected devices'\n const deviceListObj = deviceList.map((device) => {\n return {\n value: device\n }\n })\n // 可选一台或多台设备\n const chooseDevices = await checkbox({\n message: `Please select the device that needs to execute command \"${orderText}\":`,\n choices: [{ value: ALL_TEXT }, ...deviceListObj]\n })\n return chooseDevices[0] === ALL_TEXT ? deviceList : chooseDevices\n }\n /\n 下载apk\n * @param options\n * @param isQuickAppDebugger\n * @returns\n /\n static async downloadApk(\n options: IInstallApkAndDbg,\n isQuickAppDebugger: boolean\n ): Promise<string> {\n const { apkVersion } = options\n let fileName = ''\n let newVersion = apkVersion \|\| 'v1100'\n if (isQuickAppDebugger) {\n fileName = `quickapp_debugger_${newVersion}.apk`\n } else {\n fileName = `quickapp_platform_preview_release_${newVersion}.apk`\n }\n const url = `${this.quickapp_url}${fileName}`\n const apkPath = path.join(__dirname, './apk/', fileName)\n if (fs.existsSync(apkPath)) {\n // apk已下载\n ColorConsole.log(\n `The installation package has been downloaded, now use the cache file to install`\n )\n return apkPath\n } else {\n try {\n const result = await RequestUtils.downloadFile(url, fileName)\n // 打印出成功信息\n ColorConsole.success(`Success to download, ${result}`)\n return apkPath\n } catch (error) {\n // 打印出错误\n ColorConsole.throw(`Failed to download the installation package, ${error}`)\n return ''\n }\n }\n }\n /\n 获取设备上的快应用框架（需要先安装调试器）\n * 1. 请求获取平台信息\n * 2. 若获取结果为空或者undefined，则等待3s再次请求\n * 3. 若获取结果不为空，但属性availablePlatforms为空，则等待3s再次请求\n * 4. 若请求次数超过3次，则结束请求\n * 5. 否则打印获取结果\n * @param options\n /\n static async getAvailablePlatform(options: IGetAvailablePlatform) {\n try {\n const { ip, port, sn: deviceSn } = options\n let client = { ip, port }\n let countTime = 0\n let data\n\n const sleep = () => {\n ColorConsole.error(\n `Error when the device gets running platforms,request again after 3s delay`\n )\n return new Promise((resolve) => setTimeout(resolve, 3000))\n }\n const requestPlatform = async () => {\n do {\n if (countTime > 0) {\n // 等待3s\n await sleep()\n }\n data = await RequestUtils.sendReq(client, '/availablePlatforms')\n } while (++countTime < 3 && (!data \|\| (data && !JSON.parse(data).availablePlatforms)))\n if (data) {\n const dataObj = JSON.parse(data)\n if (!dataObj.availablePlatforms) {\n // 请求结果不存在平台信息，报错，结束程序\n ColorConsole.throw(`The request result no avaliable platform `)\n } else {\n // 打印请求的平台信息\n const availablePlatforms = dataObj.availablePlatforms\n ColorConsole.log(\n `The Quickapp engine list of device \"${deviceSn}\" is：${availablePlatforms.join(',')}`\n )\n }\n } else {\n //请求失败，结束程序\n ColorConsole.throw(`The device gets running platforms error`)\n }\n }\n // 先打开调试器，才能获取运行平台\n await AdbUtils.startDebugger(deviceSn)\n await requestPlatform()\n } catch (error) {\n ColorConsole.throw(`Error getting the list of Quickapp engines on the device`)\n }\n }\n /\n 给设备列表中的每个设备安装apk\n * @param deviceList\n * @param apkPath\n * @returns\n */\n static async installApk(deviceList: string[] = [], apkPath: string) {\n try {\n const newDeviceListPromiseArray = Array.from(deviceList, (deviceSn) => {\n return AdbUtils.installApk(deviceSn, apkPath)\n })\n const apkName = path.basename(apkPath)\n return Promise.all(newDeviceListPromiseArray)\n .then(() => {\n ColorConsole.success(`All devices installed ${apkName}`)\n })\n .catch(() => {\n ColorConsole.throw(`Installed ${apkName} failed`)\n })\n } catch (error) {}\n }\n}\nexport default DeviceUtil\n"],"sourceRoot":"../../src"}

package/lib/utils/RequestUtils.js CHANGED Viewed

@@ -12,7 +12,6 @@ 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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const axios_1 = __importDefault(require("axios"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -39,26 +38,16 @@ class RequestUtils {
                 axios_1.default
                     .post(requrl, options)
                     .then((data) => {
-                    ColorConsole_1.default.log({
-                        message: `### App Server ### Request ${requrl} succeeded`
-                    });
+                    ColorConsole_1.default.log(`### App Server ### Request ${requrl} succeeded`);
                     resolve(data.toString());
                 })
                     .catch((error) => {
                     if (error.respose && error.response.status === 408) {
                         // 超时处理
-                        ColorConsole_1.default.log({
-                            level: shared_utils_1.LOG_LEVEL.Error,
-                            message: `### App Server ### Request ${requrl} timed out, please try again`,
-                            isOnlyPrintError: true
-                        });
+                        ColorConsole_1.default.error(`### App Server ### Request ${requrl} timed out, please try again`);
                     }
                     else {
-                        ColorConsole_1.default.log({
-                            level: shared_utils_1.LOG_LEVEL.Error,
-                            message: `### App Server ### Request ${requrl} error message: ${error.message}`,
-                            isOnlyPrintError: true
-                        });
+                        ColorConsole_1.default.error(`### App Server ### Request ${requrl} error message: ${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`);
                     }
                 });
             });
@@ -67,9 +56,7 @@ class RequestUtils {
     static downloadFile(url, fileName) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             // 开始下载
-            ColorConsole_1.default.log({
-                message: `Start downloading file：${fileName}, address：${url}`
-            });
+            ColorConsole_1.default.log(`Start downloading file：${fileName}, address：${url}`);
             const response = yield axios_1.default.get(url, {
                 responseType: 'arraybuffer'
             });

package/lib/utils/RequestUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["utils/RequestUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA~~,6DAAsD;AACtD~~,+FAAsE;AACtE,kDAAyB;AACzB,wDAAyB;AACzB,gDAAuB;AACvB;;GAEG;AACH,MAAM,YAAY;IAChB,MAAM,CAAO,OAAO,CAAC,MAAoC,EAAE,GAAW,EAAE,MAAe;;YACrF,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,UAAU,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,CAAA;gBACzD,IAAI,OAAO,GAAG;oBACZ,IAAI,EAAE,MAAM,CAAC,EAAE;oBACf,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,IAAI;iBACd,CAAA;gBACD,IAAI,MAAM,EAAE;oBACV,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE;wBACnC,OAAO,EAAE,MAAM;qBAChB,CAAC,CAAA;iBACH;gBACD,eAAK;qBACF,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;qBACrB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACb,sBAAY,CAAC,GAAG,CAAC~~;wBACf~~,~~OAAO,EAAE,~~8BAA8B,MAAM,YAAY~~;qBAC1D~~,CAAC,CAAA;~~oBACF~~,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAC1B,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;wBAClD,OAAO;wBACP,sBAAY,CAAC,~~GAAG,CAAC;4BACf,~~KAAK,~~EAAE,wBAAS,~~CAAC,~~KAAK;4BACtB,OAAO,EAAE,~~8BAA8B,MAAM,8BAA8B~~;4BAC3E~~,~~gBAAgB,EAAE,IAAI;yBACvB,~~CAAC,CAAA;~~qBACH~~;yBAAM;wBACL,sBAAY,CAAC,~~GAAG~~,~~CAAC;4BACf~~,~~KAAK~~,~~EAAE~~,~~wBAAS~~,~~CAAC~~,KAAK~~;4BACtB~~,~~OAAO~~,~~EAAE~~,~~8BAA8B~~,~~MAAM~~,~~mBAC1C~~,~~KAAe~~,~~CAAC~~,~~OACnB~~,~~EAAE;4BACF~~,~~gBAAgB,~~EAAE,~~IAAI;yBACvB~~,~~CAAC,~~CAAA;~~qBACH~~;gBACH,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACJ,CAAC;KAAA;IACD,MAAM,CAAC,YAAY,CAAC,GAAW,EAAE,QAAgB;QAC/C,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,OAAO;YACP,sBAAY,CAAC,GAAG,CAAC~~;gBACf~~,~~OAAO,EAAE,~~0BAA0B,QAAQ,aAAa,GAAG,EAAE~~;aAC9D~~,CAAC,CAAA;~~YACF~~,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE;gBACpC,YAAY,EAAE,aAAa;aAC5B,CAAC,CAAA;YACF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBAC3B,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBAC/C,kBAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;gBAC3B,kBAAE,CAAC,aAAa,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAC/D,OAAO,CAAC,iBAAiB,QAAQ,eAAe,CAAC,CAAA;aAClD;iBAAM;gBACL,MAAM,CAAC,gCAAgC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;aAC1D;QACH,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;CACF;AACD,kBAAe,YAAY,CAAA","file":"RequestUtils.js","sourcesContent":["import ~~{ LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport~~ ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport axios from 'axios'\nimport fs from 'fs-extra'\nimport path from 'path'\n/*\n RequestUtils\n */\nclass RequestUtils {\n static async sendReq(client: { ip: string; port: string }, api: string, params?: string) {\n return new Promise<string>((resolve) => {\n const requrl = `http://${client.ip}:${client.port}${api}`\n let options = {\n host: client.ip,\n port: client.port,\n path: api,\n timeout: 3000\n }\n if (params) {\n options = Object.assign({}, options, {\n headers: params\n })\n }\n axios\n .post(requrl, options)\n .then((data) => {\n ColorConsole.log(~~{\n message:~~ `### App Server ### Request ${requrl} succeeded~~`\n }~~)\n resolve(data.toString())\n })\n .catch((error) => {\n if (error.respose && error.response.status === 408) {\n // 超时处理\n ColorConsole.~~log~~(~~{\n level: LOG_LEVEL.Error,\n message:~~ `### App Server ### Request ${requrl} timed out, please try again~~`,\n isOnlyPrintError: true\n }~~)\n } else {\n ColorConsole.~~log~~({\n ~~level: LOG_LEVEL.Error,\n message:~~ `### App Server ### Request ${requrl} error message: ${\n (~~error~~ as ~~Error).message~~\n }~~`,\~~n ~~isOnlyPrintError: true\n~~ })\n }\n })\n })\n }\n static downloadFile(url: string, fileName: string) {\n return new Promise(async (resolve, reject) => {\n // 开始下载\n ColorConsole.log(~~{\n message:~~ `Start downloading file：${fileName}, address：${url}~~`\n }~~)\n const response = await axios.get(url, {\n responseType: 'arraybuffer'\n })\n if (response.status === 200) {\n const targetDir = path.join(__dirname, './apk')\n fs.ensureDirSync(targetDir)\n fs.writeFileSync(path.join(targetDir, fileName), response.data)\n resolve(`Download file ${fileName} successfully`)\n } else {\n reject(`Download failed, status code：${response.status}`)\n }\n })\n }\n}\nexport default RequestUtils\n"],"sourceRoot":"../../src"}
1	+ {"version":3,"sources":["utils/RequestUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+FAAsE;AACtE,kDAAyB;AACzB,wDAAyB;AACzB,gDAAuB;AACvB;;GAEG;AACH,MAAM,YAAY;IAChB,MAAM,CAAO,OAAO,CAAC,MAAoC,EAAE,GAAW,EAAE,MAAe;;YACrF,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,UAAU,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,CAAA;gBACzD,IAAI,OAAO,GAAG;oBACZ,IAAI,EAAE,MAAM,CAAC,EAAE;oBACf,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,IAAI;iBACd,CAAA;gBACD,IAAI,MAAM,EAAE;oBACV,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE;wBACnC,OAAO,EAAE,MAAM;qBAChB,CAAC,CAAA;iBACH;gBACD,eAAK;qBACF,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;qBACrB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACb,sBAAY,CAAC,GAAG,CAAC,8BAA8B,MAAM,YAAY,CAAC,CAAA;oBAClE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAC1B,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;wBAClD,OAAO;wBACP,sBAAY,CAAC,KAAK,CAAC,8BAA8B,MAAM,8BAA8B,CAAC,CAAA;qBACvF;yBAAM;wBACL,sBAAY,CAAC,KAAK,CAChB,8BAA8B,MAAM,mBAClC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,KAAI,eACvB,EAAE,CACH,CAAA;qBACF;gBACH,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACJ,CAAC;KAAA;IACD,MAAM,CAAC,YAAY,CAAC,GAAW,EAAE,QAAgB;QAC/C,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,OAAO;YACP,sBAAY,CAAC,GAAG,CAAC,0BAA0B,QAAQ,aAAa,GAAG,EAAE,CAAC,CAAA;YACtE,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE;gBACpC,YAAY,EAAE,aAAa;aAC5B,CAAC,CAAA;YACF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBAC3B,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBAC/C,kBAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;gBAC3B,kBAAE,CAAC,aAAa,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAC/D,OAAO,CAAC,iBAAiB,QAAQ,eAAe,CAAC,CAAA;aAClD;iBAAM;gBACL,MAAM,CAAC,gCAAgC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;aAC1D;QACH,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;CACF;AACD,kBAAe,YAAY,CAAA","file":"RequestUtils.js","sourcesContent":["import ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport axios from 'axios'\nimport fs from 'fs-extra'\nimport path from 'path'\n/*\n RequestUtils\n */\nclass RequestUtils {\n static async sendReq(client: { ip: string; port: string }, api: string, params?: string) {\n return new Promise<string>((resolve) => {\n const requrl = `http://${client.ip}:${client.port}${api}`\n let options = {\n host: client.ip,\n port: client.port,\n path: api,\n timeout: 3000\n }\n if (params) {\n options = Object.assign({}, options, {\n headers: params\n })\n }\n axios\n .post(requrl, options)\n .then((data) => {\n ColorConsole.log(`### App Server ### Request ${requrl} succeeded`)\n resolve(data.toString())\n })\n .catch((error) => {\n if (error.respose && error.response.status === 408) {\n // 超时处理\n ColorConsole.error(`### App Server ### Request ${requrl} timed out, please try again`)\n } else {\n ColorConsole.error(\n `### App Server ### Request ${requrl} error message: ${\n error?.toString() \|\| 'unknown error'\n }`\n )\n }\n })\n })\n }\n static downloadFile(url: string, fileName: string) {\n return new Promise(async (resolve, reject) => {\n // 开始下载\n ColorConsole.log(`Start downloading file：${fileName}, address：${url}`)\n const response = await axios.get(url, {\n responseType: 'arraybuffer'\n })\n if (response.status === 200) {\n const targetDir = path.join(__dirname, './apk')\n fs.ensureDirSync(targetDir)\n fs.writeFileSync(path.join(targetDir, fileName), response.data)\n resolve(`Download file ${fileName} successfully`)\n } else {\n reject(`Download failed, status code：${response.status}`)\n }\n })\n }\n}\nexport default RequestUtils\n"],"sourceRoot":"../../src"}

package/lib/utils/VelaAvdUtils.js CHANGED Viewed

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const emulator_1 = require("@aiot-toolkit/emulator");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const utils_1 = require("@aiot-toolkit/emulator/lib/utils");
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const prompts_1 = require("@inquirer/prompts");
 const adm_zip_1 = __importDefault(require("adm-zip"));
@@ -68,11 +68,7 @@ class VelaAvdUtils {
                 });
             }
             catch (e) {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: `download ${filename} failed`
-                });
-                progress.stop();
+                ColorConsole_1.default.throw(`Download ${filename} failed`);
                 reject();
             }
         }));
@@ -107,24 +103,8 @@ class VelaAvdUtils {
     /** 根据host获取模拟器下载地址 */
     static getEmulatorUrl(version = '0.0.1') {
         const systemOs = os_1.default.platform();
-        const arch = os_1.default.arch();
-        let hostOs = '';
-        let hostArch = '';
-        switch (systemOs) {
-            case 'linux':
-                hostOs = 'linux';
-                hostArch = arch === 'x64' ? 'x86_64' : 'aarch64';
-                break;
-            case 'win32':
-                hostOs = 'windows';
-                hostArch = arch === 'x64' ? 'x86_64' : 'aarch64';
-                break;
-            case 'darwin':
-                hostOs = 'darwin';
-                hostArch = arch === 'x64' ? 'x86_64' : 'aarch64';
-            default:
-                break;
-        }
+        const hostArch = (0, utils_1.getSystemArch)();
+        let hostOs = systemOs === 'win32' ? 'windows' : systemOs;
         return `${VelaAvdUtils.emulatorBaseUrl}/v${version}/${hostOs}-${hostArch}.zip`;
     }
     /** 根据host获取vela镜像下载地址 */
@@ -134,17 +114,17 @@ class VelaAvdUtils {
     /** 根据host获取ya-vm-file-server下载地址 */
     static getv9fsToolUrl(version = '0.0.1') {
         const systemOs = os_1.default.platform();
-        const arch = os_1.default.arch();
+        const arch = (0, utils_1.getSystemArch)();
         let v9fsTool = '';
         switch (systemOs) {
             case 'linux':
-                v9fsTool = 'ya-vm-file-server-linux-x86_64';
+                v9fsTool = `ya-vm-file-server-linux-${arch}`;
                 break;
             case 'win32':
                 v9fsTool = 'ya-vm-file-server-windows.exe';
                 break;
             case 'darwin':
-                v9fsTool = (arch === 'x64') ? 'ya-vm-file-server-darwin-x84_64' : 'ya-vm-file-server-darwin-aarch64';
+                v9fsTool = `ya-vm-file-server-darwin-${arch}`;
             default:
                 break;
         }
@@ -192,10 +172,7 @@ class VelaAvdUtils {
                     if (!skinExists || (versionInfo && versionInfo.skins < onlineVersionInfo.skins)) {
                         const skinsUrl = VelaAvdUtils.getDownloadUrl('skins', onlineVersionInfo.skins);
                         yield VelaAvdUtils.downloadAndUnzip(skinsUrl, path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins'));
-                        ColorConsole_1.default.log({
-                            level: shared_utils_1.LOG_LEVEL.Success,
-                            message: `download skins succeed.`
-                        });
+                        ColorConsole_1.default.success(`Download skins succeed.`);
                     }
                     const skinList = VelaAvdUtils.velaAvdCls.getVelaSkinList();
                     avdSkin = yield (0, prompts_1.select)({
@@ -230,10 +207,7 @@ class VelaAvdUtils {
                 if (!emulatorExists || (versionInfo && versionInfo.emulator < onlineVersionInfo.emulator)) {
                     const emulatorDownloadUrl = VelaAvdUtils.getEmulatorUrl(onlineVersionInfo.emulator);
                     yield VelaAvdUtils.downloadAndUnzip(emulatorDownloadUrl, emulatorDir);
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `download emulator succeed.`
-                    });
+                    ColorConsole_1.default.success(`Download emulator succeed.`);
                 }
                 // 下载镜像
                 const velaImageDownloadUrl = this.getSystemImageUrl(onlineVersionInfo['system-images'], avdArch);
@@ -242,10 +216,7 @@ class VelaAvdUtils {
                 if (!imageExists ||
                     (versionInfo && versionInfo['system-images'] < onlineVersionInfo['system-images'])) {
                     yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `download vela image succeed.`
-                    });
+                    ColorConsole_1.default.success(`Download vela image succeed.`);
                 }
                 // 下载快应用qa文件
                 const qaDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'qa');
@@ -253,22 +224,16 @@ class VelaAvdUtils {
                 if (!qaExists || (versionInfo && versionInfo.qa < onlineVersionInfo.qa)) {
                     const qaUrl = VelaAvdUtils.getDownloadUrl('qa', onlineVersionInfo.qa);
                     yield VelaAvdUtils.downloadAndUnzip(qaUrl, qaDir);
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `download quickapp font succeed.`
-                    });
+                    ColorConsole_1.default.success(`Download quickapp font succeed.`);
                 }
                 // 下载tools
                 const toolsDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'tools');
                 const toolsExists = fs_extra_1.default.existsSync(toolsDir);
                 if (!toolsExists || (versionInfo && versionInfo.tools < onlineVersionInfo.tools)) {
                     const v9fsToolUrl = VelaAvdUtils.getv9fsToolUrl();
-                    const filename = (os_1.default.platform() === 'win32') ? 'ya-vm-file-server.exe' : 'ya-vm-file-server';
+                    const filename = os_1.default.platform() === 'win32' ? 'ya-vm-file-server.exe' : 'ya-vm-file-server';
                     yield VelaAvdUtils.downloadFromCdn(v9fsToolUrl, toolsDir, filename);
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `download tools succeed.`
-                    });
+                    ColorConsole_1.default.success(`Download tools succeed.`);
                 }
                 // 替换version.json
                 if (versionFileExist) {
@@ -279,16 +244,10 @@ class VelaAvdUtils {
                 const avdImagePath = imageDir;
                 const avdParams = { avdName, avdSkin, avdWidth, avdHeight, avdArch, avdImagePath };
                 VelaAvdUtils.velaAvdCls.createVelaAvd(avdParams);
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Success,
-                    message: `create avd succeed.`
-                });
+                ColorConsole_1.default.success(`Create avd succeed.`);
             }
             catch (e) {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: `create avd failed. Error: ${e.message}`
-                });
+                ColorConsole_1.default.throw(`Create avd failed. Error: ${e.message}`);
             }
         });
     }