elit 3.5.0 → 3.5.1

package/README.md

@@ -9,7 +9,7 @@ The package is split by runtime. Browser-facing APIs live in `elit` and the clie
 If you are generating or editing code for Elit, follow these rules first:
 
 - Use `elit` or the client subpaths for browser UI code.
-- Use `elit/server` for HTTP routes, middleware, dev server, preview server, and server-side shared state.
+- Use `elit/server` for HTTP routes, WebSocket endpoints, middleware, dev server, preview server, and server-side shared state.
 - Use `elit/desktop` only inside `elit desktop ...` runtime. Those APIs are injected by the native desktop runtime and are not normal browser globals.
 - Use `elit/build` for programmatic bundling.
 - Use `elit/database` for the VM-backed file database helpers.
@@ -62,7 +62,7 @@ Use this table as the import map for generated code.
 | `elit/state` | Reactive state and render helpers | `createState`, `computed`, `reactive`, `text`, `bindValue`, `bindChecked`, `createSharedState` |
 | `elit/style` | CSS generation and injection | `CreateStyle`, `styles`, `renderStyle`, `injectStyle`, `addClass`, `addTag` |
 | `elit/router` | Client-side routing | `createRouter`, `createRouterView`, `routerLink` |
-| `elit/server` | HTTP router, dev server, middleware, shared server state | `ServerRouter`, `createDevServer`, `cors`, `logger`, `rateLimit`, `compress`, `security`, `StateManager` |
+| `elit/server` | HTTP router, dev server, middleware, WebSocket endpoints, shared server state | `ServerRouter`, `createDevServer`, `cors`, `logger`, `rateLimit`, `compress`, `security`, `StateManager` |
 | `elit/build` | Programmatic build API | `build` |
 | `elit/desktop` | Native desktop window APIs | `createWindow`, `createWindowServer`, `onMessage`, `windowQuit`, `windowSetTitle`, `windowEval` |
 | `elit/database` | VM-backed file database | `Database`, `create`, `read`, `save`, `update`, `rename`, `remove` |
@@ -412,6 +412,17 @@ export default {
         basePath: '',
         ssr: () => documentShell,
         api,
+        ws: [
+          {
+            path: '/ws',
+            handler: ({ ws, query }) => {
+              ws.send(JSON.stringify({ type: 'connected', room: query.room || 'general' }));
+              ws.on('message', (message) => {
+                ws.send(message.toString());
+              });
+            },
+          },
+        ],
       },
     ],
   },
