@maaxyz/maa-node 4.4.0-alpha.4 → 4.4.0-beta.2

package/dist/controller.d.ts

@@ -1,5 +1,7 @@
 import { Job, JobSource } from './job';
 import maa, { ImageData } from './maa';
+import { ChainNotifyType } from './types';
+import { chain_notify_impl } from './utils';
 declare class ImageJob extends Job<maa.CtrlId, JobSource<maa.CtrlId>> {
     #private;
     constructor(ctrl: ControllerBase, source: JobSource<maa.CtrlId>, id: maa.CtrlId);
@@ -13,23 +15,9 @@ declare class ImageJob extends Job<maa.CtrlId, JobSource<maa.CtrlId>> {
         get: () => Promise<ArrayBuffer | null>;
     };
 }
-export type ControllerNotify = ({
-    adb: string;
-    address: string;
-} & ({
-    msg: 'UUIDGot';
-    uuid: string;
-} | {
-    msg: 'UUIDGetFailed';
-} | {
-    msg: 'ConnectSuccess';
-} | {
-    msg: 'ConnectFailed';
-    why: 'ConnectFailed' | 'UUIDGetFailed';
-} | {
-    msg: 'ScreencapInited' | 'ScreencapInitFailed' | 'TouchinputInited' | 'TouchinputInitFailed';
-})) | {
-    msg: 'Action.Started' | 'Action.Completed' | 'Action.Failed';
+export type ControllerNotify = {
+    msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed';
+    action: 'connect' | 'click' | 'swipe' | 'touch_down' | 'touch_move' | 'touch_up' | 'press_key' | 'input_text' | 'screencap' | 'start_app' | 'stop_app';
     ctrl_id: maa.CtrlId;
     uuid: string;
 };
@@ -37,7 +25,8 @@ export declare class ControllerBase {
     #private;
     handle: maa.ControllerHandle;
     notify(message: string, details_json: string): maa.MaybePromise<void>;
-    set parsed_notify(cb: (msg: ControllerNotify) => maa.MaybePromise<void>);
+    chain_notify: typeof chain_notify_impl;
+    chain_parsed_notify(cb: (msg: ControllerNotify) => maa.MaybePromise<void>, order?: ChainNotifyType): void;
     constructor(handle: maa.ControllerHandle);
     destroy(): void;
     set screenshot_target_long_side(value: number);

package/dist/index-client.js

@@ -150,6 +150,42 @@ var Job = class {
 
 // src/controller.ts
 var import_maa = __toESM(require_maa());
+
+// src/utils.ts
+function chain_notify_impl(cb, order = "after") {
+  const old = this.notify;
+  switch (order) {
+    case "before":
+      this.notify = async (msg, details) => {
+        await cb(msg, details);
+        await old.call(this, msg, details);
+      };
+      break;
+    case "after":
+      this.notify = async (msg, details) => {
+        await old.call(this, msg, details);
+        await cb(msg, details);
+      };
+      break;
+    case "before-no-wait":
+      this.notify = async (msg, details) => {
+        cb(msg, details);
+        await old.call(this, msg, details);
+      };
+      break;
+    case "after-no-wait":
+      this.notify = async (msg, details) => {
+        await old.call(this, msg, details);
+        cb(msg, details);
+      };
+      break;
+    case "replace":
+      this.notify = cb;
+      break;
+  }
+}
+
+// src/controller.ts
 var ImageJob = class extends Job {
   #ctrl;
   constructor(ctrl, source, id) {
@@ -181,13 +217,14 @@ var ControllerBase = class {
   #source;
   notify(message, details_json) {
   }
-  set parsed_notify(cb) {
-    this.notify = (msg, details) => {
+  chain_notify = chain_notify_impl;
+  chain_parsed_notify(cb, order = "after") {
+    this.chain_notify((msg, details) => {
       return cb({
         msg: msg.replace(/^Controller\./, ""),
         ...JSON.parse(details)
       });
-    };
+    }, order);
   }
   constructor(handle) {
     this.handle = handle;
@@ -433,13 +470,14 @@ var TaskerBase = class {
   #source;
   notify(message, details_json) {
   }
-  set parsed_notify(cb) {
-    this.notify = (msg, details) => {
+  chain_notify = chain_notify_impl;
+  chain_parsed_notify(cb, order = "after") {
+    this.chain_notify((msg, details) => {
       return cb({
         msg: msg.replace(/^(?:Tasker|Node)?\./, ""),
         ...JSON.parse(details)
       });
-    };
+    }, order);
   }
   constructor(handle) {
     this.handle = handle;
@@ -636,13 +674,14 @@ var ResourceBase = class {
   #source;
   notify(message, details_json) {
   }
-  set parsed_notify(cb) {
-    this.notify = (msg, details) => {
+  chain_notify = chain_notify_impl;
+  chain_parsed_notify(cb, order = "after") {
+    this.chain_notify((msg, details) => {
       return cb({
         msg: msg.replace(/^Resource\./, ""),
         ...JSON.parse(details)
       });
-    };
+    }, order);
   }
   constructor(handle) {
     this.handle = handle;

package/dist/index-server.js

@@ -150,6 +150,42 @@ var Job = class {
 
 // src/controller.ts
 var import_maa = __toESM(require_maa());
+
+// src/utils.ts
+function chain_notify_impl(cb, order = "after") {
+  const old = this.notify;
+  switch (order) {
+    case "before":
+      this.notify = async (msg, details) => {
+        await cb(msg, details);
+        await old.call(this, msg, details);
+      };
+      break;
+    case "after":
+      this.notify = async (msg, details) => {
+        await old.call(this, msg, details);
+        await cb(msg, details);
+      };
+      break;
+    case "before-no-wait":
+      this.notify = async (msg, details) => {
+        cb(msg, details);
+        await old.call(this, msg, details);
+      };
+      break;
+    case "after-no-wait":
+      this.notify = async (msg, details) => {
+        await old.call(this, msg, details);
+        cb(msg, details);
+      };
+      break;
+    case "replace":
+      this.notify = cb;
+      break;
+  }
+}
+
+// src/controller.ts
 var ImageJob = class extends Job {
   #ctrl;
   constructor(ctrl, source, id) {
@@ -181,13 +217,14 @@ var ControllerBase = class {
   #source;
   notify(message, details_json) {
   }
-  set parsed_notify(cb) {
-    this.notify = (msg, details) => {
+  chain_notify = chain_notify_impl;
+  chain_parsed_notify(cb, order = "after") {
+    this.chain_notify((msg, details) => {
       return cb({
         msg: msg.replace(/^Controller\./, ""),
         ...JSON.parse(details)
       });
-    };
+    }, order);
   }
   constructor(handle) {
     this.handle = handle;
@@ -433,13 +470,14 @@ var TaskerBase = class {
   #source;
   notify(message, details_json) {
   }
-  set parsed_notify(cb) {
-    this.notify = (msg, details) => {
+  chain_notify = chain_notify_impl;
+  chain_parsed_notify(cb, order = "after") {
+    this.chain_notify((msg, details) => {
       return cb({
         msg: msg.replace(/^(?:Tasker|Node)?\./, ""),
         ...JSON.parse(details)
       });
-    };
+    }, order);
   }
   constructor(handle) {
     this.handle = handle;
@@ -636,13 +674,14 @@ var ResourceBase = class {
   #source;
   notify(message, details_json) {
   }
-  set parsed_notify(cb) {
-    this.notify = (msg, details) => {
+  chain_notify = chain_notify_impl;
+  chain_parsed_notify(cb, order = "after") {
+    this.chain_notify((msg, details) => {
       return cb({
         msg: msg.replace(/^Resource\./, ""),
         ...JSON.parse(details)
       });
-    };
+    }, order);
   }
   constructor(handle) {
     this.handle = handle;

package/dist/resource.d.ts

@@ -1,21 +1,20 @@
 import { Job, JobSource } from './job';
 import maa from './maa';
 import { DumpTask } from './pipeline';
-import { CustomActionCallback, CustomRecognizerCallback } from './types';
+import { ChainNotifyType, CustomActionCallback, CustomRecognizerCallback } from './types';
+import { chain_notify_impl } from './utils';
 export type ResourceNotify = {
+    msg: 'Loading.Starting' | 'Loading.Succeeded' | 'Loading.Failed';
     res_id: maa.ResId;
     path: string;
-} & ({
-    msg: 'StartLoading';
-} | {
-    msg: 'LoadingCompleted' | 'LoadingFailed';
     hash: string;
-});
+};
 export declare class ResourceBase {
     #private;
     handle: maa.ResourceHandle;
     notify(message: string, details_json: string): maa.MaybePromise<void>;
-    set parsed_notify(cb: (msg: ResourceNotify) => maa.MaybePromise<void>);
+    chain_notify: typeof chain_notify_impl;
+    chain_parsed_notify(cb: (msg: ResourceNotify) => maa.MaybePromise<void>, order?: ChainNotifyType): void;
     constructor(handle: maa.ResourceHandle);
     destroy(): void;
     set inference_device(id: keyof typeof maa.InferenceDevice | number);

package/dist/tasker.d.ts

@@ -2,6 +2,8 @@ import { ControllerBase } from './controller';
 import { Job, JobSource } from './job';
 import maa from './maa';
 import { ResourceBase } from './resource';
+import { ChainNotifyType } from './types';
+import { chain_notify_impl } from './utils';
 type TaskDetail = ReturnType<TaskerBase['task_detail']>;
 type RecoDetailEntry = {
     box: maa.FlatRect;
@@ -47,36 +49,36 @@ declare class TaskJob extends Job<maa.TaskId, JobSource<maa.TaskId>> {
     };
 }
 export type TaskerNotify = {
+    msg: 'Task.Started' | 'Task.Completed' | 'Task.Failed';
     task_id: maa.TaskId;
     entry: string;
-    hash: string;
     uuid: string;
-} & ({
-    msg: 'Task.Started' | 'Task.Completed' | 'Task.Failed';
+    hash: string;
 } | {
     msg: 'NextList.Starting' | 'NextList.Succeeded' | 'NextList.Failed';
-    task_id: number;
+    task_id: maa.TaskId;
     name: string;
     list: string[];
     focus: unknown;
 } | {
     msg: 'Recognition.Starting' | 'Recognition.Succeeded' | 'Recognition.Failed';
-    task_id: number;
-    reco_id: number;
+    task_id: maa.TaskId;
+    reco_id: maa.RecoId;
     name: string;
     focus: unknown;
 } | {
     msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed';
-    task_id: number;
-    node_id: number;
+    task_id: maa.TaskId;
+    node_id: maa.NodeId;
     name: string;
     focus: unknown;
-});
+};
 export declare class TaskerBase {
     #private;
     handle: maa.TaskerHandle;
     notify(message: string, details_json: string): maa.MaybePromise<void>;
-    set parsed_notify(cb: (msg: TaskerNotify) => maa.MaybePromise<void>);
+    chain_notify: typeof chain_notify_impl;
+    chain_parsed_notify(cb: (msg: TaskerNotify) => maa.MaybePromise<void>, order?: ChainNotifyType): void;
     constructor(handle: maa.TaskerHandle);
     destroy(): void;
     bind(slave: ControllerBase | ResourceBase): void;

package/dist/types.d.ts

@@ -24,4 +24,5 @@ export type CustomRecognizerCallback = CustomCallback<CustomRecognizerSelf, [
     out_detail: string
 ] | null>;
 export type CustomActionCallback = CustomCallback<CustomActionSelf, boolean>;
+export type ChainNotifyType = 'before' | 'after' | 'before-no-wait' | 'after-no-wait' | 'replace';
 export {};

package/dist/utils.d.ts

@@ -0,0 +1,5 @@
+import maa from './maa';
+import { ChainNotifyType } from './types';
+export declare function chain_notify_impl(this: {
+    notify: maa.NotificationCallback;
+}, cb: maa.NotificationCallback, order?: ChainNotifyType): void;

package/package.json

@@ -25,13 +25,13 @@
         "prettier": "^3.5.2",
         "typescript": "^5.8.2"
     },
-    "version": "4.4.0-alpha.4",
+    "version": "4.4.0-beta.2",
     "optionalDependencies": {
-        "@maaxyz/maa-node-darwin-arm64": "4.4.0-alpha.4",
-        "@maaxyz/maa-node-darwin-x64": "4.4.0-alpha.4",
-        "@maaxyz/maa-node-linux-arm64": "4.4.0-alpha.4",
-        "@maaxyz/maa-node-linux-x64": "4.4.0-alpha.4",
-        "@maaxyz/maa-node-win32-arm64": "4.4.0-alpha.4",
-        "@maaxyz/maa-node-win32-x64": "4.4.0-alpha.4"
+        "@maaxyz/maa-node-darwin-arm64": "4.4.0-beta.2",
+        "@maaxyz/maa-node-darwin-x64": "4.4.0-beta.2",
+        "@maaxyz/maa-node-linux-arm64": "4.4.0-beta.2",
+        "@maaxyz/maa-node-linux-x64": "4.4.0-beta.2",
+        "@maaxyz/maa-node-win32-arm64": "4.4.0-beta.2",
+        "@maaxyz/maa-node-win32-x64": "4.4.0-beta.2"
     }
 }

package/src/controller.ts

@@ -2,6 +2,8 @@ import path from 'path'
 
 import { Job, JobSource } from './job'
 import maa, { ImageData } from './maa'
+import { ChainNotifyType } from './types'
+import { chain_notify_impl } from './utils'
 
 class ImageJob extends Job<maa.CtrlId, JobSource<maa.CtrlId>> {
     #ctrl: ControllerBase
@@ -36,38 +38,23 @@ class ImageJob extends Job<maa.CtrlId, JobSource<maa.CtrlId>> {
     }
 }
 
-export type ControllerNotify =
-    | ({
-          adb: string
-          address: string
-      } & (
-          | {
-                msg: 'UUIDGot'
-                uuid: string
-            }
-          | {
-                msg: 'UUIDGetFailed'
-            }
-          | {
-                msg: 'ConnectSuccess'
-            }
-          | {
-                msg: 'ConnectFailed'
-                why: 'ConnectFailed' | 'UUIDGetFailed'
-            }
-          | {
-                msg:
-                    | 'ScreencapInited'
-                    | 'ScreencapInitFailed'
-                    | 'TouchinputInited'
-                    | 'TouchinputInitFailed'
-            }
-      ))
-    | {
-          msg: 'Action.Started' | 'Action.Completed' | 'Action.Failed'
-          ctrl_id: maa.CtrlId
-          uuid: string
-      }
+export type ControllerNotify = {
+    msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed'
+    action:
+        | 'connect'
+        | 'click'
+        | 'swipe'
+        | 'touch_down'
+        | 'touch_move'
+        | 'touch_up'
+        | 'press_key'
+        | 'input_text'
+        | 'screencap'
+        | 'start_app'
+        | 'stop_app'
+    ctrl_id: maa.CtrlId
+    uuid: string
+}
 
 export class ControllerBase {
     handle: maa.ControllerHandle
@@ -75,13 +62,18 @@ export class ControllerBase {
 
     notify(message: string, details_json: string): maa.MaybePromise<void> {}
 
-    set parsed_notify(cb: (msg: ControllerNotify) => maa.MaybePromise<void>) {
-        this.notify = (msg, details) => {
+    chain_notify = chain_notify_impl
+
+    chain_parsed_notify(
+        cb: (msg: ControllerNotify) => maa.MaybePromise<void>,
+        order: ChainNotifyType = 'after'
+    ) {
+        this.chain_notify((msg: string, details: string) => {
             return cb({
                 msg: msg.replace(/^Controller\./, '') as any,
                 ...JSON.parse(details)
             })
-        }
+        }, order)
     }
 
     constructor(handle: maa.ControllerHandle) {

package/src/resource.ts

@@ -3,21 +3,20 @@ import { Job, JobSource } from './job'
 import maa from './maa'
 import { DumpTask } from './pipeline'
 import {
+    ChainNotifyType,
     CustomActionCallback,
     CustomActionSelf,
     CustomRecognizerCallback,
     CustomRecognizerSelf
 } from './types'
+import { chain_notify_impl } from './utils'
 
-export type ResourceNotify = { res_id: maa.ResId; path: string } & (
-    | {
-          msg: 'StartLoading'
-      }
-    | {
-          msg: 'LoadingCompleted' | 'LoadingFailed'
-          hash: string
-      }
-)
+export type ResourceNotify = {
+    msg: 'Loading.Starting' | 'Loading.Succeeded' | 'Loading.Failed'
+    res_id: maa.ResId
+    path: string
+    hash: string
+}
 
 export class ResourceBase {
     handle: maa.ResourceHandle
@@ -25,13 +24,18 @@ export class ResourceBase {
 
     notify(message: string, details_json: string): maa.MaybePromise<void> {}
 
-    set parsed_notify(cb: (msg: ResourceNotify) => maa.MaybePromise<void>) {
-        this.notify = (msg, details) => {
+    chain_notify = chain_notify_impl
+
+    chain_parsed_notify(
+        cb: (msg: ResourceNotify) => maa.MaybePromise<void>,
+        order: ChainNotifyType = 'after'
+    ) {
+        this.chain_notify((msg: string, details: string) => {
             return cb({
                 msg: msg.replace(/^Resource\./, '') as any,
                 ...JSON.parse(details)
             })
-        }
+        }, order)
     }
 
     constructor(handle: maa.ResourceHandle) {

package/src/tasker.ts

@@ -2,6 +2,8 @@ import { ControllerBase } from './controller'
 import { Job, JobSource } from './job'
 import maa from './maa'
 import { ResourceBase } from './resource'
+import { ChainNotifyType } from './types'
+import { chain_notify_impl } from './utils'
 
 type TaskDetail = ReturnType<TaskerBase['task_detail']>
 
@@ -54,37 +56,35 @@ class TaskJob extends Job<maa.TaskId, JobSource<maa.TaskId>> {
     }
 }
 
-export type TaskerNotify = {
-    task_id: maa.TaskId
-    entry: string
-    hash: string
-    uuid: string
-} & (
+export type TaskerNotify =
     | {
           msg: 'Task.Started' | 'Task.Completed' | 'Task.Failed'
+          task_id: maa.TaskId
+          entry: string
+          uuid: string
+          hash: string
       }
     | {
           msg: 'NextList.Starting' | 'NextList.Succeeded' | 'NextList.Failed'
-          task_id: number
+          task_id: maa.TaskId
           name: string
           list: string[]
           focus: unknown
       }
     | {
           msg: 'Recognition.Starting' | 'Recognition.Succeeded' | 'Recognition.Failed'
-          task_id: number
-          reco_id: number
+          task_id: maa.TaskId
+          reco_id: maa.RecoId
           name: string
           focus: unknown
       }
     | {
           msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed'
-          task_id: number
-          node_id: number
+          task_id: maa.TaskId
+          node_id: maa.NodeId
           name: string
           focus: unknown
       }
-)
 
 export class TaskerBase {
     handle: maa.TaskerHandle
@@ -92,13 +92,18 @@ export class TaskerBase {
 
     notify(message: string, details_json: string): maa.MaybePromise<void> {}
 
-    set parsed_notify(cb: (msg: TaskerNotify) => maa.MaybePromise<void>) {
-        this.notify = (msg, details) => {
+    chain_notify = chain_notify_impl
+
+    chain_parsed_notify(
+        cb: (msg: TaskerNotify) => maa.MaybePromise<void>,
+        order: ChainNotifyType = 'after'
+    ) {
+        this.chain_notify((msg: string, details: string) => {
             return cb({
                 msg: msg.replace(/^(?:Tasker|Node)?\./, '') as any,
                 ...JSON.parse(details)
             })
-        }
+        }, order)
     }
 
     constructor(handle: maa.TaskerHandle) {

package/src/types.ts

@@ -29,3 +29,5 @@ export type CustomRecognizerCallback = CustomCallback<
 >
 
 export type CustomActionCallback = CustomCallback<CustomActionSelf, boolean>
+
+export type ChainNotifyType = 'before' | 'after' | 'before-no-wait' | 'after-no-wait' | 'replace'

package/src/utils.ts

@@ -0,0 +1,40 @@
+import maa from './maa'
+import { ChainNotifyType } from './types'
+
+export function chain_notify_impl(
+    this: { notify: maa.NotificationCallback },
+    cb: maa.NotificationCallback,
+    order: ChainNotifyType = 'after'
+) {
+    const old = this.notify
+
+    switch (order) {
+        case 'before':
+            this.notify = async (msg, details) => {
+                await cb(msg, details)
+                await old.call(this, msg, details)
+            }
+            break
+        case 'after':
+            this.notify = async (msg, details) => {
+                await old.call(this, msg, details)
+                await cb(msg, details)
+            }
+            break
+        case 'before-no-wait':
+            this.notify = async (msg, details) => {
+                cb(msg, details)
+                await old.call(this, msg, details)
+            }
+            break
+        case 'after-no-wait':
+            this.notify = async (msg, details) => {
+                await old.call(this, msg, details)
+                cb(msg, details)
+            }
+            break
+        case 'replace':
+            this.notify = cb
+            break
+    }
+}