assistsx-js 0.1.42 → 0.2.1

package/README.md

@@ -3,13 +3,13 @@
 一个支持通过Web端实现Android平台自动化脚本的JS库，支持元素节点查找、获取节点文本、节点截图、执行手势动作、提供步骤器实现复杂自动化业务等一系列自动化脚本开发能力支持
 
 # AssistsX JS运行平台
-开发的自动化脚本需要运行在Android端[AssistsX](https://www.pgyer.com/SqGaCx8C)中，所以开发前需要先在手机安装[AssistsX](https://www.pgyer.com/SqGaCx8C)
+开发的自动化脚本需要运行在Android端[AssistsX](https://www.pgyer.com/assistsx)中，所以开发前需要先在手机安装[AssistsX](https://www.pgyer.com/assistsx)
 
 **扫码下载**
 
-<img width="112" alt="image" src="https://github.com/user-attachments/assets/c28ecc41-01f8-4e52-9ddc-80dc5c6d0ed5" />
+<img width="112" alt="image" src="https://github.com/user-attachments/assets/6c371313-4ca1-4598-91b3-f716ec369e7b" />
 
-**下载链接：[https://www.pgyer.com/SqGaCx8C](https://www.pgyer.com/SqGaCx8C)**
+**下载链接：[https://www.pgyer.com/assistsx](https://www.pgyer.com/assistsx)**
 
 > 下载安装后会默认安装一个示例插件，可长按删除
 
@@ -80,7 +80,7 @@ const handleClick = () => {
 ```
 
 ## 4. 加载插件
-1. 通过[AssistsX](https://www.pgyer.com/SqGaCx8C)局域网加载插件
+1. 通过[AssistsX](https://www.pgyer.com/assistsx)局域网加载插件
 > 加载插件前需要配置项目允许局域网访问，在文件`vite.config.js`添加以下配置
 ```
 export default defineConfig({

package/dist/index.cjs

@@ -39,6 +39,9 @@ __export(index_exports, {
   ImageUtils: () => ImageUtils,
   Ime: () => Ime,
   ImeAction: () => ImeAction,
+  Log: () => Log,
+  LogCallMethod: () => LogCallMethod,
+  LogStream: () => LogStream,
   Mlkit: () => Mlkit,
   MlkitCallMethod: () => MlkitCallMethod,
   Node: () => Node,
@@ -62,6 +65,8 @@ __export(index_exports, {
   http: () => http,
   imageUtils: () => imageUtils,
   ime: () => ime,
+  log: () => log,
+  logUpdateListeners: () => logUpdateListeners,
   mlkit: () => mlkit,
   pathUtils: () => pathUtils,
   screen: () => screen,
@@ -70,7 +75,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/Bounds.ts
+// src/bounds.ts
 var Bounds = class _Bounds {
   // 构造函数
   constructor(left, top, right, bottom, width, height, centerX, centerY, exactCenterX, exactCenterY, isEmpty) {
@@ -171,7 +176,7 @@ var Bounds = class _Bounds {
   }
 };
 
-// src/CallMethod.ts
+// src/call-method.ts
 var CallMethod = {
   takeScreenshot: "takeScreenshot",
   takeScreenshotSave: "takeScreenshotSave",
@@ -243,7 +248,7 @@ var CallMethod = {
   saveRootNodeTreeJson: "saveRootNodeTreeJson"
 };
 
-// src/CallResponse.ts
+// src/call-response.ts
 var CallResponse = class {
   constructor(code, data, callbackId) {
     this.code = code;
@@ -272,7 +277,7 @@ var CallResponse = class {
   }
 };
 
-// src/Utils.ts
+// src/utils.ts
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -292,7 +297,7 @@ function decodeBase64UTF8(base64) {
   return new TextDecoder("utf-8").decode(bytes);
 }
 
-// src/AppInfo.ts
+// src/app-info.ts
 var AppInfo = class _AppInfo {
   constructor(isSystem = false, minSdkVersion = 0, name = "", packageName = "", targetSdkVersion = 0, versionCode = 0, versionName = "") {
     this.isSystem = isSystem;
@@ -337,7 +342,7 @@ var AppInfo = class _AppInfo {
   }
 };
 
-// src/DeviceInfo.ts
+// src/device-info.ts
 var DeviceInfo = class _DeviceInfo {
   constructor(uniqueDeviceId = "", androidID = "", macAddress = "", isDeviceRooted = false, manufacturer = "", model = "", sdkVersionCode = 0, sdkVersionName = "", abiList = [], isAdbEnabled = false, isDevelopmentSettingsEnabled = false, isEmulator = false, isTablet = false) {
     this.uniqueDeviceId = uniqueDeviceId;
@@ -400,7 +405,7 @@ var DeviceInfo = class _DeviceInfo {
   }
 };
 
-// src/AssistsXAsync.ts
+// src/assistsx-async.ts
 var AssistsXAsync = class {
   /**
    * 执行异步调用
@@ -1408,7 +1413,7 @@ var AssistsXAsync = class {
   // }
 };
 
-// src/StepStateStore.ts
+// src/step-state-store.ts
 var import_pinia = require("pinia");
 var useStepStore = (0, import_pinia.defineStore)("step", {
   state: () => ({
@@ -1447,7 +1452,7 @@ var useStepStore = (0, import_pinia.defineStore)("step", {
   }
 });
 
-// src/StepError.ts
+// src/step-error.ts
 var StepError = class extends Error {
   constructor(message, data, impl, tag, originalError, currentStep) {
     super(message);
@@ -1466,7 +1471,7 @@ var StepStopError = class extends StepError {
   }
 };
 
-// src/StepAsync.ts
+// src/step-async.ts
 var StepAsync = class {
   /**
    * 构造函数
@@ -1762,7 +1767,7 @@ var StepAsync = class {
   }
 };
 
-// src/Step.ts
+// src/step.ts
 var _Step = class _Step {
   /**
    * 构造函数
@@ -1791,7 +1796,7 @@ var _Step = class _Step {
      */
     this.repeatCount = 0;
     /**
-     * 步骤重复执行最大次数,默认不限制
+     * 步骤重复执行最大次数,默认15次
      */
     this.repeatCountMax = _Step.repeatCountMaxDefault;
     /**
@@ -1911,7 +1916,7 @@ var _Step = class _Step {
           } else {
             nextStep = await ((_e = currentStep.impl) == null ? void 0 : _e.call(currentStep, currentStep));
           }
-          if (currentStep.repeatCountMax >= _Step.repeatCountInfinite && currentStep.repeatCount >= currentStep.repeatCountMax) {
+          if (currentStep.repeatCountMax > _Step.repeatCountInfinite && currentStep.repeatCount >= currentStep.repeatCountMax) {
             if (_Step.showLog) {
               console.log(
                 `\u91CD\u590D\u6B21\u6570${currentStep.repeatCount}\u8D85\u8FC7\u6700\u5927\u6B21\u6570${currentStep.repeatCountMax}\uFF0C\u505C\u6B62\u6267\u884C`
@@ -2470,7 +2475,7 @@ var _Step = class _Step {
 };
 _Step.delayMsDefault = 1e3;
 _Step.repeatCountInfinite = -1;
-_Step.repeatCountMaxDefault = _Step.repeatCountInfinite;
+_Step.repeatCountMaxDefault = 15;
 _Step.showLog = false;
 _Step.exceptionRetryCountMaxDefault = 3;
 /**
@@ -2487,7 +2492,7 @@ _Step._interceptors = [];
 _Step.exception = void 0;
 var Step = _Step;
 
-// src/NodeAsync.ts
+// src/node-async.ts
 var NodeAsync = class {
   /**
    * 构造函数
@@ -2840,7 +2845,7 @@ var NodeAsync = class {
   }
 };
 
-// src/Node.ts
+// src/node.ts
 var Node = class _Node {
   /**
    * 节点在屏幕中的边界
@@ -3234,7 +3239,7 @@ var Node = class _Node {
   }
 };
 
-// src/AssistsX.ts
+// src/assistsx.ts
 var callbacks = /* @__PURE__ */ new Map();
 var accessibilityEventListeners = [];
 var screen = null;
@@ -4122,7 +4127,7 @@ if (typeof window !== "undefined") {
   }
 }
 
-// src/NodeClassValue.ts
+// src/node-class-value.ts
 var NodeClassValue = {
   ImageView: "android.widget.ImageView",
   TextView: "android.widget.TextView",
@@ -4136,7 +4141,7 @@ var NodeClassValue = {
   FrameLayout: "android.widget.FrameLayout"
 };
 
-// src/WindowFlags.ts
+// src/window-flags.ts
 var WindowFlags = class {
   // 0x1000000
   /**
@@ -4247,7 +4252,7 @@ WindowFlags.FLAG_SHOW_WALLPAPER = 1048576;
 /** 强制硬件加速 */
 WindowFlags.FLAG_HARDWARE_ACCELERATED = 16777216;
 
-// src/AccessibilityEventFilter.ts
+// src/accessibility-event-filter.ts
 var AccessibilityEventFilter = class _AccessibilityEventFilter {
   constructor(config = {}) {
     var _a, _b, _c, _d, _e;
@@ -6820,7 +6825,7 @@ var Gallery = class {
 };
 var gallery = new Gallery();
 
-// src/mlkit/MlkitCallMethod.ts
+// src/mlkit/mlkit-call-method.ts
 var MlkitCallMethod = {
   /**
    * 识别屏幕中指定词组的位置（基于当前截图）
@@ -7039,7 +7044,7 @@ var Mlkit = class {
 };
 var mlkit = new Mlkit();
 
-// src/barutils/BarUtilsCallMethod.ts
+// src/barutils/bar-utils-call-method.ts
 var BarUtilsCallMethod = {
   // Status bar
   getStatusBarHeight: "getStatusBarHeight",
@@ -7364,7 +7369,7 @@ var BarUtils = class {
 };
 var barUtils = new BarUtils();
 
-// src/floatingwindow/FloatCallMethod.ts
+// src/floatingwindow/float-call-method.ts
 var FloatCallMethod = {
   /** Load floating window */
   open: "open",
@@ -7566,6 +7571,334 @@ var Float = class {
   }
 };
 var float = new Float();
+
+// src/log/log-call-method.ts
+var LogCallMethod = {
+  readAllText: "readAllText",
+  clear: "clear",
+  refreshFromFile: "refreshFromFile",
+  appendLine: "appendLine",
+  appendTimestampedEntry: "appendTimestampedEntry",
+  replaceAll: "replaceAll",
+  subscribe: "subscribe",
+  unsubscribe: "unsubscribe",
+  uploadLogs: "uploadLogs",
+  /** 获取日志服务当前域名（origin，无路径；与上传、管理后台同源），对应 AssistsLogDiagnostics.adminWebBaseUrl() */
+  getLogServiceBaseUrl: "getLogServiceBaseUrl"
+};
+var LogStream = {
+  latestLine: "latestLine",
+  entireLogText: "entireLogText"
+};
+
+// src/log/log.ts
+var pendingCallbacks = /* @__PURE__ */ new Map();
+var streamHandlers = /* @__PURE__ */ new Map();
+var subscriptionIdToCallbackId = /* @__PURE__ */ new Map();
+if (typeof window !== "undefined" && !window.assistsxLogCallback) {
+  window.assistsxLogCallback = (data) => {
+    try {
+      const json = decodeBase64UTF8(data);
+      const response = JSON.parse(json);
+      const callbackId = response.callbackId;
+      if (!callbackId) {
+        return;
+      }
+      if (streamHandlers.has(callbackId)) {
+        streamHandlers.get(callbackId)(json);
+        return;
+      }
+      const pending = pendingCallbacks.get(callbackId);
+      if (pending) {
+        pending(json);
+        pendingCallbacks.delete(callbackId);
+      }
+    } catch (e) {
+      console.error("Log bridge callback error:", e);
+    }
+  };
+}
+var logUpdateListeners = [];
+if (typeof window !== "undefined" && !window.onAssistsLogUpdate) {
+  window.onAssistsLogUpdate = (encoded) => {
+    logUpdateListeners.forEach((listener) => {
+      try {
+        const decoded = decodeBase64UTF8(encoded);
+        const parsed = JSON.parse(decoded);
+        listener(parsed);
+      } catch (error) {
+        console.error("Log update listener error:", error);
+      }
+    });
+  };
+}
+var Log = class {
+  getBridge() {
+    if (typeof window === "undefined" || !window.assistsxLog) {
+      throw new Error("assistsxLog bridge is not available");
+    }
+    return window.assistsxLog;
+  }
+  async asyncCall(method, args, timeout = 30) {
+    const uuid = generateUUID();
+    const params = {
+      method,
+      arguments: args != null ? args : void 0,
+      callbackId: uuid
+    };
+    const promise = new Promise((resolve) => {
+      pendingCallbacks.set(uuid, (data) => {
+        resolve(data);
+      });
+      setTimeout(() => {
+        pendingCallbacks.delete(uuid);
+        resolve(
+          JSON.stringify(new CallResponse(-1, null, uuid))
+        );
+      }, timeout * 1e3);
+    });
+    this.getBridge().call(JSON.stringify(params));
+    const promiseResult = await promise;
+    if (typeof promiseResult === "string") {
+      const responseData = JSON.parse(promiseResult);
+      return new CallResponse(
+        responseData.code,
+        responseData.data,
+        responseData.callbackId
+      );
+    }
+    throw new Error("Log bridge call failed");
+  }
+  /** 读取当前日志全文 */
+  async readAllText(timeout) {
+    var _a;
+    const res = await this.asyncCall(
+      LogCallMethod.readAllText,
+      void 0,
+      timeout
+    );
+    const d = res.getDataOrNull();
+    return (_a = d == null ? void 0 : d.text) != null ? _a : "";
+  }
+  /**
+   * 获取日志服务当前域名（origin，无路径；与上传、管理后台同源）。
+   * 与 Kotlin getLogServiceBaseUrl / adminWebBaseUrl 对齐。
+   */
+  async getLogServiceBaseUrl(timeout) {
+    var _a;
+    const res = await this.asyncCall(
+      LogCallMethod.getLogServiceBaseUrl,
+      void 0,
+      timeout
+    );
+    const d = res.getDataOrNull();
+    return (_a = d == null ? void 0 : d.baseUrl) != null ? _a : "";
+  }
+  /** 清空日志 */
+  async clear(timeout) {
+    const res = await this.asyncCall(
+      LogCallMethod.clear,
+      void 0,
+      timeout
+    );
+    return res.isSuccess();
+  }
+  /** 从文件重新加载到内存 Flow */
+  async refreshFromFile(timeout) {
+    const res = await this.asyncCall(
+      LogCallMethod.refreshFromFile,
+      void 0,
+      timeout
+    );
+    return res.isSuccess();
+  }
+  /** 追加一行 */
+  async appendLine(line, maxLength, timeout) {
+    const args = { line };
+    if (maxLength !== void 0) {
+      args.maxLength = maxLength;
+    }
+    const res = await this.asyncCall(
+      LogCallMethod.appendLine,
+      args,
+      timeout
+    );
+    return res.isSuccess();
+  }
+  /** 追加带时间戳的条目 */
+  async appendTimestampedEntry(message, timeout) {
+    const res = await this.asyncCall(
+      LogCallMethod.appendTimestampedEntry,
+      { message },
+      timeout
+    );
+    return res.isSuccess();
+  }
+  /** 替换全部内容 */
+  async replaceAll(content, timeout) {
+    const res = await this.asyncCall(
+      LogCallMethod.replaceAll,
+      { content },
+      timeout
+    );
+    return res.isSuccess();
+  }
+  /**
+   * 订阅 Flow：先收到 subscribed，再多次 update。
+   * resolve 后请保留 dispose 或调用 unsubscribe(subscriptionId) 以释放原生协程与 JS 回调。
+   */
+  async subscribe(stream, onUpdate, options) {
+    var _a;
+    const self = this;
+    const callbackId = generateUUID();
+    const timeoutSec = (_a = options == null ? void 0 : options.timeout) != null ? _a : 30;
+    return new Promise((resolve, reject) => {
+      let settled = false;
+      const timer = setTimeout(() => {
+        if (!settled) {
+          settled = true;
+          streamHandlers.delete(callbackId);
+          reject(new Error("Log subscribe timeout"));
+        }
+      }, timeoutSec * 1e3);
+      streamHandlers.set(callbackId, (raw) => {
+        var _a2, _b, _c;
+        let response;
+        try {
+          response = JSON.parse(raw);
+        } catch (e) {
+          return;
+        }
+        const data = response.data;
+        const code = response.code;
+        if (typeof code === "number" && code !== 0) {
+          if (!settled) {
+            settled = true;
+            clearTimeout(timer);
+            streamHandlers.delete(callbackId);
+            reject(
+              new Error(
+                (_a2 = response.message) != null ? _a2 : "Log subscribe failed"
+              )
+            );
+          }
+          return;
+        }
+        if ((data == null ? void 0 : data.event) === "subscribed" && data.subscriptionId) {
+          if (!settled) {
+            settled = true;
+            clearTimeout(timer);
+            const sid = data.subscriptionId;
+            subscriptionIdToCallbackId.set(sid, callbackId);
+            resolve({
+              subscriptionId: sid,
+              dispose: async () => {
+                await self.unsubscribe(sid);
+              }
+            });
+          }
+          return;
+        }
+        if ((data == null ? void 0 : data.event) === "update" && data.subscriptionId) {
+          onUpdate({
+            text: (_b = data.text) != null ? _b : "",
+            stream: (_c = data.stream) != null ? _c : stream,
+            subscriptionId: data.subscriptionId
+          });
+        }
+      });
+      try {
+        this.getBridge().call(
+          JSON.stringify({
+            method: LogCallMethod.subscribe,
+            arguments: { stream },
+            callbackId
+          })
+        );
+      } catch (e) {
+        clearTimeout(timer);
+        streamHandlers.delete(callbackId);
+        reject(e);
+      }
+    });
+  }
+  /** 取消订阅（与 Kotlin handleUnsubscribe 对齐） */
+  async unsubscribe(subscriptionId, timeout) {
+    const cbId = subscriptionIdToCallbackId.get(subscriptionId);
+    const res = await this.asyncCall(
+      LogCallMethod.unsubscribe,
+      { subscriptionId },
+      timeout
+    );
+    if (res.isSuccess() && cbId) {
+      streamHandlers.delete(cbId);
+      subscriptionIdToCallbackId.delete(subscriptionId);
+    }
+    return res.isSuccess();
+  }
+  /** 截图 + 节点树 + 日志上传（需 Android API 30+） */
+  async uploadLogs(options) {
+    const { timeout = 60, ...args } = options != null ? options : {};
+    const payload = {};
+    if (args.baseUrl !== void 0) {
+      payload.baseUrl = args.baseUrl;
+    }
+    if (args.format !== void 0) {
+      payload.format = args.format;
+    }
+    if (args.prettyPrint !== void 0) {
+      payload.prettyPrint = args.prettyPrint;
+    }
+    if (args.overlayHiddenDelayMillis !== void 0) {
+      payload.overlayHiddenDelayMillis = args.overlayHiddenDelayMillis;
+    }
+    if (args.uploadKey !== void 0) {
+      payload.uploadKey = args.uploadKey;
+    }
+    const uuid = generateUUID();
+    const params = {
+      method: LogCallMethod.uploadLogs,
+      arguments: Object.keys(payload).length > 0 ? payload : void 0,
+      callbackId: uuid
+    };
+    const promise = new Promise((resolve) => {
+      pendingCallbacks.set(uuid, (data) => {
+        resolve(data);
+      });
+      setTimeout(() => {
+        pendingCallbacks.delete(uuid);
+        resolve(JSON.stringify({ code: -1, data: null, callbackId: uuid }));
+      }, timeout * 1e3);
+    });
+    this.getBridge().call(JSON.stringify(params));
+    const rawStr = await promise;
+    const raw = JSON.parse(rawStr);
+    const d = raw.data;
+    if (d && typeof d === "object" && "success" in d) {
+      return d;
+    }
+    return {
+      success: raw.code === 0,
+      message: typeof raw.message === "string" ? raw.message : raw.code !== 0 ? "uploadLogs failed" : ""
+    };
+  }
+  /**
+   * 注册 onAssistsLogUpdate 推送监听（ASWebView 注入的 Base64 CallResponse，解码后见 LogUpdateEvent）
+   */
+  addLogUpdateListener(listener) {
+    logUpdateListeners.push(listener);
+  }
+  /**
+   * 移除先前通过 addLogUpdateListener 注册的同一函数引用
+   */
+  removeLogUpdateListener(listener) {
+    const i = logUpdateListeners.indexOf(listener);
+    if (i !== -1) {
+      logUpdateListeners.splice(i, 1);
+    }
+  }
+};
+var log = new Log();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AccessibilityEventFilter,
@@ -7587,6 +7920,9 @@ var float = new Float();
   ImageUtils,
   Ime,
   ImeAction,
+  Log,
+  LogCallMethod,
+  LogStream,
   Mlkit,
   MlkitCallMethod,
   Node,
@@ -7610,6 +7946,8 @@ var float = new Float();
   http,
   imageUtils,
   ime,
+  log,
+  logUpdateListeners,
   mlkit,
   pathUtils,
   screen,