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

package/src/client.ts

@@ -1,5 +1,7 @@
+import { ControllerBase } from './controller'
 import * as maa from './maa'
 import { Resource } from './resource'
+import { Tasker } from './tasker'
 
 export class AgentClient {
     handle: maa.AgentClientHandle
@@ -26,6 +28,19 @@ export class AgentClient {
         }
     }
 
+    register_sink(tasker?: Tasker, resource?: Resource, controller?: ControllerBase) {
+        if (
+            !maa.agent_client_register_sink(
+                this.handle,
+                tasker?.handle ?? null,
+                resource?.handle ?? null,
+                controller?.handle ?? null
+            )
+        ) {
+            throw 'AgentClient register sink failed'
+        }
+    }
+
     async connect() {
         if (!(await maa.agent_client_connect(this.handle))) {
             throw 'AgentClient connect failed'

package/src/controller.ts

@@ -1,9 +1,7 @@
 import path from 'path'
 
 import { Job, JobSource } from './job'
-import maa, { ImageData } from './maa'
-import { ChainNotifyType } from './types'
-import { chain_notify_impl } from './utils'
+import maa from './maa'
 
 class ImageJob extends Job<maa.CtrlId, JobSource<maa.CtrlId>> {
     #ctrl: ControllerBase
@@ -122,20 +120,13 @@ export class ControllerBase {
     handle: maa.ControllerHandle
     #source: JobSource<maa.CtrlId>
 
-    notify(message: string, details_json: string): maa.MaybePromise<void> {}
-
-    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({
+    static wrapSink(cb: (ctrl: ControllerBase, msg: ControllerNotify) => maa.MaybePromise<void>) {
+        return ((ctrl: ControllerBase, msg: string, details: string) => {
+            return cb(ctrl, {
                 msg: msg.replace(/^Controller\./, '') as any,
                 ...JSON.parse(details)
             })
-        }, order)
+        }) satisfies maa.EventCallbackWithHandle<ControllerBase>
     }
 
     constructor(handle: maa.ControllerHandle) {
@@ -150,6 +141,28 @@ export class ControllerBase {
         maa.controller_destroy(this.handle)
     }
 
+    add_sink(cb: maa.EventCallbackWithHandle<ControllerBase>) {
+        const ws = new WeakRef(this)
+        return maa.controller_add_sink(this.handle, (msg: string, details: string) => {
+            const ctrl = ws.deref()
+            if (ctrl) {
+                cb(ctrl, msg, details)
+            }
+        })
+    }
+
+    add_wrapped_sink(cb: (ctrl: ControllerBase, msg: ControllerNotify) => maa.MaybePromise<void>) {
+        return this.add_sink(ControllerBase.wrapSink(cb))
+    }
+
+    remove_sink(sink_id: maa.SinkId) {
+        maa.controller_remove_sink(this.handle, sink_id)
+    }
+
+    clear_sinks() {
+        maa.controller_clear_sinks(this.handle)
+    }
+
     set screenshot_target_long_side(value: number) {
         if (!maa.controller_set_option_screenshot_target_long_side(this.handle, value)) {
             throw 'Controller set screenshot_target_long_side failed'
@@ -251,23 +264,18 @@ export class AdbController extends ControllerBase {
         config: string,
         agent?: string
     ) {
-        let ws: WeakRef<this>
         const h = maa.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() {
@@ -285,20 +293,15 @@ export class Win32Controller extends ControllerBase {
         screencap_methods: maa.ScreencapOrInputMethods,
         input_methods: maa.ScreencapOrInputMethods
     ) {
-        let ws: WeakRef<this>
         const h = maa.win32_controller_create(
             hwnd ?? ('0' as maa.DesktopHandle),
             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() {
@@ -308,21 +311,11 @@ export class Win32Controller extends ControllerBase {
 
 export class DbgController extends ControllerBase {
     constructor(read_path: string, write_path: string, type: maa.Uint64, config: string) {
-        let ws: WeakRef<this>
-        const h = maa.dbg_controller_create(
-            read_path,
-            write_path,
-            type,
-            config,
-            (message, details_json) => {
-                return ws.deref()?.notify(message, details_json)
-            }
-        )
+        const h = maa.dbg_controller_create(read_path, write_path, type, config)
         if (!h) {
             throw 'DbgController create failed'
         }
         super(h)
-        ws = new WeakRef(this)
     }
 }
 
@@ -331,7 +324,7 @@ export 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,
@@ -372,7 +365,7 @@ export class CustomControllerActorDefaultImpl extends CustomControllerActor {
     stop_app(intent: string): maa.MaybePromise<boolean> {
         return false
     }
-    screencap(): maa.MaybePromise<ImageData | null> {
+    screencap(): maa.MaybePromise<maa.ImageData | null> {
         return null
     }
     click(x: number, y: number): maa.MaybePromise<boolean> {
@@ -412,19 +405,12 @@ export class CustomControllerActorDefaultImpl extends CustomControllerActor {
 
 export class CustomController extends ControllerBase {
     constructor(actor: CustomControllerActor) {
-        let ws: WeakRef<this>
-        const h = maa.custom_controller_create(
-            (action, ...param) => {
-                return (actor[action] as any)(...param)
-            },
-            (message, details_json) => {
-                return ws.deref()?.notify(message, details_json)
-            }
-        )
+        const h = maa.custom_controller_create((action, ...param) => {
+            return (actor[action] as any)(...param)
+        })
         if (!h) {
             throw 'CustomController create failed'
         }
         super(h)
-        ws = new WeakRef(this)
     }
 }

package/src/index-client.ts

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

package/src/index-server.ts

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

package/src/maa.d.ts

@@ -14,6 +14,7 @@ export type CtrlId = Id & { __brand: 'CtrlId' }
 export type TaskId = Id & { __brand: 'TaskId' }
 export type RecoId = Id & { __brand: 'RecoId' }
 export type NodeId = Id & { __brand: 'NodeId' }
+export type SinkId = Id & { __brand: 'SinkId' }
 
 export type Status = number & { __brand: 'Status' }
 export type LoggingLevel = number & { __brand: 'LoggingLevel' }
@@ -33,7 +34,12 @@ export type FlatRect = [x: number, y: number, width: number, height: number]
 
 type MaybePromise<T> = T | Promise<T>
 
-export type NotificationCallback = (message: string, details_json: string) => MaybePromise<void>
+export type EventCallback = (message: string, details_json: string) => MaybePromise<void>
+export type EventCallbackWithHandle<T> = (
+    handle: T,
+    message: string,
+    details_json: string
+) => MaybePromise<void>
 export type CustomRecognitionCallback = (
     context: ContextHandle,
     task_id: TaskId,
@@ -119,27 +125,29 @@ export declare function adb_controller_create(
     screencap_methods: ScreencapOrInputMethods,
     input_methods: ScreencapOrInputMethods,
     config: string,
-    agent_path: string,
-    callback: NotificationCallback | null
+    agent_path: string
 ): ControllerHandle | null
 export declare function win32_controller_create(
     handle: DesktopHandle,
     screencap_methods: ScreencapOrInputMethods,
-    input_methods: ScreencapOrInputMethods,
-    callback: NotificationCallback | null
+    input_methods: ScreencapOrInputMethods
 ): ControllerHandle | null
 export declare function custom_controller_create(
-    custom_callback: CustomControllerCallback,
-    callback: NotificationCallback | null
+    custom_callback: CustomControllerCallback
 ): ControllerHandle | null
 export declare function dbg_controller_create(
     read_path: string,
     write_path: string,
     type: Uint64,
-    config: string,
-    callback: NotificationCallback | null
+    config: string
 ): ControllerHandle | null
 export declare function controller_destroy(handle: ControllerHandle): void
+export declare function controller_add_sink(
+    handle: ControllerHandle,
+    callback: EventCallback
+): SinkId
+export declare function controller_remove_sink(handle: ControllerHandle, sink_id: SinkId): void
+export declare function controller_clear_sinks(handle: ControllerHandle): void
 export declare function controller_set_option_screenshot_target_long_side(
     handle: ControllerHandle,
     value: number
@@ -196,10 +204,11 @@ export declare function controller_get_uuid(handle: ControllerHandle): string |
 
 // resource.cpp
 
-export declare function resource_create(
-    callback: NotificationCallback | null
-): ResourceHandle | null
+export declare function resource_create(): ResourceHandle | null
 export declare function resource_destroy(handle: ResourceHandle): void
+export declare function resource_add_sink(handle: ResourceHandle, callback: EventCallback): SinkId
+export declare function resource_remove_sink(handle: ResourceHandle, sink_id: SinkId): void
+export declare function resource_clear_sinks(handle: ResourceHandle): void
 export declare function resource_set_option_inference_device(
     handle: ResourceHandle,
     id: InferenceDevice | number
@@ -251,7 +260,16 @@ export declare function resource_get_node_list(handle: ResourceHandle): string[]
 
 // tasker.cpp
 
-export declare function tasker_create(callback: NotificationCallback | null): TaskerHandle | null
+export declare function tasker_create(): TaskerHandle | null
+export declare function tasker_add_sink(handle: TaskerHandle, callback: EventCallback): SinkId
+export declare function tasker_remove_sink(handle: TaskerHandle, sink_id: SinkId): void
+export declare function tasker_clear_sinks(handle: TaskerHandle): void
+export declare function tasker_add_context_sink(
+    handle: TaskerHandle,
+    callback: EventCallbackWithHandle<ContextHandle>
+): SinkId
+export declare function tasker_remove_context_sink(handle: TaskerHandle, sink_id: SinkId): void
+export declare function tasker_clear_context_sinks(handle: TaskerHandle): void
 export declare function tasker_destroy(handle: TaskerHandle): void
 export declare function tasker_bind_resource(
     handle: TaskerHandle,
@@ -333,26 +351,6 @@ export declare function set_global_option_save_draw(value: boolean): boolean
 export declare function set_global_option_stdout_level(value: LoggingLevel): boolean
 export declare function set_global_option_debug_mode(value: boolean): boolean
 
-// pi.cpp
-
-export declare function pi_register_custom_recognizer(
-    id: Id,
-    name: string,
-    recognizer: CustomRecognitionCallback
-): void
-export declare function pi_register_custom_action(
-    id: Id,
-    name: string,
-    action: CustomActionCallback
-): void
-export declare function pi_run_cli(
-    id: Id,
-    resource_path: string,
-    user_path: string,
-    directly: boolean,
-    callback: NotificationCallback | null
-): Promise<boolean>
-
 export declare const Status: Record<
     'Invalid' | 'Pending' | 'Running' | 'Succeeded' | 'Failed',
     Status
@@ -400,6 +398,12 @@ export declare function agent_client_bind_resource(
     handle: AgentClientHandle,
     resource: ResourceHandle
 ): boolean
+export declare function agent_client_register_sink(
+    handle: AgentClientHandle,
+    tasker: TaskerHandle | null,
+    resource: ResourceHandle | null,
+    controller: ControllerHandle | null
+): boolean
 export declare function agent_client_connect(handle: AgentClientHandle): Promise<boolean>
 export declare function agent_client_disconnect(handle: AgentClientHandle): boolean
 export declare function agent_client_connected(handle: AgentClientHandle): boolean

package/src/resource.ts

@@ -3,13 +3,11 @@ 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 = {
     msg: 'Loading.Starting' | 'Loading.Succeeded' | 'Loading.Failed'
@@ -22,20 +20,13 @@ export class ResourceBase {
     handle: maa.ResourceHandle
     #source: JobSource<maa.ResId>
 
-    notify(message: string, details_json: string): maa.MaybePromise<void> {}
-
-    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({
+    static wrapSink(cb: (res: ResourceBase, msg: ResourceNotify) => maa.MaybePromise<void>) {
+        return ((res: ResourceBase, msg: string, details: string) => {
+            return cb(res, {
                 msg: msg.replace(/^Resource\./, '') as any,
                 ...JSON.parse(details)
             })
-        }, order)
+        }) satisfies maa.EventCallbackWithHandle<ResourceBase>
     }
 
     constructor(handle: maa.ResourceHandle) {
@@ -50,6 +41,28 @@ export class ResourceBase {
         maa.resource_destroy(this.handle)
     }
 
+    add_sink(cb: maa.EventCallbackWithHandle<ResourceBase>) {
+        const ws = new WeakRef(this)
+        return maa.resource_add_sink(this.handle, (msg: string, details: string) => {
+            const res = ws.deref()
+            if (res) {
+                cb(res, msg, details)
+            }
+        })
+    }
+
+    add_wrapped_sink(cb: (ctrl: ResourceBase, msg: ResourceNotify) => maa.MaybePromise<void>) {
+        return this.add_sink(ResourceBase.wrapSink(cb))
+    }
+
+    remove_sink(sink_id: maa.SinkId) {
+        maa.resource_remove_sink(this.handle, sink_id)
+    }
+
+    clear_sinks() {
+        maa.resource_clear_sinks(this.handle)
+    }
+
     set inference_device(id: keyof typeof maa.InferenceDevice | number) {
         if (typeof id === 'string') {
             id = maa.InferenceDevice[id]
@@ -190,14 +203,10 @@ export class ResourceBase {
 
 export class Resource extends ResourceBase {
     constructor() {
-        let ws: WeakRef<this>
-        const h = maa.resource_create((message, details_json) => {
-            return ws.deref()?.notify(message, details_json)
-        })
+        const h = maa.resource_create()
         if (!h) {
             throw 'Resource create failed'
         }
         super(h)
-        ws = new WeakRef(this)
     }
 }

package/src/tasker.ts

@@ -1,9 +1,8 @@
+import { Context } from './context'
 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']>
 
@@ -56,14 +55,15 @@ export 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
-          uuid: string
-          hash: string
-      }
+export type TaskerNotify = {
+    msg: 'Task.Started' | 'Task.Completed' | 'Task.Failed'
+    task_id: maa.TaskId
+    entry: string
+    uuid: string
+    hash: string
+}
+
+export type TaskerContextNotify =
     | {
           msg: 'NextList.Starting' | 'NextList.Succeeded' | 'NextList.Failed'
           task_id: maa.TaskId
@@ -90,20 +90,22 @@ export class TaskerBase {
     handle: maa.TaskerHandle
     #source: JobSource<maa.TaskId>
 
-    notify(message: string, details_json: string): maa.MaybePromise<void> {}
-
-    chain_notify = chain_notify_impl
+    static wrapSink(cb: (tasker: TaskerBase, msg: TaskerNotify) => maa.MaybePromise<void>) {
+        return ((tasker: TaskerBase, msg: string, details: string) => {
+            return cb(tasker, {
+                msg: msg.replace(/^Tasker\./, '') as any,
+                ...JSON.parse(details)
+            })
+        }) satisfies maa.EventCallbackWithHandle<TaskerBase>
+    }
 
-    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,
+    static wrapContextSink(cb: (ctx: Context, msg: TaskerContextNotify) => maa.MaybePromise<void>) {
+        return ((ctx: Context, msg: string, details: string) => {
+            return cb(ctx, {
+                msg: msg.replace(/^Node\./, '') as any,
                 ...JSON.parse(details)
             })
-        }, order)
+        }) satisfies maa.EventCallbackWithHandle<Context>
     }
 
     constructor(handle: maa.TaskerHandle) {
@@ -118,6 +120,48 @@ export class TaskerBase {
         maa.tasker_destroy(this.handle)
     }
 
+    add_sink(cb: maa.EventCallbackWithHandle<TaskerBase>) {
+        const ws = new WeakRef(this)
+        return maa.tasker_add_sink(this.handle, (msg: string, details: string) => {
+            const tasker = ws.deref()
+            if (tasker) {
+                cb(tasker, msg, details)
+            }
+        })
+    }
+
+    add_wrapped_sink(cb: (tasker: TaskerBase, msg: TaskerNotify) => maa.MaybePromise<void>) {
+        return this.add_sink(TaskerBase.wrapSink(cb))
+    }
+
+    remove_sink(sink_id: maa.SinkId) {
+        maa.tasker_remove_sink(this.handle, sink_id)
+    }
+
+    clear_sinks() {
+        maa.tasker_clear_sinks(this.handle)
+    }
+
+    add_context_sink(cb: maa.EventCallbackWithHandle<Context>) {
+        return maa.tasker_add_context_sink(this.handle, (ctx, msg, details) => {
+            cb(new Context(ctx), msg, details)
+        })
+    }
+
+    add_wrapped_context_sink(
+        cb: (ctx: Context, msg: TaskerContextNotify) => maa.MaybePromise<void>
+    ) {
+        return this.add_context_sink(TaskerBase.wrapContextSink(cb))
+    }
+
+    remove_context_sink(sink_id: maa.SinkId) {
+        maa.tasker_remove_context_sink(this.handle, sink_id)
+    }
+
+    clear_context_sinks() {
+        maa.tasker_clear_context_sinks(this.handle)
+    }
+
     bind(slave: ControllerBase | ResourceBase) {
         let ret: boolean
         if (slave instanceof ControllerBase) {
@@ -231,14 +275,10 @@ export class TaskerBase {
 
 export class Tasker extends TaskerBase {
     constructor() {
-        let ws: WeakRef<this>
-        const h = maa.tasker_create((message, details_json) => {
-            return ws.deref()?.notify(message, details_json)
-        })
+        const h = maa.tasker_create()
         if (!h) {
             throw 'Tasker create failed'
         }
         super(h)
-        ws = new WeakRef(this)
     }
 }

package/src/types.ts

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

package/dist/pi.d.ts

@@ -1,9 +0,0 @@
-import * as maa from './maa';
-import { CustomActionCallback, CustomRecognizerCallback } from './types';
-export declare const Pi: {
-    __running: boolean;
-    notify(message: string, details_json: string): maa.MaybePromise<void>;
-    register_custom_recognizer(id: maa.Id, name: string, func: CustomRecognizerCallback): void;
-    register_custom_action(id: maa.Id, name: string, func: CustomActionCallback): void;
-    run_cli(id: maa.Id, resource_path: string, user_path: string, directly: boolean): Promise<boolean>;
-};

package/dist/utils.d.ts

@@ -1,5 +0,0 @@
-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/src/pi.ts

@@ -1,66 +0,0 @@
-import { Context } from './context'
-import * as maa from './maa'
-import {
-    CustomActionCallback,
-    CustomActionSelf,
-    CustomRecognizerCallback,
-    CustomRecognizerSelf
-} from './types'
-
-export const Pi = {
-    __running: false,
-
-    notify(message: string, details_json: string): maa.MaybePromise<void> {},
-
-    register_custom_recognizer(id: maa.Id, name: string, func: CustomRecognizerCallback) {
-        maa.pi_register_custom_recognizer(
-            id,
-            name,
-            (context, id, task, name, param, image, roi) => {
-                const self: CustomRecognizerSelf = {
-                    context: new Context(context),
-                    id,
-                    task,
-                    name,
-                    param: JSON.parse(param),
-                    image,
-                    roi
-                }
-                return func.apply(self, [self])
-            }
-        )
-    },
-
-    register_custom_action(id: maa.Id, name: string, func: CustomActionCallback) {
-        maa.pi_register_custom_action(id, name, (context, id, task, name, param, recoId, box) => {
-            const self: CustomActionSelf = {
-                context: new Context(context),
-                id,
-                task,
-                name,
-                param: JSON.parse(param),
-                recoId,
-                box
-            }
-            return func.apply(self, [self])
-        })
-    },
-
-    async run_cli(id: maa.Id, resource_path: string, user_path: string, directly: boolean) {
-        if (Pi.__running) {
-            return false
-        }
-        Pi.__running = true
-        const res = await maa.pi_run_cli(
-            id,
-            resource_path,
-            user_path,
-            directly,
-            (message, details) => {
-                return Pi.notify(message, details)
-            }
-        )
-        Pi.__running = false
-        return res
-    }
-}