express-file-cluster 0.10.2 → 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 +3 -1
- package/dist/auth/index.d.ts +3 -1
- package/dist/auth/index.js +7 -5
- package/dist/{chunk-BG4A7Z32.js → chunk-3JQWQF2M.js} +3 -3
- package/dist/{chunk-4GHK27JA.cjs → chunk-4FQP6QX3.cjs} +3 -3
- package/dist/{chunk-4GHK27JA.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-MUVO7MGS.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-5LPRKZPB.js → chunk-BCSJOPYH.js} +2 -2
- package/dist/chunk-BJR42CN3.cjs +872 -0
- package/dist/chunk-BJR42CN3.cjs.map +1 -0
- package/dist/{chunk-C2FOZ7ME.js → chunk-EBJELA7T.js} +30 -25
- package/dist/chunk-EBJELA7T.js.map +1 -0
- package/dist/{chunk-Y4NKIXUL.cjs → chunk-H6MHRHUP.cjs} +104 -50
- package/dist/chunk-H6MHRHUP.cjs.map +1 -0
- package/dist/{chunk-7BC3AN7R.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-JP36TLL4.cjs → chunk-JHCXIYJH.cjs} +25 -47
- package/dist/chunk-JHCXIYJH.cjs.map +1 -0
- package/dist/{chunk-IUZ6A7PB.cjs → chunk-JVB5NLEM.cjs} +15 -13
- package/dist/chunk-JVB5NLEM.cjs.map +1 -0
- package/dist/chunk-LIAGVWFQ.js +872 -0
- 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-RETV3GKE.js → chunk-QLM3JEER.js} +5 -3
- package/dist/{chunk-RETV3GKE.js.map → chunk-QLM3JEER.js.map} +1 -1
- package/dist/{chunk-R2K7AFIB.cjs → chunk-SV4C4HWP.cjs} +89 -89
- package/dist/{chunk-R2K7AFIB.cjs.map → chunk-SV4C4HWP.cjs.map} +1 -1
- package/dist/{chunk-V73R76I4.js → chunk-UJ2ISRLP.js} +11 -33
- 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-TBIVIR6L.cjs → chunk-VLGN3XUM.cjs} +40 -35
- package/dist/chunk-VLGN3XUM.cjs.map +1 -0
- package/dist/{chunk-Y75V5FCU.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 +6 -0
- package/dist/docs/api-reference/openapi.md +36 -0
- package/dist/docs/api-reference/tasks.md +5 -1
- package/dist/docs/api-reference/testing.md +4 -0
- package/dist/docs/api-reference/tracing.md +18 -0
- package/dist/docs/api-reference/websockets.md +23 -0
- package/dist/docs/cli/add.md +1 -1
- package/dist/docs/core-concepts/background-tasks.md +5 -1
- package/dist/docs/core-concepts/clustering.md +2 -0
- package/dist/docs/core-concepts/file-based-routing.md +4 -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 +16 -0
- package/dist/docs/guides/logging.md +2 -0
- package/dist/docs/guides/openapi.md +57 -0
- package/dist/docs/guides/tracing.md +64 -0
- package/dist/docs/guides/validation.md +2 -0
- package/dist/docs/guides/websockets.md +60 -0
- package/dist/docs/index.md +4 -1
- package/dist/docs/skills/SKILL.md +7 -3
- package/dist/docs/skills/api-surface.md +18 -0
- package/dist/docs/skills/auth-internals.md +4 -2
- package/dist/docs/skills/pre-flight.md +6 -0
- package/dist/docs/skills/routing-rules.md +6 -0
- package/dist/docs/skills/tasks-internals.md +10 -2
- package/dist/docs/skills/what-not-to-invent.md +4 -0
- package/dist/index.cjs +185 -70
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +6 -14
- package/dist/index.d.ts +6 -14
- package/dist/index.js +143 -28
- package/dist/index.js.map +1 -1
- package/dist/openapi-cjs.cjs +5 -0
- 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 +4 -2
- package/dist/tasks/index.d.ts +4 -2
- package/dist/tasks/index.js +2 -1
- package/dist/testing.cjs +21 -13
- package/dist/testing.cjs.map +1 -1
- package/dist/testing.d.cts +5 -1
- package/dist/testing.d.ts +5 -1
- package/dist/testing.js +17 -8
- 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-CPMFTVXm.d.ts → types-Bgeqpm-n.d.cts} +91 -2
- package/dist/{types-CPMFTVXm.d.cts → types-Bgeqpm-n.d.ts} +91 -2
- package/package.json +11 -5
- package/dist/chunk-3SWI46YK.js +0 -74
- package/dist/chunk-3SWI46YK.js.map +0 -1
- package/dist/chunk-74BSJXWD.cjs +0 -220
- package/dist/chunk-74BSJXWD.cjs.map +0 -1
- package/dist/chunk-7BC3AN7R.cjs.map +0 -1
- package/dist/chunk-B6MB6HEG.js.map +0 -1
- package/dist/chunk-C2FOZ7ME.js.map +0 -1
- package/dist/chunk-CGY7JU4Y.cjs.map +0 -1
- package/dist/chunk-H2PVWCWC.cjs.map +0 -1
- package/dist/chunk-IUZ6A7PB.cjs.map +0 -1
- package/dist/chunk-JP36TLL4.cjs.map +0 -1
- package/dist/chunk-KLWL7XSC.js +0 -220
- package/dist/chunk-KLWL7XSC.js.map +0 -1
- package/dist/chunk-MUVO7MGS.js.map +0 -1
- package/dist/chunk-RPL2IFWK.cjs +0 -77
- package/dist/chunk-RPL2IFWK.cjs.map +0 -1
- package/dist/chunk-TBIVIR6L.cjs.map +0 -1
- package/dist/chunk-V73R76I4.js.map +0 -1
- package/dist/chunk-Y4NKIXUL.cjs.map +0 -1
- package/dist/chunk-Y75V5FCU.js.map +0 -1
- package/dist/pgboss-backend-4X2YT4RB.js +0 -14
- package/dist/pgboss-backend-UXQ3O2WT.cjs +0 -15
- package/dist/pgboss-backend-UXQ3O2WT.cjs.map +0 -1
- /package/dist/{chunk-BG4A7Z32.js.map → chunk-3JQWQF2M.js.map} +0 -0
- /package/dist/{chunk-5LPRKZPB.js.map → chunk-BCSJOPYH.js.map} +0 -0
- /package/dist/{pgboss-backend-4X2YT4RB.js.map → pgboss-backend-5DXF4G22.js.map} +0 -0
package/dist/index.js
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
|
+
attachWebSockets,
|
|
3
|
+
closeWebSockets,
|
|
2
4
|
createHttpApp,
|
|
5
|
+
generateOpenAPI,
|
|
3
6
|
mountErrorHandler,
|
|
7
|
+
mountOpenAPI,
|
|
4
8
|
mountRoutes
|
|
5
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-LIAGVWFQ.js";
|
|
6
10
|
import {
|
|
7
11
|
cache,
|
|
8
12
|
closeCache,
|
|
@@ -11,14 +15,14 @@ import {
|
|
|
11
15
|
isCacheConfigured,
|
|
12
16
|
rawIncr,
|
|
13
17
|
servePrimaryCache
|
|
14
|
-
} from "./chunk-
|
|
18
|
+
} from "./chunk-X2B7WBKH.js";
|
|
15
19
|
import {
|
|
16
20
|
scanDir
|
|
17
|
-
} from "./chunk-
|
|
21
|
+
} from "./chunk-BCSJOPYH.js";
|
|
18
22
|
import {
|
|
19
23
|
closeBullMQ,
|
|
20
24
|
initBullMQ
|
|
21
|
-
} from "./chunk-
|
|
25
|
+
} from "./chunk-EBJELA7T.js";
|
|
22
26
|
import {
|
|
23
27
|
connectMongo,
|
|
24
28
|
db,
|
|
@@ -28,12 +32,12 @@ import {
|
|
|
28
32
|
getDbClient,
|
|
29
33
|
setDbClient,
|
|
30
34
|
transaction
|
|
31
|
-
} from "./chunk-
|
|
35
|
+
} from "./chunk-3JQWQF2M.js";
|
|
32
36
|
import {
|
|
33
37
|
ModelValidationError,
|
|
34
38
|
setAutoSync,
|
|
35
39
|
setDbEngine
|
|
36
|
-
} from "./chunk-
|
|
40
|
+
} from "./chunk-QLM3JEER.js";
|
|
37
41
|
import {
|
|
38
42
|
HttpError,
|
|
39
43
|
isHttpError
|
|
@@ -41,25 +45,49 @@ import {
|
|
|
41
45
|
import {
|
|
42
46
|
closePgBoss,
|
|
43
47
|
initPgBoss
|
|
44
|
-
} from "./chunk-
|
|
45
|
-
import "./chunk-
|
|
48
|
+
} from "./chunk-74R37C4I.js";
|
|
49
|
+
import "./chunk-PUM5ZDAH.js";
|
|
46
50
|
import {
|
|
47
51
|
listTasks,
|
|
48
52
|
registerTask
|
|
49
|
-
} from "./chunk-
|
|
53
|
+
} from "./chunk-ZBQUYFI3.js";
|
|
50
54
|
import {
|
|
51
55
|
checkConnectionBudget,
|
|
52
56
|
configureLogger,
|
|
53
57
|
configureQueryLog,
|
|
54
58
|
connectPostgres,
|
|
55
|
-
getCurrentUser,
|
|
56
59
|
getLogger,
|
|
57
60
|
getQueryMetrics,
|
|
58
61
|
logger,
|
|
59
62
|
resetQueryMetrics
|
|
60
|
-
} from "./chunk-
|
|
63
|
+
} from "./chunk-UJ2ISRLP.js";
|
|
64
|
+
import {
|
|
65
|
+
configureTracing,
|
|
66
|
+
getCurrentUser,
|
|
67
|
+
shutdownTracing
|
|
68
|
+
} from "./chunk-546TNO2V.js";
|
|
69
|
+
import "./chunk-Y7I2633P.js";
|
|
70
|
+
|
|
71
|
+
// src/shutdown.ts
|
|
72
|
+
async function drainServices(options) {
|
|
73
|
+
const errors = [];
|
|
74
|
+
const outcomes = await Promise.allSettled([
|
|
75
|
+
...options.transports,
|
|
76
|
+
...options.tasks.map((close) => Promise.resolve().then(close))
|
|
77
|
+
]);
|
|
78
|
+
for (const outcome of outcomes) if (outcome.status === "rejected") errors.push(outcome.reason);
|
|
79
|
+
for (const close of [options.cache, options.tracing]) {
|
|
80
|
+
try {
|
|
81
|
+
await close();
|
|
82
|
+
} catch (error) {
|
|
83
|
+
errors.push(error);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
if (errors.length) throw new AggregateError(errors, "Service shutdown failed");
|
|
87
|
+
}
|
|
61
88
|
|
|
62
89
|
// src/index.ts
|
|
90
|
+
import http from "http";
|
|
63
91
|
import fs2 from "fs";
|
|
64
92
|
import express from "express";
|
|
65
93
|
import cluster2 from "cluster";
|
|
@@ -149,7 +177,7 @@ function generateDashboard(routes, basePath, port, projectName, projectVersion)
|
|
|
149
177
|
const safeRoutes = JSON.stringify(
|
|
150
178
|
routes.map((r) => ({
|
|
151
179
|
urlPath: r.urlPath,
|
|
152
|
-
methods: r.methods,
|
|
180
|
+
methods: r.websocket ? [...r.methods, "WS"] : r.methods,
|
|
153
181
|
params: r.params,
|
|
154
182
|
meta: r.meta ?? null
|
|
155
183
|
}))
|
|
@@ -730,18 +758,19 @@ function generateDashboard(routes, basePath, port, projectName, projectVersion)
|
|
|
730
758
|
// src/rate-limit.ts
|
|
731
759
|
var UNITS = { s: 1, m: 60, h: 3600, d: 86400 };
|
|
732
760
|
function parseWindow(window) {
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
if (m) return Number(m[1]) * UNITS[m[2]];
|
|
761
|
+
let seconds = typeof window === "number" ? window : NaN;
|
|
762
|
+
if (typeof window === "string") {
|
|
763
|
+
const match = /^(\d+(?:\.\d+)?)\s*(s|m|h|d)$/.exec(window.trim());
|
|
764
|
+
if (match) seconds = Number(match[1]) * UNITS[match[2]];
|
|
738
765
|
}
|
|
766
|
+
if (Number.isFinite(seconds) && seconds * 1e3 >= 1 && seconds * 1e3 <= Number.MAX_SAFE_INTEGER)
|
|
767
|
+
return seconds;
|
|
739
768
|
throw new Error(`[EFC] rateLimit: window must be seconds or like '15m' \u2014 got ${String(window)}`);
|
|
740
769
|
}
|
|
741
770
|
var lastCacheError = 0;
|
|
742
771
|
function rateLimit(options) {
|
|
743
772
|
const windowSeconds = parseWindow(options.window);
|
|
744
|
-
if (!Number.
|
|
773
|
+
if (!Number.isSafeInteger(options.max) || options.max < 1) {
|
|
745
774
|
throw new Error("[EFC] rateLimit: max must be a positive integer");
|
|
746
775
|
}
|
|
747
776
|
const keyOf = options.key ?? ((req) => req.ip ?? req.socket.remoteAddress);
|
|
@@ -761,7 +790,10 @@ function rateLimit(options) {
|
|
|
761
790
|
const resetMs = (slot + 1) * windowMs - now;
|
|
762
791
|
let count;
|
|
763
792
|
try {
|
|
764
|
-
count = (await rawIncr(
|
|
793
|
+
count = (await rawIncr(
|
|
794
|
+
`rl:${JSON.stringify([String(bucket), who, slot])}`,
|
|
795
|
+
Math.ceil(resetMs / 1e3) + 1
|
|
796
|
+
)).value;
|
|
765
797
|
} catch (err) {
|
|
766
798
|
if (Date.now() - lastCacheError > 3e4) {
|
|
767
799
|
lastCacheError = Date.now();
|
|
@@ -793,7 +825,18 @@ function rateLimit(options) {
|
|
|
793
825
|
}
|
|
794
826
|
|
|
795
827
|
// src/cache/response.ts
|
|
828
|
+
import { createHash } from "crypto";
|
|
796
829
|
var RESPONSE_PREFIX = "res:";
|
|
830
|
+
var representationHeaders = [
|
|
831
|
+
"content-type",
|
|
832
|
+
"cache-control",
|
|
833
|
+
"vary",
|
|
834
|
+
"content-language",
|
|
835
|
+
"content-disposition",
|
|
836
|
+
"etag",
|
|
837
|
+
"last-modified"
|
|
838
|
+
];
|
|
839
|
+
var variant = (req, names) => createHash("sha256").update(JSON.stringify(names.map((name) => [name, req.get(name) ?? null]))).digest("hex");
|
|
797
840
|
function cacheResponse(options) {
|
|
798
841
|
const opts = typeof options === "number" ? { ttl: options } : options;
|
|
799
842
|
return (req, res, next) => {
|
|
@@ -802,23 +845,65 @@ function cacheResponse(options) {
|
|
|
802
845
|
if (opts.perUser) {
|
|
803
846
|
const user = getCurrentUser();
|
|
804
847
|
const id = user?.["sub"] ?? user?.["id"];
|
|
805
|
-
if (id
|
|
806
|
-
scope = `u:${
|
|
848
|
+
if (typeof id !== "string" && (typeof id !== "number" || !Number.isFinite(id))) return next();
|
|
849
|
+
scope = `u:${JSON.stringify([id])}:`;
|
|
807
850
|
}
|
|
808
|
-
const key = RESPONSE_PREFIX + scope + (opts.key ? opts.key(req) : req.originalUrl);
|
|
851
|
+
const key = RESPONSE_PREFIX + scope + (opts.key ? opts.key(req) : req.originalUrl) + "\0" + req.method;
|
|
809
852
|
void (async () => {
|
|
810
853
|
const hit = await cache.get(key);
|
|
811
|
-
if (hit) {
|
|
854
|
+
if (hit && typeof hit.json === "string" && Array.isArray(hit.vary) && hit.variant === variant(req, hit.vary)) {
|
|
855
|
+
res.set(hit.headers);
|
|
812
856
|
res.setHeader("X-Cache", "HIT");
|
|
813
|
-
res.status(hit.status).
|
|
857
|
+
res.status(hit.status).send(hit.json);
|
|
814
858
|
return;
|
|
815
859
|
}
|
|
816
860
|
res.setHeader("X-Cache", "MISS");
|
|
861
|
+
let captured = false;
|
|
862
|
+
let snapshot = "";
|
|
817
863
|
const json = res.json.bind(res);
|
|
818
864
|
res.json = (body) => {
|
|
819
|
-
|
|
820
|
-
|
|
865
|
+
const send = res.send;
|
|
866
|
+
const eligible = !res.headersSent && res.statusCode === 200;
|
|
867
|
+
res.send = (rendered) => {
|
|
868
|
+
if (eligible && typeof rendered === "string") {
|
|
869
|
+
try {
|
|
870
|
+
JSON.parse(rendered);
|
|
871
|
+
snapshot = rendered;
|
|
872
|
+
captured = true;
|
|
873
|
+
} catch {
|
|
874
|
+
}
|
|
875
|
+
}
|
|
876
|
+
return send.call(res, rendered);
|
|
877
|
+
};
|
|
878
|
+
try {
|
|
879
|
+
return json(body);
|
|
880
|
+
} finally {
|
|
881
|
+
res.send = send;
|
|
882
|
+
}
|
|
821
883
|
};
|
|
884
|
+
res.once("finish", () => {
|
|
885
|
+
if (!captured || res.statusCode !== 200 || res.getHeader("set-cookie") !== void 0)
|
|
886
|
+
return;
|
|
887
|
+
const control = String(res.getHeader("cache-control") ?? "");
|
|
888
|
+
if (/(?:^|,)\s*(?:no-store|no-cache)(?:\s|,|=|$)/i.test(control) || !opts.perUser && /(?:^|,)\s*private(?:\s|,|=|$)/i.test(control))
|
|
889
|
+
return;
|
|
890
|
+
const vary = String(res.getHeader("vary") ?? "").split(",").map((name) => name.trim().toLowerCase()).filter(Boolean);
|
|
891
|
+
if (vary.includes("*")) return;
|
|
892
|
+
const headers = {};
|
|
893
|
+
for (const name of representationHeaders) {
|
|
894
|
+
const value = res.getHeader(name);
|
|
895
|
+
if (value !== void 0)
|
|
896
|
+
headers[name] = Array.isArray(value) ? value.join(", ") : String(value);
|
|
897
|
+
}
|
|
898
|
+
const stored = {
|
|
899
|
+
status: 200,
|
|
900
|
+
json: snapshot,
|
|
901
|
+
headers,
|
|
902
|
+
vary,
|
|
903
|
+
variant: variant(req, vary)
|
|
904
|
+
};
|
|
905
|
+
void cache.set(key, stored, { ttl: opts.ttl }).catch((error) => getLogger().debug({ err: error }, "Response cache write failed"));
|
|
906
|
+
});
|
|
822
907
|
next();
|
|
823
908
|
})().catch(next);
|
|
824
909
|
};
|
|
@@ -897,6 +982,7 @@ async function ignite(config) {
|
|
|
897
982
|
);
|
|
898
983
|
}
|
|
899
984
|
configureQueryLog(config.logging);
|
|
985
|
+
configureTracing(config.tracing);
|
|
900
986
|
if (clusterEnabled && cluster2.isPrimary) {
|
|
901
987
|
if (config.cache && config.cache.backend === "memory") {
|
|
902
988
|
servePrimaryCache(config.cache.maxEntries ?? 1e4);
|
|
@@ -949,6 +1035,7 @@ async function ignite(config) {
|
|
|
949
1035
|
if (config.tasks) {
|
|
950
1036
|
if (config.tasks.backend === "bullmq") {
|
|
951
1037
|
await initBullMQ({
|
|
1038
|
+
tracing: !!config.tracing && (config.tracing === true || config.tracing.tasks !== false),
|
|
952
1039
|
redisUrl: config.tasks.redisUrl ?? "redis://localhost:6379",
|
|
953
1040
|
concurrency: config.tasks.concurrency ?? 5,
|
|
954
1041
|
enqueueTimeout: config.tasks.enqueueTimeout ?? 5e3,
|
|
@@ -962,6 +1049,7 @@ async function ignite(config) {
|
|
|
962
1049
|
);
|
|
963
1050
|
}
|
|
964
1051
|
await initPgBoss({
|
|
1052
|
+
tracing: !!config.tracing && (config.tracing === true || config.tracing.tasks !== false),
|
|
965
1053
|
connectionString,
|
|
966
1054
|
concurrency: config.tasks.concurrency ?? 5,
|
|
967
1055
|
enqueueTimeout: config.tasks.enqueueTimeout ?? 5e3,
|
|
@@ -973,6 +1061,15 @@ async function ignite(config) {
|
|
|
973
1061
|
const routes = scanDir(apiDir);
|
|
974
1062
|
const apiRouter = express.Router();
|
|
975
1063
|
const mounted = await mountRoutes(apiRouter, routes);
|
|
1064
|
+
if (config.openapi) {
|
|
1065
|
+
const meta = readProjectMeta();
|
|
1066
|
+
const options = config.openapi === true ? {} : config.openapi;
|
|
1067
|
+
await mountOpenAPI(app, mounted, {
|
|
1068
|
+
info: { title: meta.name, version: meta.version },
|
|
1069
|
+
...options,
|
|
1070
|
+
basePath
|
|
1071
|
+
});
|
|
1072
|
+
}
|
|
976
1073
|
app.use(basePath, apiRouter);
|
|
977
1074
|
if (config.dashboard !== false && process.env["NODE_ENV"] === "development") {
|
|
978
1075
|
app.get("/", (_req, res) => {
|
|
@@ -983,7 +1080,9 @@ async function ignite(config) {
|
|
|
983
1080
|
}
|
|
984
1081
|
mountErrorHandler(app, onError);
|
|
985
1082
|
return new Promise((resolve, reject) => {
|
|
986
|
-
const server =
|
|
1083
|
+
const server = http.createServer(app);
|
|
1084
|
+
if (config.websocket !== false && mounted.some((route) => route.websocket))
|
|
1085
|
+
attachWebSockets(server, app, config.websocket);
|
|
987
1086
|
server.once("listening", () => {
|
|
988
1087
|
const wid = cluster2.worker?.id ?? "primary";
|
|
989
1088
|
const addr = server.address();
|
|
@@ -991,6 +1090,7 @@ async function ignite(config) {
|
|
|
991
1090
|
resolve(server);
|
|
992
1091
|
});
|
|
993
1092
|
server.once("error", reject);
|
|
1093
|
+
server.listen(port);
|
|
994
1094
|
});
|
|
995
1095
|
}
|
|
996
1096
|
function gracefulShutdown(server, timeoutMs = 1e4) {
|
|
@@ -1000,10 +1100,22 @@ function gracefulShutdown(server, timeoutMs = 1e4) {
|
|
|
1000
1100
|
shuttingDown = true;
|
|
1001
1101
|
getLogger().info(`${signal} received \u2014 closing server gracefully\u2026`);
|
|
1002
1102
|
if (server) {
|
|
1103
|
+
const websocketDrain = closeWebSockets(server, Math.max(1, Math.min(1e3, timeoutMs / 2)));
|
|
1003
1104
|
server.closeIdleConnections();
|
|
1004
1105
|
server.close(() => {
|
|
1005
1106
|
getLogger().info("Server closed");
|
|
1006
|
-
|
|
1107
|
+
drainServices({
|
|
1108
|
+
transports: [websocketDrain],
|
|
1109
|
+
tasks: [closeBullMQ, closePgBoss],
|
|
1110
|
+
cache: closeCache,
|
|
1111
|
+
tracing: shutdownTracing
|
|
1112
|
+
}).then(
|
|
1113
|
+
() => process.exit(0),
|
|
1114
|
+
(err) => {
|
|
1115
|
+
getLogger().error({ err }, "Service shutdown failed");
|
|
1116
|
+
process.exit(1);
|
|
1117
|
+
}
|
|
1118
|
+
);
|
|
1007
1119
|
});
|
|
1008
1120
|
setTimeout(() => {
|
|
1009
1121
|
getLogger().error("Forced exit after timeout");
|
|
@@ -1023,13 +1135,16 @@ function gracefulShutdown(server, timeoutMs = 1e4) {
|
|
|
1023
1135
|
export {
|
|
1024
1136
|
HttpError,
|
|
1025
1137
|
ModelValidationError,
|
|
1138
|
+
attachWebSockets,
|
|
1026
1139
|
cache,
|
|
1027
1140
|
cacheResponse,
|
|
1141
|
+
closeWebSockets,
|
|
1028
1142
|
compose,
|
|
1029
1143
|
db,
|
|
1030
1144
|
defineCollection,
|
|
1031
1145
|
defineModel,
|
|
1032
1146
|
defineTable,
|
|
1147
|
+
generateOpenAPI,
|
|
1033
1148
|
getDbClient,
|
|
1034
1149
|
getLogger,
|
|
1035
1150
|
getQueryMetrics,
|