@aiot-toolkit/emulator 2.0.3-beta.6 → 2.0.3-beta.8

package/lib/emulatorutil/skinLayoutParser.js

@@ -0,0 +1,111 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Status = exports.ConfigParser = void 0;
+let Status = exports.Status = /*#__PURE__*/function (Status) {
+  Status[Status["NAME"] = 1] = "NAME";
+  Status[Status["VALUE"] = 2] = "VALUE";
+  Status[Status["COMMENT"] = 3] = "COMMENT";
+  return Status;
+}({});
+class ConfigParser {
+  static isEndChar(char, index, str) {
+    return char === '\n' || index === str.length - 1;
+  }
+  parse(str) {
+    let result = {
+      comments: [],
+      values: {}
+    };
+    let currentValue = '';
+    let currentName = '';
+    let currentState = Status.NAME;
+    const resetState = () => {
+      currentValue = '';
+      currentName = '';
+    };
+    for (let i = 0; i < str.length; i++) {
+      const char = str[i];
+      switch (currentState) {
+        case Status.NAME:
+          if (char === '#') {
+            if (!currentName) {
+              currentState = Status.COMMENT;
+            }
+          } else if (char === ' ') {
+            if (currentName) {
+              currentState = Status.VALUE;
+            }
+          } else if (ConfigParser.isEndChar(char, i, str)) {
+            if (currentName) {
+              throw new Error('Unexpected end of input while in NAME state');
+            }
+          } else {
+            currentName += char;
+          }
+          break;
+        case Status.VALUE:
+          if (char === '{') {
+            let braceCount = 1;
+            let blockContent = '';
+            for (let j = i + 1; j < str.length; j++) {
+              const innerChar = str[j];
+              if (innerChar === '{') braceCount++;
+              if (innerChar === '}') braceCount--;
+              if (braceCount === 0) {
+                blockContent = str.substring(i + 1, j);
+                i = j;
+                break;
+              }
+              blockContent += innerChar;
+            }
+            const parser = new ConfigParser();
+            const parsedResult = parser.parse(blockContent);
+            result.values[currentName] = parsedResult;
+            resetState();
+            currentState = Status.NAME;
+          } else if (ConfigParser.isEndChar(char, i, str)) {
+            if (char !== '\n') {
+              currentValue += char;
+            }
+            result.values[currentName] = currentValue.trim();
+            resetState();
+            currentState = Status.NAME;
+          } else {
+            currentValue += char;
+          }
+          break;
+        case Status.COMMENT:
+          currentValue += char;
+          if (ConfigParser.isEndChar(char, i, str)) {
+            result.comments.push(currentValue.trim());
+            resetState();
+            currentState = Status.NAME;
+          }
+          break;
+        default:
+          throw new Error('Unknown state');
+      }
+    }
+    if (currentName) {
+      ;
+      result.values[currentName] = currentValue;
+    }
+    return result;
+  }
+  toObject(target) {
+    const res = {};
+    for (const key in target.values) {
+      const value = target.values[key];
+      if (typeof value === 'string') {
+        res[key] = value;
+      } else {
+        res[key] = this.toObject(value);
+      }
+    }
+    return res;
+  }
+}
+exports.ConfigParser = ConfigParser;

package/lib/index.d.ts

@@ -1,7 +1,7 @@
-import { default as VelaAvdCls } from './avd';
-import { getSystemArch } from './utils';
+export { VvdManager } from './vvd';
+import { getSystemArch, tryRun } from './utils';
 export * from './instance';
-export * from './typing/Avd';
+export * from './typing/Vvd';
 export * from './typing/Instance';
-export * from './emulatorutil/constants';
-export { VelaAvdCls, getSystemArch };
+export * from './emulatorutil';
+export { getSystemArch, tryRun };

package/lib/index.js

@@ -1,28 +1,78 @@
 "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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  VvdManager: true,
