@getstrata/core 3.1.6 → 3.1.7
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/CHANGELOG.md +4 -0
- package/dist/core/contracts/application.d.ts +5 -2
- package/dist/core/contracts/persistence.d.ts +2 -2
- package/dist/core/queue/queueServices.d.ts +2 -2
- package/dist/core/runtime/executionContext.d.ts +2 -1
- package/dist/entries/queue/createAppQueue.js +1 -1
- package/dist/entries/queue/publicQueue.js +1 -1
- package/dist/entries/queue/queueHandoff.js +8 -0
- package/dist/entries/queue/queueServices.js +1 -1
- package/dist/entries/queue/queueWorkerTransport.js +1 -1
- package/dist/entries/runtime/application.js +14 -4
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -114,6 +114,9 @@ type ExecutionEnvelope = ExecutionEnvelopeFields & ({
|
|
|
114
114
|
readonly kind: "job";
|
|
115
115
|
readonly actor: ExecutionActor;
|
|
116
116
|
});
|
|
117
|
+
interface ExecutionOptions {
|
|
118
|
+
readonly drainOnStop?: boolean;
|
|
119
|
+
}
|
|
117
120
|
type ExecutionContext = ExecutionEnvelope & {
|
|
118
121
|
readonly applicationId: string;
|
|
119
122
|
readonly executionId: string;
|
|
@@ -152,6 +155,6 @@ interface Application {
|
|
|
152
155
|
/** Stable, never rejecting; remains pending while owned operations are actually still running. */
|
|
153
156
|
readonly completion: Promise<CompletionResult>;
|
|
154
157
|
run<T>(work: (scope: CommandScope) => T | Promise<T>): Promise<T>;
|
|
155
|
-
run<T>(envelope: ExecutionEnvelope, work: (scope: CommandScope) => T | Promise<T
|
|
158
|
+
run<T>(envelope: ExecutionEnvelope, work: (scope: CommandScope) => T | Promise<T>, options?: ExecutionOptions): Promise<T>;
|
|
156
159
|
}
|
|
157
|
-
export type { Application, ApplicationConfig, ApplicationConfigValue, ApplicationDefinition, ApplicationDiagnostic, ApplicationPhase, ApplicationSnapshot, BootDisposition, CleanupContext, CleanupDisposition, CommandScope, CompletionResult, ExecutionActor, ExecutionContext, ExecutionEnvelope, ExecutionTaskOutcome, OpenOutcome, ProviderDefinition, ProviderScope, ResourcePhase, ResourceSpec, StopResult, TransportDefinition, };
|
|
160
|
+
export type { Application, ApplicationConfig, ApplicationConfigValue, ApplicationDefinition, ApplicationDiagnostic, ApplicationPhase, ApplicationSnapshot, BootDisposition, CleanupContext, CleanupDisposition, CommandScope, CompletionResult, ExecutionActor, ExecutionContext, ExecutionEnvelope, ExecutionOptions, ExecutionTaskOutcome, OpenOutcome, ProviderDefinition, ProviderScope, ResourcePhase, ResourceSpec, StopResult, TransportDefinition, };
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { DatabaseSession, TransactionSession } from "../database/session";
|
|
2
|
-
import type { ExecutionEnvelope } from "./application";
|
|
2
|
+
import type { ExecutionEnvelope, ExecutionOptions } from "./application";
|
|
3
3
|
export type SelectedSession = DatabaseSession | TransactionSession;
|
|
4
4
|
export interface ExecutionPersistence {
|
|
5
5
|
readonly database: DatabaseSession;
|
|
6
6
|
readonly policy: ScopedPolicy;
|
|
7
7
|
}
|
|
8
|
-
export type PersistenceInvocation = <T>(envelope: ExecutionEnvelope, work: (ports: ExecutionPersistence) => T | Promise<T
|
|
8
|
+
export type PersistenceInvocation = <T>(envelope: ExecutionEnvelope, work: (ports: ExecutionPersistence) => T | Promise<T>, options?: ExecutionOptions) => Promise<T>;
|
|
9
9
|
export type EstablishedDatabasePolicy = Readonly<{
|
|
10
10
|
kind: "tenant";
|
|
11
11
|
tenantId: number;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type QueueHandoff } from "@getstrata/core/queue/queueHandoff";
|
|
2
|
-
import type { ExecutionEnvelope } from "../contracts/application";
|
|
2
|
+
import type { ExecutionEnvelope, ExecutionOptions } from "../contracts/application";
|
|
3
3
|
import type { DatabaseSession } from "../database/session";
|
|
4
4
|
import type FailedJobService from "./failedJobService";
|
|
5
5
|
import type { JobContext } from "./index";
|
|
@@ -8,7 +8,7 @@ import type { QueueJobEnvelope } from "./jobRunner";
|
|
|
8
8
|
type QueueInvocation = <T>(envelope: ExecutionEnvelope, work: (ports: {
|
|
9
9
|
readonly database: DatabaseSession;
|
|
10
10
|
readonly policy?: import("../contracts/persistence").ScopedPolicy;
|
|
11
|
-
}) => T | Promise<T
|
|
11
|
+
}) => T | Promise<T>, options?: ExecutionOptions) => Promise<T>;
|
|
12
12
|
type FailureInput = Parameters<FailedJobService["recordFailure"]>[0];
|
|
13
13
|
interface QueueServices extends Pick<FailedJobService, "recordFailure" | "listRecent" | "retry" | "delete" | "flush"> {
|
|
14
14
|
runAttempt(envelope: QueueJobEnvelope, context: JobContext, work: (context: JobContext) => Promise<void>): Promise<void>;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ExecutionContext, ExecutionEnvelope } from "../contracts/application";
|
|
2
|
+
declare function readDrainOnStop(options: unknown): boolean;
|
|
2
3
|
/** Validation and copying perform no timer, listener, container or factory effects. */
|
|
3
4
|
declare function normalizeExecutionEnvelope(input: unknown): ExecutionEnvelope;
|
|
4
5
|
declare function ownExecutionContext(envelope: ExecutionEnvelope, applicationId: string, appSignal: AbortSignal): {
|
|
@@ -7,4 +8,4 @@ declare function ownExecutionContext(envelope: ExecutionEnvelope, applicationId:
|
|
|
7
8
|
check: () => void;
|
|
8
9
|
admit(drainSignal: AbortSignal): void;
|
|
9
10
|
};
|
|
10
|
-
export { normalizeExecutionEnvelope, ownExecutionContext };
|
|
11
|
+
export { normalizeExecutionEnvelope, ownExecutionContext, readDrainOnStop };
|
|
@@ -92,6 +92,14 @@ function record(input, keys) {
|
|
|
92
92
|
}
|
|
93
93
|
return result;
|
|
94
94
|
}
|
|
95
|
+
function readDrainOnStop(options) {
|
|
96
|
+
if (options === undefined)
|
|
97
|
+
return false;
|
|
98
|
+
const { drainOnStop } = record(options, ["drainOnStop"]);
|
|
99
|
+
if (drainOnStop !== undefined && typeof drainOnStop !== "boolean")
|
|
100
|
+
throw new TypeError("Execution drainOnStop must be boolean.");
|
|
101
|
+
return drainOnStop === true;
|
|
102
|
+
}
|
|
95
103
|
function metadata(value) {
|
|
96
104
|
if (value === null || typeof value !== "object" || Array.isArray(value)) {
|
|
97
105
|
throw new TypeError("Execution metadata must be a plain record.");
|
|
@@ -101,6 +101,14 @@ function record(input, keys) {
|
|
|
101
101
|
}
|
|
102
102
|
return result;
|
|
103
103
|
}
|
|
104
|
+
function readDrainOnStop(options) {
|
|
105
|
+
if (options === undefined)
|
|
106
|
+
return false;
|
|
107
|
+
const { drainOnStop } = record(options, ["drainOnStop"]);
|
|
108
|
+
if (drainOnStop !== undefined && typeof drainOnStop !== "boolean")
|
|
109
|
+
throw new TypeError("Execution drainOnStop must be boolean.");
|
|
110
|
+
return drainOnStop === true;
|
|
111
|
+
}
|
|
104
112
|
function metadata(value) {
|
|
105
113
|
if (value === null || typeof value !== "object" || Array.isArray(value)) {
|
|
106
114
|
throw new TypeError("Execution metadata must be a plain record.");
|
|
@@ -1232,19 +1240,21 @@ class OwnedApplication {
|
|
|
1232
1240
|
stop(options = {}) {
|
|
1233
1241
|
return this.taskStorage.run(undefined, () => this.beginStop(options.reason ?? "shutdown", this.definition.shutdownTimeoutMs));
|
|
1234
1242
|
}
|
|
1235
|
-
run(input, callback) {
|
|
1243
|
+
run(input, callback, options) {
|
|
1236
1244
|
return this.taskStorage.run(undefined, () => {
|
|
1237
1245
|
if (this.phase !== "ready") {
|
|
1238
1246
|
return observed2(Promise.reject(new ApplicationStateError("APPLICATION_NOT_READY", this.id)));
|
|
1239
1247
|
}
|
|
1240
1248
|
let envelope;
|
|
1241
1249
|
let work;
|
|
1250
|
+
let drainOnStop;
|
|
1242
1251
|
try {
|
|
1243
1252
|
const candidate = typeof input === "function" && callback === undefined ? input : callback;
|
|
1244
1253
|
if (typeof candidate !== "function")
|
|
1245
1254
|
throw new TypeError("Execution callback must be a function.");
|
|
1246
1255
|
work = candidate;
|
|
1247
1256
|
envelope = normalizeExecutionEnvelope(typeof input === "function" && callback === undefined ? { kind: "command" } : input);
|
|
1257
|
+
drainOnStop = readDrainOnStop(options) || envelope.kind === "request";
|
|
1248
1258
|
if (this.phase !== "ready" || this.cancellation.signal.aborted) {
|
|
1249
1259
|
throw new ApplicationStateError("APPLICATION_NOT_READY", this.id);
|
|
1250
1260
|
}
|
|
@@ -1255,11 +1265,11 @@ class OwnedApplication {
|
|
|
1255
1265
|
observed2(result.promise);
|
|
1256
1266
|
this.commands.add(result.promise);
|
|
1257
1267
|
result.promise.then(() => this.commandSettled(result.promise), () => this.commandSettled(result.promise));
|
|
1258
|
-
this.execute(envelope, work).then(result.resolve, result.reject);
|
|
1268
|
+
this.execute(envelope, work, drainOnStop).then(result.resolve, result.reject);
|
|
1259
1269
|
return result.promise;
|
|
1260
1270
|
});
|
|
1261
1271
|
}
|
|
1262
|
-
async execute(envelope, work) {
|
|
1272
|
+
async execute(envelope, work, drainOnStop) {
|
|
1263
1273
|
const owner = ownExecutionContext(envelope, this.id, this.cancellation.signal);
|
|
1264
1274
|
try {
|
|
1265
1275
|
const { context } = owner;
|
|
@@ -1333,7 +1343,7 @@ class OwnedApplication {
|
|
|
1333
1343
|
});
|
|
1334
1344
|
};
|
|
1335
1345
|
const callbacks = initialization.ok ? await settleExecutionTasks((scope) => {
|
|
1336
|
-
if (
|
|
1346
|
+
if (drainOnStop)
|
|
1337
1347
|
owner.admit(this.cleanupCancellation.signal);
|
|
1338
1348
|
return work(scope);
|
|
1339
1349
|
}, owner.check, (body, spawn, resources, dispatch) => {
|