express-file-cluster 0.9.3 → 0.10.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 +6 -7
- package/dist/auth/index.cjs.map +1 -1
- package/dist/auth/index.d.cts +7 -2
- package/dist/auth/index.d.ts +7 -2
- package/dist/auth/index.js +5 -6
- package/dist/{chunk-QL6EWT4B.cjs → chunk-4DOHQU6I.cjs} +9 -7
- package/dist/chunk-4DOHQU6I.cjs.map +1 -0
- package/dist/chunk-73XJUT2S.js +366 -0
- package/dist/chunk-73XJUT2S.js.map +1 -0
- package/dist/{chunk-ATL4GYFU.js → chunk-7KC2H76D.js} +50 -8
- package/dist/chunk-7KC2H76D.js.map +1 -0
- package/dist/{chunk-TYR2GZZE.cjs → chunk-7KO4DJRJ.cjs} +19 -14
- package/dist/chunk-7KO4DJRJ.cjs.map +1 -0
- package/dist/{chunk-UBQYQPBU.js → chunk-ATVD2HGC.js} +4 -4
- package/dist/{chunk-R34R7QPD.cjs → chunk-DCJOWFVD.cjs} +3 -3
- package/dist/{chunk-R34R7QPD.cjs.map → chunk-DCJOWFVD.cjs.map} +1 -1
- package/dist/chunk-DUADUR6R.cjs +366 -0
- package/dist/chunk-DUADUR6R.cjs.map +1 -0
- package/dist/{chunk-BBSZLGZW.js → chunk-EGSSZUVO.js} +8 -6
- package/dist/chunk-EGSSZUVO.js.map +1 -0
- package/dist/{chunk-TI24L4XE.cjs → chunk-GBI77W5T.cjs} +6 -2
- package/dist/chunk-GBI77W5T.cjs.map +1 -0
- package/dist/{chunk-RTF7PHS2.cjs → chunk-HBCY7ILD.cjs} +306 -119
- package/dist/chunk-HBCY7ILD.cjs.map +1 -0
- package/dist/{chunk-ANUSWEAP.cjs → chunk-KFVFP2Q7.cjs} +59 -17
- package/dist/chunk-KFVFP2Q7.cjs.map +1 -0
- package/dist/{chunk-RS4MXCPW.js → chunk-NI2BNGGV.js} +2 -2
- package/dist/{chunk-X2US4RAM.cjs → chunk-NKLOE4AK.cjs} +11 -13
- package/dist/chunk-NKLOE4AK.cjs.map +1 -0
- package/dist/{chunk-RRQ2RK5M.js → chunk-PGJQK36V.js} +195 -8
- package/dist/chunk-PGJQK36V.js.map +1 -0
- package/dist/{chunk-QKQZF573.js → chunk-QDEDOHP7.js} +4 -6
- package/dist/chunk-QDEDOHP7.js.map +1 -0
- package/dist/{chunk-UTM4PEVG.js → chunk-R4XO4SVM.js} +10 -5
- package/dist/chunk-R4XO4SVM.js.map +1 -0
- package/dist/chunk-R52CUEGT.js +74 -0
- package/dist/chunk-R52CUEGT.js.map +1 -0
- package/dist/{chunk-HBYSKULC.js → chunk-RAB44UGX.js} +5 -1
- package/dist/chunk-RAB44UGX.js.map +1 -0
- package/dist/{chunk-7YEX4MQV.cjs → chunk-WBLUGOAG.cjs} +42 -6
- package/dist/chunk-WBLUGOAG.cjs.map +1 -0
- package/dist/{chunk-T4OHFU5T.cjs → chunk-YK4ZM3CA.cjs} +15 -15
- package/dist/{chunk-T4OHFU5T.cjs.map → chunk-YK4ZM3CA.cjs.map} +1 -1
- package/dist/cli/db-runner.cjs +2012 -120
- package/dist/cli/db-runner.cjs.map +1 -1
- package/dist/cli/db-runner.js +1989 -97
- package/dist/cli/db-runner.js.map +1 -1
- package/dist/cli/index.cjs +101 -43
- package/dist/cli/index.cjs.map +1 -1
- package/dist/cli/index.js +80 -22
- package/dist/cli/index.js.map +1 -1
- package/dist/docs/api-reference/auth.md +10 -8
- package/dist/docs/api-reference/collection.md +44 -1
- package/dist/docs/api-reference/ignite.md +22 -3
- package/dist/docs/api-reference/types.md +99 -0
- package/dist/docs/cli/add.md +1 -1
- package/dist/docs/cli/db.md +2 -2
- package/dist/docs/contributing/index.md +1 -1
- package/dist/docs/core-concepts/background-tasks.md +6 -3
- package/dist/docs/getting-started/index.md +3 -2
- package/dist/docs/guides/authentication.md +34 -24
- package/dist/docs/guides/caching.md +32 -1
- package/dist/docs/guides/database.md +14 -0
- package/dist/docs/guides/feature-matrix.md +58 -0
- package/dist/docs/guides/migrations.md +23 -2
- package/dist/docs/guides/oauth.md +15 -1
- package/dist/docs/guides/which-api.md +2 -2
- package/dist/docs/index.md +4 -1
- package/dist/docs/skills/SKILL.md +2 -2
- package/dist/docs/skills/api-surface.md +10 -4
- package/dist/docs/skills/auth-internals.md +3 -3
- package/dist/docs/skills/tasks-internals.md +4 -3
- package/dist/docs/skills/what-not-to-invent.md +4 -3
- package/dist/docs/versioning.md +42 -0
- package/dist/index.cjs +144 -51
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +204 -3
- package/dist/index.d.ts +204 -3
- package/dist/index.js +107 -14
- package/dist/index.js.map +1 -1
- package/dist/pgboss-backend-FW42SBSM.js +14 -0
- package/dist/pgboss-backend-RVHUBJTU.cjs +14 -0
- package/dist/{pgboss-backend-TCHI7CHM.cjs.map → pgboss-backend-RVHUBJTU.cjs.map} +1 -1
- package/dist/registry/index.json +34 -3
- package/dist/registry/js-mongo/account-security.json +1 -1
- package/dist/registry/js-mongo/admin-users.json +1 -1
- package/dist/registry/js-mongo/auth.json +1 -1
- package/dist/registry/js-mongo/auth@apple.json +1 -1
- package/dist/registry/js-mongo/auth@google.json +1 -1
- package/dist/registry/js-mongo/email-verification.json +1 -1
- package/dist/registry/js-mongo/forgot-password.json +1 -1
- package/dist/registry/js-mongo/user-profile.json +1 -1
- package/dist/registry/js-mongo-collection/_base.json +1 -0
- package/dist/registry/js-mongo-collection/account-security.json +1 -0
- package/dist/registry/js-mongo-collection/account-settings.json +1 -0
- package/dist/registry/js-mongo-collection/admin-admins.json +1 -0
- package/dist/registry/js-mongo-collection/admin-analytics.json +1 -0
- package/dist/registry/js-mongo-collection/admin-billing.json +1 -0
- package/dist/registry/js-mongo-collection/admin-content.json +1 -0
- package/dist/registry/js-mongo-collection/admin-logs.json +1 -0
- package/dist/registry/js-mongo-collection/admin-support.json +1 -0
- package/dist/registry/js-mongo-collection/admin-system.json +1 -0
- package/dist/registry/js-mongo-collection/admin-users.json +1 -0
- package/dist/registry/js-mongo-collection/admin.json +1 -0
- package/dist/registry/js-mongo-collection/auth.json +1 -0
- package/dist/registry/js-mongo-collection/auth@apple.json +1 -0
- package/dist/registry/js-mongo-collection/auth@google.json +1 -0
- package/dist/registry/js-mongo-collection/billing.json +1 -0
- package/dist/registry/js-mongo-collection/email-client.json +1 -0
- package/dist/registry/js-mongo-collection/email-verification.json +1 -0
- package/dist/registry/js-mongo-collection/files.json +1 -0
- package/dist/registry/js-mongo-collection/forgot-password.json +1 -0
- package/dist/registry/js-mongo-collection/notifications.json +1 -0
- package/dist/registry/js-mongo-collection/support.json +1 -0
- package/dist/registry/js-mongo-collection/user-profile.json +1 -0
- package/dist/registry/js-pg-model/account-security.json +1 -1
- package/dist/registry/js-pg-model/admin-users.json +1 -1
- package/dist/registry/js-pg-model/auth.json +1 -1
- package/dist/registry/js-pg-model/auth@apple.json +1 -1
- package/dist/registry/js-pg-model/auth@google.json +1 -1
- package/dist/registry/js-pg-model/email-verification.json +1 -1
- package/dist/registry/js-pg-model/forgot-password.json +1 -1
- package/dist/registry/js-pg-model/user-profile.json +1 -1
- package/dist/registry/js-pg-table/account-security.json +1 -1
- package/dist/registry/js-pg-table/admin-users.json +1 -1
- package/dist/registry/js-pg-table/auth.json +1 -1
- package/dist/registry/js-pg-table/auth@apple.json +1 -1
- package/dist/registry/js-pg-table/auth@google.json +1 -1
- package/dist/registry/js-pg-table/email-verification.json +1 -1
- package/dist/registry/js-pg-table/forgot-password.json +1 -1
- package/dist/registry/js-pg-table/user-profile.json +1 -1
- package/dist/registry/ts-mongo/account-security.json +1 -1
- package/dist/registry/ts-mongo/admin-users.json +1 -1
- package/dist/registry/ts-mongo/auth.json +1 -1
- package/dist/registry/ts-mongo/auth@apple.json +1 -1
- package/dist/registry/ts-mongo/auth@google.json +1 -1
- package/dist/registry/ts-mongo/email-verification.json +1 -1
- package/dist/registry/ts-mongo/forgot-password.json +1 -1
- package/dist/registry/ts-mongo/user-profile.json +1 -1
- package/dist/registry/ts-mongo-collection/_base.json +1 -0
- package/dist/registry/ts-mongo-collection/account-security.json +1 -0
- package/dist/registry/ts-mongo-collection/account-settings.json +1 -0
- package/dist/registry/ts-mongo-collection/admin-admins.json +1 -0
- package/dist/registry/ts-mongo-collection/admin-analytics.json +1 -0
- package/dist/registry/ts-mongo-collection/admin-billing.json +1 -0
- package/dist/registry/ts-mongo-collection/admin-content.json +1 -0
- package/dist/registry/ts-mongo-collection/admin-logs.json +1 -0
- package/dist/registry/ts-mongo-collection/admin-support.json +1 -0
- package/dist/registry/ts-mongo-collection/admin-system.json +1 -0
- package/dist/registry/ts-mongo-collection/admin-users.json +1 -0
- package/dist/registry/ts-mongo-collection/admin.json +1 -0
- package/dist/registry/ts-mongo-collection/auth.json +1 -0
- package/dist/registry/ts-mongo-collection/auth@apple.json +1 -0
- package/dist/registry/ts-mongo-collection/auth@google.json +1 -0
- package/dist/registry/ts-mongo-collection/billing.json +1 -0
- package/dist/registry/ts-mongo-collection/email-client.json +1 -0
- package/dist/registry/ts-mongo-collection/email-verification.json +1 -0
- package/dist/registry/ts-mongo-collection/files.json +1 -0
- package/dist/registry/ts-mongo-collection/forgot-password.json +1 -0
- package/dist/registry/ts-mongo-collection/notifications.json +1 -0
- package/dist/registry/ts-mongo-collection/support.json +1 -0
- package/dist/registry/ts-mongo-collection/user-profile.json +1 -0
- package/dist/registry/ts-pg-model/account-security.json +1 -1
- package/dist/registry/ts-pg-model/admin-users.json +1 -1
- package/dist/registry/ts-pg-model/auth.json +1 -1
- package/dist/registry/ts-pg-model/auth@apple.json +1 -1
- package/dist/registry/ts-pg-model/auth@google.json +1 -1
- package/dist/registry/ts-pg-model/email-verification.json +1 -1
- package/dist/registry/ts-pg-model/forgot-password.json +1 -1
- package/dist/registry/ts-pg-model/user-profile.json +1 -1
- package/dist/registry/ts-pg-table/account-security.json +1 -1
- package/dist/registry/ts-pg-table/admin-users.json +1 -1
- package/dist/registry/ts-pg-table/auth.json +1 -1
- package/dist/registry/ts-pg-table/auth@apple.json +1 -1
- package/dist/registry/ts-pg-table/auth@google.json +1 -1
- package/dist/registry/ts-pg-table/email-verification.json +1 -1
- package/dist/registry/ts-pg-table/forgot-password.json +1 -1
- package/dist/registry/ts-pg-table/user-profile.json +1 -1
- package/dist/tasks/index.cjs +4 -2
- package/dist/tasks/index.cjs.map +1 -1
- package/dist/tasks/index.d.cts +4 -2
- package/dist/tasks/index.d.ts +4 -2
- package/dist/tasks/index.js +3 -1
- package/dist/thread-runner.cjs +8 -0
- package/dist/thread-runner.cjs.map +1 -0
- package/dist/thread-runner.d.cts +3 -0
- package/dist/thread-runner.d.ts +3 -0
- package/dist/thread-runner.js +8 -0
- package/dist/thread-runner.js.map +1 -0
- package/dist/{types-BY-ObnZH.d.ts → types-Bnxvj3l0.d.cts} +14 -2
- package/dist/{types-BY-ObnZH.d.cts → types-Bnxvj3l0.d.ts} +14 -2
- package/package.json +1 -1
- package/dist/chunk-277BSYVH.js +0 -127
- package/dist/chunk-277BSYVH.js.map +0 -1
- package/dist/chunk-7YEX4MQV.cjs.map +0 -1
- package/dist/chunk-ANUSWEAP.cjs.map +0 -1
- package/dist/chunk-ATL4GYFU.js.map +0 -1
- package/dist/chunk-BBSZLGZW.js.map +0 -1
- package/dist/chunk-HBYSKULC.js.map +0 -1
- package/dist/chunk-HXV543HZ.js +0 -177
- package/dist/chunk-HXV543HZ.js.map +0 -1
- package/dist/chunk-LJNSJFOL.js +0 -38
- package/dist/chunk-LJNSJFOL.js.map +0 -1
- package/dist/chunk-QKQZF573.js.map +0 -1
- package/dist/chunk-QL6EWT4B.cjs.map +0 -1
- package/dist/chunk-RRQ2RK5M.js.map +0 -1
- package/dist/chunk-RTF7PHS2.cjs.map +0 -1
- package/dist/chunk-TI24L4XE.cjs.map +0 -1
- package/dist/chunk-TYR2GZZE.cjs.map +0 -1
- package/dist/chunk-UTM4PEVG.js.map +0 -1
- package/dist/chunk-VQSWSYK6.cjs +0 -177
- package/dist/chunk-VQSWSYK6.cjs.map +0 -1
- package/dist/chunk-X2US4RAM.cjs.map +0 -1
- package/dist/chunk-YL37D6KM.cjs +0 -127
- package/dist/chunk-YL37D6KM.cjs.map +0 -1
- package/dist/pgboss-backend-QKBXVJ6B.js +0 -14
- package/dist/pgboss-backend-TCHI7CHM.cjs +0 -14
- /package/dist/{chunk-UBQYQPBU.js.map → chunk-ATVD2HGC.js.map} +0 -0
- /package/dist/{chunk-RS4MXCPW.js.map → chunk-NI2BNGGV.js.map} +0 -0
- /package/dist/{pgboss-backend-QKBXVJ6B.js.map → pgboss-backend-FW42SBSM.js.map} +0 -0
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
2
|
parseRedisUrl
|
|
3
|
-
} from "./chunk-
|
|
4
|
-
import {
|
|
5
|
-
notInstalled
|
|
6
|
-
} from "./chunk-HXV543HZ.js";
|
|
3
|
+
} from "./chunk-ATVD2HGC.js";
|
|
7
4
|
import {
|
|
8
5
|
getLogger,
|
|
6
|
+
notInstalled,
|
|
9
7
|
setCurrentUser
|
|
10
|
-
} from "./chunk-
|
|
8
|
+
} from "./chunk-73XJUT2S.js";
|
|
11
9
|
|
|
12
10
|
// src/auth/index.ts
|
|
13
11
|
import { randomUUID as randomUUID2 } from "crypto";
|
|
@@ -43,6 +41,8 @@ function servePrimaryCache(maxEntries) {
|
|
|
43
41
|
return store.del(req.args[0]);
|
|
44
42
|
case "clear":
|
|
45
43
|
return store.clear(req.args[0]);
|
|
44
|
+
case "incr":
|
|
45
|
+
return store.incr(req.args[0], req.args[1]);
|
|
46
46
|
}
|
|
47
47
|
};
|
|
48
48
|
run().then(
|
|
@@ -91,6 +91,7 @@ async function connectPrimaryCache() {
|
|
|
91
91
|
},
|
|
92
92
|
del: async (keys) => await call("del", keys),
|
|
93
93
|
clear: async (prefix2) => await call("clear", prefix2),
|
|
94
|
+
incr: async (key, ttl) => await call("incr", key, ttl),
|
|
94
95
|
close: async () => {
|
|
95
96
|
process.off("message", onMessage);
|
|
96
97
|
for (const p of pending2.values()) clearTimeout(p.timer);
|
|
@@ -134,6 +135,21 @@ function memoryBackend(maxEntries) {
|
|
|
134
135
|
for (const k of [...store.keys()]) if (k.startsWith(prefix2) && store.delete(k)) n++;
|
|
135
136
|
return n;
|
|
136
137
|
},
|
|
138
|
+
// One event-loop turn, no awaits: atomic within this process. Under clustering this
|
|
139
|
+
// store lives in the primary, so it's atomic across workers too.
|
|
140
|
+
async incr(key, ttl) {
|
|
141
|
+
const hit = live(key);
|
|
142
|
+
const current = hit ? Number(hit.value) : 0;
|
|
143
|
+
if (!Number.isInteger(current)) throw new Error(`cache incr: "${key}" is not an integer`);
|
|
144
|
+
const expires = hit ? hit.expires : ttl ? Date.now() + ttl * 1e3 : 0;
|
|
145
|
+
store.delete(key);
|
|
146
|
+
store.set(key, { value: String(current + 1), expires });
|
|
147
|
+
while (store.size > maxEntries) store.delete(store.keys().next().value);
|
|
148
|
+
return {
|
|
149
|
+
value: current + 1,
|
|
150
|
+
ttlMs: expires === 0 ? null : Math.max(0, expires - Date.now())
|
|
151
|
+
};
|
|
152
|
+
},
|
|
137
153
|
async close() {
|
|
138
154
|
store.clear();
|
|
139
155
|
}
|
|
@@ -176,6 +192,19 @@ async function redisBackend(url, timeout) {
|
|
|
176
192
|
else await client.set(key, value);
|
|
177
193
|
},
|
|
178
194
|
del: (keys) => keys.length ? client.del(...keys) : Promise.resolve(0),
|
|
195
|
+
// INCR and the first EXPIRE in one script: a crash in between can't leave a counter
|
|
196
|
+
// that never expires.
|
|
197
|
+
async incr(key, ttl) {
|
|
198
|
+
const [value, pttl] = await client.eval(
|
|
199
|
+
`local n = redis.call('INCR', KEYS[1])
|
|
200
|
+
if n == 1 and tonumber(ARGV[1]) > 0 then redis.call('PEXPIRE', KEYS[1], ARGV[1]) end
|
|
201
|
+
return {n, redis.call('PTTL', KEYS[1])}`,
|
|
202
|
+
1,
|
|
203
|
+
key,
|
|
204
|
+
ttl ? Math.max(1, Math.ceil(ttl * 1e3)) : 0
|
|
205
|
+
);
|
|
206
|
+
return { value, ttlMs: pttl < 0 ? null : pttl };
|
|
207
|
+
},
|
|
179
208
|
async clear(prefix2) {
|
|
180
209
|
let n = 0;
|
|
181
210
|
let cursor = "0";
|
|
@@ -267,8 +296,15 @@ var cache = {
|
|
|
267
296
|
},
|
|
268
297
|
async clear(keyPrefix = "") {
|
|
269
298
|
return safely("clear", (b) => b.clear(prefix + keyPrefix), 0);
|
|
299
|
+
},
|
|
300
|
+
async incr(key, options) {
|
|
301
|
+
const r = await safely("incr", (b) => b.incr(prefix + key, options?.ttl), void 0);
|
|
302
|
+
return r?.value;
|
|
270
303
|
}
|
|
271
304
|
};
|
|
305
|
+
async function rawIncr(key, ttlSeconds) {
|
|
306
|
+
return requireBackend().incr(prefix + key, ttlSeconds);
|
|
307
|
+
}
|
|
272
308
|
async function rawGet(key) {
|
|
273
309
|
return requireBackend().get(prefix + key);
|
|
274
310
|
}
|
|
@@ -340,14 +376,16 @@ async function sign(payload) {
|
|
|
340
376
|
return new SignJWT({ ...payload, efc_iat: Date.now() }).setProtectedHeader({ alg: "HS256" }).setJti(randomUUID2()).setIssuedAt().setExpirationTime(expiresIn).sign(new TextEncoder().encode(secret));
|
|
341
377
|
}
|
|
342
378
|
async function issueToken(res, payload) {
|
|
343
|
-
const { cookieDomain } = getConfig();
|
|
379
|
+
const { cookieDomain, strategy } = getConfig();
|
|
344
380
|
const token = await sign(payload);
|
|
381
|
+
if (strategy !== "http-only") return token;
|
|
345
382
|
res.cookie("efc_token", token, {
|
|
346
383
|
httpOnly: true,
|
|
347
384
|
secure: process.env["NODE_ENV"] === "production",
|
|
348
385
|
sameSite: "strict",
|
|
349
386
|
...cookieDomain !== void 0 && { domain: cookieDomain }
|
|
350
387
|
});
|
|
388
|
+
return void 0;
|
|
351
389
|
}
|
|
352
390
|
function revokeToken(res) {
|
|
353
391
|
res.clearCookie("efc_token");
|
|
@@ -363,7 +401,9 @@ function tokenFrom(req) {
|
|
|
363
401
|
return typeof auth === "string" && auth.startsWith("Bearer ") ? auth.slice(7) : void 0;
|
|
364
402
|
}
|
|
365
403
|
async function verify(token) {
|
|
366
|
-
const { payload } = await jwtVerify(token, new TextEncoder().encode(getConfig().secret)
|
|
404
|
+
const { payload } = await jwtVerify(token, new TextEncoder().encode(getConfig().secret), {
|
|
405
|
+
algorithms: ["HS256"]
|
|
406
|
+
});
|
|
367
407
|
return payload;
|
|
368
408
|
}
|
|
369
409
|
var userIdOf = (payload) => {
|
|
@@ -475,8 +515,10 @@ var requireAuth = ((...args) => {
|
|
|
475
515
|
export {
|
|
476
516
|
servePrimaryCache,
|
|
477
517
|
configureCache,
|
|
518
|
+
isCacheConfigured,
|
|
478
519
|
closeCache,
|
|
479
520
|
cache,
|
|
521
|
+
rawIncr,
|
|
480
522
|
hashPassword,
|
|
481
523
|
verifyPassword,
|
|
482
524
|
passwordNeedsRehash,
|
|
@@ -488,4 +530,4 @@ export {
|
|
|
488
530
|
revokeAllSessions,
|
|
489
531
|
requireAuth
|
|
490
532
|
};
|
|
491
|
-
//# sourceMappingURL=chunk-
|
|
533
|
+
//# sourceMappingURL=chunk-7KC2H76D.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/auth/index.ts","../src/cache/index.ts","../src/cache/ipc.ts","../src/auth/password.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport type { NextFunction, Request, RequestHandler, Response } from 'express';\nimport { SignJWT, jwtVerify, type JWTPayload } from 'jose';\nimport type { AuthStrategy } from '../types.js';\nimport { setCurrentUser } from '../context.js';\nimport { isCacheConfigured, rawGet, rawSet, revocationFailureMode } from '../cache/index.js';\nimport { getLogger } from '../logger.js';\n\ninterface AuthConfig {\n secret: string;\n strategy: AuthStrategy;\n expiresIn: string;\n cookieDomain?: string | undefined;\n}\n\nlet _config: AuthConfig | null = null;\n\nexport function configureAuth(config: AuthConfig): void {\n _config = config;\n}\n\nfunction getConfig(): AuthConfig {\n if (!_config) throw new Error('[EFC] Auth not configured — pass jwtSecret to ignite()');\n return _config;\n}\n\n// Every token carries a unique `jti` (so one session can be revoked) and its issue\n// time in milliseconds, `efc_iat` (so \"revoke all sessions issued before now\" doesn't\n// also catch a token minted in the same second as the revocation).\nasync function sign(payload: Record<string, unknown>): Promise<string> {\n const { secret, expiresIn } = getConfig();\n return new SignJWT({ ...payload, efc_iat: Date.now() })\n .setProtectedHeader({ alg: 'HS256' })\n .setJti(randomUUID())\n .setIssuedAt()\n .setExpirationTime(expiresIn)\n .sign(new TextEncoder().encode(secret));\n}\n\n/**\n * Signs a JWT for `payload` and hands it to the client the configured way: `'http-only'`\n * sets the `efc_token` cookie and resolves `undefined`; `'bearer'` resolves the token for\n * the response body (no cookie). `res.json({ ...(token ? { token } : {}) })` works for both.\n */\nexport async function issueToken(\n res: Response,\n payload: Record<string, unknown>,\n): Promise<string | undefined> {\n const { cookieDomain, strategy } = getConfig();\n const token = await sign(payload);\n if (strategy !== 'http-only') return token;\n\n res.cookie('efc_token', token, {\n httpOnly: true,\n secure: process.env['NODE_ENV'] === 'production',\n sameSite: 'strict',\n ...(cookieDomain !== undefined && { domain: cookieDomain }),\n });\n return undefined;\n}\n\nexport function revokeToken(res: Response): void {\n res.clearCookie('efc_token');\n}\n\nexport async function signToken(payload: Record<string, unknown>): Promise<string> {\n return sign(payload);\n}\n\nfunction tokenFrom(req: Request): string | undefined {\n if (getConfig().strategy === 'http-only') {\n return (req as typeof req & { cookies?: Record<string, string> }).cookies?.['efc_token'];\n }\n const auth = req.headers['authorization'];\n return typeof auth === 'string' && auth.startsWith('Bearer ') ? auth.slice(7) : undefined;\n}\n\nasync function verify(token: string): Promise<JWTPayload> {\n // Only the algorithm EFC signs with — never whatever the token's header claims.\n const { payload } = await jwtVerify(token, new TextEncoder().encode(getConfig().secret), {\n algorithms: ['HS256'],\n });\n return payload;\n}\n\nconst userIdOf = (payload: JWTPayload): string | undefined => {\n const id = payload.sub ?? (payload as Record<string, unknown>)['id'];\n return id === undefined || id === null ? undefined : String(id);\n};\n\n// ── Session revocation (needs `cache` in ignite()) ───────────────────────────\n// Stateless JWTs can't be \"un-issued\", so revocation is a denylist in the cache:\n// one key per revoked token (`sess:jti:<jti>`, kept until that token would expire)\n// and one per user for \"everything issued before T\" (`sess:user:<id>`).\n\n/** Lifetime of a token signed now, in seconds — `jwtExpiresIn` like '15m', '7d'. */\nfunction tokenLifetimeSeconds(): number {\n const m =\n /^(\\d+(?:\\.\\d+)?)\\s*(s|sec|secs|seconds?|m|min|mins|minutes?|h|hr|hrs|hours?|d|days?|w|weeks?|y|yrs?|years?)?$/i.exec(\n getConfig().expiresIn.trim(),\n );\n if (!m) return 30 * 86_400;\n const n = Number(m[1]);\n const unit = (m[2] ?? 's')[0]!.toLowerCase();\n const factor = { s: 1, m: 60, h: 3600, d: 86_400, w: 604_800, y: 31_557_600 }[unit] ?? 1;\n return Math.ceil(n * factor);\n}\n\nlet lastRevocationError = 0;\n\nasync function isRevoked(payload: JWTPayload): Promise<boolean> {\n if (payload.jti && (await rawGet(`sess:jti:${payload.jti}`)) !== null) return true;\n const userId = userIdOf(payload);\n if (userId === undefined) return false;\n const cutoff = await rawGet(`sess:user:${userId}`);\n if (cutoff === null) return false;\n const issuedMs =\n typeof (payload as Record<string, unknown>)['efc_iat'] === 'number'\n ? ((payload as Record<string, unknown>)['efc_iat'] as number)\n : (payload.iat ?? 0) * 1000; // tokens minted before efc_iat existed\n return issuedMs < Number(cutoff);\n}\n\nfunction requireRevocationStore(): void {\n if (!isCacheConfigured()) {\n throw new Error(\n '[EFC] Session revocation needs a cache — pass cache: { backend: \"redis\" } to ignite()',\n );\n }\n}\n\n/**\n * Revokes the token the current request was authenticated with: `requireAuth` rejects\n * it from now until it would have expired anyway. Pass `res` to also clear the cookie\n * (http-only strategy). Throws if the cache is unreachable, so a failed logout is visible.\n */\nexport async function revokeSession(req: Request, res?: Response): Promise<void> {\n requireRevocationStore();\n const token = tokenFrom(req);\n if (res && getConfig().strategy === 'http-only') res.clearCookie('efc_token');\n if (!token) return;\n let payload: JWTPayload;\n try {\n payload = await verify(token);\n } catch {\n return; // already invalid or expired — nothing to revoke\n }\n if (!payload.jti) return;\n const ttl = payload.exp ? payload.exp - Math.floor(Date.now() / 1000) : tokenLifetimeSeconds();\n if (ttl > 0) await rawSet(`sess:jti:${payload.jti}`, '1', ttl);\n}\n\n/**\n * Revokes every token issued to `userId` (the JWT's `sub` or `id` claim) before now —\n * \"log out of all devices\", or after a password change. Tokens issued afterwards work.\n */\nexport async function revokeAllSessions(userId: string | number): Promise<void> {\n requireRevocationStore();\n await rawSet(`sess:user:${String(userId)}`, String(Date.now()), tokenLifetimeSeconds());\n}\n\nasync function authenticate(\n req: Request,\n res: Response,\n next: NextFunction,\n roles: string[],\n): Promise<void> {\n try {\n const token = tokenFrom(req);\n\n if (!token) {\n res.status(401).json({ error: 'Unauthorized' });\n return;\n }\n\n const payload = await verify(token);\n\n if (isCacheConfigured()) {\n let revoked = false;\n try {\n revoked = await isRevoked(payload);\n } catch (err) {\n const reject = revocationFailureMode() === 'reject';\n if (Date.now() - lastRevocationError > 30_000) {\n lastRevocationError = Date.now();\n getLogger().error(\n { err },\n `Session revocation check failed — ${reject ? 'rejecting with 503' : 'allowing'} authenticated requests`,\n );\n }\n // 503, not 401: the session isn't invalid, the check is unavailable — clients\n // shouldn't discard the token and force a re-login over a cache blip.\n if (reject) {\n res.status(503).json({ error: 'Service Unavailable', statusCode: 503 });\n return;\n }\n }\n if (revoked) {\n res.status(401).json({ error: 'Unauthorized' });\n return;\n }\n }\n\n if (roles.length > 0) {\n const role = (payload as Record<string, unknown>)['role'];\n if (typeof role !== 'string' || !roles.includes(role)) {\n res.status(403).json({ error: 'Forbidden' });\n return;\n }\n }\n\n (req as typeof req & { user: unknown }).user = payload;\n setCurrentUser(payload as Record<string, unknown>);\n next();\n } catch {\n res.status(401).json({ error: 'Unauthorized' });\n }\n}\n\n/**\n * Used bare (`middlewares = [requireAuth]`) it just verifies the JWT.\n * Called with role names (`middlewares = [requireAuth('admin')]`) it\n * returns a middleware that also enforces `payload.role` is one of them.\n */\nexport interface RequireAuth {\n (req: Request, res: Response, next: NextFunction): void;\n (...roles: string[]): RequestHandler;\n}\n\nexport const requireAuth: RequireAuth = ((...args: unknown[]) => {\n if (args.length > 0 && typeof args[0] === 'string') {\n const roles = args as string[];\n return (req: Request, res: Response, next: NextFunction) => {\n void authenticate(req, res, next, roles);\n };\n }\n const [req, res, next] = args as [Request, Response, NextFunction];\n void authenticate(req, res, next, []);\n}) as RequireAuth;\n\n// Reads the JWT payload requireAuth attached for the in-flight request, from\n// anywhere — not just where `req` is in scope. Returns undefined outside a\n// request, or on a request that never ran through requireAuth.\nexport { getCurrentUser } from '../context.js';\nexport { hashPassword, verifyPassword, passwordNeedsRehash } from './password.js';\n","import cluster from 'node:cluster';\nimport type { Redis as RedisClient, RedisOptions } from 'ioredis';\nimport type { CacheConfig } from '../types.js';\nimport { getLogger } from '../logger.js';\nimport { notInstalled } from '../db/postgres.js';\nimport { parseRedisUrl } from '../tasks/bullmq-backend.js';\nimport { connectPrimaryCache } from './ipc.js';\n\n// A small key/value cache with two backends:\n// - redis: shared by every worker and instance — what production wants.\n// - memory: in-process; under clustering the primary holds it and workers reach it\n// over IPC, so it's shared by all workers on the machine (not across machines).\n// Values are JSON-serialised. A Redis outage degrades to cache misses instead of\n// failing the request — a cache must never be the thing that takes the API down.\n\nexport interface Backend {\n get(key: string): Promise<string | null>;\n set(key: string, value: string, ttlSeconds: number | undefined): Promise<void>;\n del(keys: string[]): Promise<number>;\n clear(prefix: string): Promise<number>;\n /**\n * Atomically adds 1 to an integer value (a missing key counts as 0). The TTL is set only\n * when the key is created, so it describes a fixed window. `ttlMs` is what's left of it\n * (null: no expiry).\n */\n incr(\n key: string,\n ttlSeconds: number | undefined,\n ): Promise<{ value: number; ttlMs: number | null }>;\n close(): Promise<void>;\n}\n\nexport function memoryBackend(maxEntries: number): Backend {\n const store = new Map<string, { value: string; expires: number }>();\n const live = (key: string) => {\n const hit = store.get(key);\n if (!hit) return undefined;\n if (hit.expires !== 0 && hit.expires <= Date.now()) {\n store.delete(key);\n return undefined;\n }\n return hit;\n };\n return {\n async get(key) {\n const hit = live(key);\n if (!hit) return null;\n // Re-insert so Map order tracks recency (LRU eviction drops the oldest).\n store.delete(key);\n store.set(key, hit);\n return hit.value;\n },\n async set(key, value, ttl) {\n store.delete(key);\n store.set(key, { value, expires: ttl ? Date.now() + ttl * 1000 : 0 });\n while (store.size > maxEntries) store.delete(store.keys().next().value!);\n },\n async del(keys) {\n let n = 0;\n for (const k of keys) if (live(k) && store.delete(k)) n++;\n return n;\n },\n async clear(prefix) {\n let n = 0;\n for (const k of [...store.keys()]) if (k.startsWith(prefix) && store.delete(k)) n++;\n return n;\n },\n // One event-loop turn, no awaits: atomic within this process. Under clustering this\n // store lives in the primary, so it's atomic across workers too.\n async incr(key, ttl) {\n const hit = live(key);\n const current = hit ? Number(hit.value) : 0;\n if (!Number.isInteger(current)) throw new Error(`cache incr: \"${key}\" is not an integer`);\n const expires = hit ? hit.expires : ttl ? Date.now() + ttl * 1000 : 0;\n store.delete(key);\n store.set(key, { value: String(current + 1), expires });\n while (store.size > maxEntries) store.delete(store.keys().next().value!);\n return {\n value: current + 1,\n ttlMs: expires === 0 ? null : Math.max(0, expires - Date.now()),\n };\n },\n async close() {\n store.clear();\n },\n };\n}\n\nasync function redisBackend(url: string, timeout: number): Promise<Backend> {\n let Redis: new (opts: RedisOptions) => RedisClient;\n try {\n const mod = (await import('ioredis')) as unknown as {\n Redis?: typeof Redis;\n default?: typeof Redis;\n };\n Redis = (mod.Redis ?? mod.default)!;\n } catch (err) {\n throw notInstalled(err, 'ioredis', 'npm install ioredis');\n }\n const client = new Redis({\n ...parseRedisUrl(url),\n // Fail fast instead of queueing commands while disconnected; callers treat\n // a rejected command as a miss.\n enableOfflineQueue: false,\n maxRetriesPerRequest: 1,\n commandTimeout: timeout,\n });\n let lastWarn = 0;\n client.on('error', (err: Error) => {\n // Reconnect attempts emit an error each time — log at most every 30 s.\n if (Date.now() - lastWarn > 30_000) {\n lastWarn = Date.now();\n getLogger().warn(`Cache Redis unavailable: ${err.message} (serving cache misses)`);\n }\n });\n\n // Wait for the first connection so writes made right after boot aren't dropped (the\n // offline queue is off), but never longer than a few timeouts: an unreachable Redis\n // must not block startup — the cache just serves misses until it comes back.\n await new Promise<void>((resolve) => {\n const timer = setTimeout(resolve, Math.max(2000, timeout * 2));\n client.once('ready', () => {\n clearTimeout(timer);\n resolve();\n });\n });\n return {\n get: (key) => client.get(key),\n async set(key, value, ttl) {\n if (ttl) await client.set(key, value, 'EX', Math.max(1, Math.ceil(ttl)));\n else await client.set(key, value);\n },\n del: (keys) => (keys.length ? client.del(...keys) : Promise.resolve(0)),\n // INCR and the first EXPIRE in one script: a crash in between can't leave a counter\n // that never expires.\n async incr(key, ttl) {\n const [value, pttl] = (await client.eval(\n `local n = redis.call('INCR', KEYS[1])\n if n == 1 and tonumber(ARGV[1]) > 0 then redis.call('PEXPIRE', KEYS[1], ARGV[1]) end\n return {n, redis.call('PTTL', KEYS[1])}`,\n 1,\n key,\n ttl ? Math.max(1, Math.ceil(ttl * 1000)) : 0,\n )) as [number, number];\n return { value, ttlMs: pttl < 0 ? null : pttl };\n },\n async clear(prefix) {\n let n = 0;\n let cursor = '0';\n const match = prefix.replace(/[*?[\\]\\\\]/g, '\\\\$&') + '*';\n do {\n const [next, keys] = await client.scan(cursor, 'MATCH', match, 'COUNT', 500);\n cursor = next;\n if (keys.length) n += await client.unlink(...keys);\n } while (cursor !== '0');\n return n;\n },\n async close() {\n await client.quit().catch(() => client.disconnect());\n },\n };\n}\n\nlet backend: Backend | null = null;\nlet prefix = 'efc:';\nlet revocationFailure: 'reject' | 'allow' = 'reject';\n\n/** How requireAuth should treat a failed revocation check — see CacheConfig. */\nexport function revocationFailureMode(): 'reject' | 'allow' {\n return revocationFailure;\n}\nconst pending = new Map<string, Promise<unknown>>();\n\nexport async function configureCache(config: CacheConfig): Promise<void> {\n await closeCache();\n prefix = config.prefix ?? 'efc:';\n revocationFailure = config.onRevocationCheckError ?? 'reject';\n if (config.backend === 'redis') {\n backend = await redisBackend(config.url ?? 'redis://localhost:6379', config.timeout ?? 1000);\n } else if (cluster.isWorker) {\n // Cluster workers share the primary's store over IPC (see cache/ipc.ts).\n backend = (await connectPrimaryCache()) ?? memoryBackend(config.maxEntries ?? 10_000);\n } else {\n backend = memoryBackend(config.maxEntries ?? 10_000);\n }\n}\n\nexport function isCacheConfigured(): boolean {\n return backend !== null;\n}\n\nexport async function closeCache(): Promise<void> {\n const b = backend;\n backend = null;\n pending.clear();\n await b?.close();\n}\n\nfunction requireBackend(): Backend {\n if (!backend) throw new Error('[EFC] Cache not configured — pass cache: { backend } to ignite()');\n return backend;\n}\n\n// Backend errors (Redis down/slow) degrade to \"no cache\" rather than failing the caller.\nasync function safely<T>(op: string, fn: (b: Backend) => Promise<T>, fallback: T): Promise<T> {\n const b = requireBackend();\n try {\n return await fn(b);\n } catch (err) {\n getLogger().debug({ err }, `cache ${op} failed`);\n return fallback;\n }\n}\n\nexport interface CacheSetOptions {\n /** Seconds until the entry expires. Omit for no expiry. */\n ttl?: number;\n}\n\nexport interface Cache {\n /** The cached value, or `undefined` on a miss (or when the backend is unreachable). */\n get<T = unknown>(key: string): Promise<T | undefined>;\n set(key: string, value: unknown, options?: CacheSetOptions): Promise<void>;\n has(key: string): Promise<boolean>;\n /** Deletes keys; returns how many existed. */\n del(...keys: string[]): Promise<number>;\n /**\n * Returns the cached value, or runs `fn`, caches its result and returns it.\n * Concurrent calls for the same key in one process share a single `fn` run.\n * `undefined` results are not cached.\n */\n wrap<T>(key: string, options: CacheSetOptions | number, fn: () => Promise<T>): Promise<T>;\n /** Deletes every key starting with `keyPrefix` (all of this app's keys when omitted). */\n clear(keyPrefix?: string): Promise<number>;\n /**\n * Atomically adds 1 and returns the new count — across workers and instances (Redis) or\n * this machine's workers (memory). `ttl` applies when the key is created (a fixed\n * window). Resolves `undefined` when the backend is unreachable: a count can't be made up.\n */\n incr(key: string, options?: CacheSetOptions): Promise<number | undefined>;\n}\n\nexport const cache: Cache = {\n async get<T>(key: string) {\n const raw = await safely('get', (b) => b.get(prefix + key), null);\n return raw === null ? undefined : (JSON.parse(raw) as T);\n },\n async set(key, value, options) {\n if (value === undefined) return;\n await safely('set', (b) => b.set(prefix + key, JSON.stringify(value), options?.ttl), undefined);\n },\n async has(key) {\n return (await safely('get', (b) => b.get(prefix + key), null)) !== null;\n },\n async del(...keys) {\n return safely('del', (b) => b.del(keys.map((k) => prefix + k)), 0);\n },\n async wrap<T>(key: string, options: CacheSetOptions | number, fn: () => Promise<T>) {\n const hit = await cache.get<T>(key);\n if (hit !== undefined) return hit;\n const inflight = pending.get(key) as Promise<T> | undefined;\n if (inflight) return inflight;\n const run = (async () => {\n try {\n const value = await fn();\n await cache.set(key, value, typeof options === 'number' ? { ttl: options } : options);\n return value;\n } finally {\n pending.delete(key);\n }\n })();\n pending.set(key, run);\n return run;\n },\n async clear(keyPrefix = '') {\n return safely('clear', (b) => b.clear(prefix + keyPrefix), 0);\n },\n async incr(key, options) {\n const r = await safely('incr', (b) => b.incr(prefix + key, options?.ttl), undefined);\n return r?.value;\n },\n};\n\n/** For rateLimit: the count and the window's remaining time; throws when the backend is down. */\nexport async function rawIncr(\n key: string,\n ttlSeconds: number,\n): Promise<{ value: number; ttlMs: number | null }> {\n return requireBackend().incr(prefix + key, ttlSeconds);\n}\n\n/** For auth's revocation checks, which must distinguish \"absent\" from \"backend down\". */\nexport async function rawGet(key: string): Promise<string | null> {\n return requireBackend().get(prefix + key);\n}\n\nexport async function rawSet(key: string, value: string, ttlSeconds: number): Promise<void> {\n await requireBackend().set(prefix + key, value, ttlSeconds);\n}\n","import cluster, { type Worker } from 'node:cluster';\nimport { randomUUID } from 'node:crypto';\nimport type { Backend } from './index.js';\nimport { memoryBackend } from './index.js';\nimport { getLogger } from '../logger.js';\n\n// The memory cache under clustering: the primary owns the only store and answers\n// workers' requests over the cluster IPC channel, so every worker sees the same\n// entries and the same revoked sessions. Message shape is tagged to avoid clashing\n// with application IPC.\n\nconst TAG = '__efcCache';\nconst TIMEOUT_MS = 2000;\n\ntype Op = 'ping' | 'get' | 'set' | 'del' | 'clear' | 'incr';\ninterface Request {\n [TAG]: true;\n id: string;\n op: Op;\n args: unknown[];\n}\ninterface Response {\n [TAG]: true;\n id: string;\n ok: boolean;\n result?: unknown;\n error?: string;\n}\n\nconst isTagged = (msg: unknown): msg is Record<string, unknown> =>\n msg !== null && typeof msg === 'object' && (msg as Record<string, unknown>)[TAG] === true;\n\n/** Primary side: hold the store and serve every worker. Called before workers fork. */\nexport function servePrimaryCache(maxEntries: number): void {\n const store = memoryBackend(maxEntries);\n cluster.on('message', (worker: Worker, msg: unknown) => {\n if (!isTagged(msg)) return;\n const req = msg as unknown as Request;\n const run = async (): Promise<unknown> => {\n switch (req.op) {\n case 'ping':\n return 'pong';\n case 'get':\n return store.get(req.args[0] as string);\n case 'set':\n return store.set(\n req.args[0] as string,\n req.args[1] as string,\n req.args[2] as number | undefined,\n );\n case 'del':\n return store.del(req.args[0] as string[]);\n case 'clear':\n return store.clear(req.args[0] as string);\n case 'incr':\n return store.incr(req.args[0] as string, req.args[1] as number | undefined);\n }\n };\n run().then(\n (result) =>\n worker.isConnected() &&\n worker.send({ [TAG]: true, id: req.id, ok: true, result } satisfies Response),\n (err: unknown) =>\n worker.isConnected() &&\n worker.send({ [TAG]: true, id: req.id, ok: false, error: String(err) } satisfies Response),\n );\n });\n}\n\n/**\n * Worker side: a Backend that forwards to the primary. Resolves to null — so the caller\n * can fall back to a local store — when no EFC primary answers (e.g. the app runs its\n * own cluster primary instead of ignite()'s).\n */\nexport async function connectPrimaryCache(): Promise<Backend | null> {\n if (!process.send) return null;\n const pending = new Map<\n string,\n { resolve: (v: unknown) => void; reject: (e: Error) => void; timer: NodeJS.Timeout }\n >();\n const onMessage = (msg: unknown) => {\n if (!isTagged(msg)) return;\n const res = msg as unknown as Response;\n const p = pending.get(res.id);\n if (!p) return;\n pending.delete(res.id);\n clearTimeout(p.timer);\n if (res.ok) p.resolve(res.result);\n else p.reject(new Error(res.error));\n };\n process.on('message', onMessage);\n\n const call = (op: Op, ...args: unknown[]) =>\n new Promise<unknown>((resolve, reject) => {\n const id = randomUUID();\n const timer = setTimeout(() => {\n pending.delete(id);\n reject(new Error(`[EFC] cache IPC \"${op}\" timed out`));\n }, TIMEOUT_MS);\n timer.unref();\n pending.set(id, { resolve, reject, timer });\n process.send!({ [TAG]: true, id, op, args } satisfies Request);\n });\n\n try {\n await call('ping');\n } catch {\n process.off('message', onMessage);\n getLogger().warn(\n 'cache backend \"memory\": no EFC cluster primary answered — using a per-worker store (entries and revoked sessions are not shared)',\n );\n return null;\n }\n\n return {\n get: async (key) => (await call('get', key)) as string | null,\n set: async (key, value, ttl) => {\n await call('set', key, value, ttl);\n },\n del: async (keys) => (await call('del', keys)) as number,\n clear: async (prefix) => (await call('clear', prefix)) as number,\n incr: async (key, ttl) =>\n (await call('incr', key, ttl)) as { value: number; ttlMs: number | null },\n close: async () => {\n process.off('message', onMessage);\n for (const p of pending.values()) clearTimeout(p.timer);\n pending.clear();\n },\n };\n}\n","import { randomBytes, scrypt, timingSafeEqual, type ScryptOptions } from 'node:crypto';\nimport { getLogger } from '../logger.js';\n\n// Password hashing on node:crypto's scrypt — no native addon, no extra dependency.\n// Stored format: `scrypt$<N>$<r>$<p>$<salt b64>$<key b64>`. The cost parameters travel\n// with each hash, so raising them later doesn't invalidate passwords already stored.\n// N=2^15, r=8, p=1: 32 MiB and ~100–250 ms per hash — above bcrypt cost 10 (what EFC used before)\n// without making each login hold a libuv thread for most of a second.\nconst N = 2 ** 15;\nconst R = 8;\nconst P = 1;\nconst KEY_LEN = 64;\nconst SALT_LEN = 16;\n\nfunction derive(\n password: string,\n salt: Buffer,\n n: number,\n r: number,\n p: number,\n keyLen: number,\n): Promise<Buffer> {\n // scrypt needs 128 * N * r bytes; Node's default maxmem (32 MiB) is exactly that at our defaults.\n const options: ScryptOptions = { N: n, r, p, maxmem: 256 * n * r };\n return new Promise((resolve, reject) => {\n scrypt(password.normalize('NFKC'), salt, keyLen, options, (err, key) =>\n err ? reject(err) : resolve(key),\n );\n });\n}\n\n/** Hashes a password with scrypt and a random salt. Store the returned string as-is. */\nexport async function hashPassword(password: string): Promise<string> {\n if (typeof password !== 'string' || password.length === 0) {\n throw new TypeError('[EFC] hashPassword: password must be a non-empty string');\n }\n const salt = randomBytes(SALT_LEN);\n const key = await derive(password, salt, N, R, P, KEY_LEN);\n return `scrypt$${N}$${R}$${P}$${salt.toString('base64')}$${key.toString('base64')}`;\n}\n\n/**\n * Checks a password against a hash from `hashPassword`. Returns false for a wrong password or any\n * other format — including bcrypt hashes (`$2a$`/`$2b$`/`$2y$`) from apps scaffolded before 0.9.2,\n * which EFC deliberately can't verify: those accounts reset their password.\n */\nexport async function verifyPassword(password: string, hash: string): Promise<boolean> {\n if (typeof password !== 'string' || typeof hash !== 'string') return false;\n if (/^\\$2[aby]\\$/.test(hash)) {\n getLogger().warn(\n '[EFC] verifyPassword: bcrypt hash found — not supported since 0.9.2. ' +\n 'This account must reset its password (the reset stores a hashPassword() hash).',\n );\n return false;\n }\n\n const parts = hash.split('$');\n if (parts.length !== 6 || parts[0] !== 'scrypt') return false;\n const [n, r, p] = parts.slice(1, 4).map(Number) as [number, number, number];\n if (![n, r, p].every((v) => Number.isInteger(v) && v > 0) || (n & (n - 1)) !== 0) return false;\n // Refuse cost parameters far above ours — a planted hash shouldn't be able to pin a worker.\n if (n > 2 ** 20 || r > 32 || p > 16) return false;\n const salt = Buffer.from(parts[4]!, 'base64');\n const expected = Buffer.from(parts[5]!, 'base64');\n if (salt.length === 0 || expected.length === 0) return false;\n\n const actual = await derive(password, salt, n, r, p, expected.length);\n return timingSafeEqual(actual, expected);\n}\n\n/** True when a stored hash should be replaced with `hashPassword()` (e.g. after a successful login). */\nexport function passwordNeedsRehash(hash: string): boolean {\n return !hash.startsWith(`scrypt$${N}$${R}$${P}$`);\n}\n"],"mappings":"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","names":["randomUUID","cluster","pending","prefix","prefix","cluster","randomUUID","req","res","next"]}
|
|
@@ -1,13 +1,14 @@
|
|
|
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 _chunkWBLUGOAGcjs = require('./chunk-WBLUGOAG.cjs');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkGBI77W5Tcjs = require('./chunk-GBI77W5T.cjs');
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
|
|
11
|
+
var _chunkDUADUR6Rcjs = require('./chunk-DUADUR6R.cjs');
|
|
11
12
|
|
|
12
13
|
// src/tasks/pgboss-backend.ts
|
|
13
14
|
var BOX = "__efcValue";
|
|
@@ -40,11 +41,15 @@ async function initPgBoss(opts) {
|
|
|
40
41
|
connectionString: opts.connectionString,
|
|
41
42
|
...opts.schema !== void 0 && { schema: opts.schema }
|
|
42
43
|
});
|
|
43
|
-
boss.on("error", (err) =>
|
|
44
|
-
|
|
44
|
+
boss.on("error", (err) => _chunkDUADUR6Rcjs.getLogger.call(void 0, ).error({ err }, "pg-boss error"));
|
|
45
|
+
try {
|
|
46
|
+
await boss.start();
|
|
47
|
+
} catch (err) {
|
|
48
|
+
throw _chunkDUADUR6Rcjs.explainPostgresError.call(void 0, err, opts.connectionString);
|
|
49
|
+
}
|
|
45
50
|
const queueFor = (name) => `${opts.queue}.${name}`;
|
|
46
51
|
const wantedSchedules = /* @__PURE__ */ new Set();
|
|
47
|
-
for (const def of
|
|
52
|
+
for (const def of _chunkGBI77W5Tcjs.taskRegistry.values()) {
|
|
48
53
|
const queue = queueFor(def.name);
|
|
49
54
|
await boss.createQueue(queue, retryOptions(def));
|
|
50
55
|
await boss.work(
|
|
@@ -54,11 +59,11 @@ async function initPgBoss(opts) {
|
|
|
54
59
|
for (const job of jobs) {
|
|
55
60
|
const payload = unbox(job.data);
|
|
56
61
|
try {
|
|
57
|
-
if (def.options.thread && def.filePath) await
|
|
62
|
+
if (def.options.thread && def.filePath) await _chunkWBLUGOAGcjs.runInThread.call(void 0, def.filePath, payload);
|
|
58
63
|
else await def.handler(payload);
|
|
59
|
-
|
|
64
|
+
_chunkDUADUR6Rcjs.getLogger.call(void 0, ).info({ task: def.name, jobId: job.id }, `Task ${def.name} completed`);
|
|
60
65
|
} catch (err) {
|
|
61
|
-
|
|
66
|
+
_chunkDUADUR6Rcjs.getLogger.call(void 0, ).error(
|
|
62
67
|
{ task: def.name, jobId: job.id, attempt: job.retryCount + 1, err },
|
|
63
68
|
`Task ${def.name} failed`
|
|
64
69
|
);
|
|
@@ -85,9 +90,9 @@ async function initPgBoss(opts) {
|
|
|
85
90
|
await boss.unschedule(s.name);
|
|
86
91
|
}
|
|
87
92
|
}
|
|
88
|
-
if (wantedSchedules.size > 0)
|
|
89
|
-
|
|
90
|
-
const def =
|
|
93
|
+
if (wantedSchedules.size > 0) _chunkDUADUR6Rcjs.getLogger.call(void 0, ).info(`Scheduled ${wantedSchedules.size} cron task(s)`);
|
|
94
|
+
_chunkGBI77W5Tcjs.setEnqueueImpl.call(void 0, async (name, payload) => {
|
|
95
|
+
const def = _chunkGBI77W5Tcjs.taskRegistry.get(name);
|
|
91
96
|
if (!def) {
|
|
92
97
|
throw new Error(
|
|
93
98
|
`[EFC] Cannot enqueue unknown task: "${name}". Is the task file in tasksDir?`
|
|
@@ -118,7 +123,7 @@ async function initPgBoss(opts) {
|
|
|
118
123
|
closeImpl = async () => {
|
|
119
124
|
await boss.stop({ graceful: true, timeout: 1e4 });
|
|
120
125
|
};
|
|
121
|
-
|
|
126
|
+
_chunkDUADUR6Rcjs.getLogger.call(void 0, ).info("pg-boss backend initialised");
|
|
122
127
|
}
|
|
123
128
|
async function pgBossAdmin(connectionString, queue = "efc", schema = "pgboss") {
|
|
124
129
|
const PgBoss = await loadPgBoss();
|
|
@@ -193,4 +198,4 @@ async function pgBossAdmin(connectionString, queue = "efc", schema = "pgboss") {
|
|
|
193
198
|
|
|
194
199
|
|
|
195
200
|
exports.closePgBoss = closePgBoss; exports.initPgBoss = initPgBoss; exports.pgBossAdmin = pgBossAdmin;
|
|
196
|
-
//# sourceMappingURL=chunk-
|
|
201
|
+
//# sourceMappingURL=chunk-7KO4DJRJ.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-7KO4DJRJ.cjs","../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-7KO4DJRJ.cjs","sourcesContent":[null,"import 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 connectionString: string;\n concurrency: number;\n enqueueTimeout: number;\n queue: string;\n schema?: string;\n}\n\n// pg-boss payloads must be objects; other values are boxed so any enqueue() payload works.\nconst BOX = '__efcValue';\nconst box = (payload: unknown): object =>\n payload !== null && typeof payload === 'object' && !Array.isArray(payload)\n ? (payload as object)\n : { [BOX]: payload };\nconst unbox = (data: unknown): unknown =>\n data !== null && typeof data === 'object' && BOX in data\n ? (data as Record<string, unknown>)[BOX]\n : data;\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 ...(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) await runInThread(def.filePath, payload);\n else await 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 await Promise.race([boss.send(queueFor(name), box(payload), retryOptions(def)), 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 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 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(\n (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 },\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"]}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
2
|
runInThread
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-R52CUEGT.js";
|
|
4
4
|
import {
|
|
5
5
|
setEnqueueImpl,
|
|
6
6
|
taskRegistry
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-RAB44UGX.js";
|
|
8
8
|
import {
|
|
9
9
|
getLogger
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-73XJUT2S.js";
|
|
11
11
|
|
|
12
12
|
// src/tasks/bullmq-backend.ts
|
|
13
13
|
var closeImpl = null;
|
|
@@ -151,4 +151,4 @@ export {
|
|
|
151
151
|
initBullMQ,
|
|
152
152
|
parseRedisUrl
|
|
153
153
|
};
|
|
154
|
-
//# sourceMappingURL=chunk-
|
|
154
|
+
//# sourceMappingURL=chunk-ATVD2HGC.js.map
|
|
@@ -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 _chunkDUADUR6Rcjs = require('./chunk-DUADUR6R.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
|
+
_chunkDUADUR6Rcjs.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-DCJOWFVD.cjs.map
|
|
@@ -1 +1 @@
|
|
|
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":"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","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
|
+
{"version":3,"sources":["/home/runner/work/express-file-cluster/express-file-cluster/packages/core/dist/chunk-DCJOWFVD.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-DCJOWFVD.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"]}
|