+  getSystemArch: true,
+  tryRun: true
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSystemArch = exports.VelaAvdCls = void 0;
-const avd_1 = __importDefault(require("./avd"));
-Object.defineProperty(exports, "VelaAvdCls", { enumerable: true, get: function () { return avd_1.default; } });
-const utils_1 = require("./utils");
-Object.defineProperty(exports, "getSystemArch", { enumerable: true, get: function () { return utils_1.getSystemArch; } });
-__exportStar(require("./instance"), exports);
-__exportStar(require("./typing/Avd"), exports);
-__exportStar(require("./typing/Instance"), exports);
-__exportStar(require("./emulatorutil/constants"), exports);
+Object.defineProperty(exports, "VvdManager", {
+  enumerable: true,
+  get: function () {
+    return _vvd.VvdManager;
+  }
+});
+Object.defineProperty(exports, "getSystemArch", {
+  enumerable: true,
+  get: function () {
+    return _utils.getSystemArch;
+  }
+});
+Object.defineProperty(exports, "tryRun", {
+  enumerable: true,
+  get: function () {
+    return _utils.tryRun;
+  }
+});
+var _vvd = require("./vvd");
+var _utils = require("./utils");
+var _instance = require("./instance");
+Object.keys(_instance).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _instance[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _instance[key];
+    }
+  });
+});
+var _Vvd = require("./typing/Vvd");
+Object.keys(_Vvd).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _Vvd[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _Vvd[key];
+    }
+  });
+});
+var _Instance = require("./typing/Instance");
+Object.keys(_Instance).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _Instance[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _Instance[key];
+    }
+  });
+});
+var _emulatorutil = require("./emulatorutil");
+Object.keys(_emulatorutil).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _emulatorutil[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _emulatorutil[key];
+    }
+  });
+});

package/lib/instance/common.d.ts

@@ -1,46 +1,45 @@
-import IManifest from '@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/interface/IManifest';
-import { ChildProcess } from 'child_process';
-import VelaAvdCls from '../avd';
-import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
-/**
- * CommonInstance
- */
-declare class CommonInstance {
+import readline from 'readline';
+import { IEmulatorInstanceParams } from '../typing/Instance';
+import { VelaImageType } from '../typing/Vvd';
+import { ChildProcessWithoutNullStreams } from 'child_process';
+declare class CommonEmulatorInstance {
+    imageType: VelaImageType;
+    appDir: string;
     quickappStartedFlag: RegExp;
-    projectPath: string;
-    sdkHome: string;
-    avdHome: string;
-    velaAvdCls: VelaAvdCls;
-    goldfishProcess: ChildProcess | undefined;
-    isFirstStart: boolean;
-    startOptions: IStartOptions | undefined;
-    projectInfo: IManifest;
-    isRpk: boolean;
-    isDistributedApp: boolean;
-    sn?: string;
-    constructor(params: INewGoldfishInstanceParams);
-    /** 获取模拟器二进制文件所在位置 */
-    getEmulatorBinPath(): string;
-    /** 在goldfish模拟器中运行快应用 */
-    start(options: IStartOptions): Promise<void>;
+    sn: string;
+    vvdName: string;
+    debugPort?: number | string;
+    stdoutReadline: readline.Interface;
+    stderrReadline: readline.Interface;
+    disposeReadlines: () => void;
+    onStdout: (msg: string) => void;
+    onErrout: (msg: string) => void;
+    logcatProcess: ChildProcessWithoutNullStreams;
+    constructor(params: IEmulatorInstanceParams);
+    /** 推送指定文件 */
+    push(sourcePath: string, targetPath: string): Promise<string>;
+    unzip(zipPath: string, targetPath: string): Promise<void>;
+    /** 推送指定 rpk */
+    pushRpk(rpkPath: string, appPackageName: string): Promise<string>;
     /**
      * 判断模拟器是否 ready
      */
     isConnected(): Promise<boolean>;
-    /**
-     * 通过adb连接模拟器。
-     * 时间限制为 @param timeout 秒，超时则表示连接失败
-     * @returns
-     */
-    connectGoldfish(timeout?: number): Promise<unknown>;
-    /** 杀死进程 */
-    killProcess(currProcess?: ChildProcess): void;
-    /** 停止模拟器并释放相关资源 */
-    stop(): Promise<void>;
+    /** 安装应用，留给子类实现 */
+    install(rpkPath: string, packageName?: string): Promise<void>;
+    /** 卸载应用，留给子类实现 */
+    uninstall(packageName: string): Promise<void>;
+    /** 启动应用，留给子类实现 */
+    startApp(packageName: string, debug?: boolean): Promise<void>;
+    pushAndInstall(rpkPath: string, appName: string): Promise<void>;
+    /** 重启应用 */
+    reloadApp(appName: string, debug?: boolean): Promise<void>;
+    /** 关闭应用 */
+    closeApp(appName: string): Promise<void>;
+    /** 关闭模拟器 */
+    poweroff(timeout?: number): Promise<void>;
+    systemed(): Promise<string>;
     /** 重启模拟器 */
-    restart(): Promise<void>;
-    /** 创建server */
-    createWebsockeServer(): Promise<void>;
-    connectDevice(): Promise<string | void>;
+    reboot(): Promise<void>;
 }
-export default CommonInstance;
+export default CommonEmulatorInstance;