Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-19 04:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular-devkit/build-angular): add a maximum rendering timeout for SSR and SSG during development

Browse Source 
There might be cases were currently, the render application promise does not resolve because the application never becomes stable in most cases this is due to errors, this causes the worker to never exit and the build to keep running until it's manually terminated.

With this change, we add a maximum rendering timeout of 30seconds for each page.
This commit is contained in:
Alan Agius 2023-10-27 13:46:16 +00:00 committed by Douglas Parker
parent aa9f0528f1
commit a64d8edfd6
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/angular_devkit/build_angular/src/builders/app-shell/render-worker.ts
View File

@ -51,7 +51,7 @@ interface RenderRequest {
/**
* An optional URL path that represents the Angular route that should be rendered.
*/
url: string | undefined;
url: string;
}
/**
@ -77,28 +77,45 @@ async function render({ serverBundlePath, document, url }: RenderRequest): Promi
},
];
let renderAppPromise: Promise<string>;
// Render platform server module
if (isBootstrapFn(bootstrapAppFn)) {
assert(renderApplication, `renderApplication was not exported from: ${serverBundlePath}.`);
return renderApplication(bootstrapAppFn, {
renderAppPromise = renderApplication(bootstrapAppFn, {
document,
url,
platformProviders,
});
} else {
assert(renderModule, `renderModule was not exported from: ${serverBundlePath}.`);
const moduleClass = bootstrapAppFn || AppServerModule;
assert(
moduleClass,
`Neither an AppServerModule nor a bootstrapping function was exported from: ${serverBundlePath}.`,
);
renderAppPromise = renderModule(moduleClass, {
document,
url,
extraProviders: platformProviders,
});
}
assert(renderModule, `renderModule was not exported from: ${serverBundlePath}.`);
const moduleClass = bootstrapAppFn || AppServerModule;
assert(
moduleClass,
`Neither an AppServerModule nor a bootstrapping function was exported from: ${serverBundlePath}.`,
// The below should really handled by the framework!!!.
let timer: NodeJS.Timeout;
const renderingTimeout = new Promise<never>(
(_, reject) =>
(timer = setTimeout(
() =>
reject(
new Error(`Page ${new URL(url, 'resolve://').pathname} did not render in 30 seconds.`),
),
30_000,
)),
);
return renderModule(moduleClass, {
document,
url,
extraProviders: platformProviders,
});
return Promise.race([renderAppPromise, renderingTimeout]).finally(() => clearTimeout(timer));
}
function isBootstrapFn(value: unknown): value is () => Promise<ApplicationRef> {