srvx 0.2.0 → 0.2.1

package/dist/adapters/bun.d.mts

@@ -1,17 +1,23 @@
-import { ServerOptions, Server } from '../types.mjs';
+import { ServerOptions, Server, BunFetchandler } from '../types.mjs';
 import * as Bun from 'bun';
 import 'node:http';
 import 'node:net';
 import '@cloudflare/workers-types';
 
-type BunHandler = (request: Request, server?: Bun.Server) => Response | Promise<Response>;
+declare const Response: {
+    new (body?: BodyInit | null, init?: ResponseInit): Response;
+    prototype: Response;
+    error(): Response;
+    json(data: any, init?: ResponseInit): Response;
+    redirect(url: string | URL, status?: number): Response;
+};
 declare function serve(options: ServerOptions): BunServer;
-declare class BunServer implements Server<BunHandler> {
+declare class BunServer implements Server<BunFetchandler> {
     readonly runtime = "bun";
     readonly options: ServerOptions;
     readonly bun: Server["bun"];
     readonly serveOptions: Bun.ServeOptions;
-    readonly fetch: BunHandler;
+    readonly fetch: BunFetchandler;
     constructor(options: ServerOptions);
     serve(): Promise<Awaited<this>>;
     get url(): string | undefined;
@@ -19,4 +25,4 @@ declare class BunServer implements Server<BunHandler> {
     close(closeAll?: boolean): Promise<void | undefined>;
 }
 
-export { serve };
+export { Response, serve };

package/dist/adapters/bun.mjs

@@ -1,6 +1,7 @@
 import { r as resolvePort } from '../shared/srvx.PbkQy9Ck.mjs';
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 
+const Response = globalThis.Response;
 function serve(options) {
   return new BunServer(options);
 }
@@ -48,4 +49,4 @@ class BunServer {
   }
 }
 
-export { serve };
+export { Response, serve };

package/dist/adapters/cloudflare.d.mts

@@ -4,6 +4,13 @@ import 'node:http';
 import 'node:net';
 import 'bun';
 
+declare const Response: {
+    new (body?: BodyInit | null, init?: ResponseInit): Response;
+    prototype: Response;
+    error(): Response;
+    json(data: any, init?: ResponseInit): Response;
+    redirect(url: string | URL, status?: number): Response;
+};
 declare function serve(options: ServerOptions): Server<CF.ExportedHandlerFetchHandler>;
 
-export { serve };
+export { Response, serve };

package/dist/adapters/cloudflare.mjs

@@ -1,5 +1,6 @@
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 
+const Response = globalThis.Response;
 function serve(options) {
   return new CloudflareServer(options);
 }
@@ -41,4 +42,4 @@ class CloudflareServer {
   }
 }
 
-export { serve };
+export { Response, serve };

package/dist/adapters/deno.d.mts

@@ -1,18 +1,24 @@
-import { ServerOptions, Server } from '../types.mjs';
+import { ServerOptions, Server, DenoFetchHandler } from '../types.mjs';
 import 'node:http';
 import 'node:net';
 import 'bun';
 import '@cloudflare/workers-types';
 
-type DenoHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.NetAddr>) => Response | Promise<Response>;
+declare const Response: {
+    new (body?: BodyInit | null, init?: ResponseInit): Response;
+    prototype: Response;
+    error(): Response;
+    json(data: any, init?: ResponseInit): Response;
+    redirect(url: string | URL, status?: number): Response;
+};
 declare function serve(options: ServerOptions): DenoServer;
