@maaxyz/maa-node 5.0.2 → 5.0.4

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 (7) hide show
  1. package/dist/client.d.ts +3 -0
  2. package/dist/controller.d.ts +1 -4
  3. package/dist/pipeline.d.ts +32 -32
  4. package/dist/resource.d.ts +1 -4
  5. package/dist/tasker.d.ts +56 -24
  6. package/dist/types.d.ts +6 -8
  7. package/package.json +7 -7
package/dist/client.d.ts CHANGED
@@ -6,6 +6,9 @@ declare global {
6
6
  destroy(): void
7
7
  get identifier(): string
8
8
  bind_resource(resource: Resource): void
9
+ register_resource_sink(resource: Resource): void
10
+ register_controller_sink(controller: Controller): void
11
+ register_tasker_sink(tasker: Tasker): void
9
12
  connect(): Promise<void>
10
13
  disconnect(): void
11
14
  get connected(): boolean
package/dist/controller.d.ts CHANGED
@@ -61,10 +61,7 @@ declare global {
61
61
  | AppParam
62
62
 
63
63
  type ControllerNotify = {
64
- msg:
65
- | 'Controller.Action.Starting'
66
- | 'Controller.Action.Succeeded'
67
- | 'Controller.Action.Failed'
64
+ msg: NotifyMessage<'Action'>
68
65
  ctrl_id: number // CtrlId
69
66
  uuid: string
70
67
  } & (
package/dist/pipeline.d.ts CHANGED
@@ -31,8 +31,8 @@ declare global {
31
31
 
32
32
  type RecognitionTemplateMatch<Mode> = RequiredIfStrict<
33
33
  {
34
- roi?: FlatRect | NodeName
35
- roi_offset?: FlatRect
34
+ roi?: Rect | NodeName
35
+ roi_offset?: Rect
36
36
  template?: MaybeArray<string, Mode>
37
37
  threshold?: MaybeArray<number, Mode>
38
38
  order_by?: OrderByMap['TemplateMatch']
@@ -46,8 +46,8 @@ declare global {
46
46
 
47
47
  type RecognitionFeatureMatch<Mode> = RequiredIfStrict<
48
48
  {
49
- roi?: FlatRect | NodeName
50
- roi_offset?: FlatRect
49
+ roi?: Rect | NodeName
50
+ roi_offset?: Rect
51
51
  template?: MaybeArray<string, Mode>
52
52
  count?: number
53
53
  order_by?: OrderByMap['FeatureMatch']
@@ -61,8 +61,8 @@ declare global {
61
61
  >
62
62
 
63
63
  type RecognitionColorMatch<Mode> = {
64
- roi?: FlatRect | NodeName
65
- roi_offset?: FlatRect
64
+ roi?: Rect | NodeName
65
+ roi_offset?: Rect
66
66
  } & RequiredIfStrict<
67
67
  | {
68
68
  method?: 4 | 40
@@ -85,8 +85,8 @@ declare global {
85
85
 
86
86
  type RecognitionOCR<Mode> = RequiredIfStrict<
87
87
  {
88
- roi?: FlatRect | NodeName
89
- roi_offset?: FlatRect
88
+ roi?: Rect | NodeName
89
+ roi_offset?: Rect
90
90
  expected?: MaybeArray<string, Mode>
91
91
  threshold?: MaybeArray<number, Mode>
92
92
  replace?: MaybeArray<FixedArray<string, 2>, Mode>
@@ -101,8 +101,8 @@ declare global {
101
101
 
102
102
  type RecognitionNeuralNetworkClassify<Mode> = RequiredIfStrict<
103
103
  {
104
- roi?: FlatRect | NodeName
105
- roi_offset?: FlatRect
104
+ roi?: Rect | NodeName
105
+ roi_offset?: Rect
106
106
  labels?: string[]
107
107
  model?: string
108
108
  expected?: MaybeArray<number, Mode>
@@ -115,8 +115,8 @@ declare global {
115
115
 
116
116
  type RecognitionNeuralNetworkDetect<Mode> = RequiredIfStrict<
117
117
  {
118
- roi?: FlatRect | NodeName
119
- roi_offset?: FlatRect
118
+ roi?: Rect | NodeName
119
+ roi_offset?: Rect
120
120
  labels?: string[]
121
121
  model?: string
122
122
  expected?: MaybeArray<number, Mode>
@@ -130,8 +130,8 @@ declare global {
130
130
 
131
131
  type RecognitionCustom<Mode> = RequiredIfStrict<
132
132
  {
133
- roi?: FlatRect | NodeName
134
- roi_offset?: FlatRect
133
+ roi?: Rect | NodeName
134
+ roi_offset?: Rect
135
135
  custom_recognition?: string
136
136
  custom_recognition_param?: unknown
137
137
  },
@@ -175,23 +175,23 @@ declare global {
175
175
  type ActionDoNothing = {}
176
176
 
177
177
  type ActionClick = {
178
- target?: true | NodeName | FlatRect
179
- target_offset?: FlatRect
178
+ target?: true | NodeName | Rect
179
+ target_offset?: Rect
180
180
  contact?: number
181
181
  }
182
182
 
183
183
  type ActionLongPress = {
184
- target?: true | NodeName | FlatRect
185
- target_offset?: FlatRect
184
+ target?: true | NodeName | Rect
185
+ target_offset?: Rect
186
186
  duration?: number
187
187
  contact?: number
188
188
  }
189
189
 
190
190
  type ActionSwipe = {
191
- begin?: true | NodeName | FlatRect
192
- begin_offset?: FlatRect
193
- end?: true | NodeName | FlatRect
194
- end_offset?: FlatRect
191
+ begin?: true | NodeName | Rect
192
+ begin_offset?: Rect
193
+ end?: true | NodeName | Rect
194
+ end_offset?: Rect
195
195
  duration?: number
196
196
  contact?: number
197
197
  }
@@ -200,10 +200,10 @@ declare global {
200
200
  {
201
201
  swipes?: {
202
202
  starting?: number
203
- begin?: true | NodeName | FlatRect
204
- begin_offset?: FlatRect
205
- end?: true | NodeName | FlatRect
206
- end_offset?: FlatRect
203
+ begin?: true | NodeName | Rect
204
+ begin_offset?: Rect
205
+ end?: true | NodeName | Rect
206
+ end_offset?: Rect
207
207
  duration?: number
208
208
  contact?: number
209
209
  }[]
@@ -215,8 +215,8 @@ declare global {
215
215
  type ActionTouch<Mode> = RequiredIfStrict<
216
216
  {
217
217
  contact?: number
218
- target?: true | NodeName | FlatRect
219
- target_offset?: FlatRect
218
+ target?: true | NodeName | Rect
219
+ target_offset?: Rect
220
220
  pressure?: number
221
221
  },
222
222
  never,
@@ -294,8 +294,8 @@ declare global {
294
294
 
295
295
  type ActionCustom<Mode> = RequiredIfStrict<
296
296
  {
297
- target?: true | NodeName | FlatRect
298
- target_offset?: FlatRect
297
+ target?: true | NodeName | Rect
298
+ target_offset?: Rect
299
299
  custom_action?: string
300
300
  custom_action_param?: unknown
301
301
  },
@@ -349,8 +349,8 @@ declare global {
349
349
 
350
350
  type WaitFreeze = {
351
351
  time?: number
352
- target?: true | NodeName | FlatRect
353
- target_offset?: FlatRect
352
+ target?: true | NodeName | Rect
353
+ target_offset?: Rect
354
354
  threshold?: number
355
355
  method?: 1 | 3 | 5
356
356
  rate_limit?: number
package/dist/resource.d.ts CHANGED
@@ -1,10 +1,7 @@
1
1
  declare global {
2
2
  namespace maa {
3
3
  type ResourceNotify = {
4
- msg:
5
- | 'Resource.Loading.Starting'
6
- | 'Resource.Loading.Succeeded'
7
- | 'Resource.Loading.Failed'
4
+ msg: NotifyMessage<'Loading'>
8
5
  res_id: number // ResId
9
6
  path: string
10
7
  hash: string
package/dist/tasker.d.ts CHANGED
@@ -14,7 +14,7 @@ declare global {
14
14
  }
15
15
 
16
16
  type RecoDetailEntry = {
17
- box: maa.FlatRect
17
+ box: Rect
18
18
  score?: number // TemplateMatch
19
19
  count?: number // FeatureMatch | ColorMatch
20
20
  text?: string // OCR
@@ -53,36 +53,68 @@ declare global {
53
53
  }
54
54
 
55
55
  type TaskerNotify = {
56
- msg: 'Task.Started' | 'Task.Completed' | 'Task.Failed'
56
+ msg: NotifyMessage<'Task'>
57
57
  task_id: number // TaskId
58
58
  entry: string
59
59
  uuid: string
60
60
  hash: string
61
61
  }
62
62
 
63
+ type TaskerContextPipelineNodeNotify = {
64
+ msg: NotifyMessage<'PipelineNode'>
65
+ task_id: number // TaskId
66
+ node_id: number // NodeId
67
+ name: string
68
+ focus: unknown
69
+ }
70
+
71
+ type TaskerContextRecognitionNodeNotify = {
72
+ msg: NotifyMessage<'RecognitionNode'>
73
+ task_id: number // TaskId
74
+ node_id: number // NodeId
75
+ name: string
76
+ focus: unknown
77
+ }
78
+
79
+ type TaskerContextActionNodeNotify = {
80
+ msg: NotifyMessage<'ActionNode'>
81
+ task_id: number // TaskId
82
+ node_id: number // NodeId
83
+ name: string
84
+ focus: unknown
85
+ }
86
+
87
+ type TaskerContextNextListNotify = {
88
+ msg: NotifyMessage<'NextList'>
89
+ task_id: number // TaskId
90
+ name: string
91
+ list: string[]
92
+ focus: unknown
93
+ }
94
+
95
+ type TaskerContextRecognitionNotify = {
96
+ msg: NotifyMessage<'Recognition'>
97
+ task_id: number // TaskId
98
+ reco_id: number // RecoId
99
+ name: string
100
+ focus: unknown
101
+ }
102
+
103
+ type TaskerContextActionNotify = {
104
+ msg: NotifyMessage<'Action'>
105
+ task_id: number // TaskId
106
+ action_id: number // ActId
107
+ name: string
108
+ focus: unknown
109
+ }
110
+
63
111
  type TaskerContextNotify =
64
- | {
65
- msg: 'NextList.Starting' | 'NextList.Succeeded' | 'NextList.Failed'
66
- task_id: number // TaskId
67
- name: string
68
- list: string[]
69
- focus: unknown
70
- }
71
- | {
72
- msg: 'Recognition.Starting' | 'Recognition.Succeeded' | 'Recognition.Failed'
73
- task_id: number // TaskId
74
- reco_id: number // RecoId
75
- name: string
76
- focus: unknown
77
- }
78
- | {
79
- msg: 'Action.Starting' | 'Action.Succeeded' | 'Action.Failed'
80
- task_id: number // TaskId
81
- node_id: number // NodeId
82
- action_id: number // ActId
83
- name: string
84
- focus: unknown
85
- }
112
+ | TaskerContextPipelineNodeNotify
113
+ | TaskerContextRecognitionNodeNotify
114
+ | TaskerContextActionNodeNotify
115
+ | TaskerContextNextListNotify
116
+ | TaskerContextRecognitionNotify
117
+ | TaskerContextActionNotify
86
118
 
87
119
  class TaskJob extends Job<TaskId, Tasker, TaskDetail> {}
88
120
 
package/dist/types.d.ts CHANGED
@@ -18,18 +18,16 @@ declare global {
18
18
 
19
19
  type ImageData = ArrayBuffer
20
20
 
21
- type Rect = {
22
- x: number
23
- y: number
24
- width: number
25
- height: number
26
- }
27
-
28
21
  type Point = [x: number, y: number]
29
- type FlatRect = [x: number, y: number, width: number, height: number]
22
+ type Rect = [x: number, y: number, width: number, height: number]
30
23
 
31
24
  type MaybePromise<T> = T | Promise<T>
32
25
 
26
+ type NotifyMessage<Category extends string> =
27
+ | `${Category}.Starting`
28
+ | `${Category}.Succeeded`
29
+ | `${Category}.Failed`
30
+
33
31
  interface CustomRecognitionSelf {
34
32
  context: Context
35
33
  id: TaskId
package/package.json CHANGED
@@ -28,13 +28,13 @@
28
28
  "prettier": "^3.5.2",
29
29
  "typescript": "^5.8.2"
30
30
  },
31
- "version": "5.0.2",
31
+ "version": "5.0.4",
32
32
  "optionalDependencies": {
33
- "@maaxyz/maa-node-darwin-arm64": "5.0.2",
34
- "@maaxyz/maa-node-darwin-x64": "5.0.2",
35
- "@maaxyz/maa-node-linux-arm64": "5.0.2",
36
- "@maaxyz/maa-node-linux-x64": "5.0.2",
37
- "@maaxyz/maa-node-win32-arm64": "5.0.2",
38
- "@maaxyz/maa-node-win32-x64": "5.0.2"
33
+ "@maaxyz/maa-node-darwin-arm64": "5.0.4",
34
+ "@maaxyz/maa-node-darwin-x64": "5.0.4",
35
+ "@maaxyz/maa-node-linux-arm64": "5.0.4",
36
+ "@maaxyz/maa-node-linux-x64": "5.0.4",
37
+ "@maaxyz/maa-node-win32-arm64": "5.0.4",
38
+ "@maaxyz/maa-node-win32-x64": "5.0.4"
39
39
  }
40
40
  }