@qlever-llc/trellis 0.8.4 → 0.9.0-rc.3

package/script/npm/src/server/internal_jobs/active-job.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"active-job.d.ts","sourceRoot":"","sources":["../../../../../src/server/internal_jobs/active-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEhE,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,OAAO,EAAE,MAAM;CAI5B;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,qBAAa,oBAAoB;;IAI/B,MAAM,IAAI,IAAI;IAQd,iBAAiB,IAAI,IAAI;IAKzB,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,WAAW,IAAI,OAAO;IAItB,cAAc,IAAI,OAAO;IAIzB,cAAc,IAAI,OAAO;CAG1B;AAED,KAAK,cAAc,GAAG;IACpB,cAAc,EAAE,CAAC,QAAQ,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,GAAG,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC,CAAC;AAEF,qBAAa,SAAS,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO;;gBAOxD,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,EAC3B,YAAY,EAAE,oBAAoB,EAClC,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,wBAAwB;IAQpC,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAIvC,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,WAAW,IAAI,OAAO;IAItB,iBAAiB,IAAI,oBAAoB;IAIzC,eAAe,IAAI,MAAM;IAIzB,YAAY,IAAI,OAAO;IAIvB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1B,cAAc,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpD,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOjE"}
+{"version":3,"file":"active-job.d.ts","sourceRoot":"","sources":["../../../../../src/server/internal_jobs/active-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5E,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,OAAO,EAAE,MAAM;CAI5B;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,qBAAa,oBAAoB;;IAI/B,MAAM,IAAI,IAAI;IAQd,iBAAiB,IAAI,IAAI;IAKzB,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,WAAW,IAAI,OAAO;IAItB,cAAc,IAAI,OAAO;IAIzB,cAAc,IAAI,OAAO;CAG1B;AAED,KAAK,cAAc,GAAG;IACpB,cAAc,EAAE,CAAC,QAAQ,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,GAAG,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC,CAAC;AAEF,qBAAa,SAAS,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO;;gBAOxD,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,EAC3B,YAAY,EAAE,oBAAoB,EAClC,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,wBAAwB;IAQpC,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAIvC,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC;IAI/B,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,WAAW,IAAI,OAAO;IAItB,iBAAiB,IAAI,oBAAoB;IAIzC,eAAe,IAAI,MAAM;IAIzB,YAAY,IAAI,OAAO;IAIvB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1B,cAAc,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpD,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOjE"}

package/script/npm/src/server/internal_jobs/active-job.js

@@ -65,6 +65,9 @@ class ActiveJob {
     job() {
         return __classPrivateFieldGet(this, _ActiveJob_job, "f");
     }
+    context() {
+        return __classPrivateFieldGet(this, _ActiveJob_job, "f").context;
+    }
     get signal() {
         return __classPrivateFieldGet(this, _ActiveJob_cancellation, "f").signal;
     }

package/script/npm/src/server/internal_jobs/job-manager.d.ts

@@ -1,8 +1,11 @@
+import { type MsgHdrs } from "@nats-io/nats-core";
 import { ActiveJob, ActiveJobRuntimeError, JobCancellationToken } from "./active-job.js";
 import type { JobsBinding, JobsQueueBinding } from "./bindings.js";
 import type { Job, JobLogEntry, JobProgress } from "./types.js";
 type Publisher = {
-    publish(subject: string, payload: Uint8Array): void | Promise<void>;
+    publish(subject: string, payload: Uint8Array, opts?: {
+        headers?: MsgHdrs;
+    }): void | Promise<void>;
 };
 type JobMetaSource = {
     nextJobId(): string;

package/script/npm/src/server/internal_jobs/job-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job-manager.d.ts","sourceRoot":"","sources":["../../../../../src/server/internal_jobs/job-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"job-manager.d.ts","sourceRoot":"","sources":["../../../../../src/server/internal_jobs/job-manager.ts"],"names":[],"mappings":"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"}

package/script/npm/src/server/internal_jobs/job-manager.js

@@ -13,7 +13,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _JobManager_instances, _JobManager_context, _JobManager_meta, _JobManager_getQueueBinding, _JobManager_publishJobEvent;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobCancellationToken = exports.ActiveJobRuntimeError = exports.ActiveJob = exports.JobManager = exports.JobProcessError = void 0;
+const nats_core_1 = require("@nats-io/nats-core");
 const ulid_1 = require("ulid");
+const carrier_js_1 = require("../../telemetry/carrier.js");
 const active_job_js_1 = require("./active-job.js");
 Object.defineProperty(exports, "ActiveJob", { enumerable: true, get: function () { return active_job_js_1.ActiveJob; } });
 Object.defineProperty(exports, "ActiveJobRuntimeError", { enumerable: true, get: function () { return active_job_js_1.ActiveJobRuntimeError; } });
@@ -49,6 +51,7 @@ class JobManager {
         const meta = __classPrivateFieldGet(this, _JobManager_instances, "m", _JobManager_meta).call(this);
         const now = meta.nowIso();
         const id = meta.nextJobId();
+        const context = createJobContext();
         const namespace = __classPrivateFieldGet(this, _JobManager_context, "f").jobs.namespace;
         const deadline = computeDeadline(now, binding.defaultDeadlineMs);
         const job = {
@@ -56,6 +59,7 @@ class JobManager {
             service: namespace,
             type,
             state: "pending",
+            context,
             payload,
             createdAt: now,
             updatedAt: now,
@@ -69,6 +73,7 @@ class JobManager {
             jobType: type,
             eventType: "created",
             state: "pending",
+            context,
             tries: 0,
             maxTries: binding.maxDeliver,
             payload,
@@ -93,6 +98,7 @@ class JobManager {
             eventType: "started",
             state: "active",
             previousState: job.state,
+            context: job.context,
             tries,
             timestamp: __classPrivateFieldGet(this, _JobManager_instances, "m", _JobManager_meta).call(this).nowIso(),
         });
@@ -121,6 +127,7 @@ class JobManager {
                 eventType: "completed",
                 state: "completed",
                 previousState: "active",
+                context: job.context,
                 tries,
                 result,
                 timestamp: __classPrivateFieldGet(this, _JobManager_instances, "m", _JobManager_meta).call(this).nowIso(),
@@ -144,6 +151,7 @@ class JobManager {
                         eventType: "retry",
                         state: "retry",
                         previousState: "active",
+                        context: job.context,
                         tries,
                         error: detail,
                         timestamp: __classPrivateFieldGet(this, _JobManager_instances, "m", _JobManager_meta).call(this).nowIso(),
@@ -157,6 +165,7 @@ class JobManager {
                     eventType: "failed",
                     state: "failed",
                     previousState: "active",
+                    context: job.context,
                     tries,
                     error: detail,
                     timestamp: __classPrivateFieldGet(this, _JobManager_instances, "m", _JobManager_meta).call(this).nowIso(),
@@ -181,6 +190,7 @@ class JobManager {
             eventType: "progress",
             state: "active",
             previousState: "active",
+            context: job.context,
             tries: job.tries,
             progress,
             timestamp: __classPrivateFieldGet(this, _JobManager_instances, "m", _JobManager_meta).call(this).nowIso(),
@@ -201,6 +211,7 @@ class JobManager {
             eventType: "logged",
             state: "active",
             previousState: "active",
+            context: job.context,
             tries: job.tries,
             logs: [log],
             timestamp: __classPrivateFieldGet(this, _JobManager_instances, "m", _JobManager_meta).call(this).nowIso(),
@@ -246,7 +257,8 @@ _JobManager_context = new WeakMap(), _JobManager_instances = new WeakSet(), _Job
     return binding;
 }, _JobManager_publishJobEvent = async function _JobManager_publishJobEvent(type, jobId, event) {
     const binding = __classPrivateFieldGet(this, _JobManager_instances, "m", _JobManager_getQueueBinding).call(this, type);
-    await __classPrivateFieldGet(this, _JobManager_context, "f").nc.publish(`${binding.publishPrefix}.${jobId}.${event.eventType}`, new TextEncoder().encode(JSON.stringify(event)));
+    const headers = headersFromJobContext(event.context);
+    await __classPrivateFieldGet(this, _JobManager_context, "f").nc.publish(`${binding.publishPrefix}.${jobId}.${event.eventType}`, new TextEncoder().encode(JSON.stringify(event)), { headers });
 };
 function computeDeadline(now, deadlineMs) {
     if (deadlineMs === undefined) {
@@ -256,3 +268,51 @@ function computeDeadline(now, deadlineMs) {
     timestamp.setTime(timestamp.getTime() + deadlineMs);
     return timestamp.toISOString();
 }
+function createJobContext() {
+    const carrier = (0, carrier_js_1.createMapCarrier)();
+    (0, carrier_js_1.injectTraceContext)(carrier);
+    const inheritedTraceparent = carrier.get("traceparent");
+    const traceparent = isValidTraceparent(inheritedTraceparent)
+        ? inheritedTraceparent
+        : synthesizeTraceparent();
+    const tracestate = carrier.get("tracestate");
+    return {
+        requestId: (0, ulid_1.ulid)(),
+        traceId: traceparent.slice(3, 35),
+        traceparent,
+        ...(tracestate ? { tracestate } : {}),
+    };
+}
+function headersFromJobContext(context) {
+    const headers = (0, nats_core_1.headers)();
+    headers.set("request-id", context.requestId);
+    headers.set("traceparent", context.traceparent);
+    if (context.tracestate) {
+        headers.set("tracestate", context.tracestate);
+    }
+    return headers;
+}
+function isValidTraceparent(value) {
+    if (value === undefined ||
+        !/^[0-9a-f]{2}-[0-9a-f]{32}-[0-9a-f]{16}-[0-9a-f]{2}$/.test(value)) {
+        return false;
+    }
+    return !isAllZeroHex(value.slice(3, 35)) &&
+        !isAllZeroHex(value.slice(36, 52));
+}
+function synthesizeTraceparent() {
+    return `00-${randomNonZeroHex(16)}-${randomNonZeroHex(8)}-01`;
+}
+function randomNonZeroHex(byteLength) {
+    let value = "";
+    do {
+        const bytes = new Uint8Array(byteLength);
+        crypto.getRandomValues(bytes);
+        value = Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0"))
+            .join("");
+    } while (isAllZeroHex(value));
+    return value;
+}
+function isAllZeroHex(value) {
+    return /^0+$/.test(value);
+}

package/script/npm/src/server/internal_jobs/projection.js

@@ -31,6 +31,7 @@ function seedJobFromEvent(event) {
         service: event.service,
         type: event.jobType,
         state: event.state,
+        context: event.context,
         payload: event.payload,
         createdAt: event.timestamp,
         updatedAt: event.timestamp,

package/script/npm/src/server/internal_jobs/runtime-worker.d.ts

@@ -2,7 +2,7 @@ import type { NatsConnection } from "@nats-io/nats-core";
 import type { JobsRuntimeBinding } from "./bindings.js";
 import type { ActiveJob, JobProcessOutcome } from "./job-manager.js";
 import { JobCancellationToken, type JobManager } from "./job-manager.js";
-import type { Job } from "./types.js";
+import type { Job, JobEvent } from "./types.js";
 export type WorkerAckAction = "ack" | "nak";
 export type ProjectedWorkDecision = "process" | "skip-ack";
 export type SchemaRef = {
@@ -61,6 +61,7 @@ type StartNatsConsumerDeps = {
             add(stream: string, config: Record<string, unknown>): Promise<ConsumerInfoLike>;
             info(stream: string, consumer: string): Promise<ConsumerInfoLike>;
         };
+        direct?: DirectMessageReader;
     };
     js: {
         consumers: {
@@ -68,6 +69,13 @@ type StartNatsConsumerDeps = {
         };
     };
 };
+type DirectMessageReader = {
+    getMessage(stream: string, query: {
+        last_by_subj: string;
+    }): Promise<{
+        data: Uint8Array;
+    } | null>;
+};
 type StartNatsConnectionDeps = {
     nats: NatsConnection;
     jsm?: undefined;
@@ -93,6 +101,7 @@ type StartWorkerHostOptions = {
 type StartNatsWorkerHostOptions<TResult> = Omit<StartWorkerHostOptions, "startWorker"> & StartNatsRuntimeDeps & {
     manager: JobManager<unknown, TResult>;
     getProjectedJob?: (job: Job<unknown, TResult>) => Promise<Job<unknown, TResult> | undefined>;
+    getLatestLifecycleEvent?: (job: Job<unknown, TResult>) => Promise<JobEvent | undefined>;
     validatePayload?: (args: PayloadValidationArgs<TResult>) => Promise<void> | void;
     validateResult?: (args: ResultValidationArgs<TResult>) => Promise<void> | void;
     handler: (job: ActiveJob<unknown, TResult>) => Promise<TResult>;
@@ -103,6 +112,7 @@ type StartQueueWorkerLoopOptions<TResult> = {
     cancelSubscription: CancelSubscriptionLike;
     hostCancellation?: JobCancellationToken;
     getProjectedJob?: (job: Job<unknown, TResult>) => Promise<Job<unknown, TResult> | undefined>;
+    getLatestLifecycleEvent?: (job: Job<unknown, TResult>) => Promise<JobEvent | undefined>;
     payloadSchema?: SchemaRef;
     validatePayload?: (args: PayloadValidationArgs<TResult>) => Promise<void> | void;
     resultSchema?: SchemaRef;
@@ -115,6 +125,7 @@ type StartNatsQueueWorkerOptions<TResult> = StartNatsRuntimeDeps & {
     queueType: string;
     hostCancellation?: JobCancellationToken;
     getProjectedJob?: (job: Job<unknown, TResult>) => Promise<Job<unknown, TResult> | undefined>;
+    getLatestLifecycleEvent?: (job: Job<unknown, TResult>) => Promise<JobEvent | undefined>;
     validatePayload?: (args: PayloadValidationArgs<TResult>) => Promise<void> | void;
     validateResult?: (args: ResultValidationArgs<TResult>) => Promise<void> | void;
     handler: (job: ActiveJob<unknown, TResult>) => Promise<TResult>;
@@ -128,6 +139,7 @@ export declare function processWorkPayloadWithContextAndHeartbeat<TResult>(manag
     redeliveryCount?: number;
 }): Promise<JobProcessOutcome<TResult> | undefined>;
 export declare function projectedWorkDecision(projected: Job | undefined, _work: Job): ProjectedWorkDecision;
+export declare function lifecycleWorkDecision(latest: JobEvent | undefined): ProjectedWorkDecision;
 export declare function ackActionForOutcome(outcome: JobProcessOutcome<unknown> | undefined): WorkerAckAction;
 export declare function startQueueWorkerLoop<TResult>(options: StartQueueWorkerLoopOptions<TResult>): Promise<{
     stop(): Promise<void>;

package/script/npm/src/server/internal_jobs/runtime-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-worker.d.ts","sourceRoot":"","sources":["../../../../../src/server/internal_jobs/runtime-worker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAgB,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAoB,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAG1E,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EACL,oBAAoB,EACpB,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,GAAG,EAAY,MAAM,YAAY,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,KAAK,CAAC;AAC5C,MAAM,MAAM,qBAAqB,GAAG,SAAS,GAAG,UAAU,CAAC;AAC3D,MAAM,MAAM,SAAS,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAC3C,MAAM,MAAM,qBAAqB,CAAC,OAAO,IAAI;IAC3C,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,IAAI;IAC1C,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,cAAc;gBACzC,MAAM,EAAE,OAAO,EAAE;CAI9B;AAED,qBAAa,mBAAoB,SAAQ,cAAc;gBACzC,MAAM,EAAE,OAAO,EAAE;CAI9B;AAED,qBAAa,8BAA+B,SAAQ,KAAK;gBAC3C,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAQ9C;AAED,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACpC,GAAG,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,UAAU,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC,CAAC;AAEF,KAAK,oBAAoB,GAAG,aAAa,CAAC,eAAe,CAAC,GAAG;IAC3D,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC;CAC5C,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAC1C,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG,aAAa,CAAC,iBAAiB,CAAC,GAAG;IAC/D,WAAW,IAAI,IAAI,CAAC;CACrB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IAAE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,GAAG,IAAI,CAAC;AAEzD,KAAK,gBAAgB,GAAG,OAAO,CAAC;AAEhC,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IACxC,GAAG,EAAE;QACH,SAAS,EAAE;YACT,GAAG,CACD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC7B,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;SACnE,CAAC;KACH,CAAC;IACF,EAAE,EAAE;QACF,SAAS,EAAE;YACT,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,GAAG,kBAAkB,CAAC;SACjE,CAAC;KACH,CAAC;CACH,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,EAAE,CAAC,EAAE,SAAS,CAAC;CAChB,CAAC;AAEF,KAAK,oBAAoB,GAAG,qBAAqB,GAAG,uBAAuB,CAAC;AAQ5E,KAAK,eAAe,GAAG;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,kBAAkB,CAAC,EAAE;QACnB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACrE,CAAC;IACF,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,WAAW,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACnE,CAAC;AAEF,KAAK,0BAA0B,CAAC,OAAO,IACnC,IAAI,CAAC,sBAAsB,EAAE,aAAa,CAAC,GAC3C,oBAAoB,GACpB;IACA,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,CAChB,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,KACvB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;IAChD,eAAe,CAAC,EAAE,CAChB,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,KACjC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAChC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACjE,CAAC;AAEJ,KAAK,2BAA2B,CAAC,OAAO,IAAI;IAC1C,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,kBAAkB,EAAE,sBAAsB,CAAC;IAC3C,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;IACxC,eAAe,CAAC,EAAE,CAChB,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,KACvB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,eAAe,CAAC,EAAE,CAChB,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,KACjC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAChC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACjE,CAAC;AAEF,KAAK,2BAA2B,CAAC,OAAO,IACpC,oBAAoB,GACpB;IACA,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;IACxC,eAAe,CAAC,EAAE,CAChB,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,KACvB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;IAChD,eAAe,CAAC,EAAE,CAChB,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,KACjC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAChC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACjE,CAAC;AAqCJ,wBAAsB,yCAAyC,CAAC,OAAO,EACrE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,EACrC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,oBAAoB,EAClC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,EAC/D,UAAU,CAAC,EAAE;IACX,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,eAAe,CAAC,EAAE,CAChB,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,KACjC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,cAAc,CAAC,EAAE,CACf,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAChC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC3B,EACD,OAAO,CAAC,EAAE;IAAE,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CAwCjD;AAED,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,GAAG,GAAG,SAAS,EAC1B,KAAK,EAAE,GAAG,GACT,qBAAqB,CAKvB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,SAAS,GAC9C,eAAe,CAWjB;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAChD,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC;IAAE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CA6HpC;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAChD,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC;IAAE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAkCpC;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC;IAAE,WAAW,IAAI,MAAM,CAAC;IAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CA2E3D;AAED,wBAAsB,8BAA8B,CAAC,OAAO,EAC1D,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC3C,OAAO,CAAC;IAAE,WAAW,IAAI,MAAM,CAAC;IAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CA6B3D"}
+{"version":3,"file":"runtime-worker.d.ts","sourceRoot":"","sources":["../../../../../src/server/internal_jobs/runtime-worker.ts"],"names":[],"mappings":"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"}

package/script/npm/src/server/internal_jobs/runtime-worker.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobsInfrastructureMissingError = exports.WorkerHostStopError = exports.WorkerLoopStopError = void 0;
 exports.processWorkPayloadWithContextAndHeartbeat = processWorkPayloadWithContextAndHeartbeat;
 exports.projectedWorkDecision = projectedWorkDecision;
+exports.lifecycleWorkDecision = lifecycleWorkDecision;
 exports.ackActionForOutcome = ackActionForOutcome;
 exports.startQueueWorkerLoop = startQueueWorkerLoop;
 exports.startNatsQueueWorker = startNatsQueueWorker;
@@ -102,6 +103,12 @@ function projectedWorkDecision(projected, _work) {
     }
     return (0, projection_js_1.isTerminal)(projected.state) ? "skip-ack" : "process";
 }
+function lifecycleWorkDecision(latest) {
+    if (!latest) {
+        return "process";
+    }
+    return (0, projection_js_1.isTerminal)(latest.state) ? "skip-ack" : "process";
+}
 function ackActionForOutcome(outcome) {
     if (!outcome) {
         return "ack";
@@ -155,18 +162,32 @@ async function startQueueWorkerLoop(options) {
                 await msg.nak();
                 continue;
             }
-            const projected = options.getProjectedJob
-                ? await options.getProjectedJob(job)
+            const latestLifecycle = options.getLatestLifecycleEvent
+                ? await options.getLatestLifecycleEvent(job)
                 : undefined;
             if (hostCancellation?.isHostShutdown()) {
                 await msg.nak();
                 continue;
             }
-            if (projectedWorkDecision(projected, job) === "skip-ack") {
+            if (lifecycleWorkDecision(latestLifecycle) === "skip-ack") {
                 registry.clearPending(key);
                 await msg.ack();
                 continue;
             }
+            if (!latestLifecycle) {
+                const projected = options.getProjectedJob
+                    ? await options.getProjectedJob(job)
+                    : undefined;
+                if (hostCancellation?.isHostShutdown()) {
+                    await msg.nak();
+                    continue;
+                }
+                if (projectedWorkDecision(projected, job) === "skip-ack") {
+                    registry.clearPending(key);
+                    await msg.ack();
+                    continue;
+                }
+            }
             const token = new job_manager_js_1.JobCancellationToken();
             if (hostCancellation?.isHostShutdown()) {
                 token.cancelForShutdown();
@@ -243,12 +264,17 @@ async function startNatsQueueWorker(options) {
     const info = await ensureConsumerInfo(jsm, options.binding.workStream, queue);
     const consumer = js.consumers.getConsumerFromInfo(info);
     const cancelSubscription = options.nats.subscribe(`${queue.publishPrefix}.*.cancelled`);
+    const direct = jsm.direct;
     return await startQueueWorkerLoop({
         manager: options.manager,
         consumer,
         cancelSubscription,
         hostCancellation: options.hostCancellation,
         getProjectedJob: options.getProjectedJob,
+        getLatestLifecycleEvent: options.getLatestLifecycleEvent ??
+            (direct
+                ? (job) => getLatestLifecycleEvent(direct, "JOBS", job)
+                : undefined),
         payloadSchema: queue.payload,
         validatePayload: options.validatePayload,
         resultSchema: queue.result,
@@ -270,20 +296,29 @@ async function startWorkerHostFromBinding(binding, options) {
     }
     const cancellation = new job_manager_js_1.JobCancellationToken();
     const heartbeatLoops = options.heartbeatPublisher
-        ? await Promise.all(queueTypes.map((queueType) => (0, heartbeat_js_1.startWorkerHeartbeatLoop)({
-            publisher: options.heartbeatPublisher,
-            service: binding.jobs.namespace,
-            jobType: queueType,
-            instanceId: options.instanceId,
-            concurrency: binding.jobs.queues[queueType].concurrency,
-            version: options.version,
-            intervalMs: options.heartbeatIntervalMs,
-            nowIso: options.nowIso,
-        })))
+        ? await Promise.all(queueTypes.map((queueType) => {
+            const queue = binding.jobs.queues[queueType];
+            if (!queue) {
+                throw new Error(`Worker queue '${queueType}' is not configured`);
+            }
+            return (0, heartbeat_js_1.startWorkerHeartbeatLoop)({
+                publisher: options.heartbeatPublisher,
+                service: binding.jobs.namespace,
+                jobType: queueType,
+                instanceId: options.instanceId,
+                concurrency: queue.concurrency,
+                version: options.version,
+                intervalMs: options.heartbeatIntervalMs,
+                nowIso: options.nowIso,
+            });
+        }))
         : [];
     const workers = [];
     for (const queueType of queueTypes) {
         const queue = binding.jobs.queues[queueType];
+        if (!queue) {
+            throw new Error(`Worker queue '${queueType}' is not configured`);
+        }
         for (let workerIndex = 0; workerIndex < queue.concurrency; workerIndex += 1) {
             const handle = await options.startWorker({
                 queueType,
@@ -330,6 +365,7 @@ async function startNatsWorkerHostFromBinding(binding, options) {
                 queueType,
                 hostCancellation: cancellation,
                 getProjectedJob: options.getProjectedJob,
+                getLatestLifecycleEvent: options.getLatestLifecycleEvent,
                 validatePayload: options.validatePayload,
                 validateResult: options.validateResult,
                 handler: options.handler,
@@ -383,6 +419,31 @@ function getQueueBinding(binding, queueType) {
     }
     return queue;
 }
+async function getLatestLifecycleEvent(direct, stream, job) {
+    try {
+        const msg = await direct.getMessage(stream, {
+            last_by_subj: `trellis.jobs.${job.service}.${job.type}.${job.id}.*`,
+        });
+        if (!msg) {
+            return undefined;
+        }
+        return parseWorkPayloadEvent(msg.data);
+    }
+    catch (error) {
+        if (isMessageNotFoundError(error)) {
+            return undefined;
+        }
+        if (isStreamNotFoundError(error)) {
+            throw new JobsInfrastructureMissingError(stream, job.type);
+        }
+        throw error;
+    }
+}
+function isMessageNotFoundError(error) {
+    return error instanceof Error && (error.name === "MessageNotFoundError" ||
+        error.message.includes("message not found") ||
+        error.message.includes("no message found"));
+}
 function parseWorkPayloadEvent(payload) {
     try {
         return JSON.parse(new TextDecoder().decode(payload));

package/script/npm/src/server/internal_jobs/types.d.ts

@@ -1,4 +1,11 @@
 import { type StaticDecode, Type } from "typebox";
+export declare const JobContextSchema: Type.TObject<{
+    requestId: Type.TString;
+    traceId: Type.TString;
+    traceparent: Type.TString;
+    tracestate: Type.TOptional<Type.TString>;
+}>;
+export type JobContext = StaticDecode<typeof JobContextSchema>;
 export declare const JobStateSchema: Type.TUnion<[Type.TLiteral<"pending">, Type.TLiteral<"active">, Type.TLiteral<"retry">, Type.TLiteral<"completed">, Type.TLiteral<"failed">, Type.TLiteral<"cancelled">, Type.TLiteral<"expired">, Type.TLiteral<"dead">, Type.TLiteral<"dismissed">]>;
 export type JobState = StaticDecode<typeof JobStateSchema>;
 export declare const JobLogEntrySchema: Type.TObject<{
@@ -19,6 +26,12 @@ export declare const JobSchema: Type.TObject<{
     service: Type.TString;
     type: Type.TString;
     state: Type.TUnion<[Type.TLiteral<"pending">, Type.TLiteral<"active">, Type.TLiteral<"retry">, Type.TLiteral<"completed">, Type.TLiteral<"failed">, Type.TLiteral<"cancelled">, Type.TLiteral<"expired">, Type.TLiteral<"dead">, Type.TLiteral<"dismissed">]>;
+    context: Type.TObject<{
+        requestId: Type.TString;
+        traceId: Type.TString;
+        traceparent: Type.TString;
+        tracestate: Type.TOptional<Type.TString>;
+    }>;
     payload: Type.TUnknown;
     result: Type.TOptional<Type.TUnknown>;
     createdAt: Type.TString;
@@ -52,6 +65,12 @@ export declare const JobEventSchema: Type.TObject<{
     eventType: Type.TUnion<[Type.TLiteral<"created">, Type.TLiteral<"started">, Type.TLiteral<"retry">, Type.TLiteral<"progress">, Type.TLiteral<"logged">, Type.TLiteral<"completed">, Type.TLiteral<"failed">, Type.TLiteral<"cancelled">, Type.TLiteral<"expired">, Type.TLiteral<"retried">, Type.TLiteral<"dead">, Type.TLiteral<"dismissed">]>;
     state: Type.TUnion<[Type.TLiteral<"pending">, Type.TLiteral<"active">, Type.TLiteral<"retry">, Type.TLiteral<"completed">, Type.TLiteral<"failed">, Type.TLiteral<"cancelled">, Type.TLiteral<"expired">, Type.TLiteral<"dead">, Type.TLiteral<"dismissed">]>;
     previousState: Type.TOptional<Type.TUnion<[Type.TLiteral<"pending">, Type.TLiteral<"active">, Type.TLiteral<"retry">, Type.TLiteral<"completed">, Type.TLiteral<"failed">, Type.TLiteral<"cancelled">, Type.TLiteral<"expired">, Type.TLiteral<"dead">, Type.TLiteral<"dismissed">]>>;
+    context: Type.TObject<{
+        requestId: Type.TString;
+        traceId: Type.TString;
+        traceparent: Type.TString;
+        tracestate: Type.TOptional<Type.TString>;
+    }>;
     tries: Type.TInteger;
     maxTries: Type.TOptional<Type.TInteger>;
     error: Type.TOptional<Type.TString>;

package/script/npm/src/server/internal_jobs/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/internal_jobs/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAElD,eAAO,MAAM,cAAc,wPAUzB,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,eAAO,MAAM,iBAAiB;;;;EAQ5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,eAAO,MAAM,iBAAiB;;;;;EAK5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBpB,CAAC;AAEH,MAAM,MAAM,GAAG,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,IACjD,IAAI,CAAC,YAAY,CAAC,OAAO,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC1D;IACA,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEJ,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;EA6BzB,CAAC;AAEH,MAAM,MAAM,QAAQ,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,IACtD,IAAI,CAAC,YAAY,CAAC,OAAO,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC/D;IACA,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEJ,eAAO,MAAM,qBAAqB;;;;;;;EAOhC,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/internal_jobs/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAElD,eAAO,MAAM,gBAAgB;;;;;EAO3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE/D,eAAO,MAAM,cAAc,wPAUzB,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,eAAO,MAAM,iBAAiB;;;;EAQ5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,eAAO,MAAM,iBAAiB;;;;;EAK5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAEjE,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkBpB,CAAC;AAEH,MAAM,MAAM,GAAG,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,IACjD,IAAI,CAAC,YAAY,CAAC,OAAO,SAAS,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC1D;IACA,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEJ,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BzB,CAAC;AAEH,MAAM,MAAM,QAAQ,CAAC,QAAQ,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,IACtD,IAAI,CAAC,YAAY,CAAC,OAAO,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,GAC/D;IACA,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEJ,eAAO,MAAM,qBAAqB;;;;;;;EAOhC,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/script/npm/src/server/internal_jobs/types.js

@@ -1,7 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkerHeartbeatSchema = exports.JobEventSchema = exports.JobSchema = exports.JobProgressSchema = exports.JobLogEntrySchema = exports.JobStateSchema = void 0;
+exports.WorkerHeartbeatSchema = exports.JobEventSchema = exports.JobSchema = exports.JobProgressSchema = exports.JobLogEntrySchema = exports.JobStateSchema = exports.JobContextSchema = void 0;
 const typebox_1 = require("typebox");
+exports.JobContextSchema = typebox_1.Type.Object({
+    requestId: typebox_1.Type.String({ minLength: 1 }),
+    traceId: typebox_1.Type.String({ pattern: "^[0-9a-f]{32}$" }),
+    traceparent: typebox_1.Type.String({
+        pattern: "^[0-9a-f]{2}-[0-9a-f]{32}-[0-9a-f]{16}-[0-9a-f]{2}$",
+    }),
+    tracestate: typebox_1.Type.Optional(typebox_1.Type.String({ minLength: 1 })),
+});
 exports.JobStateSchema = typebox_1.Type.Union([
     typebox_1.Type.Literal("pending"),
     typebox_1.Type.Literal("active"),
@@ -33,6 +41,7 @@ exports.JobSchema = typebox_1.Type.Object({
     service: typebox_1.Type.String({ minLength: 1 }),
     type: typebox_1.Type.String({ minLength: 1 }),
     state: exports.JobStateSchema,
+    context: exports.JobContextSchema,
     payload: typebox_1.Type.Unknown(),
     result: typebox_1.Type.Optional(typebox_1.Type.Unknown()),
     createdAt: typebox_1.Type.String({ format: "date-time" }),
@@ -66,6 +75,7 @@ exports.JobEventSchema = typebox_1.Type.Object({
     ]),
     state: exports.JobStateSchema,
     previousState: typebox_1.Type.Optional(exports.JobStateSchema),
+    context: exports.JobContextSchema,
     tries: typebox_1.Type.Integer({ minimum: 0 }),
     maxTries: typebox_1.Type.Optional(typebox_1.Type.Integer({ minimum: 1 })),
     error: typebox_1.Type.Optional(typebox_1.Type.String()),

package/script/npm/src/server/runtime.d.ts

@@ -5,6 +5,7 @@ export type NatsConnectOpts = {
     inboxPrefix?: string;
     authenticator?: unknown;
     maxReconnectAttempts?: number;
+    waitOnFirstConnect?: boolean;
 } & Record<string, unknown>;
 export type NatsConnectFn = (opts: NatsConnectOpts) => Promise<NatsConnection>;
 export type NatsCredsAuthenticatorFn = (creds: Uint8Array) => unknown;

package/script/npm/src/server/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/server/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAOzD,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;AAE/E,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC;AAEtE,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,CAAC;AAE1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,aAAa,CAAC;IACvB,kBAAkB,CAAC,EAAE,wBAAwB,CAAC;IAC9C,YAAY,CAAC,EAAE,cAAc,CAAC;CAC/B,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/server/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAOzD,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;AAE/E,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC;AAEtE,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,CAAC;AAE1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,aAAa,CAAC;IACvB,kBAAkB,CAAC,EAAE,wBAAwB,CAAC;IAC9C,YAAY,CAAC,EAAE,cAAc,CAAC;CAC/B,CAAC"}

package/script/npm/src/server/service.d.ts

@@ -4,11 +4,12 @@ import { type TrellisServiceRuntimeFor } from "../server.js";
 import { type TrellisAuth as SessionAuth } from "@qlever-llc/trellis/auth";
 import { type InferSchemaType } from "@qlever-llc/trellis/contracts";
 import type { TrellisAPI } from "@qlever-llc/trellis/contracts";
+import type { TrellisContractV1 } from "../contract_support/mod.js";
 import type { ContractJobsMetadata, ContractKvMetadata } from "../contract_support/mod.js";
 import { CONTRACT_JOBS_METADATA, CONTRACT_KV_METADATA } from "../contract_support/mod.js";
 import { AsyncResult, type BaseError, Result } from "@qlever-llc/result";
 import { type HealthCheckFn, ServiceHealth } from "./health.js";
-import type { AcceptedOperation, HandlerTrellis, OperationHandlerContext, OperationOutputOf, OperationProgressOf, OperationTransferContextOf, RpcHandlerContext, RpcHandlerErrorOf, RpcRequestErrorOf } from "../trellis.js";
+import type { AcceptedOperation, FeedEventOf, FeedInputOf, FeedRegistration as RootFeedRegistration, HandlerTrellis, OperationHandlerContext, OperationOutputOf, OperationProgressOf, OperationRuntimeHandle, OperationTransferContextOf, RpcHandlerContext, RpcHandlerErrorOf, RpcRequestErrorOf } from "../trellis.js";
 import type { NatsConnectOpts, TrellisServiceRuntimeDeps } from "./runtime.js";
 import { ServiceTransfer } from "./transfer.js";
 import { type LoggerLike } from "../globals.js";
@@ -164,6 +165,7 @@ type RequestOpts = {
 export type ServiceContract<TOwnedApi extends TrellisAPI, TTrellisApi extends TrellisAPI, TJobs extends ContractJobsMetadata = {}, TKv extends ContractKvMetadata = ContractKvMetadata> = {
     CONTRACT_ID: string;
     CONTRACT_DIGEST: string;
+    CONTRACT: TrellisContractV1;
     API: {
         owned: TOwnedApi;
         trellis: TTrellisApi;
@@ -209,10 +211,16 @@ export type OperationRegistration<TOwnedApi extends TrellisAPI, TTrellisApi exte
     accept(args: {
         sessionKey: string;
     }): AsyncResult<AcceptedOperation<OperationProgressOf<TOwnedApi, O>, OperationOutputOf<TOwnedApi, O>>, UnexpectedError>;
+    /**
+     * Loads an existing operation by id and returns a service-side control handle.
+     * The operation must belong to this service and registration name.
+     */
+    control(operationId: string): AsyncResult<OperationRuntimeHandle<OperationProgressOf<TOwnedApi, O>, OperationOutputOf<TOwnedApi, O>>, BaseError>;
     handle(handler: (args: OperationHandlerContext<InferSchemaType<TOwnedApi["operations"][O]["input"]>, OperationProgressOf<TOwnedApi, O>, OperationOutputOf<TOwnedApi, O>, OperationTransferContextOf<TOwnedApi, O>> & {
         trellis: Trellis<TTrellisApi, TKv, TJobs>;
     }) => unknown | Promise<unknown>): Promise<void>;
 };
+export type FeedRegistration<TOwnedApi extends TrellisAPI, F extends keyof TOwnedApi["feeds"] & string> = RootFeedRegistration<FeedInputOf<TOwnedApi, F>, FeedEventOf<TOwnedApi, F>>;
 export type TrellisServiceConnectArgs<TContract extends ServiceContract<TrellisAPI, TrellisAPI, ContractJobsMetadata, ContractKvMetadata>> = {
     trellisUrl: string;
     contract: TContract;
@@ -273,6 +281,7 @@ export declare class TrellisService<TOwnedApi extends TrellisAPI = TrellisAPI, T
     wait(): Promise<void>;
     stop(): Promise<void>;
     request<M extends RpcMethodName<TTrellisApi>>(method: M, input: RpcMethodInput<TTrellisApi, M>, opts?: RequestOpts): AsyncResult<RpcMethodOutput<TTrellisApi, M>, RpcRequestErrorOf<TTrellisApi, M>>;
+    feed<F extends keyof TOwnedApi["feeds"] & string>(feed: F): FeedRegistration<TOwnedApi, F>;
     operation<O extends keyof TOwnedApi["operations"] & string>(operation: O): OperationRegistration<TOwnedApi, TTrellisApi, O, TKv, TJobs>;
 }
 export {};