theokit 0.75.1 → 0.76.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 +88 -1
- package/dist/{actions-virtual-module-MIQPBAZW.js → actions-virtual-module-52O6HJZT.js} +11 -9
- package/dist/actions-virtual-module-52O6HJZT.js.map +1 -0
- package/dist/{actions-virtual-module-QEI6QPK4.js → actions-virtual-module-HS4W7HQU.js} +6 -5
- package/dist/{actions-virtual-module-QEI6QPK4.js.map → actions-virtual-module-HS4W7HQU.js.map} +1 -1
- package/dist/adapters/agent-mount.js +9 -7
- package/dist/{agent-N4OV5MDY.js → agent-HCK5RHH7.js} +4 -3
- package/dist/{app-typed-client-CHSITA46.js → app-typed-client-BWITJLJA.js} +6 -5
- package/dist/{app-typed-client-CHSITA46.js.map → app-typed-client-BWITJLJA.js.map} +1 -1
- package/dist/{app-typed-client-XQJXF646.js → app-typed-client-CJCOALMM.js} +11 -9
- package/dist/app-typed-client-CJCOALMM.js.map +1 -0
- package/dist/{aws-lambda-K5Y6XS5V.js → aws-lambda-XT7ZDJ6B.js} +3 -3
- package/dist/{build-GNKTCEES.js → build-Y3CWTWP6.js} +24 -92
- package/dist/build-Y3CWTWP6.js.map +1 -0
- package/dist/{bun-VPXMWFBA.js → bun-PJLDELDT.js} +5 -5
- package/dist/{chunk-J2KYVTPD.js → chunk-2SGNODVJ.js} +30 -16
- package/dist/chunk-2SGNODVJ.js.map +1 -0
- package/dist/chunk-2SQ7YAU3.js +85 -0
- package/dist/chunk-2SQ7YAU3.js.map +1 -0
- package/dist/{chunk-SYIQV4UH.js → chunk-36ZACTF3.js} +5 -5
- package/dist/{chunk-RY6D4EXL.js → chunk-3GM4GACM.js} +25 -4
- package/dist/{chunk-RY6D4EXL.js.map → chunk-3GM4GACM.js.map} +1 -1
- package/dist/{chunk-EW5IG7GA.js → chunk-42TYMRBG.js} +1 -1
- package/dist/{chunk-EW5IG7GA.js.map → chunk-42TYMRBG.js.map} +1 -1
- package/dist/{chunk-BINRCILF.js → chunk-4JRXZTVQ.js} +4 -13
- package/dist/chunk-4JRXZTVQ.js.map +1 -0
- package/dist/{chunk-R4AMIBZL.js → chunk-4XZOUS5G.js} +8 -8
- package/dist/chunk-4XZOUS5G.js.map +1 -0
- package/dist/{chunk-ICXXHV4V.js → chunk-54BIQFP4.js} +4 -13
- package/dist/chunk-54BIQFP4.js.map +1 -0
- package/dist/{chunk-VPK7ABMB.js → chunk-7MCEJVGV.js} +3 -3
- package/dist/{chunk-D7STTNQN.js → chunk-BXQCJJPT.js} +3 -3
- package/dist/{chunk-NX3P5MLH.js → chunk-C2BRSL4W.js} +50 -6
- package/dist/chunk-C2BRSL4W.js.map +1 -0
- package/dist/{chunk-E5QTCOKC.js → chunk-FEK25JUL.js} +88 -24
- package/dist/chunk-FEK25JUL.js.map +1 -0
- package/dist/{chunk-NLHAYGQQ.js → chunk-G3DDIEYE.js} +4 -2
- package/dist/chunk-G3DDIEYE.js.map +1 -0
- package/dist/chunk-IXXZBZF7.js +70 -0
- package/dist/chunk-IXXZBZF7.js.map +1 -0
- package/dist/{chunk-PVNMLZ5G.js → chunk-JO462JZM.js} +2 -2
- package/dist/chunk-LXV5IEBB.js +76 -0
- package/dist/chunk-LXV5IEBB.js.map +1 -0
- package/dist/{chunk-D2R5SJEL.js → chunk-MAJZ2L3A.js} +2 -2
- package/dist/{chunk-D2R5SJEL.js.map → chunk-MAJZ2L3A.js.map} +1 -1
- package/dist/chunk-NF7LXSXZ.js +19 -0
- package/dist/chunk-NF7LXSXZ.js.map +1 -0
- package/dist/chunk-OED37LE5.js +469 -0
- package/dist/chunk-OED37LE5.js.map +1 -0
- package/dist/{chunk-CLSYYO5F.js → chunk-OIYSUQM7.js} +2 -2
- package/dist/{chunk-2Z7TANA4.js → chunk-PVCXREGE.js} +6 -6
- package/dist/{chunk-EVKNHQWG.js → chunk-QBK6YYZA.js} +48 -5
- package/dist/chunk-QBK6YYZA.js.map +1 -0
- package/dist/{chunk-4X43VTST.js → chunk-TODO6J42.js} +1 -1
- package/dist/chunk-TODO6J42.js.map +1 -0
- package/dist/{chunk-ZDCCILMP.js → chunk-TQTEKNOL.js} +2 -69
- package/dist/chunk-TQTEKNOL.js.map +1 -0
- package/dist/{chunk-3MKRDJQ2.js → chunk-UQQQ3V43.js} +278 -75
- package/dist/chunk-UQQQ3V43.js.map +1 -0
- package/dist/{chunk-MX63AWEK.js → chunk-VXDTQO3S.js} +22 -6
- package/dist/{chunk-MX63AWEK.js.map → chunk-VXDTQO3S.js.map} +1 -1
- package/dist/{chunk-OZB2TKGJ.js → chunk-W2I6L4IJ.js} +2 -2
- package/dist/{chunk-UWV3B3RY.js → chunk-XDLFOATW.js} +5 -5
- package/dist/{chunk-RQKMY3JW.js → chunk-XI4FALFZ.js} +3 -3
- package/dist/chunk-XI4FALFZ.js.map +1 -0
- package/dist/{chunk-2FHNJ7LI.js → chunk-Z76QQR7I.js} +2 -2
- package/dist/chunk-ZICY2CD7.js +16 -0
- package/dist/chunk-ZICY2CD7.js.map +1 -0
- package/dist/chunk-ZN5H7CUR.js +24 -0
- package/dist/chunk-ZN5H7CUR.js.map +1 -0
- package/dist/{chunk-I5PDEWZZ.js → chunk-ZQJORKBM.js} +9 -3
- package/dist/chunk-ZQJORKBM.js.map +1 -0
- package/dist/cli/index.js +21 -15
- package/dist/cli/index.js.map +1 -1
- package/dist/{cloudflare-7EZQE4UV.js → cloudflare-F7KLBOU4.js} +6 -6
- package/dist/{config-support-HUZ4DXR7.js → config-support-2TER2BYD.js} +28 -21
- package/dist/config-support-2TER2BYD.js.map +1 -0
- package/dist/cron-lock-CfAvLApv.d.ts +36 -0
- package/dist/db-ZWDKD57T.js +86 -0
- package/dist/db-ZWDKD57T.js.map +1 -0
- package/dist/{deno-deploy-M5V3PYWU.js → deno-deploy-LJ5JQQVR.js} +5 -5
- package/dist/{dev-7PMNIIOF.js → dev-R2ZYHZV4.js} +60 -11
- package/dist/dev-R2ZYHZV4.js.map +1 -0
- package/dist/{engine-singleton-X4R7AZBJ.js → engine-singleton-BQ5QOMTC.js} +15 -9
- package/dist/{engine-singleton-X4R7AZBJ.js.map → engine-singleton-BQ5QOMTC.js.map} +1 -1
- package/dist/{generate-RW3NO3NR.js → generate-VXBSMUMW.js} +291 -85
- package/dist/generate-VXBSMUMW.js.map +1 -0
- package/dist/{index-CmkWlIDO.d.ts → index-DfsJ3Qhk.d.ts} +1 -1
- package/dist/index.d.ts +10 -1
- package/dist/index.js +12 -10
- package/dist/index.js.map +1 -1
- package/dist/{info-6NAUW5XY.js → info-IPMW56PI.js} +4 -4
- package/dist/{internal-api-R7TTYMCY.js → internal-api-6RAOYIET.js} +6 -5
- package/dist/{internal-api-A5HA7TYF.js → internal-api-YGFPLQ4E.js} +14 -11
- package/dist/job-backend-WvUs5rO1.d.ts +119 -0
- package/dist/{load-config-CLFWJOXN.js → load-config-USRR4GXP.js} +4 -4
- package/dist/{mcp-3NRZAQKY.js → mcp-FBXEX45H.js} +5 -4
- package/dist/{mcp-3NRZAQKY.js.map → mcp-FBXEX45H.js.map} +1 -1
- package/dist/{netlify-NI4HYDKN.js → netlify-ZPQNREFH.js} +2 -2
- package/dist/{node-LORYECWI.js → node-3EV3CVWB.js} +2 -2
- package/dist/{observability-bootstrap-DOWRMADT.js → observability-bootstrap-DMJ7R6WA.js} +3 -3
- package/dist/{openapi-ZHKJB3XL.js → openapi-CA3E3LZH.js} +4 -4
- package/dist/{preview-SNS7VJWH.js → preview-DLIVPM7A.js} +3 -3
- package/dist/registry-3D2KR7UE.js +34 -0
- package/dist/{routes-SMNSI2ZX.js → routes-BJ7GGRCV.js} +4 -4
- package/dist/{schema-DJH3IOVR.js → schema-FBM2UH72.js} +3 -3
- package/dist/{schemas-2R2J64ZH.js → schemas-BUR6PWSA.js} +2 -2
- package/dist/server/agent/index.d.ts +1 -1
- package/dist/server/agent/index.js +2 -1
- package/dist/server/cost/index.d.ts +2 -2
- package/dist/server/cost/index.js +1 -1
- package/dist/server/cost/sqlite/index.d.ts +2 -2
- package/dist/server/cost/sqlite/index.js +1 -1
- package/dist/server/cron/index.d.ts +20 -7
- package/dist/server/cron/index.js +8 -2
- package/dist/server/http/index.d.ts +2 -2
- package/dist/server/http/index.js +9 -7
- package/dist/server/index.d.ts +19 -10
- package/dist/server/index.js +103 -41
- package/dist/server/index.js.map +1 -1
- package/dist/server/jobs/index.d.ts +85 -44
- package/dist/server/jobs/index.js +9 -2
- package/dist/server/observability/index.js +9 -8
- package/dist/server/storage/index.d.ts +6 -2
- package/dist/server/storage/index.js +5 -1
- package/dist/server/webhook/index.d.ts +4 -5
- package/dist/server/webhook/index.js +1 -1
- package/dist/{server-boundary-ZT6HN7ON.js → server-boundary-EKIGYL7B.js} +6 -5
- package/dist/{server-boundary-ZT6HN7ON.js.map → server-boundary-EKIGYL7B.js.map} +1 -1
- package/dist/{server-boundary-HYLYGFZY.js → server-boundary-IDWIB24L.js} +11 -9
- package/dist/server-boundary-IDWIB24L.js.map +1 -0
- package/dist/{start-L5TGWGLU.js → start-LNT5UVSY.js} +118 -185
- package/dist/start-LNT5UVSY.js.map +1 -0
- package/dist/{static-O2RZ5NLR.js → static-VNN4HYRN.js} +2 -2
- package/dist/{storage-manager-3O5PDO6O.js → storage-manager-3IUIEG2P.js} +49 -5
- package/dist/storage-manager-3IUIEG2P.js.map +1 -0
- package/dist/{storage-manager-BtG38jYl.d.ts → storage-manager-Clu2RBpH.d.ts} +15 -3
- package/dist/{storage-types-CFGPFIdB.d.ts → storage-types-ndO0ZZqH.d.ts} +2 -2
- package/dist/{theo-cloud-B4R7GCWK.js → theo-cloud-243SPOIA.js} +2 -2
- package/dist/{vercel-INHLOCSZ.js → vercel-EXKSZ2OQ.js} +5 -5
- package/dist/vite-plugin/index.js +12 -10
- package/dist/{vite-plugin-UXEXT7GX.js → vite-plugin-LE42ZIGV.js} +10 -9
- package/dist/{whatsapp-D_Fnl1LX.d.ts → whatsapp-4W2eK2ij.d.ts} +1 -1
- package/package.json +1 -1
- package/dist/actions-virtual-module-MIQPBAZW.js.map +0 -1
- package/dist/app-typed-client-XQJXF646.js.map +0 -1
- package/dist/build-GNKTCEES.js.map +0 -1
- package/dist/chunk-3MKRDJQ2.js.map +0 -1
- package/dist/chunk-4X43VTST.js.map +0 -1
- package/dist/chunk-BINRCILF.js.map +0 -1
- package/dist/chunk-E5QTCOKC.js.map +0 -1
- package/dist/chunk-EVKNHQWG.js.map +0 -1
- package/dist/chunk-I5PDEWZZ.js.map +0 -1
- package/dist/chunk-ICXXHV4V.js.map +0 -1
- package/dist/chunk-IDEZ7FU2.js +0 -18
- package/dist/chunk-IDEZ7FU2.js.map +0 -1
- package/dist/chunk-J2KYVTPD.js.map +0 -1
- package/dist/chunk-NLHAYGQQ.js.map +0 -1
- package/dist/chunk-NX3P5MLH.js.map +0 -1
- package/dist/chunk-R4AMIBZL.js.map +0 -1
- package/dist/chunk-RQKMY3JW.js.map +0 -1
- package/dist/chunk-YCF3N4JS.js +0 -26
- package/dist/chunk-YCF3N4JS.js.map +0 -1
- package/dist/chunk-ZDCCILMP.js.map +0 -1
- package/dist/config-support-HUZ4DXR7.js.map +0 -1
- package/dist/db-IVVCQE5Z.js +0 -76
- package/dist/db-IVVCQE5Z.js.map +0 -1
- package/dist/dev-7PMNIIOF.js.map +0 -1
- package/dist/generate-RW3NO3NR.js.map +0 -1
- package/dist/job-backend-CgC8Xf33.d.ts +0 -68
- package/dist/registry-3SVWZVIJ.js +0 -34
- package/dist/server-boundary-HYLYGFZY.js.map +0 -1
- package/dist/start-L5TGWGLU.js.map +0 -1
- package/dist/storage-manager-3O5PDO6O.js.map +0 -1
- /package/dist/{agent-N4OV5MDY.js.map → agent-HCK5RHH7.js.map} +0 -0
- /package/dist/{aws-lambda-K5Y6XS5V.js.map → aws-lambda-XT7ZDJ6B.js.map} +0 -0
- /package/dist/{bun-VPXMWFBA.js.map → bun-PJLDELDT.js.map} +0 -0
- /package/dist/{chunk-SYIQV4UH.js.map → chunk-36ZACTF3.js.map} +0 -0
- /package/dist/{chunk-VPK7ABMB.js.map → chunk-7MCEJVGV.js.map} +0 -0
- /package/dist/{chunk-D7STTNQN.js.map → chunk-BXQCJJPT.js.map} +0 -0
- /package/dist/{chunk-PVNMLZ5G.js.map → chunk-JO462JZM.js.map} +0 -0
- /package/dist/{chunk-CLSYYO5F.js.map → chunk-OIYSUQM7.js.map} +0 -0
- /package/dist/{chunk-2Z7TANA4.js.map → chunk-PVCXREGE.js.map} +0 -0
- /package/dist/{chunk-OZB2TKGJ.js.map → chunk-W2I6L4IJ.js.map} +0 -0
- /package/dist/{chunk-UWV3B3RY.js.map → chunk-XDLFOATW.js.map} +0 -0
- /package/dist/{chunk-2FHNJ7LI.js.map → chunk-Z76QQR7I.js.map} +0 -0
- /package/dist/{cloudflare-7EZQE4UV.js.map → cloudflare-F7KLBOU4.js.map} +0 -0
- /package/dist/{deno-deploy-M5V3PYWU.js.map → deno-deploy-LJ5JQQVR.js.map} +0 -0
- /package/dist/{info-6NAUW5XY.js.map → info-IPMW56PI.js.map} +0 -0
- /package/dist/{internal-api-R7TTYMCY.js.map → internal-api-6RAOYIET.js.map} +0 -0
- /package/dist/{internal-api-A5HA7TYF.js.map → internal-api-YGFPLQ4E.js.map} +0 -0
- /package/dist/{load-config-CLFWJOXN.js.map → load-config-USRR4GXP.js.map} +0 -0
- /package/dist/{netlify-NI4HYDKN.js.map → netlify-ZPQNREFH.js.map} +0 -0
- /package/dist/{node-LORYECWI.js.map → node-3EV3CVWB.js.map} +0 -0
- /package/dist/{observability-bootstrap-DOWRMADT.js.map → observability-bootstrap-DMJ7R6WA.js.map} +0 -0
- /package/dist/{openapi-ZHKJB3XL.js.map → openapi-CA3E3LZH.js.map} +0 -0
- /package/dist/{preview-SNS7VJWH.js.map → preview-DLIVPM7A.js.map} +0 -0
- /package/dist/{registry-3SVWZVIJ.js.map → registry-3D2KR7UE.js.map} +0 -0
- /package/dist/{routes-SMNSI2ZX.js.map → routes-BJ7GGRCV.js.map} +0 -0
- /package/dist/{schema-DJH3IOVR.js.map → schema-FBM2UH72.js.map} +0 -0
- /package/dist/{schemas-2R2J64ZH.js.map → schemas-BUR6PWSA.js.map} +0 -0
- /package/dist/{static-O2RZ5NLR.js.map → static-VNN4HYRN.js.map} +0 -0
- /package/dist/{theo-cloud-B4R7GCWK.js.map → theo-cloud-243SPOIA.js.map} +0 -0
- /package/dist/{vercel-INHLOCSZ.js.map → vercel-EXKSZ2OQ.js.map} +0 -0
- /package/dist/{vite-plugin-UXEXT7GX.js.map → vite-plugin-LE42ZIGV.js.map} +0 -0
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
import {
|
|
2
|
+
createPostgresCronLock,
|
|
2
3
|
writeAtomic
|
|
3
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-LXV5IEBB.js";
|
|
5
|
+
import {
|
|
6
|
+
keepPoolErrorsFromExitingTheProcess
|
|
7
|
+
} from "./chunk-ZN5H7CUR.js";
|
|
4
8
|
import {
|
|
5
9
|
extractTraceContext,
|
|
6
10
|
generateNewTraceContext
|
|
7
11
|
} from "./chunk-UMNXCU3K.js";
|
|
12
|
+
import {
|
|
13
|
+
createLogger
|
|
14
|
+
} from "./chunk-TQTEKNOL.js";
|
|
8
15
|
import {
|
|
9
16
|
importUserModule
|
|
10
17
|
} from "./chunk-AHYOVVJ7.js";
|
|
@@ -43,9 +50,23 @@ var NonRetryableError = class extends Error {
|
|
|
43
50
|
this.name = "NonRetryableError";
|
|
44
51
|
}
|
|
45
52
|
};
|
|
53
|
+
var JobLeaseLostError = class extends Error {
|
|
54
|
+
code = "JOB_LEASE_LOST";
|
|
55
|
+
jobId;
|
|
56
|
+
operation;
|
|
57
|
+
constructor(jobId, operation) {
|
|
58
|
+
super(
|
|
59
|
+
`Cannot ${operation} job "${jobId}": its lease expired and another worker holds it now, or the job no longer exists. The current holder decides its outcome.`
|
|
60
|
+
);
|
|
61
|
+
this.name = "JobLeaseLostError";
|
|
62
|
+
this.jobId = jobId;
|
|
63
|
+
this.operation = operation;
|
|
64
|
+
}
|
|
65
|
+
};
|
|
46
66
|
|
|
47
67
|
// src/server/jobs/job-backend-memory.ts
|
|
48
68
|
var DEFAULT_MAX_PENDING = 1e4;
|
|
69
|
+
var scopedKey = (name, key) => `${name}\0${key}`;
|
|
49
70
|
var InMemoryJobBackend = class {
|
|
50
71
|
name = "memory";
|
|
51
72
|
#pending = /* @__PURE__ */ new Map();
|
|
@@ -73,7 +94,7 @@ var InMemoryJobBackend = class {
|
|
|
73
94
|
);
|
|
74
95
|
}
|
|
75
96
|
if (input.idempotencyKey) {
|
|
76
|
-
const existing = this.#idempotency.get(input.idempotencyKey);
|
|
97
|
+
const existing = this.#idempotency.get(scopedKey(input.name, input.idempotencyKey));
|
|
77
98
|
const now2 = Date.now();
|
|
78
99
|
if (existing && existing.expiresAt > now2) {
|
|
79
100
|
return { jobId: existing.jobId };
|
|
@@ -91,11 +112,13 @@ var InMemoryJobBackend = class {
|
|
|
91
112
|
traceparent: input.traceparent,
|
|
92
113
|
availableAt,
|
|
93
114
|
lockExpiresAt: null,
|
|
115
|
+
leaseToken: null,
|
|
94
116
|
dispatchTimer: null
|
|
95
117
|
};
|
|
96
118
|
this.#pending.set(jobId, entry);
|
|
97
119
|
if (input.idempotencyKey) {
|
|
98
|
-
this.#idempotency.set(input.idempotencyKey, {
|
|
120
|
+
this.#idempotency.set(scopedKey(input.name, input.idempotencyKey), {
|
|
121
|
+
key: input.idempotencyKey,
|
|
99
122
|
jobId,
|
|
100
123
|
expiresAt: now + 6e4
|
|
101
124
|
});
|
|
@@ -112,6 +135,7 @@ var InMemoryJobBackend = class {
|
|
|
112
135
|
if (entry.lockExpiresAt !== null && entry.lockExpiresAt > now) continue;
|
|
113
136
|
if (entry.availableAt > now) continue;
|
|
114
137
|
entry.lockExpiresAt = now + lockSeconds * 1e3;
|
|
138
|
+
entry.leaseToken = globalThis.crypto.randomUUID();
|
|
115
139
|
entry.attempts += 1;
|
|
116
140
|
leases.push({
|
|
117
141
|
jobId: entry.jobId,
|
|
@@ -120,31 +144,42 @@ var InMemoryJobBackend = class {
|
|
|
120
144
|
attempts: entry.attempts,
|
|
121
145
|
maxAttempts: entry.maxAttempts,
|
|
122
146
|
traceparent: entry.traceparent,
|
|
123
|
-
lockExpiresAt: new Date(entry.lockExpiresAt)
|
|
147
|
+
lockExpiresAt: new Date(entry.lockExpiresAt),
|
|
148
|
+
leaseToken: entry.leaseToken
|
|
124
149
|
});
|
|
125
150
|
}
|
|
126
151
|
return Promise.resolve(leases);
|
|
127
152
|
}
|
|
128
|
-
async ack(jobId) {
|
|
153
|
+
async ack(jobId, fence) {
|
|
129
154
|
const entry = this.#pending.get(jobId);
|
|
155
|
+
this.#assertHeld(jobId, entry, fence, "ack");
|
|
130
156
|
if (entry?.dispatchTimer) clearTimeout(entry.dispatchTimer);
|
|
131
157
|
this.#pending.delete(jobId);
|
|
132
158
|
return Promise.resolve();
|
|
133
159
|
}
|
|
134
160
|
async nack(jobId, opts) {
|
|
135
161
|
const entry = this.#pending.get(jobId);
|
|
162
|
+
this.#assertHeld(jobId, entry, opts, "nack");
|
|
136
163
|
if (!entry) return Promise.resolve();
|
|
137
|
-
if (opts.nonRetryable || entry.attempts >= entry.maxAttempts) {
|
|
164
|
+
if (opts.nonRetryable || entry.attempts >= (opts.maxAttempts ?? entry.maxAttempts)) {
|
|
138
165
|
if (entry.dispatchTimer) clearTimeout(entry.dispatchTimer);
|
|
139
166
|
this.#pending.delete(jobId);
|
|
167
|
+
console.warn(
|
|
168
|
+
`[theokit:jobs:memory] job "${entry.name}" (${jobId}) failed after ${String(entry.attempts)} attempt(s) and was dropped: ${opts.error}`
|
|
169
|
+
);
|
|
140
170
|
} else {
|
|
141
171
|
entry.lockExpiresAt = null;
|
|
172
|
+
entry.leaseToken = null;
|
|
142
173
|
}
|
|
143
174
|
return Promise.resolve();
|
|
144
175
|
}
|
|
145
|
-
|
|
176
|
+
/**
|
|
177
|
+
* The job holding `key` within its window, or null. With `name`, only that job type's key
|
|
178
|
+
* matches, as `enqueue` deduplicates on (name, key); without it, the first job holding the key.
|
|
179
|
+
*/
|
|
180
|
+
idempotency(key, ttlSeconds, name) {
|
|
146
181
|
const now = Date.now();
|
|
147
|
-
const existing = this.#idempotency.get(key);
|
|
182
|
+
const existing = name === void 0 ? [...this.#idempotency.values()].find((e) => e.key === key && e.expiresAt > now) : this.#idempotency.get(scopedKey(name, key));
|
|
148
183
|
if (!existing || existing.expiresAt <= now) {
|
|
149
184
|
return Promise.resolve(null);
|
|
150
185
|
}
|
|
@@ -167,6 +202,11 @@ var InMemoryJobBackend = class {
|
|
|
167
202
|
if (entry.dispatchTimer) clearTimeout(entry.dispatchTimer);
|
|
168
203
|
}
|
|
169
204
|
}
|
|
205
|
+
/** A fenced call whose lease no longer holds the job is refused (usetheokit/theokit#1012). */
|
|
206
|
+
#assertHeld(jobId, entry, fence, operation) {
|
|
207
|
+
if (fence?.leaseToken === void 0) return;
|
|
208
|
+
if (entry?.leaseToken !== fence.leaseToken) throw new JobLeaseLostError(jobId, operation);
|
|
209
|
+
}
|
|
170
210
|
/** EC-104 test hook — invokes the shutdown handler synchronously. */
|
|
171
211
|
triggerBeforeExitForTest() {
|
|
172
212
|
this.#cleanupOnShutdown();
|
|
@@ -186,10 +226,15 @@ var InMemoryJobBackend = class {
|
|
|
186
226
|
|
|
187
227
|
// src/server/jobs/job-backend-postgres.ts
|
|
188
228
|
var DEFAULT_TABLE = "theokit_jobs";
|
|
229
|
+
var backendLogger = createLogger({ context: { component: "theokit:jobs" } });
|
|
230
|
+
var MAX_DEFAULT_RETRY_DELAY_SECONDS = 3600;
|
|
231
|
+
var MAX_ENQUEUE_ROUNDS = 3;
|
|
232
|
+
var defaultRetryDelaySeconds = (attempts) => Math.min(2 ** attempts, MAX_DEFAULT_RETRY_DELAY_SECONDS);
|
|
189
233
|
var PostgresJobBackend = class _PostgresJobBackend {
|
|
190
234
|
name = "postgres";
|
|
191
235
|
#pool;
|
|
192
236
|
#table;
|
|
237
|
+
#retryDelaySeconds;
|
|
193
238
|
constructor(opts) {
|
|
194
239
|
if (!opts.pool) {
|
|
195
240
|
throw new Error(
|
|
@@ -198,6 +243,8 @@ var PostgresJobBackend = class _PostgresJobBackend {
|
|
|
198
243
|
}
|
|
199
244
|
this.#pool = opts.pool;
|
|
200
245
|
this.#table = opts.tableName ?? DEFAULT_TABLE;
|
|
246
|
+
keepPoolErrorsFromExitingTheProcess(opts.pool, backendLogger, { table: this.#table });
|
|
247
|
+
this.#retryDelaySeconds = opts.retryDelaySeconds ?? defaultRetryDelaySeconds;
|
|
201
248
|
}
|
|
202
249
|
/**
|
|
203
250
|
* T2.1 — Construct a `PostgresJobBackend` using a pool managed by the
|
|
@@ -213,12 +260,19 @@ var PostgresJobBackend = class _PostgresJobBackend {
|
|
|
213
260
|
* Errors thrown by the manager (unknown dbName, dangling server reference,
|
|
214
261
|
* manager already disposed) propagate to the caller with actionable text.
|
|
215
262
|
*
|
|
216
|
-
* @see ADR-0007
|
|
217
263
|
*/
|
|
218
264
|
static fromStorageManager(manager, dbName, factory, options) {
|
|
219
265
|
const pool = manager.usePostgres(dbName, factory);
|
|
220
266
|
return new _PostgresJobBackend({ pool, ...options });
|
|
221
267
|
}
|
|
268
|
+
/**
|
|
269
|
+
* A cron lock on this backend's pool, so replicas sharing the job database fire each cron tick
|
|
270
|
+
* once between them. `theokit start` uses it automatically when this is the configured
|
|
271
|
+
* `jobs.backend` and `cron.lock` is not set (usetheokit/theokit#1016).
|
|
272
|
+
*/
|
|
273
|
+
cronLock(options) {
|
|
274
|
+
return createPostgresCronLock(this.#pool, options);
|
|
275
|
+
}
|
|
222
276
|
/**
|
|
223
277
|
* Create or upgrade the schema. Idempotent (uses IF NOT EXISTS).
|
|
224
278
|
* Call once at process start; safe to re-run on every deploy.
|
|
@@ -236,9 +290,15 @@ var PostgresJobBackend = class _PostgresJobBackend {
|
|
|
236
290
|
locked_until TIMESTAMPTZ,
|
|
237
291
|
traceparent TEXT,
|
|
238
292
|
idempotency_key TEXT,
|
|
239
|
-
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
|
293
|
+
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
294
|
+
lease_token TEXT,
|
|
295
|
+
last_error TEXT,
|
|
296
|
+
failed_at TIMESTAMPTZ
|
|
240
297
|
)
|
|
241
298
|
`);
|
|
299
|
+
await this.#pool.query(`ALTER TABLE ${t} ADD COLUMN IF NOT EXISTS lease_token TEXT`);
|
|
300
|
+
await this.#pool.query(`ALTER TABLE ${t} ADD COLUMN IF NOT EXISTS last_error TEXT`);
|
|
301
|
+
await this.#pool.query(`ALTER TABLE ${t} ADD COLUMN IF NOT EXISTS failed_at TIMESTAMPTZ`);
|
|
242
302
|
await this.#pool.query(`
|
|
243
303
|
CREATE UNIQUE INDEX IF NOT EXISTS ${t}_idempotency_key_idx
|
|
244
304
|
ON ${t} (name, idempotency_key)
|
|
@@ -251,56 +311,54 @@ var PostgresJobBackend = class _PostgresJobBackend {
|
|
|
251
311
|
`);
|
|
252
312
|
}
|
|
253
313
|
async enqueue(input) {
|
|
254
|
-
const id = randomId();
|
|
255
|
-
const delaySeconds = input.delaySeconds ?? 0;
|
|
256
314
|
const t = this.#table;
|
|
257
|
-
|
|
315
|
+
const values = [
|
|
316
|
+
input.name,
|
|
317
|
+
JSON.stringify(input.input),
|
|
318
|
+
input.maxAttempts ?? 1,
|
|
319
|
+
(input.delaySeconds ?? 0).toString(),
|
|
320
|
+
input.traceparent ?? null,
|
|
321
|
+
input.idempotencyKey ?? null
|
|
322
|
+
];
|
|
323
|
+
for (let round = 0; round < MAX_ENQUEUE_ROUNDS; round++) {
|
|
324
|
+
const inserted = await this.#pool.query(
|
|
325
|
+
`INSERT INTO ${t} (id, name, input, max_attempts, available_at, traceparent, idempotency_key)
|
|
326
|
+
VALUES ($1, $2, $3::jsonb, $4, NOW() + ($5 || ' seconds')::interval, $6, $7)
|
|
327
|
+
ON CONFLICT DO NOTHING
|
|
328
|
+
RETURNING id`,
|
|
329
|
+
[randomId(), ...values]
|
|
330
|
+
);
|
|
331
|
+
if (inserted.rows.length > 0) return { jobId: inserted.rows[0].id };
|
|
258
332
|
const existing = await this.#pool.query(
|
|
259
333
|
`SELECT id FROM ${t} WHERE name = $1 AND idempotency_key = $2 LIMIT 1`,
|
|
260
334
|
[input.name, input.idempotencyKey]
|
|
261
335
|
);
|
|
262
|
-
if (existing.rows.length > 0) {
|
|
263
|
-
return { jobId: existing.rows[0].id };
|
|
264
|
-
}
|
|
336
|
+
if (existing.rows.length > 0) return { jobId: existing.rows[0].id };
|
|
265
337
|
}
|
|
266
|
-
|
|
267
|
-
`
|
|
268
|
-
VALUES ($1, $2, $3::jsonb, $4, NOW() + ($5 || ' seconds')::interval, $6, $7)`,
|
|
269
|
-
[
|
|
270
|
-
id,
|
|
271
|
-
input.name,
|
|
272
|
-
JSON.stringify(input.input),
|
|
273
|
-
input.maxAttempts ?? 1,
|
|
274
|
-
delaySeconds.toString(),
|
|
275
|
-
input.traceparent ?? null,
|
|
276
|
-
input.idempotencyKey ?? null
|
|
277
|
-
]
|
|
338
|
+
throw new Error(
|
|
339
|
+
`PostgresJobBackend.enqueue: job "${input.name}" with idempotency key "${String(input.idempotencyKey)}" conflicted ${String(MAX_ENQUEUE_ROUNDS)} times and the conflicting row was gone each time it was read; the key is being enqueued and acked in a tight loop.`
|
|
278
340
|
);
|
|
279
|
-
return { jobId: id };
|
|
280
341
|
}
|
|
281
342
|
async dequeue(opts) {
|
|
282
343
|
const t = this.#table;
|
|
283
344
|
const batchSize = opts.batchSize ?? 1;
|
|
284
345
|
const lockSeconds = opts.lockSeconds ?? 30;
|
|
285
|
-
const candidates = await this.#pool.query(
|
|
286
|
-
`SELECT id FROM ${t}
|
|
287
|
-
WHERE (locked_until IS NULL OR locked_until < NOW())
|
|
288
|
-
AND available_at <= NOW()
|
|
289
|
-
ORDER BY available_at ASC
|
|
290
|
-
LIMIT $1
|
|
291
|
-
FOR UPDATE SKIP LOCKED`,
|
|
292
|
-
[batchSize]
|
|
293
|
-
);
|
|
294
|
-
if (candidates.rows.length === 0) return [];
|
|
295
|
-
const ids = candidates.rows.map((r2) => r2.id);
|
|
296
|
-
const placeholders = ids.map((_, i) => `$${i + 2}`).join(", ");
|
|
297
346
|
const r = await this.#pool.query(
|
|
298
347
|
`UPDATE ${t}
|
|
299
|
-
SET locked_until = NOW() + ($
|
|
300
|
-
attempts = attempts + 1
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
348
|
+
SET locked_until = NOW() + ($2 || ' seconds')::interval,
|
|
349
|
+
attempts = attempts + 1,
|
|
350
|
+
lease_token = $3
|
|
351
|
+
WHERE id IN (
|
|
352
|
+
SELECT id FROM ${t}
|
|
353
|
+
WHERE (locked_until IS NULL OR locked_until < NOW())
|
|
354
|
+
AND available_at <= NOW()
|
|
355
|
+
AND failed_at IS NULL
|
|
356
|
+
ORDER BY available_at ASC
|
|
357
|
+
LIMIT $1
|
|
358
|
+
FOR UPDATE SKIP LOCKED
|
|
359
|
+
)
|
|
360
|
+
RETURNING id, name, input, attempts, max_attempts, traceparent, locked_until, lease_token`,
|
|
361
|
+
[batchSize, lockSeconds.toString(), randomId()]
|
|
304
362
|
);
|
|
305
363
|
return r.rows.map((row) => ({
|
|
306
364
|
jobId: row.id,
|
|
@@ -309,31 +367,78 @@ var PostgresJobBackend = class _PostgresJobBackend {
|
|
|
309
367
|
attempts: row.attempts,
|
|
310
368
|
maxAttempts: row.max_attempts,
|
|
311
369
|
traceparent: row.traceparent ?? void 0,
|
|
312
|
-
lockExpiresAt: row.locked_until instanceof Date ? row.locked_until : new Date(row.locked_until)
|
|
370
|
+
lockExpiresAt: row.locked_until instanceof Date ? row.locked_until : new Date(row.locked_until),
|
|
371
|
+
leaseToken: row.lease_token
|
|
313
372
|
}));
|
|
314
373
|
}
|
|
315
|
-
async ack(jobId) {
|
|
316
|
-
|
|
374
|
+
async ack(jobId, fence) {
|
|
375
|
+
const { clause, params } = this.#held(jobId, fence);
|
|
376
|
+
const r = await this.#pool.query(
|
|
377
|
+
`DELETE FROM ${this.#table} WHERE ${clause} RETURNING id`,
|
|
378
|
+
params
|
|
379
|
+
);
|
|
380
|
+
if (fence?.leaseToken !== void 0 && r.rows.length === 0) {
|
|
381
|
+
throw new JobLeaseLostError(jobId, "ack");
|
|
382
|
+
}
|
|
317
383
|
}
|
|
384
|
+
/**
|
|
385
|
+
* Record a failure. The job is retried after `retryDelaySeconds(attempts)` while attempts remain,
|
|
386
|
+
* and kept as failed (`failed_at`, `last_error`) once they are exhausted or the failure is
|
|
387
|
+
* non-retryable. It was DELETEd in that case, with its input and its error, so a job that failed
|
|
388
|
+
* for good left no record (usetheokit/theokit#1014).
|
|
389
|
+
*/
|
|
318
390
|
async nack(jobId, opts) {
|
|
319
391
|
const t = this.#table;
|
|
320
|
-
|
|
321
|
-
|
|
392
|
+
const { clause, params } = this.#held(jobId, opts);
|
|
393
|
+
const fenced = opts.leaseToken !== void 0;
|
|
394
|
+
const r = await this.#pool.query(`SELECT attempts, max_attempts FROM ${t} WHERE ${clause}`, params);
|
|
395
|
+
if (r.rows.length === 0) {
|
|
396
|
+
if (fenced) throw new JobLeaseLostError(jobId, "nack");
|
|
322
397
|
return;
|
|
323
398
|
}
|
|
324
|
-
const r = await this.#pool.query(`SELECT attempts, max_attempts FROM ${t} WHERE id = $1`, [jobId]);
|
|
325
|
-
if (r.rows.length === 0) return;
|
|
326
399
|
const { attempts, max_attempts } = r.rows[0];
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
400
|
+
const final = opts.nonRetryable === true || attempts >= (opts.maxAttempts ?? max_attempts);
|
|
401
|
+
const next = params.length + 1;
|
|
402
|
+
const write = final ? `UPDATE ${t}
|
|
403
|
+
SET failed_at = NOW(), last_error = $${next}, locked_until = NULL, lease_token = NULL
|
|
404
|
+
WHERE ${clause} RETURNING id` : `UPDATE ${t}
|
|
405
|
+
SET last_error = $${next}, locked_until = NULL, lease_token = NULL,
|
|
406
|
+
available_at = NOW() + ($${next + 1} || ' seconds')::interval
|
|
407
|
+
WHERE ${clause} RETURNING id`;
|
|
408
|
+
const values = final ? [...params, opts.error] : [...params, opts.error, this.#retryDelay(attempts).toString()];
|
|
409
|
+
const w = await this.#pool.query(write, values);
|
|
410
|
+
if (fenced && w.rows.length === 0) throw new JobLeaseLostError(jobId, "nack");
|
|
411
|
+
}
|
|
412
|
+
#retryDelay(attempts) {
|
|
413
|
+
const seconds = this.#retryDelaySeconds(attempts);
|
|
414
|
+
if (!Number.isFinite(seconds) || seconds < 0) {
|
|
415
|
+
throw new RangeError(
|
|
416
|
+
`PostgresJobBackend retryDelaySeconds(${String(attempts)}) returned ${String(seconds)}; expected a finite number of seconds >= 0.`
|
|
417
|
+
);
|
|
331
418
|
}
|
|
419
|
+
return seconds;
|
|
332
420
|
}
|
|
333
|
-
|
|
334
|
-
|
|
421
|
+
/**
|
|
422
|
+
* The row predicate for a call that finishes a job. Fenced by the lease token when the caller
|
|
423
|
+
* passed one: a worker whose lease expired and was re-leased no longer matches, so its late
|
|
424
|
+
* ack or nack cannot touch the new holder's job (usetheokit/theokit#1012).
|
|
425
|
+
*/
|
|
426
|
+
#held(jobId, fence) {
|
|
427
|
+
return fence?.leaseToken === void 0 ? { clause: "id = $1", params: [jobId] } : { clause: "id = $1 AND lease_token = $2", params: [jobId, fence.leaseToken] };
|
|
428
|
+
}
|
|
429
|
+
/**
|
|
430
|
+
* The job holding `key`, or null. Pass `name` to scope the lookup the way the UNIQUE INDEX and
|
|
431
|
+
* `enqueue` do, on (name, idempotency_key): without it, two job types sharing a key can return
|
|
432
|
+
* each other's id (usetheokit/theokit#1015). A failed job still holds its key; an acked one does
|
|
433
|
+
* not, because `ack` deletes the row. `ttlSeconds` is not used: the window is the row's life.
|
|
434
|
+
*/
|
|
435
|
+
async idempotency(key, _ttlSeconds, name) {
|
|
436
|
+
const r = name === void 0 ? await this.#pool.query(
|
|
335
437
|
`SELECT id FROM ${this.#table} WHERE idempotency_key = $1 LIMIT 1`,
|
|
336
438
|
[key]
|
|
439
|
+
) : await this.#pool.query(
|
|
440
|
+
`SELECT id FROM ${this.#table} WHERE name = $1 AND idempotency_key = $2 LIMIT 1`,
|
|
441
|
+
[name, key]
|
|
337
442
|
);
|
|
338
443
|
return r.rows.length > 0 ? { jobId: r.rows[0].id } : null;
|
|
339
444
|
}
|
|
@@ -343,6 +448,21 @@ function randomId() {
|
|
|
343
448
|
}
|
|
344
449
|
|
|
345
450
|
// src/server/jobs/job-runner.ts
|
|
451
|
+
var runnerLogger = createLogger({ context: { component: "theokit:jobs:runner" } });
|
|
452
|
+
async function finish(lease, outcome, write) {
|
|
453
|
+
try {
|
|
454
|
+
await write();
|
|
455
|
+
} catch (err) {
|
|
456
|
+
if (!(err instanceof JobLeaseLostError)) throw err;
|
|
457
|
+
runnerLogger.warn("job lease lost before the outcome was written; the new holder decides it", {
|
|
458
|
+
jobId: lease.jobId,
|
|
459
|
+
job: lease.name,
|
|
460
|
+
attempt: lease.attempts,
|
|
461
|
+
outcome,
|
|
462
|
+
code: err.code
|
|
463
|
+
});
|
|
464
|
+
}
|
|
465
|
+
}
|
|
346
466
|
function createJobRunner(backend, definitions) {
|
|
347
467
|
const byName = /* @__PURE__ */ new Map();
|
|
348
468
|
for (const def of definitions) {
|
|
@@ -351,10 +471,15 @@ function createJobRunner(backend, definitions) {
|
|
|
351
471
|
const runOne = async (lease) => {
|
|
352
472
|
const def = byName.get(lease.name);
|
|
353
473
|
if (!def) {
|
|
354
|
-
await
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
474
|
+
await finish(
|
|
475
|
+
lease,
|
|
476
|
+
"nack",
|
|
477
|
+
() => backend.nack(lease.jobId, {
|
|
478
|
+
error: `No job definition for "${lease.name}"`,
|
|
479
|
+
nonRetryable: true,
|
|
480
|
+
leaseToken: lease.leaseToken
|
|
481
|
+
})
|
|
482
|
+
);
|
|
358
483
|
return;
|
|
359
484
|
}
|
|
360
485
|
let traceId;
|
|
@@ -370,10 +495,15 @@ function createJobRunner(backend, definitions) {
|
|
|
370
495
|
try {
|
|
371
496
|
parsedInput = def.inputSchema.parse(lease.input);
|
|
372
497
|
} catch (err) {
|
|
373
|
-
await
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
498
|
+
await finish(
|
|
499
|
+
lease,
|
|
500
|
+
"nack",
|
|
501
|
+
() => backend.nack(lease.jobId, {
|
|
502
|
+
error: `Input validation failed: ${err instanceof Error ? err.message : String(err)}`,
|
|
503
|
+
nonRetryable: true,
|
|
504
|
+
leaseToken: lease.leaseToken
|
|
505
|
+
})
|
|
506
|
+
);
|
|
377
507
|
return;
|
|
378
508
|
}
|
|
379
509
|
}
|
|
@@ -391,18 +521,32 @@ function createJobRunner(backend, definitions) {
|
|
|
391
521
|
signal: abortController.signal,
|
|
392
522
|
attempt: lease.attempts
|
|
393
523
|
};
|
|
524
|
+
let failure;
|
|
525
|
+
let failed = false;
|
|
394
526
|
try {
|
|
395
527
|
await def.handler(jobCtx);
|
|
396
|
-
await backend.ack(lease.jobId);
|
|
397
528
|
} catch (err) {
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
error: err instanceof Error ? err.message : String(err),
|
|
401
|
-
nonRetryable: isNonRetryable
|
|
402
|
-
});
|
|
529
|
+
failed = true;
|
|
530
|
+
failure = err;
|
|
403
531
|
} finally {
|
|
404
532
|
clearTimeout(lockTimer);
|
|
405
533
|
}
|
|
534
|
+
if (!failed) {
|
|
535
|
+
await finish(lease, "ack", () => backend.ack(lease.jobId, { leaseToken: lease.leaseToken }));
|
|
536
|
+
return;
|
|
537
|
+
}
|
|
538
|
+
await finish(
|
|
539
|
+
lease,
|
|
540
|
+
"nack",
|
|
541
|
+
() => backend.nack(lease.jobId, {
|
|
542
|
+
error: failure instanceof Error ? failure.message : String(failure),
|
|
543
|
+
nonRetryable: failure instanceof NonRetryableError,
|
|
544
|
+
leaseToken: lease.leaseToken,
|
|
545
|
+
// The definition is the source of truth: a job enqueued through the queue client was stored
|
|
546
|
+
// with the backend default of 1 (usetheokit/theokit#1013).
|
|
547
|
+
maxAttempts: def.maxAttempts
|
|
548
|
+
})
|
|
549
|
+
);
|
|
406
550
|
};
|
|
407
551
|
return {
|
|
408
552
|
async tick(opts) {
|
|
@@ -418,6 +562,59 @@ function createJobRunner(backend, definitions) {
|
|
|
418
562
|
};
|
|
419
563
|
}
|
|
420
564
|
|
|
565
|
+
// src/server/jobs/job-worker.ts
|
|
566
|
+
var workerLogger = createLogger({ context: { component: "theokit:jobs:worker" } });
|
|
567
|
+
function createJobWorker(runner, options = {}) {
|
|
568
|
+
const pollIntervalMs = options.pollIntervalMs ?? 1e3;
|
|
569
|
+
const maxErrorBackoffMs = options.maxErrorBackoffMs ?? 3e4;
|
|
570
|
+
const tickOptions = { batchSize: options.batchSize ?? 10, lockSeconds: options.lockSeconds ?? 30 };
|
|
571
|
+
let running = false;
|
|
572
|
+
let loop;
|
|
573
|
+
let wake;
|
|
574
|
+
const wait = (ms) => new Promise((resolve) => {
|
|
575
|
+
const timer = setTimeout(done, ms);
|
|
576
|
+
function done() {
|
|
577
|
+
clearTimeout(timer);
|
|
578
|
+
wake = void 0;
|
|
579
|
+
resolve();
|
|
580
|
+
}
|
|
581
|
+
wake = done;
|
|
582
|
+
});
|
|
583
|
+
const run = async () => {
|
|
584
|
+
let failures = 0;
|
|
585
|
+
while (running) {
|
|
586
|
+
try {
|
|
587
|
+
const leased = await runner.tick(tickOptions);
|
|
588
|
+
failures = 0;
|
|
589
|
+
if (leased > 0) continue;
|
|
590
|
+
await wait(pollIntervalMs);
|
|
591
|
+
} catch (err) {
|
|
592
|
+
failures++;
|
|
593
|
+
const delayMs = Math.min(pollIntervalMs * 2 ** failures, maxErrorBackoffMs);
|
|
594
|
+
workerLogger.error("job worker tick failed; retrying", {
|
|
595
|
+
error: err instanceof Error ? err.message : String(err),
|
|
596
|
+
consecutiveFailures: failures,
|
|
597
|
+
retryInMs: delayMs
|
|
598
|
+
});
|
|
599
|
+
await wait(delayMs);
|
|
600
|
+
}
|
|
601
|
+
}
|
|
602
|
+
};
|
|
603
|
+
return {
|
|
604
|
+
start() {
|
|
605
|
+
if (running) return;
|
|
606
|
+
running = true;
|
|
607
|
+
loop = run();
|
|
608
|
+
},
|
|
609
|
+
async stop() {
|
|
610
|
+
running = false;
|
|
611
|
+
wake?.();
|
|
612
|
+
await loop;
|
|
613
|
+
loop = void 0;
|
|
614
|
+
}
|
|
615
|
+
};
|
|
616
|
+
}
|
|
617
|
+
|
|
421
618
|
// src/server/jobs/job-manifest.ts
|
|
422
619
|
var JOB_MANIFEST_SCHEMA_VERSION = 1;
|
|
423
620
|
function buildJobManifest(nodes, projectRoot) {
|
|
@@ -470,7 +667,7 @@ function isJobDefinition(value) {
|
|
|
470
667
|
const def = value;
|
|
471
668
|
return typeof def.name === "string" && typeof def.handler === "function" && typeof def.maxAttempts === "number" && typeof def.hasInputSchema === "boolean";
|
|
472
669
|
}
|
|
473
|
-
|
|
670
|
+
function listJobFiles(jobsDir) {
|
|
474
671
|
if (!existsSync(jobsDir)) return [];
|
|
475
672
|
const filePaths = [];
|
|
476
673
|
walkSourceFiles(jobsDir, { extensions: JOB_EXTENSIONS }, (p) => {
|
|
@@ -478,6 +675,10 @@ async function scanJobs(jobsDir) {
|
|
|
478
675
|
if (base.startsWith("_") || base.startsWith(".")) return;
|
|
479
676
|
filePaths.push(p);
|
|
480
677
|
});
|
|
678
|
+
return filePaths;
|
|
679
|
+
}
|
|
680
|
+
async function scanJobs(jobsDir) {
|
|
681
|
+
const filePaths = listJobFiles(jobsDir);
|
|
481
682
|
const nodes = [];
|
|
482
683
|
for (const filePath of filePaths) {
|
|
483
684
|
let mod;
|
|
@@ -517,13 +718,15 @@ async function scanJobs(jobsDir) {
|
|
|
517
718
|
export {
|
|
518
719
|
defineJob,
|
|
519
720
|
NonRetryableError,
|
|
721
|
+
JobLeaseLostError,
|
|
520
722
|
InMemoryJobBackend,
|
|
521
723
|
PostgresJobBackend,
|
|
522
724
|
createJobRunner,
|
|
725
|
+
createJobWorker,
|
|
523
726
|
JOB_MANIFEST_SCHEMA_VERSION,
|
|
524
727
|
buildJobManifest,
|
|
525
728
|
writeJobManifest,
|
|
526
729
|
DuplicateJobNameError,
|
|
527
730
|
scanJobs
|
|
528
731
|
};
|
|
529
|
-
//# sourceMappingURL=chunk-
|
|
732
|
+
//# sourceMappingURL=chunk-UQQQ3V43.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/server/jobs/define-job.ts","../src/server/jobs/job-backend.ts","../src/server/jobs/job-backend-memory.ts","../src/server/jobs/job-backend-postgres.ts","../src/server/jobs/job-runner.ts","../src/server/jobs/job-worker.ts","../src/server/jobs/job-manifest.ts","../src/server/jobs/job-scan.ts"],"mappings":"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","names":["now"]}
|
|
@@ -5,9 +5,24 @@ import {
|
|
|
5
5
|
} from "./chunk-C27VRUVN.js";
|
|
6
6
|
import {
|
|
7
7
|
observabilitySchema
|
|
8
|
-
} from "./chunk-
|
|
8
|
+
} from "./chunk-MAJZ2L3A.js";
|
|
9
9
|
|
|
10
10
|
// src/server/observability/trace-context-propagation.ts
|
|
11
|
+
var TRACEPARENT_RE = /^00-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})$/;
|
|
12
|
+
var ALL_ZEROS_TRACE = "00000000000000000000000000000000";
|
|
13
|
+
var ALL_ZEROS_SPAN = "0000000000000000";
|
|
14
|
+
function extractTraceContext(headers) {
|
|
15
|
+
const value = headers.get("traceparent");
|
|
16
|
+
if (!value) return null;
|
|
17
|
+
const m = TRACEPARENT_RE.exec(value);
|
|
18
|
+
if (!m) return null;
|
|
19
|
+
const trace_id = m[1];
|
|
20
|
+
const span_id = m[2];
|
|
21
|
+
const flags = m[3];
|
|
22
|
+
if (trace_id === ALL_ZEROS_TRACE) return null;
|
|
23
|
+
if (span_id === ALL_ZEROS_SPAN) return null;
|
|
24
|
+
return { trace_id, span_id, flags };
|
|
25
|
+
}
|
|
11
26
|
function generateNewTraceContext() {
|
|
12
27
|
return {
|
|
13
28
|
trace_id: newTraceId(),
|
|
@@ -333,10 +348,10 @@ function resolveAdapter(options) {
|
|
|
333
348
|
var TRACE_HEADER = "x-trace-id";
|
|
334
349
|
var TRACE_PARENT_HEADER = "traceparent";
|
|
335
350
|
var REQUEST_ID_HEADER = "x-request-id";
|
|
336
|
-
var
|
|
351
|
+
var TRACEPARENT_RE2 = /^00-([0-9a-f]{32})-([0-9a-f]{16})-[0-9a-f]{2}$/;
|
|
337
352
|
function parseTraceparentContext(value) {
|
|
338
353
|
if (!value) return null;
|
|
339
|
-
const m =
|
|
354
|
+
const m = TRACEPARENT_RE2.exec(value);
|
|
340
355
|
if (!m) return null;
|
|
341
356
|
const traceId = m[1];
|
|
342
357
|
if (/^0+$/.test(traceId)) return null;
|
|
@@ -500,14 +515,15 @@ function createObservabilityPluginFromConfig(observabilityConfig, env) {
|
|
|
500
515
|
}
|
|
501
516
|
|
|
502
517
|
export {
|
|
503
|
-
|
|
504
|
-
extractTraceId,
|
|
518
|
+
extractTraceContext,
|
|
505
519
|
generateNewTraceContext,
|
|
506
520
|
newTraceId,
|
|
507
521
|
newSpanId,
|
|
522
|
+
TRACE_HEADER,
|
|
523
|
+
extractTraceId,
|
|
508
524
|
requestTrace,
|
|
509
525
|
getObservabilityAdapter,
|
|
510
526
|
_resetObservabilityAdapter,
|
|
511
527
|
createObservabilityPluginFromConfig
|
|
512
528
|
};
|
|
513
|
-
//# sourceMappingURL=chunk-
|
|
529
|
+
//# sourceMappingURL=chunk-VXDTQO3S.js.map
|