express-file-cluster 0.11.0 → 0.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/index.cjs +8 -7
- package/dist/auth/index.cjs.map +1 -1
- package/dist/auth/index.d.cts +1 -1
- package/dist/auth/index.d.ts +1 -1
- package/dist/auth/index.js +7 -5
- package/dist/{chunk-JBOMTZT5.js → chunk-3JQWQF2M.js} +3 -3
- package/dist/{chunk-WHBSVYUY.cjs → chunk-4FQP6QX3.cjs} +3 -3
- package/dist/{chunk-WHBSVYUY.cjs.map → chunk-4FQP6QX3.cjs.map} +1 -1
- package/dist/chunk-546TNO2V.js +226 -0
- package/dist/chunk-546TNO2V.js.map +1 -0
- package/dist/{chunk-EJDZZ4KX.js → chunk-74R37C4I.js} +48 -21
- package/dist/chunk-74R37C4I.js.map +1 -0
- package/dist/{chunk-H2PVWCWC.cjs → chunk-A2QGDWCG.cjs} +15 -8
- package/dist/chunk-A2QGDWCG.cjs.map +1 -0
- package/dist/{chunk-O2E7H2XA.js → chunk-BCSJOPYH.js} +2 -2
- package/dist/{chunk-DGYPIIJE.cjs → chunk-BJR42CN3.cjs} +89 -62
- package/dist/chunk-BJR42CN3.cjs.map +1 -0
- package/dist/{chunk-OM2XJJWX.js → chunk-EBJELA7T.js} +30 -25
- package/dist/chunk-EBJELA7T.js.map +1 -0
- package/dist/{chunk-IEF6AEK3.cjs → chunk-H6MHRHUP.cjs} +104 -50
- package/dist/chunk-H6MHRHUP.cjs.map +1 -0
- package/dist/{chunk-6WTMRZS7.cjs → chunk-IG3V2IOK.cjs} +57 -30
- package/dist/chunk-IG3V2IOK.cjs.map +1 -0
- package/dist/chunk-JAPZYQVJ.cjs +143 -0
- package/dist/chunk-JAPZYQVJ.cjs.map +1 -0
- package/dist/{chunk-QSIP7YLW.cjs → chunk-JHCXIYJH.cjs} +25 -48
- package/dist/chunk-JHCXIYJH.cjs.map +1 -0
- package/dist/{chunk-GWMW6XY7.cjs → chunk-JVB5NLEM.cjs} +15 -13
- package/dist/chunk-JVB5NLEM.cjs.map +1 -0
- package/dist/{chunk-LECHRAU3.js → chunk-LIAGVWFQ.js} +83 -56
- package/dist/chunk-LIAGVWFQ.js.map +1 -0
- package/dist/chunk-PUM5ZDAH.js +140 -0
- package/dist/chunk-PUM5ZDAH.js.map +1 -0
- package/dist/{chunk-CGY7JU4Y.cjs → chunk-PUYBKDYD.cjs} +11 -2
- package/dist/chunk-PUYBKDYD.cjs.map +1 -0
- package/dist/{chunk-336IU55W.js → chunk-QLM3JEER.js} +5 -3
- package/dist/{chunk-336IU55W.js.map → chunk-QLM3JEER.js.map} +1 -1
- package/dist/{chunk-SOU3PBJC.cjs → chunk-SV4C4HWP.cjs} +89 -89
- package/dist/{chunk-SOU3PBJC.cjs.map → chunk-SV4C4HWP.cjs.map} +1 -1
- package/dist/{chunk-2IDRC7RK.js → chunk-UJ2ISRLP.js} +11 -34
- package/dist/chunk-UJ2ISRLP.js.map +1 -0
- package/dist/chunk-URKE3OXN.cjs +226 -0
- package/dist/chunk-URKE3OXN.cjs.map +1 -0
- package/dist/{chunk-DTMDJGRW.cjs → chunk-VLGN3XUM.cjs} +40 -35
- package/dist/chunk-VLGN3XUM.cjs.map +1 -0
- package/dist/{chunk-R6GPQZLI.js → chunk-X2B7WBKH.js} +88 -34
- package/dist/chunk-X2B7WBKH.js.map +1 -0
- package/dist/chunk-Y7I2633P.js +12 -0
- package/dist/chunk-Y7I2633P.js.map +1 -0
- package/dist/{chunk-B6MB6HEG.js → chunk-ZBQUYFI3.js} +14 -7
- package/dist/chunk-ZBQUYFI3.js.map +1 -0
- package/dist/cli/db-runner.cjs +26 -25
- package/dist/cli/db-runner.cjs.map +1 -1
- package/dist/cli/db-runner.js +5 -3
- package/dist/cli/db-runner.js.map +1 -1
- package/dist/cli/index.cjs +16 -15
- package/dist/cli/index.cjs.map +1 -1
- package/dist/cli/index.js +9 -7
- package/dist/cli/index.js.map +1 -1
- package/dist/docs/api-reference/auth.md +2 -0
- package/dist/docs/api-reference/ignite.md +2 -0
- package/dist/docs/api-reference/tasks.md +5 -1
- package/dist/docs/api-reference/testing.md +2 -0
- package/dist/docs/api-reference/tracing.md +18 -0
- package/dist/docs/cli/add.md +1 -1
- package/dist/docs/core-concepts/background-tasks.md +5 -1
- package/dist/docs/core-concepts/file-based-routing.md +2 -0
- package/dist/docs/core-concepts/middleware.md +2 -0
- package/dist/docs/guides/caching.md +12 -0
- package/dist/docs/guides/error-handling.md +2 -0
- package/dist/docs/guides/feature-matrix.md +7 -0
- package/dist/docs/guides/logging.md +2 -0
- package/dist/docs/guides/tracing.md +64 -0
- package/dist/docs/index.md +2 -1
- package/dist/docs/skills/SKILL.md +5 -3
- package/dist/docs/skills/api-surface.md +8 -0
- package/dist/docs/skills/auth-internals.md +4 -2
- package/dist/docs/skills/pre-flight.md +4 -0
- package/dist/docs/skills/routing-rules.md +2 -0
- package/dist/docs/skills/tasks-internals.md +10 -2
- package/dist/docs/skills/what-not-to-invent.md +2 -0
- package/dist/index.cjs +163 -70
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +5 -14
- package/dist/index.d.ts +5 -14
- package/dist/index.js +120 -26
- package/dist/index.js.map +1 -1
- package/dist/pgboss-backend-5DXF4G22.js +16 -0
- package/dist/pgboss-backend-KRTFHRNZ.cjs +16 -0
- package/dist/pgboss-backend-KRTFHRNZ.cjs.map +1 -0
- package/dist/registry/index.json +1 -1
- package/dist/tasks/index.cjs +3 -3
- package/dist/tasks/index.d.cts +2 -2
- package/dist/tasks/index.d.ts +2 -2
- package/dist/tasks/index.js +2 -1
- package/dist/testing.cjs +16 -14
- package/dist/testing.cjs.map +1 -1
- package/dist/testing.d.cts +2 -1
- package/dist/testing.d.ts +2 -1
- package/dist/testing.js +10 -7
- package/dist/testing.js.map +1 -1
- package/dist/thread-runner.cjs +5 -4
- package/dist/thread-runner.cjs.map +1 -1
- package/dist/thread-runner.d.cts +1 -1
- package/dist/thread-runner.d.ts +1 -1
- package/dist/thread-runner.js +4 -2
- package/dist/{types-D3QmZgeX.d.ts → types-Bgeqpm-n.d.cts} +12 -1
- package/dist/{types-D3QmZgeX.d.cts → types-Bgeqpm-n.d.ts} +12 -1
- package/package.json +7 -3
- package/dist/chunk-2IDRC7RK.js.map +0 -1
- package/dist/chunk-3SWI46YK.js +0 -74
- package/dist/chunk-3SWI46YK.js.map +0 -1
- package/dist/chunk-6WTMRZS7.cjs.map +0 -1
- package/dist/chunk-B6MB6HEG.js.map +0 -1
- package/dist/chunk-CGY7JU4Y.cjs.map +0 -1
- package/dist/chunk-DGYPIIJE.cjs.map +0 -1
- package/dist/chunk-DTMDJGRW.cjs.map +0 -1
- package/dist/chunk-EJDZZ4KX.js.map +0 -1
- package/dist/chunk-GWMW6XY7.cjs.map +0 -1
- package/dist/chunk-H2PVWCWC.cjs.map +0 -1
- package/dist/chunk-IEF6AEK3.cjs.map +0 -1
- package/dist/chunk-LECHRAU3.js.map +0 -1
- package/dist/chunk-OM2XJJWX.js.map +0 -1
- package/dist/chunk-QSIP7YLW.cjs.map +0 -1
- package/dist/chunk-R6GPQZLI.js.map +0 -1
- package/dist/chunk-RPL2IFWK.cjs +0 -77
- package/dist/chunk-RPL2IFWK.cjs.map +0 -1
- package/dist/pgboss-backend-PQW6I3VF.js +0 -14
- package/dist/pgboss-backend-QVXISTLP.cjs +0 -15
- package/dist/pgboss-backend-QVXISTLP.cjs.map +0 -1
- /package/dist/{chunk-JBOMTZT5.js.map → chunk-3JQWQF2M.js.map} +0 -0
- /package/dist/{chunk-O2E7H2XA.js.map → chunk-BCSJOPYH.js.map} +0 -0
- /package/dist/{pgboss-backend-PQW6I3VF.js.map → pgboss-backend-5DXF4G22.js.map} +0 -0
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import {
|
|
2
2
|
parseRedisUrl
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-EBJELA7T.js";
|
|
4
4
|
import {
|
|
5
5
|
getLogger,
|
|
6
|
-
notInstalled
|
|
7
|
-
|
|
6
|
+
notInstalled
|
|
7
|
+
} from "./chunk-UJ2ISRLP.js";
|
|
8
|
+
import {
|
|
8
9
|
setCurrentUser
|
|
9
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-546TNO2V.js";
|
|
11
|
+
import {
|
|
12
|
+
processState
|
|
13
|
+
} from "./chunk-Y7I2633P.js";
|
|
10
14
|
|
|
11
15
|
// src/auth/index.ts
|
|
12
16
|
import { randomUUID as randomUUID2 } from "crypto";
|
|
@@ -36,7 +40,8 @@ function servePrimaryCache(maxEntries) {
|
|
|
36
40
|
return store.set(
|
|
37
41
|
req.args[0],
|
|
38
42
|
req.args[1],
|
|
39
|
-
req.args[2]
|
|
43
|
+
req.args[2],
|
|
44
|
+
req.args[3]
|
|
40
45
|
);
|
|
41
46
|
case "del":
|
|
42
47
|
return store.del(req.args[0]);
|
|
@@ -46,14 +51,23 @@ function servePrimaryCache(maxEntries) {
|
|
|
46
51
|
return store.incr(req.args[0], req.args[1]);
|
|
47
52
|
}
|
|
48
53
|
};
|
|
49
|
-
|
|
50
|
-
(
|
|
51
|
-
|
|
54
|
+
const reply = (response) => {
|
|
55
|
+
if (!worker.isConnected()) return;
|
|
56
|
+
try {
|
|
57
|
+
worker.send(response, () => {
|
|
58
|
+
});
|
|
59
|
+
} catch {
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
void run().then(
|
|
63
|
+
(result) => reply({ [TAG]: true, id: req.id, ok: true, result }),
|
|
64
|
+
(error) => reply({ [TAG]: true, id: req.id, ok: false, error: String(error) })
|
|
52
65
|
);
|
|
53
66
|
});
|
|
54
67
|
}
|
|
55
68
|
async function connectPrimaryCache() {
|
|
56
69
|
if (!process.send) return null;
|
|
70
|
+
let closed = false;
|
|
57
71
|
const pending = /* @__PURE__ */ new Map();
|
|
58
72
|
const onMessage = (msg) => {
|
|
59
73
|
if (!isTagged(msg)) return;
|
|
@@ -67,6 +81,10 @@ async function connectPrimaryCache() {
|
|
|
67
81
|
};
|
|
68
82
|
process.on("message", onMessage);
|
|
69
83
|
const call = (op, ...args) => new Promise((resolve, reject) => {
|
|
84
|
+
if (closed || process.connected === false) {
|
|
85
|
+
reject(new Error("[EFC] Cache IPC connection is closed"));
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
70
88
|
const id = randomUUID();
|
|
71
89
|
const timer = setTimeout(() => {
|
|
72
90
|
pending.delete(id);
|
|
@@ -74,7 +92,17 @@ async function connectPrimaryCache() {
|
|
|
74
92
|
}, TIMEOUT_MS);
|
|
75
93
|
timer.unref();
|
|
76
94
|
pending.set(id, { resolve, reject, timer });
|
|
77
|
-
|
|
95
|
+
const failed = (error) => {
|
|
96
|
+
if (!error || !pending.has(id)) return;
|
|
97
|
+
pending.delete(id);
|
|
98
|
+
clearTimeout(timer);
|
|
99
|
+
reject(error);
|
|
100
|
+
};
|
|
101
|
+
try {
|
|
102
|
+
process.send({ [TAG]: true, id, op, args }, failed);
|
|
103
|
+
} catch (error) {
|
|
104
|
+
failed(error instanceof Error ? error : new Error(String(error)));
|
|
105
|
+
}
|
|
78
106
|
});
|
|
79
107
|
try {
|
|
80
108
|
await call("ping");
|
|
@@ -87,15 +115,19 @@ async function connectPrimaryCache() {
|
|
|
87
115
|
}
|
|
88
116
|
return {
|
|
89
117
|
get: async (key) => await call("get", key),
|
|
90
|
-
set: async (key, value, ttl) => {
|
|
91
|
-
await call("set", key, value, ttl);
|
|
118
|
+
set: async (key, value, ttl, pinned) => {
|
|
119
|
+
await call("set", key, value, ttl, pinned);
|
|
92
120
|
},
|
|
93
121
|
del: async (keys) => await call("del", keys),
|
|
94
122
|
clear: async (prefix) => await call("clear", prefix),
|
|
95
123
|
incr: async (key, ttl) => await call("incr", key, ttl),
|
|
96
124
|
close: async () => {
|
|
125
|
+
closed = true;
|
|
97
126
|
process.off("message", onMessage);
|
|
98
|
-
for (const p of pending.values())
|
|
127
|
+
for (const p of pending.values()) {
|
|
128
|
+
clearTimeout(p.timer);
|
|
129
|
+
p.reject(new Error("[EFC] Cache IPC connection is closed"));
|
|
130
|
+
}
|
|
99
131
|
pending.clear();
|
|
100
132
|
}
|
|
101
133
|
};
|
|
@@ -103,7 +135,18 @@ async function connectPrimaryCache() {
|
|
|
103
135
|
|
|
104
136
|
// src/cache/index.ts
|
|
105
137
|
function memoryBackend(maxEntries) {
|
|
138
|
+
if (!Number.isSafeInteger(maxEntries) || maxEntries < 1)
|
|
139
|
+
throw new Error("[EFC] cache.maxEntries must be a positive safe integer");
|
|
106
140
|
const store = /* @__PURE__ */ new Map();
|
|
141
|
+
const reserve = (key) => {
|
|
142
|
+
if (store.has(key) || store.size < maxEntries) return;
|
|
143
|
+
for (const [candidate, value] of store) {
|
|
144
|
+
if (value.expires !== 0 && value.expires <= Date.now() || !value.pinned)
|
|
145
|
+
store.delete(candidate);
|
|
146
|
+
if (store.size < maxEntries) return;
|
|
147
|
+
}
|
|
148
|
+
throw new Error("[EFC] Memory cache is full of protected session revocations");
|
|
149
|
+
};
|
|
107
150
|
const live = (key) => {
|
|
108
151
|
const hit = store.get(key);
|
|
109
152
|
if (!hit) return void 0;
|
|
@@ -121,10 +164,11 @@ function memoryBackend(maxEntries) {
|
|
|
121
164
|
store.set(key, hit);
|
|
122
165
|
return hit.value;
|
|
123
166
|
},
|
|
124
|
-
async set(key, value, ttl) {
|
|
167
|
+
async set(key, value, ttl, pinned = false) {
|
|
168
|
+
const protectedEntry = pinned || live(key)?.pinned === true;
|
|
169
|
+
reserve(key);
|
|
125
170
|
store.delete(key);
|
|
126
|
-
store.set(key, { value, expires: ttl ? Date.now() + ttl * 1e3 : 0 });
|
|
127
|
-
while (store.size > maxEntries) store.delete(store.keys().next().value);
|
|
171
|
+
store.set(key, { value, expires: ttl ? Date.now() + ttl * 1e3 : 0, pinned: protectedEntry });
|
|
128
172
|
},
|
|
129
173
|
async del(keys) {
|
|
130
174
|
let n = 0;
|
|
@@ -143,9 +187,9 @@ function memoryBackend(maxEntries) {
|
|
|
143
187
|
const current = hit ? Number(hit.value) : 0;
|
|
144
188
|
if (!Number.isInteger(current)) throw new Error(`cache incr: "${key}" is not an integer`);
|
|
145
189
|
const expires = hit ? hit.expires : ttl ? Date.now() + ttl * 1e3 : 0;
|
|
190
|
+
reserve(key);
|
|
146
191
|
store.delete(key);
|
|
147
|
-
store.set(key, { value: String(current + 1), expires });
|
|
148
|
-
while (store.size > maxEntries) store.delete(store.keys().next().value);
|
|
192
|
+
store.set(key, { value: String(current + 1), expires, pinned: hit?.pinned ?? false });
|
|
149
193
|
return {
|
|
150
194
|
value: current + 1,
|
|
151
195
|
ttlMs: expires === 0 ? null : Math.max(0, expires - Date.now())
|
|
@@ -232,6 +276,8 @@ function revocationFailureMode() {
|
|
|
232
276
|
return state.revocationFailure;
|
|
233
277
|
}
|
|
234
278
|
async function configureCache(config) {
|
|
279
|
+
if (config.backend === "memory" && (!Number.isSafeInteger(config.maxEntries ?? 1e4) || (config.maxEntries ?? 1e4) < 1))
|
|
280
|
+
throw new Error("[EFC] cache.maxEntries must be a positive safe integer");
|
|
235
281
|
await closeCache();
|
|
236
282
|
state.prefix = config.prefix ?? "efc:";
|
|
237
283
|
state.revocationFailure = config.onRevocationCheckError ?? "reject";
|
|
@@ -289,21 +335,24 @@ var cache = {
|
|
|
289
335
|
return safely("del", (b) => b.del(keys.map((k) => state.prefix + k)), 0);
|
|
290
336
|
},
|
|
291
337
|
async wrap(key, options, fn) {
|
|
338
|
+
const backend = requireBackend();
|
|
339
|
+
const prefix = state.prefix;
|
|
292
340
|
const hit = await cache.get(key);
|
|
293
341
|
if (hit !== void 0) return hit;
|
|
342
|
+
if (state.backend !== backend || state.prefix !== prefix) return fn();
|
|
294
343
|
const inflight = state.pending.get(key);
|
|
295
344
|
if (inflight) return inflight;
|
|
296
|
-
const run = (async () => {
|
|
297
|
-
|
|
298
|
-
const value = await fn();
|
|
345
|
+
const run = Promise.resolve().then(fn).then(async (value) => {
|
|
346
|
+
if (state.backend === backend && state.prefix === prefix)
|
|
299
347
|
await cache.set(key, value, typeof options === "number" ? { ttl: options } : options);
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
state.pending.delete(key);
|
|
303
|
-
}
|
|
304
|
-
})();
|
|
348
|
+
return value;
|
|
349
|
+
});
|
|
305
350
|
state.pending.set(key, run);
|
|
306
|
-
|
|
351
|
+
try {
|
|
352
|
+
return await run;
|
|
353
|
+
} finally {
|
|
354
|
+
if (state.pending.get(key) === run) state.pending.delete(key);
|
|
355
|
+
}
|
|
307
356
|
},
|
|
308
357
|
async clear(keyPrefix = "") {
|
|
309
358
|
return safely("clear", (b) => b.clear(state.prefix + keyPrefix), 0);
|
|
@@ -320,7 +369,7 @@ async function rawGet(key) {
|
|
|
320
369
|
return requireBackend().get(state.prefix + key);
|
|
321
370
|
}
|
|
322
371
|
async function rawSet(key, value, ttlSeconds) {
|
|
323
|
-
await requireBackend().set(state.prefix + key, value, ttlSeconds);
|
|
372
|
+
await requireBackend().set(state.prefix + key, value, ttlSeconds, true);
|
|
324
373
|
}
|
|
325
374
|
|
|
326
375
|
// src/auth/password.ts
|
|
@@ -399,7 +448,9 @@ async function issueToken(res, payload) {
|
|
|
399
448
|
return void 0;
|
|
400
449
|
}
|
|
401
450
|
function revokeToken(res) {
|
|
402
|
-
res.clearCookie("efc_token"
|
|
451
|
+
res.clearCookie("efc_token", {
|
|
452
|
+
...state2.config?.cookieDomain !== void 0 && { domain: state2.config.cookieDomain }
|
|
453
|
+
});
|
|
403
454
|
}
|
|
404
455
|
async function signToken(payload) {
|
|
405
456
|
return sign(payload);
|
|
@@ -455,7 +506,7 @@ function requireRevocationStore() {
|
|
|
455
506
|
async function revokeSession(req, res) {
|
|
456
507
|
requireRevocationStore();
|
|
457
508
|
const token = tokenFrom(req);
|
|
458
|
-
if (res && getConfig().strategy === "http-only") res
|
|
509
|
+
if (res && getConfig().strategy === "http-only") revokeToken(res);
|
|
459
510
|
if (!token) return;
|
|
460
511
|
let payload;
|
|
461
512
|
try {
|
|
@@ -469,7 +520,7 @@ async function revokeSession(req, res) {
|
|
|
469
520
|
}
|
|
470
521
|
async function revokeAllSessions(userId) {
|
|
471
522
|
requireRevocationStore();
|
|
472
|
-
await rawSet(`sess:user:${String(userId)}`, String(Date.now())
|
|
523
|
+
await rawSet(`sess:user:${String(userId)}`, String(Date.now()));
|
|
473
524
|
}
|
|
474
525
|
async function authenticate(req, res, next, roles) {
|
|
475
526
|
try {
|
|
@@ -479,6 +530,7 @@ async function authenticate(req, res, next, roles) {
|
|
|
479
530
|
return;
|
|
480
531
|
}
|
|
481
532
|
const payload = await verify(token);
|
|
533
|
+
if (res.headersSent || res.destroyed) return;
|
|
482
534
|
if (isCacheConfigured()) {
|
|
483
535
|
let revoked = false;
|
|
484
536
|
try {
|
|
@@ -492,11 +544,13 @@ async function authenticate(req, res, next, roles) {
|
|
|
492
544
|
`Session revocation check failed \u2014 ${reject ? "rejecting with 503" : "allowing"} authenticated requests`
|
|
493
545
|
);
|
|
494
546
|
}
|
|
547
|
+
if (res.headersSent || res.destroyed) return;
|
|
495
548
|
if (reject) {
|
|
496
549
|
res.status(503).json({ error: "Service Unavailable", statusCode: 503 });
|
|
497
550
|
return;
|
|
498
551
|
}
|
|
499
552
|
}
|
|
553
|
+
if (res.headersSent || res.destroyed) return;
|
|
500
554
|
if (revoked) {
|
|
501
555
|
res.status(401).json({ error: "Unauthorized" });
|
|
502
556
|
return;
|
|
@@ -513,18 +567,18 @@ async function authenticate(req, res, next, roles) {
|
|
|
513
567
|
setCurrentUser(payload);
|
|
514
568
|
next();
|
|
515
569
|
} catch {
|
|
516
|
-
res.status(401).json({ error: "Unauthorized" });
|
|
570
|
+
if (!res.headersSent && !res.destroyed) res.status(401).json({ error: "Unauthorized" });
|
|
517
571
|
}
|
|
518
572
|
}
|
|
519
573
|
var requireAuth = ((...args) => {
|
|
520
574
|
if (args.length > 0 && typeof args[0] === "string") {
|
|
521
575
|
const roles = args;
|
|
522
576
|
return (req2, res2, next2) => {
|
|
523
|
-
|
|
577
|
+
return authenticate(req2, res2, next2, roles);
|
|
524
578
|
};
|
|
525
579
|
}
|
|
526
580
|
const [req, res, next] = args;
|
|
527
|
-
|
|
581
|
+
return authenticate(req, res, next, []);
|
|
528
582
|
});
|
|
529
583
|
|
|
530
584
|
export {
|
|
@@ -545,4 +599,4 @@ export {
|
|
|
545
599
|
revokeAllSessions,
|
|
546
600
|
requireAuth
|
|
547
601
|
};
|
|
548
|
-
//# sourceMappingURL=chunk-
|
|
602
|
+
//# sourceMappingURL=chunk-X2B7WBKH.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 { processState } from '../process-state.js';\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\nconst state = processState('auth', () => ({ config: null as AuthConfig | null }));\n\nexport function configureAuth(config: AuthConfig): void {\n state.config = config;\n}\n\nfunction getConfig(): AuthConfig {\n if (!state.config) throw new Error('[EFC] Auth not configured — pass jwtSecret to ignite()');\n return state.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 ...(state.config?.cookieDomain !== undefined && { domain: state.config.cookieDomain }),\n });\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 // Generated login/refresh flows capture authorization time before reading credentials.\n // A token signed after revocation must not revive an authentication already in flight.\n const authenticatedAt = payload['efc_auth_at'];\n if (typeof authenticatedAt === 'number' && Number.isFinite(authenticatedAt)) {\n return Math.min(issuedMs, authenticatedAt) <= Number(cutoff);\n }\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') revokeToken(res);\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 // A shorter future jwtExpiresIn cannot determine the lifetime of older tokens.\n await rawSet(`sess:user:${String(userId)}`, String(Date.now()));\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 if (res.headersSent || res.destroyed) return;\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 (res.headersSent || res.destroyed) return;\n if (reject) {\n res.status(503).json({ error: 'Service Unavailable', statusCode: 503 });\n return;\n }\n }\n if (res.headersSent || res.destroyed) return;\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 if (!res.headersSent && !res.destroyed) 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 return authenticate(req, res, next, roles);\n };\n }\n const [req, res, next] = args as [Request, Response, NextFunction];\n return 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 { processState } from '../process-state.js';\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, pinned?: boolean): 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 if (!Number.isSafeInteger(maxEntries) || maxEntries < 1)\n throw new Error('[EFC] cache.maxEntries must be a positive safe integer');\n const store = new Map<string, { value: string; expires: number; pinned: boolean }>();\n const reserve = (key: string) => {\n if (store.has(key) || store.size < maxEntries) return;\n for (const [candidate, value] of store) {\n if ((value.expires !== 0 && value.expires <= Date.now()) || !value.pinned)\n store.delete(candidate);\n if (store.size < maxEntries) return;\n }\n throw new Error('[EFC] Memory cache is full of protected session revocations');\n };\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, pinned = false) {\n const protectedEntry = pinned || live(key)?.pinned === true;\n reserve(key);\n store.delete(key);\n store.set(key, { value, expires: ttl ? Date.now() + ttl * 1000 : 0, pinned: protectedEntry });\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 reserve(key);\n store.delete(key);\n store.set(key, { value: String(current + 1), expires, pinned: hit?.pinned ?? false });\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\nconst state = processState('cache', () => ({\n backend: null as Backend | null,\n prefix: 'efc:',\n revocationFailure: 'reject' as 'reject' | 'allow',\n pending: new Map<string, Promise<unknown>>(),\n}));\n\n/** How requireAuth should treat a failed revocation check — see CacheConfig. */\nexport function revocationFailureMode(): 'reject' | 'allow' {\n return state.revocationFailure;\n}\n\nexport async function configureCache(config: CacheConfig): Promise<void> {\n if (\n config.backend === 'memory' &&\n (!Number.isSafeInteger(config.maxEntries ?? 10_000) || (config.maxEntries ?? 10_000) < 1)\n )\n throw new Error('[EFC] cache.maxEntries must be a positive safe integer');\n await closeCache();\n state.prefix = config.prefix ?? 'efc:';\n state.revocationFailure = config.onRevocationCheckError ?? 'reject';\n if (config.backend === 'redis') {\n state.backend = await redisBackend(\n config.url ?? 'redis://localhost:6379',\n config.timeout ?? 1000,\n );\n } else if (cluster.isWorker) {\n // Cluster workers share the primary's store over IPC (see cache/ipc.ts).\n state.backend = (await connectPrimaryCache()) ?? memoryBackend(config.maxEntries ?? 10_000);\n } else {\n state.backend = memoryBackend(config.maxEntries ?? 10_000);\n }\n}\n\nexport function isCacheConfigured(): boolean {\n return state.backend !== null;\n}\n\nexport async function closeCache(): Promise<void> {\n const b = state.backend;\n state.backend = null;\n state.pending.clear();\n await b?.close();\n}\n\nfunction requireBackend(): Backend {\n if (!state.backend)\n throw new Error('[EFC] Cache not configured — pass cache: { backend } to ignite()');\n return state.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(state.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(\n 'set',\n (b) => b.set(state.prefix + key, JSON.stringify(value), options?.ttl),\n undefined,\n );\n },\n async has(key) {\n return (await safely('get', (b) => b.get(state.prefix + key), null)) !== null;\n },\n async del(...keys) {\n return safely('del', (b) => b.del(keys.map((k) => state.prefix + k)), 0);\n },\n async wrap<T>(key: string, options: CacheSetOptions | number, fn: () => Promise<T>) {\n const backend = requireBackend();\n const prefix = state.prefix;\n const hit = await cache.get<T>(key);\n if (hit !== undefined) return hit;\n // A reconfiguration during the read must not join or write another namespace.\n if (state.backend !== backend || state.prefix !== prefix) return fn();\n const inflight = state.pending.get(key) as Promise<T> | undefined;\n if (inflight) return inflight;\n // Register before invoking fn, including when it throws synchronously.\n const run = Promise.resolve()\n .then(fn)\n .then(async (value) => {\n if (state.backend === backend && state.prefix === prefix)\n await cache.set(key, value, typeof options === 'number' ? { ttl: options } : options);\n return value;\n });\n state.pending.set(key, run);\n try {\n return await run;\n } finally {\n if (state.pending.get(key) === run) state.pending.delete(key);\n }\n },\n async clear(keyPrefix = '') {\n return safely('clear', (b) => b.clear(state.prefix + keyPrefix), 0);\n },\n async incr(key, options) {\n const r = await safely('incr', (b) => b.incr(state.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(state.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(state.prefix + key);\n}\n\nexport async function rawSet(key: string, value: string, ttlSeconds?: number): Promise<void> {\n await requireBackend().set(state.prefix + key, value, ttlSeconds, true);\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 req.args[3] as boolean | 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 const reply = (response: Response) => {\n if (!worker.isConnected()) return;\n try {\n worker.send(response, () => {});\n } catch {\n /* Worker disconnected. */\n }\n };\n void run().then(\n (result) => reply({ [TAG]: true, id: req.id, ok: true, result }),\n (error: unknown) => reply({ [TAG]: true, id: req.id, ok: false, error: String(error) }),\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 let closed = false;\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 if (closed || process.connected === false) {\n reject(new Error('[EFC] Cache IPC connection is closed'));\n return;\n }\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 const failed = (error: Error | null) => {\n if (!error || !pending.has(id)) return;\n pending.delete(id);\n clearTimeout(timer);\n reject(error);\n };\n try {\n process.send!({ [TAG]: true, id, op, args } satisfies Request, failed);\n } catch (error) {\n failed(error instanceof Error ? error : new Error(String(error)));\n }\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, pinned) => {\n await call('set', key, value, ttl, pinned);\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 closed = true;\n process.off('message', onMessage);\n for (const p of pending.values()) {\n clearTimeout(p.timer);\n p.reject(new Error('[EFC] Cache IPC connection is closed'));\n }\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","cluster","state","randomUUID","req","res","next"]}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
// src/process-state.ts
|
|
2
|
+
function processState(name, initialize) {
|
|
3
|
+
const key = /* @__PURE__ */ Symbol.for("express-file-cluster.runtime.v1." + name);
|
|
4
|
+
const globals = globalThis;
|
|
5
|
+
if (!(key in globals)) globals[key] = initialize();
|
|
6
|
+
return globals[key];
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export {
|
|
10
|
+
processState
|
|
11
|
+
};
|
|
12
|
+
//# sourceMappingURL=chunk-Y7I2633P.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/process-state.ts"],"sourcesContent":["/** Internal process state shared by the package's ESM and CommonJS module graphs. */\nexport function processState<T>(name: string, initialize: () => T): T {\n const key = Symbol.for('express-file-cluster.runtime.v1.' + name);\n const globals = globalThis as Record<symbol, unknown>;\n if (!(key in globals)) globals[key] = initialize();\n return globals[key] as T;\n}\n"],"mappings":";AACO,SAAS,aAAgB,MAAc,YAAwB;AACpE,QAAM,MAAM,uBAAO,IAAI,qCAAqC,IAAI;AAChE,QAAM,UAAU;AAChB,MAAI,EAAE,OAAO,SAAU,SAAQ,GAAG,IAAI,WAAW;AACjD,SAAO,QAAQ,GAAG;AACpB;","names":[]}
|
|
@@ -1,5 +1,13 @@
|
|
|
1
|
+
import {
|
|
2
|
+
processState
|
|
3
|
+
} from "./chunk-Y7I2633P.js";
|
|
4
|
+
|
|
1
5
|
// src/tasks/index.ts
|
|
2
|
-
var
|
|
6
|
+
var state = processState("tasks", () => ({
|
|
7
|
+
registry: /* @__PURE__ */ new Map(),
|
|
8
|
+
impl: null
|
|
9
|
+
}));
|
|
10
|
+
var taskRegistry = state.registry;
|
|
3
11
|
var defineTask = (handlerOrOptions, maybeHandler) => {
|
|
4
12
|
let options = {};
|
|
5
13
|
let handler;
|
|
@@ -16,20 +24,19 @@ var defineTask = (handlerOrOptions, maybeHandler) => {
|
|
|
16
24
|
name: ""
|
|
17
25
|
};
|
|
18
26
|
};
|
|
19
|
-
var _impl = null;
|
|
20
27
|
function setEnqueueImpl(impl) {
|
|
21
|
-
|
|
28
|
+
state.impl = impl;
|
|
22
29
|
}
|
|
23
30
|
var ENQUEUE_BRIDGE = /* @__PURE__ */ Symbol.for("efc.enqueueBridge");
|
|
24
31
|
async function enqueue(name, payload) {
|
|
25
32
|
const bridge = globalThis[ENQUEUE_BRIDGE];
|
|
26
|
-
if (!
|
|
27
|
-
if (!
|
|
33
|
+
if (!state.impl && bridge) return bridge(name, payload);
|
|
34
|
+
if (!state.impl) {
|
|
28
35
|
throw new Error(
|
|
29
36
|
`[EFC] Cannot enqueue task "${name}": task queue not initialised. Set tasks.backend in ignite() config.`
|
|
30
37
|
);
|
|
31
38
|
}
|
|
32
|
-
return
|
|
39
|
+
return state.impl(name, payload);
|
|
33
40
|
}
|
|
34
41
|
function registerTask(name, def) {
|
|
35
42
|
taskRegistry.set(name, { ...def, name });
|
|
@@ -47,4 +54,4 @@ export {
|
|
|
47
54
|
registerTask,
|
|
48
55
|
listTasks
|
|
49
56
|
};
|
|
50
|
-
//# sourceMappingURL=chunk-
|
|
57
|
+
//# sourceMappingURL=chunk-ZBQUYFI3.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/tasks/index.ts"],"sourcesContent":["import { processState } from '../process-state.js';\nimport type { TaskDefinition, TaskOptions } from '../types.js';\n\ntype EnqueueImpl = (name: string, payload: unknown) => Promise<void>;\nconst state = processState('tasks', () => ({\n registry: new Map<string, TaskDefinition>(),\n impl: null as EnqueueImpl | null,\n}));\nexport const taskRegistry = state.registry;\n\ntype HandlerFn<T> = (payload: T) => Promise<void>;\ntype DefineTaskOverload = {\n <T>(handler: HandlerFn<T>): TaskDefinition<T>;\n <T>(options: TaskOptions, handler: HandlerFn<T>): TaskDefinition<T>;\n};\n\nexport const defineTask: DefineTaskOverload = <T>(\n handlerOrOptions: HandlerFn<T> | TaskOptions,\n maybeHandler?: HandlerFn<T>,\n): TaskDefinition<T> => {\n let options: TaskOptions = {};\n let handler: HandlerFn<T>;\n\n if (typeof handlerOrOptions === 'function') {\n handler = handlerOrOptions;\n } else {\n options = handlerOrOptions;\n if (!maybeHandler) throw new Error('[EFC] defineTask: handler function is required');\n handler = maybeHandler;\n }\n\n return {\n handler: handler as (payload: unknown) => Promise<void>,\n options,\n name: '',\n };\n};\n\nexport function setEnqueueImpl(impl: EnqueueImpl): void {\n state.impl = impl;\n}\n\n/** Set inside `{ thread: true }` task threads: forwards enqueue() to the main thread. */\nexport const ENQUEUE_BRIDGE = Symbol.for('efc.enqueueBridge');\n\nexport async function enqueue<T>(name: string, payload: T): Promise<void> {\n const bridge = (globalThis as Record<symbol, unknown>)[ENQUEUE_BRIDGE] as EnqueueImpl | undefined;\n if (!state.impl && bridge) return bridge(name, payload as unknown);\n if (!state.impl) {\n throw new Error(\n `[EFC] Cannot enqueue task \"${name}\": task queue not initialised. Set tasks.backend in ignite() config.`,\n );\n }\n return state.impl(name, payload as unknown);\n}\n\nexport function registerTask(name: string, def: TaskDefinition): void {\n taskRegistry.set(name, { ...def, name });\n}\n\n/**\n * Returns a read-only snapshot of all registered tasks.\n * Each entry contains the task name and its configured options.\n *\n * @example\n * const tasks = listTasks();\n * console.log(tasks.map(t => t.name));\n */\nexport function listTasks(): ReadonlyArray<{ name: string; options: TaskOptions }> {\n return Array.from(taskRegistry.values()).map(({ name, options }) => ({ name, options }));\n}\n"],"mappings":";;;;;AAIA,IAAM,QAAQ,aAAa,SAAS,OAAO;AAAA,EACzC,UAAU,oBAAI,IAA4B;AAAA,EAC1C,MAAM;AACR,EAAE;AACK,IAAM,eAAe,MAAM;AAQ3B,IAAM,aAAiC,CAC5C,kBACA,iBACsB;AACtB,MAAI,UAAuB,CAAC;AAC5B,MAAI;AAEJ,MAAI,OAAO,qBAAqB,YAAY;AAC1C,cAAU;AAAA,EACZ,OAAO;AACL,cAAU;AACV,QAAI,CAAC,aAAc,OAAM,IAAI,MAAM,gDAAgD;AACnF,cAAU;AAAA,EACZ;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA,MAAM;AAAA,EACR;AACF;AAEO,SAAS,eAAe,MAAyB;AACtD,QAAM,OAAO;AACf;AAGO,IAAM,iBAAiB,uBAAO,IAAI,mBAAmB;AAE5D,eAAsB,QAAW,MAAc,SAA2B;AACxE,QAAM,SAAU,WAAuC,cAAc;AACrE,MAAI,CAAC,MAAM,QAAQ,OAAQ,QAAO,OAAO,MAAM,OAAkB;AACjE,MAAI,CAAC,MAAM,MAAM;AACf,UAAM,IAAI;AAAA,MACR,8BAA8B,IAAI;AAAA,IACpC;AAAA,EACF;AACA,SAAO,MAAM,KAAK,MAAM,OAAkB;AAC5C;AAEO,SAAS,aAAa,MAAc,KAA2B;AACpE,eAAa,IAAI,MAAM,EAAE,GAAG,KAAK,KAAK,CAAC;AACzC;AAUO,SAAS,YAAmE;AACjF,SAAO,MAAM,KAAK,aAAa,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,QAAQ,OAAO,EAAE,MAAM,QAAQ,EAAE;AACzF;","names":[]}
|
package/dist/cli/db-runner.cjs
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkSV4C4HWPcjs = require('../chunk-SV4C4HWP.cjs');
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
@@ -18,14 +18,15 @@ var _chunkM53GODCXcjs = require('../chunk-M53GODCX.cjs');
|
|
|
18
18
|
|
|
19
19
|
|
|
20
20
|
|
|
21
|
-
var
|
|
21
|
+
var _chunkJVB5NLEMcjs = require('../chunk-JVB5NLEM.cjs');
|
|
22
22
|
require('../chunk-AGOYTFRO.cjs');
|
|
23
23
|
|
|
24
24
|
|
|
25
25
|
|
|
26
26
|
|
|
27
|
-
var
|
|
28
|
-
require('../chunk-
|
|
27
|
+
var _chunkJHCXIYJHcjs = require('../chunk-JHCXIYJH.cjs');
|
|
28
|
+
require('../chunk-URKE3OXN.cjs');
|
|
29
|
+
require('../chunk-PUYBKDYD.cjs');
|
|
29
30
|
|
|
30
31
|
// src/cli/db-runner.ts
|
|
31
32
|
var _picocolors = require('picocolors'); var _picocolors2 = _interopRequireDefault(_picocolors);
|
|
@@ -2261,14 +2262,14 @@ async function pullPostgres(pool, names = /* @__PURE__ */ new Map()) {
|
|
|
2261
2262
|
const cols = colsOf(table);
|
|
2262
2263
|
const notes = [];
|
|
2263
2264
|
const underscored = cols.filter((c) => c.name.includes("_"));
|
|
2264
|
-
const snake = underscored.length > 0 && underscored.every((c) =>
|
|
2265
|
+
const snake = underscored.length > 0 && underscored.every((c) => _chunkJVB5NLEMcjs.snakeCase.call(void 0, _chunkM53GODCXcjs.camel.call(void 0, c.name)) === c.name);
|
|
2265
2266
|
const fieldOf = (column) => snake ? _chunkM53GODCXcjs.camel.call(void 0, column) : column;
|
|
2266
2267
|
const options = {};
|
|
2267
2268
|
if (snake) options["naming"] = "snake_case";
|
|
2268
2269
|
if (idKind !== "uuid") options["id"] = idKind;
|
|
2269
|
-
const defaultTable =
|
|
2270
|
+
const defaultTable = _chunkJVB5NLEMcjs.tableNameFor.call(void 0, snake ? _chunkJVB5NLEMcjs.snakeCase.call(void 0, name) : name);
|
|
2270
2271
|
if (defaultTable !== table) options["collection"] = table;
|
|
2271
|
-
const tsColumn = (f) => cols.find((c) => c.name === (snake ?
|
|
2272
|
+
const tsColumn = (f) => cols.find((c) => c.name === (snake ? _chunkJVB5NLEMcjs.snakeCase.call(void 0, f) : f));
|
|
2272
2273
|
const isTs = (c) => _optionalChain([c, 'optionalAccess', _19 => _19.type]) === "timestamp with time zone";
|
|
2273
2274
|
const hasCreated = isTs(tsColumn("createdAt"));
|
|
2274
2275
|
const hasUpdated = isTs(tsColumn("updatedAt"));
|
|
@@ -2325,7 +2326,7 @@ async function pullPostgres(pool, names = /* @__PURE__ */ new Map()) {
|
|
|
2325
2326
|
def["default"] = /^'((?:[^']|'')*)'/.exec(d)[1].replace(/''/g, "'");
|
|
2326
2327
|
else notes.push(`${field}: database default ${d} not carried over`);
|
|
2327
2328
|
}
|
|
2328
|
-
if ((snake ?
|
|
2329
|
+
if ((snake ? _chunkJVB5NLEMcjs.snakeCase.call(void 0, field) : field) !== col.name) def["column"] = col.name;
|
|
2329
2330
|
const fk = tableFks.find((f) => f.columns.length === 1 && f.columns[0] === col.name);
|
|
2330
2331
|
if (fk) {
|
|
2331
2332
|
const target = modelName(fk.target);
|
|
@@ -2368,7 +2369,7 @@ async function pullPostgres(pool, names = /* @__PURE__ */ new Map()) {
|
|
|
2368
2369
|
const of = target.idKind === "uuid" ? "uuid" : target.idKind === "bigserial" ? "bigint" : "integer";
|
|
2369
2370
|
fields.push([fieldOf(j.column), { type: "array", of, ref: target.name }]);
|
|
2370
2371
|
}
|
|
2371
|
-
const fieldOfColumn = (c) => _nullishCoalesce(_optionalChain([fields, 'access', _31 => _31.find, 'call', _32 => _32(([f, d]) => (_nullishCoalesce(d["column"], () => ( (snake ?
|
|
2372
|
+
const fieldOfColumn = (c) => _nullishCoalesce(_optionalChain([fields, 'access', _31 => _31.find, 'call', _32 => _32(([f, d]) => (_nullishCoalesce(d["column"], () => ( (snake ? _chunkJVB5NLEMcjs.snakeCase.call(void 0, f) : f)))) === c), 'optionalAccess', _33 => _33[0]]), () => ( fieldOf(c)));
|
|
2372
2373
|
const indexDefs = [];
|
|
2373
2374
|
for (const idx of tableIndexes) {
|
|
2374
2375
|
if (usedIndexes.has(idx.name)) continue;
|
|
@@ -2676,7 +2677,7 @@ async function importModels(root) {
|
|
|
2676
2677
|
walk(_path2.default.join(root, "model"));
|
|
2677
2678
|
walk(_path2.default.join(root, "models"));
|
|
2678
2679
|
for (const f of files.sort()) await Promise.resolve().then(() => _interopRequireWildcard(require(_url.pathToFileURL.call(void 0, f).href)));
|
|
2679
|
-
return
|
|
2680
|
+
return _chunkJVB5NLEMcjs.registeredModels.call(void 0, );
|
|
2680
2681
|
}
|
|
2681
2682
|
async function existingModels(dir) {
|
|
2682
2683
|
const out = /* @__PURE__ */ new Map();
|
|
@@ -2691,9 +2692,9 @@ async function existingModels(dir) {
|
|
|
2691
2692
|
console.log(_picocolors2.default.yellow(` ! ${f} didn't load (${err.message.split("\n")[0]})`));
|
|
2692
2693
|
continue;
|
|
2693
2694
|
}
|
|
2694
|
-
for (const m of
|
|
2695
|
+
for (const m of _chunkJVB5NLEMcjs.registeredModels.call(void 0, )) if (!fileOf.has(m.name)) fileOf.set(m.name, file);
|
|
2695
2696
|
}
|
|
2696
|
-
for (const m of
|
|
2697
|
+
for (const m of _chunkJVB5NLEMcjs.registeredModels.call(void 0, )) {
|
|
2697
2698
|
const storage = await _optionalChain([m, 'access', _40 => _40.studio, 'optionalAccess', _41 => _41.storage, 'call', _42 => _42(), 'access', _43 => _43.catch, 'call', _44 => _44(() => void 0)]);
|
|
2698
2699
|
if (storage && !out.has(storage)) out.set(storage, { name: m.name, file: fileOf.get(m.name) });
|
|
2699
2700
|
}
|
|
@@ -2722,17 +2723,17 @@ function engineOf(url) {
|
|
|
2722
2723
|
async function main() {
|
|
2723
2724
|
const [command, raw] = process.argv.slice(2);
|
|
2724
2725
|
const opts = JSON.parse(_nullishCoalesce(raw, () => ( "{}")));
|
|
2725
|
-
|
|
2726
|
+
_chunkJHCXIYJHcjs.configureLogger.call(void 0, { level: "warn" });
|
|
2726
2727
|
const url = _nullishCoalesce(opts.databaseUrl, () => ( process.env["DATABASE_URL"]));
|
|
2727
2728
|
if (!url)
|
|
2728
2729
|
throw new Error("[EFC] DATABASE_URL is not set (add it to .env or pass --database-url)");
|
|
2729
2730
|
const engine = engineOf(url);
|
|
2730
|
-
|
|
2731
|
-
let client = engine === "mongodb" ? await
|
|
2732
|
-
|
|
2731
|
+
_chunkJVB5NLEMcjs.setDbEngine.call(void 0, engine);
|
|
2732
|
+
let client = engine === "mongodb" ? await _chunkSV4C4HWPcjs.connectMongo.call(void 0, url) : await _chunkJHCXIYJHcjs.connectPostgres.call(void 0, url);
|
|
2733
|
+
_chunkSV4C4HWPcjs.setDbClient.call(void 0, client);
|
|
2733
2734
|
const close = async () => {
|
|
2734
2735
|
if (engine === "mongodb") await client.close();
|
|
2735
|
-
else await
|
|
2736
|
+
else await _chunkJHCXIYJHcjs.closePostgres.call(void 0, );
|
|
2736
2737
|
};
|
|
2737
2738
|
const migrations = _path2.default.join(opts.root, "migrations");
|
|
2738
2739
|
const step = (verb) => (name) => console.log(` ${_picocolors2.default.cyan(verb)} ${name}`);
|
|
@@ -2765,7 +2766,7 @@ async function main() {
|
|
|
2765
2766
|
break;
|
|
2766
2767
|
}
|
|
2767
2768
|
case "sync": {
|
|
2768
|
-
|
|
2769
|
+
_chunkJVB5NLEMcjs.setAutoSync.call(void 0, false);
|
|
2769
2770
|
const models = await importModels(opts.root);
|
|
2770
2771
|
if (models.length === 0) {
|
|
2771
2772
|
console.log(
|
|
@@ -2800,16 +2801,16 @@ async function main() {
|
|
|
2800
2801
|
);
|
|
2801
2802
|
}
|
|
2802
2803
|
await close();
|
|
2803
|
-
client = engine === "mongodb" ? await
|
|
2804
|
-
|
|
2804
|
+
client = engine === "mongodb" ? await _chunkSV4C4HWPcjs.connectMongo.call(void 0, shadowUrl(url, engine, shadow)) : await _chunkJHCXIYJHcjs.connectPostgres.call(void 0, shadowUrl(url, engine, shadow));
|
|
2805
|
+
_chunkSV4C4HWPcjs.setDbClient.call(void 0, client);
|
|
2805
2806
|
try {
|
|
2806
|
-
|
|
2807
|
+
_chunkJVB5NLEMcjs.setAutoSync.call(void 0, false);
|
|
2807
2808
|
const migrator = new Migrator(migrations, engine, client);
|
|
2808
|
-
|
|
2809
|
+
_chunkJVB5NLEMcjs.setSyncSuppressed.call(void 0, true);
|
|
2809
2810
|
try {
|
|
2810
2811
|
await migrator.migrate();
|
|
2811
2812
|
} finally {
|
|
2812
|
-
|
|
2813
|
+
_chunkJVB5NLEMcjs.setSyncSuppressed.call(void 0, false);
|
|
2813
2814
|
}
|
|
2814
2815
|
const models = await importModels(opts.root);
|
|
2815
2816
|
if (models.length === 0) {
|
|
@@ -2892,13 +2893,13 @@ async function main() {
|
|
|
2892
2893
|
break;
|
|
2893
2894
|
}
|
|
2894
2895
|
case "pull": {
|
|
2895
|
-
|
|
2896
|
+
_chunkJVB5NLEMcjs.setAutoSync.call(void 0, false);
|
|
2896
2897
|
const dir = _path2.default.resolve(process.cwd(), _nullishCoalesce(opts.out, () => ( _path2.default.join("src", "model"))));
|
|
2897
2898
|
const existing = await existingModels(dir);
|
|
2898
2899
|
const names = new Map([...existing].map(([table, m]) => [table, m.name]));
|
|
2899
2900
|
const { models, skipped: notPulled } = engine === "postgresql" ? await pullPostgres(client, names) : await pullMongo(
|
|
2900
2901
|
client,
|
|
2901
|
-
(await
|
|
2902
|
+
(await _chunkSV4C4HWPcjs.loadMongoose.call(void 0, )).pluralize(),
|
|
2902
2903
|
{
|
|
2903
2904
|
...opts.sample !== void 0 && { sample: opts.sample },
|
|
2904
2905
|
names
|