aiot-toolkit 2.0.5-beta.8 → 2.0.5-widget-provider-beta.1

package/lib/utils/DeviceUtil.js

@@ -11,16 +11,16 @@ var _path = _interopRequireDefault(require("path"));
 var _AdbUtils = _interopRequireDefault(require("./AdbUtils"));
 var _RequestUtils = _interopRequireDefault(require("./RequestUtils"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * DeviceUtil
+/**
+ * DeviceUtil
  */
 class DeviceUtil {
   static ipRegExp = /^(?:(?: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]?)$/;
   static CLIENT_PORT = 39517;
   static quickapp_url = 'https://statres.quickapp.cn/quickapp/quickapptool/release/platform/';
-  /**
-   * 获取连接上的所有设备数组，供IDE使用
-   * @returns
+  /**
+   * 获取连接上的所有设备数组，供IDE使用
+   * @returns
    */
   static getAllConnectedDevices() {
     try {
@@ -36,10 +36,10 @@ class DeviceUtil {
       _sharedUtils.ColorConsole.throw('Error getting connection information of adb device');
     }
   }
-  /**
-   * 安装调试器、预览版
-   * @param options
-   * @returns
+  /**
+   * 安装调试器、预览版
+   * @param options
+   * @returns
    */
   static async installDbgAndMkp(options) {
     try {
@@ -71,14 +71,14 @@ class DeviceUtil {
       return Promise.reject(new Error(`Failed to install , error message：${error?.toString() || 'unknown error'}`));
     }
   }
-  /**
-   * 如果是TV等AIOT设备，需要通过IP连接
-   * 1. 若ip为空，则询问是否要连接新设备
-   * 2. 无需连接新设备，返回
-   * 3. 连接新设备，输入ip值（可输入多个ip，以逗号隔断）
-   * 4. 判断输入值，空则输出info并返回
-   * 5. 处理ip，输入每个ip设备的端口号，尝试连接，给出连接结果
-   * @param ip
+  /**
+   * 如果是TV等AIOT设备，需要通过IP连接
+   * 1. 若ip为空，则询问是否要连接新设备
+   * 2. 无需连接新设备，返回
+   * 3. 连接新设备，输入ip值（可输入多个ip，以逗号隔断）
+   * 4. 判断输入值，空则输出info并返回
+   * 5. 处理ip，输入每个ip设备的端口号，尝试连接，给出连接结果
+   * @param ip
    */
   static async connectDevice(ip) {
     try {
@@ -137,11 +137,11 @@ class DeviceUtil {
       }
     } catch {}
   }
-  /**
-   * 选择一个或者多个设备
-   * @param deviceList
-   * @param orderText
-   * @returns
+  /**
+   * 选择一个或者多个设备
+   * @param deviceList
+   * @param orderText
+   * @returns
    */
   static async queryDevice(deviceList) {
     let orderText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -164,11 +164,11 @@ class DeviceUtil {
     });
     return chooseDevices[0] === ALL_TEXT ? deviceList : chooseDevices;
   }
-  /**
-   * 下载apk
-   * @param options
-   * @param isQuickAppDebugger
-   * @returns
+  /**
+   * 下载apk
+   * @param options
+   * @param isQuickAppDebugger
+   * @returns
    */
   static async downloadApk(options, isQuickAppDebugger) {
     const {
@@ -200,14 +200,14 @@ class DeviceUtil {
       }
     }
   }
-  /**
-   * 获取设备上的快应用框架（需要先安装调试器）
-   * 1. 请求获取平台信息
-   * 2. 若获取结果为空或者undefined，则等待3s再次请求
-   * 3. 若获取结果不为空，但属性availablePlatforms为空，则等待3s再次请求
-   * 4. 若请求次数超过3次，则结束请求
-   * 5. 否则打印获取结果
-   * @param options
+  /**
+   * 获取设备上的快应用框架（需要先安装调试器）
+   * 1. 请求获取平台信息
+   * 2. 若获取结果为空或者undefined，则等待3s再次请求
+   * 3. 若获取结果不为空，但属性availablePlatforms为空，则等待3s再次请求
+   * 4. 若请求次数超过3次，则结束请求
+   * 5. 否则打印获取结果
+   * @param options
    */
   static async getAvailablePlatform(options) {
     try {
@@ -256,11 +256,11 @@ class DeviceUtil {
       _sharedUtils.ColorConsole.throw(`Error getting the list of Quickapp engines on the device`);
     }
   }
-  /**
-   * 给设备列表中的每个设备安装apk
-   * @param deviceList
-   * @param apkPath
-   * @returns
+  /**
+   * 给设备列表中的每个设备安装apk
+   * @param deviceList
+   * @param apkPath
+   * @returns
    */
   static async installApk() {
     let deviceList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];

package/lib/utils/RequestUtils.js

@@ -9,8 +9,8 @@ var _axios = _interopRequireDefault(require("axios"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * RequestUtils
+/**
+ * RequestUtils
  */
 class RequestUtils {
   static async sendReq(client, api, params) {

package/lib/utils/VelaAvdUtils.js

@@ -33,8 +33,8 @@ class VelaVvdUtils {
     return true;
   }
 
-  /**
-   * 命令行访问方式创建模拟器
+  /**
+   * 命令行访问方式创建模拟器
    */
   static async createVelaVvdByInquire() {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.5-beta.8",
+  "version": "2.0.5-widget-provider-beta.1",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -22,14 +22,14 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.5-beta.8",
-    "@aiot-toolkit/commander": "2.0.5-beta.8",
-    "@aiot-toolkit/emulator": "2.0.5-beta.8",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.8",
+    "@aiot-toolkit/aiotpack": "2.0.5-widget-provider-beta.1",
+    "@aiot-toolkit/commander": "2.0.5-widget-provider-beta.1",
+    "@aiot-toolkit/emulator": "2.0.5-widget-provider-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.5-widget-provider-beta.1",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
     "axios": "^1.7.4",
-    "file-lane": "2.0.5-beta.8",
+    "file-lane": "2.0.5-widget-provider-beta.1",
     "fs-extra": "^11.2.0",
     "koa-router": "^13.0.1",
     "lodash": "^4.17.21",
@@ -43,5 +43,5 @@
     "@types/qr-image": "^3.2.9",
     "@types/semver": "^7.5.8"
   },
-  "gitHead": "4604e54b9b009689782201b828f39a067f5fb0d4"
+  "gitHead": "64842a2c374b8b3b344cef377d9c032eaf1a99a7"
 }

package/lib/builder/XtsBuilder.d.ts

@@ -1,18 +0,0 @@
-import { IParam } from '@aiot-toolkit/commander';
-import IBuilder from './IBuilder';
-export interface IBuilderOption {
-    watch?: boolean;
-    skip?: string;
-}
-/**
- * XtsBuilder
- */
-declare class XtsBuilder implements IBuilder<IBuilderOption> {
-    static readonly PROJECT_TYPE = "xts quick app";
-    private fileLane?;
-    match(projectPath: string): boolean;
-    build(projectPath: string, options: IBuilderOption): Promise<void>;
-    dispose(): Promise<void>;
-    readonly params: IParam[];
-}
-export default XtsBuilder;

package/lib/builder/XtsBuilder.js

@@ -1,94 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _aiotpack = require("@aiot-toolkit/aiotpack");
-var _sharedUtils = require("@aiot-toolkit/shared-utils");
-var _fileLane = require("file-lane");
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * XtsBuilder
- */
-class XtsBuilder {
-  static PROJECT_TYPE = 'xts quick app';
-  match(projectPath) {
-    // app/app.xts 存在视为xts项目
-    return _fs.default.existsSync(_path.default.resolve(projectPath, 'app/app.xts'));
-  }
-  async build(projectPath, options) {
-    if (this.fileLane) {
-      // 已经在运行中，请先停止
-      throw new Error('already running, please stop first: builder.stop()');
-    }
-    const watch = options.watch || false;
-    _sharedUtils.ColorConsole.success('Start build...\n', {
-      word: 'ProjectPath: ',
-      style: _sharedUtils.ColorConsole.getStyle(_sharedUtils.Loglevel.SUCCESS)
-    }, projectPath, '\n', {
-      word: 'buildOptions: ',
-      style: _sharedUtils.ColorConsole.getStyle(_sharedUtils.Loglevel.SUCCESS)
-    }, JSON.stringify(options));
-    const compilerOptions = {
-      skip: _sharedUtils.StringUtil.string2arrayByComma(options.skip)
-    };
-    const config = new _aiotpack.XtsConfig(projectPath);
-    if (compilerOptions.skip?.includes('xts2ts')) {
-      _sharedUtils.ColorConsole.info("### skip compile xts to ts due to --skip ${compilerOptions?.skip.join(',')}");
-      const context = _fileLane.FileLaneUtil.createContext(config.output, projectPath);
-      const preWorks = config.beforeCompile || [];
-      for (let item of preWorks) {
-        try {
-          await item({
-            context,
-            config,
-            compilerOption: compilerOptions
-          });
-        } catch (error) {
-          // 报错 prework的item error
-        }
-      }
-      const follWorks = config.afterCompile || [];
-      for (let item of follWorks) {
-        try {
-          await item.worker({
-            context,
-            config,
-            compilerOption: compilerOptions
-          });
-        } catch (error) {
-          // 报错 prework的item error
-        }
-      }
-    } else {
-      this.fileLane = new _fileLane.FileLane(config, projectPath, compilerOptions);
-      this.fileLane.start({
-        watch
-      });
-    }
-  }
-  async dispose() {
-    await this.fileLane?.dispose();
-    this.fileLane = undefined;
-  }
-  params = (() => [{
-    name: 'skip',
-    type: 'string',
-    description: `Can configure skip steps, comma separated, optional values: ${_aiotpack.skipList.join(',')}`,
-    validate(value) {
-      // TODO: validate 不起作用
-      const res = _sharedUtils.StringUtil.string2arrayByComma(value);
-      const unValid = res.find(r => {
-        return !_aiotpack.skipList.includes(r);
-      });
-      if (unValid) {
-        return `${unValid} is unvalidate,  validate value are ${_aiotpack.skipList.join(',')}, Multiple values separated by commas`;
-      }
-      return true;
-    }
-  }])();
-}
-var _default = exports.default = XtsBuilder;

package/lib/starter/XtsStarter.d.ts

@@ -1,9 +0,0 @@
-import { IParam } from '@aiot-toolkit/commander';
-import XtsBuilder from '../builder/XtsBuilder';
-import IStarter from './IStarter';
-declare class XtsStarter extends IStarter {
-    builder: XtsBuilder;
-    params: IParam[];
-    start(projectPath: string, options: any): void;
-}
-export default XtsStarter;

package/lib/starter/XtsStarter.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _XtsBuilder = _interopRequireDefault(require("../builder/XtsBuilder"));
-var _IStarter = _interopRequireDefault(require("./IStarter"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-class XtsStarter extends _IStarter.default {
-  builder = (() => new _XtsBuilder.default())();
-  params = [];
-  start(projectPath, options) {
-    console.log(projectPath, options);
-    throw new Error('Method not implemented.');
-  }
-}
-var _default = exports.default = XtsStarter;