@maaxyz/maa-node 3.0.0-beta.1 → 3.0.0

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)
       });
     };
@@ -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 {
@@ -730,7 +726,7 @@ var ResourceBase = class {
     return import_maa3.default.resource_get_hash(this.handle);
   }
   get task_list() {
-    return import_maa3.default.resource_get_task_list(this.handle);
+    return import_maa3.default.resource_get_node_list(this.handle);
   }
 };
 var Resource = class extends ResourceBase {

package/dist/maa.d.ts

@@ -229,7 +229,7 @@ export declare function resource_status(handle: ResourceHandle, res_id: ResId):
 export declare function resource_wait(handle: ResourceHandle, res_id: ResId): Promise<Status>
 export declare function resource_loaded(handle: ResourceHandle): boolean
 export declare function resource_get_hash(handle: ResourceHandle): string | null
-export declare function resource_get_task_list(handle: ResourceHandle): string[] | null
+export declare function resource_get_node_list(handle: ResourceHandle): string[] | null
 
 // tasker.cpp
 

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;
@@ -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": "3.0.0-beta.1",
+    "version": "3.0.0",
     "optionalDependencies": {
-        "@maaxyz/maa-node-darwin-arm64": "3.0.0-beta.1",
-        "@maaxyz/maa-node-darwin-x64": "3.0.0-beta.1",
-        "@maaxyz/maa-node-linux-arm64": "3.0.0-beta.1",
-        "@maaxyz/maa-node-linux-x64": "3.0.0-beta.1",
-        "@maaxyz/maa-node-win32-arm64": "3.0.0-beta.1",
-        "@maaxyz/maa-node-win32-x64": "3.0.0-beta.1"
+        "@maaxyz/maa-node-darwin-arm64": "3.0.0",
+        "@maaxyz/maa-node-darwin-x64": "3.0.0",
+        "@maaxyz/maa-node-linux-arm64": "3.0.0",
+        "@maaxyz/maa-node-linux-x64": "3.0.0",
+        "@maaxyz/maa-node-win32-arm64": "3.0.0",
+        "@maaxyz/maa-node-win32-x64": "3.0.0"
     }
 }

package/src/maa.d.ts

@@ -229,7 +229,7 @@ export declare function resource_status(handle: ResourceHandle, res_id: ResId):
 export declare function resource_wait(handle: ResourceHandle, res_id: ResId): Promise<Status>
 export declare function resource_loaded(handle: ResourceHandle): boolean
 export declare function resource_get_hash(handle: ResourceHandle): string | null
-export declare function resource_get_task_list(handle: ResourceHandle): string[] | null
+export declare function resource_get_node_list(handle: ResourceHandle): string[] | null
 
 // tasker.cpp
 

package/src/resource.ts

@@ -154,7 +154,7 @@ export class ResourceBase {
     }
 
     get task_list() {
-        return maa.resource_get_task_list(this.handle)
+        return maa.resource_get_node_list(this.handle)
     }
 }
 

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)
             })
         }
@@ -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)
     }
 }