exisjs 0.5.3 → 0.5.4

package/dist/server/ws-orchestrator.js

@@ -6,19 +6,18 @@ const request_1 = require("./request");
 const response_1 = require("./response");
 const router_1 = require("../router/router");
 const socket_1 = require("../websocket/socket");
-const uws_adapter_1 = require("./uws-adapter");
 class WsOrchestrator {
     constructor(app) {
         this.app = app;
     }
-    // ─── WebSocket Upgrade Handler ───────────────────────────────────────────────
+    // --- Node.js WebSocket Upgrade Handler --------------------------------------
     async handleUpgrade(rawReq, socket, head) {
         this.app.applyBuiltins();
         // Match route
         const reqPath = (rawReq.url || '').split('?')[0];
         const matched = this.app.getRouter().match('WS', reqPath);
         if (!matched) {
-            socket.write('HTTP/1.1 404 Not Found\\r\\n\\r\\n');
+            socket.write('HTTP/1.1 404 Not Found\r\n\r\n');
             socket.destroy();
             return;
         }
@@ -48,7 +47,7 @@ class WsOrchestrator {
         await (0, router_1.runHandlers)(pipeline, req, res, async (err) => {
             if (err) {
                 this.app.log.error({ err }, 'Error during WebSocket upgrade middleware');
-                socket.write('HTTP/1.1 500 Internal Server Error\\r\\n\\r\\n');
+                socket.write('HTTP/1.1 500 Internal Server Error\r\n\r\n');
                 socket.destroy();
                 return;
             }
@@ -74,33 +73,50 @@ class WsOrchestrator {
             });
         });
     }
-    /**
-     * WebSocket Upgrade Handler for uWebSockets.js
-     * Runs the middleware pipeline and if successful, upgrades the connection.
-     */
-    async handleUwsUpgrade(shimReq, uwsRes, context) {
+    // --- Bun WebSocket Upgrade Handler ------------------------------------------
+    async handleBunUpgrade(bunReq, resolve, server) {
         this.app.applyBuiltins();
-        const reqPath = (shimReq.url || '').split('?')[0];
+        const urlObj = new URL(bunReq.url);
+        const reqPath = urlObj.pathname;
         const matched = this.app.getRouter().match('WS', reqPath);
         if (!matched) {
-            // 404
-            uwsRes.cork(() => {
-                uwsRes.writeStatus('404 Not Found');
-                uwsRes.end();
-            });
+            resolve(new Response('Not Found', { status: 404 }));
             return;
         }
-        let isAborted = false;
-        uwsRes.onAborted(() => {
-            isAborted = true;
+        // We create an ExisRequest/ExisResponse pipeline using mock Node APIs
+        // But since this is purely for middleware execution, we can use an empty object
+        // Or we could reuse BunIncomingMessage / BunServerResponse if we wanted
+        // For now, we will construct a mock for middleware execution
+        const reqMock = {
+            method: 'WS',
+            url: bunReq.url,
+            headers: {},
+            params: matched.params,
+            log: this.app.log,
+        };
+        bunReq.headers.forEach((v, k) => {
+            ;
+            reqMock.headers[k] = v;
         });
-        const shimRes = new uws_adapter_1.UwsServerResponse(uwsRes);
-        const res = new response_1.ExisResponse(shimRes);
-        const req = new request_1.ExisRequest(shimReq, res, this.app.options.trustProxy, this.app.options.bodyLimit);
-        res.req = req;
-        req.method = 'WS';
-        req.params = matched.params;
-        req.log = this.app.log;
+        let responseSent = false;
+        let responseStatus = 200;
+        let responseBody = '';
+        const resMock = {
+            headersSent: false,
+            statusCode: 200,
+            status(code) {
+                this.statusCode = code;
+                return this;
+            },
+            send(body) {
+                responseSent = true;
+                responseBody = body;
+                responseStatus = this.statusCode;
+            },
+            json(body) {
+                this.send(JSON.stringify(body));
+            },
+        };
         const pipeline = [
             ...this.app.globalMiddleware,
             async (req, res, next) => {
@@ -112,38 +128,35 @@ class WsOrchestrator {
                 });
             },
         ];
-        this.app.requestHandler._executeWithContext(req, res, async () => {
-            (0, router_1.runHandlers)(pipeline, req, res, async (err) => {
-                if (isAborted)
-                    return;
-                if (err) {
-                    this.app.log.error({ err }, 'Error during uWS WebSocket upgrade middleware');
-                    uwsRes.cork(() => {
-                        uwsRes.writeStatus('500 Internal Server Error');
-                        uwsRes.end();
-                    });
-                    return;
-                }
-                if (res.headersSent) {
-                    return; // Middleware sent an HTTP response
-                }
-                // We need to fetch headers directly from the shimReq.headers
-                const secWebSocketKey = shimReq.headers['sec-websocket-key'] || '';
-                const secWebSocketProtocol = shimReq.headers['sec-websocket-protocol'] || '';
-                const secWebSocketExtensions = shimReq.headers['sec-websocket-extensions'] || '';
-                // Prepare user data for the upgraded websocket
-                const userData = {
-                    req,
-                    res,
-                    exisWs: new socket_1.ExisWebSocket(null, req, this.app.wsServer), // the raw will be set to shim in open()
-                    finalHandler: matched.route.handlers[matched.route.handlers.length - 1],
-                };
-                this.app.wsServer.track(userData.exisWs);
-                req.ws = userData.exisWs;
-                uwsRes.cork(() => {
-                    uwsRes.upgrade(userData, secWebSocketKey, secWebSocketProtocol, secWebSocketExtensions, context);
-                });
+        await (0, router_1.runHandlers)(pipeline, reqMock, resMock, async (err) => {
+            if (err) {
+                this.app.log.error({ err }, 'Error during Bun WebSocket upgrade middleware');
+                resolve(new Response('Internal Server Error', { status: 500 }));
+                return;
+            }
+            if (responseSent || resMock.headersSent) {
+                resolve(new Response(responseBody, { status: responseStatus }));
+                return;
+            }
+            // Upgrade to WebSocket
+            const exisWs = new socket_1.ExisWebSocket(null, reqMock, this.app.wsServer);
+            const success = server.upgrade(bunReq, {
+                data: {
+                    exisWs,
+                },
             });
+            if (success) {
+                this.app.wsServer.track(exisWs);
+                reqMock.ws = exisWs;
+                const finalHandler = matched.route.handlers[matched.route.handlers.length - 1];
+                Promise.resolve(finalHandler(reqMock, resMock, () => {
+                    /* noop */
+                })).catch((err) => {
+                    this.app.log.error({ err }, 'Error in Bun WebSocket handler');
+                });
+                return;
+            }
+            resolve(new Response('WebSocket upgrade failed', { status: 400 }));
         });
     }
 }

package/dist/server/ws-orchestrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws-orchestrator.js","sourceRoot":"","sources":["../../src/server/ws-orchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ws-orchestrator.js","sourceRoot":"","sources":["../../src/server/ws-orchestrator.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -147,12 +147,12 @@ export interface ExisConfig {
     debugRouting?: boolean;
     asyncContext?: boolean;
     /**
-     * Optional. Server backend to use.
-     * 'node' (default fallback) uses Node's native HTTP/HTTPS modules.
-     * 'uws' uses uWebSockets.js for significantly higher throughput.
-     * 'auto' will use uWS if installed, otherwise Node.
+     * Defines the HTTP server backend.
+     * 'node' uses the native Node.js HTTP module.
+     * 'bun' uses Bun's native HTTP module for significantly higher throughput.
+     * 'auto' will use Bun if detected, otherwise Node.
      */
-    server?: 'auto' | 'node' | 'uws';
+    server?: 'auto' | 'node' | 'bun';
     queue?: import('./queue/types').QueueConfig;
     plugins?: ExisPlugin[];
     test?: {

package/dist/utils/config.js

@@ -131,7 +131,7 @@ const configSchema = validator_1.v.object({
     ])
         .optional(),
     keepAlive: validator_1.v.union([validator_1.v.boolean(), validator_1.v.number()]).optional(),
-    server: validator_1.v.enum(['node', 'uws']).optional(),
+    server: validator_1.v.enum(['node', 'bun']).optional(),
     workers: validator_1.v
         .union([validator_1.v.number(), validator_1.v.literal('safe'), validator_1.v.literal('max')])
         .optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exisjs",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Zero-configuration full-stack framework with integrated Queue, Cron, MongoDB, and Next.js support",
   "author": "V25 Group <support@v25group.com>",
   "keywords": [
@@ -211,9 +211,6 @@
     "resend": "*"
   },
   "peerDependenciesMeta": {
-    "uWebSockets.js": {
-      "optional": true
-    },
     "drizzle-orm": {
       "optional": true
     },
@@ -251,6 +248,7 @@
   "devDependencies": {
     "@types/accepts": "^1.3.7",
     "@types/autocannon": "^7.12.7",
+    "@types/bun": "^1.3.14",
     "@types/busboy": "^1.5.4",
     "@types/content-disposition": "^0.5.9",
     "@types/fresh": "^0.5.3",
@@ -263,7 +261,6 @@
     "mitata": "^1.0.34"
   },
   "optionalDependencies": {
-    "ioredis": "^5.11.1",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.51.0"
+    "ioredis": "^5.11.1"
   }
 }

package/dist/server/uws-adapter.d.ts

@@ -1,106 +0,0 @@
-/**
- * uWebSockets.js Server Adapter for Exis
- *
- * This module provides a high-performance server backend using uWebSockets.js
- * as a drop-in replacement for Node's native HTTP module. When uWebSockets.js
- * is installed, Exis will auto-detect and use it for dramatically higher throughput.
- *
- * uWebSockets.js bypasses Node's network layer entirely, using optimized C++
- * for socket handling, I/O batching, and direct V8 memory access.
- */
-/**
- * Returns true if uWebSockets.js is available on this platform.
- */
-export declare function isUwsAvailable(): boolean;
-/**
- * Returns the uWS module if available.
- */
-export declare function getUws(): any;
-/**
- * A lightweight shim that wraps a uWS.HttpRequest to provide the same interface
- * that ExisRequest expects from Node's IncomingMessage.
- *
- * IMPORTANT: uWS HttpRequest is only valid during the initial synchronous callback.
- * All headers, URL, and method MUST be copied synchronously before any async work.
- */
-export declare class UwsIncomingMessage {
-    method: string;
-    url: string;
-    headers: Record<string, string | undefined>;
-    socket: {
-        remoteAddress: string;
-        encrypted?: boolean;
-    };
-    complete: boolean;
-    private _listeners;
-    private _bufferedData;
-    private _hasEnded;
-    constructor(req: any, res: any);
-    on(event: string, listener: (...args: any[]) => void): this;
-    once(event: string, listener: (...args: any[]) => void): this;
-    off(event: string, listener: (...args: any[]) => void): this;
-    removeAllListeners(event?: string): this;
-    emit(event: string, ...args: any[]): boolean;
-    destroy(): void;
-}
-/**
- * A lightweight shim that wraps a uWS.HttpResponse to provide the same interface
- * that ExisResponse expects from Node's ServerResponse.
- *
- * Uses uWS cork() for I/O batching — all header and body writes happen in a
- * single syscall for maximum throughput.
- */
-export declare class UwsServerResponse {
-    readonly _uwsRes: any;
-    statusCode: number;
-    headersSent: boolean;
-    writableEnded: boolean;
-    private _headers;
-    private _aborted;
-    private _listeners;
-    constructor(_uwsRes: any);
-    setHeader(name: string, value: string | number | readonly string[]): void;
-    getHeader(name: string): string | undefined;
-    hasHeader(name: string): boolean;
-    removeHeader(name: string): void;
-    write(chunk: string | Buffer): boolean;
-    end(data?: any, callback?: () => void): void;
-    on(event: string, listener: (...args: any[]) => void): this;
-    emit(event: string, ...args: any[]): boolean;
-    assignSocket(): void;
-}
-export declare class UwsWebSocketShim {
-    readonly _uwsWs: any;
-    readyState: number;
-    private _listeners;
-    constructor(_uwsWs: any);
-    send(data: any): void;
-    close(code?: number, data?: string | Buffer): void;
-    terminate(): void;
-    ping(message?: Buffer): void;
-    on(event: string, listener: (...args: any[]) => void): this;
-    once(event: string, listener: (...args: any[]) => void): this;
-    off(event: string, listener: (...args: any[]) => void): this;
-    emit(event: string, ...args: any[]): boolean;
-}
-export interface UwsListenToken {
-    token: any;
-    port: number;
-}
-/**
- * Creates a uWebSockets.js HTTP server that delegates request handling to Exis.
- *
- * @param handler - The request handler function (typically App.handleUws)
- * @param wsHandler - The websocket upgrade handler function (typically App.handleUwsUpgrade)
- * @param ssl - Optional SSL configuration
- * @returns The uWS App instance and helper methods
- */
-export declare function createUwsApp(handler: (req: UwsIncomingMessage, res: UwsServerResponse) => void, wsHandler: (req: UwsIncomingMessage, res: any, context: any) => void, ssl?: {
-    key: string | Buffer;
-    cert: string | Buffer;
-}): {
-    app: any;
-    listen(port: number, host: string, cb: (token: UwsListenToken | null) => void): void;
-    close(token: unknown): void;
-};
-//# sourceMappingURL=uws-adapter.d.ts.map

package/dist/server/uws-adapter.d.ts.map

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