heliumts 0.9.4 → 0.9.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -1
- package/dist/bin/helium.js +57 -53
- package/dist/bin/helium.js.map +1 -1
- package/dist/client/Router.d.ts +2 -2
- package/dist/client/Router.d.ts.map +1 -1
- package/dist/client/Router.js +32 -29
- package/dist/client/Router.js.map +1 -1
- package/dist/client/cache.d.ts.map +1 -1
- package/dist/client/cache.js +13 -13
- package/dist/client/cache.js.map +1 -1
- package/dist/client/env.js.map +1 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js.map +1 -1
- package/dist/client/routerManifest.d.ts.map +1 -1
- package/dist/client/routerManifest.js +18 -29
- package/dist/client/routerManifest.js.map +1 -1
- package/dist/client/rpcClient.d.ts.map +1 -1
- package/dist/client/rpcClient.js +71 -72
- package/dist/client/rpcClient.js.map +1 -1
- package/dist/client/transitions.d.ts +1 -1
- package/dist/client/transitions.d.ts.map +1 -1
- package/dist/client/useCall.d.ts.map +1 -1
- package/dist/client/useCall.js +4 -1
- package/dist/client/useCall.js.map +1 -1
- package/dist/client/useFetch.d.ts.map +1 -1
- package/dist/client/useFetch.js +48 -92
- package/dist/client/useFetch.js.map +1 -1
- package/dist/runtime/routeOrder.d.ts +3 -0
- package/dist/runtime/routeOrder.d.ts.map +1 -0
- package/dist/runtime/routeOrder.js +15 -0
- package/dist/runtime/routeOrder.js.map +1 -0
- package/dist/server/config.d.ts.map +1 -1
- package/dist/server/config.js +51 -26
- package/dist/server/config.js.map +1 -1
- package/dist/server/defineHTTPRequest.d.ts +1 -1
- package/dist/server/defineHTTPRequest.d.ts.map +1 -1
- package/dist/server/defineHTTPRequest.js.map +1 -1
- package/dist/server/defineWorker.d.ts.map +1 -1
- package/dist/server/defineWorker.js +68 -37
- package/dist/server/defineWorker.js.map +1 -1
- package/dist/server/devServer.d.ts.map +1 -1
- package/dist/server/devServer.js +62 -17
- package/dist/server/devServer.js.map +1 -1
- package/dist/server/httpRouter.d.ts.map +1 -1
- package/dist/server/httpRouter.js +147 -43
- package/dist/server/httpRouter.js.map +1 -1
- package/dist/server/meta.d.ts.map +1 -1
- package/dist/server/meta.js +23 -15
- package/dist/server/meta.js.map +1 -1
- package/dist/server/prodServer.d.ts.map +1 -1
- package/dist/server/prodServer.js +79 -23
- package/dist/server/prodServer.js.map +1 -1
- package/dist/server/rateLimiter.d.ts +9 -0
- package/dist/server/rateLimiter.d.ts.map +1 -1
- package/dist/server/rateLimiter.js +46 -0
- package/dist/server/rateLimiter.js.map +1 -1
- package/dist/server/requestHandler.d.ts +4 -0
- package/dist/server/requestHandler.d.ts.map +1 -0
- package/dist/server/requestHandler.js +20 -0
- package/dist/server/requestHandler.js.map +1 -0
- package/dist/server/rpcRegistry.d.ts.map +1 -1
- package/dist/server/rpcRegistry.js +46 -6
- package/dist/server/rpcRegistry.js.map +1 -1
- package/dist/server/security.d.ts.map +1 -1
- package/dist/server/security.js +3 -2
- package/dist/server/security.js.map +1 -1
- package/dist/server/serializer.js +11 -6
- package/dist/server/serializer.js.map +1 -1
- package/dist/server/ssr.d.ts +2 -1
- package/dist/server/ssr.d.ts.map +1 -1
- package/dist/server/ssr.js +29 -32
- package/dist/server/ssr.js.map +1 -1
- package/dist/utils/envLoader.js +1 -1
- package/dist/utils/envLoader.js.map +1 -1
- package/dist/utils/html.d.ts +7 -0
- package/dist/utils/html.d.ts.map +1 -0
- package/dist/utils/html.js +197 -0
- package/dist/utils/html.js.map +1 -0
- package/dist/utils/ipExtractor.d.ts +6 -52
- package/dist/utils/ipExtractor.d.ts.map +1 -1
- package/dist/utils/ipExtractor.js +21 -118
- package/dist/utils/ipExtractor.js.map +1 -1
- package/dist/vite/heliumPlugin.d.ts.map +1 -1
- package/dist/vite/heliumPlugin.js +71 -83
- package/dist/vite/heliumPlugin.js.map +1 -1
- package/dist/vite/scanner.d.ts +3 -0
- package/dist/vite/scanner.d.ts.map +1 -1
- package/dist/vite/scanner.js +89 -18
- package/dist/vite/scanner.js.map +1 -1
- package/dist/vite/ssg.d.ts +4 -0
- package/dist/vite/ssg.d.ts.map +1 -1
- package/dist/vite/ssg.js +62 -39
- package/dist/vite/ssg.js.map +1 -1
- package/dist/vite/virtualServerModule.d.ts +1 -1
- package/dist/vite/virtualServerModule.d.ts.map +1 -1
- package/dist/vite/virtualServerModule.js +28 -16
- package/dist/vite/virtualServerModule.js.map +1 -1
- package/package.json +12 -7
|
@@ -1,32 +1,68 @@
|
|
|
1
1
|
import { log } from "../utils/logger.js";
|
|
2
|
-
// Map to track running worker instances
|
|
3
2
|
const runningWorkers = new Map();
|
|
3
|
+
function removeWorker(name, workerState) {
|
|
4
|
+
if (runningWorkers.get(name) === workerState) {
|
|
5
|
+
runningWorkers.delete(name);
|
|
6
|
+
}
|
|
7
|
+
}
|
|
4
8
|
function isCleanupHandler(cleanup) {
|
|
5
9
|
return typeof cleanup === "function";
|
|
6
10
|
}
|
|
7
|
-
function registerCleanup(workerState, cleanup) {
|
|
11
|
+
function registerCleanup(name, workerState, cleanup) {
|
|
8
12
|
if (!isCleanupHandler(cleanup)) {
|
|
9
13
|
return;
|
|
10
14
|
}
|
|
11
15
|
workerState.cleanupHandlers.push(cleanup);
|
|
16
|
+
// Async setup may finish after stop() has returned. Dispose its resources too.
|
|
17
|
+
if (workerState.cleanupRequested) {
|
|
18
|
+
void runWorkerCleanup(name, workerState);
|
|
19
|
+
}
|
|
12
20
|
}
|
|
13
21
|
async function runWorkerCleanup(name, workerState) {
|
|
22
|
+
workerState.cleanupRequested = true;
|
|
14
23
|
if (workerState.cleanupPromise) {
|
|
15
24
|
await workerState.cleanupPromise;
|
|
25
|
+
if (workerState.cleanupHandlers.length > 0) {
|
|
26
|
+
await runWorkerCleanup(name, workerState);
|
|
27
|
+
}
|
|
16
28
|
return;
|
|
17
29
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
30
|
+
const cleanupPromise = (async () => {
|
|
31
|
+
while (workerState.cleanupHandlers.length > 0) {
|
|
32
|
+
const cleanupHandlers = workerState.cleanupHandlers.splice(0).reverse();
|
|
33
|
+
for (const cleanup of cleanupHandlers) {
|
|
34
|
+
try {
|
|
35
|
+
await cleanup();
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
log("error", `Worker '${name}' cleanup failed:`, error);
|
|
39
|
+
}
|
|
26
40
|
}
|
|
27
41
|
}
|
|
28
42
|
})();
|
|
29
|
-
|
|
43
|
+
workerState.cleanupPromise = cleanupPromise;
|
|
44
|
+
try {
|
|
45
|
+
await cleanupPromise;
|
|
46
|
+
}
|
|
47
|
+
finally {
|
|
48
|
+
if (workerState.cleanupPromise === cleanupPromise) {
|
|
49
|
+
workerState.cleanupPromise = null;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function waitForRestart(signal, delay) {
|
|
54
|
+
if (signal.aborted) {
|
|
55
|
+
return Promise.resolve();
|
|
56
|
+
}
|
|
57
|
+
return new Promise((resolve) => {
|
|
58
|
+
const done = () => {
|
|
59
|
+
clearTimeout(timer);
|
|
60
|
+
signal.removeEventListener("abort", done);
|
|
61
|
+
resolve();
|
|
62
|
+
};
|
|
63
|
+
const timer = setTimeout(done, delay);
|
|
64
|
+
signal.addEventListener("abort", done, { once: true });
|
|
65
|
+
});
|
|
30
66
|
}
|
|
31
67
|
function waitForAbort(signal) {
|
|
32
68
|
if (signal.aborted) {
|
|
@@ -120,6 +156,7 @@ export async function startWorker(worker, createContext) {
|
|
|
120
156
|
instance: undefined,
|
|
121
157
|
cleanupHandlers: [],
|
|
122
158
|
cleanupPromise: null,
|
|
159
|
+
cleanupRequested: false,
|
|
123
160
|
};
|
|
124
161
|
const instance = {
|
|
125
162
|
id: name,
|
|
@@ -131,7 +168,7 @@ export async function startWorker(worker, createContext) {
|
|
|
131
168
|
abortController.abort();
|
|
132
169
|
instance.status = "stopped";
|
|
133
170
|
await runWorkerCleanup(name, workerState);
|
|
134
|
-
|
|
171
|
+
removeWorker(name, workerState);
|
|
135
172
|
log("info", `Worker '${name}' stopped`);
|
|
136
173
|
},
|
|
137
174
|
};
|
|
@@ -139,6 +176,7 @@ export async function startWorker(worker, createContext) {
|
|
|
139
176
|
const runWorker = async () => {
|
|
140
177
|
while (!abortController.signal.aborted) {
|
|
141
178
|
try {
|
|
179
|
+
workerState.cleanupRequested = false;
|
|
142
180
|
instance.status = "running";
|
|
143
181
|
instance.startedAt = new Date();
|
|
144
182
|
log("info", `Starting worker '${name}'`);
|
|
@@ -146,11 +184,11 @@ export async function startWorker(worker, createContext) {
|
|
|
146
184
|
const lifecycle = {
|
|
147
185
|
signal: abortController.signal,
|
|
148
186
|
onCleanup: (cleanup) => {
|
|
149
|
-
registerCleanup(workerState, cleanup);
|
|
187
|
+
registerCleanup(name, workerState, cleanup);
|
|
150
188
|
},
|
|
151
189
|
};
|
|
152
190
|
const cleanup = await handler(ctx, lifecycle);
|
|
153
|
-
registerCleanup(workerState, cleanup);
|
|
191
|
+
registerCleanup(name, workerState, cleanup);
|
|
154
192
|
if (isCleanupHandler(cleanup) && !abortController.signal.aborted) {
|
|
155
193
|
await waitForAbort(abortController.signal);
|
|
156
194
|
}
|
|
@@ -159,7 +197,10 @@ export async function startWorker(worker, createContext) {
|
|
|
159
197
|
await runWorkerCleanup(name, workerState);
|
|
160
198
|
log("info", `Worker '${name}' completed successfully`);
|
|
161
199
|
instance.status = "stopped";
|
|
162
|
-
|
|
200
|
+
removeWorker(name, workerState);
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
await runWorkerCleanup(name, workerState);
|
|
163
204
|
}
|
|
164
205
|
break;
|
|
165
206
|
}
|
|
@@ -169,33 +210,35 @@ export async function startWorker(worker, createContext) {
|
|
|
169
210
|
break;
|
|
170
211
|
}
|
|
171
212
|
await runWorkerCleanup(name, workerState);
|
|
172
|
-
|
|
213
|
+
if (abortController.signal.aborted) {
|
|
214
|
+
break;
|
|
215
|
+
}
|
|
173
216
|
instance.lastError = error instanceof Error ? error : new Error(String(error));
|
|
174
217
|
instance.status = "crashed";
|
|
175
|
-
restartCount++;
|
|
176
|
-
instance.restartCount = restartCount;
|
|
177
218
|
log("error", `Worker '${name}' crashed:`, error);
|
|
178
219
|
// Check if we should restart
|
|
179
220
|
if (options.autoRestart) {
|
|
180
221
|
if (options.maxRestarts > 0 && restartCount >= options.maxRestarts) {
|
|
181
222
|
log("error", `Worker '${name}' exceeded max restarts (${options.maxRestarts}), giving up`);
|
|
182
|
-
|
|
223
|
+
removeWorker(name, workerState);
|
|
183
224
|
break;
|
|
184
225
|
}
|
|
226
|
+
restartCount++;
|
|
227
|
+
instance.restartCount = restartCount;
|
|
185
228
|
instance.status = "restarting";
|
|
186
229
|
log("info", `Worker '${name}' will restart in ${options.restartDelayMs}ms (attempt ${restartCount}${options.maxRestarts > 0 ? `/${options.maxRestarts}` : ""})`);
|
|
187
|
-
await
|
|
230
|
+
await waitForRestart(abortController.signal, options.restartDelayMs);
|
|
188
231
|
}
|
|
189
232
|
else {
|
|
190
|
-
|
|
233
|
+
removeWorker(name, workerState);
|
|
191
234
|
break;
|
|
192
235
|
}
|
|
193
236
|
}
|
|
194
237
|
}
|
|
195
238
|
};
|
|
196
|
-
|
|
197
|
-
workerState.promise = promise;
|
|
239
|
+
// Publish state before invoking user code, including synchronous handlers.
|
|
198
240
|
runningWorkers.set(name, workerState);
|
|
241
|
+
workerState.promise = runWorker();
|
|
199
242
|
return instance;
|
|
200
243
|
}
|
|
201
244
|
/**
|
|
@@ -204,14 +247,7 @@ export async function startWorker(worker, createContext) {
|
|
|
204
247
|
export function stopWorker(name) {
|
|
205
248
|
const worker = runningWorkers.get(name);
|
|
206
249
|
if (worker) {
|
|
207
|
-
worker.
|
|
208
|
-
worker.instance.status = "stopped";
|
|
209
|
-
void runWorkerCleanup(name, worker)
|
|
210
|
-
.catch(() => { })
|
|
211
|
-
.finally(() => {
|
|
212
|
-
runningWorkers.delete(name);
|
|
213
|
-
log("info", `Worker '${name}' stopped`);
|
|
214
|
-
});
|
|
250
|
+
void worker.instance.stop();
|
|
215
251
|
return true;
|
|
216
252
|
}
|
|
217
253
|
return false;
|
|
@@ -221,12 +257,7 @@ export function stopWorker(name) {
|
|
|
221
257
|
*/
|
|
222
258
|
export async function stopAllWorkers() {
|
|
223
259
|
const workers = Array.from(runningWorkers.values());
|
|
224
|
-
|
|
225
|
-
worker.abortController.abort();
|
|
226
|
-
worker.instance.status = "stopped";
|
|
227
|
-
}
|
|
228
|
-
await Promise.all(workers.map(async (worker) => runWorkerCleanup(worker.instance.name, worker)));
|
|
229
|
-
runningWorkers.clear();
|
|
260
|
+
await Promise.all(workers.map((worker) => worker.instance.stop()));
|
|
230
261
|
log("info", `Stopped ${workers.length} worker(s)`);
|
|
231
262
|
}
|
|
232
263
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defineWorker.js","sourceRoot":"","sources":["../../src/server/defineWorker.ts"],"names":[],"mappings":"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","sourcesContent":["import { log } from \"../utils/logger.js\";\nimport type { HeliumContext } from \"./context.js\";\n\nexport type WorkerCleanup = (() => Promise<void> | void) | void;\n\nexport interface WorkerLifecycle {\n signal: AbortSignal;\n onCleanup: (cleanup: WorkerCleanup) => void;\n}\n\nexport interface WorkerOptions {\n /**\n * The name of the worker, used for logging and identification.\n * If not provided, the handler function name will be used.\n */\n name?: string;\n\n /**\n * Whether the worker should automatically restart if it crashes.\n * Default: true\n */\n autoRestart?: boolean;\n\n /**\n * Delay in milliseconds before restarting the worker after a crash.\n * Default: 5000 (5 seconds)\n */\n restartDelayMs?: number;\n\n /**\n * Maximum number of restart attempts before giving up.\n * Set to 0 for unlimited restarts.\n * Default: 0 (unlimited)\n */\n maxRestarts?: number;\n\n /**\n * Whether to start the worker automatically on server startup.\n * Default: true\n */\n autoStart?: boolean;\n}\n\nexport type WorkerHandler = (ctx: HeliumContext, lifecycle: WorkerLifecycle) => Promise<WorkerCleanup> | WorkerCleanup;\n\nexport type HeliumWorkerDef = {\n __kind: \"worker\";\n __id: string;\n name: string;\n handler: WorkerHandler;\n options: Required<WorkerOptions>;\n};\n\nexport interface WorkerInstance {\n id: string;\n name: string;\n status: \"running\" | \"stopped\" | \"crashed\" | \"restarting\";\n startedAt: Date | null;\n restartCount: number;\n lastError?: Error;\n stop: () => Promise<void>;\n}\n\n// Map to track running worker instances\nconst runningWorkers = new Map<\n string,\n {\n abortController: AbortController;\n promise: Promise<void>;\n instance: WorkerInstance;\n cleanupHandlers: Array<() => Promise<void> | void>;\n cleanupPromise: Promise<void> | null;\n }\n>();\n\nfunction isCleanupHandler(cleanup: WorkerCleanup): cleanup is () => Promise<void> | void {\n return typeof cleanup === \"function\";\n}\n\nfunction registerCleanup(\n workerState: {\n cleanupHandlers: Array<() => Promise<void> | void>;\n },\n cleanup: WorkerCleanup\n) {\n if (!isCleanupHandler(cleanup)) {\n return;\n }\n\n workerState.cleanupHandlers.push(cleanup);\n}\n\nasync function runWorkerCleanup(\n name: string,\n workerState: {\n cleanupHandlers: Array<() => Promise<void> | void>;\n cleanupPromise: Promise<void> | null;\n }\n): Promise<void> {\n if (workerState.cleanupPromise) {\n await workerState.cleanupPromise;\n return;\n }\n\n workerState.cleanupPromise = (async () => {\n const cleanupHandlers = workerState.cleanupHandlers.splice(0).reverse();\n\n for (const cleanup of cleanupHandlers) {\n try {\n await cleanup();\n } catch (error) {\n log(\"error\", `Worker '${name}' cleanup failed:`, error);\n }\n }\n })();\n\n await workerState.cleanupPromise;\n}\n\nfunction waitForAbort(signal: AbortSignal): Promise<void> {\n if (signal.aborted) {\n return Promise.resolve();\n }\n\n return new Promise((resolve) => {\n signal.addEventListener(\"abort\", () => resolve(), { once: true });\n });\n}\n\n/**\n * Create a Helium background worker definition.\n *\n * Workers are long-running background processes that start when the server\n * starts and continue running until the server shuts down. They are ideal for:\n * - Queue consumers (processing jobs from Redis, RabbitMQ, SQS, etc.)\n * - Background task processors\n * - Scheduled jobs and cron-like tasks\n * - Real-time data synchronization\n * - WebSocket connection managers\n * - Cache warmers and data pre-loaders\n *\n * @example\n * ```typescript\n * // Basic worker\n * export const queueConsumer = defineWorker(async (ctx) => {\n * while (true) {\n * const job = await queue.pop();\n * if (job) {\n * await processJob(job);\n * }\n * await sleep(1000);\n * }\n * }, { name: 'queueConsumer' });\n *\n * // Worker with options\n * export const dataSync = defineWorker(async (ctx) => {\n * // Sync data every 30 seconds\n * while (true) {\n * await syncData();\n * await sleep(30000);\n * }\n * }, {\n * name: 'dataSync',\n * autoRestart: true,\n * restartDelayMs: 10000,\n * maxRestarts: 5\n * });\n * ```\n *\n * @param handler - The worker function that runs in the background\n * @param options - Configuration options for the worker\n * @returns A HeliumWorkerDef that will be started by the server runtime\n */\nexport function defineWorker(handler: WorkerHandler, options: WorkerOptions = {}): HeliumWorkerDef {\n if (!handler) {\n throw new Error(\"defineWorker requires a handler\");\n }\n\n const name = options.name || handler.name || \"anonymous\";\n\n const resolvedOptions: Required<WorkerOptions> = {\n name,\n autoRestart: options.autoRestart ?? true,\n restartDelayMs: options.restartDelayMs ?? 5000,\n maxRestarts: options.maxRestarts ?? 0,\n autoStart: options.autoStart ?? true,\n };\n\n return {\n __kind: \"worker\",\n __id: name,\n name,\n handler,\n options: resolvedOptions,\n };\n}\n\n/**\n * Start a worker and manage its lifecycle.\n * @internal\n */\nexport async function startWorker(worker: HeliumWorkerDef, createContext: () => HeliumContext): Promise<WorkerInstance> {\n const { name, handler, options } = worker;\n\n // Check if worker is already running\n if (runningWorkers.has(name)) {\n const existing = runningWorkers.get(name)!;\n log(\"warn\", `Worker '${name}' is already running`);\n return existing.instance;\n }\n\n const abortController = new AbortController();\n let restartCount = 0;\n const workerState = {\n abortController,\n promise: Promise.resolve(),\n instance: undefined as unknown as WorkerInstance,\n cleanupHandlers: [] as Array<() => Promise<void> | void>,\n cleanupPromise: null as Promise<void> | null,\n };\n\n const instance: WorkerInstance = {\n id: name,\n name,\n status: \"running\",\n startedAt: new Date(),\n restartCount: 0,\n stop: async () => {\n abortController.abort();\n instance.status = \"stopped\";\n await runWorkerCleanup(name, workerState);\n runningWorkers.delete(name);\n log(\"info\", `Worker '${name}' stopped`);\n },\n };\n workerState.instance = instance;\n\n const runWorker = async (): Promise<void> => {\n while (!abortController.signal.aborted) {\n try {\n instance.status = \"running\";\n instance.startedAt = new Date();\n log(\"info\", `Starting worker '${name}'`);\n\n const ctx = createContext();\n const lifecycle: WorkerLifecycle = {\n signal: abortController.signal,\n onCleanup: (cleanup) => {\n registerCleanup(workerState, cleanup);\n },\n };\n const cleanup = await handler(ctx, lifecycle);\n registerCleanup(workerState, cleanup);\n\n if (isCleanupHandler(cleanup) && !abortController.signal.aborted) {\n await waitForAbort(abortController.signal);\n }\n\n // If handler completes normally, exit the loop\n if (!abortController.signal.aborted) {\n await runWorkerCleanup(name, workerState);\n log(\"info\", `Worker '${name}' completed successfully`);\n instance.status = \"stopped\";\n runningWorkers.delete(name);\n }\n break;\n } catch (error) {\n if (abortController.signal.aborted) {\n // Worker was intentionally stopped\n break;\n }\n\n await runWorkerCleanup(name, workerState);\n workerState.cleanupPromise = null;\n\n instance.lastError = error instanceof Error ? error : new Error(String(error));\n instance.status = \"crashed\";\n restartCount++;\n instance.restartCount = restartCount;\n\n log(\"error\", `Worker '${name}' crashed:`, error);\n\n // Check if we should restart\n if (options.autoRestart) {\n if (options.maxRestarts > 0 && restartCount >= options.maxRestarts) {\n log(\"error\", `Worker '${name}' exceeded max restarts (${options.maxRestarts}), giving up`);\n runningWorkers.delete(name);\n break;\n }\n\n instance.status = \"restarting\";\n log(\n \"info\",\n `Worker '${name}' will restart in ${options.restartDelayMs}ms (attempt ${restartCount}${options.maxRestarts > 0 ? `/${options.maxRestarts}` : \"\"})`\n );\n\n await new Promise((resolve) => setTimeout(resolve, options.restartDelayMs));\n } else {\n runningWorkers.delete(name);\n break;\n }\n }\n }\n };\n\n const promise = runWorker();\n workerState.promise = promise;\n\n runningWorkers.set(name, workerState);\n\n return instance;\n}\n\n/**\n * Stop a running worker by name.\n */\nexport function stopWorker(name: string): boolean {\n const worker = runningWorkers.get(name);\n if (worker) {\n worker.abortController.abort();\n worker.instance.status = \"stopped\";\n void runWorkerCleanup(name, worker)\n .catch(() => {})\n .finally(() => {\n runningWorkers.delete(name);\n log(\"info\", `Worker '${name}' stopped`);\n });\n return true;\n }\n return false;\n}\n\n/**\n * Stop all running workers.\n */\nexport async function stopAllWorkers(): Promise<void> {\n const workers = Array.from(runningWorkers.values());\n for (const worker of workers) {\n worker.abortController.abort();\n worker.instance.status = \"stopped\";\n }\n await Promise.all(workers.map(async (worker) => runWorkerCleanup(worker.instance.name, worker)));\n runningWorkers.clear();\n log(\"info\", `Stopped ${workers.length} worker(s)`);\n}\n\n/**\n * Get the status of all workers.\n */\nexport function getWorkerStatus(): WorkerInstance[] {\n return Array.from(runningWorkers.values()).map((w) => w.instance);\n}\n\n/**\n * Get a specific worker's status.\n */\nexport function getWorkerById(name: string): WorkerInstance | undefined {\n return runningWorkers.get(name)?.instance;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"defineWorker.js","sourceRoot":"","sources":["../../src/server/defineWorker.ts"],"names":[],"mappings":"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","sourcesContent":["import { log } from \"../utils/logger.js\";\nimport type { HeliumContext } from \"./context.js\";\n\nexport type WorkerCleanup = (() => Promise<void> | void) | void;\n\nexport interface WorkerLifecycle {\n signal: AbortSignal;\n onCleanup: (cleanup: WorkerCleanup) => void;\n}\n\nexport interface WorkerOptions {\n /**\n * The name of the worker, used for logging and identification.\n * If not provided, the handler function name will be used.\n */\n name?: string;\n\n /**\n * Whether the worker should automatically restart if it crashes.\n * Default: true\n */\n autoRestart?: boolean;\n\n /**\n * Delay in milliseconds before restarting the worker after a crash.\n * Default: 5000 (5 seconds)\n */\n restartDelayMs?: number;\n\n /**\n * Maximum number of restart attempts before giving up.\n * Set to 0 for unlimited restarts.\n * Default: 0 (unlimited)\n */\n maxRestarts?: number;\n\n /**\n * Whether to start the worker automatically on server startup.\n * Default: true\n */\n autoStart?: boolean;\n}\n\nexport type WorkerHandler = (ctx: HeliumContext, lifecycle: WorkerLifecycle) => Promise<WorkerCleanup> | WorkerCleanup;\n\nexport type HeliumWorkerDef = {\n __kind: \"worker\";\n __id: string;\n name: string;\n handler: WorkerHandler;\n options: Required<WorkerOptions>;\n};\n\nexport interface WorkerInstance {\n id: string;\n name: string;\n status: \"running\" | \"stopped\" | \"crashed\" | \"restarting\";\n startedAt: Date | null;\n restartCount: number;\n lastError?: Error;\n stop: () => Promise<void>;\n}\n\ninterface WorkerState {\n abortController: AbortController;\n promise: Promise<void>;\n instance: WorkerInstance;\n cleanupHandlers: Array<() => Promise<void> | void>;\n cleanupPromise: Promise<void> | null;\n cleanupRequested: boolean;\n}\n\nconst runningWorkers = new Map<string, WorkerState>();\n\nfunction removeWorker(name: string, workerState: WorkerState): void {\n if (runningWorkers.get(name) === workerState) {\n runningWorkers.delete(name);\n }\n}\n\nfunction isCleanupHandler(cleanup: WorkerCleanup): cleanup is () => Promise<void> | void {\n return typeof cleanup === \"function\";\n}\n\nfunction registerCleanup(name: string, workerState: WorkerState, cleanup: WorkerCleanup) {\n if (!isCleanupHandler(cleanup)) {\n return;\n }\n\n workerState.cleanupHandlers.push(cleanup);\n // Async setup may finish after stop() has returned. Dispose its resources too.\n if (workerState.cleanupRequested) {\n void runWorkerCleanup(name, workerState);\n }\n}\n\nasync function runWorkerCleanup(name: string, workerState: WorkerState): Promise<void> {\n workerState.cleanupRequested = true;\n if (workerState.cleanupPromise) {\n await workerState.cleanupPromise;\n if (workerState.cleanupHandlers.length > 0) {\n await runWorkerCleanup(name, workerState);\n }\n return;\n }\n\n const cleanupPromise = (async () => {\n while (workerState.cleanupHandlers.length > 0) {\n const cleanupHandlers = workerState.cleanupHandlers.splice(0).reverse();\n for (const cleanup of cleanupHandlers) {\n try {\n await cleanup();\n } catch (error) {\n log(\"error\", `Worker '${name}' cleanup failed:`, error);\n }\n }\n }\n })();\n workerState.cleanupPromise = cleanupPromise;\n try {\n await cleanupPromise;\n } finally {\n if (workerState.cleanupPromise === cleanupPromise) {\n workerState.cleanupPromise = null;\n }\n }\n}\n\nfunction waitForRestart(signal: AbortSignal, delay: number): Promise<void> {\n if (signal.aborted) {\n return Promise.resolve();\n }\n return new Promise((resolve) => {\n const done = () => {\n clearTimeout(timer);\n signal.removeEventListener(\"abort\", done);\n resolve();\n };\n const timer = setTimeout(done, delay);\n signal.addEventListener(\"abort\", done, { once: true });\n });\n}\n\nfunction waitForAbort(signal: AbortSignal): Promise<void> {\n if (signal.aborted) {\n return Promise.resolve();\n }\n\n return new Promise((resolve) => {\n signal.addEventListener(\"abort\", () => resolve(), { once: true });\n });\n}\n\n/**\n * Create a Helium background worker definition.\n *\n * Workers are long-running background processes that start when the server\n * starts and continue running until the server shuts down. They are ideal for:\n * - Queue consumers (processing jobs from Redis, RabbitMQ, SQS, etc.)\n * - Background task processors\n * - Scheduled jobs and cron-like tasks\n * - Real-time data synchronization\n * - WebSocket connection managers\n * - Cache warmers and data pre-loaders\n *\n * @example\n * ```typescript\n * // Basic worker\n * export const queueConsumer = defineWorker(async (ctx) => {\n * while (true) {\n * const job = await queue.pop();\n * if (job) {\n * await processJob(job);\n * }\n * await sleep(1000);\n * }\n * }, { name: 'queueConsumer' });\n *\n * // Worker with options\n * export const dataSync = defineWorker(async (ctx) => {\n * // Sync data every 30 seconds\n * while (true) {\n * await syncData();\n * await sleep(30000);\n * }\n * }, {\n * name: 'dataSync',\n * autoRestart: true,\n * restartDelayMs: 10000,\n * maxRestarts: 5\n * });\n * ```\n *\n * @param handler - The worker function that runs in the background\n * @param options - Configuration options for the worker\n * @returns A HeliumWorkerDef that will be started by the server runtime\n */\nexport function defineWorker(handler: WorkerHandler, options: WorkerOptions = {}): HeliumWorkerDef {\n if (!handler) {\n throw new Error(\"defineWorker requires a handler\");\n }\n\n const name = options.name || handler.name || \"anonymous\";\n\n const resolvedOptions: Required<WorkerOptions> = {\n name,\n autoRestart: options.autoRestart ?? true,\n restartDelayMs: options.restartDelayMs ?? 5000,\n maxRestarts: options.maxRestarts ?? 0,\n autoStart: options.autoStart ?? true,\n };\n\n return {\n __kind: \"worker\",\n __id: name,\n name,\n handler,\n options: resolvedOptions,\n };\n}\n\n/**\n * Start a worker and manage its lifecycle.\n * @internal\n */\nexport async function startWorker(worker: HeliumWorkerDef, createContext: () => HeliumContext): Promise<WorkerInstance> {\n const { name, handler, options } = worker;\n\n // Check if worker is already running\n if (runningWorkers.has(name)) {\n const existing = runningWorkers.get(name)!;\n log(\"warn\", `Worker '${name}' is already running`);\n return existing.instance;\n }\n\n const abortController = new AbortController();\n let restartCount = 0;\n const workerState = {\n abortController,\n promise: Promise.resolve(),\n instance: undefined as unknown as WorkerInstance,\n cleanupHandlers: [] as Array<() => Promise<void> | void>,\n cleanupPromise: null as Promise<void> | null,\n cleanupRequested: false,\n };\n\n const instance: WorkerInstance = {\n id: name,\n name,\n status: \"running\",\n startedAt: new Date(),\n restartCount: 0,\n stop: async () => {\n abortController.abort();\n instance.status = \"stopped\";\n await runWorkerCleanup(name, workerState);\n removeWorker(name, workerState);\n log(\"info\", `Worker '${name}' stopped`);\n },\n };\n workerState.instance = instance;\n\n const runWorker = async (): Promise<void> => {\n while (!abortController.signal.aborted) {\n try {\n workerState.cleanupRequested = false;\n instance.status = \"running\";\n instance.startedAt = new Date();\n log(\"info\", `Starting worker '${name}'`);\n\n const ctx = createContext();\n const lifecycle: WorkerLifecycle = {\n signal: abortController.signal,\n onCleanup: (cleanup) => {\n registerCleanup(name, workerState, cleanup);\n },\n };\n const cleanup = await handler(ctx, lifecycle);\n registerCleanup(name, workerState, cleanup);\n\n if (isCleanupHandler(cleanup) && !abortController.signal.aborted) {\n await waitForAbort(abortController.signal);\n }\n\n // If handler completes normally, exit the loop\n if (!abortController.signal.aborted) {\n await runWorkerCleanup(name, workerState);\n log(\"info\", `Worker '${name}' completed successfully`);\n instance.status = \"stopped\";\n removeWorker(name, workerState);\n } else {\n await runWorkerCleanup(name, workerState);\n }\n break;\n } catch (error) {\n if (abortController.signal.aborted) {\n // Worker was intentionally stopped\n break;\n }\n\n await runWorkerCleanup(name, workerState);\n if (abortController.signal.aborted) {\n break;\n }\n\n instance.lastError = error instanceof Error ? error : new Error(String(error));\n instance.status = \"crashed\";\n log(\"error\", `Worker '${name}' crashed:`, error);\n\n // Check if we should restart\n if (options.autoRestart) {\n if (options.maxRestarts > 0 && restartCount >= options.maxRestarts) {\n log(\"error\", `Worker '${name}' exceeded max restarts (${options.maxRestarts}), giving up`);\n removeWorker(name, workerState);\n break;\n }\n\n restartCount++;\n instance.restartCount = restartCount;\n instance.status = \"restarting\";\n log(\n \"info\",\n `Worker '${name}' will restart in ${options.restartDelayMs}ms (attempt ${restartCount}${options.maxRestarts > 0 ? `/${options.maxRestarts}` : \"\"})`\n );\n\n await waitForRestart(abortController.signal, options.restartDelayMs);\n } else {\n removeWorker(name, workerState);\n break;\n }\n }\n }\n };\n\n // Publish state before invoking user code, including synchronous handlers.\n runningWorkers.set(name, workerState);\n workerState.promise = runWorker();\n\n return instance;\n}\n\n/**\n * Stop a running worker by name.\n */\nexport function stopWorker(name: string): boolean {\n const worker = runningWorkers.get(name);\n if (worker) {\n void worker.instance.stop();\n return true;\n }\n return false;\n}\n\n/**\n * Stop all running workers.\n */\nexport async function stopAllWorkers(): Promise<void> {\n const workers = Array.from(runningWorkers.values());\n await Promise.all(workers.map((worker) => worker.instance.stop()));\n log(\"info\", `Stopped ${workers.length} worker(s)`);\n}\n\n/**\n * Get the status of all workers.\n */\nexport function getWorkerStatus(): WorkerInstance[] {\n return Array.from(runningWorkers.values()).map((w) => w.instance);\n}\n\n/**\n * Get a specific worker's status.\n */\nexport function getWorkerById(name: string): WorkerInstance | undefined {\n return runningWorkers.get(name)?.instance;\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devServer.d.ts","sourceRoot":"","sources":["../../src/server/devServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAUtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"devServer.d.ts","sourceRoot":"","sources":["../../src/server/devServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAUtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAuD,UAAU,EAAE,MAAM,UAAU,CAAC;AAM3F,KAAK,cAAc,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAC;AAC5G,KAAK,UAAU,GAAG,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,iBAAiB,CAAC;AAE3F,UAAU,WAAW;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;CAC3B;AAED,KAAK,cAAc,GAAG,CAAC,MAAM,OAAO,CAAC,aAAa,CAAC;IAAE,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;AAyD7K;;;GAGG;AACH,wBAAgB,iBAAiB,CAC7B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,cAAc,EAC5B,MAAM,GAAE,YAAiB,EACzB,OAAO,GAAE,WAAW,EAAO,EAC3B,QAAQ,GAAE,UAAU,EAAO,EAC3B,QAAQ,GAAE,cAAqB,QAqlBlC"}
|
package/dist/server/devServer.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { encode as msgpackEncode } from "@msgpack/msgpack";
|
|
1
|
+
import { decode as msgpackDecode, encode as msgpackEncode } from "@msgpack/msgpack";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { promisify } from "util";
|
|
4
4
|
import { WebSocketServer } from "ws";
|
|
@@ -12,6 +12,7 @@ import { startWorker, stopAllWorkers } from "./defineWorker.js";
|
|
|
12
12
|
import { HTTPRouter } from "./httpRouter.js";
|
|
13
13
|
import { injectSocialMetaIntoHtml, loadDefaultSocialMetaFromHtmlFile } from "./meta.js";
|
|
14
14
|
import { RateLimiter } from "./rateLimiter.js";
|
|
15
|
+
import { withRequestErrorHandling } from "./requestHandler.js";
|
|
15
16
|
import { RpcRegistry } from "./rpcRegistry.js";
|
|
16
17
|
import { initializeSecurity, verifyConnectionToken } from "./security.js";
|
|
17
18
|
import { SEOMetadataRouter } from "./seoMetadataRouter.js";
|
|
@@ -30,6 +31,10 @@ let rateLimiter = null;
|
|
|
30
31
|
let currentWorkers = [];
|
|
31
32
|
let cachedDefaultMeta;
|
|
32
33
|
let workerReloadPromise = Promise.resolve();
|
|
34
|
+
const originalRequestListeners = new WeakMap();
|
|
35
|
+
const socketRequests = new WeakMap();
|
|
36
|
+
let currentTrustProxyDepth = 0;
|
|
37
|
+
let currentMaxConnectionsPerIP = 10;
|
|
33
38
|
function createWorkerContext() {
|
|
34
39
|
return {
|
|
35
40
|
req: {
|
|
@@ -75,9 +80,12 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
75
80
|
const rpcSecurity = getRpcSecurityConfig(config);
|
|
76
81
|
const rpcConfig = getRpcConfig(config);
|
|
77
82
|
const compressionConfig = rpcConfig.compression;
|
|
83
|
+
currentTrustProxyDepth = trustProxyDepth;
|
|
84
|
+
currentMaxConnectionsPerIP = rpcSecurity.maxConnectionsPerIP;
|
|
78
85
|
initializeSecurity(rpcSecurity);
|
|
79
|
-
//
|
|
80
|
-
rateLimiter = new RateLimiter(rpcSecurity.maxMessagesPerWindow, rpcSecurity.rateLimitWindowMs, rpcSecurity.maxConnectionsPerIP);
|
|
86
|
+
// Keep live connections tracked across handler reloads.
|
|
87
|
+
rateLimiter ?? (rateLimiter = new RateLimiter(rpcSecurity.maxMessagesPerWindow, rpcSecurity.rateLimitWindowMs, rpcSecurity.maxConnectionsPerIP));
|
|
88
|
+
rateLimiter.configure(rpcSecurity.maxMessagesPerWindow, rpcSecurity.rateLimitWindowMs, rpcSecurity.maxConnectionsPerIP);
|
|
81
89
|
const registry = new RpcRegistry();
|
|
82
90
|
const httpRouter = new HTTPRouter({ maxBodySize: rpcConfig.maxBodySize });
|
|
83
91
|
const seoRouter = new SEOMetadataRouter();
|
|
@@ -91,6 +99,12 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
91
99
|
currentSSRPages = ssrPages;
|
|
92
100
|
currentAppShell = appShell;
|
|
93
101
|
cachedDefaultMeta = undefined;
|
|
102
|
+
for (const socket of wss?.clients ?? []) {
|
|
103
|
+
const req = socketRequests.get(socket);
|
|
104
|
+
if (req) {
|
|
105
|
+
registry.setSocketMetadata(socket, extractClientIP(req, trustProxyDepth), req);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
94
108
|
const getDefaultMeta = async () => {
|
|
95
109
|
if (cachedDefaultMeta !== undefined) {
|
|
96
110
|
return cachedDefaultMeta;
|
|
@@ -136,8 +150,9 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
136
150
|
: false,
|
|
137
151
|
});
|
|
138
152
|
wss.on("connection", (socket, req) => {
|
|
153
|
+
socketRequests.set(socket, req);
|
|
139
154
|
// Extract client IP with proxy configuration
|
|
140
|
-
const ip = extractClientIP(req,
|
|
155
|
+
const ip = extractClientIP(req, currentTrustProxyDepth);
|
|
141
156
|
// Store connection metadata for RPC context
|
|
142
157
|
if (currentRegistry) {
|
|
143
158
|
currentRegistry.setSocketMetadata(socket, ip, req);
|
|
@@ -162,7 +177,6 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
162
177
|
let req;
|
|
163
178
|
// Always expect MessagePack
|
|
164
179
|
const buffer = Buffer.isBuffer(msg) ? msg : Buffer.from(msg);
|
|
165
|
-
const { decode: msgpackDecode } = require("@msgpack/msgpack");
|
|
166
180
|
req = msgpackDecode(buffer);
|
|
167
181
|
const stats = rateLimiter.getConnectionStats(socket);
|
|
168
182
|
const now = Date.now();
|
|
@@ -193,13 +207,15 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
193
207
|
}
|
|
194
208
|
// Always use the current registry (may have been updated)
|
|
195
209
|
if (currentRegistry) {
|
|
196
|
-
currentRegistry.handleMessage(socket, Buffer.isBuffer(msg) ? msg : Buffer.from(msg))
|
|
210
|
+
void currentRegistry.handleMessage(socket, Buffer.isBuffer(msg) ? msg : Buffer.from(msg)).catch((error) => {
|
|
211
|
+
log("error", "WebSocket RPC error:", error);
|
|
212
|
+
});
|
|
197
213
|
}
|
|
198
214
|
});
|
|
199
215
|
});
|
|
200
216
|
// Handle WebSocket upgrade requests
|
|
201
217
|
httpServer.on("upgrade", (req, socket, head) => {
|
|
202
|
-
if (req.url?.
|
|
218
|
+
if (req.url?.split("?")[0] === "/rpc") {
|
|
203
219
|
// Security: read token from Sec-WebSocket-Protocol header instead of query string
|
|
204
220
|
const protocols = req.headers["sec-websocket-protocol"];
|
|
205
221
|
const token = typeof protocols === "string"
|
|
@@ -215,10 +231,10 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
215
231
|
return;
|
|
216
232
|
}
|
|
217
233
|
// Check IP connection limit before upgrading
|
|
218
|
-
const ip = extractClientIP(req,
|
|
219
|
-
if (rateLimiter &&
|
|
234
|
+
const ip = extractClientIP(req, currentTrustProxyDepth);
|
|
235
|
+
if (rateLimiter && currentMaxConnectionsPerIP > 0) {
|
|
220
236
|
const currentConnections = rateLimiter.getIPConnectionCount(ip);
|
|
221
|
-
if (currentConnections >=
|
|
237
|
+
if (currentConnections >= currentMaxConnectionsPerIP) {
|
|
222
238
|
log("warn", `WebSocket connection rejected - IP ${ip} has ${currentConnections} connections`);
|
|
223
239
|
socket.write("HTTP/1.1 429 Too Many Requests\r\n\r\n");
|
|
224
240
|
socket.destroy();
|
|
@@ -231,14 +247,27 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
231
247
|
}
|
|
232
248
|
});
|
|
233
249
|
log("info", "WebSocket RPC attached to dev server at /rpc");
|
|
250
|
+
const attachedWss = wss;
|
|
251
|
+
httpServer.once("close", () => {
|
|
252
|
+
for (const socket of attachedWss.clients) {
|
|
253
|
+
socket.terminate();
|
|
254
|
+
}
|
|
255
|
+
attachedWss.close();
|
|
256
|
+
if (wss === attachedWss) {
|
|
257
|
+
wss = null;
|
|
258
|
+
rateLimiter = null;
|
|
259
|
+
}
|
|
260
|
+
workerReloadPromise = workerReloadPromise.then(() => stopAllWorkers());
|
|
261
|
+
});
|
|
234
262
|
}
|
|
235
263
|
// Security: max body size for HTTP requests
|
|
236
264
|
const maxBodySize = rpcConfig.maxBodySize ?? 1048576;
|
|
237
265
|
// Attach HTTP request handler
|
|
238
266
|
// We need to intercept requests before Vite handles them
|
|
239
|
-
const originalListeners = httpServer.listeners("request").slice();
|
|
267
|
+
const originalListeners = originalRequestListeners.get(httpServer) ?? httpServer.listeners("request").slice();
|
|
268
|
+
originalRequestListeners.set(httpServer, originalListeners);
|
|
240
269
|
httpServer.removeAllListeners("request");
|
|
241
|
-
|
|
270
|
+
const handleRequest = withRequestErrorHandling(async (req, res) => {
|
|
242
271
|
const reqUrl = new URL(req.url || "/", "http://localhost");
|
|
243
272
|
const pathname = reqUrl.pathname;
|
|
244
273
|
const search = reqUrl.search;
|
|
@@ -266,6 +295,7 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
266
295
|
const ssrResult = await resolveServerSideProps({
|
|
267
296
|
req,
|
|
268
297
|
pathname: targetPathname,
|
|
298
|
+
search: targetUrl.search,
|
|
269
299
|
params: ssrMatch.params,
|
|
270
300
|
page: ssrMatch.page,
|
|
271
301
|
ctx: httpCtx,
|
|
@@ -286,7 +316,7 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
286
316
|
return;
|
|
287
317
|
}
|
|
288
318
|
// Handle token refresh endpoint
|
|
289
|
-
if (
|
|
319
|
+
if (pathname === "/__helium__/refresh-token") {
|
|
290
320
|
// Security: only allow POST to prevent CSRF via <img>/<script> tags
|
|
291
321
|
if (req.method !== "POST") {
|
|
292
322
|
res.writeHead(405, { "Content-Type": "application/json" });
|
|
@@ -301,12 +331,12 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
301
331
|
}
|
|
302
332
|
const { generateConnectionToken } = await import("./security.js");
|
|
303
333
|
const token = generateConnectionToken();
|
|
304
|
-
res.writeHead(200, { "Content-Type": "application/json" });
|
|
334
|
+
res.writeHead(200, { "Content-Type": "application/json", "Cache-Control": "no-store" });
|
|
305
335
|
res.end(JSON.stringify({ token }));
|
|
306
336
|
return;
|
|
307
337
|
}
|
|
308
338
|
// Handle HTTP-based RPC endpoint (alternative to WebSocket for mobile networks)
|
|
309
|
-
if (
|
|
339
|
+
if (pathname === "/__helium__/rpc" && req.method === "POST") {
|
|
310
340
|
// Security: verify connection token for HTTP RPC
|
|
311
341
|
const authToken = req.headers["x-helium-token"];
|
|
312
342
|
if (!authToken || !verifyConnectionToken(authToken)) {
|
|
@@ -324,11 +354,16 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
324
354
|
const chunks = [];
|
|
325
355
|
let totalSize = 0;
|
|
326
356
|
let aborted = false;
|
|
357
|
+
req.on("error", () => {
|
|
358
|
+
aborted = true;
|
|
359
|
+
});
|
|
327
360
|
req.on("data", (chunk) => {
|
|
361
|
+
if (aborted) {
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
328
364
|
totalSize += chunk.length;
|
|
329
365
|
if (totalSize > maxBodySize) {
|
|
330
366
|
aborted = true;
|
|
331
|
-
req.destroy();
|
|
332
367
|
res.writeHead(413, { "Content-Type": "application/json" });
|
|
333
368
|
res.end(JSON.stringify({ ok: false, error: "Request entity too large" }));
|
|
334
369
|
return;
|
|
@@ -530,6 +565,7 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
530
565
|
}
|
|
531
566
|
else {
|
|
532
567
|
log("error", `Failed to render SSR page for ${pathname}:`, error);
|
|
568
|
+
throw error;
|
|
533
569
|
}
|
|
534
570
|
}
|
|
535
571
|
}
|
|
@@ -540,7 +576,15 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
540
576
|
flushPendingWriteHead();
|
|
541
577
|
originalEnd(Buffer.from(html, "utf-8"));
|
|
542
578
|
};
|
|
543
|
-
void finalize()
|
|
579
|
+
void finalize().catch((error) => {
|
|
580
|
+
log("error", "Failed to finalize dev response:", error);
|
|
581
|
+
if (!res.headersSent) {
|
|
582
|
+
originalWriteHead(500, { "Content-Type": "text/plain" });
|
|
583
|
+
}
|
|
584
|
+
if (!res.writableEnded) {
|
|
585
|
+
originalEnd("Internal server error");
|
|
586
|
+
}
|
|
587
|
+
});
|
|
544
588
|
return true;
|
|
545
589
|
};
|
|
546
590
|
}
|
|
@@ -549,6 +593,7 @@ export function attachToDevServer(httpServer, loadHandlers, config = {}, workers
|
|
|
549
593
|
listener(req, res);
|
|
550
594
|
}
|
|
551
595
|
});
|
|
596
|
+
httpServer.on("request", handleRequest);
|
|
552
597
|
}
|
|
553
598
|
function toBuffer(chunk, encoding) {
|
|
554
599
|
if (Buffer.isBuffer(chunk)) {
|