@webda/async 4.0.0-beta.12 → 4.0.0-beta.14
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.
- package/README.md +14 -14
- package/lib/asyncaction.model.d.ts +15 -0
- package/lib/asyncaction.model.d.ts.map +1 -1
- package/lib/asyncaction.model.js +41 -3
- package/lib/asyncaction.model.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/services/asyncevents.service.d.ts +23 -2
- package/lib/services/asyncevents.service.d.ts.map +1 -1
- package/lib/services/asyncevents.service.js +12 -0
- package/lib/services/asyncevents.service.js.map +1 -1
- package/lib/services/asyncjobservice.service.d.ts +18 -0
- package/lib/services/asyncjobservice.service.d.ts.map +1 -1
- package/lib/services/asyncjobservice.service.js +36 -9
- package/lib/services/asyncjobservice.service.js.map +1 -1
- package/lib/services/localrunner.service.d.ts +7 -0
- package/lib/services/localrunner.service.d.ts.map +1 -1
- package/lib/services/localrunner.service.js +2 -1
- package/lib/services/localrunner.service.js.map +1 -1
- package/lib/services/runner.service.d.ts +18 -0
- package/lib/services/runner.service.d.ts.map +1 -1
- package/lib/services/runner.service.js.map +1 -1
- package/lib/services/servicerunner.service.d.ts +7 -1
- package/lib/services/servicerunner.service.d.ts.map +1 -1
- package/lib/services/servicerunner.service.js +8 -9
- package/lib/services/servicerunner.service.js.map +1 -1
- package/package.json +17 -17
- package/webda.module.json +33 -1
package/README.md
CHANGED
|
@@ -50,18 +50,18 @@ pnpm add @webda/async
|
|
|
50
50
|
}
|
|
51
51
|
```
|
|
52
52
|
|
|
53
|
-
| Parameter
|
|
54
|
-
|
|
55
|
-
| `queue`
|
|
56
|
-
| `url`
|
|
57
|
-
| `runners`
|
|
58
|
-
| `localLaunch`
|
|
59
|
-
| `fallbackOnFirst`
|
|
60
|
-
| `concurrencyLimit`
|
|
61
|
-
| `includeCron`
|
|
62
|
-
| `logsLimit`
|
|
63
|
-
| `asyncOperationDefinition` | string
|
|
64
|
-
| `schedulerResolution`
|
|
53
|
+
| Parameter | Type | Default | Required | Description |
|
|
54
|
+
| -------------------------- | -------- | --------------------- | -------- | ---------------------------------------------------------------------------- |
|
|
55
|
+
| `queue` | string | `"AsyncActionsQueue"` | Yes | Name of the Queue service to dispatch jobs through |
|
|
56
|
+
| `url` | string | `"/async"` | No | URL prefix for the status hook endpoint |
|
|
57
|
+
| `runners` | string[] | `[]` | Yes | List of Runner service names to execute jobs |
|
|
58
|
+
| `localLaunch` | boolean | `false` | No | Execute jobs inline (no queue) — useful for development |
|
|
59
|
+
| `fallbackOnFirst` | boolean | `false` | No | Use first runner if no runner matches the job type |
|
|
60
|
+
| `concurrencyLimit` | number | — | No | Maximum number of jobs running concurrently |
|
|
61
|
+
| `includeCron` | boolean | `true` | No | Launch `@Cron` operations as async operation actions, on the cluster leader |
|
|
62
|
+
| `logsLimit` | number | `500` | No | Max log lines retained per job in the store |
|
|
63
|
+
| `asyncOperationDefinition` | string | — | No | Path to a JSON file of operation definitions generated by `webda operations` |
|
|
64
|
+
| `schedulerResolution` | number | `60000` | No | Scheduler tick interval in milliseconds |
|
|
65
65
|
|
|
66
66
|
## Usage
|
|
67
67
|
|
|
@@ -78,8 +78,8 @@ export class ReportService extends Service {
|
|
|
78
78
|
// Expose an HTTP endpoint that queues a job and returns immediately
|
|
79
79
|
async generateReport(ctx: any): Promise<void> {
|
|
80
80
|
const action = await this.asyncJobService.launchAsAsyncAction(
|
|
81
|
-
"ReportService",
|
|
82
|
-
"runReport",
|
|
81
|
+
"ReportService", // service name
|
|
82
|
+
"runReport", // method name
|
|
83
83
|
ctx.getParameters().reportId
|
|
84
84
|
);
|
|
85
85
|
ctx.write({ jobId: action.getUuid(), status: action.status });
|
|
@@ -161,6 +161,7 @@ export declare class AsyncWebdaAction extends AsyncAction {
|
|
|
161
161
|
*/
|
|
162
162
|
method?: string;
|
|
163
163
|
/**
|
|
164
|
+
* Create a new AsyncWebdaAction instance
|
|
164
165
|
* @param serviceName service to call or initial data
|
|
165
166
|
* @param method method to call
|
|
166
167
|
* @param args to call with the method
|
|
@@ -192,6 +193,13 @@ export declare class AsyncOperationAction extends AsyncAction {
|
|
|
192
193
|
*/
|
|
193
194
|
logLevel: WorkerLogLevel;
|
|
194
195
|
/**
|
|
196
|
+
* The operation is called as the system (`useSystem`), a cron for example
|
|
197
|
+
*
|
|
198
|
+
* The context is stored as data: the runner rebuilds a system context from this flag
|
|
199
|
+
*/
|
|
200
|
+
system?: boolean;
|
|
201
|
+
/**
|
|
202
|
+
* Create a new AsyncOperationAction instance
|
|
195
203
|
* @param operationId operation to call or initial data
|
|
196
204
|
* @param context context to use
|
|
197
205
|
* @param logLevel log level to capture
|
|
@@ -203,5 +211,12 @@ export declare class AsyncOperationAction extends AsyncAction {
|
|
|
203
211
|
*/
|
|
204
212
|
isInternal(): boolean;
|
|
205
213
|
}
|
|
214
|
+
/**
|
|
215
|
+
* Rebuild the operation context of an AsyncOperationAction loaded from a store or received from a status hook
|
|
216
|
+
* @param context - the stored context, an OperationContext when the action never left the process
|
|
217
|
+
* @param system - the action runs as the system (see {@link AsyncOperationAction.system})
|
|
218
|
+
* @returns an operation context
|
|
219
|
+
*/
|
|
220
|
+
export declare function getActionOperationContext(context: any, system?: boolean): OperationContext;
|
|
206
221
|
export { AsyncAction };
|
|
207
222
|
//# sourceMappingURL=asyncaction.model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncaction.model.d.ts","
|
|
1
|
+
{"version":3,"file":"asyncaction.model.d.ts","sources":["../src/asyncaction.model.ts"],"names":[],"mappings":"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"}
|
package/lib/asyncaction.model.js
CHANGED
|
@@ -32,7 +32,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
|
|
|
32
32
|
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
33
33
|
done = true;
|
|
34
34
|
};
|
|
35
|
-
import { Action, CoreModel, WebContext, WebdaError, useContext, useLog, useParameters, useRouter } from "@webda/core";
|
|
35
|
+
import { Action, CoreModel, GlobalOperationContext, OperationContext, Session, SimpleOperationContext, WebContext, WebdaError, useContext, useLog, useParameters, useRouter } from "@webda/core";
|
|
36
36
|
import * as crypto from "node:crypto";
|
|
37
37
|
/**
|
|
38
38
|
* Headers sent by a job runner to authenticate against the status hook
|
|
@@ -149,8 +149,21 @@ let AsyncAction = (() => {
|
|
|
149
149
|
async verifyJobRequest(context) {
|
|
150
150
|
const jobTime = context.getHttpContext().getUniqueHeader("X-Job-Time");
|
|
151
151
|
const jobHash = context.getHttpContext().getUniqueHeader("X-Job-Hash");
|
|
152
|
-
|
|
153
|
-
|
|
152
|
+
if (!jobTime || !jobHash || !this.__secretKey) {
|
|
153
|
+
useLog("TRACE", "Invalid Job HMAC");
|
|
154
|
+
throw new WebdaError.Forbidden("Invalid Job HMAC");
|
|
155
|
+
}
|
|
156
|
+
if (/^\d{10,15}$/.test(jobTime)) {
|
|
157
|
+
const ts = Number.parseInt(jobTime, 10);
|
|
158
|
+
if (Math.abs(Date.now() - ts) > 300000) {
|
|
159
|
+
useLog("TRACE", "Expired Job HMAC timestamp");
|
|
160
|
+
throw new WebdaError.Forbidden("Invalid Job HMAC");
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
const expected = Buffer.from(this.getHmac(jobTime), "utf8");
|
|
164
|
+
const provided = Buffer.from(jobHash, "utf8");
|
|
165
|
+
// Ensure hash mac is correct using constant-time comparison
|
|
166
|
+
if (expected.length !== provided.length || !crypto.timingSafeEqual(expected, provided)) {
|
|
154
167
|
useLog("TRACE", "Invalid Job HMAC");
|
|
155
168
|
throw new WebdaError.Forbidden("Invalid Job HMAC");
|
|
156
169
|
}
|
|
@@ -220,6 +233,7 @@ export default AsyncAction;
|
|
|
220
233
|
*/
|
|
221
234
|
export class AsyncWebdaAction extends AsyncAction {
|
|
222
235
|
/**
|
|
236
|
+
* Create a new AsyncWebdaAction instance
|
|
223
237
|
* @param serviceName service to call or initial data
|
|
224
238
|
* @param method method to call
|
|
225
239
|
* @param args to call with the method
|
|
@@ -249,6 +263,7 @@ export class AsyncWebdaAction extends AsyncAction {
|
|
|
249
263
|
*/
|
|
250
264
|
export class AsyncOperationAction extends AsyncAction {
|
|
251
265
|
/**
|
|
266
|
+
* Create a new AsyncOperationAction instance
|
|
252
267
|
* @param operationId operation to call or initial data
|
|
253
268
|
* @param context context to use
|
|
254
269
|
* @param logLevel log level to capture
|
|
@@ -259,6 +274,7 @@ export class AsyncOperationAction extends AsyncAction {
|
|
|
259
274
|
this.operationId = typeof operationId === "string" ? operationId : undefined;
|
|
260
275
|
this.context = context;
|
|
261
276
|
this.logLevel = logLevel;
|
|
277
|
+
this.system = context?.isGlobalContext?.() === true;
|
|
262
278
|
}
|
|
263
279
|
this.logLevel ?? (this.logLevel = "INFO");
|
|
264
280
|
}
|
|
@@ -270,5 +286,27 @@ export class AsyncOperationAction extends AsyncAction {
|
|
|
270
286
|
return true;
|
|
271
287
|
}
|
|
272
288
|
}
|
|
289
|
+
/**
|
|
290
|
+
* Rebuild the operation context of an AsyncOperationAction loaded from a store or received from a status hook
|
|
291
|
+
* @param context - the stored context, an OperationContext when the action never left the process
|
|
292
|
+
* @param system - the action runs as the system (see {@link AsyncOperationAction.system})
|
|
293
|
+
* @returns an operation context
|
|
294
|
+
*/
|
|
295
|
+
export function getActionOperationContext(context, system = false) {
|
|
296
|
+
if (context instanceof OperationContext) {
|
|
297
|
+
return context;
|
|
298
|
+
}
|
|
299
|
+
const input = context?.input;
|
|
300
|
+
// A stored system action (a cron) runs as the system again
|
|
301
|
+
const ctx = system ? new GlobalOperationContext() : new SimpleOperationContext();
|
|
302
|
+
if (!system) {
|
|
303
|
+
const session = new Session();
|
|
304
|
+
if (context?.session && typeof context.session === "object") {
|
|
305
|
+
Object.assign(session, context.session);
|
|
306
|
+
}
|
|
307
|
+
ctx.setSession(session);
|
|
308
|
+
}
|
|
309
|
+
return ctx.setInput(Buffer.isBuffer(input) ? input : input?.type === "Buffer" ? Buffer.from(input.data) : Buffer.from("{}"));
|
|
310
|
+
}
|
|
273
311
|
export { AsyncAction };
|
|
274
312
|
//# sourceMappingURL=asyncaction.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncaction.model.js","
|
|
1
|
+
{"version":3,"file":"asyncaction.model.js","sources":["../src/asyncaction.model.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,wBAAwB,CAAC;AACvC,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,qCAAqC,CAAC;AACpD,cAAc,mCAAmC,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import { registerWebdaPackage } from "@webda/utils";
|
|
1
2
|
export * from "./asyncaction.model.js";
|
|
2
3
|
export * from "./services/asyncjobservice.service.js";
|
|
3
4
|
export * from "./services/runner.service.js";
|
|
4
5
|
export * from "./services/localrunner.service.js";
|
|
5
6
|
export * from "./services/servicerunner.service.js";
|
|
6
7
|
export * from "./services/asyncevents.service.js";
|
|
8
|
+
// Refuse a second copy of the package, see registerWebdaPackage
|
|
9
|
+
registerWebdaPackage("@webda/async", import.meta.url);
|
|
7
10
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,cAAc,wBAAwB,CAAC;AACvC,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,qCAAqC,CAAC;AACpD,cAAc,mCAAmC,CAAC;AAElD,gEAAgE;AAChE,oBAAoB,CAAC,cAAc,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC"}
|
|
@@ -25,6 +25,7 @@ export declare class AsyncEvent {
|
|
|
25
25
|
*/
|
|
26
26
|
static ServiceTag: string;
|
|
27
27
|
/**
|
|
28
|
+
* Create a new AsyncEvent instance
|
|
28
29
|
* @param service - the emitter: a service, a model class or its serialized name
|
|
29
30
|
* @param type - the event type
|
|
30
31
|
* @param payload - the event payload
|
|
@@ -60,20 +61,27 @@ interface QueueMap {
|
|
|
60
61
|
[key: string]: Queue;
|
|
61
62
|
}
|
|
62
63
|
/**
|
|
64
|
+
* Configuration parameters for EventService
|
|
63
65
|
* @inheritdoc
|
|
64
66
|
*/
|
|
65
67
|
export declare class EventServiceParameters extends ServiceParameters {
|
|
66
68
|
/**
|
|
67
69
|
* Queues to post async events to
|
|
68
70
|
*/
|
|
69
|
-
/**
|
|
71
|
+
/**
|
|
72
|
+
* Queues
|
|
73
|
+
* @default {}
|
|
74
|
+
*/
|
|
70
75
|
queues: {
|
|
71
76
|
[key: string]: string;
|
|
72
77
|
};
|
|
73
78
|
/**
|
|
74
79
|
* Make the event sending asynchronous
|
|
75
80
|
*/
|
|
76
|
-
/**
|
|
81
|
+
/**
|
|
82
|
+
* Whether sync is enabled
|
|
83
|
+
* @default false
|
|
84
|
+
*/
|
|
77
85
|
sync: boolean;
|
|
78
86
|
/**
|
|
79
87
|
* @override
|
|
@@ -83,13 +91,26 @@ export declare class EventServiceParameters extends ServiceParameters {
|
|
|
83
91
|
load(params?: any): this;
|
|
84
92
|
}
|
|
85
93
|
/**
|
|
94
|
+
* Event service implementation
|
|
86
95
|
* @category CoreServices
|
|
87
96
|
* @WebdaModda AsyncEvents
|
|
88
97
|
*/
|
|
89
98
|
declare class EventService<T extends EventServiceParameters = EventServiceParameters> extends Service<T> {
|
|
99
|
+
/**
|
|
100
|
+
* Callbacks
|
|
101
|
+
*/
|
|
90
102
|
_callbacks: Record<string, Array<(payload: any, event: AsyncEvent) => unknown>>;
|
|
103
|
+
/**
|
|
104
|
+
* Queues
|
|
105
|
+
*/
|
|
91
106
|
_queues: QueueMap;
|
|
107
|
+
/**
|
|
108
|
+
* Default queue
|
|
109
|
+
*/
|
|
92
110
|
_defaultQueue: string;
|
|
111
|
+
/**
|
|
112
|
+
* Whether async is enabled
|
|
113
|
+
*/
|
|
93
114
|
_async: boolean;
|
|
94
115
|
/**
|
|
95
116
|
* Resolve the queues
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncevents.service.d.ts","
|
|
1
|
+
{"version":3,"file":"asyncevents.service.d.ts","sources":["../../src/services/asyncevents.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAoC,MAAM,aAAa,CAAC;AAClG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C;;GAEG;AACH,qBAAa,UAAU;IACrB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;OAEG;IACH,MAAM,CAAC,UAAU,SAAqB;IAEtC;;;;;OAKG;IACH,YAAY,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,GAAQ,EAWlF;IAED;;;;;;OAMG;IACH,MAAM;;MAYL;IAED;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,cAazB;IAED;;;OAGG;IACH,SAAS,WAER;CACF;AAED;;GAEG;AACH,UAAU,QAAQ;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;CACtB;AAED;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,iBAAiB;IAC3D;;OAEG;IACH;;;OAGG;IACH,MAAM,EAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC;;OAEG;IACH;;;OAGG;IACH,IAAI,EAAG,OAAO,CAAC;IAEf;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAK3B;CACF;AAED;;;;GAIG;AACH,cAAM,YAAY,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IAC9F;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,CAAC,CAAM;IACrF;;OAEG;IACH,OAAO,EAAE,QAAQ,CAAM;IACvB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAM;IAC3B;;OAEG;IACH,MAAM,EAAG,OAAO,CAAC;IAEjB;;;OAGG;IACH,OAAO,IAAI,IAAI,CAiBd;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,iBAAiB,CACf,OAAO,EAAE,OAAO,GAAG,UAAU,EAC7B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,KAAK,OAAO,EACtD,KAAK,CAAC,EAAE,MAAM,QAiBf;IAED;;;;;;;;OAQG;IACG,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,GAAG,iBAUnG;IAED;;;;;OAKG;IACH,UAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAY5D;IAED;;;;OAIG;IACH,UAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,iBAE/C;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,GAAE,MAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAIxD;CACF;AAED,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,YAAY,EAAE,QAAQ,EAAE,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { Service, ServiceParameters, useDynamicService, useRepository } from "@w
|
|
|
4
4
|
*/
|
|
5
5
|
export class AsyncEvent {
|
|
6
6
|
/**
|
|
7
|
+
* Create a new AsyncEvent instance
|
|
7
8
|
* @param service - the emitter: a service, a model class or its serialized name
|
|
8
9
|
* @param type - the event type
|
|
9
10
|
* @param payload - the event payload
|
|
@@ -71,6 +72,7 @@ export class AsyncEvent {
|
|
|
71
72
|
*/
|
|
72
73
|
AsyncEvent.ServiceTag = "#Webda:Service:";
|
|
73
74
|
/**
|
|
75
|
+
* Configuration parameters for EventService
|
|
74
76
|
* @inheritdoc
|
|
75
77
|
*/
|
|
76
78
|
export class EventServiceParameters extends ServiceParameters {
|
|
@@ -87,14 +89,24 @@ export class EventServiceParameters extends ServiceParameters {
|
|
|
87
89
|
}
|
|
88
90
|
}
|
|
89
91
|
/**
|
|
92
|
+
* Event service implementation
|
|
90
93
|
* @category CoreServices
|
|
91
94
|
* @WebdaModda AsyncEvents
|
|
92
95
|
*/
|
|
93
96
|
class EventService extends Service {
|
|
94
97
|
constructor() {
|
|
95
98
|
super(...arguments);
|
|
99
|
+
/**
|
|
100
|
+
* Callbacks
|
|
101
|
+
*/
|
|
96
102
|
this._callbacks = {};
|
|
103
|
+
/**
|
|
104
|
+
* Queues
|
|
105
|
+
*/
|
|
97
106
|
this._queues = {};
|
|
107
|
+
/**
|
|
108
|
+
* Default queue
|
|
109
|
+
*/
|
|
98
110
|
this._defaultQueue = "";
|
|
99
111
|
}
|
|
100
112
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncevents.service.js","
|
|
1
|
+
{"version":3,"file":"asyncevents.service.js","sources":["../../src/services/asyncevents.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,25 @@ import { Runner } from "./runner.service.js";
|
|
|
10
10
|
* Represent a Job information as you will find in env
|
|
11
11
|
*/
|
|
12
12
|
export interface JobInfo {
|
|
13
|
+
/**
|
|
14
|
+
* Job ID
|
|
15
|
+
*/
|
|
13
16
|
JOB_ID: string;
|
|
17
|
+
/**
|
|
18
|
+
* Job secret key
|
|
19
|
+
*/
|
|
14
20
|
JOB_SECRET_KEY: string;
|
|
21
|
+
/**
|
|
22
|
+
* Job hook
|
|
23
|
+
*/
|
|
15
24
|
JOB_HOOK: string;
|
|
25
|
+
/**
|
|
26
|
+
* Job orchestrator
|
|
27
|
+
*/
|
|
16
28
|
JOB_ORCHESTRATOR: string;
|
|
17
29
|
}
|
|
18
30
|
/**
|
|
31
|
+
* Configuration parameters for AsyncJobService
|
|
19
32
|
* @inheritdoc
|
|
20
33
|
*/
|
|
21
34
|
export declare class AsyncJobServiceParameters extends ServiceParameters {
|
|
@@ -160,6 +173,7 @@ export default class AsyncJobService<T extends AsyncJobServiceParameters = Async
|
|
|
160
173
|
[key: string]: WebdaQL.QueryValidator;
|
|
161
174
|
};
|
|
162
175
|
/**
|
|
176
|
+
* Resolve operation
|
|
163
177
|
* @inheritdoc
|
|
164
178
|
* @returns this
|
|
165
179
|
*/
|
|
@@ -294,12 +308,16 @@ export default class AsyncJobService<T extends AsyncJobServiceParameters = Async
|
|
|
294
308
|
runAsyncOperationAction(jobInfo?: JobInfo): Promise<void>;
|
|
295
309
|
/**
|
|
296
310
|
* Get the cron callback function
|
|
311
|
+
*
|
|
312
|
+
* Each tick launches the cron operation as an AsyncOperationAction, called as the system with the cron input
|
|
297
313
|
* @param cron - the cron definition
|
|
298
314
|
* @returns the cron callback
|
|
299
315
|
*/
|
|
300
316
|
getCronExecutor(cron: CronDefinition): () => Promise<void>;
|
|
301
317
|
/**
|
|
302
318
|
* Manage scheduled actions and crontab actions
|
|
319
|
+
*
|
|
320
|
+
* The crons are scheduled on the cluster leader only: each tick launches one action across the replicas
|
|
303
321
|
* @returns a cancelable loop promise
|
|
304
322
|
*/
|
|
305
323
|
scheduler(): CancelableLoopPromise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncjobservice.service.d.ts","
|
|
1
|
+
{"version":3,"file":"asyncjobservice.service.d.ts","sources":["../../src/services/asyncjobservice.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,14 +32,16 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
|
|
|
32
32
|
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
33
33
|
done = true;
|
|
34
34
|
};
|
|
35
|
-
import { canCallOperation, Command, CronService, listFullOperations, registerOperation, registerSchema, Service, ServiceParameters, SimpleOperationContext, useApplication, useCore, useDynamicService, useModel, useParameters, validateSchema, ValidationError, WebdaError } from "@webda/core";
|
|
35
|
+
import { callOperation, canCallOperation, Command, isOperationEnabled, CronService, listFullOperations, registerOperation, registerSchema, Service, ServiceParameters, SimpleOperationContext, useApplication, useCore, useDynamicService, useModel, useParameters, useSystem, validateSchema, ValidationError, WebdaError, whenLeader } from "@webda/core";
|
|
36
36
|
import { CancelableLoopPromise, CancelablePromise, FileUtils, getUuid, JSONUtils, sleep } from "@webda/utils";
|
|
37
37
|
import axios from "axios";
|
|
38
38
|
import * as crypto from "node:crypto";
|
|
39
39
|
import { schedule as crontabSchedule } from "node-cron";
|
|
40
|
+
import { getActionOperationContext } from "../asyncaction.model.js";
|
|
40
41
|
import { Runner } from "./runner.service.js";
|
|
41
42
|
import { ServiceRunner, ServiceRunnerParameters } from "./servicerunner.service.js";
|
|
42
43
|
/**
|
|
44
|
+
* Configuration parameters for AsyncJobService
|
|
43
45
|
* @inheritdoc
|
|
44
46
|
*/
|
|
45
47
|
export class AsyncJobServiceParameters extends ServiceParameters {
|
|
@@ -82,6 +84,7 @@ let AsyncJobService = (() => {
|
|
|
82
84
|
this.operationsQueries = {};
|
|
83
85
|
}
|
|
84
86
|
/**
|
|
87
|
+
* Resolve operation
|
|
85
88
|
* @inheritdoc
|
|
86
89
|
* @returns this
|
|
87
90
|
*/
|
|
@@ -319,6 +322,10 @@ let AsyncJobService = (() => {
|
|
|
319
322
|
if (!operation) {
|
|
320
323
|
throw new WebdaError.NotFound(`${operationId} Unknown`);
|
|
321
324
|
}
|
|
325
|
+
// A disabled operation cannot be told apart from an unknown one
|
|
326
|
+
if (!(await isOperationEnabled(context, operationId, operation))) {
|
|
327
|
+
throw new WebdaError.NotFound(`${operationId} Unknown`);
|
|
328
|
+
}
|
|
322
329
|
// Probe first so a forbidden operation answers Forbidden before any input validation
|
|
323
330
|
if (!(await canCallOperation(context, operationId))) {
|
|
324
331
|
throw new WebdaError.Forbidden(`${operationId} PermissionDenied`);
|
|
@@ -501,9 +508,17 @@ let AsyncJobService = (() => {
|
|
|
501
508
|
},
|
|
502
509
|
status: "RUNNING"
|
|
503
510
|
}));
|
|
504
|
-
this.log("DEBUG", "Action received", action.serviceName, action.method, action.arguments);
|
|
511
|
+
this.log("DEBUG", "Action received", action.operationId ?? action.serviceName, action.method, action.arguments);
|
|
505
512
|
let results;
|
|
506
513
|
try {
|
|
514
|
+
if (action.operationId) {
|
|
515
|
+
// AsyncOperationAction: call the operation, as the system when a cron launched it
|
|
516
|
+
const context = getActionOperationContext(action.context, action.system);
|
|
517
|
+
await callOperation(context, action.operationId);
|
|
518
|
+
results = context.getOutput();
|
|
519
|
+
await this.postHook(jobInfo, { results, status: "SUCCESS" });
|
|
520
|
+
return;
|
|
521
|
+
}
|
|
507
522
|
// Check it contains the right info
|
|
508
523
|
if (!action.method || !action.serviceName) {
|
|
509
524
|
throw new Error("WebdaAsyncAction must have method and serviceName defined at least");
|
|
@@ -536,31 +551,43 @@ let AsyncJobService = (() => {
|
|
|
536
551
|
}
|
|
537
552
|
/**
|
|
538
553
|
* Get the cron callback function
|
|
554
|
+
*
|
|
555
|
+
* Each tick launches the cron operation as an AsyncOperationAction, called as the system with the cron input
|
|
539
556
|
* @param cron - the cron definition
|
|
540
557
|
* @returns the cron callback
|
|
541
558
|
*/
|
|
542
559
|
getCronExecutor(cron) {
|
|
543
560
|
return async () => {
|
|
544
561
|
try {
|
|
545
|
-
this.log("INFO", `Execute cron ${cron.
|
|
546
|
-
|
|
562
|
+
this.log("INFO", `Execute cron ${cron.toString()} as an AsyncOperationAction`);
|
|
563
|
+
const model = this.operationModel ?? useModel(this.parameters.asyncOperationModel);
|
|
564
|
+
await this.launchAction(new model(cron.operationId, useSystem(cron.input)));
|
|
547
565
|
}
|
|
548
566
|
catch (err) {
|
|
549
|
-
this.log("ERROR", `Execution error cron ${cron.
|
|
567
|
+
this.log("ERROR", `Execution error cron ${cron.toString()} - ${err}`);
|
|
550
568
|
}
|
|
551
569
|
};
|
|
552
570
|
}
|
|
553
571
|
/**
|
|
554
572
|
* Manage scheduled actions and crontab actions
|
|
573
|
+
*
|
|
574
|
+
* The crons are scheduled on the cluster leader only: each tick launches one action across the replicas
|
|
555
575
|
* @returns a cancelable loop promise
|
|
556
576
|
*/
|
|
557
577
|
scheduler() {
|
|
558
578
|
// Map cron to an AsyncOperationAction
|
|
559
579
|
// It allows you to keep a trace of the cron execution in the AsyncAction
|
|
580
|
+
let unregister;
|
|
560
581
|
if (this.parameters.includeCron) {
|
|
561
|
-
CronService.
|
|
562
|
-
|
|
563
|
-
|
|
582
|
+
const crons = CronService.resolveCrons();
|
|
583
|
+
const tasks = [];
|
|
584
|
+
unregister = whenLeader(() => {
|
|
585
|
+
crons.forEach(cron => {
|
|
586
|
+
this.log("INFO", `Schedule cron ${cron.toString()}`);
|
|
587
|
+
tasks.push(crontabSchedule(cron.cron, this.getCronExecutor(cron)));
|
|
588
|
+
});
|
|
589
|
+
}, () => {
|
|
590
|
+
tasks.splice(0).forEach(task => task.stop());
|
|
564
591
|
});
|
|
565
592
|
}
|
|
566
593
|
// Every schedulerResolution will check for scheduled task
|
|
@@ -575,7 +602,7 @@ let AsyncJobService = (() => {
|
|
|
575
602
|
await sleep(time - Date.now());
|
|
576
603
|
/* c8 ignore next */
|
|
577
604
|
}
|
|
578
|
-
});
|
|
605
|
+
}, async () => unregister?.());
|
|
579
606
|
}
|
|
580
607
|
},
|
|
581
608
|
(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncjobservice.service.js","sourceRoot":"","sources":["../../src/services/asyncjobservice.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"asyncjobservice.service.js","sources":["../../src/services/asyncjobservice.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,13 @@ export declare class LocalRunnerParameters extends RunnerParameters {
|
|
|
35
35
|
* Type of action returned by LocalRunner
|
|
36
36
|
*/
|
|
37
37
|
export interface ProcessAction {
|
|
38
|
+
/**
|
|
39
|
+
* Agent
|
|
40
|
+
*/
|
|
38
41
|
agent: AgentInfo;
|
|
42
|
+
/**
|
|
43
|
+
* PID
|
|
44
|
+
*/
|
|
39
45
|
pid: number;
|
|
40
46
|
}
|
|
41
47
|
/**
|
|
@@ -53,6 +59,7 @@ export default class LocalRunner<T extends LocalRunnerParameters = LocalRunnerPa
|
|
|
53
59
|
*/
|
|
54
60
|
spawn(command: string, args: string[], options?: SpawnOptions): ChildProcess;
|
|
55
61
|
/**
|
|
62
|
+
* Return the process information
|
|
56
63
|
* @inheritdoc
|
|
57
64
|
* @param action - the action to launch
|
|
58
65
|
* @param info - the job information
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localrunner.service.d.ts","
|
|
1
|
+
{"version":3,"file":"localrunner.service.d.ts","sources":["../../src/services/localrunner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE1E;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACzD;;OAEG;IACH,OAAO,EAAG,MAAM,CAAC;IACjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB;;;;OAIG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAK3B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IACjB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IACzG;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,YAAY,CAG3E;IAED;;;;;;OAMG;IACG,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAkD7E;CACF;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}
|
|
@@ -35,6 +35,7 @@ export default class LocalRunner extends Runner {
|
|
|
35
35
|
return spawn(command, args, options ?? {});
|
|
36
36
|
}
|
|
37
37
|
/**
|
|
38
|
+
* Return the process information
|
|
38
39
|
* @inheritdoc
|
|
39
40
|
* @param action - the action to launch
|
|
40
41
|
* @param info - the job information
|
|
@@ -46,7 +47,7 @@ export default class LocalRunner extends Runner {
|
|
|
46
47
|
...info
|
|
47
48
|
};
|
|
48
49
|
this.log("INFO", "Job", action.uuid, "started with", Object.keys(envs)
|
|
49
|
-
.map(k => `${k}=${envs[k]}`)
|
|
50
|
+
.map(k => `${k}=${k === "JOB_SECRET_KEY" ? "***" : envs[k]}`)
|
|
50
51
|
.join(" "), this.parameters.command, this.parameters.args ? this.parameters.args.map(a => `'${a}'`).join(" ") : "");
|
|
51
52
|
const child = this.spawn(this.parameters.command, this.parameters.args || [], {
|
|
52
53
|
...this.parameters.options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localrunner.service.js","
|
|
1
|
+
{"version":3,"file":"localrunner.service.js","sources":["../../src/services/localrunner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAA8B,MAAM,oBAAoB,CAAC;AAGvE,OAAO,EAAa,MAAM,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE1E;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,gBAAgB;IAoBzD;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAQ,EAAE;;QACnB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,IAAI,CAAC,OAAO,KAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;QACpB,MAAA,IAAI,CAAC,OAAO,EAAC,GAAG,QAAH,GAAG,GAAK,EAAE,EAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAgBD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,WAAqE,SAAQ,MAAS;IACzG;;;;;;OAMG;IACH,KAAK,CAAC,OAAe,EAAE,IAAc,EAAE,OAAsB;QAC3D,sBAAsB;QACtB,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,IAAI,EAAE,CAAiB,CAAC;IAC7D,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,YAAY,CAAC,MAAmB,EAAE,IAAa;QACnD,MAAM,IAAI,GAA8B;YACtC,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG;YAC/B,GAAG,IAAI;SACR,CAAC;QACF,IAAI,CAAC,GAAG,CACN,MAAM,EACN,KAAK,EACL,MAAM,CAAC,IAAI,EACX,cAAc,EACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;aACd,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5D,IAAI,CAAC,GAAG,CAAC,EACZ,IAAI,CAAC,UAAU,CAAC,OAAO,EACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAC9E,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,EAAE;YAC5E,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO;YAC1B,GAAG,EAAE,IAAI;YACT,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,mCAAmC;QACnC,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,KAAK,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;YAC1C,4DAA4D;YAC5D,IAAI,IAAI,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;gBAC9B,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAChG,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;YACF,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjC,iEAAiE;YACjE,MAAM,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAC3D,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAmB,EAAE,EAAE;gBAC7C,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;oBAC3D,MAAM,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC3D,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;oBACnD,MAAM,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE;YAC5B,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;SACtB,CAAC;IACJ,CAAC;CACF;AAED,OAAO,EAAE,WAAW,EAAE,CAAC"}
|
|
@@ -21,16 +21,34 @@ export declare class RunnerParameters extends ServiceParameters {
|
|
|
21
21
|
* Agent Information
|
|
22
22
|
*/
|
|
23
23
|
export interface AgentInfo {
|
|
24
|
+
/**
|
|
25
|
+
* Hostname
|
|
26
|
+
*/
|
|
24
27
|
hostname: string;
|
|
28
|
+
/**
|
|
29
|
+
* Platform
|
|
30
|
+
*/
|
|
25
31
|
platform: string;
|
|
32
|
+
/**
|
|
33
|
+
* Release
|
|
34
|
+
*/
|
|
26
35
|
release: string;
|
|
36
|
+
/**
|
|
37
|
+
* Memory
|
|
38
|
+
*/
|
|
27
39
|
memory: number;
|
|
40
|
+
/**
|
|
41
|
+
* Type
|
|
42
|
+
*/
|
|
28
43
|
type: string;
|
|
29
44
|
}
|
|
30
45
|
/**
|
|
31
46
|
* Node Agent information
|
|
32
47
|
*/
|
|
33
48
|
export interface NodeAgentInfo extends AgentInfo {
|
|
49
|
+
/**
|
|
50
|
+
* Node version
|
|
51
|
+
*/
|
|
34
52
|
nodeVersion: string;
|
|
35
53
|
}
|
|
36
54
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.service.d.ts","
|
|
1
|
+
{"version":3,"file":"runner.service.d.ts","sources":["../../src/services/runner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE5D;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,iBAAiB;IACrD;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAI3B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,SAAS;IAC9C;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,8BAAsB,MAAM,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IAC5F;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEhC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,IAAI,SAAS,CAQ/B;IACD;;;;OAIG;IACH,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACzE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.service.js","
|
|
1
|
+
{"version":3,"file":"runner.service.js","sources":["../../src/services/runner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAI9B;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;IAOrD;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAQ,EAAE;QACnB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,IAAI,CAAC,OAAO,KAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAsCD;;GAEG;AACH,MAAM,OAAgB,MAAsD,SAAQ,OAAU;IAC5F;;;;OAIG;IACH,UAAU,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY;QACjB,OAAO;YACL,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;YACvB,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;YACvB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;YACrB,MAAM,EAAE,EAAE,CAAC,QAAQ,EAAE;YACrB,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE;SAChB,CAAC;IACJ,CAAC;CAOF"}
|
|
@@ -33,8 +33,12 @@ export declare class ActionMemoryLogger extends MemoryLogger {
|
|
|
33
33
|
protected action: ActionLogTarget;
|
|
34
34
|
logSaveDelay: number;
|
|
35
35
|
format?: string | undefined;
|
|
36
|
+
/**
|
|
37
|
+
* Timeout
|
|
38
|
+
*/
|
|
36
39
|
protected timeout?: NodeJS.Timeout;
|
|
37
40
|
/**
|
|
41
|
+
* Create a new ActionMemoryLogger instance
|
|
38
42
|
* @param output - the worker output to listen to
|
|
39
43
|
* @param level - the log level
|
|
40
44
|
* @param limit - the maximum number of logs
|
|
@@ -90,10 +94,12 @@ export default class ServiceRunner<T extends ServiceRunnerParameters = ServiceRu
|
|
|
90
94
|
/**
|
|
91
95
|
* Rebuild an operation context if the action was loaded from a store
|
|
92
96
|
* @param context - the stored context
|
|
97
|
+
* @param system - the action runs as the system
|
|
93
98
|
* @returns an operation context
|
|
94
99
|
*/
|
|
95
|
-
protected getOperationContext(context: any): OperationContext;
|
|
100
|
+
protected getOperationContext(context: any, system?: boolean): OperationContext;
|
|
96
101
|
/**
|
|
102
|
+
* Return the service action
|
|
97
103
|
* @inheritdoc
|
|
98
104
|
* @param action - the action to launch
|
|
99
105
|
* @param info - the job information
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"servicerunner.service.d.ts","
|
|
1
|
+
{"version":3,"file":"servicerunner.service.d.ts","sources":["../../src/services/servicerunner.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,gBAAgB,EAAqC,MAAM,aAAa,CAAC;AACjG,OAAO,EAEL,YAAY,EAEZ,cAAc,EACd,aAAa,EACb,YAAY,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAmB,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,KAAK,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC;AAEhF;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;IAmBhD,SAAS,CAAC,MAAM,EAAE,eAAe;IAC1B,YAAY,EAAE,MAAM;IACpB,MAAM,CAAC,EAAE,MAAM;IApBxB;;OAEG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAEnC;;;;;;;;OAQG;IACH,YACE,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,MAAM,EACH,MAAM,EAAE,eAAe,EAC1B,YAAY,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,MAAM,YAAA,EAGvB;IAED;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,aAAa,QAK3B;IAED;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAM1B;IAED;;;OAGG;IACG,YAAY,kBAGjB;CACF;AAED;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,gBAAgB;IAC3D;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,YAAY,EAAG,MAAM,CAAC;IAEtB;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAI3B;CACF;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAC/G;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,GAAE,OAAe,GAAG,gBAAgB,CAErF;IAED;;;;;;OAMG;IACG,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAiD7E;CACF;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import { callOperation,
|
|
1
|
+
import { callOperation, useApplication, useDynamicService } from "@webda/core";
|
|
2
2
|
import { ConsoleLogger, MemoryLogger, useWorkerOutput } from "@webda/workout";
|
|
3
|
-
import { AsyncOperationAction, AsyncWebdaAction } from "../asyncaction.model.js";
|
|
3
|
+
import { AsyncOperationAction, AsyncWebdaAction, getActionOperationContext } from "../asyncaction.model.js";
|
|
4
4
|
import { Runner, RunnerParameters } from "./runner.service.js";
|
|
5
5
|
/**
|
|
6
6
|
* Keep log in memory and save it to the action object every 5s
|
|
7
7
|
*/
|
|
8
8
|
export class ActionMemoryLogger extends MemoryLogger {
|
|
9
9
|
/**
|
|
10
|
+
* Create a new ActionMemoryLogger instance
|
|
10
11
|
* @param output - the worker output to listen to
|
|
11
12
|
* @param level - the log level
|
|
12
13
|
* @param limit - the maximum number of logs
|
|
@@ -73,16 +74,14 @@ export default class ServiceRunner extends Runner {
|
|
|
73
74
|
/**
|
|
74
75
|
* Rebuild an operation context if the action was loaded from a store
|
|
75
76
|
* @param context - the stored context
|
|
77
|
+
* @param system - the action runs as the system
|
|
76
78
|
* @returns an operation context
|
|
77
79
|
*/
|
|
78
|
-
getOperationContext(context) {
|
|
79
|
-
|
|
80
|
-
return context;
|
|
81
|
-
}
|
|
82
|
-
const input = context?.input;
|
|
83
|
-
return new SimpleOperationContext().setInput(Buffer.isBuffer(input) ? input : input?.type === "Buffer" ? Buffer.from(input.data) : Buffer.from("{}"));
|
|
80
|
+
getOperationContext(context, system = false) {
|
|
81
|
+
return getActionOperationContext(context, system);
|
|
84
82
|
}
|
|
85
83
|
/**
|
|
84
|
+
* Return the service action
|
|
86
85
|
* @inheritdoc
|
|
87
86
|
* @param action - the action to launch
|
|
88
87
|
* @param info - the job information
|
|
@@ -112,7 +111,7 @@ export default class ServiceRunner extends Runner {
|
|
|
112
111
|
else {
|
|
113
112
|
if (!action.operationId)
|
|
114
113
|
throw new Error("Operation id is required");
|
|
115
|
-
await callOperation(this.getOperationContext(action.context), action.operationId);
|
|
114
|
+
await callOperation(this.getOperationContext(action.context, action.system), action.operationId);
|
|
116
115
|
}
|
|
117
116
|
await logger.saveAndClose();
|
|
118
117
|
await action.patch({ status: "SUCCESS" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"servicerunner.service.js","
|
|
1
|
+
{"version":3,"file":"servicerunner.service.js","sources":["../../src/services/servicerunner.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webda/async",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.14",
|
|
4
4
|
"description": "Async System",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"keywords": [
|
|
@@ -12,26 +12,26 @@
|
|
|
12
12
|
"package.json"
|
|
13
13
|
],
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"axios": "^1.
|
|
15
|
+
"axios": "^1.21.0",
|
|
16
16
|
"json-schema": "^0.4.0",
|
|
17
|
-
"node-cron": "^4.
|
|
18
|
-
"@webda/
|
|
19
|
-
"@webda/
|
|
20
|
-
"@webda/
|
|
21
|
-
"@webda/
|
|
17
|
+
"node-cron": "^4.6.0",
|
|
18
|
+
"@webda/core": "4.0.0-beta.14",
|
|
19
|
+
"@webda/ql": "4.0.0-beta.11",
|
|
20
|
+
"@webda/utils": "4.0.0-beta.13",
|
|
21
|
+
"@webda/workout": "4.0.0-beta.7"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@types/json-schema": "^7.0.15",
|
|
25
|
-
"@types/node": "
|
|
26
|
-
"@vitest/coverage-v8": "^
|
|
27
|
-
"jscodeshift": "^17.
|
|
28
|
-
"sinon": "^
|
|
29
|
-
"skott": "^0.35.
|
|
30
|
-
"typescript": "7.1.0-dev.
|
|
31
|
-
"vite": "^
|
|
32
|
-
"vitest": "^
|
|
33
|
-
"@webda/
|
|
34
|
-
"@webda/
|
|
25
|
+
"@types/node": "26.6.6",
|
|
26
|
+
"@vitest/coverage-v8": "^5.1.0",
|
|
27
|
+
"jscodeshift": "^17.4.0",
|
|
28
|
+
"sinon": "^22.1.0",
|
|
29
|
+
"skott": "^0.35.12",
|
|
30
|
+
"typescript": "7.1.0-dev.20261102.1",
|
|
31
|
+
"vite": "^7.3.7",
|
|
32
|
+
"vitest": "^5.1.0",
|
|
33
|
+
"@webda/compiler": "^4.0.0-beta.14",
|
|
34
|
+
"@webda/test": "4.0.0-beta.9"
|
|
35
35
|
},
|
|
36
36
|
"bugs": {
|
|
37
37
|
"url": "https://github.com/loopingz/webda.io/issues"
|
package/webda.module.json
CHANGED
|
@@ -14,17 +14,21 @@
|
|
|
14
14
|
"type": "string"
|
|
15
15
|
},
|
|
16
16
|
"default": {},
|
|
17
|
+
"description": "Queues",
|
|
17
18
|
"type": "object"
|
|
18
19
|
}
|
|
19
20
|
},
|
|
21
|
+
"description": "Configuration parameters for EventService",
|
|
20
22
|
"inheritdoc": true,
|
|
21
23
|
"properties": {
|
|
22
24
|
"queues": {
|
|
23
25
|
"$ref": "#/definitions/queues",
|
|
24
|
-
"default": {}
|
|
26
|
+
"default": {},
|
|
27
|
+
"description": "Queues"
|
|
25
28
|
},
|
|
26
29
|
"sync": {
|
|
27
30
|
"default": false,
|
|
31
|
+
"description": "Whether sync is enabled",
|
|
28
32
|
"type": "boolean"
|
|
29
33
|
},
|
|
30
34
|
"type": {
|
|
@@ -49,6 +53,7 @@
|
|
|
49
53
|
"Schema": {
|
|
50
54
|
"$schema": "http://json-schema.org/draft-07/schema#",
|
|
51
55
|
"additionalProperties": false,
|
|
56
|
+
"description": "Configuration parameters for AsyncJobService",
|
|
52
57
|
"inheritdoc": true,
|
|
53
58
|
"properties": {
|
|
54
59
|
"asyncActionModel": {
|
|
@@ -884,6 +889,9 @@
|
|
|
884
889
|
},
|
|
885
890
|
"Actions": {
|
|
886
891
|
"status": {
|
|
892
|
+
"openapi": {
|
|
893
|
+
"hidden": true
|
|
894
|
+
},
|
|
887
895
|
"handler": "statusAction"
|
|
888
896
|
}
|
|
889
897
|
},
|
|
@@ -926,6 +934,9 @@
|
|
|
926
934
|
"logLevel": {
|
|
927
935
|
"type": "WorkerLogLevel"
|
|
928
936
|
},
|
|
937
|
+
"system": {
|
|
938
|
+
"type": "boolean"
|
|
939
|
+
},
|
|
929
940
|
"status": {
|
|
930
941
|
"type": "\"RUNNING\" | \"SUCCESS\" | \"ERROR\" | \"QUEUED\" | \"STARTING\" | \"TIMEOUT\" | \"SCHEDULED\""
|
|
931
942
|
},
|
|
@@ -1059,6 +1070,11 @@
|
|
|
1059
1070
|
"statusDetails": {
|
|
1060
1071
|
"description": "Job current status"
|
|
1061
1072
|
},
|
|
1073
|
+
"system": {
|
|
1074
|
+
"default": false,
|
|
1075
|
+
"description": "The operation is called as the system (`useSystem`), a cron for example\n\nThe context is stored as data: the runner rebuilds a system context from this flag",
|
|
1076
|
+
"type": "boolean"
|
|
1077
|
+
},
|
|
1062
1078
|
"type": {
|
|
1063
1079
|
"description": "Type of action",
|
|
1064
1080
|
"type": "string"
|
|
@@ -1168,6 +1184,11 @@
|
|
|
1168
1184
|
"statusDetails": {
|
|
1169
1185
|
"description": "Job current status"
|
|
1170
1186
|
},
|
|
1187
|
+
"system": {
|
|
1188
|
+
"default": false,
|
|
1189
|
+
"description": "The operation is called as the system (`useSystem`), a cron for example\n\nThe context is stored as data: the runner rebuilds a system context from this flag",
|
|
1190
|
+
"type": "boolean"
|
|
1191
|
+
},
|
|
1171
1192
|
"type": {
|
|
1172
1193
|
"description": "Type of action",
|
|
1173
1194
|
"type": "string"
|
|
@@ -1277,6 +1298,11 @@
|
|
|
1277
1298
|
"statusDetails": {
|
|
1278
1299
|
"description": "Job current status"
|
|
1279
1300
|
},
|
|
1301
|
+
"system": {
|
|
1302
|
+
"default": false,
|
|
1303
|
+
"description": "The operation is called as the system (`useSystem`), a cron for example\n\nThe context is stored as data: the runner rebuilds a system context from this flag",
|
|
1304
|
+
"type": "boolean"
|
|
1305
|
+
},
|
|
1280
1306
|
"type": {
|
|
1281
1307
|
"description": "Type of action",
|
|
1282
1308
|
"type": "string"
|
|
@@ -1306,6 +1332,9 @@
|
|
|
1306
1332
|
},
|
|
1307
1333
|
"Actions": {
|
|
1308
1334
|
"status": {
|
|
1335
|
+
"openapi": {
|
|
1336
|
+
"hidden": true
|
|
1337
|
+
},
|
|
1309
1338
|
"handler": "statusAction"
|
|
1310
1339
|
}
|
|
1311
1340
|
},
|
|
@@ -1728,6 +1757,9 @@
|
|
|
1728
1757
|
},
|
|
1729
1758
|
"Actions": {
|
|
1730
1759
|
"status": {
|
|
1760
|
+
"openapi": {
|
|
1761
|
+
"hidden": true
|
|
1762
|
+
},
|
|
1731
1763
|
"handler": "statusAction"
|
|
1732
1764
|
}
|
|
1733
1765
|
},
|