Moduletrace/bunext
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error handling bugfix: pass #1

Browse Source
This commit is contained in:
tben
2026-10-02 07:04:22 +01:00
parent 39a5e91eeb
commit d8ea4f8e02
53 changed files with 1179 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/functions/server/bunext-req-handler.ts
+6 -2
View File
@@ -7,6 +7,7 @@ import handleFiles from "./handle-files";
import handleBunextPublicAssets from "./handle-bunext-public-assets";
import checkExcludedPatterns from "../../utils/check-excluded-patterns";
import { AppData } from "../../data/app-data";
import { log } from "../../utils/log";
import fullRebuild from "./full-rebuild";
const HMR_RETRY_COOLDOWN_MS = 5000;
@@ -86,12 +87,15 @@ export default async function bunextRequestHandler({
return response;
} catch (error: any) {
log.error(
`Server Error: ${error?.message || error}\n${error?.stack || ""}`,
);
if (is_dev) {
return new Response(`Server Error: ${error.message}`, {
return new Response(`Server Error: ${error?.message || error}`, {
status: 500,
});
}
console.error(`Server Error: ${error.message}`, error);
return new Response("Internal Server Error", { status: 500 });
}
}
src/functions/server/full-rebuild.ts
+33 -6
View File
@@ -1,9 +1,36 @@
import { log } from "../../utils/log";
import allPagesESBuildContextBundler from "../bundler/all-pages-esbuild-context-bundler";
import serverPostBuildFn from "./server-post-build-fn";
import watcherEsbuildCTX from "./watcher-esbuild-ctx";
import { restartWatcher } from "./watcher-esbuild-ctx";
import { logBuildErrorsOnce } from "../../utils/build-error-log";
// Single-flight: error recovery paths (grab-page-component retries, the
// watcher, post-build HMR pushes) all call fullRebuild, and each rebuild
// triggers serverPostBuildFn which can re-enter error handling. Without this
// guard one broken page could fan out into cascading, overlapping rebuilds
// that leave the dev server unresponsive. Concurrent callers await the same
// in-flight rebuild instead of starting a new one.
let rebuild_in_progress: Promise<void> | undefined;
export default async function fullRebuild(params?: { msg?: string }) {
if (rebuild_in_progress) {
if (params?.msg) {
log.watch(`Rebuild already in progress, skipping: ${params.msg}`);
}
return rebuild_in_progress;
}
const run = doFullRebuild(params).finally(() => {
if (rebuild_in_progress === run) {
rebuild_in_progress = undefined;
}
});
rebuild_in_progress = run;
return run;
}
async function doFullRebuild(params?: { msg?: string }) {
try {
const { msg } = params || {};
@@ -29,14 +56,14 @@ export default async function fullRebuild(params?: { msg?: string }) {
},
});
} catch (error: any) {
log.error(error);
logBuildErrorsOnce(
[{ text: error?.message || String(error) }],
(line) => log.error(line),
);
} finally {
global.BUNEXT_RECOMPILING = false;
global.BUNEXT_IS_SERVER_COMPONENT = false;
}
if (global.BUNEXT_PAGES_SRC_WATCHER) {
global.BUNEXT_PAGES_SRC_WATCHER.close();
watcherEsbuildCTX();
}
restartWatcher();
}
src/functions/server/handle-routes.ts
+180 -118
View File
@@ -7,6 +7,7 @@ import grabRouteParams from "../../utils/grab-route-params";
import grabConstants from "../../utils/grab-constants";
import grabRouter from "../../utils/grab-router";
import isDevelopment from "../../utils/is-development";
import { log } from "../../utils/log";
import _ from "lodash";
import path from "path";
import grabDirNames from "../../utils/grab-dir-names";
@@ -19,138 +20,199 @@ type Params = {
};
export default async function ({ req }: Params): Promise<Response> {
const url = new URL(req.url);
const is_dev = isDevelopment();
try {
const url = new URL(req.url);
const is_dev = isDevelopment();
const { MBInBytes, ServerDefaultRequestBodyLimitBytes } = grabConstants();
const { MBInBytes, ServerDefaultRequestBodyLimitBytes } =
grabConstants();
const router = grabRouter();
const router = grabRouter();
const match = router.match(url.pathname);
const match = router.match(url.pathname);
if (!match?.filePath) {
const errMsg = `Route ${url.pathname} not found`;
if (!match?.filePath) {
const errMsg = `Route ${url.pathname} not found`;
return Response.json(
{
success: false,
msg: errMsg,
},
{
status: 404,
headers: {
"Content-Type": "application/json",
},
},
);
}
const routeParams: BunxRouteParams = await grabRouteParams({
req,
query: match.query,
});
let module: any;
const now = Date.now();
const relative_match_path = grabRelativePath(match.filePath);
if (
is_dev &&
global.BUNEXT_SSR_BUNDLER_CTX_MAP?.[relative_match_path]?.path
) {
const target_import = path.join(
ROOT_DIR,
global.BUNEXT_SSR_BUNDLER_CTX_MAP[relative_match_path].path,
);
module = await import(`${target_import}?t=${now}`);
} else {
const import_path = is_dev
? `${match.filePath}?t=${now}`
: match.filePath;
module = await import(import_path);
}
const config = module.config as BunextServerRouteConfig | undefined;
const maxBodyBytes = config?.max_request_body_mb
? config.max_request_body_mb * MBInBytes
: ServerDefaultRequestBodyLimitBytes;
const contentLength = req.headers.get("content-length");
if (contentLength) {
const size = parseInt(contentLength, 10);
if (size > maxBodyBytes) {
return Response.json(
{
success: false,
msg: "Request Body Too Large!",
},
{
status: 413,
headers: {
"Content-Type": "application/json",
},
},
);
}
} else if (req.method !== "GET" && req.method !== "HEAD") {
const body = await req.arrayBuffer();
if (body.byteLength > maxBodyBytes) {
return Response.json(
{
success: false,
msg: "Request Body Too Large!",
},
{
status: 413,
headers: {
"Content-Type": "application/json",
},
},
);
}
try {
routeParams.body = JSON.parse(
new TextDecoder().decode(body) || "{}",
);
} catch (error: any) {
log.error(
`Invalid JSON body for ${url.pathname}: ${error?.message}`,
);
return Response.json(
{
success: false,
msg: "Invalid JSON body",
},
{
status: 400,
headers: {
"Content-Type": "application/json",
},
},
);
}
}
const target_module = (module["default"] ||
module["handler"]) as BunextAPIRouteHandler;
let res: any;
try {
res = await target_module?.({
...routeParams,
});
} catch (error: any) {
log.error(
`API Route Error (${url.pathname}): ${error?.message}\n${error?.stack || ""}`,
);
return Response.json(
{
success: false,
msg: `Route handler error: ${error?.message || "Internal Server Error"}`,
},
{
status: 500,
headers: {
"Content-Type": "application/json",
},
},
);
}
if (res instanceof Response) {
if (is_dev) {
res.headers.set(
"Cache-Control",
"no-cache, no-store, must-revalidate",
);
}
return res;
}
if (res) {
let final_res = Response.json(
_.omit(res, [
"bunext_api_route_res_options",
"bunext_api_route_res_transform_fn",
]),
{
...(res.bunext_api_route_res_options || undefined),
},
);
if (res.bunext_api_route_res_transform_fn) {
final_res = await res.bunext_api_route_res_transform_fn(
final_res,
);
}
return final_res;
}
return Response.json({ err: `Route handler error` });
} catch (error: any) {
const url = new URL(req.url);
log.error(
`API Route Error (${url.pathname}): ${error?.message}\n${error?.stack || ""}`,
);
return Response.json(
{
success: false,
msg: errMsg,
msg: `Route handler error: ${error?.message || "Internal Server Error"}`,
},
{
status: 404,
status: 500,
headers: {
"Content-Type": "application/json",
},
},
);
}
const routeParams: BunxRouteParams = await grabRouteParams({
req,
query: match.query,
});
let module: any;
const now = Date.now();
const relative_match_path = grabRelativePath(match.filePath);
if (
is_dev &&
global.BUNEXT_SSR_BUNDLER_CTX_MAP?.[relative_match_path]?.path
) {
const target_import = path.join(
ROOT_DIR,
global.BUNEXT_SSR_BUNDLER_CTX_MAP[relative_match_path].path,
);
module = await import(`${target_import}?t=${now}`);
} else {
const import_path = is_dev
? `${match.filePath}?t=${now}`
: match.filePath;
module = await import(import_path);
}
const config = module.config as BunextServerRouteConfig | undefined;
const maxBodyBytes = config?.max_request_body_mb
? config.max_request_body_mb * MBInBytes
: ServerDefaultRequestBodyLimitBytes;
const contentLength = req.headers.get("content-length");
if (contentLength) {
const size = parseInt(contentLength, 10);
if (size > maxBodyBytes) {
return Response.json(
{
success: false,
msg: "Request Body Too Large!",
},
{
status: 413,
headers: {
"Content-Type": "application/json",
},
},
);
}
} else if (req.method !== "GET" && req.method !== "HEAD") {
const body = await req.arrayBuffer();
if (body.byteLength > maxBodyBytes) {
return Response.json(
{
success: false,
msg: "Request Body Too Large!",
},
{
status: 413,
headers: {
"Content-Type": "application/json",
},
},
);
}
routeParams.body = JSON.parse(new TextDecoder().decode(body) || "{}");
}
const target_module = (module["default"] ||
module["handler"]) as BunextAPIRouteHandler;
const res = await target_module?.({
...routeParams,
});
if (res instanceof Response) {
if (is_dev) {
res.headers.set(
"Cache-Control",
"no-cache, no-store, must-revalidate",
);
}
return res;
}
if (res) {
let final_res = Response.json(
_.omit(res, [
"bunext_api_route_res_options",
"bunext_api_route_res_transform_fn",
]),
{
...(res.bunext_api_route_res_options || undefined),
},
);
if (res.bunext_api_route_res_transform_fn) {
final_res = await res.bunext_api_route_res_transform_fn(final_res);
}
return final_res;
}
return Response.json({ err: `Route handler error` });
}
src/functions/server/server-post-build-fn.ts
+3
View File
@@ -58,6 +58,9 @@ export default async function serverPostBuildFn(params?: Params) {
req: mock_req,
return_server_res_only: true,
is_hydration: true,
// This runs inside serverPostBuildFn (post-build of fullRebuild);
// letting it trigger another rebuild/retry would cascade.
no_retry: true,
});
if (page_component instanceof Response) {
src/functions/server/start-server.ts
+10 -4
View File
@@ -2,7 +2,10 @@ import _ from "lodash";
import { log } from "../../utils/log";
import serverParamsGen from "./server-params-gen";
import isDevelopment from "../../utils/is-development";
import watcherEsbuildCTX from "./watcher-esbuild-ctx";
import {
restartWatcher,
watcherRestartAvailable,
} from "./watcher-esbuild-ctx";
export default async function startServer() {
const serverParams = await serverParamsGen();
@@ -15,10 +18,13 @@ export default async function startServer() {
log.server(`http://${server.hostname}:${server.port}`);
if (is_dev) {
// Watchdog: periodically re-create the FS watcher in case it went
// stale and stopped receiving events. Skipped while a recent restart
// (e.g. by fullRebuild) is still fresh so the watcher isn't churned
// twice in a row.
setInterval(() => {
if (global.BUNEXT_PAGES_SRC_WATCHER) {
global.BUNEXT_PAGES_SRC_WATCHER.close();
watcherEsbuildCTX();
if (watcherRestartAvailable()) {
restartWatcher();
}
}, 5000);
}
src/functions/server/watcher-esbuild-ctx.ts
+50 -7
View File
@@ -6,9 +6,38 @@ import { AppData } from "../../data/app-data";
import checkExcludedPatterns from "../../utils/check-excluded-patterns";
import pagesSSRBundler from "../bundler/pages-ssr-bundler";
import { log } from "../../utils/log";
import { logBuildErrorsOnce } from "../../utils/build-error-log";
const { ROOT_DIR, BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();
// Tracks the last watcher re-creation so the 5s watchdog in start-server
// doesn't fight fullRebuild (which also restarts the watcher after a rebuild).
let last_watcher_restart = 0;
/**
* Closes and re-creates the FS watcher. Deduped: callers that restart the
* watcher around the same time (fullRebuild, reloadWatcher, watchdog) only
* trigger a single re-creation.
*/
export function restartWatcher() {
if (!global.BUNEXT_PAGES_SRC_WATCHER) return;
if (Date.now() - last_watcher_restart < 1000) return;
global.BUNEXT_PAGES_SRC_WATCHER.close();
global.BUNEXT_PAGES_SRC_WATCHER = undefined;
last_watcher_restart = Date.now();
watcherEsbuildCTX();
}
/**
* True when the watcher was last (re)created long enough ago that the
* watchdog should consider re-creating it again.
*/
export function watcherRestartAvailable() {
return Date.now() - last_watcher_restart > 6000;
}
export default async function watcherEsbuildCTX() {
const pages_src_watcher = watch(
ROOT_DIR,
@@ -114,8 +143,16 @@ export default async function watcherEsbuildCTX() {
global.BUNEXT_IS_SERVER_COMPONENT = true;
}
if (global.BUNEXT_BUNDLER_CTX) {
if (
global.BUNEXT_BUNDLER_CTX &&
!global.BUNEXT_BUNDLER_CTX_DISPOSED
) {
await global.BUNEXT_BUNDLER_CTX.rebuild();
} else if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
await fullRebuild({
msg: `Restarting Bundler ...`,
});
return;
}
if (filename.match(/(404|500)\.tsx?/)) {
@@ -169,8 +206,17 @@ export default async function watcherEsbuildCTX() {
await fullRebuild({
msg: `${type} ${action}: ${filename}. Rebuilding ...`,
});
} catch (error) {
log.error(`Watcher rebuild failed: ${error}`);
} catch (error: any) {
logBuildErrorsOnce(
[
{
text: `Watcher rebuild failed: ${
error?.message || String(error)
}`,
},
],
(line) => log.error(line),
);
} finally {
if (owns_recompile) {
global.BUNEXT_RECOMPILING = false;
@@ -184,8 +230,5 @@ export default async function watcherEsbuildCTX() {
}
function reloadWatcher() {
if (global.BUNEXT_PAGES_SRC_WATCHER) {
global.BUNEXT_PAGES_SRC_WATCHER.close();
watcherEsbuildCTX();
}
restartWatcher();
}
src/functions/server/web-pages/generate-web-html.tsx
+17 -1
View File
@@ -185,10 +185,19 @@ export default async function genWebHTML({
console.debug = () => {};
let htmlBody: string;
let render_error: any;
let has_render_error = false;
try {
const stream = await renderToReadableStream(final_component, {
onError(error: any) {
if (error.message.includes('unique "key" prop')) return;
if (error?.message?.includes('unique "key" prop')) return;
if (!has_render_error) {
has_render_error = true;
render_error = error;
}
originalConsole.error(error);
},
});
@@ -198,6 +207,13 @@ export default async function genWebHTML({
Object.assign(console, originalConsole);
}
// A component crash during SSR must surface as a proper error (handled
// upstream as a 500 page). React only reports these to `onError`; without
// rethrowing, the user gets a 200 with broken/blank markup.
if (has_render_error) {
throw render_error;
}
html += htmlBody;
return html;
src/functions/server/web-pages/grab-page-component.tsx
+36 -7
View File
@@ -11,6 +11,7 @@ import isDevelopment from "../../../utils/is-development";
import { existsSync } from "fs";
import grabDirNames from "../../../utils/grab-dir-names";
import grabRelativePath from "../../../utils/grab-relative-path";
import { logBuildErrorsOnce } from "../../../utils/build-error-log";
const { BUNX_BUNDLER_ERROR_EXIT_FILE, ROOT_DIR } = grabDirNames();
@@ -28,6 +29,12 @@ type Params = {
file_path?: string;
debug?: boolean;
retry?: boolean;
/**
* Skip the dev auto-rebuild/retry recovery path. Used by internal callers
* (e.g. HMR post-build) where triggering yet another fullRebuild on top
* of the rebuild that's already in progress would cascade.
*/
no_retry?: boolean;
return_server_res_only?: boolean;
skip_server_res?: boolean;
is_hydration?: boolean;
@@ -43,6 +50,7 @@ export default async function grabPageComponent(
return_server_res_only,
skip_server_res,
is_hydration,
no_retry,
} = params;
const url = req?.url ? new URL(req.url) : undefined;
@@ -104,13 +112,21 @@ export default async function grabPageComponent(
let retries = 0;
const MAX_RETRIES = 2;
while (retries < MAX_RETRIES) {
// Only retry transient failures: if the last rebuild failed
// (BUNEXT_BUILD_FAILED), the file is broken and more rebuilds
// will just repeat the same error.
while (
retries < MAX_RETRIES &&
!global.BUNEXT_BUILD_FAILED
) {
await fullRebuild({
msg: `Retrying Bundle map for file \`${relative_file_path}\``,
});
await Bun.sleep(1000);
bundledMap = global.BUNEXT_BUNDLER_CTX_MAP[relative_file_path];
bundledMap =
global.BUNEXT_BUNDLER_CTX_MAP[relative_file_path];
if (bundledMap?.path) break;
retries++;
}
if (!bundledMap?.path) {
@@ -170,8 +186,13 @@ export default async function grabPageComponent(
error?.name === "NotFoundError" ||
error?.status === 404;
if (!params.retry && is_dev) {
while (global.BUNEXT_REBUILD_RETRIES < 2) {
if (!params.retry && !params.no_retry && is_dev) {
// Skip the retry cascade when the last rebuild failed: the error
// is persistent and more rebuilds would repeat it endlessly.
while (
!global.BUNEXT_BUILD_FAILED &&
global.BUNEXT_REBUILD_RETRIES < 2
) {
global.BUNEXT_REBUILD_RETRIES =
global.BUNEXT_REBUILD_RETRIES + 1;
@@ -198,10 +219,18 @@ export default async function grabPageComponent(
if (is404) {
global.BUNEXT_IS_404_PAGE = true;
} else {
log.error(`Error Grabbing Page Component: ${error.message}`);
log.error(`Page: ${passed_file_path || url?.pathname}`);
logBuildErrorsOnce(
[
{
text: `Error Grabbing Page Component: ${error.message}; Page: ${
passed_file_path || url?.pathname
}`,
},
],
(line) => log.error(line),
);
if (is_dev) {
if (is_dev && !params.no_retry && !global.BUNEXT_BUILD_FAILED) {
fullRebuild();
}
}
src/functions/server/web-pages/handle-web-pages.tsx
+11 -1
View File
@@ -1,5 +1,6 @@
import isDevelopment from "../../../utils/is-development";
import { log } from "../../../utils/log";
import { logBuildErrorsOnce } from "../../../utils/build-error-log";
import getCache from "../../cache/get-cache";
import generateWebPageResponseFromComponentReturn from "./generate-web-page-response-from-component-return";
import grabPageComponent from "./grab-page-component";
@@ -45,7 +46,16 @@ export default async function handleWebPages({
...componentRes,
});
} catch (error: any) {
log.error(`Error Handling Web Page: ${error.message}`, error);
logBuildErrorsOnce(
[
{
text: `Error Handling Web Page: ${
error?.message || String(error)
}`,
},
],
(line) => log.error(line),
);
const componentRes = await grabPageErrorComponent({
error,