@maaxyz/maa-node 4.5.6 → 5.0.0-alpha.1

package/dist/client.d.ts

@@ -1,11 +1,14 @@
+import { ControllerBase } from './controller';
 import * as maa from './maa';
 import { Resource } from './resource';
+import { Tasker } from './tasker';
 export declare class AgentClient {
     handle: maa.AgentClientHandle;
     constructor(identifier?: string);
     destroy(): void;
     get identifier(): string | null;
     bind_resource(resource: Resource): void;
+    register_sink(tasker?: Tasker, resource?: Resource, controller?: ControllerBase): void;
     connect(): Promise<void>;
     disconnect(): void;
     get connected(): boolean;

package/dist/controller.d.ts

@@ -1,7 +1,5 @@
 import { Job, JobSource } from './job';
-import maa, { ImageData } from './maa';
-import { ChainNotifyType } from './types';
-import { chain_notify_impl } from './utils';
+import maa from './maa';
 declare class ImageJob extends Job<maa.CtrlId, JobSource<maa.CtrlId>> {
     #private;
     constructor(ctrl: ControllerBase, source: JobSource<maa.CtrlId>, id: maa.CtrlId);
@@ -83,11 +81,13 @@ export type ControllerNotify = {
 export declare class ControllerBase {
     #private;
     handle: maa.ControllerHandle;
-    notify(message: string, details_json: string): maa.MaybePromise<void>;
-    chain_notify: typeof chain_notify_impl;
-    chain_parsed_notify(cb: (msg: ControllerNotify) => maa.MaybePromise<void>, order?: ChainNotifyType): void;
+    static wrapSink(cb: (ctrl: ControllerBase, msg: ControllerNotify) => maa.MaybePromise<void>): (ctrl: ControllerBase, msg: string, details: string) => maa.MaybePromise<void>;
     constructor(handle: maa.ControllerHandle);
     destroy(): void;
+    add_sink(cb: maa.EventCallbackWithHandle<ControllerBase>): maa.SinkId;
+    add_wrapped_sink(cb: (ctrl: ControllerBase, msg: ControllerNotify) => maa.MaybePromise<void>): maa.SinkId;
+    remove_sink(sink_id: maa.SinkId): void;
+    clear_sinks(): void;
     set screenshot_target_long_side(value: number);
     set screenshot_target_short_side(value: number);
     set screenshot_use_raw_size(value: boolean);
@@ -125,7 +125,7 @@ export declare abstract class CustomControllerActor {
     abstract request_uuid(): maa.MaybePromise<string | null>;
     abstract start_app(intent: string): maa.MaybePromise<boolean>;
     abstract stop_app(intent: string): maa.MaybePromise<boolean>;
-    abstract screencap(): maa.MaybePromise<ImageData | null>;
+    abstract screencap(): maa.MaybePromise<maa.ImageData | null>;
     abstract click(x: number, y: number): maa.MaybePromise<boolean>;
     abstract swipe(x1: number, y1: number, x2: number, y2: number, duration: number): maa.MaybePromise<boolean>;
     abstract touch_down(contact: number, x: number, y: number, pressure: number): maa.MaybePromise<boolean>;
@@ -141,7 +141,7 @@ export declare class CustomControllerActorDefaultImpl extends CustomControllerAc
     request_uuid(): maa.MaybePromise<string | null>;
     start_app(intent: string): maa.MaybePromise<boolean>;
     stop_app(intent: string): maa.MaybePromise<boolean>;
-    screencap(): maa.MaybePromise<ImageData | null>;
+    screencap(): maa.MaybePromise<maa.ImageData | null>;
     click(x: number, y: number): maa.MaybePromise<boolean>;
     swipe(x1: number, y1: number, x2: number, y2: number, duration: number): maa.MaybePromise<boolean>;
     touch_down(contact: number, x: number, y: number, pressure: number): maa.MaybePromise<boolean>;

package/dist/index-client.d.ts

@@ -6,7 +6,6 @@ export * from './resource';
 export * from './tasker';
 export * from './context';
 export * from './global';
-export * from './pi';
 export * from './types';
 export * from './pipeline';
 export * from './client';

package/dist/index-client.js

@@ -84,7 +84,6 @@ __export(index_client_exports, {
   DbgController: () => DbgController,
   Global: () => Global,
   Job: () => Job,
-  Pi: () => Pi,
   Resource: () => Resource,
   ResourceBase: () => ResourceBase,
   TaskJob: () => TaskJob,
@@ -150,42 +149,6 @@ var Job = class {
 // src/controller.ts
 var import_path = __toESM(require("path"));
 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) {
@@ -212,19 +175,16 @@ var ImageJob = class extends Job {
     return pro;
   }
 };
-var ControllerBase = class {
+var ControllerBase = class _ControllerBase {
   handle;
   #source;
-  notify(message, details_json) {
-  }
-  chain_notify = chain_notify_impl;
-  chain_parsed_notify(cb, order = "after") {
-    this.chain_notify((msg, details) => {
-      return cb({
+  static wrapSink(cb) {
+    return (ctrl, msg, details) => {
+      return cb(ctrl, {
         msg: msg.replace(/^Controller\./, ""),
         ...JSON.parse(details)
       });
-    }, order);
+    };
   }
   constructor(handle) {
     this.handle = handle;
@@ -236,6 +196,24 @@ var ControllerBase = class {
   destroy() {
     import_maa.default.controller_destroy(this.handle);
   }
+  add_sink(cb) {
+    const ws = new WeakRef(this);
+    return import_maa.default.controller_add_sink(this.handle, (msg, details) => {
+      const ctrl = ws.deref();
+      if (ctrl) {
+        cb(ctrl, msg, details);
+      }
+    });
+  }
+  add_wrapped_sink(cb) {
+    return this.add_sink(_ControllerBase.wrapSink(cb));
+  }
+  remove_sink(sink_id) {
+    import_maa.default.controller_remove_sink(this.handle, sink_id);
+  }
+  clear_sinks() {
+    import_maa.default.controller_clear_sinks(this.handle);
+  }
   set screenshot_target_long_side(value) {
     if (!import_maa.default.controller_set_option_screenshot_target_long_side(this.handle, value)) {
       throw "Controller set screenshot_target_long_side failed";
@@ -311,23 +289,18 @@ var ControllerBase = class {
 };
 var AdbController = class _AdbController extends ControllerBase {
   constructor(adb_path, address, screencap_methods, input_methods, config, agent) {
-    let ws;
     const h = import_maa.default.adb_controller_create(
       adb_path,
       address,
       screencap_methods,
       input_methods,
       config,
-      agent ?? _AdbController.agent_path(),
-      (message, details_json) => {
-        return ws.deref()?.notify(message, details_json);
-      }
+      agent ?? _AdbController.agent_path()
     );
     if (!h) {
       throw "AdbController create failed";
     }
     super(h);
-    ws = new WeakRef(this);
   }
   static agent_path() {
     return import_path.default.join(__dirname, "..", "agent");
@@ -338,20 +311,15 @@ var AdbController = class _AdbController extends ControllerBase {
 };
 var Win32Controller = class extends ControllerBase {
   constructor(hwnd, screencap_methods, input_methods) {
-    let ws;
     const h = import_maa.default.win32_controller_create(
       hwnd ?? "0",
       screencap_methods,
-      input_methods,
-      (message, details_json) => {
-        return ws.deref()?.notify(message, details_json);
-      }
+      input_methods
     );
     if (!h) {
       throw "Win32Controller create failed";
     }
     super(h);
-    ws = new WeakRef(this);
   }
   static find() {
     return import_maa.default.find_desktop();
@@ -359,21 +327,11 @@ var Win32Controller = class extends ControllerBase {
 };
 var DbgController = class extends ControllerBase {
   constructor(read_path, write_path, type, config) {
-    let ws;
-    const h = import_maa.default.dbg_controller_create(
-      read_path,
-      write_path,
-      type,
-      config,
-      (message, details_json) => {
-        return ws.deref()?.notify(message, details_json);
-      }
-    );
+    const h = import_maa.default.dbg_controller_create(read_path, write_path, type, config);
     if (!h) {
       throw "DbgController create failed";
     }
     super(h);
-    ws = new WeakRef(this);
   }
 };
 var CustomControllerActor = class {
@@ -424,20 +382,13 @@ var CustomControllerActorDefaultImpl = class extends CustomControllerActor {
 };
 var CustomController = class extends ControllerBase {
   constructor(actor) {
-    let ws;
-    const h = import_maa.default.custom_controller_create(
-      (action, ...param) => {
-        return actor[action](...param);
-      },
-      (message, details_json) => {
-        return ws.deref()?.notify(message, details_json);
-      }
-    );
+    const h = import_maa.default.custom_controller_create((action, ...param) => {
+      return actor[action](...param);
+    });
     if (!h) {
       throw "CustomController create failed";
     }
     super(h);
-    ws = new WeakRef(this);
   }
 };
 
@@ -472,19 +423,24 @@ var TaskJob = class extends Job {
     return pro;
   }
 };
-var TaskerBase = class {
+var TaskerBase = class _TaskerBase {
   handle;
   #source;
-  notify(message, details_json) {
+  static wrapSink(cb) {
+    return (tasker, msg, details) => {
+      return cb(tasker, {
+        msg: msg.replace(/^Tasker\./, ""),
+        ...JSON.parse(details)
+      });
+    };
   }
-  chain_notify = chain_notify_impl;
-  chain_parsed_notify(cb, order = "after") {
-    this.chain_notify((msg, details) => {
-      return cb({
-        msg: msg.replace(/^(?:Tasker|Node)?\./, ""),
+  static wrapContextSink(cb) {
+    return (ctx, msg, details) => {
+      return cb(ctx, {
+        msg: msg.replace(/^Node\./, ""),
         ...JSON.parse(details)
       });
-    }, order);
+    };
   }
   constructor(handle) {
     this.handle = handle;
@@ -496,6 +452,38 @@ var TaskerBase = class {
   destroy() {
     import_maa2.default.tasker_destroy(this.handle);
   }
+  add_sink(cb) {
+    const ws = new WeakRef(this);
+    return import_maa2.default.tasker_add_sink(this.handle, (msg, details) => {
+      const tasker = ws.deref();
+      if (tasker) {
+        cb(tasker, msg, details);
+      }
+    });
+  }
+  add_wrapped_sink(cb) {
+    return this.add_sink(_TaskerBase.wrapSink(cb));
+  }
+  remove_sink(sink_id) {
+    import_maa2.default.tasker_remove_sink(this.handle, sink_id);
+  }
+  clear_sinks() {
+    import_maa2.default.tasker_clear_sinks(this.handle);
+  }
+  add_context_sink(cb) {
+    return import_maa2.default.tasker_add_context_sink(this.handle, (ctx, msg, details) => {
+      cb(new Context(ctx), msg, details);
+    });
+  }
+  add_wrapped_context_sink(cb) {
+    return this.add_context_sink(_TaskerBase.wrapContextSink(cb));
+  }
+  remove_context_sink(sink_id) {
+    import_maa2.default.tasker_remove_context_sink(this.handle, sink_id);
+  }
+  clear_context_sinks() {
+    import_maa2.default.tasker_clear_context_sinks(this.handle);
+  }
   bind(slave) {
     let ret;
     if (slave instanceof ControllerBase) {
@@ -596,15 +584,11 @@ var TaskerBase = class {
 };
 var Tasker = class extends TaskerBase {
   constructor() {
-    let ws;
-    const h = import_maa2.default.tasker_create((message, details_json) => {
-      return ws.deref()?.notify(message, details_json);
-    });
+    const h = import_maa2.default.tasker_create();
     if (!h) {
       throw "Tasker create failed";
     }
     super(h);
-    ws = new WeakRef(this);
   }
 };
 
@@ -676,19 +660,16 @@ var Context = class _Context {
 
 // src/resource.ts
 var import_maa3 = __toESM(require_maa());
-var ResourceBase = class {
+var ResourceBase = class _ResourceBase {
   handle;
   #source;
-  notify(message, details_json) {
-  }
-  chain_notify = chain_notify_impl;
-  chain_parsed_notify(cb, order = "after") {
-    this.chain_notify((msg, details) => {
-      return cb({
+  static wrapSink(cb) {
+    return (res, msg, details) => {
+      return cb(res, {
         msg: msg.replace(/^Resource\./, ""),
         ...JSON.parse(details)
       });
-    }, order);
+    };
   }
   constructor(handle) {
     this.handle = handle;
@@ -700,6 +681,24 @@ var ResourceBase = class {
   destroy() {
     import_maa3.default.resource_destroy(this.handle);
   }
+  add_sink(cb) {
+    const ws = new WeakRef(this);
+    return import_maa3.default.resource_add_sink(this.handle, (msg, details) => {
+      const res = ws.deref();
+      if (res) {
+        cb(res, msg, details);
+      }
+    });
+  }
+  add_wrapped_sink(cb) {
+    return this.add_sink(_ResourceBase.wrapSink(cb));
+  }
+  remove_sink(sink_id) {
+    import_maa3.default.resource_remove_sink(this.handle, sink_id);
+  }
+  clear_sinks() {
+    import_maa3.default.resource_clear_sinks(this.handle);
+  }
   set inference_device(id) {
     if (typeof id === "string") {
       id = import_maa3.default.InferenceDevice[id];
@@ -817,15 +816,11 @@ var ResourceBase = class {
 };
 var Resource = class extends ResourceBase {
   constructor() {
-    let ws;
-    const h = import_maa3.default.resource_create((message, details_json) => {
-      return ws.deref()?.notify(message, details_json);
-    });
+    const h = import_maa3.default.resource_create();
     if (!h) {
       throw "Resource create failed";
     }
     super(h);
-    ws = new WeakRef(this);
   }
 };
 
@@ -862,103 +857,56 @@ var Global = {
   }
 };
 
-// src/pi.ts
-var maa7 = __toESM(require_maa());
-var Pi = {
-  __running: false,
-  notify(message, details_json) {
-  },
-  register_custom_recognizer(id, name, func) {
-    maa7.pi_register_custom_recognizer(
-      id,
-      name,
-      (context, id2, task, name2, param, image, roi) => {
-        const self = {
-          context: new Context(context),
-          id: id2,
-          task,
-          name: name2,
-          param: JSON.parse(param),
-          image,
-          roi
-        };
-        return func.apply(self, [self]);
-      }
-    );
-  },
-  register_custom_action(id, name, func) {
-    maa7.pi_register_custom_action(id, name, (context, id2, task, name2, param, recoId, box) => {
-      const self = {
-        context: new Context(context),
-        id: id2,
-        task,
-        name: name2,
-        param: JSON.parse(param),
-        recoId,
-        box
-      };
-      return func.apply(self, [self]);
-    });
-  },
-  async run_cli(id, resource_path, user_path, directly) {
-    if (Pi.__running) {
-      return false;
-    }
-    Pi.__running = true;
-    const res = await maa7.pi_run_cli(
-      id,
-      resource_path,
-      user_path,
-      directly,
-      (message, details) => {
-        return Pi.notify(message, details);
-      }
-    );
-    Pi.__running = false;
-    return res;
-  }
-};
-
 // src/client.ts
-var maa8 = __toESM(require_maa());
+var maa7 = __toESM(require_maa());
 var AgentClient = class {
   handle;
   constructor(identifier) {
-    const h = maa8.agent_client_create(identifier ?? null);
+    const h = maa7.agent_client_create(identifier ?? null);
     if (!h) {
       throw "AgentClient create failed";
     }
     this.handle = h;
   }
   destroy() {
-    maa8.agent_client_destroy(this.handle);
+    maa7.agent_client_destroy(this.handle);
   }
   get identifier() {
-    return maa8.agent_client_identifier(this.handle);
+    return maa7.agent_client_identifier(this.handle);
   }
   bind_resource(resource) {
-    if (!maa8.agent_client_bind_resource(this.handle, resource.handle)) {
+    if (!maa7.agent_client_bind_resource(this.handle, resource.handle)) {
       throw "AgentClient bind resource failed";
     }
   }
+  register_sink(tasker, resource, controller) {
+    if (!maa7.agent_client_register_sink(
+      this.handle,
+      tasker?.handle ?? null,
+      resource?.handle ?? null,
+      controller?.handle ?? null
+    )) {
+      throw "AgentClient register sink failed";
+    }
+  }
   async connect() {
-    if (!await maa8.agent_client_connect(this.handle)) {
+    if (!await maa7.agent_client_connect(this.handle)) {
       throw "AgentClient connect failed";
     }
   }
   disconnect() {
-    if (!maa8.agent_client_disconnect(this.handle)) {
+    if (!maa7.agent_client_disconnect(this.handle)) {
       throw "AgentClient disconnect failed";
     }
   }
   get connected() {
-    return maa8.agent_client_connected(this.handle);
+    return maa7.agent_client_connected(this.handle);
   }
   get alive() {
-    return maa8.agent_client_alive(this.handle);
+    return maa7.agent_client_alive(this.handle);
   }
   set timeout(ms) {
-    if (!maa8.agent_client_set_timeout(this.handle, ms)) {
+    if (!maa7.agent_client_set_timeout(this.handle, ms)) {
       throw "AgentClient set timeout failed";
     }
   }
@@ -975,7 +923,6 @@ var AgentClient = class {
   DbgController,
   Global,
   Job,
-  Pi,
   Resource,
   ResourceBase,
   TaskJob,

package/dist/index-server.d.ts

@@ -6,7 +6,6 @@ export * from './resource';
 export * from './tasker';
 export * from './context';
 export * from './global';
-export * from './pi';
 export * from './types';
 export * from './pipeline';
 export * from './server';