@maaxyz/maa-node 4.0.0 → 4.1.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/client.d.ts +1 -1
  2. package/dist/context.d.ts +3 -3
  3. package/dist/index-client.js +3 -3
  4. package/dist/index-server.js +1 -1
  5. package/dist/maa.d.ts +1 -1
  6. package/dist/tasker.d.ts +16 -4
  7. package/package.json +7 -7
  8. package/src/client.ts +2 -2
  9. package/src/maa.d.ts +1 -1
  10. package/src/tasker.ts +15 -1
package/dist/client.d.ts CHANGED
@@ -6,6 +6,6 @@ export declare class AgentClient {
6
6
  destroy(): void;
7
7
  bind_resource(resource: Resource): void;
8
8
  create_socket(identifier: string | null): string;
9
- connect(): void;
9
+ connect(): Promise<void>;
10
10
  disconnect(): void;
11
11
  }
package/dist/context.d.ts CHANGED
@@ -13,7 +13,7 @@ export declare class Context {
13
13
  algorithm: string;
14
14
  hit: boolean;
15
15
  box: maa.Rect;
16
- detail: string;
16
+ detail: import("./tasker").RecoDetail;
17
17
  raw: ArrayBuffer;
18
18
  draws: ArrayBuffer[];
19
19
  } | null;
@@ -26,7 +26,7 @@ export declare class Context {
26
26
  algorithm: string;
27
27
  hit: boolean;
28
28
  box: maa.Rect;
29
- detail: string;
29
+ detail: import("./tasker").RecoDetail;
30
30
  raw: ArrayBuffer;
31
31
  draws: ArrayBuffer[];
32
32
  } | null>;
@@ -37,7 +37,7 @@ export declare class Context {
37
37
  algorithm: string;
38
38
  hit: boolean;
39
39
  box: maa.Rect;
40
- detail: string;
40
+ detail: import("./tasker").RecoDetail;
41
41
  raw: ArrayBuffer;
42
42
  draws: ArrayBuffer[];
43
43
  } | null;
package/dist/index-client.js CHANGED
@@ -509,7 +509,7 @@ var TaskerBase = class {
509
509
  algorithm,
510
510
  hit,
511
511
  box,
512
- detail,
512
+ detail: JSON.parse(detail),
513
513
  raw,
514
514
  draws
515
515
  };
@@ -1040,8 +1040,8 @@ var AgentClient = class {
1040
1040
  }
1041
1041
  return rid;
1042
1042
  }
