@qodalis/cli-server-plugin-jobs 1.0.0-beta.14 → 1.0.0-beta.15
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 +23 -2
- package/dist/cli-job-execution-context.d.ts +6 -0
- package/dist/cli-job-execution-context.d.ts.map +1 -1
- package/dist/cli-job-execution-context.js +10 -0
- package/dist/cli-job-execution-context.js.map +1 -1
- package/dist/cli-job-scheduler.d.ts +51 -4
- package/dist/cli-job-scheduler.d.ts.map +1 -1
- package/dist/cli-job-scheduler.js +103 -16
- package/dist/cli-job-scheduler.js.map +1 -1
- package/dist/cli-jobs-builder.d.ts +3 -1
- package/dist/cli-jobs-builder.d.ts.map +1 -1
- package/dist/cli-jobs-builder.js +2 -1
- package/dist/cli-jobs-builder.js.map +1 -1
- package/dist/cli-jobs-controller.d.ts +1 -0
- package/dist/cli-jobs-controller.d.ts.map +1 -1
- package/dist/cli-jobs-controller.js +52 -5
- package/dist/cli-jobs-controller.js.map +1 -1
- package/dist/in-memory-job-storage-provider.d.ts +8 -1
- package/dist/in-memory-job-storage-provider.d.ts.map +1 -1
- package/dist/in-memory-job-storage-provider.js +33 -0
- package/dist/in-memory-job-storage-provider.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/package-info.d.ts +4 -0
- package/dist/package-info.d.ts.map +1 -0
- package/dist/package-info.js +10 -0
- package/dist/package-info.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -8,6 +8,7 @@ const cli_job_scheduler_1 = require("./cli-job-scheduler");
|
|
|
8
8
|
*
|
|
9
9
|
* Routes (relative to mount point):
|
|
10
10
|
* - GET / - list all jobs
|
|
11
|
+
* - GET /executions - executions across jobs (?job=a,b&group=&status=&since=&limit=&offset=)
|
|
11
12
|
* - GET /:id - single job details
|
|
12
13
|
* - POST /:id/trigger - trigger immediate execution
|
|
13
14
|
* - POST /:id/pause - pause scheduled execution
|
|
@@ -28,6 +29,42 @@ function createCliJobsController(scheduler, storage) {
|
|
|
28
29
|
const jobs = scheduler.getAll();
|
|
29
30
|
res.json(jobs);
|
|
30
31
|
});
|
|
32
|
+
// Before /:id, which would take "executions" for a job id
|
|
33
|
+
router.get('/executions', async (req, res) => {
|
|
34
|
+
let jobIds = queryList(req.query.job).flatMap((j) => j.split(',').map((id) => id.trim()).filter(Boolean));
|
|
35
|
+
const group = typeof req.query.group === 'string' && req.query.group.trim() ? req.query.group.trim() : undefined;
|
|
36
|
+
if (group) {
|
|
37
|
+
const inGroup = scheduler
|
|
38
|
+
.getAll()
|
|
39
|
+
.filter((j) => j.group !== undefined && j.group.toLowerCase() === group.toLowerCase())
|
|
40
|
+
.map((j) => j.id);
|
|
41
|
+
jobIds = jobIds.length > 0 ? jobIds.filter((id) => inGroup.includes(id)) : inGroup;
|
|
42
|
+
}
|
|
43
|
+
else if (jobIds.length === 0) {
|
|
44
|
+
jobIds = undefined;
|
|
45
|
+
}
|
|
46
|
+
let since;
|
|
47
|
+
if (typeof req.query.since === 'string' && req.query.since) {
|
|
48
|
+
since = new Date(req.query.since);
|
|
49
|
+
if (Number.isNaN(since.getTime())) {
|
|
50
|
+
return res.status(400).json({ error: 'since must be an ISO 8601 date', code: 'INVALID_QUERY' });
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
const parsedLimit = parseInt(req.query.limit, 10);
|
|
54
|
+
const limit = Math.min(Math.max(Number.isNaN(parsedLimit) ? 20 : parsedLimit, 1), 100);
|
|
55
|
+
const offset = Math.max(parseInt(req.query.offset, 10) || 0, 0);
|
|
56
|
+
const status = typeof req.query.status === 'string' && req.query.status ? req.query.status : undefined;
|
|
57
|
+
try {
|
|
58
|
+
// A group (or a job filter) matching no job lists nothing, not every job
|
|
59
|
+
const result = jobIds && jobIds.length === 0
|
|
60
|
+
? { items: [], total: 0 }
|
|
61
|
+
: await scheduler.queryExecutions({ jobIds, status, since, limit, offset });
|
|
62
|
+
res.json({ items: result.items.map(toListItem), total: result.total, limit, offset });
|
|
63
|
+
}
|
|
64
|
+
catch (err) {
|
|
65
|
+
handleError(res, err);
|
|
66
|
+
}
|
|
67
|
+
});
|
|
31
68
|
router.get('/:id', (req, res) => {
|
|
32
69
|
const job = scheduler.get(req.params.id);
|
|
33
70
|
if (!job) {
|
|
@@ -111,10 +148,7 @@ function createCliJobsController(scheduler, storage) {
|
|
|
111
148
|
const status = req.query.status;
|
|
112
149
|
const result = await storage.getExecutions(req.params.id, { limit, offset, status });
|
|
113
150
|
// Strip logs from list view, add logCount
|
|
114
|
-
const items = result.items.map(
|
|
115
|
-
const { logs, ...rest } = exec;
|
|
116
|
-
return { ...rest, logCount: logs?.length ?? 0 };
|
|
117
|
-
});
|
|
151
|
+
const items = result.items.map(toListItem);
|
|
118
152
|
res.json({
|
|
119
153
|
items,
|
|
120
154
|
total: result.total,
|
|
@@ -131,10 +165,23 @@ function createCliJobsController(scheduler, storage) {
|
|
|
131
165
|
if (!execution || execution.jobId !== req.params.id) {
|
|
132
166
|
return res.status(404).json({ error: 'Execution not found', code: 'EXECUTION_NOT_FOUND' });
|
|
133
167
|
}
|
|
134
|
-
res.json(execution);
|
|
168
|
+
res.json({ ...execution, properties: execution.properties ?? {} });
|
|
135
169
|
});
|
|
136
170
|
return router;
|
|
137
171
|
}
|
|
172
|
+
/** An execution in a list: without its logs, with their count and the run's properties. */
|
|
173
|
+
function toListItem(exec) {
|
|
174
|
+
const { logs, ...rest } = exec;
|
|
175
|
+
return { ...rest, properties: exec.properties ?? {}, logCount: logs?.length ?? 0 };
|
|
176
|
+
}
|
|
177
|
+
/** A query parameter given once, repeated or not at all, as a list of strings. */
|
|
178
|
+
function queryList(value) {
|
|
179
|
+
if (typeof value === 'string')
|
|
180
|
+
return [value];
|
|
181
|
+
if (Array.isArray(value))
|
|
182
|
+
return value.filter((v) => typeof v === 'string');
|
|
183
|
+
return [];
|
|
184
|
+
}
|
|
138
185
|
/** Map a caught error to an appropriate HTTP response. */
|
|
139
186
|
function handleError(res, err) {
|
|
140
187
|
if (err instanceof cli_job_scheduler_1.JobError) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-jobs-controller.js","sourceRoot":"","sources":["../cli-jobs-controller.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cli-jobs-controller.js","sourceRoot":"","sources":["../cli-jobs-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ICliJobStorageProvider, JobExecution, JobExecutionStatus, JobState } from '@qodalis/cli-server-abstractions';
|
|
1
|
+
import { ICliJobStorageProvider, JobExecution, JobExecutionQuery, JobExecutionStatus, JobState } from '@qodalis/cli-server-abstractions';
|
|
2
2
|
/** Volatile, in-memory storage for job executions and state (lost on restart). */
|
|
3
3
|
export declare class InMemoryJobStorageProvider implements ICliJobStorageProvider {
|
|
4
4
|
private readonly _executions;
|
|
@@ -14,9 +14,16 @@ export declare class InMemoryJobStorageProvider implements ICliJobStorageProvide
|
|
|
14
14
|
items: JobExecution[];
|
|
15
15
|
total: number;
|
|
16
16
|
}>;
|
|
17
|
+
queryExecutions(query: JobExecutionQuery): Promise<{
|
|
18
|
+
items: JobExecution[];
|
|
19
|
+
total: number;
|
|
20
|
+
}>;
|
|
21
|
+
prune(before: Date): Promise<number>;
|
|
22
|
+
deleteExecution(executionId: string): Promise<boolean>;
|
|
17
23
|
getExecution(executionId: string): Promise<JobExecution | null>;
|
|
18
24
|
saveJobState(jobId: string, state: JobState): Promise<void>;
|
|
19
25
|
getJobState(jobId: string): Promise<JobState | null>;
|
|
20
26
|
getAllJobStates(): Promise<Map<string, JobState>>;
|
|
27
|
+
private _remove;
|
|
21
28
|
}
|
|
22
29
|
//# sourceMappingURL=in-memory-job-storage-provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-memory-job-storage-provider.d.ts","sourceRoot":"","sources":["../in-memory-job-storage-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,YAAY,EACZ,kBAAkB,EAClB,QAAQ,
|
|
1
|
+
{"version":3,"file":"in-memory-job-storage-provider.d.ts","sourceRoot":"","sources":["../in-memory-job-storage-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,QAAQ,EAEX,MAAM,kCAAkC,CAAC;AAE1C,kFAAkF;AAClF,qBAAa,0BAA2B,YAAW,sBAAsB;IACrE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmC;IAC/D,gDAAgD;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+B;IAC9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAEpD,aAAa,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAarD,aAAa,CACf,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;KAAE,GAC3E,OAAO,CAAC;QAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAmB9C,eAAe,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAU5F,KAAK,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IAUpC,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAItD,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAI/D,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAIpD,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAIvD,OAAO,CAAC,OAAO;CASlB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InMemoryJobStorageProvider = void 0;
|
|
4
|
+
const cli_server_abstractions_1 = require("@qodalis/cli-server-abstractions");
|
|
4
5
|
/** Volatile, in-memory storage for job executions and state (lost on restart). */
|
|
5
6
|
class InMemoryJobStorageProvider {
|
|
6
7
|
_executions = new Map();
|
|
@@ -33,6 +34,27 @@ class InMemoryJobStorageProvider {
|
|
|
33
34
|
const items = executions.slice(offset, offset + limit);
|
|
34
35
|
return { items, total };
|
|
35
36
|
}
|
|
37
|
+
async queryExecutions(query) {
|
|
38
|
+
const jobIds = query.jobIds ? new Set(query.jobIds) : undefined;
|
|
39
|
+
const matches = Array.from(this._executions.values())
|
|
40
|
+
.filter((e) => (!jobIds || jobIds.has(e.jobId)) && (0, cli_server_abstractions_1.matchesJobExecutionQuery)(e, query))
|
|
41
|
+
.sort((a, b) => new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime());
|
|
42
|
+
const offset = query.offset ?? 0;
|
|
43
|
+
const limit = query.limit ?? 20;
|
|
44
|
+
return { items: matches.slice(offset, offset + limit), total: matches.length };
|
|
45
|
+
}
|
|
46
|
+
async prune(before) {
|
|
47
|
+
let removed = 0;
|
|
48
|
+
for (const execution of Array.from(this._executions.values())) {
|
|
49
|
+
if (new Date(execution.startedAt).getTime() < before.getTime() && this._remove(execution.id)) {
|
|
50
|
+
removed++;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return removed;
|
|
54
|
+
}
|
|
55
|
+
async deleteExecution(executionId) {
|
|
56
|
+
return this._remove(executionId);
|
|
57
|
+
}
|
|
36
58
|
async getExecution(executionId) {
|
|
37
59
|
return this._executions.get(executionId) ?? null;
|
|
38
60
|
}
|
|
@@ -45,6 +67,17 @@ class InMemoryJobStorageProvider {
|
|
|
45
67
|
async getAllJobStates() {
|
|
46
68
|
return new Map(this._jobStates);
|
|
47
69
|
}
|
|
70
|
+
_remove(executionId) {
|
|
71
|
+
const execution = this._executions.get(executionId);
|
|
72
|
+
if (!execution)
|
|
73
|
+
return false;
|
|
74
|
+
this._executions.delete(executionId);
|
|
75
|
+
const list = this._jobExecutions.get(execution.jobId);
|
|
76
|
+
const index = list?.indexOf(executionId) ?? -1;
|
|
77
|
+
if (list && index >= 0)
|
|
78
|
+
list.splice(index, 1);
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
48
81
|
}
|
|
49
82
|
exports.InMemoryJobStorageProvider = InMemoryJobStorageProvider;
|
|
50
83
|
//# sourceMappingURL=in-memory-job-storage-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-memory-job-storage-provider.js","sourceRoot":"","sources":["../in-memory-job-storage-provider.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"in-memory-job-storage-provider.js","sourceRoot":"","sources":["../in-memory-job-storage-provider.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { CliJobsBuilder, CliJobsPluginResult } from './cli-jobs-builder';
|
|
2
|
-
export { CliJobScheduler, JobRegistration, JobDto, JobError } from './cli-job-scheduler';
|
|
2
|
+
export { CliJobScheduler, ICliJobScheduler, CliJobOptionsUpdate, JobRegistration, JobDto, JobError } from './cli-job-scheduler';
|
|
3
3
|
export { CliJobExecutionContext } from './cli-job-execution-context';
|
|
4
4
|
export { CliJobLogger } from './cli-job-logger';
|
|
5
5
|
export { InMemoryJobStorageProvider } from './in-memory-job-storage-provider';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAChI,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,uDAAyE;AAAhE,kHAAA,cAAc,OAAA;AACvB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,uDAAyE;AAAhE,kHAAA,cAAc,OAAA;AACvB,yDAAgI;AAAvH,oHAAA,eAAe,OAAA;AAAkE,6GAAA,QAAQ,OAAA;AAClG,yEAAqE;AAA5D,mIAAA,sBAAsB,OAAA;AAC/B,mDAAgD;AAAvC,8GAAA,YAAY,OAAA;AACrB,mFAA8E;AAArE,4IAAA,0BAA0B,OAAA;AACnC,6DAAgE;AAAvD,8HAAA,uBAAuB,OAAA;AAChC,qDAAkD;AAAzC,gHAAA,aAAa,OAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-info.d.ts","sourceRoot":"","sources":["../package-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAuB,MAAM,kCAAkC,CAAC;AAE3F,oEAAoE;AACpE,eAAO,MAAM,mBAAmB,EAAE,kBAGjC,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.jobsInstalledPlugin = void 0;
|
|
4
|
+
const cli_server_abstractions_1 = require("@qodalis/cli-server-abstractions");
|
|
5
|
+
/** This package, as listed among the server's installed plugins. */
|
|
6
|
+
exports.jobsInstalledPlugin = (0, cli_server_abstractions_1.readInstalledPlugin)(__dirname, '@qodalis/cli-server-plugin-jobs', 'Jobs') ?? {
|
|
7
|
+
id: '@qodalis/cli-server-plugin-jobs',
|
|
8
|
+
name: 'Jobs',
|
|
9
|
+
};
|
|
10
|
+
//# sourceMappingURL=package-info.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-info.js","sourceRoot":"","sources":["../package-info.ts"],"names":[],"mappings":";;;AAAA,8EAA2F;AAE3F,oEAAoE;AACvD,QAAA,mBAAmB,GAAuB,IAAA,6CAAmB,EAAC,SAAS,EAAE,iCAAiC,EAAE,MAAM,CAAC,IAAI;IAChI,EAAE,EAAE,iCAAiC;IACrC,IAAI,EAAE,MAAM;CACf,CAAC"}
|