express-file-cluster 0.11.0 → 0.12.0
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/auth/index.cjs +8 -7
- package/dist/auth/index.cjs.map +1 -1
- package/dist/auth/index.d.cts +1 -1
- package/dist/auth/index.d.ts +1 -1
- package/dist/auth/index.js +7 -5
- package/dist/{chunk-JBOMTZT5.js → chunk-3JQWQF2M.js} +3 -3
- package/dist/{chunk-WHBSVYUY.cjs → chunk-4FQP6QX3.cjs} +3 -3
- package/dist/{chunk-WHBSVYUY.cjs.map → chunk-4FQP6QX3.cjs.map} +1 -1
- package/dist/chunk-546TNO2V.js +226 -0
- package/dist/chunk-546TNO2V.js.map +1 -0
- package/dist/{chunk-EJDZZ4KX.js → chunk-74R37C4I.js} +48 -21
- package/dist/chunk-74R37C4I.js.map +1 -0
- package/dist/{chunk-H2PVWCWC.cjs → chunk-A2QGDWCG.cjs} +15 -8
- package/dist/chunk-A2QGDWCG.cjs.map +1 -0
- package/dist/{chunk-O2E7H2XA.js → chunk-BCSJOPYH.js} +2 -2
- package/dist/{chunk-DGYPIIJE.cjs → chunk-BJR42CN3.cjs} +89 -62
- package/dist/chunk-BJR42CN3.cjs.map +1 -0
- package/dist/{chunk-OM2XJJWX.js → chunk-EBJELA7T.js} +30 -25
- package/dist/chunk-EBJELA7T.js.map +1 -0
- package/dist/{chunk-IEF6AEK3.cjs → chunk-H6MHRHUP.cjs} +104 -50
- package/dist/chunk-H6MHRHUP.cjs.map +1 -0
- package/dist/{chunk-6WTMRZS7.cjs → chunk-IG3V2IOK.cjs} +57 -30
- package/dist/chunk-IG3V2IOK.cjs.map +1 -0
- package/dist/chunk-JAPZYQVJ.cjs +143 -0
- package/dist/chunk-JAPZYQVJ.cjs.map +1 -0
- package/dist/{chunk-QSIP7YLW.cjs → chunk-JHCXIYJH.cjs} +25 -48
- package/dist/chunk-JHCXIYJH.cjs.map +1 -0
- package/dist/{chunk-GWMW6XY7.cjs → chunk-JVB5NLEM.cjs} +15 -13
- package/dist/chunk-JVB5NLEM.cjs.map +1 -0
- package/dist/{chunk-LECHRAU3.js → chunk-LIAGVWFQ.js} +83 -56
- package/dist/chunk-LIAGVWFQ.js.map +1 -0
- package/dist/chunk-PUM5ZDAH.js +140 -0
- package/dist/chunk-PUM5ZDAH.js.map +1 -0
- package/dist/{chunk-CGY7JU4Y.cjs → chunk-PUYBKDYD.cjs} +11 -2
- package/dist/chunk-PUYBKDYD.cjs.map +1 -0
- package/dist/{chunk-336IU55W.js → chunk-QLM3JEER.js} +5 -3
- package/dist/{chunk-336IU55W.js.map → chunk-QLM3JEER.js.map} +1 -1
- package/dist/{chunk-SOU3PBJC.cjs → chunk-SV4C4HWP.cjs} +89 -89
- package/dist/{chunk-SOU3PBJC.cjs.map → chunk-SV4C4HWP.cjs.map} +1 -1
- package/dist/{chunk-2IDRC7RK.js → chunk-UJ2ISRLP.js} +11 -34
- package/dist/chunk-UJ2ISRLP.js.map +1 -0
- package/dist/chunk-URKE3OXN.cjs +226 -0
- package/dist/chunk-URKE3OXN.cjs.map +1 -0
- package/dist/{chunk-DTMDJGRW.cjs → chunk-VLGN3XUM.cjs} +40 -35
- package/dist/chunk-VLGN3XUM.cjs.map +1 -0
- package/dist/{chunk-R6GPQZLI.js → chunk-X2B7WBKH.js} +88 -34
- package/dist/chunk-X2B7WBKH.js.map +1 -0
- package/dist/chunk-Y7I2633P.js +12 -0
- package/dist/chunk-Y7I2633P.js.map +1 -0
- package/dist/{chunk-B6MB6HEG.js → chunk-ZBQUYFI3.js} +14 -7
- package/dist/chunk-ZBQUYFI3.js.map +1 -0
- package/dist/cli/db-runner.cjs +26 -25
- package/dist/cli/db-runner.cjs.map +1 -1
- package/dist/cli/db-runner.js +5 -3
- package/dist/cli/db-runner.js.map +1 -1
- package/dist/cli/index.cjs +16 -15
- package/dist/cli/index.cjs.map +1 -1
- package/dist/cli/index.js +9 -7
- package/dist/cli/index.js.map +1 -1
- package/dist/docs/api-reference/auth.md +2 -0
- package/dist/docs/api-reference/ignite.md +2 -0
- package/dist/docs/api-reference/tasks.md +5 -1
- package/dist/docs/api-reference/testing.md +2 -0
- package/dist/docs/api-reference/tracing.md +18 -0
- package/dist/docs/cli/add.md +1 -1
- package/dist/docs/core-concepts/background-tasks.md +5 -1
- package/dist/docs/core-concepts/file-based-routing.md +2 -0
- package/dist/docs/core-concepts/middleware.md +2 -0
- package/dist/docs/guides/caching.md +12 -0
- package/dist/docs/guides/error-handling.md +2 -0
- package/dist/docs/guides/feature-matrix.md +7 -0
- package/dist/docs/guides/logging.md +2 -0
- package/dist/docs/guides/tracing.md +64 -0
- package/dist/docs/index.md +2 -1
- package/dist/docs/skills/SKILL.md +5 -3
- package/dist/docs/skills/api-surface.md +8 -0
- package/dist/docs/skills/auth-internals.md +4 -2
- package/dist/docs/skills/pre-flight.md +4 -0
- package/dist/docs/skills/routing-rules.md +2 -0
- package/dist/docs/skills/tasks-internals.md +10 -2
- package/dist/docs/skills/what-not-to-invent.md +2 -0
- package/dist/index.cjs +163 -70
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +5 -14
- package/dist/index.d.ts +5 -14
- package/dist/index.js +120 -26
- package/dist/index.js.map +1 -1
- package/dist/pgboss-backend-5DXF4G22.js +16 -0
- package/dist/pgboss-backend-KRTFHRNZ.cjs +16 -0
- package/dist/pgboss-backend-KRTFHRNZ.cjs.map +1 -0
- package/dist/registry/index.json +1 -1
- package/dist/tasks/index.cjs +3 -3
- package/dist/tasks/index.d.cts +2 -2
- package/dist/tasks/index.d.ts +2 -2
- package/dist/tasks/index.js +2 -1
- package/dist/testing.cjs +16 -14
- package/dist/testing.cjs.map +1 -1
- package/dist/testing.d.cts +2 -1
- package/dist/testing.d.ts +2 -1
- package/dist/testing.js +10 -7
- package/dist/testing.js.map +1 -1
- package/dist/thread-runner.cjs +5 -4
- package/dist/thread-runner.cjs.map +1 -1
- package/dist/thread-runner.d.cts +1 -1
- package/dist/thread-runner.d.ts +1 -1
- package/dist/thread-runner.js +4 -2
- package/dist/{types-D3QmZgeX.d.ts → types-Bgeqpm-n.d.cts} +12 -1
- package/dist/{types-D3QmZgeX.d.cts → types-Bgeqpm-n.d.ts} +12 -1
- package/package.json +7 -3
- package/dist/chunk-2IDRC7RK.js.map +0 -1
- package/dist/chunk-3SWI46YK.js +0 -74
- package/dist/chunk-3SWI46YK.js.map +0 -1
- package/dist/chunk-6WTMRZS7.cjs.map +0 -1
- package/dist/chunk-B6MB6HEG.js.map +0 -1
- package/dist/chunk-CGY7JU4Y.cjs.map +0 -1
- package/dist/chunk-DGYPIIJE.cjs.map +0 -1
- package/dist/chunk-DTMDJGRW.cjs.map +0 -1
- package/dist/chunk-EJDZZ4KX.js.map +0 -1
- package/dist/chunk-GWMW6XY7.cjs.map +0 -1
- package/dist/chunk-H2PVWCWC.cjs.map +0 -1
- package/dist/chunk-IEF6AEK3.cjs.map +0 -1
- package/dist/chunk-LECHRAU3.js.map +0 -1
- package/dist/chunk-OM2XJJWX.js.map +0 -1
- package/dist/chunk-QSIP7YLW.cjs.map +0 -1
- package/dist/chunk-R6GPQZLI.js.map +0 -1
- package/dist/chunk-RPL2IFWK.cjs +0 -77
- package/dist/chunk-RPL2IFWK.cjs.map +0 -1
- package/dist/pgboss-backend-PQW6I3VF.js +0 -14
- package/dist/pgboss-backend-QVXISTLP.cjs +0 -15
- package/dist/pgboss-backend-QVXISTLP.cjs.map +0 -1
- /package/dist/{chunk-JBOMTZT5.js.map → chunk-3JQWQF2M.js.map} +0 -0
- /package/dist/{chunk-O2E7H2XA.js.map → chunk-BCSJOPYH.js.map} +0 -0
- /package/dist/{pgboss-backend-PQW6I3VF.js.map → pgboss-backend-5DXF4G22.js.map} +0 -0
|
@@ -1,19 +1,37 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunkJAPZYQVJcjs = require('./chunk-JAPZYQVJ.cjs');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkA2QGDWCGcjs = require('./chunk-A2QGDWCG.cjs');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _chunkJHCXIYJHcjs = require('./chunk-JHCXIYJH.cjs');
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
var _chunkURKE3OXNcjs = require('./chunk-URKE3OXN.cjs');
|
|
16
|
+
|
|
17
|
+
// src/tasks/payload.ts
|
|
18
|
+
var VALUE = "__efcValue";
|
|
19
|
+
var VERSION = "__efcBox";
|
|
20
|
+
function boxPgPayload(payload) {
|
|
21
|
+
if (payload === void 0) return {};
|
|
22
|
+
if (payload !== null && typeof payload === "object" && !Array.isArray(payload) && !Object.hasOwn(payload, VALUE))
|
|
23
|
+
return payload;
|
|
24
|
+
return { [VERSION]: 1, [VALUE]: payload };
|
|
25
|
+
}
|
|
26
|
+
function unboxPgPayload(data) {
|
|
27
|
+
if (data === null || typeof data !== "object" || !Object.hasOwn(data, VALUE)) return data;
|
|
28
|
+
const keys = Object.keys(data);
|
|
29
|
+
if (keys.length === 1 || keys.length === 2 && Object.hasOwn(data, VERSION) && data[VERSION] === 1)
|
|
30
|
+
return data[VALUE];
|
|
31
|
+
return data;
|
|
32
|
+
}
|
|
12
33
|
|
|
13
34
|
// src/tasks/pgboss-backend.ts
|
|
14
|
-
var BOX = "__efcValue";
|
|
15
|
-
var box = (payload) => payload !== null && typeof payload === "object" && !Array.isArray(payload) ? payload : { [BOX]: payload };
|
|
16
|
-
var unbox = (data) => data !== null && typeof data === "object" && BOX in data ? data[BOX] : data;
|
|
17
35
|
var retryOptions = (def) => ({
|
|
18
36
|
// pg-boss's retryLimit counts re-runs, exactly like EFC's `retries`.
|
|
19
37
|
retryLimit: _nullishCoalesce(def.options.retries, () => ( 3)),
|
|
@@ -39,17 +57,22 @@ async function initPgBoss(opts) {
|
|
|
39
57
|
const PgBoss = await loadPgBoss();
|
|
40
58
|
const boss = new PgBoss({
|
|
41
59
|
connectionString: opts.connectionString,
|
|
60
|
+
openTelemetry: {
|
|
61
|
+
enabled: !!opts.tracing,
|
|
62
|
+
propagateContext: !!opts.tracing,
|
|
63
|
+
propagator: _chunkURKE3OXNcjs.tracePropagator
|
|
64
|
+
},
|
|
42
65
|
...opts.schema !== void 0 && { schema: opts.schema }
|
|
43
66
|
});
|
|
44
|
-
boss.on("error", (err) =>
|
|
67
|
+
boss.on("error", (err) => _chunkJHCXIYJHcjs.getLogger.call(void 0, ).error({ err }, "pg-boss error"));
|
|
45
68
|
try {
|
|
46
69
|
await boss.start();
|
|
47
70
|
} catch (err) {
|
|
48
|
-
throw
|
|
71
|
+
throw _chunkJHCXIYJHcjs.explainPostgresError.call(void 0, err, opts.connectionString);
|
|
49
72
|
}
|
|
50
73
|
const queueFor = (name) => `${opts.queue}.${name}`;
|
|
51
74
|
const wantedSchedules = /* @__PURE__ */ new Set();
|
|
52
|
-
for (const def of
|
|
75
|
+
for (const def of _chunkA2QGDWCGcjs.taskRegistry.values()) {
|
|
53
76
|
const queue = queueFor(def.name);
|
|
54
77
|
await boss.createQueue(queue, retryOptions(def));
|
|
55
78
|
await boss.work(
|
|
@@ -57,13 +80,14 @@ async function initPgBoss(opts) {
|
|
|
57
80
|
{ localConcurrency: _nullishCoalesce(def.options.concurrency, () => ( opts.concurrency)) },
|
|
58
81
|
async (jobs) => {
|
|
59
82
|
for (const job of jobs) {
|
|
60
|
-
const payload =
|
|
83
|
+
const payload = unboxPgPayload(job.data);
|
|
61
84
|
try {
|
|
62
|
-
if (def.options.thread && def.filePath)
|
|
63
|
-
|
|
64
|
-
|
|
85
|
+
if (def.options.thread && def.filePath)
|
|
86
|
+
await _chunkURKE3OXNcjs.taskContext.call(void 0, () => _chunkJAPZYQVJcjs.runInThread.call(void 0, def.filePath, payload, !!opts.tracing));
|
|
87
|
+
else await _chunkURKE3OXNcjs.taskContext.call(void 0, () => def.handler(payload));
|
|
88
|
+
_chunkJHCXIYJHcjs.getLogger.call(void 0, ).info({ task: def.name, jobId: job.id }, `Task ${def.name} completed`);
|
|
65
89
|
} catch (err) {
|
|
66
|
-
|
|
90
|
+
_chunkJHCXIYJHcjs.getLogger.call(void 0, ).error(
|
|
67
91
|
{ task: def.name, jobId: job.id, attempt: job.retryCount + 1, err },
|
|
68
92
|
`Task ${def.name} failed`
|
|
69
93
|
);
|
|
@@ -90,9 +114,9 @@ async function initPgBoss(opts) {
|
|
|
90
114
|
await boss.unschedule(s.name);
|
|
91
115
|
}
|
|
92
116
|
}
|
|
93
|
-
if (wantedSchedules.size > 0)
|
|
94
|
-
|
|
95
|
-
const def =
|
|
117
|
+
if (wantedSchedules.size > 0) _chunkJHCXIYJHcjs.getLogger.call(void 0, ).info(`Scheduled ${wantedSchedules.size} cron task(s)`);
|
|
118
|
+
_chunkA2QGDWCGcjs.setEnqueueImpl.call(void 0, async (name, payload) => {
|
|
119
|
+
const def = _chunkA2QGDWCGcjs.taskRegistry.get(name);
|
|
96
120
|
if (!def) {
|
|
97
121
|
throw new Error(
|
|
98
122
|
`[EFC] Cannot enqueue unknown task: "${name}". Is the task file in tasksDir?`
|
|
@@ -110,7 +134,11 @@ async function initPgBoss(opts) {
|
|
|
110
134
|
);
|
|
111
135
|
});
|
|
112
136
|
try {
|
|
113
|
-
await Promise.race([
|
|
137
|
+
const id = await Promise.race([
|
|
138
|
+
boss.send(queueFor(name), boxPgPayload(payload), retryOptions(def)),
|
|
139
|
+
timeout
|
|
140
|
+
]);
|
|
141
|
+
if (id === null) throw new Error(`[EFC] Queue did not accept task "${name}"`);
|
|
114
142
|
} catch (err) {
|
|
115
143
|
if (err instanceof Error && err.message.startsWith("[EFC]")) throw err;
|
|
116
144
|
throw new Error(
|
|
@@ -123,13 +151,14 @@ async function initPgBoss(opts) {
|
|
|
123
151
|
closeImpl = async () => {
|
|
124
152
|
await boss.stop({ graceful: true, timeout: 1e4 });
|
|
125
153
|
};
|
|
126
|
-
|
|
154
|
+
_chunkJHCXIYJHcjs.getLogger.call(void 0, ).info("pg-boss backend initialised");
|
|
127
155
|
}
|
|
128
156
|
async function pgBossAdmin(connectionString, queue = "efc", schema = "pgboss") {
|
|
129
157
|
const PgBoss = await loadPgBoss();
|
|
130
158
|
const boss = new PgBoss({
|
|
131
159
|
connectionString,
|
|
132
160
|
schema,
|
|
161
|
+
openTelemetry: { enabled: false },
|
|
133
162
|
supervise: false,
|
|
134
163
|
schedule: false,
|
|
135
164
|
migrate: false
|
|
@@ -166,16 +195,14 @@ async function pgBossAdmin(connectionString, queue = "efc", schema = "pgboss") {
|
|
|
166
195
|
const rows = (await failedRows([], name ? 1e4 : limit)).filter(
|
|
167
196
|
(r) => !name || taskOf(r.name) === name
|
|
168
197
|
);
|
|
169
|
-
return rows.slice(0, limit).map(
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
})
|
|
178
|
-
);
|
|
198
|
+
return rows.slice(0, limit).map((r) => ({
|
|
199
|
+
id: r.id,
|
|
200
|
+
name: taskOf(r.name),
|
|
201
|
+
data: unboxPgPayload(r.data),
|
|
202
|
+
error: String(_nullishCoalesce(_nullishCoalesce(_optionalChain([r, 'access', _3 => _3.output, 'optionalAccess', _4 => _4.message]), () => ( r.output)), () => ( ""))),
|
|
203
|
+
attempts: r.retry_count + 1,
|
|
204
|
+
failedAt: _nullishCoalesce(r.completed_on, () => ( void 0))
|
|
205
|
+
}));
|
|
179
206
|
},
|
|
180
207
|
async retry(ids) {
|
|
181
208
|
const rows = await failedRows(ids);
|
|
@@ -198,4 +225,4 @@ async function pgBossAdmin(connectionString, queue = "efc", schema = "pgboss") {
|
|
|
198
225
|
|
|
199
226
|
|
|
200
227
|
exports.closePgBoss = closePgBoss; exports.initPgBoss = initPgBoss; exports.pgBossAdmin = pgBossAdmin;
|
|
201
|
-
//# sourceMappingURL=chunk-
|
|
228
|
+
//# sourceMappingURL=chunk-IG3V2IOK.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-IG3V2IOK.cjs","../src/tasks/payload.ts","../src/tasks/pgboss-backend.ts"],"names":[],"mappings":"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","file":"/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-IG3V2IOK.cjs","sourcesContent":[null,"// pg-boss accepts object payloads. Escape user objects that contain the legacy\n// box key, and retain support for jobs written by older EFC versions.\nconst VALUE = '__efcValue';\nconst VERSION = '__efcBox';\nexport function boxPgPayload(payload: unknown): object {\n if (payload === undefined) return {}; // Same JSON-queue normalization as BullMQ.\n if (\n payload !== null &&\n typeof payload === 'object' &&\n !Array.isArray(payload) &&\n !Object.hasOwn(payload, VALUE)\n )\n return payload;\n return { [VERSION]: 1, [VALUE]: payload };\n}\nexport function unboxPgPayload(data: unknown): unknown {\n if (data === null || typeof data !== 'object' || !Object.hasOwn(data, VALUE)) return data;\n const keys = Object.keys(data);\n if (\n keys.length === 1 ||\n (keys.length === 2 &&\n Object.hasOwn(data, VERSION) &&\n (data as Record<string, unknown>)[VERSION] === 1)\n )\n return (data as Record<string, unknown>)[VALUE];\n return data;\n}\n","import { boxPgPayload as box, unboxPgPayload as unbox } from './payload.js';\nimport { taskContext, tracePropagator } from '../tracing.js';\nimport type { PgBoss as PgBossType } from 'pg-boss';\nimport type { TaskDefinition } from '../types.js';\nimport { taskRegistry, setEnqueueImpl } from './index.js';\nimport { runInThread } from './thread-runner.js';\nimport { getLogger } from '../logger.js';\nimport { explainPostgresError } from '../db/postgres.js';\nimport type { FailedJob, TaskAdmin } from './admin.js';\n\n// pg-boss keeps one queue per job name, so each task gets its own pg-boss queue\n// named `<tasks.queue>.<TaskName>` — the prefix keeps apps sharing a database apart.\n\ninterface PgBossOpts {\n tracing?: boolean;\n connectionString: string;\n concurrency: number;\n enqueueTimeout: number;\n queue: string;\n schema?: string;\n}\n\nconst retryOptions = (def: TaskDefinition) => ({\n // pg-boss's retryLimit counts re-runs, exactly like EFC's `retries`.\n retryLimit: def.options.retries ?? 3,\n retryDelay: 1,\n retryBackoff: (def.options.backoff ?? 'exponential') === 'exponential',\n});\n\nasync function loadPgBoss(): Promise<typeof PgBossType> {\n try {\n const mod = (await import('pg-boss')) as unknown as {\n PgBoss?: typeof PgBossType;\n default?: typeof PgBossType | { PgBoss: typeof PgBossType };\n };\n const ctor =\n mod.PgBoss ??\n (typeof mod.default === 'function'\n ? mod.default\n : (mod.default as { PgBoss: typeof PgBossType }).PgBoss);\n return ctor;\n } catch {\n throw new Error('[EFC] pg-boss is not installed. Run: npm install pg-boss');\n }\n}\n\nlet closeImpl: (() => Promise<void>) | null = null;\n\nexport async function closePgBoss(): Promise<void> {\n const close = closeImpl;\n closeImpl = null;\n await close?.();\n}\n\nexport async function initPgBoss(opts: PgBossOpts): Promise<void> {\n const PgBoss = await loadPgBoss();\n const boss = new PgBoss({\n connectionString: opts.connectionString,\n openTelemetry: {\n enabled: !!opts.tracing,\n propagateContext: !!opts.tracing,\n propagator: tracePropagator,\n },\n ...(opts.schema !== undefined && { schema: opts.schema }),\n });\n boss.on('error', (err: Error) => getLogger().error({ err }, 'pg-boss error'));\n try {\n await boss.start();\n } catch (err) {\n throw explainPostgresError(err, opts.connectionString);\n }\n\n const queueFor = (name: string) => `${opts.queue}.${name}`;\n const wantedSchedules = new Set<string>();\n\n for (const def of taskRegistry.values()) {\n const queue = queueFor(def.name);\n await boss.createQueue(queue, retryOptions(def));\n await boss.work(\n queue,\n { localConcurrency: def.options.concurrency ?? opts.concurrency },\n async (jobs: { id: string; data: unknown; retryCount: number }[]) => {\n for (const job of jobs) {\n const payload = unbox(job.data);\n try {\n if (def.options.thread && def.filePath)\n await taskContext(() => runInThread(def.filePath!, payload, !!opts.tracing));\n else await taskContext(() => def.handler(payload));\n getLogger().info({ task: def.name, jobId: job.id }, `Task ${def.name} completed`);\n } catch (err) {\n getLogger().error(\n { task: def.name, jobId: job.id, attempt: job.retryCount + 1, err },\n `Task ${def.name} failed`,\n );\n throw err;\n }\n }\n },\n );\n if (def.options.schedule) {\n wantedSchedules.add(queue);\n await boss.schedule(\n queue,\n def.options.schedule,\n {},\n {\n ...retryOptions(def),\n ...(def.options.timezone !== undefined && { tz: def.options.timezone }),\n },\n );\n }\n }\n\n // Drop schedules for tasks that lost their `schedule` or no longer exist.\n for (const s of await boss.getSchedules()) {\n if (s.name.startsWith(`${opts.queue}.`) && !wantedSchedules.has(s.name)) {\n await boss.unschedule(s.name);\n }\n }\n if (wantedSchedules.size > 0) getLogger().info(`Scheduled ${wantedSchedules.size} cron task(s)`);\n\n setEnqueueImpl(async (name, payload) => {\n const def = taskRegistry.get(name);\n if (!def) {\n throw new Error(\n `[EFC] Cannot enqueue unknown task: \"${name}\". Is the task file in tasksDir?`,\n );\n }\n let timer: NodeJS.Timeout | undefined;\n const timeout = new Promise<never>((_, reject) => {\n timer = setTimeout(\n () =>\n reject(\n new Error(\n `[EFC] Cannot enqueue task \"${name}\": PostgreSQL did not respond within ${opts.enqueueTimeout}ms`,\n ),\n ),\n opts.enqueueTimeout,\n );\n });\n try {\n const id = await Promise.race([\n boss.send(queueFor(name), box(payload), retryOptions(def)),\n timeout,\n ]);\n if (id === null) throw new Error(`[EFC] Queue did not accept task \"${name}\"`);\n } catch (err) {\n if (err instanceof Error && err.message.startsWith('[EFC]')) throw err;\n throw new Error(\n `[EFC] Cannot enqueue task \"${name}\": ${err instanceof Error ? err.message : String(err)}`,\n );\n } finally {\n clearTimeout(timer);\n }\n });\n\n closeImpl = async () => {\n // graceful: lets in-flight jobs finish before the connection pool closes.\n await boss.stop({ graceful: true, timeout: 10_000 });\n };\n\n getLogger().info('pg-boss backend initialised');\n}\n\n/** Dead-letter inspection for `efc tasks failed | retry | purge` on pg-boss. */\nexport async function pgBossAdmin(\n connectionString: string,\n queue = 'efc',\n schema = 'pgboss',\n): Promise<TaskAdmin> {\n const PgBoss = await loadPgBoss();\n // No supervision or cron here: this instance only reads and settles jobs.\n const boss = new PgBoss({\n connectionString,\n schema,\n openTelemetry: { enabled: false },\n supervise: false,\n schedule: false,\n migrate: false,\n });\n boss.on('error', () => {});\n await boss.start();\n const db = boss.getDb();\n const prefix = `${queue}.`;\n const taskOf = (name: string) => name.slice(prefix.length);\n const table = `\"${schema.replace(/\"/g, '\"\"')}\".job`;\n\n const failedRows = async (ids: string[], limit = 10_000) =>\n (\n await db.executeSql(\n `SELECT id, name, data, output, retry_count, completed_on FROM ${table}\n WHERE state = 'failed' AND starts_with(name, $1) ${ids.length ? 'AND id = ANY($3::uuid[])' : ''}\n ORDER BY completed_on DESC NULLS LAST LIMIT $2`,\n ids.length ? [prefix, limit, ids] : [prefix, limit],\n )\n ).rows as {\n id: string;\n name: string;\n data: unknown;\n output: unknown;\n retry_count: number;\n completed_on: Date | null;\n }[];\n\n const byQueue = (rows: { id: string; name: string }[]) => {\n const groups = new Map<string, string[]>();\n for (const r of rows) groups.set(r.name, [...(groups.get(r.name) ?? []), r.id]);\n return groups;\n };\n\n return {\n async counts() {\n const { rows } = await db.executeSql(\n `SELECT state, count(*)::int AS n FROM ${table} WHERE starts_with(name, $1) GROUP BY state`,\n [prefix],\n );\n return Object.fromEntries(\n (rows as { state: string; n: number }[]).map((r) => [r.state, r.n]),\n );\n },\n async listFailed({ limit, name }) {\n const rows = (await failedRows([], name ? 10_000 : limit)).filter(\n (r) => !name || taskOf(r.name) === name,\n );\n return rows.slice(0, limit).map((r): FailedJob => ({\n id: r.id,\n name: taskOf(r.name),\n data: unbox(r.data),\n error: String((r.output as { message?: string } | null)?.message ?? r.output ?? ''),\n attempts: r.retry_count + 1,\n failedAt: r.completed_on ?? undefined,\n }));\n },\n async retry(ids) {\n const rows = await failedRows(ids);\n for (const [q, list] of byQueue(rows)) await boss.retry(q, list);\n return rows.length;\n },\n async purge(ids) {\n const rows = await failedRows(ids);\n for (const [q, list] of byQueue(rows)) await boss.deleteJob(q, list);\n return rows.length;\n },\n async close() {\n await boss.stop({ graceful: false });\n },\n };\n}\n"]}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
var _chunkA2QGDWCGcjs = require('./chunk-A2QGDWCG.cjs');
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
var _chunkURKE3OXNcjs = require('./chunk-URKE3OXN.cjs');
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
var _chunkPUYBKDYDcjs = require('./chunk-PUYBKDYD.cjs');
|
|
13
|
+
|
|
14
|
+
// src/tasks/thread-runner.ts
|
|
15
|
+
var _crypto = require('crypto');
|
|
16
|
+
var _api = require('@opentelemetry/api');
|
|
17
|
+
var _worker_threads = require('worker_threads');
|
|
18
|
+
if (!_worker_threads.isMainThread && _worker_threads.parentPort && _optionalChain([_worker_threads.workerData, 'optionalAccess', _ => _.efcTask])) {
|
|
19
|
+
const port = _worker_threads.parentPort;
|
|
20
|
+
const {
|
|
21
|
+
handlerPath,
|
|
22
|
+
payload,
|
|
23
|
+
token,
|
|
24
|
+
trace: parentTrace
|
|
25
|
+
} = _worker_threads.workerData;
|
|
26
|
+
const waiting = /* @__PURE__ */ new Map();
|
|
27
|
+
let seq = 0;
|
|
28
|
+
port.unref();
|
|
29
|
+
port.on("message", (msg) => {
|
|
30
|
+
if (_optionalChain([msg, 'optionalAccess', _2 => _2.type]) !== "enqueued" || msg.token !== token) return;
|
|
31
|
+
const w = waiting.get(msg.id);
|
|
32
|
+
if (!w) return;
|
|
33
|
+
waiting.delete(msg.id);
|
|
34
|
+
if (waiting.size === 0) port.unref();
|
|
35
|
+
if (msg.error === void 0) w.resolve();
|
|
36
|
+
else w.reject(new Error(msg.error));
|
|
37
|
+
});
|
|
38
|
+
globalThis[_chunkA2QGDWCGcjs.ENQUEUE_BRIDGE] = (name, payload2) => new Promise((resolve, reject) => {
|
|
39
|
+
const id = ++seq;
|
|
40
|
+
waiting.set(id, { resolve, reject });
|
|
41
|
+
port.ref();
|
|
42
|
+
port.postMessage({
|
|
43
|
+
type: "enqueue",
|
|
44
|
+
token,
|
|
45
|
+
id,
|
|
46
|
+
name,
|
|
47
|
+
payload: payload2,
|
|
48
|
+
...parentTrace && { trace: _chunkURKE3OXNcjs.injectTrace.call(void 0, ) }
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
(async () => {
|
|
52
|
+
try {
|
|
53
|
+
const mod = await Promise.resolve().then(() => _interopRequireWildcard(require(handlerPath)));
|
|
54
|
+
const def = mod["default"];
|
|
55
|
+
if (!def || typeof def.handler !== "function") {
|
|
56
|
+
throw new Error(`[EFC] Thread runner: no valid task export in ${handlerPath}`);
|
|
57
|
+
}
|
|
58
|
+
const ctx = parentTrace ? _chunkURKE3OXNcjs.extractTrace.call(void 0, parentTrace) : _api.context.active();
|
|
59
|
+
await _chunkURKE3OXNcjs.runWithContext.call(void 0,
|
|
60
|
+
{ otelContext: ctx },
|
|
61
|
+
() => _api.context.with(ctx, () => def.handler(payload))
|
|
62
|
+
);
|
|
63
|
+
port.postMessage({ type: "done", ok: true, token });
|
|
64
|
+
} catch (err) {
|
|
65
|
+
port.postMessage({ type: "done", ok: false, error: String(err), token });
|
|
66
|
+
}
|
|
67
|
+
})();
|
|
68
|
+
}
|
|
69
|
+
function runInThread(handlerPath, payload, tracing = false) {
|
|
70
|
+
return new Promise((resolve, reject) => {
|
|
71
|
+
const token = _crypto.randomUUID.call(void 0, );
|
|
72
|
+
const worker = new (0, _worker_threads.Worker)(new URL("./thread-runner.js", _chunkPUYBKDYDcjs.importMetaUrl), {
|
|
73
|
+
workerData: {
|
|
74
|
+
efcTask: true,
|
|
75
|
+
handlerPath,
|
|
76
|
+
payload,
|
|
77
|
+
token,
|
|
78
|
+
...tracing && { trace: _chunkURKE3OXNcjs.injectTrace.call(void 0, ) }
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
let completed = false;
|
|
82
|
+
let exited = false;
|
|
83
|
+
let settled = false;
|
|
84
|
+
const pending = /* @__PURE__ */ new Set();
|
|
85
|
+
const settle = (error) => {
|
|
86
|
+
if (settled) return;
|
|
87
|
+
settled = true;
|
|
88
|
+
if (error) reject(error);
|
|
89
|
+
else resolve();
|
|
90
|
+
};
|
|
91
|
+
worker.on("message", (message) => {
|
|
92
|
+
if (!message || typeof message !== "object" || message.token !== token)
|
|
93
|
+
return;
|
|
94
|
+
const msg = message;
|
|
95
|
+
if (msg.type === "enqueue") {
|
|
96
|
+
if (completed || !Number.isSafeInteger(msg.id) || typeof msg.name !== "string") return;
|
|
97
|
+
const reply = (error) => {
|
|
98
|
+
if (exited) return;
|
|
99
|
+
try {
|
|
100
|
+
worker.postMessage({
|
|
101
|
+
type: "enqueued",
|
|
102
|
+
token,
|
|
103
|
+
id: msg.id,
|
|
104
|
+
...error !== void 0 && { error }
|
|
105
|
+
});
|
|
106
|
+
} catch (e) {
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
const parent = msg.trace ? _chunkURKE3OXNcjs.extractTrace.call(void 0, msg.trace) : _api.context.active();
|
|
110
|
+
const operation = Promise.resolve().then(() => _api.context.with(parent, () => _chunkA2QGDWCGcjs.enqueue.call(void 0, msg.name, msg.payload))).then(
|
|
111
|
+
() => reply(),
|
|
112
|
+
(err) => reply(err instanceof Error ? err.message : String(err))
|
|
113
|
+
);
|
|
114
|
+
pending.add(operation);
|
|
115
|
+
void operation.then(() => pending.delete(operation));
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
if (msg.type !== "done" || typeof msg.ok !== "boolean" || completed) return;
|
|
119
|
+
completed = true;
|
|
120
|
+
void Promise.allSettled([...pending]).then(() => worker.terminate()).then(
|
|
121
|
+
() => settle(
|
|
122
|
+
msg.ok ? void 0 : new Error(typeof msg.error === "string" ? msg.error : "Thread task failed")
|
|
123
|
+
),
|
|
124
|
+
(error) => settle(error instanceof Error ? error : new Error(String(error)))
|
|
125
|
+
);
|
|
126
|
+
});
|
|
127
|
+
worker.on("error", (error) => {
|
|
128
|
+
void worker.terminate().catch(() => {
|
|
129
|
+
});
|
|
130
|
+
settle(error);
|
|
131
|
+
});
|
|
132
|
+
worker.on("exit", (code) => {
|
|
133
|
+
exited = true;
|
|
134
|
+
if (!completed)
|
|
135
|
+
settle(new Error(`Thread worker exited with code ${code} before reporting completion`));
|
|
136
|
+
});
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
|
|
141
|
+
|
|
142
|
+
exports.runInThread = runInThread;
|
|
143
|
+
//# sourceMappingURL=chunk-JAPZYQVJ.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-JAPZYQVJ.cjs","../src/tasks/thread-runner.ts"],"names":["payload"],"mappings":"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","file":"/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-JAPZYQVJ.cjs","sourcesContent":[null,"import { randomUUID } from 'node:crypto';\nimport { context } from '@opentelemetry/api';\nimport { injectTrace, extractTrace, type TraceCarrier } from '../tracing.js';\nimport { runWithContext } from '../context.js';\nimport { Worker, workerData, parentPort, isMainThread } from 'node:worker_threads';\nimport type { TaskDefinition } from '../types.js';\nimport { enqueue, ENQUEUE_BRIDGE } from './index.js';\n\n// `{ thread: true }` tasks run here, in a worker_thread. The task queue lives on the main\n// thread, so `enqueue()` inside the thread is bridged: the thread posts the call, the main\n// thread runs the real enqueue() and posts back the outcome.\n\ntype FromThread = (\n | { type: 'done'; ok: true }\n | { type: 'done'; ok: false; error: string }\n | { type: 'enqueue'; id: number; name: string; payload: unknown; trace?: TraceCarrier }\n) & { token: string };\ntype ToThread = { type: 'enqueued'; id: number; error?: string; token: string };\n\n// ── Worker-thread side ────────────────────────────────────────────────────────\nif (!isMainThread && parentPort && (workerData as { efcTask?: boolean })?.efcTask) {\n const port = parentPort;\n const {\n handlerPath,\n payload,\n token,\n trace: parentTrace,\n } = workerData as { handlerPath: string; payload: unknown; trace?: TraceCarrier; token: string };\n const waiting = new Map<number, { resolve: () => void; reject: (e: Error) => void }>();\n let seq = 0;\n // The port only keeps the thread alive while an enqueue waits for its answer, so a\n // finished task's thread still exits.\n port.unref();\n port.on('message', (msg: ToThread) => {\n if (msg?.type !== 'enqueued' || msg.token !== token) return;\n const w = waiting.get(msg.id);\n if (!w) return;\n waiting.delete(msg.id);\n if (waiting.size === 0) port.unref();\n if (msg.error === undefined) w.resolve();\n else w.reject(new Error(msg.error));\n });\n // On globalThis, so the task's own copy of express-file-cluster/tasks (ESM or CJS)\n // finds it too.\n (globalThis as Record<symbol, unknown>)[ENQUEUE_BRIDGE] = (name: string, payload: unknown) =>\n new Promise<void>((resolve, reject) => {\n const id = ++seq;\n waiting.set(id, { resolve, reject });\n port.ref();\n port.postMessage({\n type: 'enqueue',\n token,\n id,\n name,\n payload,\n ...(parentTrace && { trace: injectTrace() }),\n } satisfies FromThread);\n });\n\n (async () => {\n try {\n const mod = (await import(handlerPath)) as Record<string, unknown>;\n const def = mod['default'] as TaskDefinition | undefined;\n if (!def || typeof def.handler !== 'function') {\n throw new Error(`[EFC] Thread runner: no valid task export in ${handlerPath}`);\n }\n const ctx = parentTrace ? extractTrace(parentTrace) : context.active();\n // A thread has no SDK unless the app initializes one there. Preserve the\n // carrier for nested enqueue even with the API's no-op context manager.\n await runWithContext({ otelContext: ctx }, () =>\n context.with(ctx, () => def.handler(payload)),\n );\n port.postMessage({ type: 'done', ok: true, token } satisfies FromThread);\n } catch (err) {\n port.postMessage({ type: 'done', ok: false, error: String(err), token } satisfies FromThread);\n }\n })();\n}\n\n// ── Main-thread side ──────────────────────────────────────────────────────────\nexport function runInThread(handlerPath: string, payload: unknown, tracing = false): Promise<void> {\n return new Promise((resolve, reject) => {\n const token = randomUUID();\n const worker = new Worker(new URL('./thread-runner.js', import.meta.url), {\n workerData: {\n efcTask: true,\n handlerPath,\n payload,\n token,\n ...(tracing && { trace: injectTrace() }),\n },\n });\n\n let completed = false;\n let exited = false;\n let settled = false;\n const pending = new Set<Promise<void>>();\n const settle = (error?: Error) => {\n if (settled) return;\n settled = true;\n if (error) reject(error);\n else resolve();\n };\n worker.on('message', (message: unknown) => {\n if (\n !message ||\n typeof message !== 'object' ||\n (message as { token?: unknown }).token !== token\n )\n return;\n const msg = message as FromThread;\n if (msg.type === 'enqueue') {\n if (completed || !Number.isSafeInteger(msg.id) || typeof msg.name !== 'string') return;\n const reply = (error?: string) => {\n if (exited) return;\n try {\n worker.postMessage({\n type: 'enqueued',\n token,\n id: msg.id,\n ...(error !== undefined && { error }),\n } satisfies ToThread);\n } catch {\n /* An exited worker has nobody left waiting for the reply. */\n }\n };\n const parent = msg.trace ? extractTrace(msg.trace) : context.active();\n const operation = Promise.resolve()\n .then(() => context.with(parent, () => enqueue(msg.name, msg.payload)))\n .then(\n () => reply(),\n (err: unknown) => reply(err instanceof Error ? err.message : String(err)),\n );\n pending.add(operation);\n void operation.then(() => pending.delete(operation));\n return;\n }\n if (msg.type !== 'done' || typeof msg.ok !== 'boolean' || completed) return;\n completed = true;\n // The job owns this isolate. Wait for bridge acknowledgments, then dispose\n // timers/open handles before releasing its queue slot or retrying it.\n void Promise.allSettled([...pending])\n .then(() => worker.terminate())\n .then(\n () =>\n settle(\n msg.ok\n ? undefined\n : new Error(typeof msg.error === 'string' ? msg.error : 'Thread task failed'),\n ),\n (error: unknown) => settle(error instanceof Error ? error : new Error(String(error))),\n );\n });\n worker.on('error', (error) => {\n void worker.terminate().catch(() => {});\n settle(error);\n });\n worker.on('exit', (code) => {\n exited = true;\n if (!completed)\n settle(new Error(`Thread worker exited with code ${code} before reporting completion`));\n });\n });\n}\n"]}
|
|
@@ -1,27 +1,7 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
|
-
function processState(name, initialize) {
|
|
3
|
-
const key = /* @__PURE__ */ Symbol.for("express-file-cluster.runtime.v1." + name);
|
|
4
|
-
const globals = globalThis;
|
|
5
|
-
if (!(key in globals)) globals[key] = initialize();
|
|
6
|
-
return globals[key];
|
|
7
|
-
}
|
|
1
|
+
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
8
2
|
|
|
9
|
-
|
|
10
|
-
var
|
|
11
|
-
var storage = processState("request-context", () => new (0, _async_hooks.AsyncLocalStorage)());
|
|
12
|
-
function runWithContext(ctx, fn) {
|
|
13
|
-
return storage.run(ctx, fn);
|
|
14
|
-
}
|
|
15
|
-
function getRequestContext() {
|
|
16
|
-
return storage.getStore();
|
|
17
|
-
}
|
|
18
|
-
function setCurrentUser(user) {
|
|
19
|
-
const store = storage.getStore();
|
|
20
|
-
if (store) store.user = user;
|
|
21
|
-
}
|
|
22
|
-
function getCurrentUser() {
|
|
23
|
-
return _optionalChain([storage, 'access', _ => _.getStore, 'call', _2 => _2(), 'optionalAccess', _3 => _3.user]);
|
|
24
|
-
}
|
|
3
|
+
|
|
4
|
+
var _chunkURKE3OXNcjs = require('./chunk-URKE3OXN.cjs');
|
|
25
5
|
|
|
26
6
|
// src/logger.ts
|
|
27
7
|
var _cluster = require('cluster'); var _cluster2 = _interopRequireDefault(_cluster);
|
|
@@ -55,13 +35,13 @@ function prettyStream(out = process.stdout) {
|
|
|
55
35
|
const err = rec["err"];
|
|
56
36
|
const fields = extra.filter(([k]) => k !== "err").map(([k, v]) => `${k}=${typeof v === "string" ? v : JSON.stringify(v)}`).join(" ");
|
|
57
37
|
out.write(
|
|
58
|
-
`${_picocolors2.default.dim(time)} ${level} ${worker}${reqId}${String(_nullishCoalesce(rec["msg"], () => ( "")))}` + (fields ? " " + _picocolors2.default.dim(fields) : "") + (_optionalChain([err, 'optionalAccess',
|
|
38
|
+
`${_picocolors2.default.dim(time)} ${level} ${worker}${reqId}${String(_nullishCoalesce(rec["msg"], () => ( "")))}` + (fields ? " " + _picocolors2.default.dim(fields) : "") + (_optionalChain([err, 'optionalAccess', _ => _.stack]) ? "\n" + _picocolors2.default.red(err.stack) : "") + "\n"
|
|
59
39
|
);
|
|
60
40
|
}
|
|
61
41
|
};
|
|
62
42
|
}
|
|
63
43
|
function workerLabel() {
|
|
64
|
-
return _cluster2.default.isWorker ? `w${_nullishCoalesce(_optionalChain([_cluster2.default, 'access',
|
|
44
|
+
return _cluster2.default.isWorker ? `w${_nullishCoalesce(_optionalChain([_cluster2.default, 'access', _2 => _2.worker, 'optionalAccess', _3 => _3.id]), () => ( "?"))}` : "primary";
|
|
65
45
|
}
|
|
66
46
|
function build(config2) {
|
|
67
47
|
if (config2 === false) return _pino.pino.call(void 0, { level: "silent" });
|
|
@@ -75,10 +55,12 @@ var rootLogger = build(void 0);
|
|
|
75
55
|
var logRequests = true;
|
|
76
56
|
function configureLogger(config2) {
|
|
77
57
|
rootLogger = build(config2);
|
|
78
|
-
logRequests = config2 !== false && (_nullishCoalesce(_optionalChain([config2, 'optionalAccess',
|
|
58
|
+
logRequests = config2 !== false && (_nullishCoalesce(_optionalChain([config2, 'optionalAccess', _4 => _4.requests]), () => ( true)));
|
|
79
59
|
}
|
|
80
60
|
function getLogger() {
|
|
81
|
-
|
|
61
|
+
const log = _nullishCoalesce(_optionalChain([_chunkURKE3OXNcjs.getRequestContext.call(void 0, ), 'optionalAccess', _5 => _5.log]), () => ( rootLogger));
|
|
62
|
+
const fields = _chunkURKE3OXNcjs.traceLogFields.call(void 0, );
|
|
63
|
+
return fields.span_id && log.bindings().span_id !== fields.span_id ? log.child(fields) : log;
|
|
82
64
|
}
|
|
83
65
|
var logger = new Proxy({}, {
|
|
84
66
|
get(_t, prop) {
|
|
@@ -92,11 +74,11 @@ function requestLogger() {
|
|
|
92
74
|
return (req, res, next) => {
|
|
93
75
|
const incoming = req.get("x-request-id");
|
|
94
76
|
const id = incoming && SAFE_REQUEST_ID.test(incoming) ? incoming : _crypto.randomUUID.call(void 0, );
|
|
95
|
-
const log = rootLogger.child({ reqId: id });
|
|
77
|
+
const log = rootLogger.child({ reqId: id, ..._chunkURKE3OXNcjs.traceLogFields.call(void 0, ) });
|
|
96
78
|
req.id = id;
|
|
97
79
|
req.log = log;
|
|
98
80
|
res.setHeader("X-Request-Id", id);
|
|
99
|
-
const ctx = getRequestContext();
|
|
81
|
+
const ctx = _chunkURKE3OXNcjs.getRequestContext.call(void 0, );
|
|
100
82
|
if (ctx) {
|
|
101
83
|
ctx.requestId = id;
|
|
102
84
|
ctx.log = log;
|
|
@@ -123,13 +105,13 @@ function requestLogger() {
|
|
|
123
105
|
}
|
|
124
106
|
|
|
125
107
|
// src/db/query-log.ts
|
|
126
|
-
|
|
108
|
+
var _async_hooks = require('async_hooks');
|
|
127
109
|
var metrics = /* @__PURE__ */ new Map();
|
|
128
110
|
var metricsSince = Date.now();
|
|
129
111
|
var metricsDropped = 0;
|
|
130
112
|
function getQueryMetrics() {
|
|
131
113
|
return {
|
|
132
|
-
enabled: !!_optionalChain([config, 'optionalAccess',
|
|
114
|
+
enabled: !!_optionalChain([config, 'optionalAccess', _6 => _6.metricsLimit]),
|
|
133
115
|
since: metricsSince,
|
|
134
116
|
dropped: metricsDropped,
|
|
135
117
|
entries: [...metrics.values()].map((entry) => ({ ...entry })).sort((a, b) => a.model.localeCompare(b.model) || a.op.localeCompare(b.op))
|
|
@@ -141,7 +123,7 @@ function resetQueryMetrics() {
|
|
|
141
123
|
metricsSince = Date.now();
|
|
142
124
|
}
|
|
143
125
|
function collectMetric(event) {
|
|
144
|
-
if (!_optionalChain([config, 'optionalAccess',
|
|
126
|
+
if (!_optionalChain([config, 'optionalAccess', _7 => _7.metricsLimit])) return;
|
|
145
127
|
const key = event.model + "\0" + event.op;
|
|
146
128
|
let metric = metrics.get(key);
|
|
147
129
|
if (!metric) {
|
|
@@ -177,7 +159,7 @@ var config;
|
|
|
177
159
|
var listeners = /* @__PURE__ */ new Set();
|
|
178
160
|
var enableHooks = [];
|
|
179
161
|
function configureQueryLog(logging) {
|
|
180
|
-
const q = logging === false ? void 0 : _optionalChain([logging, 'optionalAccess',
|
|
162
|
+
const q = logging === false ? void 0 : _optionalChain([logging, 'optionalAccess', _8 => _8.queries]);
|
|
181
163
|
config = !q ? void 0 : q === true ? { all: true, ...DEFAULTS, metricsLimit: 0 } : {
|
|
182
164
|
all: _nullishCoalesce(q.all, () => ( false)),
|
|
183
165
|
slowMs: _nullishCoalesce(q.slowMs, () => ( DEFAULTS.slowMs)),
|
|
@@ -209,8 +191,8 @@ function untracked(fn) {
|
|
|
209
191
|
function callSite(callee) {
|
|
210
192
|
const holder = {};
|
|
211
193
|
Error.captureStackTrace(holder, callee);
|
|
212
|
-
const line = _optionalChain([holder, 'access',
|
|
213
|
-
return _optionalChain([line, 'optionalAccess',
|
|
194
|
+
const line = _optionalChain([holder, 'access', _9 => _9.stack, 'optionalAccess', _10 => _10.split, 'call', _11 => _11("\n"), 'access', _12 => _12[1]]);
|
|
195
|
+
return _optionalChain([line, 'optionalAccess', _13 => _13.trim, 'call', _14 => _14(), 'access', _15 => _15.replace, 'call', _16 => _16(/^at /, "")]);
|
|
214
196
|
}
|
|
215
197
|
function emit(event, site, top) {
|
|
216
198
|
for (const listener of listeners) listener(event);
|
|
@@ -228,7 +210,7 @@ function emit(event, site, top) {
|
|
|
228
210
|
if (top && config.nPlusOne !== false) detectNPlusOne(event, site, config.nPlusOne);
|
|
229
211
|
}
|
|
230
212
|
function detectNPlusOne(event, site, threshold) {
|
|
231
|
-
const ctx = getRequestContext();
|
|
213
|
+
const ctx = _chunkURKE3OXNcjs.getRequestContext.call(void 0, );
|
|
232
214
|
if (!ctx) return;
|
|
233
215
|
const key = `${event.model}.${event.op}`;
|
|
234
216
|
const counts = ctx.queryCounts ??= /* @__PURE__ */ new Map();
|
|
@@ -252,7 +234,7 @@ function traceOps(model, target, ops) {
|
|
|
252
234
|
const start = process.hrtime.bigint();
|
|
253
235
|
const finish = (error) => {
|
|
254
236
|
const durationMs = Math.round(Number(process.hrtime.bigint() - start) / 1e5) / 10;
|
|
255
|
-
const reqId = _optionalChain([getRequestContext
|
|
237
|
+
const reqId = _optionalChain([_chunkURKE3OXNcjs.getRequestContext.call(void 0, ), 'optionalAccess', _17 => _17.requestId]);
|
|
256
238
|
emit(
|
|
257
239
|
{
|
|
258
240
|
model,
|
|
@@ -260,7 +242,7 @@ function traceOps(model, target, ops) {
|
|
|
260
242
|
durationMs,
|
|
261
243
|
statements: frame.statements,
|
|
262
244
|
...reqId !== void 0 && { reqId },
|
|
263
|
-
...error !== void 0 && { error: _nullishCoalesce(_optionalChain([error, 'optionalAccess',
|
|
245
|
+
...error !== void 0 && { error: _nullishCoalesce(_optionalChain([error, 'optionalAccess', _18 => _18.message]), () => ( String(error))) }
|
|
264
246
|
},
|
|
265
247
|
site,
|
|
266
248
|
!parent
|
|
@@ -286,7 +268,7 @@ function traceOps(model, target, ops) {
|
|
|
286
268
|
|
|
287
269
|
var invalidators = /* @__PURE__ */ new WeakMap();
|
|
288
270
|
function invalidatePreparedStatements(pool2) {
|
|
289
|
-
_optionalChain([invalidators, 'access',
|
|
271
|
+
_optionalChain([invalidators, 'access', _19 => _19.get, 'call', _20 => _20(pool2), 'optionalCall', _21 => _21()]);
|
|
290
272
|
}
|
|
291
273
|
function preparedDriver(pool2, max) {
|
|
292
274
|
if (!Number.isSafeInteger(max) || max < 0) {
|
|
@@ -373,7 +355,7 @@ async function connectPostgres(url, poolConfig = {}) {
|
|
|
373
355
|
let PoolCtor;
|
|
374
356
|
try {
|
|
375
357
|
const pg = await Promise.resolve().then(() => _interopRequireWildcard(require("pg")));
|
|
376
|
-
PoolCtor = _nullishCoalesce(_optionalChain([pg, 'access',
|
|
358
|
+
PoolCtor = _nullishCoalesce(_optionalChain([pg, 'access', _22 => _22.default, 'optionalAccess', _23 => _23.Pool]), () => ( pg.Pool));
|
|
377
359
|
} catch (err) {
|
|
378
360
|
throw notInstalled(err, "pg", "npm install pg drizzle-orm");
|
|
379
361
|
}
|
|
@@ -492,7 +474,7 @@ async function closePostgres() {
|
|
|
492
474
|
const p = pool;
|
|
493
475
|
pool = void 0;
|
|
494
476
|
orm = void 0;
|
|
495
|
-
await _optionalChain([p, 'optionalAccess',
|
|
477
|
+
await _optionalChain([p, 'optionalAccess', _24 => _24.end, 'call', _25 => _25()]);
|
|
496
478
|
}
|
|
497
479
|
|
|
498
480
|
|
|
@@ -515,10 +497,5 @@ async function closePostgres() {
|
|
|
515
497
|
|
|
516
498
|
|
|
517
499
|
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
exports.processState = processState; exports.runWithContext = runWithContext; exports.getRequestContext = getRequestContext; exports.setCurrentUser = setCurrentUser; exports.getCurrentUser = getCurrentUser; exports.configureLogger = configureLogger; exports.getLogger = getLogger; exports.logger = logger; exports.requestLogger = requestLogger; exports.getQueryMetrics = getQueryMetrics; exports.resetQueryMetrics = resetQueryMetrics; exports.configureQueryLog = configureQueryLog; exports.whenQueryTracking = whenQueryTracking; exports.countStatement = countStatement; exports.untracked = untracked; exports.traceOps = traceOps; exports.invalidatePreparedStatements = invalidatePreparedStatements; exports.notInstalled = notInstalled; exports.connectPostgres = connectPostgres; exports.explainPostgresError = explainPostgresError; exports.checkConnectionBudget = checkConnectionBudget; exports.getOrm = getOrm; exports.getPool = getPool; exports.closePostgres = closePostgres;
|
|
524
|
-
//# sourceMappingURL=chunk-QSIP7YLW.cjs.map
|
|
500
|
+
exports.configureLogger = configureLogger; exports.getLogger = getLogger; exports.logger = logger; exports.requestLogger = requestLogger; exports.getQueryMetrics = getQueryMetrics; exports.resetQueryMetrics = resetQueryMetrics; exports.configureQueryLog = configureQueryLog; exports.whenQueryTracking = whenQueryTracking; exports.countStatement = countStatement; exports.untracked = untracked; exports.traceOps = traceOps; exports.invalidatePreparedStatements = invalidatePreparedStatements; exports.notInstalled = notInstalled; exports.connectPostgres = connectPostgres; exports.explainPostgresError = explainPostgresError; exports.checkConnectionBudget = checkConnectionBudget; exports.getOrm = getOrm; exports.getPool = getPool; exports.closePostgres = closePostgres;
|
|
501
|
+
//# sourceMappingURL=chunk-JHCXIYJH.cjs.map
|