@@ -431,6 +442,14 @@ export default {
     root: './dist',
     index: './index.html',
     port: 4173,
+    ws: [
+      {
+        path: '/ws',
+        handler: ({ ws }) => {
+          ws.on('message', (message) => ws.send(message.toString()));
+        },
+      },
+    ],
   },
   test: {
     include: ['testing/unit/**/*.test.ts'],
@@ -477,6 +496,12 @@ export default {
 };
 ```
 
+Notes:
+
+- `dev.ws` and `preview.ws` register global WebSocket endpoints.
+- `clients[].ws` registers client-specific endpoints and prefixes each path with that client's `basePath`.
+- The internal Elit HMR and shared-state socket uses `/__elit_ws`, so do not reuse that path for custom endpoints.
+
 Important details:
 
 - `build` may be a single object or an array. If it is an array, all builds run sequentially.
@@ -620,6 +645,49 @@ const server = createDevServer({
 console.log(server.url);
 ```
 
+### Custom WebSocket Endpoints
+
+Server:
+
+```ts
+import { createDevServer } from 'elit/server';
+
+const server = createDevServer({
+  root: '.',
+  open: false,
+  ws: [
+    {
+      path: '/ws',
+      handler: ({ ws, query }) => {
+        ws.send(JSON.stringify({ type: 'connected', room: query.room || 'general' }));
+
+        ws.on('message', (message) => {
+          ws.send(message.toString());
+        });
+      },
+    },
+  ],
+});
+```
+
+Client:
+
+```ts
+const socket = new WebSocket(`ws://${location.host}/ws?room=general`);
+
+socket.addEventListener('message', (event) => {
+  console.log(event.data);
+});
+
+socket.send('hello');
+```
+
+Notes:
+
+- Use `dev.ws` or `preview.ws` for global endpoints.
+- Use `clients[].ws` when each client should expose its own endpoint under its `basePath`.
+- Do not use `/__elit_ws`; Elit reserves that path for internal HMR and shared-state traffic.
+
 ### Shared State Between Server and Client
 
 Client:
@@ -801,6 +869,16 @@ npx elit test --coverage --coverage-reporter text,html
 
 The package also exports `elit/test`, `elit/test-runtime`, and `elit/test-reporter` for advanced use, but most users should stay on the CLI.
 
+## Changelog
+
+Latest release notes live in [CHANGELOG.md](CHANGELOG.md).
+
+Highlights in `v3.5.1`:
+
+- Added first-class custom WebSocket endpoints for `dev`, `preview`, and `clients[]` config.
+- Moved internal HMR and shared-state traffic to `/__elit_ws` so custom endpoints do not collide with Elit internals.
+- Tightened cross-runtime WebSocket path matching so root endpoints no longer swallow every upgrade request.
+
 ## Good Defaults For Generated Code
 
 When writing new Elit code, these defaults are usually correct:

package/dist/build.d.mts

@@ -1,4 +1,4 @@
-import { B as BuildOptions, a as BuildResult } from './server-DpnTyF7I.mjs';
+import { B as BuildOptions, a as BuildResult } from './server--YFoC6ln.mjs';
 import './http.mjs';
 import 'node:events';
 import './ws.mjs';

package/dist/cli.js

@@ -1183,11 +1183,12 @@ var init_http = __esm({
             },
             fetch: (req) => {
               const urlObj = new URL(req.url);
-              const pathname = urlObj.pathname + urlObj.search;
+              const pathname = urlObj.pathname;
+              const requestUrl = urlObj.pathname + urlObj.search;
               const upgradeHeader = req.headers.get("upgrade");
               if (upgradeHeader && upgradeHeader.toLowerCase() === "websocket") {
                 const matchingWebSocketServer = Array.from(this._bunWebSocketServers).find((wsServer) => {
-                  return !wsServer.path || wsServer.path === "/" || wsServer.path === pathname;
+                  return !wsServer.path || wsServer.path === pathname;
                 });
                 if (!matchingWebSocketServer) {
                   return new Response("WebSocket path not found", { status: 404 });
@@ -1201,7 +1202,7 @@ var init_http = __esm({
                     wsServer: matchingWebSocketServer,
                     request: {
                       method: req.method,
-                      url: pathname,
+                      url: requestUrl,
                       headers: requestHeaders,
                       socket: { remoteAddress: void 0 }
                     }
@@ -1219,7 +1220,7 @@ var init_http = __esm({
               let responseReady = false;
               const incomingMessage = {
                 method: req.method,
-                url: pathname,
+                url: requestUrl,
                 headers: req.headers,
                 httpVersion: "1.1",
                 rawHeaders: [],
@@ -59399,7 +59400,7 @@ var require_package3 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "elit",
-      version: "3.5.0",
+      version: "3.5.1",
       description: "Optimized lightweight library for creating DOM elements with reactive state",
       main: "dist/index.js",
       module: "dist/index.mjs",
@@ -59886,6 +59887,10 @@ function createNativeWebSocket(url, protocols) {
   }
   return new globalThis.WebSocket(url, protocols);
 }
+function getRequestPath(url) {
+  const [pathname = "/"] = (url || "/").split("?");
+  return pathname || "/";
+}
 var WebSocket2 = class extends import_events2.EventEmitter {
   constructor(address, protocols, _options) {
     super();
@@ -59982,7 +59987,7 @@ var WebSocketServer = class extends import_events2.EventEmitter {
     this.clients = /* @__PURE__ */ new Set();
     this._ownsHttpServer = false;
     this.options = options || {};
-    this.path = options?.path || "/";
+    this.path = options?.path;
     if (runtime === "node") {
       if (options?.server) {
         this._httpServer = options.server;
@@ -60009,8 +60014,9 @@ var WebSocketServer = class extends import_events2.EventEmitter {
   }
   _setupUpgradeHandler() {
     this._httpServer.on("upgrade", (request3, socket, head) => {
-      console.log("[WebSocket] Upgrade request:", request3.url, "Expected:", this.path);
-      if (this.path && this.path !== "/" && request3.url !== this.path) {
+      const requestPath = getRequestPath(request3.url);
+      console.log("[WebSocket] Upgrade request:", requestPath, "Expected:", this.path || "(any)");
+      if (this.path && requestPath !== this.path) {
         console.log("[WebSocket] Path mismatch, ignoring");
         return;
       }
@@ -60254,7 +60260,7 @@ var WebSocketServer = class extends import_events2.EventEmitter {
    * Check if server should handle request
    */
   shouldHandle(request3) {
-    if (this.path && request3.url !== this.path) {
+    if (this.path && getRequestPath(request3.url) !== this.path) {
       return false;
     }
     return true;
@@ -61368,7 +61374,8 @@ var createElitImportMap = async (rootDir, basePath = "", mode = "dev") => {
   const allImports = { ...externalImports, ...elitImports };
   return `<script type="importmap">${JSON.stringify({ imports: allImports }, null, 2)}</script>`;
 };
-var createHMRScript = (port, wsPath) => `<script>(function(){let ws;let retries=0;let maxRetries=5;function connect(){ws=new WebSocket('ws://'+window.location.hostname+':${port}${wsPath}');ws.onopen=()=>{console.log('[Elit HMR] Connected');retries=0};ws.onmessage=(e)=>{const d=JSON.parse(e.data);if(d.type==='update'){console.log('[Elit HMR] File updated:',d.path);window.location.reload()}else if(d.type==='reload'){console.log('[Elit HMR] Reloading...');window.location.reload()}else if(d.type==='error')console.error('[Elit HMR] Error:',d.error)};ws.onclose=()=>{if(retries<maxRetries){retries++;setTimeout(connect,1000*retries)}else if(retries===maxRetries){console.log('[Elit HMR] Connection closed. Start dev server to reconnect.')}};ws.onerror=()=>{ws.close()}}connect()})();</script>`;
+var ELIT_INTERNAL_WS_PATH = "/__elit_ws";
+var createHMRScript = (port) => `<script>(function(){let ws;let retries=0;let maxRetries=5;const protocol=window.location.protocol==='https:'?'wss://':'ws://';function connect(){ws=new WebSocket(protocol+window.location.hostname+':${port}${ELIT_INTERNAL_WS_PATH}');ws.onopen=()=>{console.log('[Elit HMR] Connected');retries=0};ws.onmessage=(e)=>{const d=JSON.parse(e.data);if(d.type==='update'){console.log('[Elit HMR] File updated:',d.path);window.location.reload()}else if(d.type==='reload'){console.log('[Elit HMR] Reloading...');window.location.reload()}else if(d.type==='error')console.error('[Elit HMR] Error:',d.error)};ws.onclose=()=>{if(retries<maxRetries){retries++;setTimeout(connect,1000*retries)}else if(retries===maxRetries){console.log('[Elit HMR] Connection closed. Start dev server to reconnect.')}};ws.onerror=()=>{ws.close()}}connect()})();</script>`;
 var rewriteRelativePaths = (html, basePath) => {
   if (!basePath) return html;
   html = html.replace(/(<script[^>]+src=["'])(?!https?:\/\/|\/)(\.\/)?([^"']+)(["'])/g, `$1${basePath}/$3$4`);
@@ -61376,6 +61383,52 @@ var rewriteRelativePaths = (html, basePath) => {
   return html;
 };
 var normalizeBasePath = (basePath) => basePath && basePath !== "/" ? basePath : "";
+var normalizeWebSocketPath = (path) => {
+  let normalizedPath = path.trim();
+  if (!normalizedPath) {
+    return "/";
+  }
+  if (!normalizedPath.startsWith("/")) {
+    normalizedPath = `/${normalizedPath}`;
+  }
+  if (normalizedPath.length > 1 && normalizedPath.endsWith("/")) {
+    normalizedPath = normalizedPath.slice(0, -1);
+  }
+  return normalizedPath;
+};
+var getRequestPath2 = (url) => {
+  const [pathname = "/"] = url.split("?");
+  return pathname || "/";
+};
+var parseRequestQuery = (url) => {
+  const query = {};
+  const queryString = url.split("?")[1];
+  if (!queryString) {
+    return query;
+  }
+  for (const entry of queryString.split("&")) {
+    if (!entry) {
+      continue;
+    }
+    const [rawKey, rawValue = ""] = entry.split("=");
+    if (!rawKey) {
+      continue;
+    }
+    query[decodeURIComponent(rawKey)] = decodeURIComponent(rawValue);
+  }
+  return query;
+};
+var normalizeWebSocketEndpoints = (endpoints, basePath = "") => {
+  const normalizedBasePath = normalizeBasePath(basePath);
+  return (endpoints || []).map((endpoint) => {
+    const normalizedPath = normalizeWebSocketPath(endpoint.path);
+    const fullPath = !normalizedBasePath ? normalizedPath : normalizedPath === normalizedBasePath || normalizedPath.startsWith(`${normalizedBasePath}/`) ? normalizedPath : normalizedPath === "/" ? normalizedBasePath : `${normalizedBasePath}${normalizedPath}`;
+    return {
+      path: fullPath,
+      handler: endpoint.handler
+    };
+  });
+};
 var requestAcceptsGzip = (acceptEncoding) => {
   if (Array.isArray(acceptEncoding)) {
     return acceptEncoding.some((value) => /\bgzip\b/i.test(value));
@@ -61804,7 +61857,8 @@ function createDevServer(options) {
   if (config.mode === "dev") {
     clearImportMapCache();
   }
-  const clientsToNormalize = config.clients?.length ? config.clients : config.root ? [{ root: config.root, basePath: config.basePath || "", index: config.index, ssr: config.ssr, api: config.api, proxy: config.proxy, mode: config.mode }] : null;
+  const usesClientArray = Boolean(config.clients?.length);
+  const clientsToNormalize = usesClientArray ? config.clients : config.root ? [{ root: config.root, basePath: config.basePath || "", index: config.index, ssr: config.ssr, api: config.api, proxy: config.proxy, ws: config.ws, mode: config.mode }] : null;
   if (!clientsToNormalize) throw new Error('DevServerOptions must include either "clients" array or "root" directory');
   const normalizedClients = clientsToNormalize.map((client) => {
     let basePath = client.basePath || "";
@@ -61826,10 +61880,23 @@ function createDevServer(options) {
       index: indexPath,
       ssr: client.ssr,
       api: client.api,
+      ws: normalizeWebSocketEndpoints(client.ws, basePath),
       proxyHandler: client.proxy ? createProxyHandler(client.proxy) : void 0,
       mode: client.mode || "dev"
     };
   });
+  const globalWebSocketEndpoints = usesClientArray ? normalizeWebSocketEndpoints(config.ws) : [];
+  const normalizedWebSocketEndpoints = [...normalizedClients.flatMap((client) => client.ws), ...globalWebSocketEndpoints];
+  const seenWebSocketPaths = /* @__PURE__ */ new Set();
+  for (const endpoint of normalizedWebSocketEndpoints) {
+    if (endpoint.path === ELIT_INTERNAL_WS_PATH) {
+      throw new Error(`WebSocket path "${ELIT_INTERNAL_WS_PATH}" is reserved for Elit internals`);
+    }
+    if (seenWebSocketPaths.has(endpoint.path)) {
+      throw new Error(`Duplicate WebSocket endpoint path: ${endpoint.path}`);
+    }
+    seenWebSocketPaths.add(endpoint.path);
+  }
   const globalProxyHandler = config.proxy ? createProxyHandler(config.proxy) : null;
   const server = createServer(async (req, res) => {
     const originalUrl = req.url || "/";
@@ -62146,8 +62213,7 @@ ${error}`);
         }
       }
       if (ext === ".html") {
-        const wsPath = normalizeBasePath(client.basePath);
-        const hmrScript = config.mode !== "preview" ? createHMRScript(config.port, wsPath) : "";
+        const hmrScript = config.mode !== "preview" ? createHMRScript(config.port) : "";
         let html = content.toString();
         let ssrStyles = "";
         if (client.ssr) {
@@ -62246,7 +62312,7 @@ ${elitImportMap}`;
       }
       const basePath = normalizeBasePath(client.basePath);
       html = rewriteRelativePaths(html, basePath);
-      const hmrScript = config.mode !== "preview" ? createHMRScript(config.port, basePath) : "";
+      const hmrScript = config.mode !== "preview" ? createHMRScript(config.port) : "";
       const elitImportMap = await createElitImportMap(client.root, basePath, client.mode);
       const modeScript = config.mode === "preview" ? "<script>window.__ELIT_MODE__='preview';</script>\n" : "";
       html = html.includes("</head>") ? html.replace("</head>", `${modeScript}${elitImportMap}</head>`) : html;
@@ -62266,49 +62332,73 @@ ${elitImportMap}`;
       send500(res, "500 SSR Error");
     }
   }
