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

package/lib/starter/androidRouter/PackageRouter.js

@@ -1,152 +1,156 @@
 "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 shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const qr_image_1 = __importDefault(require("qr-image"));
-const LinkMode_1 = __importDefault(require("./LinkMode"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _path = _interopRequireDefault(require("path"));
+var _qrImage = _interopRequireDefault(require("qr-image"));
+var _LinkMode = _interopRequireDefault(require("./LinkMode"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const CLIENT_PORT = 39517;
 /**
  * 打包相关的路由配置
  * 用于开发机的httpServer
  */
 class PackageRouter {
-    constructor(param) {
-        this.param = param;
-        this.routeList = [
-            {
-                path: '/qrcode', // 获取二维码图片
-                handler: (ctx, next) => {
-                    return this.handlerQrCode(ctx, next);
-                }
-            },
-            {
-                path: '/bundle', // 获取 rpk 包
-                handler: (ctx, next) => {
-                    this.recordDevice(ctx);
-                    return this.handlerDownLoadRpk(ctx, next);
-                }
-            }
-        ];
-        /**
-         * 下载 rpk 包
-         * @param ctx
-         * @param next
-         */
-        this.handlerDownLoadRpk = (ctx, next) => {
-            const { projectPath, options } = this.param;
-            const dist = path_1.default.join(projectPath, options.releasePath);
-            const files = fs_extra_1.default.readdirSync(dist).filter((item) => path_1.default.extname(item) === '.rpk');
-            const filePath = files.length ? path_1.default.join(dist, files[0]) : '';
-            this.download(filePath, ctx);
-            return next();
-        };
-        this.handlerQrCode = (ctx, next) => {
-            const qrText = ctx.origin;
-            const image = qr_image_1.default.image(qrText, {
-                size: 9
-            });
-            ctx.type = 'image/png';
-            ctx.body = image;
-            return next();
-        };
-        /**
-         * 记录设备信息
-         *
-         * 获取请求的 ip 和端口，记录到本机中，最多记录5个
-         *
-         * 文件内容的格式为：
-         * ```
-         * records: {
-         *    "快应用项目路径":[
-         *        {ip:"", port:""},
-         *        {ip:"", port:""},
-         *        {ip:"", port:""}
-         *    ]
-         * }
-         * ```
-         *
-         *
-         * 此记录的作用是：当重新打包后，获取已连接的设备列表
-         * @param ctx
-         * @param next
-         */
-        this.recordDevice = (ctx) => __awaiter(this, void 0, void 0, function* () {
-            const clientInfo = this.getClientFromRequest(ctx);
-            if (!(clientInfo === null || clientInfo === void 0 ? void 0 : clientInfo.clientIp)) {
-                return;
-            }
-            if (clientInfo.linkMode === LinkMode_1.default.WIFI) {
-                const max = 5;
-                const filePath = this.param.options.clientRecordPath;
-                const projectPath = this.param.projectPath;
-                const data = {
-                    sn: clientInfo.sn,
-                    ip: clientInfo.clientIp,
-                    port: CLIENT_PORT
-                };
-                const json = fs_extra_1.default.readJSONSync(filePath, { throws: false }) || {};
-                if (!json.records) {
-                    json.records = {};
-                }
-                if (!json.records[projectPath]) {
-                    json.records[projectPath] = [];
-                }
-                const deviceList = json.records[projectPath];
-                if (deviceList.findIndex((item) => item.ip === data.ip) < 0) {
-                    deviceList.push(data);
-                    if (deviceList.length > max) {
-                        deviceList.splice(0, deviceList.length - max);
-                    }
-                    fs_extra_1.default.ensureDirSync(path_1.default.dirname(filePath));
-                    fs_extra_1.default.writeJSONSync(filePath, json, { spaces: 2 });
-                }
-            }
-        });
+  constructor(param) {
+    this.param = param;
+  }
+  routeList = [{
+    path: '/qrcode',
+    // 获取二维码图片
+    handler: (ctx, next) => {
+      return this.handlerQrCode(ctx, next);
     }
-    getClientFromRequest(ctx) {
-        const clientIp = shared_utils_1.NetworkUtil.getClientIp(ctx);
-        const serverIp = shared_utils_1.NetworkUtil.getIPv4IPAddress();
-        const sn = ctx.request.header['device-serial-number'];
-        let linkMode = LinkMode_1.default.NULL;
-        if (clientIp === '127.0.0.1' && sn) {
-            linkMode = LinkMode_1.default.ADB;
-        }
-        else if (clientIp !== '127.0.0.1' && clientIp !== serverIp) {
-            linkMode = LinkMode_1.default.WIFI;
-        }
-        return { clientIp, sn, linkMode };
+  }, {
+    path: '/bundle',
+    // 获取 rpk 包
+    handler: (ctx, next) => {
+      this.recordDevice(ctx);
+      return this.handlerDownLoadRpk(ctx, next);
     }
-    /**
-     * http 请求中，用于返回下载文件
-     *
-     * 调用此方法后，仍需调用 next()
-     *
-     * @param filePath 文件绝对路径
-     * @param ctx 请求上下文
-     */
-    download(filePath, ctx) {
-        if (filePath && fs_extra_1.default.existsSync(filePath)) {
-            ctx.set('Content-Type', 'application/octet-stream');
-            ctx.set('Content-Transfer-Encoding', 'binary');
-            ctx.set('Content-Disposition', `attachment; filename=${path_1.default.basename(filePath)}`);
-            ctx.body = fs_extra_1.default.createReadStream(filePath);
-        }
-        else {
-            ctx.throw('404', 404);
+  }];
+
+  /**
+   * 下载 rpk 包
+   * @param ctx
+   * @param next
+   */
+  handlerDownLoadRpk = (ctx, next) => {
+    const {
+      projectPath,
+      options
+    } = this.param;
+    const dist = _path.default.join(projectPath, options.releasePath);
+    const files = _fsExtra.default.readdirSync(dist).filter(item => _path.default.extname(item) === '.rpk');
+    const filePath = files.length ? _path.default.join(dist, files[0]) : '';
+    this.download(filePath, ctx);
+    return next();
+  };
+  handlerQrCode = (ctx, next) => {
+    const qrText = ctx.origin;
+    const image = _qrImage.default.image(qrText, {
+      size: 9
+    });
+    ctx.type = 'image/png';
+    ctx.body = image;
+    return next();
+  };
+
+  /**
+   * 记录设备信息
+   *
+   * 获取请求的 ip 和端口，记录到本机中，最多记录5个
+   *
+   * 文件内容的格式为：
+   * ```
+   * records: {
+   *    "快应用项目路径":[
+   *        {ip:"", port:""},
+   *        {ip:"", port:""},
+   *        {ip:"", port:""}
+   *    ]
+   * }
+   * ```
+   *
+   *
+   * 此记录的作用是：当重新打包后，获取已连接的设备列表
+   * @param ctx
+   * @param next
+   */
+  recordDevice = async ctx => {
+    const clientInfo = this.getClientFromRequest(ctx);
+    if (!clientInfo?.clientIp) {
+      return;
+    }
+    if (clientInfo.linkMode === _LinkMode.default.WIFI) {
+      const max = 5;
+      const filePath = this.param.options.clientRecordPath;
+      const projectPath = this.param.projectPath;
+      const data = {
+        sn: clientInfo.sn,
+        ip: clientInfo.clientIp,
+        port: CLIENT_PORT
+      };
+      const json = _fsExtra.default.readJSONSync(filePath, {
+        throws: false
+      }) || {};
+      if (!json.records) {
+        json.records = {};
+      }
+      if (!json.records[projectPath]) {
+        json.records[projectPath] = [];
+      }
+      const deviceList = json.records[projectPath];
+      if (deviceList.findIndex(item => item.ip === data.ip) < 0) {
+        deviceList.push(data);
+        if (deviceList.length > max) {
+          deviceList.splice(0, deviceList.length - max);
         }
+        _fsExtra.default.ensureDirSync(_path.default.dirname(filePath));
+        _fsExtra.default.writeJSONSync(filePath, json, {
+          spaces: 2
+        });
+      }
+    }
+  };
+  getClientFromRequest(ctx) {
+    const clientIp = _sharedUtils.NetworkUtil.getClientIp(ctx);
+    const serverIp = _sharedUtils.NetworkUtil.getIPv4IPAddress();
+    const sn = ctx.request.header['device-serial-number'];
+    let linkMode = _LinkMode.default.NULL;
+    if (clientIp === '127.0.0.1' && sn) {
+      linkMode = _LinkMode.default.ADB;
+    } else if (clientIp !== '127.0.0.1' && clientIp !== serverIp) {
+      linkMode = _LinkMode.default.WIFI;
+    }
+    return {
+      clientIp,
+      sn,
+      linkMode
+    };
+  }
+
+  /**
+   * http 请求中，用于返回下载文件
+   *
+   * 调用此方法后，仍需调用 next()
+   *
+   * @param filePath 文件绝对路径
+   * @param ctx 请求上下文
+   */
+  download(filePath, ctx) {
+    if (filePath && _fsExtra.default.existsSync(filePath)) {
+      ctx.set('Content-Type', 'application/octet-stream');
+      ctx.set('Content-Transfer-Encoding', 'binary');
+      ctx.set('Content-Disposition', `attachment; filename=${_path.default.basename(filePath)}`);
+      ctx.body = _fsExtra.default.createReadStream(filePath);
+    } else {
+      ctx.throw('404', 404);
     }
+  }
 }
-exports.default = PackageRouter;
+var _default = exports.default = PackageRouter;

package/lib/utils/AdbUtils.js

@@ -1,83 +1,55 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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 });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const adbMiwt = __importStar(require("@miwt/adb"));
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
+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; }
 /**
  * AdbUtils
  */
 class AdbUtils {
-    // 连接设备
-    static connect(ip, port) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const adbConnet = yield adbMiwt.execAdbCmdAsync(`adb connect ${ip}:${port}`);
-            return adbConnet.indexOf('connected to') >= 0;
-        });
-    }
-    // 获取所有已连接的设备(包含无线连接设备)
-    static getAllConnectedDevices() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield adbMiwt.getAdbDevices();
-            return res.map(({ sn }) => sn);
-        });
-    }
-    // 安装设备
-    static installApk(sn, apkPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = yield adbMiwt.installApk(sn, apkPath);
-            return result;
-        });
-    }
-    // 启动调试器
-    static startDebugger(deviceSn) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const adbShell = adbMiwt.execAdbCmd(`adb -s ${deviceSn} shell am start -n "org.hapjs.debugger/.MainActivity"`);
-            adbShell.stdout.on('data', (data) => {
-                // 监听stderr事件，获取输出内容
-                shared_utils_1.ColorConsole.log(`### startDebugger ### ${data}`);
-            });
-            adbShell.stderr.on('data', (data) => {
-                // 监听stderr事件，获取输出内容
-                if (data.indexOf('Error') >= 0) {
-                    shared_utils_1.ColorConsole.throw(`### startDebugger ### ${data}`);
-                }
-            });
-            adbShell.on('close', () => {
-                // 处理命令正常结束
-                Promise.resolve();
-            });
-        });
-    }
+  // 连接设备
+  static async connect(ip, port) {
+    const adbConnet = await adbMiwt.execAdbCmdAsync(`adb connect ${ip}:${port}`);
+    return adbConnet.indexOf('connected to') >= 0;
+  }
+  // 获取所有已连接的设备(包含无线连接设备)
+  static async getAllConnectedDevices() {
+    const res = await adbMiwt.getAdbDevices();
+    return res.map(_ref => {
+      let {
+        sn
+      } = _ref;
+      return sn;
+    });
+  }
+
+  // 安装设备
+  static async installApk(sn, apkPath) {
+    const result = await adbMiwt.installApk(sn, apkPath);
+    return result;
+  }
+  // 启动调试器
+  static async startDebugger(deviceSn) {
+    const adbShell = adbMiwt.execAdbCmd(`adb -s ${deviceSn} shell am start -n "org.hapjs.debugger/.MainActivity"`);
+    adbShell.stdout.on('data', data => {
+      // 监听stderr事件，获取输出内容
+      _sharedUtils.ColorConsole.log(`### startDebugger ### ${data}`);
+    });
+    adbShell.stderr.on('data', data => {
+      // 监听stderr事件，获取输出内容
+      if (data.indexOf('Error') >= 0) {
+        _sharedUtils.ColorConsole.throw(`### startDebugger ### ${data}`);
+      }
+    });
+    adbShell.on('close', () => {
+      // 处理命令正常结束
+      Promise.resolve();
+    });
+  }
 }
-exports.default = AdbUtils;
+var _default = exports.default = AdbUtils;