bun-plugin-stx 0.2.371 → 0.2.373

package/dist/serve.d.ts

@@ -1,3 +1,4 @@
+import { serve as bunServe } from 'bun';
 import type { MiddlewareContext, MiddlewareHandler, MiddlewareRequest, PageMiddleware, PrepareMiddlewareRequest } from './page-middleware';
 export type { MiddlewareContext, MiddlewareDefinition, MiddlewareHandler, MiddlewareRequest, PageMiddleware, PrepareMiddlewareRequest } from './page-middleware';
 /**
@@ -334,6 +335,8 @@ export declare interface ServeOptions {
   watchDirs?: string[]
   renderCache?: boolean
   renderCacheVary?: 'request' | 'source'
+  renderCacheLimit?: number
+  clientAddress?: (req: Request, server: ServeServer) => string | null | undefined
   cssCacheLimit?: number
   prewarmRenderCache?: boolean | number
   imageWarmupGraceMs?: number
@@ -347,7 +350,7 @@ export declare interface ServeOptions {
   i18n?: import('@stacksjs/stx').ResolvedI18n
   site?: import('@stacksjs/stx').SiteConfig
   routes?: Record<string, (req: Request) => Response | Promise<Response>>
-  onRequest?: (req: Request) =>
+  onRequest?: (req: Request, server: ServeServer) =>
   | Response
   | Record<string, unknown>
   | null
@@ -381,3 +384,5 @@ export declare interface ServeOptions {
  * `cwcss-crosswind.d.ts`). `typeof import` cannot drift from the real engine.
  */
 declare type CssEngine = Pick<typeof import('@stacksjs/ts-css/engine'), 'CSSGenerator' | 'config'>;
+/** The Bun server `serve()` started - handed to `onRequest` beside each request. */
+export type ServeServer = ReturnType<typeof bunServe>;

package/dist/serve.js

@@ -9323,7 +9323,7 @@ After installing: bun add bun-plugin-stx`);
   const isExcludedPage = pageExcluder(options.exclude);
   let discoveredPagePaths = null;
   let assetsInitialized = false;
-  const htmlCache = new Map;
+  const htmlCache = boundedCache(options.renderCacheLimit ?? 512);
   const ENABLE_HTML_CACHE = options.renderCache === true;
   const RENDER_CACHE_VARY = options.renderCacheVary ?? "request";
   const cssCssCache = boundedCache(options.cssCacheLimit ?? 512);
@@ -9667,6 +9667,14 @@ function __stxOverlay(errs){
       full.responseHeaders = { ...full.responseHeaders, [header]: String(value) };
     };
   }
+  function resolveClientAddress(req, server) {
+    try {
+      const address = options.clientAddress ? options.clientAddress(req, server) : server.requestIP(req)?.address;
+      return address ?? "";
+    } catch {
+      return "";
+    }
+  }
   function htmlCacheKey(filePath, reqCtx) {
     if (RENDER_CACHE_VARY === "source")
       return filePath;
@@ -10005,7 +10013,7 @@ function __stxOverlay(errs){
     const isMutating = !!reqCtx && reqCtx.method !== "GET" && reqCtx.method !== "HEAD";
     if (ENABLE_HTML_CACHE && !skipCacheHint && !isMutating) {
       const cacheKey = htmlCacheKey(filePath, reqCtx);
-      const cachedEntry = htmlCache.get(cacheKey);
+      const cachedEntry = htmlCache.read(cacheKey);
       if (cachedEntry && await templateSignatureFresh(cachedEntry.signature)) {
         if (reqCtx) {
           reqCtx.responseStatus = cachedEntry.status;
@@ -10082,7 +10090,7 @@ function __stxOverlay(errs){
     }
     if (ENABLE_HTML_CACHE && !context.__stx_skip_cache && !skipCacheHint && !isMutating && isRenderableCacheCandidate(output) && placeholdersAreReady) {
       const signature = await buildTemplateSignature(filePath, dependencies);
-      htmlCache.set(htmlCacheKey(filePath, reqCtx), { html: output, signature, status: reqCtx?.responseStatus ?? 200, headers: reqCtx?.responseHeaders });
+      htmlCache.remember(htmlCacheKey(filePath, reqCtx), { html: output, signature, status: reqCtx?.responseStatus ?? 200, headers: reqCtx?.responseHeaders });
     }
     return output;
   }
@@ -10204,7 +10212,7 @@ function __stxOverlay(errs){
     if (reqCtx)
       reqCtx.params = paramsObj;
     if (cacheShell) {
-      const cachedEntry = htmlCache.get(filePath);
+      const cachedEntry = htmlCache.read(filePath);
       if (cachedEntry && await templateSignatureFresh(cachedEntry.signature)) {
         if (reqCtx) {
           reqCtx.responseStatus = cachedEntry.status;
@@ -10285,7 +10293,7 @@ ${output}`;
     const recordedResponse = readResponseStatus(context) !== undefined || !!readResponseHeaders(context);
     if (!context.__stx_skip_cache && !recordedResponse && isRenderableCacheCandidate(output) && placeholdersAreReady) {
       const signature = await buildTemplateSignature(filePath, dependencies);
-      htmlCache.set(filePath, { html: output, signature, status: reqCtx?.responseStatus ?? 200, headers: reqCtx?.responseHeaders });
+      htmlCache.remember(filePath, { html: output, signature, status: reqCtx?.responseStatus ?? 200, headers: reqCtx?.responseHeaders });
     }
     return fillRouteParams(output, paramsObj);
   }
@@ -10506,7 +10514,7 @@ ${block}`;
               activeServeHost = req.headers.get("host") || "";
               activeServeCookieHeader = req.headers.get("cookie") || "";
               activeServeCookies = parseCookies(req);
-              activeServeIp = server.requestIP(req)?.address || (req.headers.get("x-forwarded-for") || "").split(",")[0].trim();
+              activeServeIp = resolveClientAddress(req, server);
               mintedCsrfToken = csrfTokenToMint(req, activeServeCookies);
               if (mintedCsrfToken)
                 activeServeCookies[CSRF_COOKIE] = mintedCsrfToken;
@@ -10662,7 +10670,7 @@ ${block}`;
                   return new Response(content2, { headers });
                 }
                 if (options.onRequest) {
-                  const hookResult = await options.onRequest(req);
+                  const hookResult = await options.onRequest(req, server);
                   if (hookResult instanceof Response)
                     return hookResult;
                   if (hookResult && typeof hookResult === "object")

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.371",
+  "version": "0.2.373",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -74,7 +74,7 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/stx": "0.2.371",
-    "stx-router": "0.2.371"
+    "@stacksjs/stx": "0.2.373",
+    "stx-router": "0.2.373"
   }
 }