@maaxyz/maa-node 2.4.2 → 3.0.0-beta.2

package/dist/context.d.ts

@@ -5,7 +5,7 @@ export declare class Context {
     #private;
     handle: maa.ContextHandle;
     constructor(handle: maa.ContextHandle);
-    run_pipeline(entry: string, pipeline_override?: Record<string, unknown>): Promise<{
+    run_task(entry: string, pipeline_override?: Record<string, unknown>): Promise<{
         entry: string;
         nodes: ({
             name: string;

package/dist/index.js

@@ -427,7 +427,7 @@ var TaskerBase = class {
   set parsed_notify(cb) {
     this.notify = (msg, details) => {
       return cb({
-        msg: msg.replace(/^Task(?:er)?\./, ""),
+        msg: msg.replace(/^(?:Tasker|Node)?\./, ""),
         ...JSON.parse(details)
       });
     };
@@ -453,11 +453,11 @@ var TaskerBase = class {
       throw "Tasker bind failed";
     }
   }
-  post_pipeline(entry, param = {}) {
+  post_task(entry, param = {}) {
     return new TaskJob(
       this,
       this.#source,
-      import_maa2.default.tasker_post_pipeline(this.handle, entry, JSON.stringify(param))
+      import_maa2.default.tasker_post_task(this.handle, entry, JSON.stringify(param))
     );
   }
   get inited() {
@@ -467,11 +467,7 @@ var TaskerBase = class {
     return import_maa2.default.tasker_running(this.handle);
   }
   post_stop() {
-    return new TaskJob(
-      this,
-      this.#source,
-      import_maa2.default.tasker_post_stop(this.handle)
-    );
+    return new TaskJob(this, this.#source, import_maa2.default.tasker_post_stop(this.handle));
   }
   get resource() {
     const res = import_maa2.default.tasker_get_resource(this.handle);
@@ -537,8 +533,8 @@ var TaskerBase = class {
       return null;
     }
   }
-  latest_node(task) {
-    return import_maa2.default.tasker_get_latest_node(this.handle, task);
+  latest_node(node) {
+    return import_maa2.default.tasker_get_latest_node(this.handle, node);
   }
 };
 var Tasker = class extends TaskerBase {
@@ -563,8 +559,8 @@ var Context = class _Context {
     this.handle = handle;
     this.#tasker = new TaskerBase(maa4.context_get_tasker(this.handle));
   }
-  async run_pipeline(entry, pipeline_override = {}) {
-    const id = await maa4.context_run_pipeline(
+  async run_task(entry, pipeline_override = {}) {
+    const id = await maa4.context_run_task(
       this.handle,
       entry,
       JSON.stringify(pipeline_override)
@@ -715,8 +711,8 @@ var ResourceBase = class {
       throw "Resource clear_custom_action failed";
     }
   }
-  post_path(path2) {
-    return new Job(this.#source, import_maa3.default.resource_post_path(this.handle, path2));
+  post_bundle(path2) {
+    return new Job(this.#source, import_maa3.default.resource_post_bundle(this.handle, path2));
   }
   clear() {
     if (!import_maa3.default.resource_clear(this.handle)) {

package/dist/maa.d.ts

@@ -36,7 +36,7 @@ export type NotificationCallback = (message: string, details_json: string) => Ma
 export type CustomRecognitionCallback = (
     context: ContextHandle,
     task_id: TaskId,
-    current_task_name: string,
+    node_name: string,
     custom_recognition_name: string,
     custom_recognition_param: string,
     image: ImageData,
@@ -45,7 +45,7 @@ export type CustomRecognitionCallback = (
 export type CustomActionCallback = (
     context: ContextHandle,
     task_id: TaskId,
-    current_task_name: string,
+    node_name: string,
     custom_action_name: string,
     custom_action_param: string,
     reco_id: RecoId,
@@ -73,7 +73,7 @@ export type CustomControllerCallback = (
 
 // context.cpp
 
-export declare function context_run_pipeline(
+export declare function context_run_task(
     context: ContextHandle,
     entry: string,
     pipeline_override: string
@@ -223,7 +223,7 @@ export declare function resource_unregister_custom_action(
     name: string
 ): boolean
 export declare function resource_clear_custom_action(handle: ResourceHandle): boolean
-export declare function resource_post_path(handle: ResourceHandle, path: string): ResId
+export declare function resource_post_bundle(handle: ResourceHandle, path: string): ResId
 export declare function resource_clear(handle: ResourceHandle): boolean
 export declare function resource_status(handle: ResourceHandle, res_id: ResId): Status
 export declare function resource_wait(handle: ResourceHandle, res_id: ResId): Promise<Status>
@@ -244,7 +244,7 @@ export declare function tasker_bind_controller(
     controller: ControllerHandle | null
 ): boolean
 export declare function tasker_inited(handle: TaskerHandle): boolean
-export declare function tasker_post_pipeline(
+export declare function tasker_post_task(
     handle: TaskerHandle,
     entry: string,
     pipeline_override: string
@@ -280,7 +280,7 @@ export declare function tasker_get_task_detail(
 ): [entry: string, node_ids: NodeId[], status: Status] | null
 export declare function tasker_get_latest_node(
     handle: TaskerHandle,
-    task_name: string
+    node_name: string
 ): NodeId | null
 
 // config.cpp

package/dist/resource.d.ts

@@ -25,7 +25,7 @@ export declare class ResourceBase {
     register_custom_action(name: string, func: CustomActionCallback): void;
     unregister_custom_action(name: string): void;
     clear_custom_action(): void;
-    post_path(path: string): Job<maa.ResId, JobSource<maa.ResId>>;
+    post_bundle(path: string): Job<maa.ResId, JobSource<maa.ResId>>;
     clear(): void;
     get loaded(): boolean;
     get hash(): string | null;

package/dist/tasker.d.ts

@@ -40,31 +40,20 @@ export type TaskerNotify = {
 } & ({
     msg: 'Task.Started' | 'Task.Completed' | 'Task.Failed';
 } | {
-    msg: 'Debug.RecognitionResult' | 'Debug.Hit';
-    current: string;
-    recognition: {
-        reco_id: maa.RecoId;
-        name: string;
-        /**
-         * Won't be `null` for msg `Debug.Hit`
-         */
-        box: maa.FlatRect | null;
-        detail: string;
-    };
+    msg: 'NextList.Starting' | 'NextList.Succeeded' | 'NextList.Failed';
+    task_id: number;
+    name: string;
+    list: string[];
 } | {
-    msg: 'Focus.ReadyToRun' | 'Focus.Completed' | 'Debug.ReadyToRun' | 'Debug.Completed';
-    current: string;
-    node: {
-        node_id: maa.NodeId;
-        name: string;
-        reco_id: maa.RecoId;
-        times: number;
-        completed: boolean;
-    };
+    msg: 'Recognition.Starting' | 'Recognition.Succeeded' | 'Recognition.Failed';
+    task_id: number;
+    reco_id: number;
+    name: string;
 } | {
-    msg: 'Debug.ListToRecognize' | 'Debug.MissAll';
-    current: string;
-    list: string[];
+    msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed';
+    task_id: number;
+    node_id: number;
+    name: string;
 });
 export declare class TaskerBase {
     #private;
@@ -74,7 +63,7 @@ export declare class TaskerBase {
     constructor(handle: maa.TaskerHandle);
     destroy(): void;
     bind(slave: ControllerBase | ResourceBase): void;
-    post_pipeline(entry: string, param?: Record<string, unknown>): TaskJob;
+    post_task(entry: string, param?: Record<string, unknown>): TaskJob;
     get inited(): boolean;
     get running(): boolean;
     post_stop(): TaskJob;
@@ -120,7 +109,7 @@ export declare class TaskerBase {
         } | null)[];
         status: maa.Status;
     } | null;
-    latest_node(task: string): maa.NodeId | null;
+    latest_node(node: string): maa.NodeId | null;
 }
 export declare class Tasker extends TaskerBase {
     constructor();

package/package.json

@@ -21,13 +21,13 @@
         "prettier": "^3.3.2",
         "typescript": "^5.4.5"
     },
-    "version": "2.4.2",
+    "version": "3.0.0-beta.2",
     "optionalDependencies": {
-        "@maaxyz/maa-node-darwin-arm64": "2.4.2",
-        "@maaxyz/maa-node-darwin-x64": "2.4.2",
-        "@maaxyz/maa-node-linux-arm64": "2.4.2",
-        "@maaxyz/maa-node-linux-x64": "2.4.2",
-        "@maaxyz/maa-node-win32-arm64": "2.4.2",
-        "@maaxyz/maa-node-win32-x64": "2.4.2"
+        "@maaxyz/maa-node-darwin-arm64": "3.0.0-beta.2",
+        "@maaxyz/maa-node-darwin-x64": "3.0.0-beta.2",
+        "@maaxyz/maa-node-linux-arm64": "3.0.0-beta.2",
+        "@maaxyz/maa-node-linux-x64": "3.0.0-beta.2",
+        "@maaxyz/maa-node-win32-arm64": "3.0.0-beta.2",
+        "@maaxyz/maa-node-win32-x64": "3.0.0-beta.2"
     }
 }

package/src/context.ts

@@ -10,8 +10,8 @@ export class Context {
         this.#tasker = new TaskerBase(maa.context_get_tasker(this.handle))
     }
 
-    async run_pipeline(entry: string, pipeline_override: Record<string, unknown> = {}) {
-        const id = await maa.context_run_pipeline(
+    async run_task(entry: string, pipeline_override: Record<string, unknown> = {}) {
+        const id = await maa.context_run_task(
             this.handle,
             entry,
             JSON.stringify(pipeline_override)

package/src/maa.d.ts

@@ -36,7 +36,7 @@ export type NotificationCallback = (message: string, details_json: string) => Ma
 export type CustomRecognitionCallback = (
     context: ContextHandle,
     task_id: TaskId,
-    current_task_name: string,
+    node_name: string,
     custom_recognition_name: string,
     custom_recognition_param: string,
     image: ImageData,
@@ -45,7 +45,7 @@ export type CustomRecognitionCallback = (
 export type CustomActionCallback = (
     context: ContextHandle,
     task_id: TaskId,
-    current_task_name: string,
+    node_name: string,
     custom_action_name: string,
     custom_action_param: string,
     reco_id: RecoId,
@@ -73,7 +73,7 @@ export type CustomControllerCallback = (
 
 // context.cpp
 
-export declare function context_run_pipeline(
+export declare function context_run_task(
     context: ContextHandle,
     entry: string,
     pipeline_override: string
@@ -223,7 +223,7 @@ export declare function resource_unregister_custom_action(
     name: string
 ): boolean
 export declare function resource_clear_custom_action(handle: ResourceHandle): boolean
-export declare function resource_post_path(handle: ResourceHandle, path: string): ResId
+export declare function resource_post_bundle(handle: ResourceHandle, path: string): ResId
 export declare function resource_clear(handle: ResourceHandle): boolean
 export declare function resource_status(handle: ResourceHandle, res_id: ResId): Status
 export declare function resource_wait(handle: ResourceHandle, res_id: ResId): Promise<Status>
@@ -244,7 +244,7 @@ export declare function tasker_bind_controller(
     controller: ControllerHandle | null
 ): boolean
 export declare function tasker_inited(handle: TaskerHandle): boolean
-export declare function tasker_post_pipeline(
+export declare function tasker_post_task(
     handle: TaskerHandle,
     entry: string,
     pipeline_override: string
@@ -280,7 +280,7 @@ export declare function tasker_get_task_detail(
 ): [entry: string, node_ids: NodeId[], status: Status] | null
 export declare function tasker_get_latest_node(
     handle: TaskerHandle,
-    task_name: string
+    node_name: string
 ): NodeId | null
 
 // config.cpp

package/src/resource.ts

@@ -135,8 +135,8 @@ export class ResourceBase {
         }
     }
 
-    post_path(path: string) {
-        return new Job(this.#source, maa.resource_post_path(this.handle, path))
+    post_bundle(path: string) {
+        return new Job(this.#source, maa.resource_post_bundle(this.handle, path))
     }
 
     clear() {

package/src/tasker.ts

@@ -48,33 +48,22 @@ export type TaskerNotify = {
           msg: 'Task.Started' | 'Task.Completed' | 'Task.Failed'
       }
     | {
-          msg: 'Debug.RecognitionResult' | 'Debug.Hit'
-          current: string
-          recognition: {
-              reco_id: maa.RecoId
-              name: string
-              /**
-               * Won't be `null` for msg `Debug.Hit`
-               */
-              box: maa.FlatRect | null
-              detail: string
-          }
+          msg: 'NextList.Starting' | 'NextList.Succeeded' | 'NextList.Failed'
+          task_id: number
+          name: string
+          list: string[]
       }
     | {
-          msg: 'Focus.ReadyToRun' | 'Focus.Completed' | 'Debug.ReadyToRun' | 'Debug.Completed'
-          current: string
-          node: {
-              node_id: maa.NodeId
-              name: string
-              reco_id: maa.RecoId
-              times: number
-              completed: boolean
-          }
+          msg: 'Recognition.Starting' | 'Recognition.Succeeded' | 'Recognition.Failed'
+          task_id: number
+          reco_id: number
+          name: string
       }
     | {
-          msg: 'Debug.ListToRecognize' | 'Debug.MissAll'
-          current: string
-          list: string[]
+          msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed'
+          task_id: number
+          node_id: number
+          name: string
       }
 )
 
@@ -87,7 +76,7 @@ export class TaskerBase {
     set parsed_notify(cb: (msg: TaskerNotify) => maa.MaybePromise<void>) {
         this.notify = (msg, details) => {
             return cb({
-                msg: msg.replace(/^Task(?:er)?\./, '') as any,
+                msg: msg.replace(/^(?:Tasker|Node)?\./, '') as any,
                 ...JSON.parse(details)
             })
         }
@@ -117,11 +106,11 @@ export class TaskerBase {
         }
     }
 
-    post_pipeline(entry: string, param: Record<string, unknown> = {}) {
+    post_task(entry: string, param: Record<string, unknown> = {}) {
         return new TaskJob(
             this,
             this.#source,
-            maa.tasker_post_pipeline(this.handle, entry, JSON.stringify(param))
+            maa.tasker_post_task(this.handle, entry, JSON.stringify(param))
         )
     }
 
@@ -134,11 +123,7 @@ export class TaskerBase {
     }
 
     post_stop() {
-        return new TaskJob(
-            this,
-            this.#source,
-            maa.tasker_post_stop(this.handle)
-        )
+        return new TaskJob(this, this.#source, maa.tasker_post_stop(this.handle))
     }
 
     get resource() {
@@ -211,8 +196,8 @@ export class TaskerBase {
         }
     }
 
-    latest_node(task: string) {
-        return maa.tasker_get_latest_node(this.handle, task)
+    latest_node(node: string) {
+        return maa.tasker_get_latest_node(this.handle, node)
     }
 }