express-file-cluster 0.5.0 → 0.7.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/README.md +2 -2
- package/dist/auth/index.cjs +5 -5
- package/dist/auth/index.d.cts +1 -1
- package/dist/auth/index.d.ts +1 -1
- package/dist/auth/index.js +4 -4
- package/dist/{chunk-VYHJX54R.js → chunk-277BSYVH.js} +2 -1
- package/dist/chunk-277BSYVH.js.map +1 -0
- package/dist/{chunk-RTFJ32T5.js → chunk-6OGOVV57.js} +1344 -132
- package/dist/chunk-6OGOVV57.js.map +1 -0
- package/dist/{chunk-QTRGJ2EN.cjs → chunk-AZYXQU3Z.cjs} +1378 -166
- package/dist/chunk-AZYXQU3Z.cjs.map +1 -0
- package/dist/chunk-BUBXO7WU.js +170 -0
- package/dist/chunk-BUBXO7WU.js.map +1 -0
- package/dist/chunk-MGH4VDV3.cjs +170 -0
- package/dist/chunk-MGH4VDV3.cjs.map +1 -0
- package/dist/{chunk-ULQXD4YZ.cjs → chunk-R34R7QPD.cjs} +3 -3
- package/dist/{chunk-ULQXD4YZ.cjs.map → chunk-R34R7QPD.cjs.map} +1 -1
- package/dist/{chunk-M7MUPWCE.js → chunk-RS4MXCPW.js} +2 -2
- package/dist/{chunk-SZT36SGB.cjs → chunk-T4OHFU5T.cjs} +8 -8
- package/dist/{chunk-SZT36SGB.cjs.map → chunk-T4OHFU5T.cjs.map} +1 -1
- package/dist/{chunk-5PDAWMGF.js → chunk-TRC4DUZB.js} +4 -4
- package/dist/{chunk-47K2532L.cjs → chunk-TYR2GZZE.cjs} +7 -7
- package/dist/{chunk-47K2532L.cjs.map → chunk-TYR2GZZE.cjs.map} +1 -1
- package/dist/{chunk-PMF4GMHD.js → chunk-UBQYQPBU.js} +2 -2
- package/dist/{chunk-JJJJTACK.js → chunk-UTM4PEVG.js} +2 -2
- package/dist/{chunk-RSBW2B3D.cjs → chunk-YL37D6KM.cjs} +3 -2
- package/dist/chunk-YL37D6KM.cjs.map +1 -0
- package/dist/{chunk-SFVEQ2T5.cjs → chunk-ZDM5JHVK.cjs} +11 -11
- package/dist/{chunk-SFVEQ2T5.cjs.map → chunk-ZDM5JHVK.cjs.map} +1 -1
- package/dist/cli/db-runner.cjs +10 -10
- package/dist/cli/db-runner.js +3 -3
- package/dist/cli/index.cjs +6 -6
- package/dist/cli/index.js +4 -4
- package/dist/docs/api-reference/ignite.md +3 -0
- package/dist/docs/api-reference/table.md +210 -2
- package/dist/docs/guides/logging.md +38 -0
- package/dist/docs/index.md +1 -1
- package/dist/docs/skills/SKILL.md +2 -2
- package/dist/docs/skills/api-surface.md +2 -1
- package/dist/docs/skills/what-not-to-invent.md +1 -1
- package/dist/index.cjs +44 -69
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +248 -21
- package/dist/index.d.ts +248 -21
- package/dist/index.js +12 -37
- package/dist/index.js.map +1 -1
- package/dist/{pgboss-backend-UUJOVEYK.js → pgboss-backend-QKBXVJ6B.js} +3 -3
- package/dist/pgboss-backend-TCHI7CHM.cjs +14 -0
- package/dist/{pgboss-backend-3E6ATY42.cjs.map → pgboss-backend-TCHI7CHM.cjs.map} +1 -1
- package/dist/tasks/index.d.cts +1 -1
- package/dist/tasks/index.d.ts +1 -1
- package/dist/{types-DJCPAsM4.d.cts → types-B6lVw4bj.d.cts} +49 -2
- package/dist/{types-DJCPAsM4.d.ts → types-B6lVw4bj.d.ts} +49 -2
- package/package.json +1 -1
- package/dist/chunk-3VWD2ZED.js +0 -60
- package/dist/chunk-3VWD2ZED.js.map +0 -1
- package/dist/chunk-ALBDM5R3.cjs +0 -60
- package/dist/chunk-ALBDM5R3.cjs.map +0 -1
- package/dist/chunk-QTRGJ2EN.cjs.map +0 -1
- package/dist/chunk-RSBW2B3D.cjs.map +0 -1
- package/dist/chunk-RTFJ32T5.js.map +0 -1
- package/dist/chunk-VYHJX54R.js.map +0 -1
- package/dist/pgboss-backend-3E6ATY42.cjs +0 -14
- /package/dist/{chunk-M7MUPWCE.js.map → chunk-RS4MXCPW.js.map} +0 -0
- /package/dist/{chunk-5PDAWMGF.js.map → chunk-TRC4DUZB.js.map} +0 -0
- /package/dist/{chunk-PMF4GMHD.js.map → chunk-UBQYQPBU.js.map} +0 -0
- /package/dist/{chunk-JJJJTACK.js.map → chunk-UTM4PEVG.js.map} +0 -0
- /package/dist/{pgboss-backend-UUJOVEYK.js.map → pgboss-backend-QKBXVJ6B.js.map} +0 -0
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
import {
|
|
2
|
+
getLogger,
|
|
3
|
+
getRequestContext
|
|
4
|
+
} from "./chunk-277BSYVH.js";
|
|
5
|
+
|
|
6
|
+
// src/db/query-log.ts
|
|
7
|
+
import { AsyncLocalStorage } from "async_hooks";
|
|
8
|
+
var DEFAULTS = { slowMs: 500, nPlusOne: 10 };
|
|
9
|
+
var config;
|
|
10
|
+
var listeners = /* @__PURE__ */ new Set();
|
|
11
|
+
var enableHooks = [];
|
|
12
|
+
function configureQueryLog(logging) {
|
|
13
|
+
const q = logging === false ? void 0 : logging?.queries;
|
|
14
|
+
config = !q ? void 0 : q === true ? { all: true, ...DEFAULTS } : {
|
|
15
|
+
all: q.all ?? false,
|
|
16
|
+
slowMs: q.slowMs ?? DEFAULTS.slowMs,
|
|
17
|
+
nPlusOne: q.nPlusOne ?? DEFAULTS.nPlusOne
|
|
18
|
+
};
|
|
19
|
+
if (config) for (const hook of enableHooks) hook();
|
|
20
|
+
}
|
|
21
|
+
function active() {
|
|
22
|
+
return config !== void 0 || listeners.size > 0;
|
|
23
|
+
}
|
|
24
|
+
function whenQueryTracking(install) {
|
|
25
|
+
enableHooks.push(install);
|
|
26
|
+
if (active()) install();
|
|
27
|
+
}
|
|
28
|
+
var frames = new AsyncLocalStorage();
|
|
29
|
+
function countStatement() {
|
|
30
|
+
for (let f = frames.getStore(); f; f = f.parent) f.statements++;
|
|
31
|
+
}
|
|
32
|
+
function untracked(fn) {
|
|
33
|
+
return frames.run(void 0, fn);
|
|
34
|
+
}
|
|
35
|
+
function callSite(callee) {
|
|
36
|
+
const holder = {};
|
|
37
|
+
Error.captureStackTrace(holder, callee);
|
|
38
|
+
const line = holder.stack?.split("\n")[1];
|
|
39
|
+
return line?.trim().replace(/^at /, "");
|
|
40
|
+
}
|
|
41
|
+
function emit(event, site, top) {
|
|
42
|
+
for (const listener of listeners) listener(event);
|
|
43
|
+
if (!config) return;
|
|
44
|
+
const log = getLogger();
|
|
45
|
+
const msg = `${event.model}.${event.op} ${event.durationMs}ms`;
|
|
46
|
+
const fields = { ...event };
|
|
47
|
+
delete fields.reqId;
|
|
48
|
+
if (event.durationMs >= config.slowMs) {
|
|
49
|
+
log.warn({ ...fields, slow: true }, `Slow query: ${msg}`);
|
|
50
|
+
} else if (config.all) {
|
|
51
|
+
log.info(fields, msg);
|
|
52
|
+
}
|
|
53
|
+
if (top && config.nPlusOne !== false) detectNPlusOne(event, site, config.nPlusOne);
|
|
54
|
+
}
|
|
55
|
+
function detectNPlusOne(event, site, threshold) {
|
|
56
|
+
const ctx = getRequestContext();
|
|
57
|
+
if (!ctx) return;
|
|
58
|
+
const key = `${event.model}.${event.op}`;
|
|
59
|
+
const counts = ctx.queryCounts ??= /* @__PURE__ */ new Map();
|
|
60
|
+
const n = (counts.get(key) ?? 0) + 1;
|
|
61
|
+
counts.set(key, n);
|
|
62
|
+
if (n !== threshold) return;
|
|
63
|
+
getLogger().warn(
|
|
64
|
+
{ model: event.model, op: event.op, count: n, ...site !== void 0 && { site } },
|
|
65
|
+
`Possible N+1: ${key} ran ${n} times in one request \u2014 load them in one query instead`
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
function traceOps(model, target, ops) {
|
|
69
|
+
const t = target;
|
|
70
|
+
for (const op of ops) {
|
|
71
|
+
const fn = t[op];
|
|
72
|
+
const traced = function(...args) {
|
|
73
|
+
if (!active()) return fn.apply(this, args);
|
|
74
|
+
const parent = frames.getStore();
|
|
75
|
+
const frame = { statements: 0, parent };
|
|
76
|
+
const site = !parent && config && config.nPlusOne !== false ? callSite(traced) : void 0;
|
|
77
|
+
const start = process.hrtime.bigint();
|
|
78
|
+
const finish = (error) => {
|
|
79
|
+
const durationMs = Math.round(Number(process.hrtime.bigint() - start) / 1e5) / 10;
|
|
80
|
+
const reqId = getRequestContext()?.requestId;
|
|
81
|
+
emit(
|
|
82
|
+
{
|
|
83
|
+
model,
|
|
84
|
+
op,
|
|
85
|
+
durationMs,
|
|
86
|
+
statements: frame.statements,
|
|
87
|
+
...reqId !== void 0 && { reqId },
|
|
88
|
+
...error !== void 0 && { error: error?.message ?? String(error) }
|
|
89
|
+
},
|
|
90
|
+
site,
|
|
91
|
+
!parent
|
|
92
|
+
);
|
|
93
|
+
};
|
|
94
|
+
return frames.run(frame, () => fn.apply(this, args)).then(
|
|
95
|
+
(result) => {
|
|
96
|
+
finish();
|
|
97
|
+
return result;
|
|
98
|
+
},
|
|
99
|
+
(err) => {
|
|
100
|
+
finish(err);
|
|
101
|
+
throw err;
|
|
102
|
+
}
|
|
103
|
+
);
|
|
104
|
+
};
|
|
105
|
+
t[op] = traced;
|
|
106
|
+
}
|
|
107
|
+
return target;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
// src/db/postgres.ts
|
|
111
|
+
var pool;
|
|
112
|
+
function notInstalled(err, pkg, install) {
|
|
113
|
+
const code = err.code;
|
|
114
|
+
return code === "ERR_MODULE_NOT_FOUND" || code === "MODULE_NOT_FOUND" ? new Error(`[EFC] ${pkg} is not installed. Run: ${install}`) : err;
|
|
115
|
+
}
|
|
116
|
+
var orm;
|
|
117
|
+
async function connectPostgres(url) {
|
|
118
|
+
let PoolCtor;
|
|
119
|
+
try {
|
|
120
|
+
const pg = await import("pg");
|
|
121
|
+
PoolCtor = pg.default?.Pool ?? pg.Pool;
|
|
122
|
+
} catch (err) {
|
|
123
|
+
throw notInstalled(err, "pg", "npm install pg drizzle-orm");
|
|
124
|
+
}
|
|
125
|
+
let drizzle;
|
|
126
|
+
try {
|
|
127
|
+
({ drizzle } = await import("drizzle-orm/node-postgres"));
|
|
128
|
+
} catch (err) {
|
|
129
|
+
throw notInstalled(err, "drizzle-orm", "npm install drizzle-orm");
|
|
130
|
+
}
|
|
131
|
+
const next = new PoolCtor({ connectionString: url });
|
|
132
|
+
next.on("error", (err) => getLogger().error({ err }, "PostgreSQL pool error"));
|
|
133
|
+
await next.query("select 1");
|
|
134
|
+
pool = next;
|
|
135
|
+
orm = drizzle(next, { logger: { logQuery: countStatement } });
|
|
136
|
+
getLogger().info("PostgreSQL connected");
|
|
137
|
+
return next;
|
|
138
|
+
}
|
|
139
|
+
function getOrm() {
|
|
140
|
+
if (!orm) {
|
|
141
|
+
throw new Error(
|
|
142
|
+
"[EFC] PostgreSQL not connected \u2014 set database/databaseUrl in ignite() (or call connectPostgres)"
|
|
143
|
+
);
|
|
144
|
+
}
|
|
145
|
+
return orm;
|
|
146
|
+
}
|
|
147
|
+
function getPool() {
|
|
148
|
+
if (!pool) throw new Error("[EFC] PostgreSQL not connected");
|
|
149
|
+
return pool;
|
|
150
|
+
}
|
|
151
|
+
async function closePostgres() {
|
|
152
|
+
const p = pool;
|
|
153
|
+
pool = void 0;
|
|
154
|
+
orm = void 0;
|
|
155
|
+
await p?.end();
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
export {
|
|
159
|
+
configureQueryLog,
|
|
160
|
+
whenQueryTracking,
|
|
161
|
+
countStatement,
|
|
162
|
+
untracked,
|
|
163
|
+
traceOps,
|
|
164
|
+
notInstalled,
|
|
165
|
+
connectPostgres,
|
|
166
|
+
getOrm,
|
|
167
|
+
getPool,
|
|
168
|
+
closePostgres
|
|
169
|
+
};
|
|
170
|
+
//# sourceMappingURL=chunk-BUBXO7WU.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/db/query-log.ts","../src/db/postgres.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport type { LoggingConfig } from '../types.js';\nimport { getRequestContext } from '../context.js';\nimport { getLogger } from '../logger.js';\n\n// Query logging (`logging.queries`): one event per model operation — model, operation,\n// duration, how many database statements it issued, and the request ID — plus slow-query\n// warnings and an N+1 detector. Statements are counted at the driver: Drizzle's logger on\n// PostgreSQL, mongoose's debug hook on MongoDB.\n\n/** One finished model operation. */\nexport interface QueryEvent {\n model: string;\n op: string;\n durationMs: number;\n /** Database statements (SQL statements / MongoDB commands) issued, nested calls included. */\n statements: number;\n /** The request it ran in, if any. */\n reqId?: string;\n /** Set when it threw. */\n error?: string;\n}\n\ninterface Resolved {\n all: boolean;\n slowMs: number;\n nPlusOne: number | false;\n}\n\nconst DEFAULTS = { slowMs: 500, nPlusOne: 10 } as const;\n\nlet config: Resolved | undefined;\nconst listeners = new Set<(event: QueryEvent) => void>();\nconst enableHooks: (() => void)[] = [];\n\n/** Called by ignite() during Pre-Flight, next to configureLogger(). */\nexport function configureQueryLog(logging: LoggingConfig | false | undefined): void {\n const q = logging === false ? undefined : logging?.queries;\n config = !q\n ? undefined\n : q === true\n ? { all: true, ...DEFAULTS }\n : {\n all: q.all ?? false,\n slowMs: q.slowMs ?? DEFAULTS.slowMs,\n nPlusOne: q.nPlusOne ?? DEFAULTS.nPlusOne,\n };\n if (config) for (const hook of enableHooks) hook();\n}\n\nfunction active(): boolean {\n return config !== undefined || listeners.size > 0;\n}\n\n/**\n * Receives every model operation while subscribed (whether or not `logging.queries` is\n * on). Returns the unsubscribe function. Internal — tests use it to count statements.\n */\nexport function onQuery(listener: (event: QueryEvent) => void): () => void {\n listeners.add(listener);\n for (const hook of enableHooks) hook();\n return () => listeners.delete(listener);\n}\n\n/** Registers a driver hook to install once query tracking is first needed. */\nexport function whenQueryTracking(install: () => void): void {\n enableHooks.push(install);\n if (active()) install();\n}\n\ninterface Frame {\n statements: number;\n parent: Frame | undefined;\n}\n\nconst frames = new AsyncLocalStorage<Frame | undefined>();\n\n/** Called by the driver hooks for each statement sent to the database. */\nexport function countStatement(): void {\n for (let f = frames.getStore(); f; f = f.parent) f.statements++;\n}\n\n/** Runs `fn` outside any operation, so its statements (e.g. auto-sync) are not counted. */\nexport function untracked<R>(fn: () => R): R {\n return frames.run(undefined, fn);\n}\n\n// The first stack frame outside EFC: the line in the app that made the call.\nfunction callSite(callee: (...args: never[]) => unknown): string | undefined {\n const holder: { stack?: string } = {};\n Error.captureStackTrace(holder, callee);\n const line = holder.stack?.split('\\n')[1];\n return line?.trim().replace(/^at /, '');\n}\n\nfunction emit(event: QueryEvent, site: string | undefined, top: boolean): void {\n for (const listener of listeners) listener(event);\n if (!config) return;\n const log = getLogger();\n const msg = `${event.model}.${event.op} ${event.durationMs}ms`;\n // The request's logger already carries reqId.\n const fields: Partial<QueryEvent> = { ...event };\n delete fields.reqId;\n if (event.durationMs >= config.slowMs) {\n log.warn({ ...fields, slow: true }, `Slow query: ${msg}`);\n } else if (config.all) {\n log.info(fields, msg);\n }\n if (top && config.nPlusOne !== false) detectNPlusOne(event, site, config.nPlusOne);\n}\n\nfunction detectNPlusOne(event: QueryEvent, site: string | undefined, threshold: number): void {\n const ctx = getRequestContext();\n if (!ctx) return;\n const key = `${event.model}.${event.op}`;\n const counts = (ctx.queryCounts ??= new Map());\n const n = (counts.get(key) ?? 0) + 1;\n counts.set(key, n);\n if (n !== threshold) return;\n getLogger().warn(\n { model: event.model, op: event.op, count: n, ...(site !== undefined && { site }) },\n `Possible N+1: ${key} ran ${n} times in one request — load them in one query instead`,\n );\n}\n\n/**\n * Wraps a model's public operations so each call is timed, its statements counted and\n * the result reported. A no-op wrapper while query logging is off.\n */\nexport function traceOps<M extends object>(model: string, target: M, ops: readonly string[]): M {\n const t = target as Record<string, unknown>;\n for (const op of ops) {\n const fn = t[op] as (...args: unknown[]) => Promise<unknown>;\n const traced = function (this: unknown, ...args: unknown[]): Promise<unknown> {\n if (!active()) return fn.apply(this, args);\n const parent = frames.getStore();\n const frame: Frame = { statements: 0, parent };\n // Only N+1 checks need the call site; capture it while the caller is on the stack.\n const site = !parent && config && config.nPlusOne !== false ? callSite(traced) : undefined;\n const start = process.hrtime.bigint();\n const finish = (error?: unknown) => {\n const durationMs = Math.round(Number(process.hrtime.bigint() - start) / 1e5) / 10;\n const reqId = getRequestContext()?.requestId;\n emit(\n {\n model,\n op,\n durationMs,\n statements: frame.statements,\n ...(reqId !== undefined && { reqId }),\n ...(error !== undefined && { error: (error as Error)?.message ?? String(error) }),\n },\n site,\n !parent,\n );\n };\n return frames\n .run(frame, () => fn.apply(this, args))\n .then(\n (result) => {\n finish();\n return result;\n },\n (err: unknown) => {\n finish(err);\n throw err;\n },\n );\n };\n t[op] = traced;\n }\n return target;\n}\n","import type { Pool } from 'pg';\nimport { getLogger } from '../logger.js';\nimport { countStatement } from './query-log.js';\n\n// Pre-Flight's PostgreSQL connection: a node-postgres Pool (exposed as `db`) plus a\n// Drizzle instance over it that the model adapter queries through.\n\n/* eslint-disable @typescript-eslint/no-explicit-any -- drizzle is an optional peer, loaded dynamically */\nlet pool: Pool | undefined;\n\n/** Only a genuinely missing package becomes \"not installed\"; other load errors surface as-is. */\nexport function notInstalled(err: unknown, pkg: string, install: string): Error {\n const code = (err as { code?: string }).code;\n return code === 'ERR_MODULE_NOT_FOUND' || code === 'MODULE_NOT_FOUND'\n ? new Error(`[EFC] ${pkg} is not installed. Run: ${install}`)\n : (err as Error);\n}\nlet orm: any;\n\nexport async function connectPostgres(url: string): Promise<Pool> {\n let PoolCtor: typeof Pool;\n try {\n const pg = (await import('pg')) as unknown as {\n default?: { Pool: typeof Pool };\n Pool?: typeof Pool;\n };\n PoolCtor = (pg.default?.Pool ?? pg.Pool)!;\n } catch (err) {\n throw notInstalled(err, 'pg', 'npm install pg drizzle-orm');\n }\n let drizzle: (client: Pool, config: object) => unknown;\n try {\n ({ drizzle } = (await import('drizzle-orm/node-postgres')) as unknown as {\n drizzle: (client: Pool, config: object) => unknown;\n });\n } catch (err) {\n throw notInstalled(err, 'drizzle-orm', 'npm install drizzle-orm');\n }\n\n const next = new PoolCtor({ connectionString: url });\n // Idle-client errors (e.g. the server restarting) are emitted on the pool; unhandled\n // they would crash the process.\n next.on('error', (err) => getLogger().error({ err }, 'PostgreSQL pool error'));\n await next.query('select 1');\n pool = next;\n // Every model statement goes through Drizzle, in or out of a transaction: count it.\n orm = drizzle(next, { logger: { logQuery: countStatement } });\n getLogger().info('PostgreSQL connected');\n return next;\n}\n\nexport function getOrm(): any {\n if (!orm) {\n throw new Error(\n '[EFC] PostgreSQL not connected — set database/databaseUrl in ignite() (or call connectPostgres)',\n );\n }\n return orm;\n}\n\nexport function getPool(): Pool {\n if (!pool) throw new Error('[EFC] PostgreSQL not connected');\n return pool;\n}\n\nexport async function closePostgres(): Promise<void> {\n const p = pool;\n pool = undefined;\n orm = undefined;\n await p?.end();\n}\n"],"mappings":"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","names":[]}
|
|
@@ -0,0 +1,170 @@
|
|
|
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
|
+
|
|
3
|
+
|
|
4
|
+
var _chunkYL37D6KMcjs = require('./chunk-YL37D6KM.cjs');
|
|
5
|
+
|
|
6
|
+
// src/db/query-log.ts
|
|
7
|
+
var _async_hooks = require('async_hooks');
|
|
8
|
+
var DEFAULTS = { slowMs: 500, nPlusOne: 10 };
|
|
9
|
+
var config;
|
|
10
|
+
var listeners = /* @__PURE__ */ new Set();
|
|
11
|
+
var enableHooks = [];
|
|
12
|
+
function configureQueryLog(logging) {
|
|
13
|
+
const q = logging === false ? void 0 : _optionalChain([logging, 'optionalAccess', _ => _.queries]);
|
|
14
|
+
config = !q ? void 0 : q === true ? { all: true, ...DEFAULTS } : {
|
|
15
|
+
all: _nullishCoalesce(q.all, () => ( false)),
|
|
16
|
+
slowMs: _nullishCoalesce(q.slowMs, () => ( DEFAULTS.slowMs)),
|
|
17
|
+
nPlusOne: _nullishCoalesce(q.nPlusOne, () => ( DEFAULTS.nPlusOne))
|
|
18
|
+
};
|
|
19
|
+
if (config) for (const hook of enableHooks) hook();
|
|
20
|
+
}
|
|
21
|
+
function active() {
|
|
22
|
+
return config !== void 0 || listeners.size > 0;
|
|
23
|
+
}
|
|
24
|
+
function whenQueryTracking(install) {
|
|
25
|
+
enableHooks.push(install);
|
|
26
|
+
if (active()) install();
|
|
27
|
+
}
|
|
28
|
+
var frames = new (0, _async_hooks.AsyncLocalStorage)();
|
|
29
|
+
function countStatement() {
|
|
30
|
+
for (let f = frames.getStore(); f; f = f.parent) f.statements++;
|
|
31
|
+
}
|
|
32
|
+
function untracked(fn) {
|
|
33
|
+
return frames.run(void 0, fn);
|
|
34
|
+
}
|
|
35
|
+
function callSite(callee) {
|
|
36
|
+
const holder = {};
|
|
37
|
+
Error.captureStackTrace(holder, callee);
|
|
38
|
+
const line = _optionalChain([holder, 'access', _2 => _2.stack, 'optionalAccess', _3 => _3.split, 'call', _4 => _4("\n"), 'access', _5 => _5[1]]);
|
|
39
|
+
return _optionalChain([line, 'optionalAccess', _6 => _6.trim, 'call', _7 => _7(), 'access', _8 => _8.replace, 'call', _9 => _9(/^at /, "")]);
|
|
40
|
+
}
|
|
41
|
+
function emit(event, site, top) {
|
|
42
|
+
for (const listener of listeners) listener(event);
|
|
43
|
+
if (!config) return;
|
|
44
|
+
const log = _chunkYL37D6KMcjs.getLogger.call(void 0, );
|
|
45
|
+
const msg = `${event.model}.${event.op} ${event.durationMs}ms`;
|
|
46
|
+
const fields = { ...event };
|
|
47
|
+
delete fields.reqId;
|
|
48
|
+
if (event.durationMs >= config.slowMs) {
|
|
49
|
+
log.warn({ ...fields, slow: true }, `Slow query: ${msg}`);
|
|
50
|
+
} else if (config.all) {
|
|
51
|
+
log.info(fields, msg);
|
|
52
|
+
}
|
|
53
|
+
if (top && config.nPlusOne !== false) detectNPlusOne(event, site, config.nPlusOne);
|
|
54
|
+
}
|
|
55
|
+
function detectNPlusOne(event, site, threshold) {
|
|
56
|
+
const ctx = _chunkYL37D6KMcjs.getRequestContext.call(void 0, );
|
|
57
|
+
if (!ctx) return;
|
|
58
|
+
const key = `${event.model}.${event.op}`;
|
|
59
|
+
const counts = ctx.queryCounts ??= /* @__PURE__ */ new Map();
|
|
60
|
+
const n = (_nullishCoalesce(counts.get(key), () => ( 0))) + 1;
|
|
61
|
+
counts.set(key, n);
|
|
62
|
+
if (n !== threshold) return;
|
|
63
|
+
_chunkYL37D6KMcjs.getLogger.call(void 0, ).warn(
|
|
64
|
+
{ model: event.model, op: event.op, count: n, ...site !== void 0 && { site } },
|
|
65
|
+
`Possible N+1: ${key} ran ${n} times in one request \u2014 load them in one query instead`
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
function traceOps(model, target, ops) {
|
|
69
|
+
const t = target;
|
|
70
|
+
for (const op of ops) {
|
|
71
|
+
const fn = t[op];
|
|
72
|
+
const traced = function(...args) {
|
|
73
|
+
if (!active()) return fn.apply(this, args);
|
|
74
|
+
const parent = frames.getStore();
|
|
75
|
+
const frame = { statements: 0, parent };
|
|
76
|
+
const site = !parent && config && config.nPlusOne !== false ? callSite(traced) : void 0;
|
|
77
|
+
const start = process.hrtime.bigint();
|
|
78
|
+
const finish = (error) => {
|
|
79
|
+
const durationMs = Math.round(Number(process.hrtime.bigint() - start) / 1e5) / 10;
|
|
80
|
+
const reqId = _optionalChain([_chunkYL37D6KMcjs.getRequestContext.call(void 0, ), 'optionalAccess', _10 => _10.requestId]);
|
|
81
|
+
emit(
|
|
82
|
+
{
|
|
83
|
+
model,
|
|
84
|
+
op,
|
|
85
|
+
durationMs,
|
|
86
|
+
statements: frame.statements,
|
|
87
|
+
...reqId !== void 0 && { reqId },
|
|
88
|
+
...error !== void 0 && { error: _nullishCoalesce(_optionalChain([error, 'optionalAccess', _11 => _11.message]), () => ( String(error))) }
|
|
89
|
+
},
|
|
90
|
+
site,
|
|
91
|
+
!parent
|
|
92
|
+
);
|
|
93
|
+
};
|
|
94
|
+
return frames.run(frame, () => fn.apply(this, args)).then(
|
|
95
|
+
(result) => {
|
|
96
|
+
finish();
|
|
97
|
+
return result;
|
|
98
|
+
},
|
|
99
|
+
(err) => {
|
|
100
|
+
finish(err);
|
|
101
|
+
throw err;
|
|
102
|
+
}
|
|
103
|
+
);
|
|
104
|
+
};
|
|
105
|
+
t[op] = traced;
|
|
106
|
+
}
|
|
107
|
+
return target;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
// src/db/postgres.ts
|
|
111
|
+
var pool;
|
|
112
|
+
function notInstalled(err, pkg, install) {
|
|
113
|
+
const code = err.code;
|
|
114
|
+
return code === "ERR_MODULE_NOT_FOUND" || code === "MODULE_NOT_FOUND" ? new Error(`[EFC] ${pkg} is not installed. Run: ${install}`) : err;
|
|
115
|
+
}
|
|
116
|
+
var orm;
|
|
117
|
+
async function connectPostgres(url) {
|
|
118
|
+
let PoolCtor;
|
|
119
|
+
try {
|
|
120
|
+
const pg = await Promise.resolve().then(() => _interopRequireWildcard(require("pg")));
|
|
121
|
+
PoolCtor = _nullishCoalesce(_optionalChain([pg, 'access', _12 => _12.default, 'optionalAccess', _13 => _13.Pool]), () => ( pg.Pool));
|
|
122
|
+
} catch (err) {
|
|
123
|
+
throw notInstalled(err, "pg", "npm install pg drizzle-orm");
|
|
124
|
+
}
|
|
125
|
+
let drizzle;
|
|
126
|
+
try {
|
|
127
|
+
({ drizzle } = await Promise.resolve().then(() => _interopRequireWildcard(require("drizzle-orm/node-postgres"))));
|
|
128
|
+
} catch (err) {
|
|
129
|
+
throw notInstalled(err, "drizzle-orm", "npm install drizzle-orm");
|
|
130
|
+
}
|
|
131
|
+
const next = new PoolCtor({ connectionString: url });
|
|
132
|
+
next.on("error", (err) => _chunkYL37D6KMcjs.getLogger.call(void 0, ).error({ err }, "PostgreSQL pool error"));
|
|
133
|
+
await next.query("select 1");
|
|
134
|
+
pool = next;
|
|
135
|
+
orm = drizzle(next, { logger: { logQuery: countStatement } });
|
|
136
|
+
_chunkYL37D6KMcjs.getLogger.call(void 0, ).info("PostgreSQL connected");
|
|
137
|
+
return next;
|
|
138
|
+
}
|
|
139
|
+
function getOrm() {
|
|
140
|
+
if (!orm) {
|
|
141
|
+
throw new Error(
|
|
142
|
+
"[EFC] PostgreSQL not connected \u2014 set database/databaseUrl in ignite() (or call connectPostgres)"
|
|
143
|
+
);
|
|
144
|
+
}
|
|
145
|
+
return orm;
|
|
146
|
+
}
|
|
147
|
+
function getPool() {
|
|
148
|
+
if (!pool) throw new Error("[EFC] PostgreSQL not connected");
|
|
149
|
+
return pool;
|
|
150
|
+
}
|
|
151
|
+
async function closePostgres() {
|
|
152
|
+
const p = pool;
|
|
153
|
+
pool = void 0;
|
|
154
|
+
orm = void 0;
|
|
155
|
+
await _optionalChain([p, 'optionalAccess', _14 => _14.end, 'call', _15 => _15()]);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
|
|
159
|
+
|
|
160
|
+
|
|
161
|
+
|
|
162
|
+
|
|
163
|
+
|
|
164
|
+
|
|
165
|
+
|
|
166
|
+
|
|
167
|
+
|
|
168
|
+
|
|
169
|
+
exports.configureQueryLog = configureQueryLog; exports.whenQueryTracking = whenQueryTracking; exports.countStatement = countStatement; exports.untracked = untracked; exports.traceOps = traceOps; exports.notInstalled = notInstalled; exports.connectPostgres = connectPostgres; exports.getOrm = getOrm; exports.getPool = getPool; exports.closePostgres = closePostgres;
|
|
170
|
+
//# sourceMappingURL=chunk-MGH4VDV3.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-MGH4VDV3.cjs","../src/db/query-log.ts","../src/db/postgres.ts"],"names":[],"mappings":"AAAA;AACE;AACA;AACF,wDAA6B;AAC7B;AACA;ACLA,0CAAkC;AA6BlC,IAAM,SAAA,EAAW,EAAE,MAAA,EAAQ,GAAA,EAAK,QAAA,EAAU,GAAG,CAAA;AAE7C,IAAI,MAAA;AACJ,IAAM,UAAA,kBAAY,IAAI,GAAA,CAAiC,CAAA;AACvD,IAAM,YAAA,EAA8B,CAAC,CAAA;AAG9B,SAAS,iBAAA,CAAkB,OAAA,EAAkD;AAClF,EAAA,MAAM,EAAA,EAAI,QAAA,IAAY,MAAA,EAAQ,KAAA,EAAA,kBAAY,OAAA,2BAAS,SAAA;AACnD,EAAA,OAAA,EAAS,CAAC,EAAA,EACN,KAAA,EAAA,EACA,EAAA,IAAM,KAAA,EACJ,EAAE,GAAA,EAAK,IAAA,EAAM,GAAG,SAAS,EAAA,EACzB;AAAA,IACE,GAAA,mBAAK,CAAA,CAAE,GAAA,UAAO,OAAA;AAAA,IACd,MAAA,mBAAQ,CAAA,CAAE,MAAA,UAAU,QAAA,CAAS,QAAA;AAAA,IAC7B,QAAA,mBAAU,CAAA,CAAE,QAAA,UAAY,QAAA,CAAS;AAAA,EACnC,CAAA;AACN,EAAA,GAAA,CAAI,MAAA,EAAQ,IAAA,CAAA,MAAW,KAAA,GAAQ,WAAA,EAAa,IAAA,CAAK,CAAA;AACnD;AAEA,SAAS,MAAA,CAAA,EAAkB;AACzB,EAAA,OAAO,OAAA,IAAW,KAAA,EAAA,GAAa,SAAA,CAAU,KAAA,EAAO,CAAA;AAClD;AAaO,SAAS,iBAAA,CAAkB,OAAA,EAA2B;AAC3D,EAAA,WAAA,CAAY,IAAA,CAAK,OAAO,CAAA;AACxB,EAAA,GAAA,CAAI,MAAA,CAAO,CAAA,EAAG,OAAA,CAAQ,CAAA;AACxB;AAOA,IAAM,OAAA,EAAS,IAAI,mCAAA,CAAqC,CAAA;AAGjD,SAAS,cAAA,CAAA,EAAuB;AACrC,EAAA,IAAA,CAAA,IAAS,EAAA,EAAI,MAAA,CAAO,QAAA,CAAS,CAAA,EAAG,CAAA,EAAG,EAAA,EAAI,CAAA,CAAE,MAAA,EAAQ,CAAA,CAAE,UAAA,EAAA;AACrD;AAGO,SAAS,SAAA,CAAa,EAAA,EAAgB;AAC3C,EAAA,OAAO,MAAA,CAAO,GAAA,CAAI,KAAA,CAAA,EAAW,EAAE,CAAA;AACjC;AAGA,SAAS,QAAA,CAAS,MAAA,EAA2D;AAC3E,EAAA,MAAM,OAAA,EAA6B,CAAC,CAAA;AACpC,EAAA,KAAA,CAAM,iBAAA,CAAkB,MAAA,EAAQ,MAAM,CAAA;AACtC,EAAA,MAAM,KAAA,kBAAO,MAAA,qBAAO,KAAA,6BAAO,KAAA,mBAAM,IAAI,CAAA,qBAAE,CAAC,GAAA;AACxC,EAAA,uBAAO,IAAA,6BAAM,IAAA,mBAAK,CAAA,qBAAE,OAAA,mBAAQ,MAAA,EAAQ,EAAE,GAAA;AACxC;AAEA,SAAS,IAAA,CAAK,KAAA,EAAmB,IAAA,EAA0B,GAAA,EAAoB;AAC7E,EAAA,IAAA,CAAA,MAAW,SAAA,GAAY,SAAA,EAAW,QAAA,CAAS,KAAK,CAAA;AAChD,EAAA,GAAA,CAAI,CAAC,MAAA,EAAQ,MAAA;AACb,EAAA,MAAM,IAAA,EAAM,yCAAA,CAAU;AACtB,EAAA,MAAM,IAAA,EAAM,CAAA,EAAA;AAEN,EAAA;AACC,EAAA;AACG,EAAA;AACG,IAAA;AACF,EAAA;AACA,IAAA;AACX,EAAA;AACW,EAAA;AACb;AAES;AACK,EAAA;AACF,EAAA;AACE,EAAA;AACN,EAAA;AACK,EAAA;AACA,EAAA;AACD,EAAA;AACE,EAAA;AACD,IAAA;AACT,IAAA;AACF,EAAA;AACF;AAMgB;AACJ,EAAA;AACC,EAAA;AACE,IAAA;AACL,IAAA;AACC,MAAA;AACC,MAAA;AACA,MAAA;AAEA,MAAA;AACA,MAAA;AACA,MAAA;AACE,QAAA;AACA,QAAA;AACN,QAAA;AACE,UAAA;AACE,YAAA;AACA,YAAA;AACA,YAAA;AACA,YAAA;AACI,YAAA;AACA,YAAA;AACN,UAAA;AACA,UAAA;AACC,UAAA;AACH,QAAA;AACF,MAAA;AACO,MAAA;AAGF,QAAA;AACC,UAAA;AACA,UAAA;AACF,QAAA;AACC,QAAA;AACC,UAAA;AACA,UAAA;AACF,QAAA;AACF,MAAA;AACJ,IAAA;AACQ,IAAA;AACV,EAAA;AACO,EAAA;AACT;ADhEe;AACA;AErGX;AAGY;AACA,EAAA;AACP,EAAA;AAGT;AACI;AAEkB;AAChB,EAAA;AACA,EAAA;AACU,IAAA;AAIA,IAAA;AACL,EAAA;AACD,IAAA;AACR,EAAA;AACI,EAAA;AACA,EAAA;AACS,IAAA;AAGJ,EAAA;AACD,IAAA;AACR,EAAA;AAEa,EAAA;AAGL,EAAA;AACG,EAAA;AACJ,EAAA;AAED,EAAA;AACM,EAAA;AACL,EAAA;AACT;AAEgB;AACJ,EAAA;AACE,IAAA;AACR,MAAA;AACF,IAAA;AACF,EAAA;AACO,EAAA;AACT;AAEgB;AACH,EAAA;AACJ,EAAA;AACT;AAEsB;AACV,EAAA;AACH,EAAA;AACD,EAAA;AACO,EAAA;AACf;AFsFe;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-MGH4VDV3.cjs","sourcesContent":[null,"import { AsyncLocalStorage } from 'node:async_hooks';\nimport type { LoggingConfig } from '../types.js';\nimport { getRequestContext } from '../context.js';\nimport { getLogger } from '../logger.js';\n\n// Query logging (`logging.queries`): one event per model operation — model, operation,\n// duration, how many database statements it issued, and the request ID — plus slow-query\n// warnings and an N+1 detector. Statements are counted at the driver: Drizzle's logger on\n// PostgreSQL, mongoose's debug hook on MongoDB.\n\n/** One finished model operation. */\nexport interface QueryEvent {\n model: string;\n op: string;\n durationMs: number;\n /** Database statements (SQL statements / MongoDB commands) issued, nested calls included. */\n statements: number;\n /** The request it ran in, if any. */\n reqId?: string;\n /** Set when it threw. */\n error?: string;\n}\n\ninterface Resolved {\n all: boolean;\n slowMs: number;\n nPlusOne: number | false;\n}\n\nconst DEFAULTS = { slowMs: 500, nPlusOne: 10 } as const;\n\nlet config: Resolved | undefined;\nconst listeners = new Set<(event: QueryEvent) => void>();\nconst enableHooks: (() => void)[] = [];\n\n/** Called by ignite() during Pre-Flight, next to configureLogger(). */\nexport function configureQueryLog(logging: LoggingConfig | false | undefined): void {\n const q = logging === false ? undefined : logging?.queries;\n config = !q\n ? undefined\n : q === true\n ? { all: true, ...DEFAULTS }\n : {\n all: q.all ?? false,\n slowMs: q.slowMs ?? DEFAULTS.slowMs,\n nPlusOne: q.nPlusOne ?? DEFAULTS.nPlusOne,\n };\n if (config) for (const hook of enableHooks) hook();\n}\n\nfunction active(): boolean {\n return config !== undefined || listeners.size > 0;\n}\n\n/**\n * Receives every model operation while subscribed (whether or not `logging.queries` is\n * on). Returns the unsubscribe function. Internal — tests use it to count statements.\n */\nexport function onQuery(listener: (event: QueryEvent) => void): () => void {\n listeners.add(listener);\n for (const hook of enableHooks) hook();\n return () => listeners.delete(listener);\n}\n\n/** Registers a driver hook to install once query tracking is first needed. */\nexport function whenQueryTracking(install: () => void): void {\n enableHooks.push(install);\n if (active()) install();\n}\n\ninterface Frame {\n statements: number;\n parent: Frame | undefined;\n}\n\nconst frames = new AsyncLocalStorage<Frame | undefined>();\n\n/** Called by the driver hooks for each statement sent to the database. */\nexport function countStatement(): void {\n for (let f = frames.getStore(); f; f = f.parent) f.statements++;\n}\n\n/** Runs `fn` outside any operation, so its statements (e.g. auto-sync) are not counted. */\nexport function untracked<R>(fn: () => R): R {\n return frames.run(undefined, fn);\n}\n\n// The first stack frame outside EFC: the line in the app that made the call.\nfunction callSite(callee: (...args: never[]) => unknown): string | undefined {\n const holder: { stack?: string } = {};\n Error.captureStackTrace(holder, callee);\n const line = holder.stack?.split('\\n')[1];\n return line?.trim().replace(/^at /, '');\n}\n\nfunction emit(event: QueryEvent, site: string | undefined, top: boolean): void {\n for (const listener of listeners) listener(event);\n if (!config) return;\n const log = getLogger();\n const msg = `${event.model}.${event.op} ${event.durationMs}ms`;\n // The request's logger already carries reqId.\n const fields: Partial<QueryEvent> = { ...event };\n delete fields.reqId;\n if (event.durationMs >= config.slowMs) {\n log.warn({ ...fields, slow: true }, `Slow query: ${msg}`);\n } else if (config.all) {\n log.info(fields, msg);\n }\n if (top && config.nPlusOne !== false) detectNPlusOne(event, site, config.nPlusOne);\n}\n\nfunction detectNPlusOne(event: QueryEvent, site: string | undefined, threshold: number): void {\n const ctx = getRequestContext();\n if (!ctx) return;\n const key = `${event.model}.${event.op}`;\n const counts = (ctx.queryCounts ??= new Map());\n const n = (counts.get(key) ?? 0) + 1;\n counts.set(key, n);\n if (n !== threshold) return;\n getLogger().warn(\n { model: event.model, op: event.op, count: n, ...(site !== undefined && { site }) },\n `Possible N+1: ${key} ran ${n} times in one request — load them in one query instead`,\n );\n}\n\n/**\n * Wraps a model's public operations so each call is timed, its statements counted and\n * the result reported. A no-op wrapper while query logging is off.\n */\nexport function traceOps<M extends object>(model: string, target: M, ops: readonly string[]): M {\n const t = target as Record<string, unknown>;\n for (const op of ops) {\n const fn = t[op] as (...args: unknown[]) => Promise<unknown>;\n const traced = function (this: unknown, ...args: unknown[]): Promise<unknown> {\n if (!active()) return fn.apply(this, args);\n const parent = frames.getStore();\n const frame: Frame = { statements: 0, parent };\n // Only N+1 checks need the call site; capture it while the caller is on the stack.\n const site = !parent && config && config.nPlusOne !== false ? callSite(traced) : undefined;\n const start = process.hrtime.bigint();\n const finish = (error?: unknown) => {\n const durationMs = Math.round(Number(process.hrtime.bigint() - start) / 1e5) / 10;\n const reqId = getRequestContext()?.requestId;\n emit(\n {\n model,\n op,\n durationMs,\n statements: frame.statements,\n ...(reqId !== undefined && { reqId }),\n ...(error !== undefined && { error: (error as Error)?.message ?? String(error) }),\n },\n site,\n !parent,\n );\n };\n return frames\n .run(frame, () => fn.apply(this, args))\n .then(\n (result) => {\n finish();\n return result;\n },\n (err: unknown) => {\n finish(err);\n throw err;\n },\n );\n };\n t[op] = traced;\n }\n return target;\n}\n","import type { Pool } from 'pg';\nimport { getLogger } from '../logger.js';\nimport { countStatement } from './query-log.js';\n\n// Pre-Flight's PostgreSQL connection: a node-postgres Pool (exposed as `db`) plus a\n// Drizzle instance over it that the model adapter queries through.\n\n/* eslint-disable @typescript-eslint/no-explicit-any -- drizzle is an optional peer, loaded dynamically */\nlet pool: Pool | undefined;\n\n/** Only a genuinely missing package becomes \"not installed\"; other load errors surface as-is. */\nexport function notInstalled(err: unknown, pkg: string, install: string): Error {\n const code = (err as { code?: string }).code;\n return code === 'ERR_MODULE_NOT_FOUND' || code === 'MODULE_NOT_FOUND'\n ? new Error(`[EFC] ${pkg} is not installed. Run: ${install}`)\n : (err as Error);\n}\nlet orm: any;\n\nexport async function connectPostgres(url: string): Promise<Pool> {\n let PoolCtor: typeof Pool;\n try {\n const pg = (await import('pg')) as unknown as {\n default?: { Pool: typeof Pool };\n Pool?: typeof Pool;\n };\n PoolCtor = (pg.default?.Pool ?? pg.Pool)!;\n } catch (err) {\n throw notInstalled(err, 'pg', 'npm install pg drizzle-orm');\n }\n let drizzle: (client: Pool, config: object) => unknown;\n try {\n ({ drizzle } = (await import('drizzle-orm/node-postgres')) as unknown as {\n drizzle: (client: Pool, config: object) => unknown;\n });\n } catch (err) {\n throw notInstalled(err, 'drizzle-orm', 'npm install drizzle-orm');\n }\n\n const next = new PoolCtor({ connectionString: url });\n // Idle-client errors (e.g. the server restarting) are emitted on the pool; unhandled\n // they would crash the process.\n next.on('error', (err) => getLogger().error({ err }, 'PostgreSQL pool error'));\n await next.query('select 1');\n pool = next;\n // Every model statement goes through Drizzle, in or out of a transaction: count it.\n orm = drizzle(next, { logger: { logQuery: countStatement } });\n getLogger().info('PostgreSQL connected');\n return next;\n}\n\nexport function getOrm(): any {\n if (!orm) {\n throw new Error(\n '[EFC] PostgreSQL not connected — set database/databaseUrl in ignite() (or call connectPostgres)',\n );\n }\n return orm;\n}\n\nexport function getPool(): Pool {\n if (!pool) throw new Error('[EFC] PostgreSQL not connected');\n return pool;\n}\n\nexport async function closePostgres(): Promise<void> {\n const p = pool;\n pool = undefined;\n orm = undefined;\n await p?.end();\n}\n"]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunkYL37D6KMcjs = require('./chunk-YL37D6KM.cjs');
|
|
4
4
|
|
|
5
5
|
// src/router/scan.ts
|
|
6
6
|
var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
|
|
@@ -82,7 +82,7 @@ function compareSpecificity(a, b) {
|
|
|
82
82
|
function scanDir(dir, base = dir, maxDepth = DEFAULT_MAX_DEPTH, _depth = 0) {
|
|
83
83
|
if (!_fs2.default.existsSync(dir)) return [];
|
|
84
84
|
if (_depth > maxDepth) {
|
|
85
|
-
|
|
85
|
+
_chunkYL37D6KMcjs.getLogger.call(void 0, ).warn(`scanDir: max depth (${maxDepth}) reached at ${dir}, skipping subtree`);
|
|
86
86
|
return [];
|
|
87
87
|
}
|
|
88
88
|
const entries = [];
|
|
@@ -113,4 +113,4 @@ function scanDir(dir, base = dir, maxDepth = DEFAULT_MAX_DEPTH, _depth = 0) {
|
|
|
113
113
|
|
|
114
114
|
|
|
115
115
|
exports.scanDir = scanDir;
|
|
116
|
-
//# sourceMappingURL=chunk-
|
|
116
|
+
//# sourceMappingURL=chunk-R34R7QPD.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-ULQXD4YZ.cjs","../src/router/scan.ts"],"names":[],"mappings":"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","file":"/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-ULQXD4YZ.cjs","sourcesContent":[null,"import fs from 'node:fs';\nimport path from 'node:path';\nimport type { RouteEntry } from '../types.js';\nimport { getLogger } from '../logger.js';\n\nconst ROUTE_FILE_RE = /\\.(ts|js|mts|mjs|cts|cjs)$/;\nconst DYNAMIC_SEGMENT_RE = /\\[([^\\]]+)\\]/g;\n\n/** Maximum directory depth scanDir will recurse into by default. */\nconst DEFAULT_MAX_DEPTH = 10;\n\n// Match order within one position: static, then [id], then [[id]], then [...slug],\n// then [[...slug]]. Comparing these ranks segment by segment means a more specific\n// route always registers (and so matches) first.\nconst enum Rank {\n Static = 0,\n Dynamic = 1,\n Optional = 2,\n CatchAll = 3,\n OptionalCatchAll = 4,\n}\n\ninterface Segment {\n rank: Rank;\n /** Express-style display/path form: `users`, `:id`, `:id?`, `:slug*`, `:slug*?`. */\n display: string;\n name?: string;\n}\n\nfunction parseSegment(raw: string): Segment {\n let m: RegExpMatchArray | null;\n if ((m = raw.match(/^\\[\\[\\.\\.\\.([^\\]]+)\\]\\]$/)))\n return { rank: Rank.OptionalCatchAll, display: `:${m[1]}*?`, name: m[1]! };\n if ((m = raw.match(/^\\[\\.\\.\\.([^\\]]+)\\]$/)))\n return { rank: Rank.CatchAll, display: `:${m[1]}*`, name: m[1]! };\n if ((m = raw.match(/^\\[\\[([^\\]]+)\\]\\]$/)))\n return { rank: Rank.Optional, display: `:${m[1]}?`, name: m[1]! };\n if (raw.includes('['))\n return { rank: Rank.Dynamic, display: raw.replace(DYNAMIC_SEGMENT_RE, ':$1') };\n return { rank: Rank.Static, display: raw };\n}\n\nfunction segmentsOf(relativePath: string): Segment[] {\n const p = relativePath.replace(ROUTE_FILE_RE, '').replace(/(^|\\/)index$/, '');\n return p.split('/').filter(Boolean).map(parseSegment);\n}\n\nfunction filePathToUrlPath(relativePath: string): string {\n const segs = segmentsOf(relativePath);\n return segs.length === 0 ? '/' : '/' + segs.map((s) => s.display).join('/');\n}\n\nfunction extractParams(relativePath: string): string[] {\n const params: string[] = [];\n for (const raw of relativePath.split('/')) {\n const re = /\\[+(?:\\.\\.\\.)?([^\\]]+)\\]+/g;\n let match: RegExpExecArray | null;\n while ((match = re.exec(raw)) !== null) {\n if (match[1]) params.push(match[1]);\n }\n }\n return params;\n}\n\nfunction escapeRegExp(s: string): string {\n return s.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');\n}\n\n/**\n * Express 4's string paths can't express a multi-segment catch-all with a name, so\n * routes containing one are mounted on a RegExp; captures come back in segment order\n * and mount.ts maps them onto the names in `params`.\n */\nfunction buildPattern(segs: Segment[]): RegExp | undefined {\n const last = segs.length - 1;\n segs.forEach((s, i) => {\n if (i !== last && (s.rank === Rank.CatchAll || s.rank === Rank.OptionalCatchAll)) {\n throw new Error(`[EFC] Catch-all segment \"${s.display}\" must be the last path segment`);\n }\n });\n if (!segs.some((s) => s.rank >= Rank.CatchAll)) return undefined;\n\n let src = '';\n for (const s of segs) {\n switch (s.rank) {\n case Rank.Static:\n src += '/' + escapeRegExp(s.display);\n break;\n case Rank.Dynamic:\n src += '/' + escapeRegExp(s.display).replace(/:[A-Za-z0-9_$]+/g, '([^/]+?)');\n break;\n case Rank.Optional:\n src += '(?:/([^/]+?))?';\n break;\n case Rank.CatchAll:\n src += '/(.+?)';\n break;\n case Rank.OptionalCatchAll:\n src += '(?:/(.*?))?';\n break;\n }\n }\n return new RegExp(`^${src || ''}/?$`, 'i');\n}\n\nfunction compareSpecificity(a: Segment[], b: Segment[]): number {\n for (let i = 0; i < Math.min(a.length, b.length); i++) {\n const diff = a[i]!.rank - b[i]!.rank;\n if (diff !== 0) return diff;\n }\n return 0;\n}\n\n/**\n * Recursively scans `dir` for route files and returns a sorted list of\n * `RouteEntry` objects, most specific first: at each path position a static\n * segment beats `[id]`, which beats `[[id]]`, then `[...slug]`, then\n * `[[...slug]]`. Ties are sorted alphabetically.\n *\n * @param dir - Root directory to scan (must exist).\n * @param base - Base directory used to derive relative URL paths; defaults to `dir`.\n * @param maxDepth - Maximum recursion depth (default: 10). Guards against\n * circular symlinks or unexpectedly deep directory trees.\n * @param _depth - Internal current depth counter — do not pass externally.\n */\nexport function scanDir(\n dir: string,\n base: string = dir,\n maxDepth: number = DEFAULT_MAX_DEPTH,\n _depth: number = 0,\n): RouteEntry[] {\n if (!fs.existsSync(dir)) return [];\n if (_depth > maxDepth) {\n getLogger().warn(`scanDir: max depth (${maxDepth}) reached at ${dir}, skipping subtree`);\n return [];\n }\n\n const entries: RouteEntry[] = [];\n const items = fs.readdirSync(dir, { withFileTypes: true });\n\n for (const item of items) {\n const fullPath = path.join(dir, item.name);\n if (item.isDirectory()) {\n entries.push(...scanDir(fullPath, base, maxDepth, _depth + 1));\n } else if (ROUTE_FILE_RE.test(item.name)) {\n const relative = '/' + path.relative(base, fullPath).replace(/\\\\/g, '/');\n const segs = segmentsOf(relative);\n const pattern = buildPattern(segs);\n entries.push({\n urlPath: filePathToUrlPath(relative),\n filePath: fullPath,\n params: extractParams(relative),\n ...(pattern !== undefined && { pattern }),\n });\n }\n }\n\n // Most specific first (segment-by-segment rank), ties broken alphabetically.\n const rel = (e: RouteEntry) => '/' + path.relative(base, e.filePath).replace(/\\\\/g, '/');\n return entries.sort((a, b) => {\n const diff = compareSpecificity(segmentsOf(rel(a)), segmentsOf(rel(b)));\n return diff !== 0 ? diff : a.urlPath.localeCompare(b.urlPath);\n });\n}\n\nexport { filePathToUrlPath };\n"]}
|
|
1
|
+
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-R34R7QPD.cjs","../src/router/scan.ts"],"names":[],"mappings":"AAAA;AACE;AACF,wDAA6B;AAC7B;AACA;ACJA,gEAAe;AACf,wEAAiB;AAIjB,IAAM,cAAA,EAAgB,4BAAA;AACtB,IAAM,mBAAA,EAAqB,eAAA;AAG3B,IAAM,kBAAA,EAAoB,EAAA;AAoB1B,SAAS,YAAA,CAAa,GAAA,EAAsB;AAC1C,EAAA,IAAI,CAAA;AACJ,EAAA,GAAA,CAAK,EAAA,EAAI,GAAA,CAAI,KAAA,CAAM,0BAA0B,CAAA;AAC3C,IAAA,OAAO,EAAE,IAAA,EAAM,wBAAA,EAAuB,OAAA,EAAS,CAAA,CAAA,EAAI,CAAA,CAAE,CAAC,CAAC,CAAA,EAAA,CAAA,EAAM,IAAA,EAAM,CAAA,CAAE,CAAC,EAAG,CAAA;AAC3E,EAAA,GAAA,CAAK,EAAA,EAAI,GAAA,CAAI,KAAA,CAAM,sBAAsB,CAAA;AACvC,IAAA,OAAO,EAAE,IAAA,EAAM,gBAAA,EAAe,OAAA,EAAS,CAAA,CAAA,EAAI,CAAA,CAAE,CAAC,CAAC,CAAA,CAAA,CAAA,EAAK,IAAA,EAAM,CAAA,CAAE,CAAC,EAAG,CAAA;AAClE,EAAA,GAAA,CAAK,EAAA,EAAI,GAAA,CAAI,KAAA,CAAM,oBAAoB,CAAA;AACrC,IAAA,OAAO,EAAE,IAAA,EAAM,gBAAA,EAAe,OAAA,EAAS,CAAA,CAAA,EAAI,CAAA,CAAE,CAAC,CAAC,CAAA,CAAA,CAAA,EAAK,IAAA,EAAM,CAAA,CAAE,CAAC,EAAG,CAAA;AAClE,EAAA,GAAA,CAAI,GAAA,CAAI,QAAA,CAAS,GAAG,CAAA;AAClB,IAAA,OAAO,EAAE,IAAA,EAAM,eAAA,EAAc,OAAA,EAAS,GAAA,CAAI,OAAA,CAAQ,kBAAA,EAAoB,KAAK,EAAE,CAAA;AAC/E,EAAA,OAAO,EAAE,IAAA,EAAM,cAAA,EAAa,OAAA,EAAS,IAAI,CAAA;AAC3C;AAEA,SAAS,UAAA,CAAW,YAAA,EAAiC;AACnD,EAAA,MAAM,EAAA,EAAI,YAAA,CAAa,OAAA,CAAQ,aAAA,EAAe,EAAE,CAAA,CAAE,OAAA,CAAQ,cAAA,EAAgB,EAAE,CAAA;AAC5E,EAAA,OAAO,CAAA,CAAE,KAAA,CAAM,GAAG,CAAA,CAAE,MAAA,CAAO,OAAO,CAAA,CAAE,GAAA,CAAI,YAAY,CAAA;AACtD;AAEA,SAAS,iBAAA,CAAkB,YAAA,EAA8B;AACvD,EAAA,MAAM,KAAA,EAAO,UAAA,CAAW,YAAY,CAAA;AACpC,EAAA,OAAO,IAAA,CAAK,OAAA,IAAW,EAAA,EAAI,IAAA,EAAM,IAAA,EAAM,IAAA,CAAK,GAAA,CAAI,CAAC,CAAA,EAAA,GAAM,CAAA,CAAE,OAAO,CAAA,CAAE,IAAA,CAAK,GAAG,CAAA;AAC5E;AAEA,SAAS,aAAA,CAAc,YAAA,EAAgC;AACrD,EAAA,MAAM,OAAA,EAAmB,CAAC,CAAA;AAC1B,EAAA,IAAA,CAAA,MAAW,IAAA,GAAO,YAAA,CAAa,KAAA,CAAM,GAAG,CAAA,EAAG;AACzC,IAAA,MAAM,GAAA,EAAK,4BAAA;AACX,IAAA,IAAI,KAAA;AACJ,IAAA,MAAA,CAAA,CAAQ,MAAA,EAAQ,EAAA,CAAG,IAAA,CAAK,GAAG,CAAA,EAAA,IAAO,IAAA,EAAM;AACtC,MAAA,GAAA,CAAI,KAAA,CAAM,CAAC,CAAA,EAAG,MAAA,CAAO,IAAA,CAAK,KAAA,CAAM,CAAC,CAAC,CAAA;AAAA,IACpC;AAAA,EACF;AACA,EAAA,OAAO,MAAA;AACT;AAEA,SAAS,YAAA,CAAa,CAAA,EAAmB;AACvC,EAAA,OAAO,CAAA,CAAE,OAAA,CAAQ,qBAAA,EAAuB,MAAM,CAAA;AAChD;AAOA,SAAS,YAAA,CAAa,IAAA,EAAqC;AACzD,EAAA,MAAM,KAAA,EAAO,IAAA,CAAK,OAAA,EAAS,CAAA;AAC3B,EAAA,IAAA,CAAK,OAAA,CAAQ,CAAC,CAAA,EAAG,CAAA,EAAA,GAAM;AACrB,IAAA,GAAA,CAAI,EAAA,IAAM,KAAA,GAAA,CAAS,CAAA,CAAE,KAAA,IAAS,iBAAA,GAAiB,CAAA,CAAE,KAAA,IAAS,wBAAA,CAAA,EAAwB;AAChF,MAAA,MAAM,IAAI,KAAA,CAAM,CAAA,yBAAA,EAA4B,CAAA,CAAE,OAAO,CAAA,+BAAA,CAAiC,CAAA;AAAA,IACxF;AAAA,EACF,CAAC,CAAA;AACD,EAAA,GAAA,CAAI,CAAC,IAAA,CAAK,IAAA,CAAK,CAAC,CAAA,EAAA,GAAM,CAAA,CAAE,KAAA,GAAQ,gBAAa,CAAA,EAAG,OAAO,KAAA,CAAA;AAEvD,EAAA,IAAI,IAAA,EAAM,EAAA;AACV,EAAA,IAAA,CAAA,MAAW,EAAA,GAAK,IAAA,EAAM;AACpB,IAAA,OAAA,CAAQ,CAAA,CAAE,IAAA,EAAM;AAAA,MACd,KAAK,cAAA;AACH,QAAA,IAAA,GAAO,IAAA,EAAM,YAAA,CAAa,CAAA,CAAE,OAAO,CAAA;AACnC,QAAA,KAAA;AAAA,MACF,KAAK,eAAA;AACH,QAAA,IAAA,GAAO,IAAA,EAAM,YAAA,CAAa,CAAA,CAAE,OAAO,CAAA,CAAE,OAAA,CAAQ,kBAAA,EAAoB,UAAU,CAAA;AAC3E,QAAA,KAAA;AAAA,MACF,KAAK,gBAAA;AACH,QAAA,IAAA,GAAO,gBAAA;AACP,QAAA,KAAA;AAAA,MACF,KAAK,gBAAA;AACH,QAAA,IAAA,GAAO,QAAA;AACP,QAAA,KAAA;AAAA,MACF,KAAK,wBAAA;AACH,QAAA,IAAA,GAAO,aAAA;AACP,QAAA,KAAA;AAAA,IACJ;AAAA,EACF;AACA,EAAA,OAAO,IAAI,MAAA,CAAO,CAAA,CAAA,EAAI,IAAA,GAAO,EAAE,CAAA,GAAA,CAAA,EAAO,GAAG,CAAA;AAC3C;AAEA,SAAS,kBAAA,CAAmB,CAAA,EAAc,CAAA,EAAsB;AAC9D,EAAA,IAAA,CAAA,IAAS,EAAA,EAAI,CAAA,EAAG,EAAA,EAAI,IAAA,CAAK,GAAA,CAAI,CAAA,CAAE,MAAA,EAAQ,CAAA,CAAE,MAAM,CAAA,EAAG,CAAA,EAAA,EAAK;AACrD,IAAA,MAAM,KAAA,EAAO,CAAA,CAAE,CAAC,CAAA,CAAG,KAAA,EAAO,CAAA,CAAE,CAAC,CAAA,CAAG,IAAA;AAChC,IAAA,GAAA,CAAI,KAAA,IAAS,CAAA,EAAG,OAAO,IAAA;AAAA,EACzB;AACA,EAAA,OAAO,CAAA;AACT;AAcO,SAAS,OAAA,CACd,GAAA,EACA,KAAA,EAAe,GAAA,EACf,SAAA,EAAmB,iBAAA,EACnB,OAAA,EAAiB,CAAA,EACH;AACd,EAAA,GAAA,CAAI,CAAC,YAAA,CAAG,UAAA,CAAW,GAAG,CAAA,EAAG,OAAO,CAAC,CAAA;AACjC,EAAA,GAAA,CAAI,OAAA,EAAS,QAAA,EAAU;AACrB,IAAA,yCAAA,CAAU,CAAE,IAAA,CAAK,CAAA,oBAAA,EAAuB,QAAQ,CAAA,aAAA,EAAgB,GAAG,CAAA,kBAAA,CAAoB,CAAA;AACvF,IAAA,OAAO,CAAC,CAAA;AAAA,EACV;AAEA,EAAA,MAAM,QAAA,EAAwB,CAAC,CAAA;AAC/B,EAAA,MAAM,MAAA,EAAQ,YAAA,CAAG,WAAA,CAAY,GAAA,EAAK,EAAE,aAAA,EAAe,KAAK,CAAC,CAAA;AAEzD,EAAA,IAAA,CAAA,MAAW,KAAA,GAAQ,KAAA,EAAO;AACxB,IAAA,MAAM,SAAA,EAAW,cAAA,CAAK,IAAA,CAAK,GAAA,EAAK,IAAA,CAAK,IAAI,CAAA;AACzC,IAAA,GAAA,CAAI,IAAA,CAAK,WAAA,CAAY,CAAA,EAAG;AACtB,MAAA,OAAA,CAAQ,IAAA,CAAK,GAAG,OAAA,CAAQ,QAAA,EAAU,IAAA,EAAM,QAAA,EAAU,OAAA,EAAS,CAAC,CAAC,CAAA;AAAA,IAC/D,EAAA,KAAA,GAAA,CAAW,aAAA,CAAc,IAAA,CAAK,IAAA,CAAK,IAAI,CAAA,EAAG;AACxC,MAAA,MAAM,SAAA,EAAW,IAAA,EAAM,cAAA,CAAK,QAAA,CAAS,IAAA,EAAM,QAAQ,CAAA,CAAE,OAAA,CAAQ,KAAA,EAAO,GAAG,CAAA;AACvE,MAAA,MAAM,KAAA,EAAO,UAAA,CAAW,QAAQ,CAAA;AAChC,MAAA,MAAM,QAAA,EAAU,YAAA,CAAa,IAAI,CAAA;AACjC,MAAA,OAAA,CAAQ,IAAA,CAAK;AAAA,QACX,OAAA,EAAS,iBAAA,CAAkB,QAAQ,CAAA;AAAA,QACnC,QAAA,EAAU,QAAA;AAAA,QACV,MAAA,EAAQ,aAAA,CAAc,QAAQ,CAAA;AAAA,QAC9B,GAAI,QAAA,IAAY,KAAA,EAAA,GAAa,EAAE,QAAQ;AAAA,MACzC,CAAC,CAAA;AAAA,IACH;AAAA,EACF;AAGA,EAAA,MAAM,IAAA,EAAM,CAAC,CAAA,EAAA,GAAkB,IAAA,EAAM,cAAA,CAAK,QAAA,CAAS,IAAA,EAAM,CAAA,CAAE,QAAQ,CAAA,CAAE,OAAA,CAAQ,KAAA,EAAO,GAAG,CAAA;AACvF,EAAA,OAAO,OAAA,CAAQ,IAAA,CAAK,CAAC,CAAA,EAAG,CAAA,EAAA,GAAM;AAC5B,IAAA,MAAM,KAAA,EAAO,kBAAA,CAAmB,UAAA,CAAW,GAAA,CAAI,CAAC,CAAC,CAAA,EAAG,UAAA,CAAW,GAAA,CAAI,CAAC,CAAC,CAAC,CAAA;AACtE,IAAA,OAAO,KAAA,IAAS,EAAA,EAAI,KAAA,EAAO,CAAA,CAAE,OAAA,CAAQ,aAAA,CAAc,CAAA,CAAE,OAAO,CAAA;AAAA,EAC9D,CAAC,CAAA;AACH;ADpDA;AACA;AACE;AACF,0BAAC","file":"/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-R34R7QPD.cjs","sourcesContent":[null,"import fs from 'node:fs';\nimport path from 'node:path';\nimport type { RouteEntry } from '../types.js';\nimport { getLogger } from '../logger.js';\n\nconst ROUTE_FILE_RE = /\\.(ts|js|mts|mjs|cts|cjs)$/;\nconst DYNAMIC_SEGMENT_RE = /\\[([^\\]]+)\\]/g;\n\n/** Maximum directory depth scanDir will recurse into by default. */\nconst DEFAULT_MAX_DEPTH = 10;\n\n// Match order within one position: static, then [id], then [[id]], then [...slug],\n// then [[...slug]]. Comparing these ranks segment by segment means a more specific\n// route always registers (and so matches) first.\nconst enum Rank {\n Static = 0,\n Dynamic = 1,\n Optional = 2,\n CatchAll = 3,\n OptionalCatchAll = 4,\n}\n\ninterface Segment {\n rank: Rank;\n /** Express-style display/path form: `users`, `:id`, `:id?`, `:slug*`, `:slug*?`. */\n display: string;\n name?: string;\n}\n\nfunction parseSegment(raw: string): Segment {\n let m: RegExpMatchArray | null;\n if ((m = raw.match(/^\\[\\[\\.\\.\\.([^\\]]+)\\]\\]$/)))\n return { rank: Rank.OptionalCatchAll, display: `:${m[1]}*?`, name: m[1]! };\n if ((m = raw.match(/^\\[\\.\\.\\.([^\\]]+)\\]$/)))\n return { rank: Rank.CatchAll, display: `:${m[1]}*`, name: m[1]! };\n if ((m = raw.match(/^\\[\\[([^\\]]+)\\]\\]$/)))\n return { rank: Rank.Optional, display: `:${m[1]}?`, name: m[1]! };\n if (raw.includes('['))\n return { rank: Rank.Dynamic, display: raw.replace(DYNAMIC_SEGMENT_RE, ':$1') };\n return { rank: Rank.Static, display: raw };\n}\n\nfunction segmentsOf(relativePath: string): Segment[] {\n const p = relativePath.replace(ROUTE_FILE_RE, '').replace(/(^|\\/)index$/, '');\n return p.split('/').filter(Boolean).map(parseSegment);\n}\n\nfunction filePathToUrlPath(relativePath: string): string {\n const segs = segmentsOf(relativePath);\n return segs.length === 0 ? '/' : '/' + segs.map((s) => s.display).join('/');\n}\n\nfunction extractParams(relativePath: string): string[] {\n const params: string[] = [];\n for (const raw of relativePath.split('/')) {\n const re = /\\[+(?:\\.\\.\\.)?([^\\]]+)\\]+/g;\n let match: RegExpExecArray | null;\n while ((match = re.exec(raw)) !== null) {\n if (match[1]) params.push(match[1]);\n }\n }\n return params;\n}\n\nfunction escapeRegExp(s: string): string {\n return s.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');\n}\n\n/**\n * Express 4's string paths can't express a multi-segment catch-all with a name, so\n * routes containing one are mounted on a RegExp; captures come back in segment order\n * and mount.ts maps them onto the names in `params`.\n */\nfunction buildPattern(segs: Segment[]): RegExp | undefined {\n const last = segs.length - 1;\n segs.forEach((s, i) => {\n if (i !== last && (s.rank === Rank.CatchAll || s.rank === Rank.OptionalCatchAll)) {\n throw new Error(`[EFC] Catch-all segment \"${s.display}\" must be the last path segment`);\n }\n });\n if (!segs.some((s) => s.rank >= Rank.CatchAll)) return undefined;\n\n let src = '';\n for (const s of segs) {\n switch (s.rank) {\n case Rank.Static:\n src += '/' + escapeRegExp(s.display);\n break;\n case Rank.Dynamic:\n src += '/' + escapeRegExp(s.display).replace(/:[A-Za-z0-9_$]+/g, '([^/]+?)');\n break;\n case Rank.Optional:\n src += '(?:/([^/]+?))?';\n break;\n case Rank.CatchAll:\n src += '/(.+?)';\n break;\n case Rank.OptionalCatchAll:\n src += '(?:/(.*?))?';\n break;\n }\n }\n return new RegExp(`^${src || ''}/?$`, 'i');\n}\n\nfunction compareSpecificity(a: Segment[], b: Segment[]): number {\n for (let i = 0; i < Math.min(a.length, b.length); i++) {\n const diff = a[i]!.rank - b[i]!.rank;\n if (diff !== 0) return diff;\n }\n return 0;\n}\n\n/**\n * Recursively scans `dir` for route files and returns a sorted list of\n * `RouteEntry` objects, most specific first: at each path position a static\n * segment beats `[id]`, which beats `[[id]]`, then `[...slug]`, then\n * `[[...slug]]`. Ties are sorted alphabetically.\n *\n * @param dir - Root directory to scan (must exist).\n * @param base - Base directory used to derive relative URL paths; defaults to `dir`.\n * @param maxDepth - Maximum recursion depth (default: 10). Guards against\n * circular symlinks or unexpectedly deep directory trees.\n * @param _depth - Internal current depth counter — do not pass externally.\n */\nexport function scanDir(\n dir: string,\n base: string = dir,\n maxDepth: number = DEFAULT_MAX_DEPTH,\n _depth: number = 0,\n): RouteEntry[] {\n if (!fs.existsSync(dir)) return [];\n if (_depth > maxDepth) {\n getLogger().warn(`scanDir: max depth (${maxDepth}) reached at ${dir}, skipping subtree`);\n return [];\n }\n\n const entries: RouteEntry[] = [];\n const items = fs.readdirSync(dir, { withFileTypes: true });\n\n for (const item of items) {\n const fullPath = path.join(dir, item.name);\n if (item.isDirectory()) {\n entries.push(...scanDir(fullPath, base, maxDepth, _depth + 1));\n } else if (ROUTE_FILE_RE.test(item.name)) {\n const relative = '/' + path.relative(base, fullPath).replace(/\\\\/g, '/');\n const segs = segmentsOf(relative);\n const pattern = buildPattern(segs);\n entries.push({\n urlPath: filePathToUrlPath(relative),\n filePath: fullPath,\n params: extractParams(relative),\n ...(pattern !== undefined && { pattern }),\n });\n }\n }\n\n // Most specific first (segment-by-segment rank), ties broken alphabetically.\n const rel = (e: RouteEntry) => '/' + path.relative(base, e.filePath).replace(/\\\\/g, '/');\n return entries.sort((a, b) => {\n const diff = compareSpecificity(segmentsOf(rel(a)), segmentsOf(rel(b)));\n return diff !== 0 ? diff : a.urlPath.localeCompare(b.urlPath);\n });\n}\n\nexport { filePathToUrlPath };\n"]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getLogger
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-277BSYVH.js";
|
|
4
4
|
|
|
5
5
|
// src/router/scan.ts
|
|
6
6
|
import fs from "fs";
|
|
@@ -113,4 +113,4 @@ function scanDir(dir, base = dir, maxDepth = DEFAULT_MAX_DEPTH, _depth = 0) {
|
|
|
113
113
|
export {
|
|
114
114
|
scanDir
|
|
115
115
|
};
|
|
116
|
-
//# sourceMappingURL=chunk-
|
|
116
|
+
//# sourceMappingURL=chunk-RS4MXCPW.js.map
|
|
@@ -7,7 +7,7 @@ var _chunk7YEX4MQVcjs = require('./chunk-7YEX4MQV.cjs');
|
|
|
7
7
|
var _chunkTI24L4XEcjs = require('./chunk-TI24L4XE.cjs');
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _chunkYL37D6KMcjs = require('./chunk-YL37D6KM.cjs');
|
|
11
11
|
|
|
12
12
|
// src/tasks/bullmq-backend.ts
|
|
13
13
|
var closeImpl = null;
|
|
@@ -40,7 +40,7 @@ async function syncSchedules(queue) {
|
|
|
40
40
|
await queue.removeJobScheduler(s.key);
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
-
if (wanted.size > 0)
|
|
43
|
+
if (wanted.size > 0) _chunkYL37D6KMcjs.getLogger.call(void 0, ).info(`Scheduled ${wanted.size} cron task(s)`);
|
|
44
44
|
}
|
|
45
45
|
async function closeBullMQ() {
|
|
46
46
|
const close = closeImpl;
|
|
@@ -76,16 +76,16 @@ async function initBullMQ(opts) {
|
|
|
76
76
|
{ connection, concurrency: opts.concurrency }
|
|
77
77
|
);
|
|
78
78
|
worker.on("failed", (job, err) => {
|
|
79
|
-
|
|
79
|
+
_chunkYL37D6KMcjs.getLogger.call(void 0, ).error(
|
|
80
80
|
{ task: _optionalChain([job, 'optionalAccess', _3 => _3.name]), jobId: _optionalChain([job, 'optionalAccess', _4 => _4.id]), attempt: _optionalChain([job, 'optionalAccess', _5 => _5.attemptsMade]), err },
|
|
81
81
|
`Task ${_nullishCoalesce(_optionalChain([job, 'optionalAccess', _6 => _6.name]), () => ( "unknown"))} failed`
|
|
82
82
|
);
|
|
83
83
|
});
|
|
84
84
|
worker.on("error", (err) => {
|
|
85
|
-
|
|
85
|
+
_chunkYL37D6KMcjs.getLogger.call(void 0, ).error(`Task worker error: ${err.message}`);
|
|
86
86
|
});
|
|
87
87
|
worker.on("completed", (job) => {
|
|
88
|
-
|
|
88
|
+
_chunkYL37D6KMcjs.getLogger.call(void 0, ).info({ task: job.name, jobId: job.id }, `Task ${job.name} completed`);
|
|
89
89
|
});
|
|
90
90
|
_chunkTI24L4XEcjs.setEnqueueImpl.call(void 0, async (name, payload) => {
|
|
91
91
|
const def = _chunkTI24L4XEcjs.taskRegistry.get(name);
|
|
@@ -119,14 +119,14 @@ async function initBullMQ(opts) {
|
|
|
119
119
|
});
|
|
120
120
|
let closing = false;
|
|
121
121
|
schedulesSynced = queue.waitUntilReady().then(() => syncSchedules(queue)).catch((err) => {
|
|
122
|
-
if (!closing)
|
|
122
|
+
if (!closing) _chunkYL37D6KMcjs.getLogger.call(void 0, ).error({ err }, "Failed to sync cron task schedules");
|
|
123
123
|
});
|
|
124
124
|
closeImpl = async () => {
|
|
125
125
|
closing = true;
|
|
126
126
|
await worker.close();
|
|
127
127
|
await queue.close();
|
|
128
128
|
};
|
|
129
|
-
|
|
129
|
+
_chunkYL37D6KMcjs.getLogger.call(void 0, ).info("BullMQ backend initialised");
|
|
130
130
|
}
|
|
131
131
|
function parseRedisUrl(url) {
|
|
132
132
|
try {
|
|
@@ -151,4 +151,4 @@ function parseRedisUrl(url) {
|
|
|
151
151
|
|
|
152
152
|
|
|
153
153
|
exports.closeBullMQ = closeBullMQ; exports.initBullMQ = initBullMQ; exports.parseRedisUrl = parseRedisUrl;
|
|
154
|
-
//# sourceMappingURL=chunk-
|
|
154
|
+
//# sourceMappingURL=chunk-T4OHFU5T.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-SZT36SGB.cjs","../src/tasks/bullmq-backend.ts"],"names":[],"mappings":"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","file":"/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-SZT36SGB.cjs","sourcesContent":[null,"import type { Job } from 'bullmq';\nimport type * as BullMQNS from 'bullmq';\nimport { taskRegistry, setEnqueueImpl } from './index.js';\nimport type { TaskDefinition } from '../types.js';\nimport { runInThread } from './thread-runner.js';\nimport { getLogger } from '../logger.js';\n\ninterface BullMQOpts {\n redisUrl: string;\n concurrency: number;\n enqueueTimeout: number;\n queue: string;\n}\n\nlet closeImpl: (() => Promise<void>) | null = null;\nlet schedulesSynced: Promise<void> = Promise.resolve();\n\n/** Resolves once cron schedulers have been reconciled with the registry (tests, CLI). */\nexport function whenSchedulesSynced(): Promise<void> {\n return schedulesSynced;\n}\n\nexport const SCHEDULER_PREFIX = 'efc-cron:';\n\nfunction jobOptions(def: TaskDefinition) {\n return {\n // BullMQ's `attempts` counts the first run; `retries` counts only the re-runs.\n attempts: (def.options.retries ?? 3) + 1,\n backoff: { type: def.options.backoff ?? 'exponential', delay: 1000 },\n };\n}\n\n// One job scheduler per task with a `schedule`, keyed by task name. upsert is\n// idempotent, so every cluster worker can run this without creating duplicates;\n// schedulers whose task lost its `schedule` (or was deleted) are removed.\nasync function syncSchedules(queue: BullMQNS.Queue): Promise<void> {\n const wanted = new Set<string>();\n for (const def of taskRegistry.values()) {\n if (!def.options.schedule) continue;\n const id = SCHEDULER_PREFIX + def.name;\n wanted.add(id);\n await queue.upsertJobScheduler(\n id,\n {\n pattern: def.options.schedule,\n ...(def.options.timezone !== undefined && { tz: def.options.timezone }),\n },\n { name: def.name, data: {}, opts: jobOptions(def) },\n );\n }\n for (const s of await queue.getJobSchedulers(0, -1)) {\n if (s.key.startsWith(SCHEDULER_PREFIX) && !wanted.has(s.key)) {\n await queue.removeJobScheduler(s.key);\n }\n }\n if (wanted.size > 0) getLogger().info(`Scheduled ${wanted.size} cron task(s)`);\n}\n\n/** Drains the BullMQ worker and closes both Redis connections. No-op if never initialised. */\nexport async function closeBullMQ(): Promise<void> {\n const close = closeImpl;\n closeImpl = null;\n await close?.();\n}\n\nexport async function initBullMQ(opts: BullMQOpts): Promise<void> {\n let bullmq: typeof BullMQNS;\n try {\n bullmq = await import('bullmq');\n } catch {\n throw new Error('[EFC] bullmq is not installed. Run: npm install bullmq');\n }\n\n const connection = parseRedisUrl(opts.redisUrl);\n // With the offline queue on (ioredis default) queue.add() buffers forever while Redis is\n // down, so enqueue() never settles. Off, commands reject once the connection drops; the\n // initial connect is bounded by the enqueueTimeout race below.\n const queue = new bullmq.Queue(opts.queue, {\n connection: { ...connection, enableOfflineQueue: false },\n });\n // Without a listener, ioredis connection errors surface as unhandled 'error' events.\n queue.on('error', () => {});\n\n const worker = new bullmq.Worker(\n opts.queue,\n async (job: Job) => {\n const def = taskRegistry.get(job.name);\n if (!def) {\n throw new Error(`[EFC] No task registered for name: ${job.name}`);\n }\n\n if (def.options.thread && def.filePath) {\n await runInThread(def.filePath, job.data);\n } else {\n await def.handler(job.data);\n }\n },\n { connection, concurrency: opts.concurrency },\n );\n\n worker.on('failed', (job: Job | undefined, err: Error) => {\n getLogger().error(\n { task: job?.name, jobId: job?.id, attempt: job?.attemptsMade, err },\n `Task ${job?.name ?? 'unknown'} failed`,\n );\n });\n\n worker.on('error', (err: Error) => {\n getLogger().error(`Task worker error: ${err.message}`);\n });\n\n worker.on('completed', (job: Job) => {\n getLogger().info({ task: job.name, jobId: job.id }, `Task ${job.name} completed`);\n });\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\n const add = queue.waitUntilReady().then(() => queue.add(name, payload, jobOptions(def)));\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}\": Redis at ${connection.host}:${connection.port} did not respond within ${opts.enqueueTimeout}ms`,\n ),\n ),\n opts.enqueueTimeout,\n );\n });\n\n try {\n await Promise.race([add, timeout]);\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 let closing = false;\n // Not awaited: a Redis outage at boot must not block the HTTP server from starting.\n schedulesSynced = queue\n .waitUntilReady()\n .then(() => syncSchedules(queue))\n .catch((err: unknown) => {\n // Shutting down before Redis ever answered aborts the wait — not a real failure.\n if (!closing) getLogger().error({ err }, 'Failed to sync cron task schedules');\n });\n\n closeImpl = async () => {\n closing = true;\n await worker.close();\n await queue.close();\n };\n\n getLogger().info('BullMQ backend initialised');\n}\n\ninterface RedisConnection {\n host: string;\n port: number;\n username?: string;\n password?: string;\n db?: number;\n tls?: Record<string, never>;\n}\n\nexport function parseRedisUrl(url: string): RedisConnection {\n try {\n const u = new URL(url);\n const result: RedisConnection = {\n host: u.hostname || 'localhost',\n port: parseInt(u.port || '6379', 10),\n };\n if (u.username) result.username = decodeURIComponent(u.username);\n if (u.password) result.password = decodeURIComponent(u.password);\n const db = parseInt(u.pathname.slice(1), 10);\n if (!Number.isNaN(db)) result.db = db;\n if (u.protocol === 'rediss:') result.tls = {};\n return result;\n } catch {\n return { host: 'localhost', port: 6379 };\n }\n}\n"]}
|
|
1
|
+
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-T4OHFU5T.cjs","../src/tasks/bullmq-backend.ts"],"names":[],"mappings":"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","file":"/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-T4OHFU5T.cjs","sourcesContent":[null,"import type { Job } from 'bullmq';\nimport type * as BullMQNS from 'bullmq';\nimport { taskRegistry, setEnqueueImpl } from './index.js';\nimport type { TaskDefinition } from '../types.js';\nimport { runInThread } from './thread-runner.js';\nimport { getLogger } from '../logger.js';\n\ninterface BullMQOpts {\n redisUrl: string;\n concurrency: number;\n enqueueTimeout: number;\n queue: string;\n}\n\nlet closeImpl: (() => Promise<void>) | null = null;\nlet schedulesSynced: Promise<void> = Promise.resolve();\n\n/** Resolves once cron schedulers have been reconciled with the registry (tests, CLI). */\nexport function whenSchedulesSynced(): Promise<void> {\n return schedulesSynced;\n}\n\nexport const SCHEDULER_PREFIX = 'efc-cron:';\n\nfunction jobOptions(def: TaskDefinition) {\n return {\n // BullMQ's `attempts` counts the first run; `retries` counts only the re-runs.\n attempts: (def.options.retries ?? 3) + 1,\n backoff: { type: def.options.backoff ?? 'exponential', delay: 1000 },\n };\n}\n\n// One job scheduler per task with a `schedule`, keyed by task name. upsert is\n// idempotent, so every cluster worker can run this without creating duplicates;\n// schedulers whose task lost its `schedule` (or was deleted) are removed.\nasync function syncSchedules(queue: BullMQNS.Queue): Promise<void> {\n const wanted = new Set<string>();\n for (const def of taskRegistry.values()) {\n if (!def.options.schedule) continue;\n const id = SCHEDULER_PREFIX + def.name;\n wanted.add(id);\n await queue.upsertJobScheduler(\n id,\n {\n pattern: def.options.schedule,\n ...(def.options.timezone !== undefined && { tz: def.options.timezone }),\n },\n { name: def.name, data: {}, opts: jobOptions(def) },\n );\n }\n for (const s of await queue.getJobSchedulers(0, -1)) {\n if (s.key.startsWith(SCHEDULER_PREFIX) && !wanted.has(s.key)) {\n await queue.removeJobScheduler(s.key);\n }\n }\n if (wanted.size > 0) getLogger().info(`Scheduled ${wanted.size} cron task(s)`);\n}\n\n/** Drains the BullMQ worker and closes both Redis connections. No-op if never initialised. */\nexport async function closeBullMQ(): Promise<void> {\n const close = closeImpl;\n closeImpl = null;\n await close?.();\n}\n\nexport async function initBullMQ(opts: BullMQOpts): Promise<void> {\n let bullmq: typeof BullMQNS;\n try {\n bullmq = await import('bullmq');\n } catch {\n throw new Error('[EFC] bullmq is not installed. Run: npm install bullmq');\n }\n\n const connection = parseRedisUrl(opts.redisUrl);\n // With the offline queue on (ioredis default) queue.add() buffers forever while Redis is\n // down, so enqueue() never settles. Off, commands reject once the connection drops; the\n // initial connect is bounded by the enqueueTimeout race below.\n const queue = new bullmq.Queue(opts.queue, {\n connection: { ...connection, enableOfflineQueue: false },\n });\n // Without a listener, ioredis connection errors surface as unhandled 'error' events.\n queue.on('error', () => {});\n\n const worker = new bullmq.Worker(\n opts.queue,\n async (job: Job) => {\n const def = taskRegistry.get(job.name);\n if (!def) {\n throw new Error(`[EFC] No task registered for name: ${job.name}`);\n }\n\n if (def.options.thread && def.filePath) {\n await runInThread(def.filePath, job.data);\n } else {\n await def.handler(job.data);\n }\n },\n { connection, concurrency: opts.concurrency },\n );\n\n worker.on('failed', (job: Job | undefined, err: Error) => {\n getLogger().error(\n { task: job?.name, jobId: job?.id, attempt: job?.attemptsMade, err },\n `Task ${job?.name ?? 'unknown'} failed`,\n );\n });\n\n worker.on('error', (err: Error) => {\n getLogger().error(`Task worker error: ${err.message}`);\n });\n\n worker.on('completed', (job: Job) => {\n getLogger().info({ task: job.name, jobId: job.id }, `Task ${job.name} completed`);\n });\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\n const add = queue.waitUntilReady().then(() => queue.add(name, payload, jobOptions(def)));\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}\": Redis at ${connection.host}:${connection.port} did not respond within ${opts.enqueueTimeout}ms`,\n ),\n ),\n opts.enqueueTimeout,\n );\n });\n\n try {\n await Promise.race([add, timeout]);\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 let closing = false;\n // Not awaited: a Redis outage at boot must not block the HTTP server from starting.\n schedulesSynced = queue\n .waitUntilReady()\n .then(() => syncSchedules(queue))\n .catch((err: unknown) => {\n // Shutting down before Redis ever answered aborts the wait — not a real failure.\n if (!closing) getLogger().error({ err }, 'Failed to sync cron task schedules');\n });\n\n closeImpl = async () => {\n closing = true;\n await worker.close();\n await queue.close();\n };\n\n getLogger().info('BullMQ backend initialised');\n}\n\ninterface RedisConnection {\n host: string;\n port: number;\n username?: string;\n password?: string;\n db?: number;\n tls?: Record<string, never>;\n}\n\nexport function parseRedisUrl(url: string): RedisConnection {\n try {\n const u = new URL(url);\n const result: RedisConnection = {\n host: u.hostname || 'localhost',\n port: parseInt(u.port || '6379', 10),\n };\n if (u.username) result.username = decodeURIComponent(u.username);\n if (u.password) result.password = decodeURIComponent(u.password);\n const db = parseInt(u.pathname.slice(1), 10);\n if (!Number.isNaN(db)) result.db = db;\n if (u.protocol === 'rediss:') result.tls = {};\n return result;\n } catch {\n return { host: 'localhost', port: 6379 };\n }\n}\n"]}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
2
|
parseRedisUrl
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-UBQYQPBU.js";
|
|
4
4
|
import {
|
|
5
5
|
notInstalled
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-BUBXO7WU.js";
|
|
7
7
|
import {
|
|
8
8
|
getLogger,
|
|
9
9
|
setCurrentUser
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-277BSYVH.js";
|
|
11
11
|
|
|
12
12
|
// src/auth/index.ts
|
|
13
13
|
import { randomUUID as randomUUID2 } from "crypto";
|
|
@@ -435,4 +435,4 @@ export {
|
|
|
435
435
|
revokeAllSessions,
|
|
436
436
|
requireAuth
|
|
437
437
|
};
|
|
438
|
-
//# sourceMappingURL=chunk-
|
|
438
|
+
//# sourceMappingURL=chunk-TRC4DUZB.js.map
|