@antelopejs/dms-saas 0.3.11 → 0.3.12
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/dist/operator-actions/db/lifecycle-delivery.model.d.ts +2 -0
- package/dist/operator-actions/db/lifecycle-delivery.model.js +38 -5
- package/dist/operator-actions/db/lifecycle-delivery.model.js.map +1 -1
- package/dist/operator-actions/db/lifecycle-delivery.table.d.ts +2 -0
- package/dist/operator-actions/db/lifecycle-delivery.table.js +8 -0
- package/dist/operator-actions/db/lifecycle-delivery.table.js.map +1 -1
- package/dist/operator-actions/lifecycle-outbox.js +11 -5
- package/dist/operator-actions/lifecycle-outbox.js.map +1 -1
- package/dist/workers/plan-migration.js +24 -4
- package/dist/workers/plan-migration.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { WorkspaceLifecycleReceipt } from "@antelopejs/interface-dms-saas/workspace-lifecycle";
|
|
2
2
|
import { LifecycleDelivery, type WorkspaceProvisioningState } from "./lifecycle-delivery.table";
|
|
3
|
+
export declare function isLifecycleDeliveryClaimable(delivery: LifecycleDelivery, now?: number): boolean;
|
|
3
4
|
declare const LifecycleDeliveryModel_base: {
|
|
4
5
|
new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
|
|
5
6
|
readonly table: import("@antelopejs/interface-database").Table<LifecycleDelivery>;
|
|
@@ -22,6 +23,7 @@ export declare class LifecycleDeliveryModel extends LifecycleDeliveryModel_base
|
|
|
22
23
|
transitionProvisioning(id: string, expected: WorkspaceProvisioningState, next: WorkspaceProvisioningState, invoiceId?: string | null): Promise<void>;
|
|
23
24
|
findByOperation(operationId: string): Promise<LifecycleDelivery[]>;
|
|
24
25
|
findReplayable(): Promise<LifecycleDelivery[]>;
|
|
26
|
+
claim(delivery: LifecycleDelivery): Promise<LifecycleDelivery | null>;
|
|
25
27
|
markSucceeded(delivery: LifecycleDelivery, receipt: WorkspaceLifecycleReceipt): Promise<void>;
|
|
26
28
|
markFailed(delivery: LifecycleDelivery): Promise<void>;
|
|
27
29
|
private mutate;
|
|
@@ -1,9 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LifecycleDeliveryModel = void 0;
|
|
4
|
+
exports.isLifecycleDeliveryClaimable = isLifecycleDeliveryClaimable;
|
|
4
5
|
const node_crypto_1 = require("node:crypto");
|
|
5
6
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
6
7
|
const lifecycle_delivery_table_1 = require("./lifecycle-delivery.table");
|
|
8
|
+
const REPLAYABLE_STATUSES = ["pending", "failed", "running"];
|
|
9
|
+
const CLAIMABLE_STATUSES = new Set(["pending", "failed"]);
|
|
10
|
+
const CLAIM_LEASE_MS = 10 * 60 * 1000;
|
|
11
|
+
function isLifecycleDeliveryClaimable(delivery, now = Date.now()) {
|
|
12
|
+
if (CLAIMABLE_STATUSES.has(delivery.status))
|
|
13
|
+
return true;
|
|
14
|
+
if (delivery.status !== "running")
|
|
15
|
+
return false;
|
|
16
|
+
return !delivery.claimExpiresAt || delivery.claimExpiresAt.getTime() <= now;
|
|
17
|
+
}
|
|
7
18
|
class LifecycleDeliveryModel extends (0, interface_database_decorators_1.BasicDataModel)(lifecycle_delivery_table_1.LifecycleDelivery, lifecycle_delivery_table_1.lifecycleDeliveriesTableName) {
|
|
8
19
|
async transitionProvisioning(id, expected, next, invoiceId) {
|
|
9
20
|
const current = await this.get(id);
|
|
@@ -27,10 +38,28 @@ class LifecycleDeliveryModel extends (0, interface_database_decorators_1.BasicDa
|
|
|
27
38
|
return this.getBy("operationId", operationId);
|
|
28
39
|
}
|
|
29
40
|
async findReplayable() {
|
|
30
|
-
const rows = await this.table.getAll(
|
|
41
|
+
const rows = await this.table.getAll(REPLAYABLE_STATUSES, "status").run();
|
|
42
|
+
const now = Date.now();
|
|
31
43
|
return rows
|
|
32
44
|
.map((row) => LifecycleDeliveryModel.fromDatabase(row))
|
|
33
|
-
.filter((row) => !!row);
|
|
45
|
+
.filter((row) => !!row && isLifecycleDeliveryClaimable(row, now));
|
|
46
|
+
}
|
|
47
|
+
async claim(delivery) {
|
|
48
|
+
const now = Date.now();
|
|
49
|
+
if (!isLifecycleDeliveryClaimable(delivery, now))
|
|
50
|
+
return null;
|
|
51
|
+
const patch = {
|
|
52
|
+
status: "running",
|
|
53
|
+
claimId: (0, node_crypto_1.randomUUID)(),
|
|
54
|
+
claimExpiresAt: new Date(now + CLAIM_LEASE_MS),
|
|
55
|
+
startedAt: new Date(now),
|
|
56
|
+
};
|
|
57
|
+
const outcome = await this.mutate(delivery, patch);
|
|
58
|
+
if (outcome === "unknown")
|
|
59
|
+
throw new Error("Workspace lifecycle claim unknown; retry after lease");
|
|
60
|
+
if (outcome !== "applied")
|
|
61
|
+
return null;
|
|
62
|
+
return Object.assign(delivery, patch);
|
|
34
63
|
}
|
|
35
64
|
async markSucceeded(delivery, receipt) {
|
|
36
65
|
const current = await this.get(delivery._id);
|
|
@@ -56,13 +85,17 @@ class LifecycleDeliveryModel extends (0, interface_database_decorators_1.BasicDa
|
|
|
56
85
|
throw new Error("Workspace lifecycle receipt changed; retry delivery");
|
|
57
86
|
}
|
|
58
87
|
async markFailed(delivery) {
|
|
59
|
-
|
|
88
|
+
const current = await this.get(delivery._id);
|
|
89
|
+
if (!current || current.status === "succeeded")
|
|
90
|
+
return;
|
|
91
|
+
if (current.claimId !== delivery.claimId)
|
|
60
92
|
return;
|
|
61
|
-
const outcome = await this.mutate(
|
|
93
|
+
const outcome = await this.mutate(current, {
|
|
62
94
|
status: "failed",
|
|
95
|
+
claimExpiresAt: null,
|
|
63
96
|
lastErrorCode: "saas.errors.lifecycle.consumer_failed",
|
|
64
97
|
completedAt: new Date(),
|
|
65
|
-
attemptCount:
|
|
98
|
+
attemptCount: current.attemptCount + 1,
|
|
66
99
|
});
|
|
67
100
|
if (outcome === "unknown")
|
|
68
101
|
throw new Error("Workspace lifecycle failure outcome unknown");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-delivery.model.js","sourceRoot":"","sources":["../../../src/operator-actions/db/lifecycle-delivery.model.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"lifecycle-delivery.model.js","sourceRoot":"","sources":["../../../src/operator-actions/db/lifecycle-delivery.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,8 @@ export declare class LifecycleDelivery extends Table {
|
|
|
14
14
|
status: OperatorActionStatus;
|
|
15
15
|
attemptCount: number;
|
|
16
16
|
revision: string;
|
|
17
|
+
claimId: string | null;
|
|
18
|
+
claimExpiresAt: Date | null;
|
|
17
19
|
receiptId: string | null;
|
|
18
20
|
acceptedAt: Date | null;
|
|
19
21
|
effectiveAt: Date | null;
|
|
@@ -62,6 +62,14 @@ __decorate([
|
|
|
62
62
|
(0, interface_database_decorators_1.Field)("string"),
|
|
63
63
|
__metadata("design:type", String)
|
|
64
64
|
], LifecycleDelivery.prototype, "revision", void 0);
|
|
65
|
+
__decorate([
|
|
66
|
+
(0, interface_database_decorators_1.Field)("string"),
|
|
67
|
+
__metadata("design:type", Object)
|
|
68
|
+
], LifecycleDelivery.prototype, "claimId", void 0);
|
|
69
|
+
__decorate([
|
|
70
|
+
(0, interface_database_decorators_1.Field)("date"),
|
|
71
|
+
__metadata("design:type", Object)
|
|
72
|
+
], LifecycleDelivery.prototype, "claimExpiresAt", void 0);
|
|
65
73
|
__decorate([
|
|
66
74
|
(0, interface_database_decorators_1.Field)("string"),
|
|
67
75
|
__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-delivery.table.js","sourceRoot":"","sources":["../../../src/operator-actions/db/lifecycle-delivery.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAQmD;AACnD,mEAAuE;AACvE,qFAA2E;AAI9D,QAAA,4BAA4B,GAAG,2BAA2B,CAAC;AASjE,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,qCAAK;
|
|
1
|
+
{"version":3,"file":"lifecycle-delivery.table.js","sourceRoot":"","sources":["../../../src/operator-actions/db/lifecycle-delivery.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAQmD;AACnD,mEAAuE;AACvE,qFAA2E;AAI9D,QAAA,4BAA4B,GAAG,2BAA2B,CAAC;AASjE,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,qCAAK;CAyE3C,CAAA;AAzEY,8CAAiB;AAEpB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;8CACI;AAIZ;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;sDACY;AAKpB;IAHP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;IACf,IAAA,wCAAQ,EAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,sBAAM,EAAE,CAAC;;mDACN;AAIjB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;mDACS;AAGjB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;qDACiC;AAGzC;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;gEAC6B;AAGrC;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;4DAC6C;AAIrD;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;iDACqB;AAG7B;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;uDACa;AAGrB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;mDACS;AAIjB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;kDACe;AAIvB;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;;yDACsB;AAG5B;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;oDACiB;AAGzB;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;;qDACkB;AAGxB;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;;sDACmB;AAGzB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;wDACqB;AAG7B;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACO,IAAI;sDAAC;AAKlB;IAHP,IAAA,4CAAY,GAAE;IACd,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;oDAAC;AAGhB;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;;oDACiB;AAGvB;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;;sDACmB;AAIzB;IAFP,IAAA,0CAAU,GAAE;IACZ,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;oDAAC;4BAxEb,iBAAiB;IAD7B,IAAA,6CAAa,EAAC,oCAA4B,EAAE,4BAAgB,CAAC;GACjD,iBAAiB,CAyE7B"}
|
|
@@ -55,6 +55,8 @@ function buildDelivery(input, consumer) {
|
|
|
55
55
|
attemptCount: 0,
|
|
56
56
|
revision: (0, node_crypto_1.randomUUID)(),
|
|
57
57
|
receiptId: null,
|
|
58
|
+
claimId: null,
|
|
59
|
+
claimExpiresAt: null,
|
|
58
60
|
acceptedAt: null,
|
|
59
61
|
effectiveAt: null,
|
|
60
62
|
lastErrorCode: null,
|
|
@@ -189,18 +191,22 @@ async function invokeConsumer(model, delivery, consumer) {
|
|
|
189
191
|
}
|
|
190
192
|
async function deliverOne(delivery) {
|
|
191
193
|
if (delivery.status === STATUS_SUCCEEDED)
|
|
192
|
-
return
|
|
194
|
+
return "settled";
|
|
193
195
|
const consumer = resolveConsumer(delivery);
|
|
194
196
|
if (!consumer)
|
|
195
197
|
throw new Error("Workspace lifecycle consumer is unavailable");
|
|
196
198
|
const model = (0, interface_database_decorators_1.GetModel)(lifecycle_delivery_model_1.LifecycleDeliveryModel);
|
|
197
|
-
await
|
|
198
|
-
|
|
199
|
+
const claimed = await model.claim(delivery);
|
|
200
|
+
if (!claimed)
|
|
201
|
+
return "held_elsewhere";
|
|
202
|
+
await invokeConsumer(model, claimed, consumer);
|
|
203
|
+
return "delivered";
|
|
199
204
|
}
|
|
200
205
|
async function dispatchWorkspaceLifecycle(input) {
|
|
201
206
|
const deliveries = await persistDeliveries(input);
|
|
202
207
|
for (const delivery of deliveries) {
|
|
203
|
-
await deliverOne(delivery)
|
|
208
|
+
if ((await deliverOne(delivery)) === "held_elsewhere")
|
|
209
|
+
throw new Error("Workspace lifecycle delivery is in flight; retry");
|
|
204
210
|
}
|
|
205
211
|
}
|
|
206
212
|
async function reconcileWorkspaceLifecycleDeliveries() {
|
|
@@ -216,7 +222,7 @@ async function reconcileWorkspaceLifecycleDeliveries() {
|
|
|
216
222
|
continue;
|
|
217
223
|
}
|
|
218
224
|
try {
|
|
219
|
-
if (await deliverOne(delivery))
|
|
225
|
+
if ((await deliverOne(delivery)) === "delivered")
|
|
220
226
|
result.delivered += 1;
|
|
221
227
|
}
|
|
222
228
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle-outbox.js","sourceRoot":"","sources":["../../src/operator-actions/lifecycle-outbox.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"lifecycle-outbox.js","sourceRoot":"","sources":["../../src/operator-actions/lifecycle-outbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -177,7 +177,13 @@ async function processTenantInJob(job, tenantId) {
|
|
|
177
177
|
});
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
|
-
|
|
180
|
+
const LIVE_EXECUTORS_KEY = Symbol.for("@antelopejs/dms-saas/plan-migration-executors");
|
|
181
|
+
function liveExecutors() {
|
|
182
|
+
const host = globalThis;
|
|
183
|
+
host[LIVE_EXECUTORS_KEY] ??= new Set();
|
|
184
|
+
return host[LIVE_EXECUTORS_KEY];
|
|
185
|
+
}
|
|
186
|
+
async function executePlanMigrationJob(jobId) {
|
|
181
187
|
const model = (0, interface_database_decorators_1.GetModel)(db_2.PlanMigrationModel);
|
|
182
188
|
const job = await model.get(jobId);
|
|
183
189
|
if (!job || job.status !== "pending")
|
|
@@ -194,14 +200,28 @@ async function processPlanMigrationJob(jobId) {
|
|
|
194
200
|
completedAt: new Date(),
|
|
195
201
|
});
|
|
196
202
|
}
|
|
203
|
+
async function processPlanMigrationJob(jobId) {
|
|
204
|
+
const executors = liveExecutors();
|
|
205
|
+
if (executors.has(jobId))
|
|
206
|
+
return;
|
|
207
|
+
executors.add(jobId);
|
|
208
|
+
try {
|
|
209
|
+
await executePlanMigrationJob(jobId);
|
|
210
|
+
}
|
|
211
|
+
finally {
|
|
212
|
+
executors.delete(jobId);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
197
215
|
async function resumePendingPlanMigrations() {
|
|
198
216
|
const model = (0, interface_database_decorators_1.GetModel)(db_2.PlanMigrationModel);
|
|
199
217
|
for (const job of await model.findResumable()) {
|
|
200
|
-
if (job.status
|
|
201
|
-
await
|
|
218
|
+
if (job.status !== "running") {
|
|
219
|
+
await processPlanMigrationJob(job._id);
|
|
202
220
|
continue;
|
|
203
221
|
}
|
|
204
|
-
|
|
222
|
+
if (liveExecutors().has(job._id))
|
|
223
|
+
continue;
|
|
224
|
+
await model.markInterrupted(job);
|
|
205
225
|
}
|
|
206
226
|
}
|
|
207
227
|
//# sourceMappingURL=plan-migration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-migration.js","sourceRoot":"","sources":["../../src/workers/plan-migration.ts"],"names":[],"mappings":";;AAgDA,8DAQC;
|
|
1
|
+
{"version":3,"file":"plan-migration.js","sourceRoot":"","sources":["../../src/workers/plan-migration.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/dms-saas",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.12",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@antelopejs/interface-database": ">=0.1.8 <1.0.0",
|
|
37
37
|
"@antelopejs/interface-database-decorators": ">=0.1.7 <1.0.0",
|
|
38
38
|
"@antelopejs/interface-dms": ">=0.3.2 <1.0.0",
|
|
39
|
-
"@antelopejs/interface-dms-saas": ">=0.2.
|
|
39
|
+
"@antelopejs/interface-dms-saas": ">=0.2.7 <0.3.0",
|
|
40
40
|
"node-cron": "^4.2.1",
|
|
41
41
|
"stripe": "^22.6.2",
|
|
42
42
|
"zod": "^3.24.4"
|