aiot-toolkit 2.0.3-beta.7 → 2.0.3-beta.9

package/lib/index.js

@@ -1,14 +1,49 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CompileMode = exports.FileLaneTriggerType = exports.AndroidUxBuilder = exports.VelaUxBuilder = void 0;
-const VelaUxBuilder_1 = __importDefault(require("./builder/VelaUxBuilder"));
-exports.VelaUxBuilder = VelaUxBuilder_1.default;
-const AndroidUxBuilder_1 = __importDefault(require("./builder/AndroidUxBuilder"));
-exports.AndroidUxBuilder = AndroidUxBuilder_1.default;
-const FileLaneTriggerType_1 = __importDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
-exports.FileLaneTriggerType = FileLaneTriggerType_1.default;
-const aiotpack_1 = require("@aiot-toolkit/aiotpack");
-Object.defineProperty(exports, "CompileMode", { enumerable: true, get: function () { return aiotpack_1.CompileMode; } });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "AndroidUxBuilder", {
+  enumerable: true,
+  get: function () {
+    return _AndroidUxBuilder.default;
+  }
+});
+Object.defineProperty(exports, "CompileMode", {
+  enumerable: true,
+  get: function () {
+    return _aiotpack.CompileMode;
+  }
+});
+Object.defineProperty(exports, "FileLaneTriggerType", {
+  enumerable: true,
+  get: function () {
+    return _FileLaneTriggerType.default;
+  }
+});
+Object.defineProperty(exports, "IFileLaneEvents", {
+  enumerable: true,
+  get: function () {
+    return _IFileLaneEvents.default;
+  }
+});
+Object.defineProperty(exports, "IFileLaneSuccessData", {
+  enumerable: true,
+  get: function () {
+    return _IFileLaneEvents.IFileLaneSuccessData;
+  }
+});
+Object.defineProperty(exports, "VelaUxBuilder", {
+  enumerable: true,
+  get: function () {
+    return _VelaUxBuilder.default;
+  }
+});
+var _VelaUxBuilder = _interopRequireDefault(require("./builder/VelaUxBuilder"));
+var _AndroidUxBuilder = _interopRequireDefault(require("./builder/AndroidUxBuilder"));
+var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
+var _aiotpack = require("@aiot-toolkit/aiotpack");
+var _IFileLaneEvents = _interopRequireWildcard(require("file-lane/lib/interface/IFileLaneEvents"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/lib/interface/CommandInterface.js

@@ -1,2 +1,5 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/interface/VelaEmulatorInterface.js

@@ -1,2 +1,5 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/starter/AndroidUxStart.js

@@ -1,171 +1,171 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        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 aiotpack_1 = require("@aiot-toolkit/aiotpack");
-const commander_1 = require("@aiot-toolkit/commander");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const http_1 = __importDefault(require("http"));
-const path_1 = __importDefault(require("path"));
-const AndroidUxBuilder_1 = __importDefault(require("../builder/AndroidUxBuilder"));
-const IStarter_1 = __importDefault(require("./IStarter"));
-const PackageRouter_1 = __importDefault(require("./androidRouter/PackageRouter"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _aiotpack = require("@aiot-toolkit/aiotpack");
+var _commander = require("@aiot-toolkit/commander");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _http = _interopRequireDefault(require("http"));
+var _path = _interopRequireDefault(require("path"));
+var _AndroidUxBuilder = _interopRequireDefault(require("../builder/AndroidUxBuilder"));
+var _IStarter = _interopRequireDefault(require("./IStarter"));
+var _PackageRouter = _interopRequireDefault(require("./androidRouter/PackageRouter"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * AndroidUxStart
  *
  * 1. 启动本机开发者http服务器，并提供二维码，以下载 rpk
  * 2. 打包 rpk，并监听文件变化，重新打包
  */
-class AndroidUxStart extends IStarter_1.default {
-    constructor() {
-        super(...arguments);
-        this.builder = new AndroidUxBuilder_1.default();
-        this.projectPath = '';
-        this.params = [...this.builder.params];
-    }
-    get waiter() {
-        return new commander_1.PersistentCommand({
-            description: 'you can press follow keys to do something',
-            options: [
-                {
-                    key: 'q',
-                    description: 'show qrcode',
-                    action: () => {
-                        this.showAddress();
-                    }
-                },
-                {
-                    key: '?',
-                    description: 'show waiter desc',
-                    action: () => {
-                        this.waiter.clearLog();
-                        this.waiter.describe();
-                    }
-                }
-            ]
-        });
-    }
-    /**
-     * 启动
-     * 1. build 项目
-     * 2. build 成功，则创建http服务器
-     */
-    start(projectPath, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.projectPath = projectPath;
-            const buildOption = Object.assign(Object.assign({}, aiotpack_1.JavascriptDefaultCompileOption), options);
-            yield this.build(projectPath, buildOption);
-            yield this.createServer(buildOption);
-        });
-    }
-    /**
-     * 创建服务器
-     *
-     * 1. 使用 koa 创建服务器
-     * 2. 显示服务器地址和二维码
-     * @returns
-     */
-    createServer(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                const routeConfigList = [
-                    new PackageRouter_1.default({
-                        projectPath: this.projectPath,
-                        options
-                    })
-                ];
-                const data = yield shared_utils_1.NetworkUtil.createHttpServer({
-                    wantPort: options.server.port,
-                    routeConfigList,
-                    staticFolder: path_1.default.join(__dirname, './androidRouter/h5'),
-                    events: {
-                        onSuccess: () => {
-                            this.server = data.server;
-                            this.port = data.port;
-                            this.showAddress();
-                            resolve(data);
-                        }
-                    }
-                });
-            }));
-        });
-    }
-    showAddress() {
-        const ip = shared_utils_1.NetworkUtil.getIPv4IPAddress();
-        const { port } = this;
-        if (!ip) {
-            const localUrl = `http://localhost:${port}`;
-            shared_utils_1.ColorConsole.warn(`devServer`, localUrl);
+class AndroidUxStart extends _IStarter.default {
+  builder = (() => new _AndroidUxBuilder.default())();
+  projectPath = '';
+  params = (() => [...this.builder.params])();
+  get waiter() {
+    return new _commander.PersistentCommand({
+      description: 'you can press follow keys to do something',
+      options: [{
+        key: 'q',
+        description: 'show qrcode',
+        action: () => {
+          this.showAddress();
         }
-        else {
-            const lanUrl = `http://${ip}:${port}`;
-            // 显示二维码
-            shared_utils_1.ColorConsole.info(`devServer`, lanUrl);
-            shared_utils_1.CommonUtil.outputQRCodeOnTerminal(lanUrl);
+      }, {
+        key: '?',
+        description: 'show waiter desc',
+        action: () => {
+          this.waiter.clearLog();
+          this.waiter.describe();
         }
+      }]
+    });
+  }
+
+  /**
+   * 启动
+   * 1. build 项目
+   * 2. build 成功，则创建http服务器
+   */
+  async start(projectPath, options) {
+    this.projectPath = projectPath;
+    const buildOption = {
+      ..._aiotpack.JavascriptDefaultCompileOption,
+      ...options
+    };
+    await this.build(projectPath, buildOption);
+    await this.createServer(buildOption);
+  }
+
+  /**
+   * 创建服务器
+   *
+   * 1. 使用 koa 创建服务器
+   * 2. 显示服务器地址和二维码
+   * @returns
+   */
+  async createServer(options) {
+    return new Promise(async resolve => {
+      const routeConfigList = [new _PackageRouter.default({
+        projectPath: this.projectPath,
+        options
+      })];
+      const data = await _sharedUtils.NetworkUtil.createHttpServer({
+        wantPort: options.server.port,
+        routeConfigList,
+        staticFolder: _path.default.join(__dirname, './androidRouter/h5'),
+        events: {
+          onSuccess: () => {
+            this.server = data.server;
+            this.port = data.port;
+            this.showAddress();
+            resolve(data);
+          }
+        }
+      });
+    });
+  }
+  showAddress() {
+    const ip = _sharedUtils.NetworkUtil.getIPv4IPAddress();
+    const {
+      port
+    } = this;
+    if (!ip) {
+      const localUrl = `http://localhost:${port}`;
+      _sharedUtils.ColorConsole.warn(`devServer`, localUrl);
+    } else {
+      const lanUrl = `http://${ip}:${port}`;
+      // 显示二维码
+      _sharedUtils.ColorConsole.info(`devServer`, lanUrl);
+      _sharedUtils.CommonUtil.outputQRCodeOnTerminal(lanUrl);
     }
-    build(projectPath, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.builder.events = {
-                onBuildSuccess: (data) => {
-                    shared_utils_1.ColorConsole.info(`build time: ${data.costTime}ms`);
-                    this.noticeDeviceListUpdate(projectPath, options);
-                }
-            };
-            yield this.builder.build(projectPath, Object.assign(Object.assign({}, options), { watch: true }));
-        });
-    }
-    dispose() {
-        var _a;
-        (_a = this.server) === null || _a === void 0 ? void 0 : _a.close();
-    }
-    /**
-     * 通知已知的设备，应用有更新
-     * @param projectPath
-     * @param options
-     */
-    noticeDeviceListUpdate(projectPath, options) {
-        var _a;
-        const { clientRecordPath } = options;
-        const json = fs_extra_1.default.readJSONSync(clientRecordPath, { throws: false });
-        const deviceList = (_a = json === null || json === void 0 ? void 0 : json.records) === null || _a === void 0 ? void 0 : _a[projectPath];
-        if (deviceList) {
-            deviceList.forEach((item) => {
-                const { ip, port } = item;
-                if (!ip) {
-                    return;
-                }
-                const url = `http://${ip}:${port}/update`;
-                const requestOption = { host: ip, port, path: '/update', timeout: 3000 };
-                http_1.default
-                    .request(requestOption, () => {
-                    shared_utils_1.ColorConsole.success(`Notify the phone to update the rpk file success`, {
-                        word: url
-                    });
-                })
-                    .on('error', (error) => {
-                    shared_utils_1.ColorConsole.warn(`Notify the phone to update the rpk file`, { word: 'error: ' }, {
-                        word: error.message
-                    });
-                })
-                    .on('timeout', () => {
-                    shared_utils_1.ColorConsole.warn(`Notify the phone to update the rpk file`, { word: 'timeout: ' }, {
-                        word: url
-                    });
-                });
-            });
+  }
+  async build(projectPath, options) {
+    this.builder.events = {
+      onBuildSuccess: data => {
+        _sharedUtils.ColorConsole.info(`build time: ${data.costTime}ms`);
+        this.noticeDeviceListUpdate(projectPath, options);
+      }
+    };
+    await this.builder.build(projectPath, {
+      ...options,
+      watch: true
+    });
+  }
+  dispose() {
+    this.server?.close();
+  }
+
+  /**
+   * 通知已知的设备，应用有更新
+   * @param projectPath
+   * @param options
+   */
+  noticeDeviceListUpdate(projectPath, options) {
+    const {
+      clientRecordPath
+    } = options;
+    const json = _fsExtra.default.readJSONSync(clientRecordPath, {
+      throws: false
+    });
+    const deviceList = json?.records?.[projectPath];
+    if (deviceList) {
+      deviceList.forEach(item => {
+        const {
+          ip,
+          port
+        } = item;
+        if (!ip) {
+          return;
         }
+        const url = `http://${ip}:${port}/update`;
+        const requestOption = {
+          host: ip,
+          port,
+          path: '/update',
+          timeout: 3000
+        };
+        _http.default.request(requestOption, () => {
+          _sharedUtils.ColorConsole.success(`Notify the phone to update the rpk file success`, {
+            word: url
+          });
+        }).on('error', error => {
+          _sharedUtils.ColorConsole.warn(`Notify the phone to update the rpk file`, {
+            word: 'error: '
+          }, {
+            word: error.message
+          });
+        }).on('timeout', () => {
+          _sharedUtils.ColorConsole.warn(`Notify the phone to update the rpk file`, {
+            word: 'timeout: '
+          }, {
+            word: url
+          });
+        });
+      });
     }
+  }
 }
-exports.default = AndroidUxStart;
+var _default = exports.default = AndroidUxStart;

package/lib/starter/IStarter.js

@@ -1,43 +1,45 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
 /**
  * IStarter
  */
 class IStarter {
-    constructor(name, description) {
-        this.name = name;
-        this.description = description;
-        /**
-         * start 的参数列表
-         */
-        this.params = [];
-    }
-    get waiter() {
-        return;
-    }
-    /**
-     * start 的命令
-     */
-    getCommond() {
-        return {
-            name: this.name,
-            description: this.description,
-            paramList: this.params,
-            waiter: this.waiter,
-            action: (option) => __awaiter(this, void 0, void 0, function* () {
-                const projectPath = process.cwd();
-                return this.start(projectPath, option);
-            })
-        };
-    }
+  /**
+   * start 的参数列表
+   */
+  params = [];
+  constructor(name, description) {
+    this.name = name;
+    this.description = description;
+  }
+  get waiter() {
+    return;
+  }
+
+  /**
+   * start 的命令
+   */
+  getCommond() {
+    return {
+      name: this.name,
+      description: this.description,
+      paramList: this.params,
+      waiter: this.waiter,
+      action: async option => {
+        const projectPath = process.cwd();
+        return this.start(projectPath, option);
+      }
+    };
+  }
+
+  /**
+   * 运行项目
+   * @param projectPath 项目路径
+   * @param options 命令参数
+   */
 }
-exports.default = IStarter;
+exports.default = IStarter;

package/lib/starter/VelaUxStarter.d.ts

@@ -1,15 +1,20 @@
 import { IParam } from '@aiot-toolkit/commander';
-import { IStartOptions, GoldfishInstance, MiwearInstance, OldGoldfishInstance } from '@aiot-toolkit/emulator';
+import { IStartOptions, CommonInstance } from '@aiot-toolkit/emulator';
 import VelaUxBuilder from '../builder/VelaUxBuilder';
 import IStarter from './IStarter';
+import Event from 'events';
 /**
  * VelaUxStarter
  * ux快应用启动器
  */
 declare class VelaUxStarter extends IStarter<IStartOptions> {
-    private ws;
-    currentGoldfishInstance: GoldfishInstance | MiwearInstance | OldGoldfishInstance | undefined;
+    protected name: string;
+    protected description: string;
+    emulatorInstance?: CommonInstance;
     builder: VelaUxBuilder;
+    event: Event;
+    lastRpk?: string;
+    constructor(name: string, description: string);
     params: IParam[];
     start(projectPath: string, options: any): Promise<void>;
     /**