Refactor error handling
This commit is contained in:
parent
f018b228a8
commit
cb5126c947
6
dist/commands/dev/index.js
vendored
6
dist/commands/dev/index.js
vendored
@ -4,6 +4,7 @@ import grabDirNames from "../../utils/grab-dir-names";
|
|||||||
import writeErrorFile from "../../functions/write-error-file";
|
import writeErrorFile from "../../functions/write-error-file";
|
||||||
let retries = 0;
|
let retries = 0;
|
||||||
let timeout;
|
let timeout;
|
||||||
|
const MAX_RETRIES = 5;
|
||||||
export default function () {
|
export default function () {
|
||||||
return new Command("dev")
|
return new Command("dev")
|
||||||
.description("Run development server")
|
.description("Run development server")
|
||||||
@ -13,7 +14,8 @@ export default function () {
|
|||||||
}
|
}
|
||||||
async function dev() {
|
async function dev() {
|
||||||
clearTimeout(timeout);
|
clearTimeout(timeout);
|
||||||
if (retries == 1) {
|
if (retries >= MAX_RETRIES) {
|
||||||
|
console.error(`Dev server crashed ${MAX_RETRIES} times. Exiting.`);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
const dev_spawn_file = path.resolve(__dirname, "dev-spawn.ts");
|
const dev_spawn_file = path.resolve(__dirname, "dev-spawn.ts");
|
||||||
@ -32,7 +34,7 @@ async function dev() {
|
|||||||
retries++;
|
retries++;
|
||||||
timeout = setTimeout(() => {
|
timeout = setTimeout(() => {
|
||||||
retries = 0;
|
retries = 0;
|
||||||
}, 5000);
|
}, 10000);
|
||||||
const exited = await dev_process.exited;
|
const exited = await dev_process.exited;
|
||||||
if (exited) {
|
if (exited) {
|
||||||
return await dev();
|
return await dev();
|
||||||
|
|||||||
@ -21,14 +21,29 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
|
|||||||
build_starts++;
|
build_starts++;
|
||||||
build_start = performance.now();
|
build_start = performance.now();
|
||||||
const does_error_file_exist = existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE);
|
const does_error_file_exist = existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE);
|
||||||
if (build_starts == MAX_BUILD_STARTS &&
|
if (build_starts >= MAX_BUILD_STARTS &&
|
||||||
!does_error_file_exist) {
|
!does_error_file_exist) {
|
||||||
await buildOnstartErrorHandler();
|
await buildOnstartErrorHandler();
|
||||||
process.exit(1);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
build.onEnd((result) => {
|
build.onEnd((result) => {
|
||||||
if (result.errors.length > 0) {
|
if (result.errors.length > 0) {
|
||||||
|
global.RECOMPILING = false;
|
||||||
|
global.IS_SERVER_COMPONENT = false;
|
||||||
|
build_starts = 0;
|
||||||
|
log.error(`Build errors:`);
|
||||||
|
for (const err of result.errors) {
|
||||||
|
log.error(` ${err.text}${err.location ? ` (${err.location.file}:${err.location.line}:${err.location.column})` : ""}`);
|
||||||
|
}
|
||||||
|
for (let i = global.HMR_CONTROLLERS.length - 1; i >= 0; i--) {
|
||||||
|
const controller = global.HMR_CONTROLLERS[i];
|
||||||
|
try {
|
||||||
|
controller?.controller?.enqueue(`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`);
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
global.HMR_CONTROLLERS.splice(i, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const artifacts = grabArtifactsFromBundledResults({
|
const artifacts = grabArtifactsFromBundledResults({
|
||||||
@ -59,8 +74,13 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
|
|||||||
fullRebuild();
|
fullRebuild();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
try {
|
||||||
pagesSSRBundler();
|
pagesSSRBundler();
|
||||||
}
|
}
|
||||||
|
catch (error) {
|
||||||
|
log.error(`SSR Bundler Error: ${error}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
// if (global.SSR_BUNDLER_CTX) {
|
// if (global.SSR_BUNDLER_CTX) {
|
||||||
// global.SSR_BUNDLER_CTX.rebuild();
|
// global.SSR_BUNDLER_CTX.rebuild();
|
||||||
// } else {
|
// } else {
|
||||||
|
|||||||
@ -22,7 +22,9 @@ export default function ssrCTXArtifactTracker({ entryToPage, post_build_fn, }) {
|
|||||||
});
|
});
|
||||||
build.onEnd((result) => {
|
build.onEnd((result) => {
|
||||||
if (result.errors.length > 0) {
|
if (result.errors.length > 0) {
|
||||||
console.log("result.errors", result.errors);
|
global.SSR_BUNDLER_CTX_DISPOSED = false;
|
||||||
|
build_starts = 0;
|
||||||
|
console.log("SSR Build errors:", result.errors);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const artifacts = grabArtifactsFromBundledResults({
|
const artifacts = grabArtifactsFromBundledResults({
|
||||||
|
|||||||
2
dist/functions/server/full-rebuild.js
vendored
2
dist/functions/server/full-rebuild.js
vendored
@ -23,6 +23,8 @@ export default async function fullRebuild(params) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
|
global.RECOMPILING = false;
|
||||||
|
global.IS_SERVER_COMPONENT = false;
|
||||||
log.error(error);
|
log.error(error);
|
||||||
}
|
}
|
||||||
if (global.PAGES_SRC_WATCHER) {
|
if (global.PAGES_SRC_WATCHER) {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@moduletrace/bunext",
|
"name": "@moduletrace/bunext",
|
||||||
"version": "1.0.85",
|
"version": "1.0.86",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"module": "index.ts",
|
"module": "index.ts",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import writeErrorFile from "../../functions/write-error-file";
|
|||||||
|
|
||||||
let retries = 0;
|
let retries = 0;
|
||||||
let timeout: any;
|
let timeout: any;
|
||||||
|
const MAX_RETRIES = 5;
|
||||||
|
|
||||||
export default function () {
|
export default function () {
|
||||||
return new Command("dev")
|
return new Command("dev")
|
||||||
@ -18,7 +19,8 @@ export default function () {
|
|||||||
async function dev() {
|
async function dev() {
|
||||||
clearTimeout(timeout);
|
clearTimeout(timeout);
|
||||||
|
|
||||||
if (retries == 1) {
|
if (retries >= MAX_RETRIES) {
|
||||||
|
console.error(`Dev server crashed ${MAX_RETRIES} times. Exiting.`);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -42,7 +44,7 @@ async function dev() {
|
|||||||
|
|
||||||
timeout = setTimeout(() => {
|
timeout = setTimeout(() => {
|
||||||
retries = 0;
|
retries = 0;
|
||||||
}, 5000);
|
}, 10000);
|
||||||
|
|
||||||
const exited = await dev_process.exited;
|
const exited = await dev_process.exited;
|
||||||
if (exited) {
|
if (exited) {
|
||||||
|
|||||||
@ -43,16 +43,35 @@ export default function esbuildCTXArtifactTracker({
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (
|
if (
|
||||||
build_starts == MAX_BUILD_STARTS &&
|
build_starts >= MAX_BUILD_STARTS &&
|
||||||
!does_error_file_exist
|
!does_error_file_exist
|
||||||
) {
|
) {
|
||||||
await buildOnstartErrorHandler();
|
await buildOnstartErrorHandler();
|
||||||
process.exit(1);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
build.onEnd((result) => {
|
build.onEnd((result) => {
|
||||||
if (result.errors.length > 0) {
|
if (result.errors.length > 0) {
|
||||||
|
global.RECOMPILING = false;
|
||||||
|
global.IS_SERVER_COMPONENT = false;
|
||||||
|
build_starts = 0;
|
||||||
|
|
||||||
|
log.error(`Build errors:`);
|
||||||
|
for (const err of result.errors) {
|
||||||
|
log.error(` ${err.text}${err.location ? ` (${err.location.file}:${err.location.line}:${err.location.column})` : ""}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let i = global.HMR_CONTROLLERS.length - 1; i >= 0; i--) {
|
||||||
|
const controller = global.HMR_CONTROLLERS[i];
|
||||||
|
try {
|
||||||
|
controller?.controller?.enqueue(
|
||||||
|
`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`,
|
||||||
|
);
|
||||||
|
} catch {
|
||||||
|
global.HMR_CONTROLLERS.splice(i, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,7 +117,11 @@ export default function esbuildCTXArtifactTracker({
|
|||||||
cleanupLogsDirs();
|
cleanupLogsDirs();
|
||||||
fullRebuild();
|
fullRebuild();
|
||||||
} else {
|
} else {
|
||||||
|
try {
|
||||||
pagesSSRBundler();
|
pagesSSRBundler();
|
||||||
|
} catch (error) {
|
||||||
|
log.error(`SSR Bundler Error: ${error}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (global.SSR_BUNDLER_CTX) {
|
// if (global.SSR_BUNDLER_CTX) {
|
||||||
|
|||||||
@ -40,7 +40,9 @@ export default function ssrCTXArtifactTracker({
|
|||||||
|
|
||||||
build.onEnd((result) => {
|
build.onEnd((result) => {
|
||||||
if (result.errors.length > 0) {
|
if (result.errors.length > 0) {
|
||||||
console.log("result.errors", result.errors);
|
global.SSR_BUNDLER_CTX_DISPOSED = false;
|
||||||
|
build_starts = 0;
|
||||||
|
console.log("SSR Build errors:", result.errors);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -30,6 +30,8 @@ export default async function fullRebuild(params?: { msg?: string }) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
|
global.RECOMPILING = false;
|
||||||
|
global.IS_SERVER_COMPONENT = false;
|
||||||
log.error(error);
|
log.error(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user