bun-plugin-stx 0.2.744 → 0.2.746
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/render-admission.d.ts +13 -0
- package/dist/serve.d.ts +2 -1
- package/dist/serve.js +105 -2
- package/package.json +3 -3
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export declare function createRenderAdmission(options?: RenderAdmissionOptions): {
|
|
2
|
+
run: <T>(start: () => Promise<T>, signal?: AbortSignal) => Promise<T>
|
|
3
|
+
};
|
|
4
|
+
/** Bounds work before a render allocates its script contexts and HTML. */
|
|
5
|
+
export declare interface RenderAdmissionOptions {
|
|
6
|
+
renderConcurrency?: number
|
|
7
|
+
renderQueueLimit?: number
|
|
8
|
+
renderQueueTimeoutMs?: number
|
|
9
|
+
}
|
|
10
|
+
export declare class RenderAdmissionError extends Error {
|
|
11
|
+
readonly status: 408 | 503;
|
|
12
|
+
constructor(status: 408 | 503);
|
|
13
|
+
}
|
package/dist/serve.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { compileDomainRoutes, describeDomainRoutes, requestHost, resolveDomainEl
|
|
|
3
3
|
import type { DomainRoutesOption } from './domain-routes';
|
|
4
4
|
import type { ImageTemplateScope } from './image-warmup-scope';
|
|
5
5
|
import type { MiddlewareContext, MiddlewareHandler, MiddlewareRequest, PageMiddleware, PrepareMiddlewareRequest } from './page-middleware';
|
|
6
|
+
import type { RenderAdmissionOptions } from './render-admission';
|
|
6
7
|
export type { DomainRoute, DomainRoutesOption } from './domain-routes';
|
|
7
8
|
export type { MiddlewareContext, MiddlewareDefinition, MiddlewareHandler, MiddlewareRequest, PageMiddleware, PrepareMiddlewareRequest } from './page-middleware';
|
|
8
9
|
/**
|
|
@@ -347,7 +348,7 @@ export declare interface ServeRequestContext {
|
|
|
347
348
|
actionCookies?: string[]
|
|
348
349
|
[key: string]: unknown
|
|
349
350
|
}
|
|
350
|
-
export declare interface ServeOptions {
|
|
351
|
+
export declare interface ServeOptions extends RenderAdmissionOptions {
|
|
351
352
|
patterns: string[]
|
|
352
353
|
exclude?: string[]
|
|
353
354
|
port?: number
|
package/dist/serve.js
CHANGED
|
@@ -9150,6 +9150,90 @@ function createRenderCacheStore(options) {
|
|
|
9150
9150
|
}
|
|
9151
9151
|
};
|
|
9152
9152
|
}
|
|
9153
|
+
|
|
9154
|
+
// src/render-admission.ts
|
|
9155
|
+
class RenderAdmissionError extends Error {
|
|
9156
|
+
status;
|
|
9157
|
+
constructor(status) {
|
|
9158
|
+
super(status === 408 ? "Request aborted" : "Page rendering is busy; please retry");
|
|
9159
|
+
this.status = status;
|
|
9160
|
+
this.name = "RenderAdmissionError";
|
|
9161
|
+
}
|
|
9162
|
+
}
|
|
9163
|
+
function integer(value, fallback, minimum) {
|
|
9164
|
+
if (value === undefined)
|
|
9165
|
+
return fallback;
|
|
9166
|
+
if (!Number.isSafeInteger(value) || value < minimum)
|
|
9167
|
+
throw new RangeError(`Render admission requires an integer >= ${minimum}`);
|
|
9168
|
+
return value;
|
|
9169
|
+
}
|
|
9170
|
+
function createRenderAdmission(options = {}) {
|
|
9171
|
+
const concurrency = integer(options.renderConcurrency, 4, 1);
|
|
9172
|
+
const queueLimit = integer(options.renderQueueLimit, 32, 0);
|
|
9173
|
+
const timeoutMs = integer(options.renderQueueTimeoutMs, 15000, 1);
|
|
9174
|
+
const waiting = [];
|
|
9175
|
+
let active = 0;
|
|
9176
|
+
function release() {
|
|
9177
|
+
active--;
|
|
9178
|
+
waiting.shift()?.start();
|
|
9179
|
+
}
|
|
9180
|
+
async function acquire(signal) {
|
|
9181
|
+
if (signal?.aborted)
|
|
9182
|
+
throw new RenderAdmissionError(408);
|
|
9183
|
+
if (active < concurrency) {
|
|
9184
|
+
active++;
|
|
9185
|
+
return;
|
|
9186
|
+
}
|
|
9187
|
+
if (waiting.length >= queueLimit)
|
|
9188
|
+
throw new RenderAdmissionError(503);
|
|
9189
|
+
await new Promise((resolve, reject) => {
|
|
9190
|
+
let settled = false;
|
|
9191
|
+
const cleanup = () => {
|
|
9192
|
+
clearTimeout(timer);
|
|
9193
|
+
signal?.removeEventListener("abort", abort);
|
|
9194
|
+
};
|
|
9195
|
+
const fail = (status) => {
|
|
9196
|
+
if (settled)
|
|
9197
|
+
return;
|
|
9198
|
+
settled = true;
|
|
9199
|
+
const index = waiting.indexOf(entry);
|
|
9200
|
+
if (index !== -1)
|
|
9201
|
+
waiting.splice(index, 1);
|
|
9202
|
+
cleanup();
|
|
9203
|
+
reject(new RenderAdmissionError(status));
|
|
9204
|
+
};
|
|
9205
|
+
const abort = () => fail(408);
|
|
9206
|
+
const entry = {
|
|
9207
|
+
start() {
|
|
9208
|
+
if (settled)
|
|
9209
|
+
return;
|
|
9210
|
+
settled = true;
|
|
9211
|
+
cleanup();
|
|
9212
|
+
active++;
|
|
9213
|
+
resolve();
|
|
9214
|
+
}
|
|
9215
|
+
};
|
|
9216
|
+
const timer = setTimeout(() => fail(503), timeoutMs);
|
|
9217
|
+
timer.unref?.();
|
|
9218
|
+
waiting.push(entry);
|
|
9219
|
+
signal?.addEventListener("abort", abort, { once: true });
|
|
9220
|
+
if (signal?.aborted)
|
|
9221
|
+
abort();
|
|
9222
|
+
});
|
|
9223
|
+
}
|
|
9224
|
+
return {
|
|
9225
|
+
async run(start, signal) {
|
|
9226
|
+
await acquire(signal);
|
|
9227
|
+
try {
|
|
9228
|
+
if (signal?.aborted)
|
|
9229
|
+
throw new RenderAdmissionError(408);
|
|
9230
|
+
return await start();
|
|
9231
|
+
} finally {
|
|
9232
|
+
release();
|
|
9233
|
+
}
|
|
9234
|
+
}
|
|
9235
|
+
};
|
|
9236
|
+
}
|
|
9153
9237
|
// src/page-middleware.ts
|
|
9154
9238
|
var DEFAULT_PRIORITY = 10;
|
|
9155
9239
|
function middlewarePriority(middleware) {
|
|
@@ -9819,6 +9903,7 @@ After installing: bun add bun-plugin-stx`);
|
|
|
9819
9903
|
let assetsInitialized = false;
|
|
9820
9904
|
const htmlCache = boundedCache(options.renderCacheLimit ?? 512);
|
|
9821
9905
|
const pendingShellRenders = new Map;
|
|
9906
|
+
const renderAdmission = createRenderAdmission(options);
|
|
9822
9907
|
const ENABLE_HTML_CACHE = options.renderCache === true;
|
|
9823
9908
|
const RENDER_CACHE_VARY = options.renderCacheVary ?? "request";
|
|
9824
9909
|
const renderCacheStore = ENABLE_HTML_CACHE && RENDER_CACHE_VARY === "source" && options.renderCachePersist === true ? createRenderCacheStore({ dir: stateDir(process20.cwd(), "render-cache"), inputs: () => renderInputs(), buildId: getBuildId }) : null;
|
|
@@ -10590,6 +10675,9 @@ function __stxOverlay(errs){
|
|
|
10590
10675
|
reqCtx.responseHeaders = { ...reqCtx.responseHeaders, ...headers };
|
|
10591
10676
|
}
|
|
10592
10677
|
async function processTemplate(filePath, reqCtx) {
|
|
10678
|
+
return renderAdmission.run(() => renderTemplate(filePath, reqCtx), reqCtx?.request?.signal);
|
|
10679
|
+
}
|
|
10680
|
+
async function renderTemplate(filePath, reqCtx) {
|
|
10593
10681
|
const ticket = await renderTicket(reqCtx);
|
|
10594
10682
|
const content = await Bun.file(filePath).text();
|
|
10595
10683
|
if (reqCtx)
|
|
@@ -10781,6 +10869,9 @@ function __stxOverlay(errs){
|
|
|
10781
10869
|
return null;
|
|
10782
10870
|
}
|
|
10783
10871
|
async function processTemplateDynamic(filePath, paramNames, paramValues, routePath, reqCtx) {
|
|
10872
|
+
return renderAdmission.run(() => renderTemplateDynamic(filePath, paramNames, paramValues, routePath, reqCtx), reqCtx?.request?.signal);
|
|
10873
|
+
}
|
|
10874
|
+
async function renderTemplateDynamic(filePath, paramNames, paramValues, routePath, reqCtx) {
|
|
10784
10875
|
const ticket = await renderTicket(reqCtx);
|
|
10785
10876
|
const content = await Bun.file(filePath).text();
|
|
10786
10877
|
if (reqCtx)
|
|
@@ -10814,7 +10905,7 @@ function __stxOverlay(errs){
|
|
|
10814
10905
|
const pending = pendingShellRenders.get(filePath);
|
|
10815
10906
|
if (pending) {
|
|
10816
10907
|
await pending;
|
|
10817
|
-
return
|
|
10908
|
+
return renderTemplateDynamic(filePath, paramNames, paramValues, routePath, reqCtx);
|
|
10818
10909
|
}
|
|
10819
10910
|
pendingShellRenders.set(filePath, new Promise((resolve) => {
|
|
10820
10911
|
releaseShell = resolve;
|
|
@@ -11101,6 +11192,16 @@ ${block}`;
|
|
|
11101
11192
|
reusePort,
|
|
11102
11193
|
idleTimeout: production ? 120 : 0,
|
|
11103
11194
|
error(error) {
|
|
11195
|
+
if (error instanceof RenderAdmissionError) {
|
|
11196
|
+
return new Response(error.message, {
|
|
11197
|
+
status: error.status,
|
|
11198
|
+
headers: {
|
|
11199
|
+
"Content-Type": "text/plain; charset=utf-8",
|
|
11200
|
+
"Cache-Control": "no-store",
|
|
11201
|
+
...error.status === 503 && { "Retry-After": "1" }
|
|
11202
|
+
}
|
|
11203
|
+
});
|
|
11204
|
+
}
|
|
11104
11205
|
console.error("[stx] Request failed:", error);
|
|
11105
11206
|
return new Response("<h1>Internal Server Error</h1><p>An error occurred while processing your request.</p>", {
|
|
11106
11207
|
status: 500,
|
|
@@ -11410,11 +11511,13 @@ ${block}`;
|
|
|
11410
11511
|
...partialsDir && { partialsDir },
|
|
11411
11512
|
autoShell: false
|
|
11412
11513
|
};
|
|
11413
|
-
const html = await processDirectives(componentTemplate, {}, `${componentsDir}/${componentName}.stx`, componentOpts, new Set);
|
|
11514
|
+
const html = await renderAdmission.run(() => processDirectives(componentTemplate, {}, `${componentsDir}/${componentName}.stx`, componentOpts, new Set), req.signal);
|
|
11414
11515
|
return new Response(html, {
|
|
11415
11516
|
headers: { "Content-Type": "text/html; charset=utf-8", ...corsHeaders }
|
|
11416
11517
|
});
|
|
11417
11518
|
} catch (e) {
|
|
11519
|
+
if (e instanceof RenderAdmissionError)
|
|
11520
|
+
throw e;
|
|
11418
11521
|
return new Response(`<div class="stx-async-error">${e.message}</div>`, {
|
|
11419
11522
|
status: 500,
|
|
11420
11523
|
headers: { "Content-Type": "text/html; charset=utf-8", ...corsHeaders }
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "bun-plugin-stx",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.746",
|
|
5
5
|
"description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
|
|
6
6
|
"author": "Chris Breuer <chris@stacksjs.org>",
|
|
7
7
|
"license": "MIT",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"typecheck": "bun tsc --noEmit"
|
|
75
75
|
},
|
|
76
76
|
"dependencies": {
|
|
77
|
-
"@stacksjs/stx": "0.2.
|
|
78
|
-
"stx-router": "0.2.
|
|
77
|
+
"@stacksjs/stx": "0.2.746",
|
|
78
|
+
"stx-router": "0.2.746"
|
|
79
79
|
}
|
|
80
80
|
}
|