gemi 0.4.2 → 0.4.3

package/dist/app/App.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="bun-types" />
-/// <reference types="bun-types" />
 import type { ApiRouter } from "../http/ApiRouter";
 import { ViewRouter } from "../http/ViewRouter";
 import type { ComponentTree } from "../client/types";
@@ -10,9 +7,9 @@ import type { ServerWebSocket } from "bun";
 import { ComponentType } from "react";
 interface RenderParams {
     styles: string[];
-    views: Record<string, string>;
     manifest: Record<string, any>;
     serverManifest: Record<string, any>;
+    bootstrapModules?: string[];
 }
 interface AppParams {
     viewRouter: new () => ViewRouter;
@@ -22,6 +19,7 @@ interface AppParams {
     root: ComponentType;
 }
 export declare class App {
+    private renderParams;
     private flatViewRoutes;
     private flatApiRoutes;
     private routeManifest;
@@ -36,11 +34,13 @@ export declare class App {
     private Root;
     constructor(params: AppParams);
     private prepare;
-    printName(): void;
     getComponentTree(): ComponentTree;
+    setRenderParams(params: RenderParams): void;
     private resolvePageData;
-    handleRequest(req: Request): Promise<any>;
-    fetch(req: Request, renderParams: RenderParams): Promise<Response>;
+    private runMiddleware;
+    handleApiRequest(req: Request): Promise<Response>;
+    handleViewRequest(req: Request): Promise<Response>;
+    fetch(req: Request): Promise<Response>;
     private handleWebSocketMessage;
     private handleWebSocketOpen;
     private handleWebSocketClose;

package/dist/app/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../app/App.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAGV,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAU3C,OAAO,EAAE,aAAa,EAA2B,MAAM,OAAO,CAAC;AAK/D,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACrC;AAED,UAAU,SAAS;IACjB,UAAU,EAAE,UAAU,UAAU,CAAC;IACjC,SAAS,EAAE,UAAU,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAC;IACzD,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,cAAc,CAGf;IACP,OAAO,CAAC,aAAa,CASd;IACP,OAAO,CAAC,aAAa,CAAgC;IAC9C,IAAI,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,aAAa,CAAgB;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAM;IAC7D,UAAU,SAAK;IACtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,IAAI,CAAgB;gBAEhB,MAAM,EAAE,SAAS;IAU7B,OAAO,CAAC,OAAO;IAkCR,SAAS;IAIT,gBAAgB;YAIT,eAAe;IAsDvB,aAAa,CAAC,GAAG,EAAE,OAAO;IAqL1B,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY;IA+GpD,OAAO,CAAC,sBAAsB,CAGtB;IACR,OAAO,CAAC,mBAAmB,CAEzB;IACF,OAAO,CAAC,oBAAoB,CAM1B;IAEF,SAAS;sBAdH,eAAe,WACV,MAAM,GAAG,MAAM;mBAES,eAAe;oBAI5C,eAAe,QACb,MAAM,UACJ,MAAM;MASd;CACH"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../app/App.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AAKpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAU3C,OAAO,EAAE,aAAa,EAA2B,MAAM,OAAO,CAAC;AAM/D,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,UAAU,SAAS;IACjB,UAAU,EAAE,UAAU,UAAU,CAAC;IACjC,SAAS,EAAE,UAAU,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,EAAE,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAC;IACzD,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,qBAAa,GAAG;IACd,OAAO,CAAC,YAAY,CAKlB;IACF,OAAO,CAAC,cAAc,CAGf;IACP,OAAO,CAAC,aAAa,CASd;IACP,OAAO,CAAC,aAAa,CAAgC;IAC9C,IAAI,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,aAAa,CAAgB;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,UAAU,CAAC,CAAM;IAC7D,UAAU,SAAK;IACtB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,IAAI,CAAgB;gBAEhB,MAAM,EAAE,SAAS;IAU7B,OAAO,CAAC,OAAO;IAkCR,gBAAgB;IAIhB,eAAe,CAAC,MAAM,EAAE,YAAY;YAI7B,eAAe;IAqC7B,OAAO,CAAC,aAAa;IAmCf,gBAAgB,CAAC,GAAG,EAAE,OAAO;IAwF7B,iBAAiB,CAAC,GAAG,EAAE,OAAO;IA+L9B,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAU5C,OAAO,CAAC,sBAAsB,CAGtB;IACR,OAAO,CAAC,mBAAmB,CAEzB;IACF,OAAO,CAAC,oBAAoB,CAM1B;IAEF,SAAS;sBAdH,eAAe,WACV,MAAM,GAAG,MAAM;mBAES,eAAe;oBAI5C,eAAe,QACb,MAAM,UACJ,MAAM;MASd;CACH"}

package/dist/app/index.js

@@ -723,14 +723,14 @@ class ApiRouter {
           method,
           exec: async (req, params, app) => {
             let handler = (_req, params2) => Promise.resolve({});
-            let httpRequest = new HttpRequest(req);
+            let httpRequest = new HttpRequest(req.rawRequest);
             if (isController(controller)) {
               const controllerInstance = new controller(app);
               const Req = controllerInstance.requests[methodName] ?? HttpRequest;
-              httpRequest = new Req(req);
+              httpRequest = new Req(req.rawRequest);
               handler = controllerInstance[methodName].bind(controllerInstance);
             } else if (typeof controller === "function") {
-              handler = (req2) => controller(new HttpRequest(req2));
+              handler = (req2) => controller(req2);
             }
             return await handler(httpRequest, params);
           }
@@ -1849,6 +1849,12 @@ function isConstructor(value) {
 
 // app/App.ts
 class App {
+  renderParams = {
+    styles: [],
+    manifest: {},
+    serverManifest: {},
+    bootstrapModules: []
+  };
   flatViewRoutes = {};
   flatApiRoutes = {};
   routeManifest = {};
@@ -1898,12 +1904,12 @@ class App {
     this.routeManifest = createRouteManifest(viewRouters);
     this.flatApiRoutes = createFlatApiRoutes(apiRouters);
   }
-  printName() {
-    console.log(this.name);
-  }
   getComponentTree() {
     return this.componentTree;
   }
+  setRenderParams(params) {
+    this.renderParams = params;
+  }
   async resolvePageData(req) {
     const url = new URL(req.url);
     let handlers = [];
@@ -1920,19 +1926,7 @@ class App {
         middlewares = handler.middleware;
       }
     }
-    const reqWithMiddlewares = middlewares.map((middleware) => {
-      if (typeof middleware === "string") {
-        return new this.middlewareAliases[middleware]().run;
-      }
-      return middleware;
-    }).reduce((acc, middleware) => {
-      return async (req2, ctx) => {
-        return {
-          ...await acc(req2, ctx),
-          ...await middleware(req2, ctx)
-        };
-      };
-    }, (_req, _ctx) => Promise.resolve({}));
+    const reqWithMiddlewares = this.runMiddleware(middlewares);
     const reqCtx = new Map;
     const data = await requestContext.run(reqCtx, async () => {
       await reqWithMiddlewares(new HttpRequest(req), reqCtx);
@@ -1945,247 +1939,259 @@ class App {
       user: reqCtx.get("user") ?? null
     };
   }
-  async handleRequest(req) {
+  runMiddleware(middleware) {
+    return middleware.map((aliasOrTest) => {
+      if (typeof aliasOrTest === "string") {
+        const alias = aliasOrTest;
+        if (this.middlewareAliases?.[alias]) {
+          const middleware2 = new this.middlewareAliases[alias];
+          return middleware2.run;
+        }
+      } else {
+        if (isConstructor(aliasOrTest)) {
+          const middleware2 = new aliasOrTest;
+          return middleware2.run;
+        }
+        return aliasOrTest;
+      }
+    }).filter(Boolean).reduce((acc, middleware2) => {
+      return async (req, ctx) => {
+        return {
+          ...await acc(req, ctx),
+          ...await middleware2(req, ctx)
+        };
+      };
+    }, (_req) => Promise.resolve({}));
+  }
+  async handleApiRequest(req) {
     const url = new URL(req.url);
-    if (url.pathname.startsWith("/api")) {
-      const apiPath = url.pathname.replace("/api", "");
-      for (const [path, handler] of Object.entries(this.flatApiRoutes)) {
-        const pattern = new me({ pathname: path });
-        if (pattern.test({ pathname: apiPath })) {
-          const params = pattern.exec({ pathname: apiPath })?.pathname.groups;
-          if (!handler[req.method.toLowerCase()]) {
-            return {
-              kind: "api_404"
-            };
-          }
-          const exec = handler[req.method.toLowerCase()].exec;
-          const middlewares = handler[req.method.toLowerCase()].middleware;
-          const reqWithMiddlewares = middlewares.map((aliasOrTest) => {
-            if (typeof aliasOrTest === "string") {
-              const alias = aliasOrTest;
-              if (this.middlewareAliases?.[alias]) {
-                const middleware = new this.middlewareAliases[alias];
-                return middleware.run;
-              }
+    const apiPath = url.pathname.replace("/api", "");
+    for (const [path, handler] of Object.entries(this.flatApiRoutes)) {
+      const pattern = new me({ pathname: path });
+      if (pattern.test({ pathname: apiPath })) {
+        const params = pattern.exec({ pathname: apiPath })?.pathname.groups;
+        if (!handler[req.method.toLowerCase()]) {
+          return new Response(JSON.stringify({ error: { message: "Not found" } }));
+        }
+        const exec = handler[req.method.toLowerCase()].exec;
+        const middlewares = handler[req.method.toLowerCase()].middleware;
+        const reqWithMiddlewares = this.runMiddleware(middlewares);
+        const reqCtx = new Map;
+        return await requestContext.run(reqCtx, async () => {
+          const httpRequest = new HttpRequest(req);
+          let handler2 = exec ? () => exec(httpRequest, params, this) : () => Promise.resolve({});
+          try {
+            await reqWithMiddlewares(httpRequest, reqCtx);
+          } catch (err) {
+            if (err.kind === GEMI_REQUEST_BREAKER_ERROR) {
+              const { status = 400, data: data2, headers } = err.payload.api;
+              return new Response(JSON.stringify(data2), {
+                status,
+                headers: {
+                  "Content-Type": "application/json",
+                  ...headers
+                }
+              });
             } else {
-              if (isConstructor(aliasOrTest)) {
-                const middleware = new aliasOrTest;
-                return middleware.run;
-              }
-              return aliasOrTest;
-            }
-          }).filter(Boolean).reduce((acc, middleware) => {
-            return async (req2, ctx) => {
-              return {
-                ...await acc(req2, ctx),
-                ...await middleware(req2, ctx)
-              };
-            };
-          }, (req2) => Promise.resolve({}));
-          const reqCtx = new Map;
-          return await requestContext.run(reqCtx, async () => {
-            try {
-              await reqWithMiddlewares(new HttpRequest(req), reqCtx);
-            } catch (err) {
-              if (err.kind === GEMI_REQUEST_BREAKER_ERROR) {
-                return {
-                  kind: "apiError",
-                  ...err.payload.api
-                };
-              } else {
-                throw err;
-              }
+              throw err;
             }
-            if (exec) {
-              let data = {};
-              try {
-                data = await exec(req, params, this);
-              } catch (err) {
-                if (err.kind === GEMI_REQUEST_BREAKER_ERROR) {
-                  return {
-                    kind: "apiError",
-                    ...err.payload.api
-                  };
-                } else {
-                  throw err;
-                }
-              }
-              return {
-                kind: "api",
-                data,
+          }
+          let data = {};
+          try {
+            data = await handler2();
+          } catch (err) {
+            if (err.kind === GEMI_REQUEST_BREAKER_ERROR) {
+              const { status = 400, data: data2, headers } = err.payload.api;
+              return new Response(JSON.stringify(data2), {
+                status,
                 headers: {
-                  "Set-Cookie": Object.entries({}).map(([name, config]) => {
-                    return `${name}=${config.value}; HttpOnly; SameSite=Strict; Path=/; Max-Age=${config.maxAge}`;
-                  }).join(", ")
+                  "Content-Type": "application/json",
+                  ...headers
                 }
-              };
+              });
+            } else {
+              throw err;
+            }
+          }
+          const result = {
+            kind: "api",
+            data,
+            headers: {
+              "Set-Cookie": Object.entries({}).map(([name, config]) => {
+                return `${name}=${config.value}; HttpOnly; SameSite=Strict; Path=/; Max-Age=${config.maxAge}`;
+              }).join(", ")
+            }
+          };
+          return new Response(JSON.stringify(result.data), {
+            headers: {
+              "Content-Type": "application/json",
+              ...result.headers
             }
           });
-        }
+        });
       }
-      return {
-        kind: "api_404"
-      };
-    } else {
-      let pageData = null;
-      try {
-        pageData = await this.resolvePageData(req);
-      } catch (err) {
-        if (err instanceof RequestBreakerError) {
-          return {
-            kind: "viewError",
-            ...err.payload.view
-          };
+    }
+    return new Response(JSON.stringify({ error: { message: "Not found" } }), {
+      status: 404
+    });
+  }
+  async handleViewRequest(req) {
+    const url = new URL(req.url);
+    let pageData = null;
+    try {
+      let handlers = [];
+      let middlewares = [];
+      let currentPathName2 = null;
+      let params2 = {};
+      const sortedEntries = Object.entries(this.flatViewRoutes).sort(([pathA], [pathB]) => pathB.length - pathA.length);
+      for (const [pathname, handler] of sortedEntries) {
+        const pattern = new me({ pathname });
+        if (pattern.test({ pathname: url.pathname })) {
+          currentPathName2 = pathname;
+          params2 = pattern.exec({ pathname: url.pathname })?.pathname.groups;
+          handlers = handler.exec;
+          middlewares = handler.middleware;
         }
       }
-      if (!pageData) {
-        return {
-          kind: "",
-          data: {},
-          meta: [],
-          headers: {}
-        };
-      }
-      const { data, params, currentPathName, user } = pageData;
-      const viewData = data.reduce((acc, data2) => {
-        return {
-          ...acc,
-          ...data2
-        };
-      }, {});
-      if (url.searchParams.get("json")) {
-        return {
-          kind: "viewData",
-          data: {
-            [url.pathname]: viewData
-          },
-          meta: [],
-          headers: {}
-        };
+      if (!currentPathName2) {
+        return new Response(null, {
+          status: 404
+        });
       }
-      let cookieHeaders = {};
-      const visitorIdExist = req.headers.get("cookie")?.includes("visitor_id");
-      if (!visitorIdExist) {
-        cookieHeaders = {
-          "Set-Cookie": `visitor_id=${v4()}; HttpOnly; SameSite=Strict; Path=/`
-        };
+      const reqWithMiddlewares = this.runMiddleware(middlewares);
+      const reqCtx = new Map;
+      const data2 = await requestContext.run(reqCtx, async () => {
+        await reqWithMiddlewares(new HttpRequest(req), reqCtx);
+        return await Promise.all(handlers.map((fn) => fn(req, params2, this)));
+      });
+      pageData = {
+        data: data2,
+        currentPathName: currentPathName2,
+        params: params2,
+        user: reqCtx.get("user") ?? null
+      };
+    } catch (err) {
+      if (err.kind === GEMI_REQUEST_BREAKER_ERROR) {
+        return new Response(null, {
+          ...err.payload.view
+        });
       }
+    }
+    if (!pageData) {
+      return new Response("<div>404</div>");
+    }
+    const { data, params, currentPathName, user } = pageData;
+    const viewData = data.reduce((acc, data2) => {
       return {
-        kind: "view",
+        ...acc,
+        ...data2
+      };
+    }, {});
+    if (url.searchParams.get("json")) {
+      const result2 = {
+        kind: "viewData",
         data: {
-          pageData: {
-            [url.pathname]: viewData
-          },
-          auth: { user },
-          routeManifest: this.routeManifest,
-          router: {
-            pathname: currentPathName,
-            params,
-            currentPath: url.pathname,
-            is404: false
-          },
-          componentTree: [["404", []], ...this.componentTree]
-        },
-        head: {},
-        headers: {
-          "Content-Type": "text/html",
-          "Cache-Control": user ? "private, no-cache, no-store, max-age=0, must-revalidate" : "public, max-age=864000, must-revalidate",
-          ETag: this.appId,
-          ...cookieHeaders
+          [url.pathname]: viewData
         },
-        status: 200
+        meta: [],
+        headers: {}
       };
-    }
-  }
-  async fetch(req, renderParams) {
-    const result = await this.handleRequest(req);
-    if (result.kind === "api_404") {
-      return new Response("Not found", { status: 404 });
-    }
-    if (result.kind === "viewError") {
-      const { kind, ...payload } = result;
-      return new Response(null, {
-        ...payload
-      });
-    }
-    if (result.kind === "apiError") {
-      const { kind, data, ...payload } = result;
-      return new Response(JSON.stringify(data), {
-        ...payload
-      });
-    }
-    if (!result) {
-      return new Response("Not found", { status: 404 });
-    }
-    if (result.kind === "viewData") {
-      const { data, headers, head } = result;
       return new Response(JSON.stringify({
-        data,
-        head
+        data: result2.data,
+        head: {}
       }), {
         headers: {
-          ...headers,
+          ...result2.headers,
           "Content-Type": "application/json"
         }
       });
     }
-    if (result.kind === "view") {
-      const { data, headers, status } = result;
-      const { styles, views, manifest, serverManifest, ...renderOptions } = renderParams;
-      const viewImportMap = {};
-      let appDir = null;
-      const template = (viewName, path) => `"${viewName}": () => import("${path}")`;
-      const templates = [];
-      for (const fileName of [
-        "404",
-        ...flattenComponentTree(this.componentTree)
-      ]) {
-        if (!manifest) {
-          appDir = `${process.env.APP_DIR}`;
-          const mod = await import(`${appDir}/views/${fileName}.tsx`);
-          viewImportMap[fileName] = mod.default;
-          templates.push(template(fileName, `${appDir}/views/${fileName}.tsx`));
-        } else {
-          const { file } = serverManifest[`app/views/${fileName}.tsx`];
-          const mod = await import(`${process.env.DIST_DIR}/server/${file}`);
-          viewImportMap[fileName] = mod.default;
-          const clientFile = manifest[`app/views/${fileName}.tsx`];
-          if (clientFile) {
-            templates.push(template(fileName, `/${clientFile.file}`));
-          }
-        }
+    let cookieHeaders = {};
+    const visitorIdExist = req.headers.get("cookie")?.includes("visitor_id");
+    if (!visitorIdExist) {
+      cookieHeaders = {
+        "Set-Cookie": `visitor_id=${v4()}; HttpOnly; SameSite=Strict; Path=/`
+      };
+    }
+    const { styles, manifest, serverManifest, bootstrapModules } = this.renderParams;
+    const viewImportMap = {};
+    let appDir = null;
+    const template = (viewName, path) => `"${viewName}": () => import("${path}")`;
+    const templates = [];
+    for (const fileName of [
+      "404",
+      ...flattenComponentTree(this.componentTree)
+    ]) {
+      if (false) {
       }
-      const loaders = `{${templates.join(",")}}`;
-      const stream = await renderToReadableStream(createElement(Fragment, {
-        children: [
-          styles,
-          createElement(this.Root, {
-            data,
-            viewImportMap
-          })
-        ]
-      }), {
-        bootstrapScriptContent: `window.__GEMI_DATA__ = ${JSON.stringify(data)}; window.loaders=${loaders}`,
-        ...renderOptions
-      });
-      return new Response(stream, {
-        status,
-        headers: {
-          "Content-Type": "text/html",
-          ...headers
+      if (!manifest) {
+        appDir = `${process.env.APP_DIR}`;
+        const mod = await import(`${appDir}/views/${fileName}.tsx`);
+        viewImportMap[fileName] = mod.default;
+        templates.push(template(fileName, `${appDir}/views/${fileName}.tsx`));
+      } else {
+        const serverFile = serverManifest[`app/views/${fileName}.tsx`];
+        const mod = await import(`${process.env.DIST_DIR}/server/${serverFile?.file}`);
+        viewImportMap[fileName] = mod.default;
+        const clientFile = manifest[`app/views/${fileName}.tsx`];
+        if (clientFile) {
+          templates.push(template(fileName, `/${clientFile?.file}`));
         }
-      });
+      }
     }
-    if (result.kind === "api") {
-      const { data, headers } = result;
-      return new Response(JSON.stringify(data), {
-        headers: {
-          "Content-Type": "application/json",
-          ...headers
-        }
-      });
+    const loaders = `{${templates.join(",")}}`;
+    const result = {
+      kind: "view",
+      data: {
+        pageData: {
+          [url.pathname]: viewData
+        },
+        auth: { user },
+        routeManifest: this.routeManifest,
+        router: {
+          pathname: currentPathName,
+          params,
+          currentPath: url.pathname,
+          is404: false
+        },
+        componentTree: [["404", []], ...this.componentTree]
+      },
+      head: {},
+      headers: {
+        "Content-Type": "text/html",
+        "Cache-Control": user ? "private, no-cache, no-store, max-age=0, must-revalidate" : "public, max-age=864000, must-revalidate",
+        ETag: this.appId,
+        ...cookieHeaders
+      },
+      status: 200
+    };
+    const stream = await renderToReadableStream(createElement(Fragment, {
+      children: [
+        styles,
+        createElement(this.Root, {
+          data: result.data,
+          viewImportMap
+        })
+      ]
+    }), {
+      bootstrapScriptContent: `window.__GEMI_DATA__ = ${JSON.stringify(result.data)}; window.loaders=${loaders}`,
+      bootstrapModules
+    });
+    return new Response(stream, {
+      status: result.status,
+      headers: {
+        "Content-Type": "text/html",
+        ...result.headers
+      }
+    });
+  }
+  async fetch(req) {
+    const url = new URL(req.url);
+    if (url.pathname.startsWith("/api")) {
+      return await this.handleApiRequest(req);
+    } else {
+      return await this.handleViewRequest(req);
     }
-    return new Response("Not found", { status: 404 });
   }
   handleWebSocketMessage = (ws, message) => {
   };

package/dist/client/ClientRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../client/ClientRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,aAAa,EACnB,MAAM,OAAO,CAAC;AAkFf,eAAO,MAAM,YAAY,UAAW;IAClC,aAAa,CAAC,EAAE,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,UAAU,EAAE,cAAc,GAAG,CAAC,CAAC;CAChC,4CA2BA,CAAC"}
+{"version":3,"file":"ClientRouter.d.ts","sourceRoot":"","sources":["../../client/ClientRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,aAAa,EACnB,MAAM,OAAO,CAAC;AAkFf,eAAO,MAAM,YAAY,UAAW;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;CAChC,4CA2BA,CAAC"}

package/dist/client/ClientRouterContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientRouterContext.d.ts","sourceRoot":"","sources":["../../client/ClientRouterContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,EAAE,EACP,KAAK,QAAQ,EAEd,MAAM,SAAS,CAAC;AACjB,OAAO,EAOL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,UAAU,wBAAwB;IAChC,kBAAkB,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACtC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACxD,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,eAAO,MAAM,mBAAmB,mDAE/B,CAAC;AAEF,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,eAAO,MAAM,oBAAoB,UACxB,kBAAkB,yBAAyB,CAAC,4CA2GpD,CAAC;AAUF,wBAAgB,WAAW,aAU1B;AAED,wBAAgB,SAAS,2BAGxB;AAED,wBAAgB,WAAW,SAAK;AAEhC,wBAAgB,SAAS;eAGJ,EAAE,UAAU,GAAG;EAsBnC;AAED,eAAO,MAAM,IAAI,UACR,KAAK,eAAe,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,EAAE,CAAA;CAAE,4CA0BxD,CAAC"}
+{"version":3,"file":"ClientRouterContext.d.ts","sourceRoot":"","sources":["../../client/ClientRouterContext.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,EAAE,EACP,KAAK,QAAQ,EAEd,MAAM,SAAS,CAAC;AACjB,OAAO,EAOL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,UAAU,wBAAwB;IAChC,kBAAkB,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACtC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACxD,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,eAAO,MAAM,mBAAmB,mDAE/B,CAAC;AAEF,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,eAAO,MAAM,oBAAoB,UACxB,iBAAiB,CAAC,yBAAyB,CAAC,4CA2GpD,CAAC;AAUF,wBAAgB,WAAW,aAU1B;AAED,wBAAgB,SAAS,2BAGxB;AAED,wBAAgB,WAAW,SAAK;AAEhC,wBAAgB,SAAS;eAGJ,EAAE,UAAU,GAAG;EAsBnC;AAED,eAAO,MAAM,IAAI,UACR,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,EAAE,CAAA;CAAE,4CA0BxD,CAAC"}

package/dist/client/Form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../client/Form.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EAKpB,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAkDzB,UAAU,SAAS,CAAC,CAAC,GAAG,EAAE,CAAE,SAAQ,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC;IAC1E,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CACvB;AAkBD,wBAAgB,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,2CAoI1C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,CAAC,OAAO,KAAK,CAAC;;;;;;;EAShE;AAED,eAAO,MAAM,KAAK,UACT,eAAe,OAAO,CAAC,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,GAAG,IAAI,CAAC;CAC1C,4CA2CF,CAAC;AAEF,eAAO,MAAM,QAAQ,UACZ,eAAe,OAAO,CAAC,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,GAAG,IAAI,CAAC;CAC1C,4CA4CF,CAAC;AAaF,eAAO,MAAM,YAAY,UAChB,eAAe,MAAM,CAAC,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,SAAS,CAAC;CAC7C,8GAWF,CAAC"}
+{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../client/Form.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EAKpB,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAkDzB,UAAU,SAAS,CAAC,CAAC,GAAG,EAAE,CAAE,SAAQ,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC;IAC1E,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CACvB;AAkBD,wBAAgB,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,2CAoI1C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,CAAC,OAAO,KAAK,CAAC;;;;;;;EAShE;AAED,eAAO,MAAM,KAAK,UACT,cAAc,CAAC,OAAO,CAAC,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,GAAG,IAAI,CAAC;CAC1C,4CA2CF,CAAC;AAEF,eAAO,MAAM,QAAQ,UACZ,cAAc,CAAC,OAAO,CAAC,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,GAAG,IAAI,CAAC;CAC1C,4CA4CF,CAAC;AAaF,eAAO,MAAM,YAAY,UAChB,cAAc,CAAC,MAAM,CAAC,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,CAAC,SAAS,CAAC;CAC7C,8GAWF,CAAC"}

package/dist/client/Image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../client/Image.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAyC5C,UAAU,UAAU;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,KAAK,UAAW,eAAe,KAAK,CAAC,GAAG,UAAU,4CAwB9D,CAAC"}
+{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../client/Image.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAyC5C,UAAU,UAAU;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,KAAK,UAAW,cAAc,CAAC,KAAK,CAAC,GAAG,UAAU,4CAwB9D,CAAC"}

package/dist/client/Mutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Mutation.d.ts","sourceRoot":"","sources":["../../client/Mutation.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EAItB,KAAK,cAAc,EAGpB,MAAM,OAAO,CAAC;AAcf,UAAU,aAAa;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC;IACrD,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CACnC;AAED,eAAO,MAAM,QAAQ,UAAW,kBAAkB,aAAa,CAAC,4CA2D/D,CAAC;AAEF,wBAAgB,iBAAiB;;EAIhC;AAED,eAAO,MAAM,gBAAgB,UAAW;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,CAAC,KAAK,WAAW,CAAC;CACxD,4CAwBA,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,eAAe,KAAK,CAAC,4CAQrD,CAAC"}
+{"version":3,"file":"Mutation.d.ts","sourceRoot":"","sources":["../../client/Mutation.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EAItB,KAAK,cAAc,EAGpB,MAAM,OAAO,CAAC;AAcf,UAAU,aAAa;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC;IACrD,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CACnC;AAED,eAAO,MAAM,QAAQ,UAAW,iBAAiB,CAAC,aAAa,CAAC,4CA2D/D,CAAC;AAEF,wBAAgB,iBAAiB;;EAIhC;AAED,eAAO,MAAM,gBAAgB,UAAW;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;CACxD,4CAwBA,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,cAAc,CAAC,KAAK,CAAC,4CAQrD,CAAC"}

package/dist/client/ServerDataProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerDataProvider.d.ts","sourceRoot":"","sources":["../../client/ServerDataProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,KAAK,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEhC,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/C,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE,OAAO,CAAC;KAChB,CAAC;IACF,aAAa,EAAE,aAAa,CAAC;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;YACd,QAAQ,EAAE,KAAK,CAAC;gBACd,cAAc,EAAE,MAAM,CAAC;gBACvB,IAAI,EAAE,MAAM,CAAC;aACd,CAAC,CAAC;YACH,UAAU,EAAE,MAAM,CAAC;YACnB,EAAE,EAAE,MAAM,CAAC;SACZ,CAAC;KACH,CAAC;CACH;AAED,eAAO,MAAM,iBAAiB,iDAA8C,CAAC;AAE7E,UAAU,uBAAuB;IAC/B,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED,eAAO,MAAM,kBAAkB,UACtB,kBAAkB,uBAAuB,CAAC,4CAgBlD,CAAC"}
+{"version":3,"file":"ServerDataProvider.d.ts","sourceRoot":"","sources":["../../client/ServerDataProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,KAAK,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEhC,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/C,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE,OAAO,CAAC;KAChB,CAAC;IACF,aAAa,EAAE,aAAa,CAAC;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;YACd,QAAQ,EAAE,KAAK,CAAC;gBACd,cAAc,EAAE,MAAM,CAAC;gBACvB,IAAI,EAAE,MAAM,CAAC;aACd,CAAC,CAAC;YACH,UAAU,EAAE,MAAM,CAAC;YACnB,EAAE,EAAE,MAAM,CAAC;SACZ,CAAC;KACH,CAAC;CACH;AAED,eAAO,MAAM,iBAAiB,iDAA8C,CAAC;AAE7E,UAAU,uBAAuB;IAC/B,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED,eAAO,MAAM,kBAAkB,UACtB,iBAAiB,CAAC,uBAAuB,CAAC,4CAgBlD,CAAC"}

package/dist/client/index.js

@@ -29381,7 +29381,7 @@ function flattenComponentTree(componentTree) {
   return Array.from(new Set(out));
 }
 let viewImportMap = null;
-if (typeof window !== "undefined") {
+if (typeof window !== "undefined" && process.env.NODE_ENV !== "test") {
   viewImportMap = {};
   const { componentTree } = window.__GEMI_DATA__;
   for (const viewName of flattenComponentTree(componentTree)) {

package/dist/email/index.js

@@ -8745,7 +8745,7 @@ var __async2 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-var version = "3.3.0";
+var version = "3.4.0";
 var ApiKeys = class {
   constructor(resend) {
     this.resend = resend;
@@ -8935,17 +8935,6 @@ var Emails = class {
     });
   }
 };
-var isResendErrorResponse = (response) => {
-  if (typeof response !== "object" || response === null) {
-    return false;
-  }
-  const error = response;
-  if (typeof error !== "object" || error === null) {
-    return false;
-  }
-  const { message, name: name2 } = error;
-  return typeof message === "string" && typeof name2 === "string";
-};
 var defaultBaseUrl = "https://api.resend.com";
 var defaultUserAgent = `resend-node:${version}`;
 var baseUrl = typeof process !== "undefined" && process.env ? process.env.RESEND_BASE_URL || defaultBaseUrl : defaultBaseUrl;
@@ -8975,27 +8964,43 @@ var Resend = class {
   }
   fetchRequest(_0) {
     return __async2(this, arguments, function* (path, options = {}) {
-      const response = yield fetch(`${baseUrl}${path}`, options);
-      if (!response.ok) {
-        let error = {
-          message: response.statusText,
-          name: "application_error"
-        };
-        try {
-          error = yield response.json();
-          if (isResendErrorResponse(error)) {
+      try {
+        const response = yield fetch(`${baseUrl}${path}`, options);
+        if (!response.ok) {
+          try {
+            const rawError = yield response.text();
+            return { data: null, error: JSON.parse(rawError) };
+          } catch (err) {
+            if (err instanceof SyntaxError) {
+              return {
+                data: null,
+                error: {
+                  name: "application_error",
+                  message: "Internal server error. We are unable to process your request right now, please try again later."
+                }
+              };
+            }
+            const error = {
+              message: response.statusText,
+              name: "application_error"
+            };
+            if (err instanceof Error) {
+              return { data: null, error: __spreadProps(__spreadValues2({}, error), { message: err.message }) };
+            }
             return { data: null, error };
           }
-          return { data: null, error };
-        } catch (err) {
-          if (err instanceof Error) {
-            return { data: null, error: __spreadProps(__spreadValues2({}, error), { message: err.message }) };
-          }
-          return { data: null, error };
         }
+        const data = yield response.json();
+        return { data, error: null };
+      } catch (error) {
+        return {
+          data: null,
+          error: {
+            name: "application_error",
+            message: "Unable to fetch data. The request could not be resolved."
+          }
+        };
       }
-      const data = yield response.json();
-      return { data, error: null };
     });
   }
   post(_0, _1) {

package/dist/http/ApiRouter.d.ts

@@ -13,7 +13,7 @@ type ErrorResponse = {
 type Prepare = (middleware?: (Middleware | string)[]) => {
     middleware: string[];
     method: string;
-    exec: (req: Request, params: Record<string, any>, app: App) => Promise<Partial<DataResponse> | ErrorResponse>;
+    exec: (req: HttpRequest, params: Record<string, any>, app: App) => Promise<Partial<DataResponse> | ErrorResponse>;
 };
 type ApiHandler<T extends new (app: App) => Controller, U = {}> = {
     prepare: Prepare;
@@ -21,7 +21,7 @@ type ApiHandler<T extends new (app: App) => Controller, U = {}> = {
         prepare: Prepare;
     };
 };
-export type ApiRouteExec = (req: Request, params: Record<string, string>, app: App) => Promise<DataResponse | ErrorResponse>;
+export type ApiRouteExec = (req: HttpRequest, params: Record<string, string>, app: App) => Promise<DataResponse | ErrorResponse>;
 type ApiRouteConfig = {
     prepare: Prepare;
 };

package/dist/http/ApiRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApiRouter.d.ts","sourceRoot":"","sources":["../../http/ApiRouter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ApiRouter.d.ts","sourceRoot":"","sources":["../../http/ApiRouter.ts"],"names":[],"mappings":"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"}

package/dist/http/index.js

@@ -252,14 +252,14 @@ class ApiRouter {
           method,
           exec: async (req, params, app) => {
             let handler = (_req, params2) => Promise.resolve({});
-            let httpRequest = new HttpRequest(req);
+            let httpRequest = new HttpRequest(req.rawRequest);
             if (isController(controller)) {
               const controllerInstance = new controller(app);
               const Req = controllerInstance.requests[methodName] ?? HttpRequest;
-              httpRequest = new Req(req);
+              httpRequest = new Req(req.rawRequest);
               handler = controllerInstance[methodName].bind(controllerInstance);
             } else if (typeof controller === "function") {
-              handler = (req2) => controller(new HttpRequest(req2));
+              handler = (req2) => controller(req2);
             }
             return await handler(httpRequest, params);
           }

package/dist/http/requestContext.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { AsyncLocalStorage } from "async_hooks";
 export declare const requestContext: AsyncLocalStorage<Map<string, any>>;
 //# sourceMappingURL=requestContext.d.ts.map

package/dist/http/requestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestContext.d.ts","sourceRoot":"","sources":["../../http/requestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAYhD,eAAO,MAAM,cAAc,qCAA4C,CAAC"}
+{"version":3,"file":"requestContext.d.ts","sourceRoot":"","sources":["../../http/requestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAYhD,eAAO,MAAM,cAAc,qCAA4C,CAAC"}

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "gemi",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "devDependencies": {
+    "@happy-dom/global-registrator": "^14.12.3",
     "@repo/eslint-config": "*",
     "@repo/typescript-config": "*",
     "@types/bun": "^1.1.4",
     "@types/eslint": "^8.56.5",
+    "@types/jsdom": "^21.1.7",
     "@types/node": "^20.11.24",
     "@types/react": "^18.2.61",
     "@types/react-dom": "^18.2.19",
     "eslint": "^8.57.0",
+    "happy-dom": "^14.12.3",
+    "jsdom": "^24.1.0",
     "typescript": "^5.3.3",
     "vitest": "^1.6.0"
   },