express-file-cluster 0.10.0 → 0.10.2

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.
Files changed (186) hide show
  1. package/dist/auth/index.cjs +7 -6
  2. package/dist/auth/index.cjs.map +1 -1
  3. package/dist/auth/index.d.cts +1 -1
  4. package/dist/auth/index.d.ts +1 -1
  5. package/dist/auth/index.js +5 -5
  6. package/dist/{chunk-R52CUEGT.js → chunk-3SWI46YK.js} +2 -2
  7. package/dist/{chunk-DCJOWFVD.cjs → chunk-4GHK27JA.cjs} +3 -3
  8. package/dist/{chunk-DCJOWFVD.cjs.map → chunk-4GHK27JA.cjs.map} +1 -1
  9. package/dist/{chunk-NI2BNGGV.js → chunk-5LPRKZPB.js} +2 -2
  10. package/dist/chunk-74BSJXWD.cjs +220 -0
  11. package/dist/chunk-74BSJXWD.cjs.map +1 -0
  12. package/dist/{chunk-7KO4DJRJ.cjs → chunk-7BC3AN7R.cjs} +14 -14
  13. package/dist/{chunk-7KO4DJRJ.cjs.map → chunk-7BC3AN7R.cjs.map} +1 -1
  14. package/dist/chunk-AGOYTFRO.cjs +42 -0
  15. package/dist/chunk-AGOYTFRO.cjs.map +1 -0
  16. package/dist/{chunk-RAB44UGX.js → chunk-B6MB6HEG.js} +1 -1
  17. package/dist/{chunk-PGJQK36V.js → chunk-BG4A7Z32.js} +7 -5
  18. package/dist/{chunk-PGJQK36V.js.map → chunk-BG4A7Z32.js.map} +1 -1
  19. package/dist/{chunk-ATVD2HGC.js → chunk-C2FOZ7ME.js} +4 -4
  20. package/dist/chunk-CGY7JU4Y.cjs +8 -0
  21. package/dist/chunk-CGY7JU4Y.cjs.map +1 -0
  22. package/dist/{chunk-EGSSZUVO.js → chunk-DN4TCGYB.js} +38 -11
  23. package/dist/chunk-DN4TCGYB.js.map +1 -0
  24. package/dist/{chunk-GBI77W5T.cjs → chunk-H2PVWCWC.cjs} +1 -1
  25. package/dist/{chunk-GBI77W5T.cjs.map → chunk-H2PVWCWC.cjs.map} +1 -1
  26. package/dist/{chunk-NKLOE4AK.cjs → chunk-IUZ6A7PB.cjs} +20 -53
  27. package/dist/chunk-IUZ6A7PB.cjs.map +1 -0
  28. package/dist/{chunk-DUADUR6R.cjs → chunk-JP36TLL4.cjs} +171 -14
  29. package/dist/chunk-JP36TLL4.cjs.map +1 -0
  30. package/dist/chunk-KLWL7XSC.js +220 -0
  31. package/dist/chunk-KLWL7XSC.js.map +1 -0
  32. package/dist/{chunk-4DOHQU6I.cjs → chunk-M53GODCX.cjs} +39 -12
  33. package/dist/chunk-M53GODCX.cjs.map +1 -0
  34. package/dist/{chunk-R4XO4SVM.js → chunk-MUVO7MGS.js} +4 -4
  35. package/dist/{chunk-HBCY7ILD.cjs → chunk-R2K7AFIB.cjs} +97 -95
  36. package/dist/chunk-R2K7AFIB.cjs.map +1 -0
  37. package/dist/{chunk-QDEDOHP7.js → chunk-RETV3GKE.js} +9 -42
  38. package/dist/chunk-RETV3GKE.js.map +1 -0
  39. package/dist/{chunk-WBLUGOAG.cjs → chunk-RPL2IFWK.cjs} +8 -5
  40. package/dist/chunk-RPL2IFWK.cjs.map +1 -0
  41. package/dist/{chunk-YK4ZM3CA.cjs → chunk-TBIVIR6L.cjs} +15 -15
  42. package/dist/{chunk-YK4ZM3CA.cjs.map → chunk-TBIVIR6L.cjs.map} +1 -1
  43. package/dist/{chunk-73XJUT2S.js → chunk-V73R76I4.js} +162 -5
  44. package/dist/chunk-V73R76I4.js.map +1 -0
  45. package/dist/chunk-XPY5TQDK.js +42 -0
  46. package/dist/chunk-XPY5TQDK.js.map +1 -0
  47. package/dist/{chunk-KFVFP2Q7.cjs → chunk-Y4NKIXUL.cjs} +70 -55
  48. package/dist/chunk-Y4NKIXUL.cjs.map +1 -0
  49. package/dist/{chunk-7KC2H76D.js → chunk-Y75V5FCU.js} +62 -47
  50. package/dist/chunk-Y75V5FCU.js.map +1 -0
  51. package/dist/cli/db-runner.cjs +81 -42
  52. package/dist/cli/db-runner.cjs.map +1 -1
  53. package/dist/cli/db-runner.js +54 -16
  54. package/dist/cli/db-runner.js.map +1 -1
  55. package/dist/cli/index.cjs +23 -25
  56. package/dist/cli/index.cjs.map +1 -1
  57. package/dist/cli/index.js +12 -17
  58. package/dist/cli/index.js.map +1 -1
  59. package/dist/docs/api-reference/auth.md +23 -0
  60. package/dist/docs/api-reference/compose.md +1 -1
  61. package/dist/docs/api-reference/db.md +8 -0
  62. package/dist/docs/api-reference/ignite.md +4 -1
  63. package/dist/docs/api-reference/testing.md +26 -0
  64. package/dist/docs/cli/add.md +2 -2
  65. package/dist/docs/core-concepts/file-based-routing.md +2 -0
  66. package/dist/docs/core-concepts/middleware.md +2 -2
  67. package/dist/docs/getting-started/index.md +4 -0
  68. package/dist/docs/guides/authentication.md +33 -0
  69. package/dist/docs/guides/caching.md +2 -0
  70. package/dist/docs/guides/database.md +15 -0
  71. package/dist/docs/guides/environment-variables.md +6 -0
  72. package/dist/docs/guides/generated-portals.md +3 -1
  73. package/dist/docs/guides/logging.md +17 -0
  74. package/dist/docs/guides/migrations.md +4 -2
  75. package/dist/docs/guides/testing.md +31 -0
  76. package/dist/docs/index.md +2 -1
  77. package/dist/docs/skills/SKILL.md +5 -1
  78. package/dist/docs/skills/api-surface.md +20 -4
  79. package/dist/docs/skills/auth-internals.md +14 -1
  80. package/dist/docs/skills/pre-flight.md +6 -0
  81. package/dist/docs/skills/routing-rules.md +1 -1
  82. package/dist/docs/skills/what-not-to-invent.md +9 -1
  83. package/dist/docs/versioning.md +1 -1
  84. package/dist/index.cjs +75 -264
  85. package/dist/index.cjs.map +1 -1
  86. package/dist/index.d.cts +27 -3
  87. package/dist/index.d.ts +27 -3
  88. package/dist/index.js +28 -218
  89. package/dist/index.js.map +1 -1
  90. package/dist/pgboss-backend-4X2YT4RB.js +14 -0
  91. package/dist/pgboss-backend-UXQ3O2WT.cjs +15 -0
  92. package/dist/pgboss-backend-UXQ3O2WT.cjs.map +1 -0
  93. package/dist/registry/index.json +27 -3
  94. package/dist/registry/js-mongo/account-security.json +1 -1
  95. package/dist/registry/js-mongo/admin-users.json +1 -1
  96. package/dist/registry/js-mongo/auth.json +1 -1
  97. package/dist/registry/js-mongo/auth@apple.json +1 -1
  98. package/dist/registry/js-mongo/auth@google.json +1 -1
  99. package/dist/registry/js-mongo/forgot-password.json +1 -1
  100. package/dist/registry/js-mongo/user-profile.json +1 -1
  101. package/dist/registry/js-mongo-collection/account-security.json +1 -1
  102. package/dist/registry/js-mongo-collection/admin-users.json +1 -1
  103. package/dist/registry/js-mongo-collection/auth.json +1 -1
  104. package/dist/registry/js-mongo-collection/auth@apple.json +1 -1
  105. package/dist/registry/js-mongo-collection/auth@google.json +1 -1
  106. package/dist/registry/js-mongo-collection/forgot-password.json +1 -1
  107. package/dist/registry/js-mongo-collection/user-profile.json +1 -1
  108. package/dist/registry/js-pg-model/account-security.json +1 -1
  109. package/dist/registry/js-pg-model/admin-users.json +1 -1
  110. package/dist/registry/js-pg-model/auth.json +1 -1
  111. package/dist/registry/js-pg-model/auth@apple.json +1 -1
  112. package/dist/registry/js-pg-model/auth@google.json +1 -1
  113. package/dist/registry/js-pg-model/forgot-password.json +1 -1
  114. package/dist/registry/js-pg-model/user-profile.json +1 -1
  115. package/dist/registry/js-pg-table/account-security.json +1 -1
  116. package/dist/registry/js-pg-table/admin-users.json +1 -1
  117. package/dist/registry/js-pg-table/auth.json +1 -1
  118. package/dist/registry/js-pg-table/auth@apple.json +1 -1
  119. package/dist/registry/js-pg-table/auth@google.json +1 -1
  120. package/dist/registry/js-pg-table/forgot-password.json +1 -1
  121. package/dist/registry/js-pg-table/user-profile.json +1 -1
  122. package/dist/registry/ts-mongo/account-security.json +1 -1
  123. package/dist/registry/ts-mongo/admin-users.json +1 -1
  124. package/dist/registry/ts-mongo/auth.json +1 -1
  125. package/dist/registry/ts-mongo/auth@apple.json +1 -1
  126. package/dist/registry/ts-mongo/auth@google.json +1 -1
  127. package/dist/registry/ts-mongo/forgot-password.json +1 -1
  128. package/dist/registry/ts-mongo/user-profile.json +1 -1
  129. package/dist/registry/ts-mongo-collection/account-security.json +1 -1
  130. package/dist/registry/ts-mongo-collection/admin-users.json +1 -1
  131. package/dist/registry/ts-mongo-collection/auth.json +1 -1
  132. package/dist/registry/ts-mongo-collection/auth@apple.json +1 -1
  133. package/dist/registry/ts-mongo-collection/auth@google.json +1 -1
  134. package/dist/registry/ts-mongo-collection/forgot-password.json +1 -1
  135. package/dist/registry/ts-mongo-collection/user-profile.json +1 -1
  136. package/dist/registry/ts-pg-model/account-security.json +1 -1
  137. package/dist/registry/ts-pg-model/admin-users.json +1 -1
  138. package/dist/registry/ts-pg-model/auth.json +1 -1
  139. package/dist/registry/ts-pg-model/auth@apple.json +1 -1
  140. package/dist/registry/ts-pg-model/auth@google.json +1 -1
  141. package/dist/registry/ts-pg-model/forgot-password.json +1 -1
  142. package/dist/registry/ts-pg-model/user-profile.json +1 -1
  143. package/dist/registry/ts-pg-table/account-security.json +1 -1
  144. package/dist/registry/ts-pg-table/admin-users.json +1 -1
  145. package/dist/registry/ts-pg-table/auth.json +1 -1
  146. package/dist/registry/ts-pg-table/auth@apple.json +1 -1
  147. package/dist/registry/ts-pg-table/auth@google.json +1 -1
  148. package/dist/registry/ts-pg-table/forgot-password.json +1 -1
  149. package/dist/registry/ts-pg-table/user-profile.json +1 -1
  150. package/dist/tasks/index.cjs +3 -2
  151. package/dist/tasks/index.cjs.map +1 -1
  152. package/dist/tasks/index.d.cts +1 -1
  153. package/dist/tasks/index.d.ts +1 -1
  154. package/dist/tasks/index.js +1 -1
  155. package/dist/testing-cjs.cjs +5 -0
  156. package/dist/testing.cjs +59 -0
  157. package/dist/testing.cjs.map +1 -0
  158. package/dist/testing.d.cts +27 -0
  159. package/dist/testing.d.ts +27 -0
  160. package/dist/testing.js +58 -0
  161. package/dist/testing.js.map +1 -0
  162. package/dist/thread-runner.cjs +4 -3
  163. package/dist/thread-runner.cjs.map +1 -1
  164. package/dist/thread-runner.js +2 -2
  165. package/dist/{types-Bnxvj3l0.d.ts → types-CPMFTVXm.d.cts} +8 -0
  166. package/dist/{types-Bnxvj3l0.d.cts → types-CPMFTVXm.d.ts} +8 -0
  167. package/package.json +6 -1
  168. package/dist/chunk-4DOHQU6I.cjs.map +0 -1
  169. package/dist/chunk-73XJUT2S.js.map +0 -1
  170. package/dist/chunk-7KC2H76D.js.map +0 -1
  171. package/dist/chunk-DUADUR6R.cjs.map +0 -1
  172. package/dist/chunk-EGSSZUVO.js.map +0 -1
  173. package/dist/chunk-HBCY7ILD.cjs.map +0 -1
  174. package/dist/chunk-KFVFP2Q7.cjs.map +0 -1
  175. package/dist/chunk-NKLOE4AK.cjs.map +0 -1
  176. package/dist/chunk-QDEDOHP7.js.map +0 -1
  177. package/dist/chunk-WBLUGOAG.cjs.map +0 -1
  178. package/dist/pgboss-backend-FW42SBSM.js +0 -14
  179. package/dist/pgboss-backend-RVHUBJTU.cjs +0 -14
  180. package/dist/pgboss-backend-RVHUBJTU.cjs.map +0 -1
  181. /package/dist/{chunk-R52CUEGT.js.map → chunk-3SWI46YK.js.map} +0 -0
  182. /package/dist/{chunk-NI2BNGGV.js.map → chunk-5LPRKZPB.js.map} +0 -0
  183. /package/dist/{chunk-RAB44UGX.js.map → chunk-B6MB6HEG.js.map} +0 -0
  184. /package/dist/{chunk-ATVD2HGC.js.map → chunk-C2FOZ7ME.js.map} +0 -0
  185. /package/dist/{chunk-R4XO4SVM.js.map → chunk-MUVO7MGS.js.map} +0 -0
  186. /package/dist/{pgboss-backend-FW42SBSM.js.map → pgboss-backend-4X2YT4RB.js.map} +0 -0