-declare class DenoServer implements Server<DenoHandler> {
+declare class DenoServer implements Server<DenoFetchHandler> {
     #private;
     readonly runtime = "deno";
     readonly options: ServerOptions;
     readonly deno: Server["deno"];
     readonly serveOptions: Deno.ServeTcpOptions;
-    readonly fetch: DenoHandler;
+    readonly fetch: DenoFetchHandler;
     constructor(options: ServerOptions);
     serve(): Promise<this>;
     get url(): string | undefined;
@@ -20,4 +26,4 @@ declare class DenoServer implements Server<DenoHandler> {
     close(): Promise<void | undefined>;
 }
 
-export { serve };
+export { Response, serve };

package/dist/adapters/deno.mjs

@@ -1,6 +1,7 @@
 import { r as resolvePort, f as fmtURL } from '../shared/srvx.PbkQy9Ck.mjs';
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 
+const Response = globalThis.Response;
 function serve(options) {
   return new DenoServer(options);
 }
@@ -64,4 +65,4 @@ class DenoServer {
   }
 }
 
-export { serve };
+export { Response, serve };

package/dist/adapters/node.d.mts

@@ -1,4 +1,4 @@
-import { ServerOptions, Server } from '../types.mjs';
+import { ServerOptions, Server, FetchHandler, NodeHttpHandler } from '../types.mjs';
 import NodeHttp__default from 'node:http';
 import 'node:net';
 import 'bun';
@@ -7,8 +7,8 @@ import '@cloudflare/workers-types';
 type NodeFastResponse = InstanceType<typeof NodeFastResponse>;
 declare const NodeFastResponse: {
     new (body?: BodyInit | null, init?: ResponseInit): {
-        "__#4112@#body"?: BodyInit | null;
-        "__#4112@#init"?: ResponseInit;
+        "__#4200@#body"?: BodyInit | null;
+        "__#4200@#init"?: ResponseInit;
         /**
          * Prepare Node.js response object
          */
@@ -19,11 +19,11 @@ declare const NodeFastResponse: {
             body: string | Uint8Array<ArrayBufferLike> | ReadableStream<Uint8Array<ArrayBufferLike>> | Buffer<ArrayBufferLike> | DataView<ArrayBufferLike> | null | undefined;
         };
         /** Lazy initialized response instance */
-        "__#4112@#responseObj"?: Response;
+        "__#4200@#responseObj"?: Response;
         /** Lazy initialized headers instance */
-        "__#4112@#headersObj"?: Headers;
+        "__#4200@#headersObj"?: Headers;
         clone(): Response;
-        readonly "__#4112@#response": Response;
+        readonly "__#4200@#response": Response;
         readonly headers: Headers;
         readonly ok: boolean;
         readonly redirected: boolean;
@@ -31,7 +31,7 @@ declare const NodeFastResponse: {
         readonly statusText: string;
         readonly type: ResponseType;
         readonly url: string;
-        "__#4112@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
+        "__#4200@#fastBody"<T extends object>(as: new (...args: any[]) => T): T | null | false;
         readonly body: ReadableStream<Uint8Array> | null;
         readonly bodyUsed: boolean;
         arrayBuffer(): Promise<ArrayBuffer>;
@@ -44,5 +44,6 @@ declare const NodeFastResponse: {
 };
 
 declare function serve(options: ServerOptions): Server;
+declare function toNodeHandler(fetchHandler: FetchHandler): NodeHttpHandler;
 
-export { NodeFastResponse as Response, serve };
+export { NodeFastResponse as Response, serve, toNodeHandler };

package/dist/adapters/node.mjs

@@ -724,6 +724,14 @@ const NodeFastResponse = /* @__PURE__ */ (() => (
 function serve(options) {
   return new NodeServer(options);
 }
+function toNodeHandler(fetchHandler) {
+  return (nodeReq, nodeRes) => {
+    const request = new NodeRequestProxy(nodeReq);
+    request.node = { req: nodeReq, res: nodeRes };
+    const res = fetchHandler(request);
+    return res instanceof Promise ? res.then((resolvedRes) => sendNodeResponse(nodeRes, resolvedRes)) : sendNodeResponse(nodeRes, res);
+  };
+}
 class NodeServer {
   constructor(options) {
     this.runtime = "node";
@@ -779,4 +787,4 @@ class NodeServer {
   }
 }
 
-export { NodeFastResponse as Response, serve };
+export { NodeFastResponse as Response, serve, toNodeHandler };

package/dist/types.d.mts

@@ -166,5 +166,10 @@ interface ServerRequest extends Request {
         context: CF.ExecutionContext;
     };
 }
+type FetchHandler = (request: Request) => Response | Promise<Response>;
+type BunFetchandler = (request: Request, server?: Bun.Server) => Response | Promise<Response>;
+type DenoFetchHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.NetAddr>) => Response | Promise<Response>;
+type NodeHttpHandler = (nodeReq: NodeHttp.IncomingMessage, nodeRes: NodeHttp.ServerResponse) => void | Promise<void>;
+type CloudflareFetchHandler = CF.ExportedHandlerFetchHandler;
 
-export { type Server, type ServerHandler, type ServerOptions, type ServerPlugin, type ServerPluginInstance, type ServerRequest, serve };
+export { type BunFetchandler, type CloudflareFetchHandler, type DenoFetchHandler, type FetchHandler, type NodeHttpHandler, type Server, type ServerHandler, type ServerOptions, type ServerPlugin, type ServerPluginInstance, type ServerRequest, serve };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "repository": "unjs/srvx",
   "license": "MIT",