@ereo/server 0.2.36 → 0.2.38

package/dist/bun-server.d.ts

@@ -80,6 +80,9 @@ export interface ServerOptions {
  * Bun server instance.
  */
 export declare class BunServer {
+    private static readonly HTTP_METHODS;
+    private static readonly METHOD_OVERRIDE_HEADER;
+    private static readonly METHOD_OVERRIDE_ALLOWED;
     private server;
     private app;
     private router;
@@ -87,6 +90,7 @@ export declare class BunServer {
     private staticHandler;
     private options;
     private wsUpgradeHandlers;
+    private fetchHandler;
     constructor(options?: ServerOptions);
     /**
      * Setup default middleware.
@@ -171,6 +175,7 @@ export declare class BunServer {
      * Render an error page.
      */
     private renderErrorPage;
+    private getEffectiveMethod;
     /**
      * Build meta descriptors from route's meta function.
      */
@@ -186,6 +191,8 @@ export declare class BunServer {
     /**
      * Build HTML string for meta tags from descriptors.
      */
+    private static readonly ALLOWED_LINK_ATTRS;
+    private static escapeAttr;
     private buildMetaHtml;
     /**
      * Inject route meta tags into layout-rendered HTML.
@@ -235,6 +242,7 @@ export declare class BunServer {
     stop(): void;
     /**
      * Reload the server (for HMR).
+     * Reuses the full fetch handler to preserve WebSocket upgrade logic.
      */
     reload(): Promise<void>;
     /**

package/dist/bun-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bun-server.d.ts","sourceRoot":"","sources":["../src/bun-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bun-server.d.ts","sourceRoot":"","sources":["../src/bun-server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,KAAK,EAAmE,iBAAiB,EAA0C,MAAM,YAAY,CAAC;AAC7J,OAAO,EAAiC,OAAO,EAAiB,MAAM,YAAY,CAAC;AACnF,OAAO,EAAE,UAAU,EAAwD,MAAM,cAAc,CAAC;AAChG,OAAO,EAIL,IAAI,EACJ,eAAe,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAA+C,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AA8E9F;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,QAAQ,CAAC;AAEtD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,wBAAwB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0BAA0B;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,qBAAqB;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kBAAkB;IAClB,IAAI,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,6BAA6B;IAC7B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,wBAAwB;IACxB,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACzD,kBAAkB;IAClB,GAAG,CAAC,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF,wFAAwF;IACxF,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,kCAAkC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6BAA6B;IAC7B,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,2FAA2F;IAC3F,KAAK,CAAC,EAAE,OAAO,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,iBAAiB,CAAC;QAC9B,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAC;QAC3C,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAC;QAC9C,iDAAiD;QACjD,cAAc,CAAC,EAAE;YACf,SAAS,EAAE;gBACT,IAAI,EAAE,CAAC,EAAE,EAAE,GAAG,KAAK,IAAI,CAAC;gBACxB,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,KAAK,IAAI,CAAC;gBACzB,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;aACtD,CAAC;SACH,CAAC;QACF,sDAAsD;QACtD,aAAa,CAAC,EAAE;YACd,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC;YACjC,eAAe,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAClD,WAAW,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;SACtF,CAAC;KACH,CAAC;CACH;AAED;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAyE;IAC7G,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAa;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAuC;IAEtF,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,GAAG,CAAwB;IACnC,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,aAAa,CAAiE;IACtF,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,iBAAiB,CAIjB;IACR,OAAO,CAAC,YAAY,CAA+F;gBAEvG,OAAO,GAAE,aAAkB;IAoBvC;;OAEG;IACH,OAAO,CAAC,eAAe;IAwBvB;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAI1B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAOnC;;OAEG;IACH,GAAG,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IACrC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI;IASnD,6DAA6D;IAC7D,OAAO,KAAK,kBAAkB,GAK7B;IAED,sFAAsF;IACtF,OAAO,CAAC,gBAAgB;IAUxB;;;OAGG;IACH,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAI5G;;OAEG;YACW,aAAa;IA4H3B;;OAEG;YACW,sBAAsB;IA2BpC;;OAEG;YACW,WAAW;IAuBzB;;OAEG;YACW,uBAAuB;IA6BrC;;OAEG;YACW,gBAAgB;IAwP9B;;OAEG;YACW,UAAU;IAsGxB;;;;;;;OAOG;YACW,mBAAmB;IA0HjC;;OAEG;YACW,gBAAgB;IAoC9B;;;;;;OAMG;YACW,yBAAyB;IA2JvC;;OAEG;YACW,sBAAsB;IAkDpC;;OAEG;YACW,iBAAiB;IAqC/B;;OAEG;IACH,OAAO,CAAC,eAAe;YA+BT,kBAAkB;IAqChC;;OAEG;IACH,OAAO,CAAC,SAAS;IA0BjB;;OAEG;IACH,OAAO,CAAC,YAAY;IASpB;;OAEG;IACH,OAAO,CAAC,eAAe;IAcvB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAIvC;IAEH,OAAO,CAAC,MAAM,CAAC,UAAU;IAQzB,OAAO,CAAC,aAAa;IA0BrB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAkB1B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA8BxB;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IA4CzB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAqBzB;;OAEG;IACH,OAAO,CAAC,UAAU;IASlB;;;OAGG;YACW,iBAAiB;IAmD/B;;OAEG;YACW,uBAAuB;IA8ErC;;OAEG;IACH,OAAO,CAAC,WAAW;IA0CnB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IA+GvC;;OAEG;IACH,IAAI,IAAI,IAAI;IAOZ;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ7B;;OAEG;IACH,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI;IAInC;;OAEG;IACH,OAAO,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE;CAOpE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,SAAS,CAE/D;AAED;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAIvE"}

package/dist/index.js

@@ -28,8 +28,16 @@ class MiddlewareChain {
     let index = 0;
     const next = async () => {
       if (index < applicable.length) {
-        const middleware = applicable[index++];
-        return middleware.handler(request, context, next);
+        const currentIndex = index++;
+        const middleware = applicable[currentIndex];
+        let called = false;
+        return middleware.handler(request, context, async () => {
+          if (called) {
+            throw new Error("next() called multiple times in middleware");
+          }
+          called = true;
+          return next();
+        });
       }
       return final();
     };
@@ -70,6 +78,7 @@ function cors(options = {}) {
   } = options;
   return async (request, context, next) => {
     const requestOrigin = request.headers.get("Origin");
+    const isWildcardOrigin = typeof origin === "string" && origin === "*";
     let allowedOrigin = null;
     if (typeof origin === "string") {
       allowedOrigin = origin;
@@ -78,22 +87,47 @@ function cors(options = {}) {
     } else if (typeof origin === "function") {
       allowedOrigin = requestOrigin && origin(requestOrigin) ? requestOrigin : null;
     }
+    const responseOrigin = (() => {
+      if (allowedOrigin === "*") {
+        if (credentials && requestOrigin) {
+          return requestOrigin;
+        }
+        return "*";
+      }
+      return allowedOrigin;
+    })();
+    const shouldVaryOrigin = !isWildcardOrigin || credentials && !!requestOrigin;
     if (request.method === "OPTIONS") {
+      if (requestOrigin && !responseOrigin) {
+        return new Response(null, { status: 403 });
+      }
       return new Response(null, {
         status: 204,
         headers: {
-          "Access-Control-Allow-Origin": allowedOrigin || "*",
+          ...responseOrigin ? { "Access-Control-Allow-Origin": responseOrigin } : {},
           "Access-Control-Allow-Methods": methods.join(", "),
           "Access-Control-Allow-Headers": allowedHeaders.join(", "),
           "Access-Control-Max-Age": maxAge.toString(),
-          ...credentials && { "Access-Control-Allow-Credentials": "true" }
+          ...credentials && { "Access-Control-Allow-Credentials": "true" },
+          ...shouldVaryOrigin ? { Vary: "Origin" } : {}
         }
       });
     }
     const response = await next();
     const headers = new Headers(response.headers);
-    if (allowedOrigin) {
-      headers.set("Access-Control-Allow-Origin", allowedOrigin);
+    if (responseOrigin) {
+      headers.set("Access-Control-Allow-Origin", responseOrigin);
+      if (shouldVaryOrigin) {
+        const existingVary = headers.get("Vary");
+        if (existingVary) {
+          const parts = existingVary.split(",").map((s) => s.trim().toLowerCase());
+          if (!parts.includes("origin")) {
+            headers.set("Vary", `${existingVary}, Origin`);
+          }
+        } else {
+          headers.set("Vary", "Origin");
+        }
+      }
     }
     if (exposedHeaders.length > 0) {
       headers.set("Access-Control-Expose-Headers", exposedHeaders.join(", "));
@@ -190,6 +224,14 @@ function rateLimit(options = {}) {
       for (const k of expired) {
         requests.delete(k);
       }
+      if (requests.size > MAX_ENTRIES) {
+        const entries = Array.from(requests.entries());
+        entries.sort((a, b) => a[1].resetTime - b[1].resetTime);
+        const toRemove = Math.max(1, Math.floor(entries.length * 0.2));
+        for (let i = 0;i < toRemove; i++) {
+          requests.delete(entries[i][0]);
+        }
+      }
     }
     if (record.count > max) {
       return new Response(JSON.stringify({ error: "Too many requests" }), {
@@ -306,6 +348,7 @@ function serveStatic(options) {
     }
     const resolvedRoot = resolve(root);
     let filepath = resolve(root, normalize(pathname.replace(/^\//, "")));
+    const requestedExt = extname(filepath).toLowerCase();
     if (!filepath.startsWith(resolvedRoot)) {
       return new Response("Forbidden", { status: 403 });
     }
@@ -344,8 +387,7 @@ function serveStatic(options) {
       } else if (maxAge > 0) {
         headers.set("Cache-Control", `public, max-age=${maxAge}`);
       }
-      const ext = extname(filepath).toLowerCase();
-      if (negotiateImageFormat && NEGOTIABLE_IMAGE_EXTENSIONS.includes(ext)) {
+      if (negotiateImageFormat && NEGOTIABLE_IMAGE_EXTENSIONS.includes(requestedExt)) {
         headers.set("Vary", "Accept");
       }
       const ifNoneMatch = request.headers.get("If-None-Match");
@@ -456,7 +498,7 @@ function createShell(options) {
     `);
   const scriptTags = scripts.map((src) => `<script type="module" src="${escapeAttr(src)}"></script>`).join(`
     `);
-  const loaderScript = loaderData ? `<script>window.__EREO_DATA__=${serializeLoaderData(loaderData)}</script>` : "";
+  const loaderScript = loaderData === undefined ? "" : `<script>window.__EREO_DATA__=${serializeLoaderData(loaderData)}</script>`;
   const head = `<!DOCTYPE html>
 <html ${htmlAttrs}>
 <head>
@@ -480,20 +522,23 @@ function createShell(options) {
 async function renderToStream(element, options) {
   const { renderToPipeableStream } = await import("react-dom/server");
   const { shell, scripts = [], styles = [] } = options;
-  let loaderData = null;
+  let loaderData = undefined;
   if (options.match.route.module?.loader) {
     loaderData = await options.match.route.module.loader({
       request: options.request ?? new Request("http://localhost"),
       params: options.match.params,
       context: options.context
     });
+    if (loaderData === undefined) {
+      loaderData = null;
+    }
   }
-  const hasDeferred = hasDeferredData(loaderData);
+  const hasDeferred = loaderData !== undefined && hasDeferredData(loaderData);
   const { head, tail } = createShell({
     shell,
     scripts: [],
     styles,
-    loaderData: hasDeferred ? null : loaderData
+    loaderData: hasDeferred ? undefined : loaderData
   });
   return new Promise((resolve2, reject) => {
     const { PassThrough } = __require("stream");
@@ -579,15 +624,18 @@ async function renderToStream(element, options) {
 async function renderToString(element, options) {
   const { renderToString: reactRenderToString } = await import("react-dom/server");
   const { shell, scripts = [], styles = [] } = options;
-  let loaderData = null;
+  let loaderData = undefined;
   if (options.match.route.module?.loader) {
     loaderData = await options.match.route.module.loader({
       request: options.request ?? new Request("http://localhost"),
       params: options.match.params,
       context: options.context
     });
+    if (loaderData === undefined) {
+      loaderData = null;
+    }
   }
-  if (hasDeferredData(loaderData)) {
+  if (loaderData !== undefined && hasDeferredData(loaderData)) {
     loaderData = await resolveAllDeferred(loaderData);
   }
   const { head, tail } = createShell({ shell, scripts, styles, loaderData });
@@ -669,31 +717,46 @@ async function enforceAuthConfig(authConfig, request, context, params) {
 }
 
 // src/bun-server.ts
+var _cachedRenderer = null;
+var _rendererPromise = null;
 async function getStreamingRenderer() {
-  try {
-    const browserServer = await import("react-dom/server.browser");
-    if (typeof browserServer.renderToReadableStream === "function") {
-      return {
-        renderToReadableStream: browserServer.renderToReadableStream,
-        renderToString: browserServer.renderToString
+  if (_cachedRenderer)
+    return _cachedRenderer;
+  if (_rendererPromise)
+    return _rendererPromise;
+  _rendererPromise = (async () => {
+    try {
+      const browserServer = await import("react-dom/server.browser");
+      if (typeof browserServer.renderToReadableStream === "function") {
+        _cachedRenderer = {
+          renderToReadableStream: browserServer.renderToReadableStream,
+          renderToString: browserServer.renderToString
+        };
+        return _cachedRenderer;
+      }
+    } catch {}
+    try {
+      const server = await import("react-dom/server");
+      _cachedRenderer = {
+        renderToReadableStream: server.renderToReadableStream,
+        renderToString: server.renderToString
       };
+      return _cachedRenderer;
+    } catch {
+      _cachedRenderer = {
+        renderToReadableStream: undefined,
+        renderToString: (await import("react-dom/server")).renderToString
+      };
+      return _cachedRenderer;
     }
-  } catch {}
-  try {
-    const server = await import("react-dom/server");
-    return {
-      renderToReadableStream: server.renderToReadableStream,
-      renderToString: server.renderToString
-    };
-  } catch {
-    return {
-      renderToReadableStream: undefined,
-      renderToString: (await import("react-dom/server")).renderToString
-    };
-  }
+  })();
+  return _rendererPromise;
 }
 
 class BunServer {
+  static HTTP_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"];
+  static METHOD_OVERRIDE_HEADER = "_method";
+  static METHOD_OVERRIDE_ALLOWED = new Set(["PUT", "PATCH", "DELETE"]);
   server = null;
   app = null;
   router = null;
@@ -701,6 +764,7 @@ class BunServer {
   staticHandler = null;
   options;
   wsUpgradeHandlers = [];
+  fetchHandler = null;
   constructor(options = {}) {
     this.options = {
       port: 3000,
@@ -843,7 +907,8 @@ class BunServer {
       });
       return context.applyToResponse(response);
     } catch (error) {
-      return this.handleError(error, context);
+      const errorResponse = this.handleError(error, context);
+      return context.applyToResponse(errorResponse);
     }
   }
   async executeRouteMiddleware(request, context, middlewareChain, handler) {
@@ -878,22 +943,29 @@ class BunServer {
       if (index >= middleware.length) {
         return handler();
       }
-      const mw = middleware[index++];
-      return mw(request, context, next);
+      const currentIndex = index++;
+      const mw = middleware[currentIndex];
+      let called = false;
+      return mw(request, context, async () => {
+        if (called) {
+          throw new Error("next() called multiple times in middleware");
+        }
+        called = true;
+        return next();
+      });
     };
     return next();
   }
   async handleRouteInner(request, match, context) {
     const module = match.route.module;
+    const httpMethod = await this.getEffectiveMethod(request);
     const routeAuthConfig = match.route.config?.auth || module.config?.auth;
     if (routeAuthConfig) {
       const denied = await enforceAuthConfig(routeAuthConfig, request, context, match.params);
       if (denied)
         return denied;
     }
-    const httpMethod = request.method.toUpperCase();
-    const HTTP_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"];
-    if (HTTP_METHODS.includes(httpMethod)) {
+    if (BunServer.HTTP_METHODS.includes(httpMethod)) {
       const methodHandler = module[httpMethod];
       if (typeof methodHandler === "function") {
         const result = await methodHandler({ request, params: match.params, context });
@@ -920,7 +992,7 @@ class BunServer {
     if (module.beforeLoad) {
       await module.beforeLoad({ request, params: match.params, context });
     }
-    if (request.method !== "GET" && request.method !== "HEAD") {
+    if (httpMethod !== "GET" && httpMethod !== "HEAD") {
       if (module.action) {
         const result = await module.action({
           request,
@@ -941,20 +1013,23 @@ class BunServer {
         }
         const loaderArgs2 = { request, params: match.params, context };
         const loaderPromises2 = [];
-        loaderPromises2.push(module.loader ? Promise.resolve(module.loader(loaderArgs2)) : Promise.resolve(null));
+        loaderPromises2.push(module.loader ? Promise.resolve(module.loader(loaderArgs2)) : Promise.resolve(undefined));
         for (const layout of layouts) {
-          loaderPromises2.push(layout.module?.loader ? Promise.resolve(layout.module.loader(loaderArgs2)) : Promise.resolve(null));
+          loaderPromises2.push(layout.module?.loader ? Promise.resolve(layout.module.loader(loaderArgs2)) : Promise.resolve(undefined));
         }
         const loaderResults2 = await Promise.all(loaderPromises2);
-        const loaderData2 = loaderResults2[0];
+        const loaderData2 = module.loader && loaderResults2[0] === undefined ? null : loaderResults2[0];
         if (loaderData2 instanceof Response)
           return loaderData2;
         const layoutLoaderData2 = new Map;
         for (let i = 0;i < layouts.length; i++) {
-          const layoutData = loaderResults2[i + 1];
+          let layoutData = loaderResults2[i + 1];
+          if (layouts[i].module?.loader && layoutData === undefined) {
+            layoutData = null;
+          }
           if (layoutData instanceof Response)
             return layoutData;
-          if (layoutData !== null)
+          if (layoutData !== undefined)
             layoutLoaderData2.set(layouts[i].id, layoutData);
         }
         const routeHeaders2 = this.buildRouteHeaders(match);
@@ -971,14 +1046,14 @@ class BunServer {
       const loaderFn = () => module.loader(loaderArgs);
       loaderPromises.push(activeSpan ? Promise.resolve(inst.traceLoader(activeSpan, match.route.id || "route", loaderFn)) : Promise.resolve(loaderFn()));
     } else {
-      loaderPromises.push(Promise.resolve(null));
+      loaderPromises.push(Promise.resolve(undefined));
     }
     for (const layout of layouts) {
       if (layout.module?.loader) {
         const layoutLoaderFn = () => layout.module.loader(loaderArgs);
         loaderPromises.push(activeSpan ? Promise.resolve(inst.traceLoader(activeSpan, `layout:${layout.id}`, layoutLoaderFn)) : Promise.resolve(layoutLoaderFn()));
       } else {
-        loaderPromises.push(Promise.resolve(null));
+        loaderPromises.push(Promise.resolve(undefined));
       }
     }
     let loaderResults;
@@ -997,23 +1072,26 @@ class BunServer {
       }
       throw thrownError;
     }
-    const loaderData = loaderResults[0];
+    const loaderData = module.loader && loaderResults[0] === undefined ? null : loaderResults[0];
     if (loaderData instanceof Response) {
       return loaderData;
     }
     const layoutLoaderData = new Map;
     for (let i = 0;i < layouts.length; i++) {
-      const layoutData = loaderResults[i + 1];
+      let layoutData = loaderResults[i + 1];
+      if (layouts[i].module?.loader && layoutData === undefined) {
+        layoutData = null;
+      }
       if (layoutData instanceof Response) {
         return layoutData;
       }
-      if (layoutData !== null) {
+      if (layoutData !== undefined) {
         layoutLoaderData.set(layouts[i].id, layoutData);
       }
     }
     const routeHeaders = this.buildRouteHeaders(match);
     if (request.headers.get("Accept")?.includes("application/json")) {
-      const resolvedLoaderData = hasDeferredData2(loaderData) ? await resolveAllDeferred2(loaderData) : loaderData;
+      const resolvedLoaderData = loaderData === undefined ? null : hasDeferredData2(loaderData) ? await resolveAllDeferred2(loaderData) : loaderData;
       const jsonPayload = {
         data: resolvedLoaderData,
         params: match.params
@@ -1131,7 +1209,8 @@ class BunServer {
       const headBytes = encoder.encode(head);
       const tailBytes = hasDeferred ? null : encoder.encode(tail);
       const abortController = new AbortController;
-      timeoutId = setTimeout(() => abortController.abort(), 1e4);
+      const STREAM_TIMEOUT = 1e4;
+      timeoutId = setTimeout(() => abortController.abort(), STREAM_TIMEOUT);
       const reactStream = await renderToReadableStream(element, {
         bootstrapModules: [clientEntry],
         signal: abortController.signal,
@@ -1152,13 +1231,19 @@ class BunServer {
               const { done, value } = await reader.read();
               if (done) {
                 if (hasDeferred) {
+                  clearTimeout(timeoutId);
                   let resolvedData;
+                  let deferredTimeoutId;
                   try {
                     resolvedData = await Promise.race([
                       resolveAllDeferred2(loaderData),
-                      new Promise((_, reject) => setTimeout(() => reject(new Error("Deferred data resolution timed out")), 1e4))
+                      new Promise((_, reject) => {
+                        deferredTimeoutId = setTimeout(() => reject(new Error("Deferred data resolution timed out")), STREAM_TIMEOUT);
+                      })
                     ]);
+                    clearTimeout(deferredTimeoutId);
                   } catch (error) {
+                    clearTimeout(deferredTimeoutId);
                     console.error("Deferred data resolution failed:", error);
                     resolvedData = null;
                   }
@@ -1231,7 +1316,8 @@ class BunServer {
       const clientEntry = this.options.clientEntry;
       const encoder = new TextEncoder;
       const abortController = new AbortController;
-      timeoutId = setTimeout(() => abortController.abort(), 1e4);
+      const STREAM_TIMEOUT = 1e4;
+      timeoutId = setTimeout(() => abortController.abort(), STREAM_TIMEOUT);
       const reactStream = await renderToReadableStream(element, {
         bootstrapModules: [clientEntry],
         signal: abortController.signal,
@@ -1239,10 +1325,11 @@ class BunServer {
           console.error("Streaming render error:", error);
         }
       });
-      const loaderScript = !hasDeferred && loaderData ? encoder.encode(`${traceScript}<script>window.__EREO_DATA__=${serializeLoaderData2(loaderData)}</script>`) : traceScript ? encoder.encode(traceScript) : null;
+      const loaderScript = !hasDeferred && loaderData !== undefined ? encoder.encode(`${traceScript}<script>window.__EREO_DATA__=${serializeLoaderData2(loaderData)}</script>`) : traceScript ? encoder.encode(traceScript) : null;
       const metaHtml = metaDescriptors.length > 0 ? this.buildMetaHtml(metaDescriptors) : "";
       let metaInjected = metaHtml.length === 0;
       const decoder = new TextDecoder;
+      let pendingChunk = "";
       const reader = reactStream.getReader();
       let done = false;
       const self = this;
@@ -1252,14 +1339,25 @@ class BunServer {
             return;
           const result = await reader.read();
           if (result.done) {
+            if (pendingChunk) {
+              controller.enqueue(encoder.encode(pendingChunk));
+              pendingChunk = "";
+              metaInjected = true;
+            }
             if (hasDeferred) {
+              clearTimeout(timeoutId);
               let resolvedData;
+              let deferredTimeoutId;
               try {
                 resolvedData = await Promise.race([
                   resolveAllDeferred2(loaderData),
-                  new Promise((_, reject) => setTimeout(() => reject(new Error("Deferred data resolution timed out")), 1e4))
+                  new Promise((_, reject) => {
+                    deferredTimeoutId = setTimeout(() => reject(new Error("Deferred data resolution timed out")), STREAM_TIMEOUT);
+                  })
                 ]);
+                clearTimeout(deferredTimeoutId);
               } catch (error) {
+                clearTimeout(deferredTimeoutId);
                 console.error("Deferred data resolution failed:", error);
                 resolvedData = null;
               }
@@ -1272,13 +1370,30 @@ class BunServer {
             done = true;
           } else {
             if (!metaInjected) {
-              const chunk = decoder.decode(result.value, { stream: true });
+              const chunk = pendingChunk + decoder.decode(result.value, { stream: true });
+              pendingChunk = "";
               if (chunk.includes("</head>")) {
                 const injected = self.injectMetaIntoHtml(chunk, metaDescriptors);
                 controller.enqueue(encoder.encode(injected));
                 metaInjected = true;
                 return;
               }
+              const tail = chunk.slice(-6);
+              const headTag = "</head>";
+              let bufferFrom = -1;
+              for (let i = 1;i < headTag.length; i++) {
+                if (chunk.endsWith(headTag.slice(0, i))) {
+                  bufferFrom = chunk.length - i;
+                  break;
+                }
+              }
+              if (bufferFrom >= 0) {
+                controller.enqueue(encoder.encode(chunk.slice(0, bufferFrom)));
+                pendingChunk = chunk.slice(bufferFrom);
+              } else {
+                controller.enqueue(encoder.encode(chunk));
+              }
+              return;
             }
             controller.enqueue(result.value);
           }
@@ -1308,7 +1423,7 @@ class BunServer {
       if (metaDescriptors.length > 0) {
         html = this.injectMetaIntoHtml(html, metaDescriptors);
       }
-      const loaderScript = resolvedData ? `${traceScript}<script>window.__EREO_DATA__=${serializeLoaderData2(resolvedData)}</script>` : traceScript;
+      const loaderScript = resolvedData !== undefined ? `${traceScript}<script>window.__EREO_DATA__=${serializeLoaderData2(resolvedData)}</script>` : traceScript;
       const clientScript = `<script type="module" src="${this.options.clientEntry}"></script>`;
       if (html.includes("</body>")) {
         html = html.replace("</body>", `${loaderScript}${clientScript}</body>`);
@@ -1386,6 +1501,33 @@ class BunServer {
       }
     });
   }
+  async getEffectiveMethod(request) {
+    const method = request.method.toUpperCase();
+    if (method !== "POST") {
+      return method;
+    }
+    const headerOverride = request.headers.get("X-HTTP-Method-Override");
+    if (headerOverride) {
+      const normalized = headerOverride.toUpperCase();
+      if (BunServer.METHOD_OVERRIDE_ALLOWED.has(normalized))
+        return normalized;
+    }
+    const contentType = request.headers.get("Content-Type") || "";
+    if (!contentType.includes("application/x-www-form-urlencoded")) {
+      return method;
+    }
+    try {
+      const formData = await request.clone().formData();
+      const override = formData.get(BunServer.METHOD_OVERRIDE_HEADER);
+      if (typeof override !== "string") {
+        return method;
+      }
+      const normalized = override.toUpperCase();
+      return BunServer.METHOD_OVERRIDE_ALLOWED.has(normalized) ? normalized : method;
+    } catch {
+      return method;
+    }
+  }
   buildMeta(module, loaderData, params, url) {
     if (!module.meta) {
       return [];
@@ -1424,22 +1566,42 @@ class BunServer {
     }
     return tags;
   }
+  static ALLOWED_LINK_ATTRS = new Set([
+    "rel",
+    "href",
+    "type",
+    "media",
+    "sizes",
+    "crossorigin",
+    "as",
+    "hreflang",
+    "title",
+    "integrity",
+    "referrerpolicy",
+    "fetchpriority",
+    "imagesizes",
+    "imagesrcset",
+    "disabled"
+  ]);
+  static escapeAttr(s) {
+    return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  }
   buildMetaHtml(meta) {
     let html = "";
     for (const descriptor of meta) {
       if (descriptor.name && descriptor.content) {
-        const name = descriptor.name.replace(/"/g, "&quot;");
-        const content = descriptor.content.replace(/"/g, "&quot;");
+        const name = BunServer.escapeAttr(descriptor.name);
+        const content = BunServer.escapeAttr(descriptor.content);
         html += `<meta name="${name}" content="${content}"/>`;
       } else if (descriptor.property && descriptor.content) {
-        const property = descriptor.property.replace(/"/g, "&quot;");
-        const content = descriptor.content.replace(/"/g, "&quot;");
+        const property = BunServer.escapeAttr(descriptor.property);
+        const content = BunServer.escapeAttr(descriptor.content);
         html += `<meta property="${property}" content="${content}"/>`;
       } else if (descriptor["script:ld+json"]) {
         const safeJsonLd = String(descriptor["script:ld+json"]).replace(/<\//g, "<\\/");
         html += `<script type="application/ld+json">${safeJsonLd}</script>`;
       } else if (descriptor.tagName === "link") {
-        const attrs = Object.entries(descriptor).filter(([k]) => k !== "tagName").map(([k, v]) => `${k}="${String(v).replace(/"/g, "&quot;")}"`).join(" ");
+        const attrs = Object.entries(descriptor).filter(([k]) => k !== "tagName" && BunServer.ALLOWED_LINK_ATTRS.has(k)).map(([k, v]) => `${k}="${BunServer.escapeAttr(String(v))}"`).join(" ");
         html += `<link ${attrs}/>`;
       }
     }
@@ -1692,70 +1854,69 @@ class BunServer {
         resolveHandler(ws)?.drain?.(ws);
       }
     };
-    const serverOptions = {
-      port,
-      hostname,
-      fetch: async (request, server) => {
-        const url = new URL(request.url);
-        if (websocket && url.pathname === "/__hmr") {
-          if (server.upgrade(request, { data: { _wsType: "hmr" } }))
-            return;
+    this.fetchHandler = async (request, server) => {
+      const url = new URL(request.url);
+      if (websocket && url.pathname === "/__hmr") {
+        if (server.upgrade(request, { data: { _wsType: "hmr" } }))
+          return;
+      }
+      if (url.pathname === "/__ereo/trace-ws" && typeof this.options.trace === "object" && this.options.trace.traceWebSocket) {
+        const traceWsType = "__ereo_trace_ws";
+        if (!upgradeHandlers.some((h) => h.path === traceWsType)) {
+          upgradeHandlers.push({
+            path: traceWsType,
+            upgrader: () => true,
+            wsConfig: this.options.trace.traceWebSocket.websocket
+          });
         }
-        if (url.pathname === "/__ereo/trace-ws" && typeof this.options.trace === "object" && this.options.trace.traceWebSocket) {
-          const traceWsType = "__ereo_trace_ws";
-          if (!upgradeHandlers.some((h) => h.path === traceWsType)) {
-            upgradeHandlers.push({
-              path: traceWsType,
-              upgrader: () => true,
-              wsConfig: this.options.trace.traceWebSocket.websocket
-            });
+        if (server.upgrade(request, { data: { _wsType: traceWsType } }))
+          return;
+      }
+      const upgradeHeader = request.headers.get("Upgrade");
+      if (upgradeHeader?.toLowerCase() === "websocket") {
+        for (const handler of upgradeHandlers) {
+          if (url.pathname === handler.path) {
+            const data = { _wsType: handler.path, subscriptions: new Map, ctx: {}, originalRequest: request };
+            if (server.upgrade(request, { data }))
+              return;
           }
-          if (server.upgrade(request, { data: { _wsType: traceWsType } }))
-            return;
         }
-        const upgradeHeader = request.headers.get("Upgrade");
-        if (upgradeHeader?.toLowerCase() === "websocket") {
-          for (const handler of upgradeHandlers) {
-            if (url.pathname === handler.path) {
-              const data = { _wsType: handler.path, subscriptions: new Map, ctx: {}, originalRequest: request };
-              if (server.upgrade(request, { data }))
+        if (this.router && typeof this.router.getRoutes === "function") {
+          const routes = this.router.getRoutes();
+          const matchResult = matchWithLayouts(url.pathname, routes);
+          if (matchResult) {
+            await this.router.loadModule(matchResult.route);
+            const mod = matchResult.route.module;
+            if (mod?.websocket) {
+              const wsType = "route:" + url.pathname;
+              if (!upgradeHandlers.some((h) => h.path === wsType)) {
+                upgradeHandlers.push({
+                  path: wsType,
+                  upgrader: () => true,
+                  wsConfig: mod.websocket
+                });
+              }
+              if (typeof mod.GET === "function") {
+                return this.handleRequest(request, wsType);
+              }
+              if (server.upgrade(request, { data: { _wsType: wsType } })) {
                 return;
-            }
-          }
-          if (this.router && typeof this.router.getRoutes === "function") {
-            const routes = this.router.getRoutes();
-            const matchResult = matchWithLayouts(url.pathname, routes);
-            if (matchResult) {
-              await this.router.loadModule(matchResult.route);
-              const mod = matchResult.route.module;
-              if (mod?.websocket) {
-                const wsType = "route:" + url.pathname;
-                if (!upgradeHandlers.some((h) => h.path === wsType)) {
-                  upgradeHandlers.push({
-                    path: wsType,
-                    upgrader: () => true,
-                    wsConfig: mod.websocket
-                  });
-                }
-                if (typeof mod.GET === "function") {
-                  return this.handleRequest(request, wsType);
-                }
-                if (server.upgrade(request, { data: { _wsType: wsType } })) {
-                  return;
-                }
-                return new Response("WebSocket upgrade failed", { status: 400 });
               }
+              return new Response("WebSocket upgrade failed", { status: 400 });
             }
           }
         }
-        return this.handleRequest(request);
-      },
-      error: (error) => this.handleError(error, {})
+      }
+      return this.handleRequest(request);
+    };
+    const serverOptions = {
+      port,
+      hostname,
+      fetch: this.fetchHandler,
+      error: (error) => this.handleError(error, createContext(new Request("http://localhost/"))),
+      websocket: mergedWebSocket,
+      tls: tls || undefined
     };
-    if (tls) {
-      serverOptions.tls = tls;
-    }
-    serverOptions.websocket = mergedWebSocket;
     this.server = Bun.serve(serverOptions);
     const protocol = tls ? "https" : "http";
     console.log(`Server running at ${protocol}://${hostname}:${port}`);
@@ -1768,9 +1929,9 @@ class BunServer {
     }
   }
   async reload() {
-    if (this.server) {
+    if (this.server && this.fetchHandler) {
       this.server.reload({
-        fetch: (request) => this.handleRequest(request)
+        fetch: this.fetchHandler
       });
     }
   }

package/dist/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAgB,UAAU,EAAE,MAAM,YAAY,CAAC;AAG9E;;;;;;;;;GASG;AACH,MAAM,WAAW,oBAAoB;IACnC,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,6EAA6E;IAC7E,OAAO,EAAE,iBAAiB,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,WAAW,CAA8B;IAEjD;;OAEG;IACH,GAAG,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IACrC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAUnD;;;;;;;OAOG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC;IAwBpB;;OAEG;IACH,OAAO,CAAC,SAAS;CAQlB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,eAAe,CAEvD;AAMD;;GAEG;AACH,wBAAgB,MAAM,IAAI,iBAAiB,CAc1C;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;IAC3D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,IAAI,CAAC,OAAO,GAAE,WAAgB,GAAG,iBAAiB,CAyDjE;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,KAAK,CAAC;IAC9C,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAChC,iBAAiB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACpC;AAED,wBAAgB,eAAe,CAAC,OAAO,GAAE,sBAA2B,GAAG,iBAAiB,CAmCvF;AAED;;GAEG;AACH,wBAAgB,QAAQ,IAAI,iBAAiB,CA+B5C;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;CAC7C;AAED,wBAAgB,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,iBAAiB,CA8D3E"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAgB,UAAU,EAAE,MAAM,YAAY,CAAC;AAG9E;;;;;;;;;GASG;AACH,MAAM,WAAW,oBAAoB;IACnC,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,6EAA6E;IAC7E,OAAO,EAAE,iBAAiB,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,WAAW,CAA8B;IAEjD;;OAEG;IACH,GAAG,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IACrC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAUnD;;;;;;;OAOG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GAC7B,OAAO,CAAC,QAAQ,CAAC;IAgCpB;;OAEG;IACH,OAAO,CAAC,SAAS;CAQlB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,eAAe,CAEvD;AAMD;;GAEG;AACH,wBAAgB,MAAM,IAAI,iBAAiB,CAc1C;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;IAC3D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,IAAI,CAAC,OAAO,GAAE,WAAgB,GAAG,iBAAiB,CAwFjE;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,KAAK,CAAC;IAC9C,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAChC,iBAAiB,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACpC;AAED,wBAAgB,eAAe,CAAC,OAAO,GAAE,sBAA2B,GAAG,iBAAiB,CAmCvF;AAED;;GAEG;AACH,wBAAgB,QAAQ,IAAI,iBAAiB,CA+B5C;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;CAC7C;AAED,wBAAgB,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,iBAAiB,CAyE3E"}

package/dist/static.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../src/static.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAuCH;;GAEG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpD;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kEAAkE;IAClE,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAwDD;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAsJlG;AAiDD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,IAGvC,SAAS,OAAO,EAAE,SAAS,GAAG,EAAE,MAAM,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAK5E"}
+{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["../src/static.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAuCH;;GAEG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpD;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kEAAkE;IAClE,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAwDD;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAuJlG;AAiDD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,IAGvC,SAAS,OAAO,EAAE,SAAS,GAAG,EAAE,MAAM,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAK5E"}

package/dist/streaming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../src/streaming.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,KAAK,EAAS,UAAU,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,YAAY,CAAC;AAGhG;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,kBAAkB;IAClB,KAAK,EAAE,UAAU,CAAC;IAClB,sBAAsB;IACtB,OAAO,EAAE,UAAU,CAAC;IACpB,+CAA+C;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qBAAqB;IACrB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,uBAAuB;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,uDAAuD;IACvD,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,uBAAuB;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACnC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CA+DjC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAuHvB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAgCvB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,CAK7D"}
+{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../src/streaming.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,KAAK,EAAS,UAAU,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,YAAY,CAAC;AAGhG;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,kBAAkB;IAClB,KAAK,EAAE,UAAU,CAAC;IAClB,sBAAsB;IACtB,OAAO,EAAE,UAAU,CAAC;IACpB,+CAA+C;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qBAAqB;IACrB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,uBAAuB;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,uDAAuD;IACvD,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,uBAAuB;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACnC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CA+DjC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA0HvB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAmCvB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,CAK7D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ereo/server",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "license": "MIT",
   "author": "Enoch Kujem Abassey",
   "homepage": "https://ereojs.github.io/ereoJS",
@@ -32,10 +32,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ereo/core": "^0.2.36",
-    "@ereo/client": "^0.2.36",
-    "@ereo/router": "^0.2.36",
-    "@ereo/data": "^0.2.36"
+    "@ereo/core": "workspace:*",
+    "@ereo/client": "workspace:*",
+    "@ereo/router": "workspace:*",
+    "@ereo/data": "workspace:*"
   },
   "devDependencies": {
     "@types/bun": "^1.1.0",