1043
- connect() {
1044
- if (!maa8.agent_client_connect(this.handle)) {
1043
+ async connect() {
1044
+ if (!await maa8.agent_client_connect(this.handle)) {
1045
1045
  throw "AgentClient connect failed";
1046
1046
  }
1047
1047
  }
package/dist/index-server.js CHANGED
@@ -509,7 +509,7 @@ var TaskerBase = class {
509
509
  algorithm,
510
510
  hit,
511
511
  box,
512
- detail,
512
+ detail: JSON.parse(detail),
513
513
  raw,
514
514
  draws
515
515
  };
package/dist/maa.d.ts CHANGED
@@ -387,7 +387,7 @@ export declare function agent_client_create_socket(
387
387
  handle: AgentClientHandle,
388
388
  identifier: string | null
389
389
  ): string | null
390
- export declare function agent_client_connect(handle: AgentClientHandle): boolean
390
+ export declare function agent_client_connect(handle: AgentClientHandle): Promise<boolean>
391
391
  export declare function agent_client_disconnect(handle: AgentClientHandle): boolean
392
392
 
393
393
  // agent.cpp - server
package/dist/tasker.d.ts CHANGED
@@ -3,6 +3,15 @@ import { Job, JobSource } from './job';
3
3
  import maa from './maa';
4
4
  import { ResourceBase } from './resource';
5
5
  type TaskDetail = ReturnType<TaskerBase['task_detail']>;
6
+ type RecoDetailEntry = {
7
+ box: maa.Rect;
8
+ detail: string;
9
+ };
10
+ export type RecoDetail = {
11
+ all_results: RecoDetailEntry[];
12
+ filtered_results_: RecoDetailEntry[];
13
+ best_result_: RecoDetailEntry | null;
14
+ };
6
15
  declare class TaskJob extends Job<maa.TaskId, JobSource<maa.TaskId>> {
7
16
  #private;
8
17
  constructor(tasker: TaskerBase, source: JobSource<maa.TaskId>, id: maa.TaskId);
@@ -15,7 +24,7 @@ declare class TaskJob extends Job<maa.TaskId, JobSource<maa.TaskId>> {
15
24
  algorithm: string;
16
25
  hit: boolean;
17
26
  box: maa.Rect;
18
- detail: string;
27
+ detail: RecoDetail;
19
28
  raw: ArrayBuffer;
20
29
  draws: ArrayBuffer[];
21
30
  } | null;
@@ -44,16 +53,19 @@ export type TaskerNotify = {
44
53
  task_id: number;
45
54
  name: string;
46
55
  list: string[];
56
+ focus: unknown;
47
57
  } | {
48
58
  msg: 'Recognition.Starting' | 'Recognition.Succeeded' | 'Recognition.Failed';
49
59
  task_id: number;
50
60
  reco_id: number;
51
61
  name: string;
62
+ focus: unknown;
52
63
  } | {
53
64
  msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed';
54
65
  task_id: number;
55
66
  node_id: number;
56
67
  name: string;
68
+ focus: unknown;
57
69
  });
58
70
  export declare class TaskerBase {
59
71
  #private;
@@ -75,7 +87,7 @@ export declare class TaskerBase {
75
87
  algorithm: string;
76
88
  hit: boolean;
77
89
  box: maa.Rect;
78
- detail: string;
90
+ detail: RecoDetail;
79
91
  raw: ArrayBuffer;
80
92
  draws: ArrayBuffer[];
81
93
  } | null;
@@ -86,7 +98,7 @@ export declare class TaskerBase {
86
98
  algorithm: string;
87
99
  hit: boolean;
88
100
  box: maa.Rect;
89
- detail: string;
101
+ detail: RecoDetail;
90
102
  raw: ArrayBuffer;
91
103
  draws: ArrayBuffer[];
92
104
  } | null;
@@ -101,7 +113,7 @@ export declare class TaskerBase {
101
113
  algorithm: string;
102
114
  hit: boolean;
103
115
  box: maa.Rect;
104
- detail: string;
116
+ detail: RecoDetail;
105
117
  raw: ArrayBuffer;
106
118
  draws: ArrayBuffer[];
107
119
  } | null;
package/package.json CHANGED
@@ -25,13 +25,13 @@
25
25
  "prettier": "^3.5.2",
26
26
  "typescript": "^5.8.2"
27
27
  },
28
- "version": "4.0.0",
28
+ "version": "4.1.0-alpha.2",
29
29
  "optionalDependencies": {
30
- "@maaxyz/maa-node-darwin-arm64": "4.0.0",
31
- "@maaxyz/maa-node-darwin-x64": "4.0.0",
32
- "@maaxyz/maa-node-linux-arm64": "4.0.0",
33
- "@maaxyz/maa-node-linux-x64": "4.0.0",
34
- "@maaxyz/maa-node-win32-arm64": "4.0.0",
35
- "@maaxyz/maa-node-win32-x64": "4.0.0"
30
+ "@maaxyz/maa-node-darwin-arm64": "4.1.0-alpha.2",
31
+ "@maaxyz/maa-node-darwin-x64": "4.1.0-alpha.2",
32
+ "@maaxyz/maa-node-linux-arm64": "4.1.0-alpha.2",
33
+ "@maaxyz/maa-node-linux-x64": "4.1.0-alpha.2",
34
+ "@maaxyz/maa-node-win32-arm64": "4.1.0-alpha.2",
35
+ "@maaxyz/maa-node-win32-x64": "4.1.0-alpha.2"
36
36
  }
37
37
  }
package/src/client.ts CHANGED
@@ -30,8 +30,8 @@ export class AgentClient {
30
30
  return rid
31
31
  }
32
32
 
33
- connect() {
34
- if (!maa.agent_client_connect(this.handle)) {
33
+ async connect() {
34
+ if (!(await maa.agent_client_connect(this.handle))) {
35
35
  throw 'AgentClient connect failed'
36
36
  }
37
37
  }
package/src/maa.d.ts CHANGED
@@ -387,7 +387,7 @@ export declare function agent_client_create_socket(
387
387
  handle: AgentClientHandle,
388
388
  identifier: string | null
389
389
  ): string | null
390
- export declare function agent_client_connect(handle: AgentClientHandle): boolean
390
+ export declare function agent_client_connect(handle: AgentClientHandle): Promise<boolean>
391
391
  export declare function agent_client_disconnect(handle: AgentClientHandle): boolean
392
392
 
393
393
  // agent.cpp - server
package/src/tasker.ts CHANGED
@@ -5,6 +5,17 @@ import { ResourceBase } from './resource'
5
5
 
6
6
  type TaskDetail = ReturnType<TaskerBase['task_detail']>
7
7
 
8
+ type RecoDetailEntry = {
9
+ box: maa.Rect
10
+ detail: string
11
+ }
12
+
13
+ export type RecoDetail = {
14
+ all_results: RecoDetailEntry[]
15
+ filtered_results_: RecoDetailEntry[]
16
+ best_result_: RecoDetailEntry | null
17
+ }
18
+
8
19
  class TaskJob extends Job<maa.TaskId, JobSource<maa.TaskId>> {
9
20
  #tasker: TaskerBase
10
21
 
@@ -52,18 +63,21 @@ export type TaskerNotify = {
52
63
  task_id: number
53
64
  name: string
54
65
  list: string[]
66
+ focus: unknown
55
67
  }
56
68
  | {
57
69
  msg: 'Recognition.Starting' | 'Recognition.Succeeded' | 'Recognition.Failed'
58
70
  task_id: number
59
71
  reco_id: number
60
72
  name: string
73
+ focus: unknown
61
74
  }
62
75
  | {
63
76
  msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed'
64
77
  task_id: number
65
78
  node_id: number
66
79
  name: string
80
+ focus: unknown
67
81
  }
68
82
  )
69
83
 
@@ -159,7 +173,7 @@ export class TaskerBase {
159
173
  algorithm,
160
174
  hit,
161
175
  box,
162
- detail,
176
+ detail: JSON.parse(detail) as RecoDetail,
163
177
  raw,
164
178
  draws
165
179
  }