@decaf-ts/core 0.27.4 → 0.28.1
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 +4 -4
- package/dist/core.cjs +1 -1
- package/dist/core.cjs.map +1 -1
- package/dist/core.js +1 -1
- package/dist/core.js.map +1 -1
- package/lib/cjs/index.cjs +3 -3
- package/lib/cjs/migrations/Migration.cjs +16 -2
- package/lib/cjs/migrations/Migration.cjs.map +1 -1
- package/lib/cjs/migrations/MigrationService.cjs +52 -29
- package/lib/cjs/migrations/MigrationService.cjs.map +1 -1
- package/lib/cjs/tasks/TaskEngine.cjs +25 -13
- package/lib/cjs/tasks/TaskEngine.cjs.map +1 -1
- package/lib/cjs/tasks/builder.cjs +22 -5
- package/lib/cjs/tasks/builder.cjs.map +1 -1
- package/lib/cjs/tasks/models/TaskStepSpecModel.cjs +6 -0
- package/lib/cjs/tasks/models/TaskStepSpecModel.cjs.map +1 -1
- package/lib/esm/index.js +3 -3
- package/lib/esm/migrations/Migration.js +17 -3
- package/lib/esm/migrations/Migration.js.map +1 -1
- package/lib/esm/migrations/MigrationService.js +52 -29
- package/lib/esm/migrations/MigrationService.js.map +1 -1
- package/lib/esm/tasks/TaskEngine.js +25 -13
- package/lib/esm/tasks/TaskEngine.js.map +1 -1
- package/lib/esm/tasks/builder.js +22 -5
- package/lib/esm/tasks/builder.js.map +1 -1
- package/lib/esm/tasks/models/TaskStepSpecModel.js +6 -0
- package/lib/esm/tasks/models/TaskStepSpecModel.js.map +1 -1
- package/lib/types/index.d.cts +3 -3
- package/lib/types/index.d.mts +3 -3
- package/lib/types/migrations/Migration.d.cts +6 -2
- package/lib/types/migrations/Migration.d.mts +6 -2
- package/lib/types/migrations/MigrationService.d.cts +13 -5
- package/lib/types/migrations/MigrationService.d.mts +13 -5
- package/lib/types/migrations/types.d.cts +3 -2
- package/lib/types/migrations/types.d.mts +3 -2
- package/lib/types/tasks/builder.d.cts +7 -0
- package/lib/types/tasks/builder.d.mts +7 -0
- package/lib/types/tasks/models/TaskStepSpecModel.d.cts +1 -0
- package/lib/types/tasks/models/TaskStepSpecModel.d.mts +1 -0
- package/lib/types/workers/WorkThreadEnvironment.d.cts +5 -1
- package/lib/types/workers/WorkThreadEnvironment.d.mts +5 -1
- package/package.json +3 -2
|
@@ -203,6 +203,10 @@ class TaskStepSpecBuilder {
|
|
|
203
203
|
this.step.dependsOn = value;
|
|
204
204
|
return this;
|
|
205
205
|
}
|
|
206
|
+
setCanFail(value) {
|
|
207
|
+
this.step.canFail = value;
|
|
208
|
+
return this;
|
|
209
|
+
}
|
|
206
210
|
setMaxAttempts(value) {
|
|
207
211
|
this.step.maxAttempts = value;
|
|
208
212
|
return this;
|
|
@@ -211,7 +215,10 @@ class TaskStepSpecBuilder {
|
|
|
211
215
|
this.step.backoff = value;
|
|
212
216
|
return this;
|
|
213
217
|
}
|
|
214
|
-
addStep(classification, nameOrInput, inputMaybe) {
|
|
218
|
+
addStep(classification, nameOrInput, inputMaybe, canFailMaybe) {
|
|
219
|
+
if (arguments.length >= 4) {
|
|
220
|
+
return this.parent.addStep(classification, nameOrInput, inputMaybe, canFailMaybe);
|
|
221
|
+
}
|
|
215
222
|
return this.parent.addStep(classification, nameOrInput, inputMaybe);
|
|
216
223
|
}
|
|
217
224
|
setSteps(value) {
|
|
@@ -242,16 +249,26 @@ class CompositeTaskBuilder extends TaskBuilder {
|
|
|
242
249
|
const now = new Date();
|
|
243
250
|
const hasOnlyClassification = arguments.length === 1;
|
|
244
251
|
const hasThirdArg = arguments.length >= 3;
|
|
252
|
+
const hasFourthArg = arguments.length >= 4;
|
|
245
253
|
const name = hasThirdArg && typeof nameOrInput === "string" ? nameOrInput : undefined;
|
|
246
|
-
const input =
|
|
254
|
+
const input = hasFourthArg
|
|
247
255
|
? inputMaybe
|
|
248
|
-
:
|
|
249
|
-
?
|
|
250
|
-
:
|
|
256
|
+
: hasThirdArg && typeof nameOrInput === "string"
|
|
257
|
+
? inputMaybe
|
|
258
|
+
: hasOnlyClassification
|
|
259
|
+
? undefined
|
|
260
|
+
: nameOrInput;
|
|
261
|
+
const canFail = hasFourthArg
|
|
262
|
+
? // eslint-disable-next-line prefer-rest-params
|
|
263
|
+
Boolean(arguments[3])
|
|
264
|
+
: hasThirdArg && typeof nameOrInput !== "string"
|
|
265
|
+
? Boolean(inputMaybe)
|
|
266
|
+
: false;
|
|
251
267
|
const step = new TaskStepSpecModel_js_1.TaskStepSpecModel({
|
|
252
268
|
classification,
|
|
253
269
|
name,
|
|
254
270
|
input,
|
|
271
|
+
canFail,
|
|
255
272
|
createdAt: now,
|
|
256
273
|
updatedAt: now,
|
|
257
274
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks/builder.cjs","sourceRoot":"","sources":["tasks/builder.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tasks/builder.cjs","sourceRoot":"","sources":["tasks/builder.js"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ const TaskBackoffModel_js_1 = require("./TaskBackoffModel.cjs");
|
|
|
23
23
|
let TaskStepSpecModel = class TaskStepSpecModel extends decorator_validation_1.Model {
|
|
24
24
|
constructor(arg) {
|
|
25
25
|
super(arg);
|
|
26
|
+
this.canFail = false;
|
|
26
27
|
}
|
|
27
28
|
};
|
|
28
29
|
exports.TaskStepSpecModel = TaskStepSpecModel;
|
|
@@ -52,6 +53,11 @@ __decorate([
|
|
|
52
53
|
(0, decorator_validation_2.list)(() => String),
|
|
53
54
|
__metadata("design:type", Array)
|
|
54
55
|
], TaskStepSpecModel.prototype, "dependsOn", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
(0, decoration_1.prop)(),
|
|
58
|
+
(0, decoration_1.description)("Whether a failing step may be tolerated so the composite can continue"),
|
|
59
|
+
__metadata("design:type", Boolean)
|
|
60
|
+
], TaskStepSpecModel.prototype, "canFail", void 0);
|
|
55
61
|
__decorate([
|
|
56
62
|
(0, decoration_1.prop)(),
|
|
57
63
|
(0, decorator_validation_1.min)(1),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks/models/TaskStepSpecModel.cjs","sourceRoot":"","sources":["tasks/models/TaskStepSpecModel.js"],"names":[],"mappings":";;;AAAA,IAAI,UAAU,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,UAAU,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI;IACjF,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7H,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,UAAU;QAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;;QAC1H,KAAK,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YAAE,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gBAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;IAClJ,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAClE,CAAC,CAAC;AACF,IAAI,UAAU,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IACxD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,UAAU;QAAE,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC7G,CAAC,CAAC;AACF,yEAAyF;AACzF,qDAAyD;AACzD,yEAAsD;AACtD,2DAAoD;AACpD,+DAAyD;AACzD,IAAI,iBAAiB,GAAG,MAAM,iBAAkB,SAAQ,4BAAK;IACzD,YAAY,GAAG;QACX,KAAK,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tasks/models/TaskStepSpecModel.cjs","sourceRoot":"","sources":["tasks/models/TaskStepSpecModel.js"],"names":[],"mappings":"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"}
|
package/lib/esm/index.js
CHANGED
|
@@ -33,21 +33,21 @@ export * from "./persistence/index.js";
|
|
|
33
33
|
* @const VERSION
|
|
34
34
|
* @memberOf module:core
|
|
35
35
|
*/
|
|
36
|
-
export const VERSION = "0.
|
|
36
|
+
export const VERSION = "0.28.0";
|
|
37
37
|
/**
|
|
38
38
|
* @description Represents the current commit hash of the module build.
|
|
39
39
|
* @summary Stores the current git commit hash for the package. The build replaces
|
|
40
40
|
* the placeholder with the actual commit hash at publish time.
|
|
41
41
|
* @const COMMIT
|
|
42
42
|
*/
|
|
43
|
-
export const COMMIT = "
|
|
43
|
+
export const COMMIT = "19de947";
|
|
44
44
|
/**
|
|
45
45
|
* @description Represents the full version string of the module.
|
|
46
46
|
* @summary Stores the semver version and commit hash for the package.
|
|
47
47
|
* The build replaces the placeholder with the actual `<version>-<commit>` value at publish time.
|
|
48
48
|
* @const FULL_VERSION
|
|
49
49
|
*/
|
|
50
|
-
export const FULL_VERSION = "0.
|
|
50
|
+
export const FULL_VERSION = "0.28.0-19de947";
|
|
51
51
|
/**
|
|
52
52
|
* @description Stores the current package version
|
|
53
53
|
* @summary A constant representing the version of the core package
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Metadata } from "@decaf-ts/decoration";
|
|
2
|
-
import { AbsContextual } from "./../utils/ContextualLoggedClass.js";
|
|
2
|
+
import { AbsContextual, } from "./../utils/ContextualLoggedClass.js";
|
|
3
3
|
import { prefixMethod } from "./../utils/utils.js";
|
|
4
4
|
import { InternalError } from "@decaf-ts/db-decorators";
|
|
5
5
|
import { Adapter } from "./../persistence/Adapter.js";
|
|
@@ -51,7 +51,7 @@ export class AbsMigration extends AbsContextual {
|
|
|
51
51
|
return true;
|
|
52
52
|
}
|
|
53
53
|
prefix(name) {
|
|
54
|
-
return async function preffix(qrOrAdapter) {
|
|
54
|
+
return async function preffix(qrOrAdapter, ...args) {
|
|
55
55
|
let qr;
|
|
56
56
|
if (qrOrAdapter instanceof Adapter) {
|
|
57
57
|
qr = this.getQueryRunner(qrOrAdapter.client);
|
|
@@ -60,7 +60,7 @@ export class AbsMigration extends AbsContextual {
|
|
|
60
60
|
qr = qrOrAdapter;
|
|
61
61
|
qrOrAdapter = this.adapter;
|
|
62
62
|
}
|
|
63
|
-
const { ctx, log } = await this.logCtx([name], PersistenceKeys.MIGRATION, true);
|
|
63
|
+
const { ctx, log } = await this.logCtx([name, ...args], PersistenceKeys.MIGRATION, true);
|
|
64
64
|
const allowed = await this.enforceRules(qr, qrOrAdapter, ctx);
|
|
65
65
|
if (!allowed) {
|
|
66
66
|
log.verbose(`Skipping migration ${this.constructor.name} due to rules`);
|
|
@@ -69,5 +69,19 @@ export class AbsMigration extends AbsContextual {
|
|
|
69
69
|
return [qr, qrOrAdapter, ctx];
|
|
70
70
|
}.bind(this);
|
|
71
71
|
}
|
|
72
|
+
logCtx(args, operation, allowCreate = false, overrides) {
|
|
73
|
+
let adapter;
|
|
74
|
+
try {
|
|
75
|
+
adapter = this["adapter"];
|
|
76
|
+
}
|
|
77
|
+
catch {
|
|
78
|
+
adapter = undefined;
|
|
79
|
+
}
|
|
80
|
+
if (!allowCreate || !adapter)
|
|
81
|
+
return super.logCtx(args, operation, allowCreate, overrides);
|
|
82
|
+
return adapter
|
|
83
|
+
.context(typeof operation === "string" ? operation : operation.name, overrides || {}, undefined, ...args)
|
|
84
|
+
.then((ctx) => super.logCtx([typeof operation === "string" ? operation : operation.name, ...args.slice(0, -1), ctx], PersistenceKeys.MIGRATION, false, overrides));
|
|
85
|
+
}
|
|
72
86
|
}
|
|
73
87
|
//# sourceMappingURL=Migration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../../src/migrations/Migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,
|
|
1
|
+
{"version":3,"file":"Migration.js","sourceRoot":"","sources":["../../../src/migrations/Migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,11 @@ export class MigrationService extends ClientBasedService {
|
|
|
20
20
|
this.precedence = null;
|
|
21
21
|
}
|
|
22
22
|
static async migrateAdapters(adapters, cfg = {}, ...args) {
|
|
23
|
+
const migrationService = (MigrationService.defaultSingleton ||=
|
|
24
|
+
new MigrationService());
|
|
25
|
+
return migrationService.migrateAdapters(adapters, cfg, ...args);
|
|
26
|
+
}
|
|
27
|
+
async migrateAdapters(adapters, cfg = {}, ...args) {
|
|
23
28
|
const flavours = cfg.flavours?.length ? new Set(cfg.flavours) : undefined;
|
|
24
29
|
const selected = adapters.filter((adapter) => !flavours || flavours.has(adapter.alias));
|
|
25
30
|
const migratingAliases = new Set(adapters.map((adapter) => adapter.alias).filter(Boolean));
|
|
@@ -29,30 +34,43 @@ export class MigrationService extends ClientBasedService {
|
|
|
29
34
|
migratingAliases.has(taskServiceAdapterAlias)) {
|
|
30
35
|
throw new InternalError(`TaskEngine adapter alias "${taskServiceAdapterAlias}" cannot participate in the migration targets`);
|
|
31
36
|
}
|
|
32
|
-
const
|
|
37
|
+
const migrationService = this;
|
|
38
|
+
migrationService.versioning =
|
|
39
|
+
cfg.versioning || new StandardMigrationVersioning();
|
|
40
|
+
migrationService.allowedReferences = cfg.references?.length
|
|
41
|
+
? new Set(cfg.references)
|
|
42
|
+
: undefined;
|
|
43
|
+
migrationService.queuedTaskChain = [];
|
|
44
|
+
migrationService.orchestrationConfig = {
|
|
45
|
+
...DefaultMigrationConfig,
|
|
46
|
+
targetVersion: cfg.toVersion,
|
|
47
|
+
taskMode: !!cfg.taskMode,
|
|
48
|
+
taskService: cfg.taskService,
|
|
49
|
+
versioning: cfg.versioning,
|
|
50
|
+
references: cfg.references,
|
|
51
|
+
};
|
|
33
52
|
for (const adapter of selected) {
|
|
34
53
|
const scope = adapter.alias;
|
|
35
54
|
const handlers = cfg.handlers?.[scope] || cfg.handlers?.[adapter.flavour] || {};
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
await migrationService.boot({
|
|
55
|
+
const executionConfig = {
|
|
56
|
+
...DefaultMigrationConfig,
|
|
39
57
|
persistenceFlavour: scope,
|
|
40
58
|
targetVersion: cfg.toVersion,
|
|
41
59
|
taskMode: !!cfg.taskMode,
|
|
42
|
-
|
|
43
|
-
|
|
60
|
+
includeGenericInTaskMode: cfg.includeGenericInTaskMode ??
|
|
61
|
+
!(cfg.taskMode && selected.length > 1),
|
|
44
62
|
retrieveLastVersion: handlers.retrieveLastVersion,
|
|
45
63
|
setCurrentVersion: handlers.setCurrentVersion,
|
|
46
64
|
taskService: cfg.taskService,
|
|
47
65
|
versioning: cfg.versioning,
|
|
48
66
|
references: cfg.references,
|
|
49
|
-
}
|
|
67
|
+
};
|
|
50
68
|
if (cfg.taskMode)
|
|
51
|
-
await migrationService.
|
|
69
|
+
await migrationService.migrateViaTasksWithConfig(executionConfig, ...args);
|
|
52
70
|
else
|
|
53
|
-
await migrationService.
|
|
71
|
+
await migrationService.migrateNormallyWithConfig(executionConfig, ...args);
|
|
54
72
|
}
|
|
55
|
-
return
|
|
73
|
+
return migrationService;
|
|
56
74
|
}
|
|
57
75
|
async initialize(...args) {
|
|
58
76
|
const { log, ctx } = (await this.logCtx(args, PersistenceKeys.INITIALIZATION, true)).for(this.initialize);
|
|
@@ -319,10 +337,12 @@ export class MigrationService extends ClientBasedService {
|
|
|
319
337
|
return undefined;
|
|
320
338
|
}
|
|
321
339
|
async migrateNormally(qr, adapter, ...args) {
|
|
322
|
-
const { ctxArgs, log } = (await this.logCtx(args, PersistenceKeys.MIGRATION, true)).for(this.migrateNormally);
|
|
323
340
|
void qr;
|
|
324
341
|
void adapter;
|
|
325
|
-
|
|
342
|
+
return this.migrateNormallyWithConfig(this.config, ...args);
|
|
343
|
+
}
|
|
344
|
+
async migrateNormallyWithConfig(cfg, ...args) {
|
|
345
|
+
const { ctxArgs, log } = (await this.logCtx(args, PersistenceKeys.MIGRATION, true)).for(this.migrateNormally);
|
|
326
346
|
const targetFlavour = cfg.persistenceFlavour;
|
|
327
347
|
const includeGeneric = cfg.taskMode
|
|
328
348
|
? (cfg.includeGenericInTaskMode ?? true)
|
|
@@ -331,7 +351,7 @@ export class MigrationService extends ClientBasedService {
|
|
|
331
351
|
? Adapter.get(targetFlavour)
|
|
332
352
|
: undefined;
|
|
333
353
|
let currentVersion;
|
|
334
|
-
if (cfg.retrieveLastVersion
|
|
354
|
+
if (cfg.retrieveLastVersion) {
|
|
335
355
|
const retrieved = await cfg.retrieveLastVersion(scopedAdapter, ...ctxArgs);
|
|
336
356
|
if (retrieved)
|
|
337
357
|
currentVersion = this.normalizeVersion(retrieved);
|
|
@@ -346,7 +366,7 @@ export class MigrationService extends ClientBasedService {
|
|
|
346
366
|
for (const migration of plan) {
|
|
347
367
|
await this.executeMigration(migration, ...ctxArgs);
|
|
348
368
|
}
|
|
349
|
-
if (cfg.setCurrentVersion
|
|
369
|
+
if (cfg.setCurrentVersion) {
|
|
350
370
|
const finalVersion = cfg.targetVersion ||
|
|
351
371
|
plan[plan.length - 1]?.version ||
|
|
352
372
|
currentVersion ||
|
|
@@ -357,17 +377,20 @@ export class MigrationService extends ClientBasedService {
|
|
|
357
377
|
return undefined;
|
|
358
378
|
}
|
|
359
379
|
async migrateViaTasks(qr, adapter, ...args) {
|
|
360
|
-
const { ctx, ctxArgs, log } = (await this.logCtx(args, PersistenceKeys.MIGRATION, true)).for(this.migrateViaTasks);
|
|
361
380
|
void qr;
|
|
362
381
|
void adapter;
|
|
363
|
-
|
|
382
|
+
this.queuedTaskChain = [];
|
|
383
|
+
return this.migrateViaTasksWithConfig(this.config, ...args);
|
|
384
|
+
}
|
|
385
|
+
async migrateViaTasksWithConfig(cfg, ...args) {
|
|
386
|
+
const { ctx, ctxArgs, log } = (await this.logCtx(args, PersistenceKeys.MIGRATION, true)).for(this.migrateViaTasks);
|
|
364
387
|
const targetFlavour = cfg.persistenceFlavour;
|
|
365
388
|
const includeGeneric = cfg.includeGenericInTaskMode ?? true;
|
|
366
389
|
const scopedAdapter = targetFlavour
|
|
367
390
|
? Adapter.get(targetFlavour)
|
|
368
391
|
: undefined;
|
|
369
392
|
let currentVersion;
|
|
370
|
-
if (cfg.retrieveLastVersion
|
|
393
|
+
if (cfg.retrieveLastVersion) {
|
|
371
394
|
const retrieved = await cfg.retrieveLastVersion(scopedAdapter, ...ctxArgs);
|
|
372
395
|
if (retrieved)
|
|
373
396
|
currentVersion = this.normalizeVersion(retrieved);
|
|
@@ -379,7 +402,6 @@ export class MigrationService extends ClientBasedService {
|
|
|
379
402
|
includeGeneric,
|
|
380
403
|
});
|
|
381
404
|
log.debug(`sorted migration before execution: ${plan.map((s) => `${s.reference}@${s.version}`)}`);
|
|
382
|
-
this.queuedTaskChain = [];
|
|
383
405
|
if (plan.length) {
|
|
384
406
|
const tasks = this.buildMigrationTasksForPlan(plan, ...ctxArgs);
|
|
385
407
|
if (cfg.taskService) {
|
|
@@ -396,6 +418,8 @@ export class MigrationService extends ClientBasedService {
|
|
|
396
418
|
this.queuedTaskChain.push({
|
|
397
419
|
id: created.id,
|
|
398
420
|
version: versionTask.version,
|
|
421
|
+
adapter: scopedAdapter,
|
|
422
|
+
setCurrentVersion: cfg.setCurrentVersion,
|
|
399
423
|
});
|
|
400
424
|
if (!created?.id) {
|
|
401
425
|
log.warn(`TaskService.push returned missing id for version ${versionTask.version}`);
|
|
@@ -407,7 +431,7 @@ export class MigrationService extends ClientBasedService {
|
|
|
407
431
|
for (const migration of plan) {
|
|
408
432
|
await this.executeMigration(migration, ...ctxArgs);
|
|
409
433
|
}
|
|
410
|
-
if (cfg.setCurrentVersion
|
|
434
|
+
if (cfg.setCurrentVersion) {
|
|
411
435
|
const finalVersion = cfg.targetVersion ||
|
|
412
436
|
plan[plan.length - 1]?.version ||
|
|
413
437
|
currentVersion ||
|
|
@@ -421,7 +445,7 @@ export class MigrationService extends ClientBasedService {
|
|
|
421
445
|
}
|
|
422
446
|
async track(taskIds, ...args) {
|
|
423
447
|
const { ctxArgs } = (await this.logCtx(args, PersistenceKeys.MIGRATION, true)).for(this.track);
|
|
424
|
-
const cfg = this.config;
|
|
448
|
+
const cfg = this.orchestrationConfig || this.config;
|
|
425
449
|
if (!cfg.taskService || !cfg.taskMode)
|
|
426
450
|
return;
|
|
427
451
|
const explicitTaskIds = typeof taskIds === "string"
|
|
@@ -438,24 +462,23 @@ export class MigrationService extends ClientBasedService {
|
|
|
438
462
|
: pendingIds;
|
|
439
463
|
if (!ids.length)
|
|
440
464
|
return;
|
|
441
|
-
const
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
}, {});
|
|
445
|
-
const scopedAdapter = this.config.persistenceFlavour
|
|
446
|
-
? Adapter.get(this.config.persistenceFlavour)
|
|
465
|
+
const queuedByTaskId = new Map(this.queuedTaskChain.map((task) => [task.id, task]));
|
|
466
|
+
const scopedAdapter = cfg.persistenceFlavour
|
|
467
|
+
? Adapter.get(cfg.persistenceFlavour)
|
|
447
468
|
: undefined;
|
|
448
469
|
for (const id of ids) {
|
|
449
470
|
const { tracker } = await cfg.taskService.track(id, ...ctxArgs);
|
|
450
471
|
await tracker.wait();
|
|
451
|
-
|
|
452
|
-
|
|
472
|
+
const queued = queuedByTaskId.get(id);
|
|
473
|
+
const setCurrentVersion = queued?.setCurrentVersion || cfg.setCurrentVersion;
|
|
474
|
+
if (setCurrentVersion && queued?.version) {
|
|
475
|
+
await setCurrentVersion(this.normalizeVersion(queued.version), (queued.adapter || scopedAdapter), ...ctxArgs);
|
|
453
476
|
}
|
|
454
477
|
}
|
|
455
478
|
}
|
|
456
479
|
async retry(taskIds, ...args) {
|
|
457
480
|
const { ctxArgs } = (await this.logCtx(args, PersistenceKeys.MIGRATION, true)).for(this.retry);
|
|
458
|
-
const cfg = this.config;
|
|
481
|
+
const cfg = this.orchestrationConfig || this.config;
|
|
459
482
|
if (!cfg.taskMode || !cfg.taskService) {
|
|
460
483
|
await this.migrateNormally(undefined, undefined, ...ctxArgs);
|
|
461
484
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MigrationService.js","sourceRoot":"","sources":["../../../src/migrations/MigrationService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MigrationService.js","sourceRoot":"","sources":["../../../src/migrations/MigrationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -805,29 +805,41 @@ export class TaskEngine extends AbsContextual {
|
|
|
805
805
|
}
|
|
806
806
|
}
|
|
807
807
|
if (lastStepErr) {
|
|
808
|
-
try {
|
|
809
|
-
await handler.catch?.(step.input, lastStepErr, context);
|
|
810
|
-
}
|
|
811
|
-
catch (catchErr) {
|
|
812
|
-
ctx.logger.warn("composite step catch() hook failed", {
|
|
813
|
-
error: catchErr,
|
|
814
|
-
});
|
|
815
|
-
}
|
|
816
808
|
const now = new Date();
|
|
809
|
+
const canFail = step.canFail === true;
|
|
810
|
+
const serializedErr = serializeError(lastStepErr);
|
|
817
811
|
results[idx] = new TaskStepResultModel({
|
|
818
812
|
status: TaskStatus.FAILED,
|
|
819
|
-
error:
|
|
813
|
+
error: serializedErr,
|
|
820
814
|
attempt: stepAttempt,
|
|
821
815
|
createdAt: now,
|
|
822
816
|
updatedAt: now,
|
|
823
817
|
});
|
|
818
|
+
if (canFail) {
|
|
819
|
+
try {
|
|
820
|
+
await handler.catch?.(step.input, lastStepErr, context);
|
|
821
|
+
}
|
|
822
|
+
catch (catchErr) {
|
|
823
|
+
ctx.logger.warn("composite step catch() hook failed", {
|
|
824
|
+
error: catchErr,
|
|
825
|
+
});
|
|
826
|
+
}
|
|
827
|
+
}
|
|
824
828
|
task.stepResults = results;
|
|
825
|
-
task.
|
|
826
|
-
|
|
827
|
-
|
|
829
|
+
task.error = canFail ? undefined : serializedErr;
|
|
830
|
+
if (canFail) {
|
|
831
|
+
idx = stepIndex + 1;
|
|
832
|
+
task.currentStep = idx;
|
|
833
|
+
}
|
|
834
|
+
else {
|
|
835
|
+
task.currentStep = idx;
|
|
836
|
+
}
|
|
837
|
+
// persist composite progress before optionally continuing to the next step
|
|
828
838
|
const persisted = await this.tasks.update(task);
|
|
829
839
|
Object.assign(task, persisted);
|
|
830
|
-
|
|
840
|
+
if (!canFail) {
|
|
841
|
+
throw lastStepErr;
|
|
842
|
+
}
|
|
831
843
|
}
|
|
832
844
|
}
|
|
833
845
|
return { stepResults: results };
|