-  let wss = null;
-  if (config.mode !== "preview") {
-    wss = new WebSocketServer({ server });
+  const wss = new WebSocketServer({ server, path: ELIT_INTERNAL_WS_PATH });
+  const webSocketServers = [wss];
+  if (config.logging) {
+    console.log(`[WebSocket] Internal server initialized at ${ELIT_INTERNAL_WS_PATH}`);
+  }
+  wss.on("connection", (ws, req) => {
+    wsClients.add(ws);
+    const message = { type: "connected", timestamp: Date.now() };
+    ws.send(JSON.stringify(message));
     if (config.logging) {
-      console.log("[HMR] WebSocket server initialized");
+      console.log("[WebSocket] Internal client connected from", req.socket.remoteAddress);
     }
-    wss.on("connection", (ws, req) => {
-      wsClients.add(ws);
-      const message = { type: "connected", timestamp: Date.now() };
-      ws.send(JSON.stringify(message));
-      if (config.logging) {
-        console.log("[HMR] Client connected from", req.socket.remoteAddress);
-      }
-      ws.on("message", (data) => {
-        try {
-          const msg = JSON.parse(data.toString());
-          if (msg.type === "state:subscribe") {
-            stateManager.subscribe(msg.key, ws);
-            if (config.logging) {
-              console.log(`[State] Client subscribed to "${msg.key}"`);
-            }
-          } else if (msg.type === "state:unsubscribe") {
-            stateManager.unsubscribe(msg.key, ws);
-            if (config.logging) {
-              console.log(`[State] Client unsubscribed from "${msg.key}"`);
-            }
-          } else if (msg.type === "state:change") {
-            stateManager.handleStateChange(msg.key, msg.value);
-            if (config.logging) {
-              console.log(`[State] Client updated "${msg.key}"`);
-            }
+    ws.on("message", (data) => {
+      try {
+        const msg = JSON.parse(data.toString());
+        if (msg.type === "state:subscribe") {
+          stateManager.subscribe(msg.key, ws);
+          if (config.logging) {
+            console.log(`[State] Client subscribed to "${msg.key}"`);
           }
-        } catch (error) {
+        } else if (msg.type === "state:unsubscribe") {
+          stateManager.unsubscribe(msg.key, ws);
+          if (config.logging) {
+            console.log(`[State] Client unsubscribed from "${msg.key}"`);
+          }
+        } else if (msg.type === "state:change") {
+          stateManager.handleStateChange(msg.key, msg.value);
           if (config.logging) {
-            console.error("[WebSocket] Message parse error:", error);
+            console.log(`[State] Client updated "${msg.key}"`);
           }
         }
-      });
-      ws.on("close", () => {
-        wsClients.delete(ws);
-        stateManager.unsubscribeAll(ws);
+      } catch (error) {
         if (config.logging) {
-          console.log("[HMR] Client disconnected");
+          console.error("[WebSocket] Message parse error:", error);
+        }
+      }
+    });
+    ws.on("close", () => {
+      wsClients.delete(ws);
+      stateManager.unsubscribeAll(ws);
+      if (config.logging) {
+        console.log("[WebSocket] Internal client disconnected");
+      }
+    });
+  });
+  for (const endpoint of normalizedWebSocketEndpoints) {
+    const endpointServer = new WebSocketServer({ server, path: endpoint.path });
+    webSocketServers.push(endpointServer);
+    if (config.logging) {
+      console.log(`[WebSocket] Endpoint ready at ${endpoint.path}`);
+    }
+    endpointServer.on("connection", (ws, req) => {
+      const requestUrl = req.url || endpoint.path;
+      const ctx = {
+        ws,
+        req,
+        path: getRequestPath2(requestUrl),
+        query: parseRequestQuery(requestUrl),
+        headers: req.headers
+      };
+      void Promise.resolve(endpoint.handler(ctx)).catch((error) => {
+        if (config.logging) {
+          console.error(`[WebSocket] Endpoint error at ${endpoint.path}:`, error);
+        }
+        try {
+          ws.close(CLOSE_CODES.INTERNAL_ERROR, "Internal Server Error");
+        } catch {
         }
       });
     });
@@ -62392,9 +62482,8 @@ ${elitImportMap}`;
     isClosing = true;
     if (config.logging) console.log("\n[Server] Shutting down...");
     if (watcher) await watcher.close();
-    if (wss) {
-      wss.close();
-      wsClients.forEach((client) => client.close());
+    if (webSocketServers.length > 0) {
+      webSocketServers.forEach((wsServer) => wsServer.close());
       wsClients.clear();
     }
     return new Promise((resolve8) => {
@@ -62718,7 +62807,26 @@ var import_esbuild2 = require("esbuild");
 
 // src/state.ts
 var ELIT_NATIVE_BINDING = /* @__PURE__ */ Symbol.for("elit.native.binding");
+var ELIT_INTERNAL_WS_PATH2 = "/__elit_ws";
 var createState = (initial, options) => dom.createState(initial, options);
+function resolveSharedStateWebSocketUrl(wsUrl) {
+  const protocol = typeof location !== "undefined" && location.protocol === "https:" ? "wss:" : "ws:";
+  const origin = typeof location !== "undefined" ? `${protocol}//${location.host}` : `${protocol}//localhost`;
+  if (!wsUrl) {
+    return `${origin}${ELIT_INTERNAL_WS_PATH2}`;
+  }
+  if (/^wss?:\/\//i.test(wsUrl)) {
+    const parsedUrl = new URL(wsUrl);
+    if (!parsedUrl.pathname || parsedUrl.pathname === "/") {
+      parsedUrl.pathname = ELIT_INTERNAL_WS_PATH2;
+    }
+    return parsedUrl.toString();
+  }
+  if (wsUrl.startsWith("/")) {
+    return `${origin}${wsUrl}`;
+  }
+  return wsUrl;
+}
 var SharedState2 = class {
   constructor(key, defaultValue, wsUrl) {
     this.key = key;
@@ -62770,7 +62878,7 @@ var SharedState2 = class {
    */
   connect() {
     if (typeof window === "undefined") return;
-    const url = this.wsUrl || `ws://${location.host}`;
+    const url = resolveSharedStateWebSocketUrl(this.wsUrl);
     this.ws = new WebSocket(url);
     this.ws.addEventListener("open", () => {
       this.subscribe();
@@ -78676,6 +78784,9 @@ async function runPreview(args) {
   if (mergedOptions.api) {
     options.api = mergedOptions.api;
   }
+  if (mergedOptions.ws && mergedOptions.ws.length > 0) {
+    options.ws = mergedOptions.ws;
+  }
   if (mergedOptions.https) {
     options.https = mergedOptions.https;
   }
@@ -79021,6 +79132,7 @@ Preview Options:
 Note: Preview mode has full feature parity with dev mode:
       - Single root and multi-client configurations (use clients[] in config)
       - REST API endpoints (use api option in config)
+  - WebSocket endpoints (use ws option in config)
       - Proxy forwarding and Web Workers
       - HTTPS support, custom middleware, and SSR
 
@@ -79091,6 +79203,18 @@ API Configuration:
     1. Client-specific API routes are matched first (defined in clients[].api)
     2. Global API routes are matched second (defined in dev.api or preview.api)
 
+WebSocket Configuration:
+  Configure WebSocket endpoints per client or globally.
+  Supports both global configuration and client-specific configuration.
+
+  Options:
+    - path: Upgrade path to match (required, e.g., '/ws', '/chat')
+    - handler: Connection handler invoked with { ws, req, path, query, headers }
+
+  Priority:
+    1. Client-specific endpoints are prefixed with the client's basePath (defined in clients[].ws)
+    2. Global endpoints listen exactly as configured (defined in dev.ws or preview.ws)
+
 Examples:
   elit dev
   elit dev --port 8080

package/dist/config.d.mts

@@ -1,4 +1,4 @@
-import { D as DevServerOptions, B as BuildOptions, P as PreviewOptions, T as TestOptions } from './server-DpnTyF7I.mjs';
+import { D as DevServerOptions, B as BuildOptions, P as PreviewOptions, T as TestOptions } from './server--YFoC6ln.mjs';
 import './http.mjs';
 import 'node:events';
 import './ws.mjs';

package/dist/coverage.d.mts

@@ -1,4 +1,4 @@
-import { b as TestCoverageReporter } from './server-DpnTyF7I.mjs';
+import { b as TestCoverageReporter } from './server--YFoC6ln.mjs';
 import './http.mjs';
 import 'node:events';
 import './ws.mjs';

package/dist/http.d.ts.map

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

package/dist/http.js

@@ -424,11 +424,12 @@ var Server = class extends import_node_events.EventEmitter {
         },
         fetch: (req) => {
           const urlObj = new URL(req.url);
-          const pathname = urlObj.pathname + urlObj.search;
+          const pathname = urlObj.pathname;
+          const requestUrl = urlObj.pathname + urlObj.search;
           const upgradeHeader = req.headers.get("upgrade");
           if (upgradeHeader && upgradeHeader.toLowerCase() === "websocket") {
             const matchingWebSocketServer = Array.from(this._bunWebSocketServers).find((wsServer) => {
-              return !wsServer.path || wsServer.path === "/" || wsServer.path === pathname;
+              return !wsServer.path || wsServer.path === pathname;
             });
             if (!matchingWebSocketServer) {
               return new Response("WebSocket path not found", { status: 404 });
@@ -442,7 +443,7 @@ var Server = class extends import_node_events.EventEmitter {
                 wsServer: matchingWebSocketServer,
                 request: {
                   method: req.method,
-                  url: pathname,
+                  url: requestUrl,
                   headers: requestHeaders,
                   socket: { remoteAddress: void 0 }
                 }
@@ -460,7 +461,7 @@ var Server = class extends import_node_events.EventEmitter {
           let responseReady = false;
           const incomingMessage = {
             method: req.method,
-            url: pathname,
+            url: requestUrl,
             headers: req.headers,
             httpVersion: "1.1",
             rawHeaders: [],