@@ -1,11 +1,12 @@
1
1
  import {
2
2
  parseRedisUrl
3
- } from "./chunk-ATVD2HGC.js";
3
+ } from "./chunk-C2FOZ7ME.js";
4
4
  import {
5
5
  getLogger,
6
6
  notInstalled,
7
+ processState,
7
8
  setCurrentUser
8
- } from "./chunk-73XJUT2S.js";
9
+ } from "./chunk-V73R76I4.js";
9
10
 
10
11
  // src/auth/index.ts
11
12
  import { randomUUID as randomUUID2 } from "crypto";
@@ -53,13 +54,13 @@ function servePrimaryCache(maxEntries) {
53
54
  }
54
55
  async function connectPrimaryCache() {
55
56
  if (!process.send) return null;
56
- const pending2 = /* @__PURE__ */ new Map();
57
+ const pending = /* @__PURE__ */ new Map();
57
58
  const onMessage = (msg) => {
58
59
  if (!isTagged(msg)) return;
59
60
  const res = msg;
60
- const p = pending2.get(res.id);
61
+ const p = pending.get(res.id);
61
62
  if (!p) return;
62
- pending2.delete(res.id);
63
+ pending.delete(res.id);
63
64
  clearTimeout(p.timer);
64
65
  if (res.ok) p.resolve(res.result);
65
66
  else p.reject(new Error(res.error));
@@ -68,11 +69,11 @@ async function connectPrimaryCache() {
68
69
  const call = (op, ...args) => new Promise((resolve, reject) => {
69
70
  const id = randomUUID();
70
71
  const timer = setTimeout(() => {
71
- pending2.delete(id);
72
+ pending.delete(id);
72
73
  reject(new Error(`[EFC] cache IPC "${op}" timed out`));
73
74
  }, TIMEOUT_MS);
74
75
  timer.unref();
75
- pending2.set(id, { resolve, reject, timer });
76
+ pending.set(id, { resolve, reject, timer });
76
77
  process.send({ [TAG]: true, id, op, args });
77
78
  });
78
79
  try {
@@ -90,12 +91,12 @@ async function connectPrimaryCache() {
90
91
  await call("set", key, value, ttl);
91
92
  },
92
93
  del: async (keys) => await call("del", keys),
93
- clear: async (prefix2) => await call("clear", prefix2),
94
+ clear: async (prefix) => await call("clear", prefix),
94
95
  incr: async (key, ttl) => await call("incr", key, ttl),
95
96
  close: async () => {
96
97
  process.off("message", onMessage);
97
- for (const p of pending2.values()) clearTimeout(p.timer);
98
- pending2.clear();
98
+ for (const p of pending.values()) clearTimeout(p.timer);
99
+ pending.clear();
99
100
  }
100
101
  };
101
102
  }
@@ -130,9 +131,9 @@ function memoryBackend(maxEntries) {
130
131
  for (const k of keys) if (live(k) && store.delete(k)) n++;
131
132
  return n;
132
133
  },
133
- async clear(prefix2) {
134
+ async clear(prefix) {
134
135
  let n = 0;
135
- for (const k of [...store.keys()]) if (k.startsWith(prefix2) && store.delete(k)) n++;
136
+ for (const k of [...store.keys()]) if (k.startsWith(prefix) && store.delete(k)) n++;
136
137
  return n;
137
138
  },
138
139
  // One event-loop turn, no awaits: atomic within this process. Under clustering this
@@ -205,10 +206,10 @@ async function redisBackend(url, timeout) {
205
206
  );
206
207
  return { value, ttlMs: pttl < 0 ? null : pttl };
207
208
  },
208
- async clear(prefix2) {
209
+ async clear(prefix) {
209
210
  let n = 0;
210
211
  let cursor = "0";
211
- const match = prefix2.replace(/[*?[\]\\]/g, "\\$&") + "*";
212
+ const match = prefix.replace(/[*?[\]\\]/g, "\\$&") + "*";
212
213
  do {
213
214
  const [next, keys] = await client.scan(cursor, "MATCH", match, "COUNT", 500);
214
215
  cursor = next;
@@ -221,37 +222,43 @@ async function redisBackend(url, timeout) {
221
222
  }
222
223
  };
223
224
  }
224
- var backend = null;
225
- var prefix = "efc:";
226
- var revocationFailure = "reject";
225
+ var state = processState("cache", () => ({
226
+ backend: null,
227
+ prefix: "efc:",
228
+ revocationFailure: "reject",
229
+ pending: /* @__PURE__ */ new Map()
230
+ }));
227
231
  function revocationFailureMode() {
228
- return revocationFailure;
232
+ return state.revocationFailure;
229
233
  }
230
- var pending = /* @__PURE__ */ new Map();
231
234
  async function configureCache(config) {
232
235
  await closeCache();
233
- prefix = config.prefix ?? "efc:";
234
- revocationFailure = config.onRevocationCheckError ?? "reject";
236
+ state.prefix = config.prefix ?? "efc:";
237
+ state.revocationFailure = config.onRevocationCheckError ?? "reject";
235
238
  if (config.backend === "redis") {
236
- backend = await redisBackend(config.url ?? "redis://localhost:6379", config.timeout ?? 1e3);
239
+ state.backend = await redisBackend(
240
+ config.url ?? "redis://localhost:6379",
241
+ config.timeout ?? 1e3
242
+ );
237
243
  } else if (cluster2.isWorker) {
238
- backend = await connectPrimaryCache() ?? memoryBackend(config.maxEntries ?? 1e4);
244
+ state.backend = await connectPrimaryCache() ?? memoryBackend(config.maxEntries ?? 1e4);
239
245
  } else {
240
- backend = memoryBackend(config.maxEntries ?? 1e4);
246
+ state.backend = memoryBackend(config.maxEntries ?? 1e4);
241
247
  }
242
248
  }
243
249
  function isCacheConfigured() {
244
- return backend !== null;
250
+ return state.backend !== null;
245
251
  }
246
252
  async function closeCache() {
247
- const b = backend;
248
- backend = null;
249
- pending.clear();
253
+ const b = state.backend;
254
+ state.backend = null;
255
+ state.pending.clear();
250
256
  await b?.close();
251
257
  }
252
258
  function requireBackend() {
253
- if (!backend) throw new Error("[EFC] Cache not configured \u2014 pass cache: { backend } to ignite()");
254
- return backend;
259
+ if (!state.backend)
260
+ throw new Error("[EFC] Cache not configured \u2014 pass cache: { backend } to ignite()");
261
+ return state.backend;
255
262
  }
256
263
  async function safely(op, fn, fallback) {
257
264
  const b = requireBackend();
@@ -264,23 +271,27 @@ async function safely(op, fn, fallback) {
264
271
  }
265
272
  var cache = {
266
273
  async get(key) {
267
- const raw = await safely("get", (b) => b.get(prefix + key), null);
274
+ const raw = await safely("get", (b) => b.get(state.prefix + key), null);
268
275
  return raw === null ? void 0 : JSON.parse(raw);
269
276
  },
270
277
  async set(key, value, options) {
271
278
  if (value === void 0) return;
272
- await safely("set", (b) => b.set(prefix + key, JSON.stringify(value), options?.ttl), void 0);
279
+ await safely(
280
+ "set",
281
+ (b) => b.set(state.prefix + key, JSON.stringify(value), options?.ttl),
282
+ void 0
283
+ );
273
284
  },
274
285
  async has(key) {
275
- return await safely("get", (b) => b.get(prefix + key), null) !== null;
286
+ return await safely("get", (b) => b.get(state.prefix + key), null) !== null;
276
287
  },
277
288
  async del(...keys) {
278
- return safely("del", (b) => b.del(keys.map((k) => prefix + k)), 0);
289
+ return safely("del", (b) => b.del(keys.map((k) => state.prefix + k)), 0);
279
290
  },
280
291
  async wrap(key, options, fn) {
281
292
  const hit = await cache.get(key);
282
293
  if (hit !== void 0) return hit;
283
- const inflight = pending.get(key);
294
+ const inflight = state.pending.get(key);
284
295
  if (inflight) return inflight;
285
296
  const run = (async () => {
286
297
  try {
@@ -288,28 +299,28 @@ var cache = {
288
299
  await cache.set(key, value, typeof options === "number" ? { ttl: options } : options);
289
300
  return value;
290
301
  } finally {
291
- pending.delete(key);
302
+ state.pending.delete(key);
292
303
  }
293
304
  })();
294
- pending.set(key, run);
305
+ state.pending.set(key, run);
295
306
  return run;
296
307
  },
297
308
  async clear(keyPrefix = "") {
298
- return safely("clear", (b) => b.clear(prefix + keyPrefix), 0);
309
+ return safely("clear", (b) => b.clear(state.prefix + keyPrefix), 0);
299
310
  },
300
311
  async incr(key, options) {
301
- const r = await safely("incr", (b) => b.incr(prefix + key, options?.ttl), void 0);
312
+ const r = await safely("incr", (b) => b.incr(state.prefix + key, options?.ttl), void 0);
302
313
  return r?.value;
303
314
  }
304
315
  };
305
316
  async function rawIncr(key, ttlSeconds) {
306
- return requireBackend().incr(prefix + key, ttlSeconds);
317
+ return requireBackend().incr(state.prefix + key, ttlSeconds);
307
318
  }
308
319
  async function rawGet(key) {
309
- return requireBackend().get(prefix + key);
320
+ return requireBackend().get(state.prefix + key);
310
321
  }
311
322
  async function rawSet(key, value, ttlSeconds) {
312
- await requireBackend().set(prefix + key, value, ttlSeconds);
323
+ await requireBackend().set(state.prefix + key, value, ttlSeconds);
313
324
  }
314
325
 
315
326
  // src/auth/password.ts
@@ -363,13 +374,13 @@ function passwordNeedsRehash(hash) {
363
374
  }
364
375
 
365
376
  // src/auth/index.ts
366
- var _config = null;
377
+ var state2 = processState("auth", () => ({ config: null }));
367
378
  function configureAuth(config) {
368
- _config = config;
379
+ state2.config = config;
369
380
  }
370
381
  function getConfig() {
371
- if (!_config) throw new Error("[EFC] Auth not configured \u2014 pass jwtSecret to ignite()");
372
- return _config;
382
+ if (!state2.config) throw new Error("[EFC] Auth not configured \u2014 pass jwtSecret to ignite()");
383
+ return state2.config;
373
384
  }
374
385
  async function sign(payload) {
375
386
  const { secret, expiresIn } = getConfig();
@@ -428,6 +439,10 @@ async function isRevoked(payload) {
428
439
  const cutoff = await rawGet(`sess:user:${userId}`);
429
440
  if (cutoff === null) return false;
430
441
  const issuedMs = typeof payload["efc_iat"] === "number" ? payload["efc_iat"] : (payload.iat ?? 0) * 1e3;
442
+ const authenticatedAt = payload["efc_auth_at"];
443
+ if (typeof authenticatedAt === "number" && Number.isFinite(authenticatedAt)) {
444
+ return Math.min(issuedMs, authenticatedAt) <= Number(cutoff);
445
+ }
431
446
  return issuedMs < Number(cutoff);
432
447
  }
433
448
  function requireRevocationStore() {
@@ -530,4 +545,4 @@ export {
530
545
  revokeAllSessions,
531
546
  requireAuth
532
547
  };
533
- //# sourceMappingURL=chunk-7KC2H76D.js.map
548
+ //# sourceMappingURL=chunk-Y75V5FCU.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}\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') 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 { 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): 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\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 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 hit = await cache.get<T>(key);\n if (hit !== undefined) return hit;\n const inflight = state.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 state.pending.delete(key);\n }\n })();\n state.pending.set(key, run);\n return run;\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);\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","cluster","state","randomUUID","req","res","next"]}
@@ -2,7 +2,7 @@
2
2
 
3
3
 
4
4
 
5
- var _chunkHBCY7ILDcjs = require('../chunk-HBCY7ILD.cjs');
5
+ var _chunkR2K7AFIBcjs = require('../chunk-R2K7AFIB.cjs');
6
6
 
7
7
 
8
8
 
@@ -10,7 +10,7 @@ var _chunkHBCY7ILDcjs = require('../chunk-HBCY7ILD.cjs');
10
10
 
11
11
 
12
12
 
13
- var _chunk4DOHQU6Icjs = require('../chunk-4DOHQU6I.cjs');
13
+ var _chunkM53GODCXcjs = require('../chunk-M53GODCX.cjs');
14
14
 
15
15
 
16
16
 
@@ -18,12 +18,14 @@ var _chunk4DOHQU6Icjs = require('../chunk-4DOHQU6I.cjs');
18
18
 
19
19
 
20
20
 
21
- var _chunkNKLOE4AKcjs = require('../chunk-NKLOE4AK.cjs');
21
+ var _chunkIUZ6A7PBcjs = require('../chunk-IUZ6A7PB.cjs');
22
+ require('../chunk-AGOYTFRO.cjs');
22
23
 
23
24
 
24
25
 
25
26
 
26
- var _chunkDUADUR6Rcjs = require('../chunk-DUADUR6R.cjs');
27
+ var _chunkJP36TLL4cjs = require('../chunk-JP36TLL4.cjs');
28
+ require('../chunk-CGY7JU4Y.cjs');
27
29
 
28
30
  // src/cli/db-runner.ts
29
31
  var _picocolors = require('picocolors'); var _picocolors2 = _interopRequireDefault(_picocolors);
@@ -2186,7 +2188,7 @@ function scalarType(type) {
2186
2188
  if (type === "jsonb" || type === "json") return { def: { type: "json" } };
2187
2189
  return { def: { type: "json" }, note: `${type} has no EFC type \u2014 mapped to json` };
2188
2190
  }
2189
- async function pullPostgres(pool) {
2191
+ async function pullPostgres(pool, names = /* @__PURE__ */ new Map()) {
2190
2192
  const q = async (sql) => (await pool.query(sql)).rows;
2191
2193
  const tables = (await q(
2192
2194
  `SELECT c.relname AS name FROM pg_class c JOIN pg_namespace n ON n.oid = c.relnamespace
@@ -2227,8 +2229,8 @@ async function pullPostgres(pool) {
2227
2229
  const fksOf = (t) => fks.filter((f) => f.table === t);
2228
2230
  const joinTables = /* @__PURE__ */ new Map();
2229
2231
  for (const t of tables) {
2230
- const names = colsOf(t).map((c) => c.name).sort().join(",");
2231
- if (names !== "owner_id,position,ref_id") continue;
2232
+ const names2 = colsOf(t).map((c) => c.name).sort().join(",");
2233
+ if (names2 !== "owner_id,position,ref_id") continue;
2232
2234
  const owner = _optionalChain([fksOf, 'call', _8 => _8(t), 'access', _9 => _9.find, 'call', _10 => _10((f) => f.columns[0] === "owner_id"), 'optionalAccess', _11 => _11.target]);
2233
2235
  const target = _optionalChain([fksOf, 'call', _12 => _12(t), 'access', _13 => _13.find, 'call', _14 => _14((f) => f.columns[0] === "ref_id"), 'optionalAccess', _15 => _15.target]);
2234
2236
  if (owner && target && t.startsWith(`${owner}_`))
@@ -2249,7 +2251,7 @@ async function pullPostgres(pool) {
2249
2251
  skipped.push(t);
2250
2252
  continue;
2251
2253
  }
2252
- models.set(t, { table: t, name: _chunk4DOHQU6Icjs.pascal.call(void 0, _chunk4DOHQU6Icjs.singular.call(void 0, t)), idKind });
2254
+ models.set(t, { table: t, name: _nullishCoalesce(names.get(t), () => ( _chunkM53GODCXcjs.pascal.call(void 0, _chunkM53GODCXcjs.singular.call(void 0, t)))), idKind });
2253
2255
  }
2254
2256
  const modelName = (t) => _optionalChain([models, 'access', _16 => _16.get, 'call', _17 => _17(t), 'optionalAccess', _18 => _18.name]);
2255
2257
  const out = [];
@@ -2259,14 +2261,14 @@ async function pullPostgres(pool) {
2259
2261
  const cols = colsOf(table);
2260
2262
  const notes = [];
2261
2263
  const underscored = cols.filter((c) => c.name.includes("_"));
2262
- const snake = underscored.length > 0 && underscored.every((c) => _chunkNKLOE4AKcjs.snakeCase.call(void 0, _chunk4DOHQU6Icjs.camel.call(void 0, c.name)) === c.name);
2263
- const fieldOf = (column) => snake ? _chunk4DOHQU6Icjs.camel.call(void 0, column) : column;
2264
+ const snake = underscored.length > 0 && underscored.every((c) => _chunkIUZ6A7PBcjs.snakeCase.call(void 0, _chunkM53GODCXcjs.camel.call(void 0, c.name)) === c.name);
2265
+ const fieldOf = (column) => snake ? _chunkM53GODCXcjs.camel.call(void 0, column) : column;
2264
2266
  const options = {};
2265
2267
  if (snake) options["naming"] = "snake_case";
2266
2268
  if (idKind !== "uuid") options["id"] = idKind;
2267
- const defaultTable = _chunkNKLOE4AKcjs.tableNameFor.call(void 0, snake ? _chunkNKLOE4AKcjs.snakeCase.call(void 0, name) : name);
2269
+ const defaultTable = _chunkIUZ6A7PBcjs.tableNameFor.call(void 0, snake ? _chunkIUZ6A7PBcjs.snakeCase.call(void 0, name) : name);
2268
2270
  if (defaultTable !== table) options["collection"] = table;
2269
- const tsColumn = (f) => cols.find((c) => c.name === (snake ? _chunkNKLOE4AKcjs.snakeCase.call(void 0, f) : f));
2271
+ const tsColumn = (f) => cols.find((c) => c.name === (snake ? _chunkIUZ6A7PBcjs.snakeCase.call(void 0, f) : f));
2270
2272
  const isTs = (c) => _optionalChain([c, 'optionalAccess', _19 => _19.type]) === "timestamp with time zone";
2271
2273
  const hasCreated = isTs(tsColumn("createdAt"));
2272
2274
  const hasUpdated = isTs(tsColumn("updatedAt"));
@@ -2290,9 +2292,9 @@ async function pullPostgres(pool) {
2290
2292
  let field = fieldOf(col.name);
2291
2293
  const fkCol = tableFks.some((f) => f.columns.length === 1 && f.columns[0] === col.name);
2292
2294
  const stem = _optionalChain([/^(.+?)(?:Id|_id)$/, 'access', _20 => _20.exec, 'call', _21 => _21(col.name), 'optionalAccess', _22 => _22[1]]);
2293
- if (fkCol && stem && !taken.has(_chunk4DOHQU6Icjs.camel.call(void 0, stem))) {
2294
- taken.add(_chunk4DOHQU6Icjs.camel.call(void 0, stem));
2295
- field = _chunk4DOHQU6Icjs.camel.call(void 0, stem);
2295
+ if (fkCol && stem && !taken.has(_chunkM53GODCXcjs.camel.call(void 0, stem))) {
2296
+ taken.add(_chunkM53GODCXcjs.camel.call(void 0, stem));
2297
+ field = _chunkM53GODCXcjs.camel.call(void 0, stem);
2296
2298
  }
2297
2299
  let def;
2298
2300
  if (col.enumLabels) {
@@ -2323,7 +2325,7 @@ async function pullPostgres(pool) {
2323
2325
  def["default"] = /^'((?:[^']|'')*)'/.exec(d)[1].replace(/''/g, "'");
2324
2326
  else notes.push(`${field}: database default ${d} not carried over`);
2325
2327
  }
2326
- if ((snake ? _chunkNKLOE4AKcjs.snakeCase.call(void 0, field) : field) !== col.name) def["column"] = col.name;
2328
+ if ((snake ? _chunkIUZ6A7PBcjs.snakeCase.call(void 0, field) : field) !== col.name) def["column"] = col.name;
2327
2329
  const fk = tableFks.find((f) => f.columns.length === 1 && f.columns[0] === col.name);
2328
2330
  if (fk) {
2329
2331
  const target = modelName(fk.target);
@@ -2366,7 +2368,7 @@ async function pullPostgres(pool) {
2366
2368
  const of = target.idKind === "uuid" ? "uuid" : target.idKind === "bigserial" ? "bigint" : "integer";
2367
2369
  fields.push([fieldOf(j.column), { type: "array", of, ref: target.name }]);
2368
2370
  }
2369
- const fieldOfColumn = (c) => _nullishCoalesce(_optionalChain([fields, 'access', _31 => _31.find, 'call', _32 => _32(([f, d]) => (_nullishCoalesce(d["column"], () => ( (snake ? _chunkNKLOE4AKcjs.snakeCase.call(void 0, f) : f)))) === c), 'optionalAccess', _33 => _33[0]]), () => ( fieldOf(c)));
2371
+ const fieldOfColumn = (c) => _nullishCoalesce(_optionalChain([fields, 'access', _31 => _31.find, 'call', _32 => _32(([f, d]) => (_nullishCoalesce(d["column"], () => ( (snake ? _chunkIUZ6A7PBcjs.snakeCase.call(void 0, f) : f)))) === c), 'optionalAccess', _33 => _33[0]]), () => ( fieldOf(c)));
2370
2372
  const indexDefs = [];
2371
2373
  for (const idx of tableIndexes) {
2372
2374
  if (usedIndexes.has(idx.name)) continue;
@@ -2411,8 +2413,8 @@ async function pullPostgres(pool) {
2411
2413
  for (const field of refFields) {
2412
2414
  const def = fields.find(([f]) => f === field)[1];
2413
2415
  const many = def["type"] === "array" || !def["unique"];
2414
- let rel = many ? _chunk4DOHQU6Icjs.plural.call(void 0, _chunk4DOHQU6Icjs.lcFirst.call(void 0, name)) : _chunk4DOHQU6Icjs.lcFirst.call(void 0, name);
2415
- if (refFields.length > 1) rel = `${rel}By${_chunk4DOHQU6Icjs.pascal.call(void 0, field)}`;
2416
+ let rel = many ? _chunkM53GODCXcjs.plural.call(void 0, _chunkM53GODCXcjs.lcFirst.call(void 0, name)) : _chunkM53GODCXcjs.lcFirst.call(void 0, name);
2417
+ if (refFields.length > 1) rel = `${rel}By${_chunkM53GODCXcjs.pascal.call(void 0, field)}`;
2416
2418
  const taken2 = _nullishCoalesce(relationNames.get(target), () => ( /* @__PURE__ */ new Set()));
2417
2419
  while (taken2.has(rel)) rel = `${rel}_`;
2418
2420
  taken2.add(rel);
@@ -2422,7 +2424,7 @@ async function pullPostgres(pool) {
2422
2424
  relations.set(target, rels);
2423
2425
  }
2424
2426
  }
2425
- out.push({ name, fields, options, notes });
2427
+ out.push({ name, fields, options, notes, table });
2426
2428
  }
2427
2429
  for (const model of out) {
2428
2430
  const rels = relations.get(model.name);
@@ -2540,7 +2542,7 @@ function fieldDef(name, shape, total, path3, ctx) {
2540
2542
  };
2541
2543
  }
2542
2544
  function refFor(field, ctx) {
2543
- const base = _chunk4DOHQU6Icjs.singular.call(void 0, field.replace(/_?[Ii][Dd]s?$/, "")).toLowerCase();
2545
+ const base = _chunkM53GODCXcjs.singular.call(void 0, field.replace(/_?[Ii][Dd]s?$/, "")).toLowerCase();
2544
2546
  const model = ctx.models.get(base);
2545
2547
  return model ? { ref: model } : {};
2546
2548
  }
@@ -2556,7 +2558,9 @@ async function pullMongo(conn, pluralize, opts = {}) {
2556
2558
  const sampleSize = _nullishCoalesce(opts.sample, () => ( 1e3));
2557
2559
  const db = conn.db;
2558
2560
  const collections = (await db.listCollections({ type: "collection" }).toArray()).map((c) => c.name).filter((n) => !n.startsWith("system.") && !INTERNAL2.has(n)).sort();
2559
- const nameOf2 = new Map(collections.map((c) => [c, _chunk4DOHQU6Icjs.pascal.call(void 0, _chunk4DOHQU6Icjs.singular.call(void 0, c)) || "Model"]));
2561
+ const nameOf2 = new Map(
2562
+ collections.map((c) => [c, _nullishCoalesce(_optionalChain([opts, 'access', _37 => _37.names, 'optionalAccess', _38 => _38.get, 'call', _39 => _39(c)]), () => ( (_chunkM53GODCXcjs.pascal.call(void 0, _chunkM53GODCXcjs.singular.call(void 0, c)) || "Model")))])
2563
+ );
2560
2564
  const ctxModels = new Map([...nameOf2.values()].map((m) => [m.toLowerCase(), m]));
2561
2565
  const models = [];
2562
2566
  const skipped = [];
@@ -2645,7 +2649,14 @@ async function pullMongo(conn, pluralize, opts = {}) {
2645
2649
  ctx.notes.unshift(
2646
2650
  docs.length ? `Pulled from ${docs.length} sampled document(s) of "${collection}": a field is required only when every sample had a value.` : `"${collection}" is empty \u2014 no fields could be inferred.`
2647
2651
  );
2648
- models.push({ name, fields, options, notes: ctx.notes, api: "defineCollection" });
2652
+ models.push({
2653
+ name,
2654
+ fields,
2655
+ options,
2656
+ notes: ctx.notes,
2657
+ api: "defineCollection",
2658
+ table: collection
2659
+ });
2649
2660
  }
2650
2661
  return { models, skipped };
2651
2662
  }
@@ -2665,7 +2676,28 @@ async function importModels(root) {
2665
2676
  walk(_path2.default.join(root, "model"));
2666
2677
  walk(_path2.default.join(root, "models"));
2667
2678
  for (const f of files.sort()) await Promise.resolve().then(() => _interopRequireWildcard(require(_url.pathToFileURL.call(void 0, f).href)));
2668
- return _chunkNKLOE4AKcjs.registeredModels.call(void 0, );
2679
+ return _chunkIUZ6A7PBcjs.registeredModels.call(void 0, );
2680
+ }
2681
+ async function existingModels(dir) {
2682
+ const out = /* @__PURE__ */ new Map();
2683
+ if (!_fs2.default.existsSync(dir)) return out;
2684
+ const files = _fs2.default.readdirSync(dir).filter((f) => /\.(ts|js|mts|mjs)$/.test(f) && !f.endsWith(".d.ts")).sort((a, b) => Number(/^index\./.test(a)) - Number(/^index\./.test(b)) || a.localeCompare(b));
2685
+ const fileOf = /* @__PURE__ */ new Map();
2686
+ for (const f of files) {
2687
+ const file = _path2.default.join(dir, f);
2688
+ try {
2689
+ await Promise.resolve().then(() => _interopRequireWildcard(require(_url.pathToFileURL.call(void 0, file).href)));
2690
+ } catch (err) {
2691
+ console.log(_picocolors2.default.yellow(` ! ${f} didn't load (${err.message.split("\n")[0]})`));
2692
+ continue;
2693
+ }
2694
+ for (const m of _chunkIUZ6A7PBcjs.registeredModels.call(void 0, )) if (!fileOf.has(m.name)) fileOf.set(m.name, file);
2695
+ }
2696
+ for (const m of _chunkIUZ6A7PBcjs.registeredModels.call(void 0, )) {
2697
+ 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
+ if (storage && !out.has(storage)) out.set(storage, { name: m.name, file: fileOf.get(m.name) });
2699
+ }
2700
+ return out;
2669
2701
  }
2670
2702
  function shadowUrl(url, engine, name) {
2671
2703
  if (engine === "mongodb")
@@ -2690,17 +2722,17 @@ function engineOf(url) {
2690
2722
  async function main() {
2691
2723
  const [command, raw] = process.argv.slice(2);
2692
2724
  const opts = JSON.parse(_nullishCoalesce(raw, () => ( "{}")));
2693
- _chunkDUADUR6Rcjs.configureLogger.call(void 0, { level: "warn" });
2725
+ _chunkJP36TLL4cjs.configureLogger.call(void 0, { level: "warn" });
2694
2726
  const url = _nullishCoalesce(opts.databaseUrl, () => ( process.env["DATABASE_URL"]));
2695
2727
  if (!url)
2696
2728
  throw new Error("[EFC] DATABASE_URL is not set (add it to .env or pass --database-url)");
2697
2729
  const engine = engineOf(url);
2698
- _chunkNKLOE4AKcjs.setDbEngine.call(void 0, engine);
2699
- let client = engine === "mongodb" ? await _chunkHBCY7ILDcjs.connectMongo.call(void 0, url) : await _chunkDUADUR6Rcjs.connectPostgres.call(void 0, url);
2700
- _chunkHBCY7ILDcjs.setDbClient.call(void 0, client);
2730
+ _chunkIUZ6A7PBcjs.setDbEngine.call(void 0, engine);
2731
+ let client = engine === "mongodb" ? await _chunkR2K7AFIBcjs.connectMongo.call(void 0, url) : await _chunkJP36TLL4cjs.connectPostgres.call(void 0, url);
2732
+ _chunkR2K7AFIBcjs.setDbClient.call(void 0, client);
2701
2733
  const close = async () => {
2702
2734
  if (engine === "mongodb") await client.close();
2703
- else await _chunkDUADUR6Rcjs.closePostgres.call(void 0, );
2735
+ else await _chunkJP36TLL4cjs.closePostgres.call(void 0, );
2704
2736
  };
2705
2737
  const migrations = _path2.default.join(opts.root, "migrations");
2706
2738
  const step = (verb) => (name) => console.log(` ${_picocolors2.default.cyan(verb)} ${name}`);
@@ -2733,7 +2765,7 @@ async function main() {
2733
2765
  break;
2734
2766
  }
2735
2767
  case "sync": {
2736
- _chunkNKLOE4AKcjs.setAutoSync.call(void 0, false);
2768
+ _chunkIUZ6A7PBcjs.setAutoSync.call(void 0, false);
2737
2769
  const models = await importModels(opts.root);
2738
2770
  if (models.length === 0) {
2739
2771
  console.log(
@@ -2768,16 +2800,16 @@ async function main() {
2768
2800
  );
2769
2801
  }
2770
2802
  await close();
2771
- client = engine === "mongodb" ? await _chunkHBCY7ILDcjs.connectMongo.call(void 0, shadowUrl(url, engine, shadow)) : await _chunkDUADUR6Rcjs.connectPostgres.call(void 0, shadowUrl(url, engine, shadow));
2772
- _chunkHBCY7ILDcjs.setDbClient.call(void 0, client);
2803
+ client = engine === "mongodb" ? await _chunkR2K7AFIBcjs.connectMongo.call(void 0, shadowUrl(url, engine, shadow)) : await _chunkJP36TLL4cjs.connectPostgres.call(void 0, shadowUrl(url, engine, shadow));
2804
+ _chunkR2K7AFIBcjs.setDbClient.call(void 0, client);
2773
2805
  try {
2774
- _chunkNKLOE4AKcjs.setAutoSync.call(void 0, false);
2806
+ _chunkIUZ6A7PBcjs.setAutoSync.call(void 0, false);
2775
2807
  const migrator = new Migrator(migrations, engine, client);
2776
- _chunkNKLOE4AKcjs.setSyncSuppressed.call(void 0, true);
2808
+ _chunkIUZ6A7PBcjs.setSyncSuppressed.call(void 0, true);
2777
2809
  try {
2778
2810
  await migrator.migrate();
2779
2811
  } finally {
2780
- _chunkNKLOE4AKcjs.setSyncSuppressed.call(void 0, false);
2812
+ _chunkIUZ6A7PBcjs.setSyncSuppressed.call(void 0, false);
2781
2813
  }
2782
2814
  const models = await importModels(opts.root);
2783
2815
  if (models.length === 0) {
@@ -2860,10 +2892,17 @@ async function main() {
2860
2892
  break;
2861
2893
  }
2862
2894
  case "pull": {
2863
- const { models, skipped: notPulled } = engine === "postgresql" ? await pullPostgres(client) : await pullMongo(
2895
+ _chunkIUZ6A7PBcjs.setAutoSync.call(void 0, false);
2896
+ const dir = _path2.default.resolve(process.cwd(), _nullishCoalesce(opts.out, () => ( _path2.default.join("src", "model"))));
2897
+ const existing = await existingModels(dir);
2898
+ const names = new Map([...existing].map(([table, m]) => [table, m.name]));
2899
+ const { models, skipped: notPulled } = engine === "postgresql" ? await pullPostgres(client, names) : await pullMongo(
2864
2900
  client,
2865
- (await _chunkHBCY7ILDcjs.loadMongoose.call(void 0, )).pluralize(),
2866
- opts.sample !== void 0 ? { sample: opts.sample } : {}
2901
+ (await _chunkR2K7AFIBcjs.loadMongoose.call(void 0, )).pluralize(),
2902
+ {
2903
+ ...opts.sample !== void 0 && { sample: opts.sample },
2904
+ names
2905
+ }
2867
2906
  );
2868
2907
  if (models.length === 0) {
2869
2908
  console.log(
@@ -2874,9 +2913,9 @@ async function main() {
2874
2913
  break;
2875
2914
  }
2876
2915
  const typescript = _fs2.default.existsSync(_path2.default.join(process.cwd(), "tsconfig.json"));
2877
- const dir = _path2.default.resolve(process.cwd(), _nullishCoalesce(opts.out, () => ( _path2.default.join("src", "model"))));
2878
- const { written, skipped } = _chunk4DOHQU6Icjs.writeModels.call(void 0, dir, models, {
2916
+ const { written, skipped } = _chunkM53GODCXcjs.writeModels.call(void 0, dir, models, {
2879
2917
  typescript,
2918
+ existing,
2880
2919
  ...opts.force && { force: true }
2881
2920
  });
2882
2921
  console.log(_picocolors2.default.bold(`
@@ -2884,9 +2923,9 @@ async function main() {
2884
2923
  `));
2885
2924
  for (const f of written)
2886
2925
  console.log(` ${_picocolors2.default.green("+")} ${_path2.default.relative(process.cwd(), f)}`);
2887
- for (const f of skipped)
2926
+ for (const { file, reason } of skipped)
2888
2927
  console.log(
2889
- ` ${_picocolors2.default.yellow("\u2022")} ${_path2.default.relative(process.cwd(), f)} ${_picocolors2.default.dim("exists \u2014 kept (--force overwrites)")}`
2928
+ ` ${_picocolors2.default.yellow("\u2022")} ${_path2.default.relative(process.cwd(), file)} ${_picocolors2.default.dim(reason)}`
2890
2929
  );
2891
2930
  if (notPulled.length)
2892
2931
  console.log(