crossws 0.4.0 → 0.4.2

package/dist/adapters/bun.d.mts

@@ -4,7 +4,7 @@ import '../shared/crossws.BQXMA5bH.mjs';
 
 interface BunAdapter extends AdapterInstance {
     websocket: WebSocketHandler<ContextData>;
-    handleUpgrade(req: Request, server: Server): Promise<Response | undefined>;
+    handleUpgrade(req: Request, server: Server<ContextData>): Promise<Response | undefined>;
 }
 interface BunOptions extends AdapterOptions {
 }
@@ -12,7 +12,7 @@ type ContextData = {
     peer?: BunPeer;
     namespace: string;
     request: Request;
-    server?: Server;
+    server?: Server<ContextData>;
     context: PeerContext;
 };
 declare const bunAdapter: Adapter<BunAdapter, BunOptions>;

package/dist/adapters/cloudflare.mjs

@@ -67,6 +67,7 @@ const cloudflareAdapter = (opts = {}) => {
       server.addEventListener("close", (event) => {
         peers.delete(peer);
         hooks.callHook("close", peer, event);
+        server.close();
       });
       return new Response(null, {
         status: 101,

package/dist/adapters/node.mjs

@@ -1,7 +1,7 @@
 import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.WpyOHUXc.mjs';
 import { g as getPeers, A as AdapterHookable, a as adapterUtils } from '../shared/crossws.CPlNx7g8.mjs';
 import { W as WSError } from '../shared/crossws.By9qWDAI.mjs';
-import { _ as _WebSocketServer } from '../shared/crossws.CipVM6lf.mjs';
+import { _ as _WebSocketServer } from '../shared/crossws.C5pESzqN.mjs';
 import { S as StubRequest } from '../shared/crossws.B31KJMcF.mjs';
 import 'stream';
 import 'events';

package/dist/server/bun.d.mts

@@ -1,5 +1,5 @@
-import { ServerPlugin, Server } from 'srvx/types';
-import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.95-eYp2D.mjs';
+import { ServerPlugin, Server } from 'srvx';
+import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.CP-89VBK.mjs';
 import '../index.mjs';
 import '../shared/crossws.BQXMA5bH.mjs';
 import '../adapters/bun.mjs';

package/dist/server/cloudflare.d.mts

@@ -1,5 +1,5 @@
-import { ServerPlugin, Server } from 'srvx/types';
-import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.95-eYp2D.mjs';
+import { ServerPlugin, Server } from 'srvx';
+import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.CP-89VBK.mjs';
 import '../index.mjs';
 import '../shared/crossws.BQXMA5bH.mjs';
 import '../adapters/bun.mjs';

package/dist/server/default.d.mts

@@ -1,5 +1,5 @@
-import { ServerPlugin, Server } from 'srvx/types';
-import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.95-eYp2D.mjs';
+import { ServerPlugin, Server } from 'srvx';
+import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.CP-89VBK.mjs';
 import '../index.mjs';
 import '../shared/crossws.BQXMA5bH.mjs';
 import '../adapters/bun.mjs';

package/dist/server/deno.d.mts

@@ -1,5 +1,5 @@
-import { ServerPlugin, Server } from 'srvx/types';
-import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.95-eYp2D.mjs';
+import { ServerPlugin, Server } from 'srvx';
+import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.CP-89VBK.mjs';
 import '../index.mjs';
 import '../shared/crossws.BQXMA5bH.mjs';
 import '../adapters/bun.mjs';

package/dist/server/node.d.mts

@@ -1,5 +1,5 @@
-import { ServerPlugin, Server } from 'srvx/types';
-import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.95-eYp2D.mjs';
+import { ServerPlugin, Server } from 'srvx';
+import { W as WSOptions, S as ServerWithWSOptions } from '../shared/crossws.CP-89VBK.mjs';
 import '../index.mjs';
 import '../shared/crossws.BQXMA5bH.mjs';
 import '../adapters/bun.mjs';

package/dist/server/node.mjs

@@ -3,7 +3,7 @@ import nodeAdapter from '../adapters/node.mjs';
 import '../shared/crossws.WpyOHUXc.mjs';
 import '../shared/crossws.CPlNx7g8.mjs';
 import '../shared/crossws.By9qWDAI.mjs';
-import '../shared/crossws.CipVM6lf.mjs';
+import '../shared/crossws.C5pESzqN.mjs';
 import 'stream';
 import 'events';
 import 'http';
@@ -26,7 +26,13 @@ function plugin(wsOpts) {
     const originalServe = server.serve;
     server.serve = () => {
       server.node?.server.on("upgrade", (req, socket, head) => {
-        ws.handleUpgrade(req, socket, head, new NodeRequest(req));
+        ws.handleUpgrade(
+          req,
+          socket,
+          head,
+          // @ts-expect-error (upgrade is not typed)
+          new NodeRequest({ req, upgrade: { socket, head } })
+        );
       });
       return originalServe.call(server);
     };

package/dist/shared/{crossws.CipVM6lf.mjs → crossws.C5pESzqN.mjs}

@@ -29,6 +29,7 @@ function requireConstants () {
 
 	constants = {
 	  BINARY_TYPES,
+	  CLOSE_TIMEOUT: 30000,
 	  EMPTY_BUFFER: Buffer.alloc(0),
 	  GUID: '258EAFA5-E914-47DA-95CA-C5AB0DC85B11',
 	  hasBlob,
@@ -2799,6 +2800,7 @@ function requireWebsocket () {
 
 	const {
 	  BINARY_TYPES,
+	  CLOSE_TIMEOUT,
 	  EMPTY_BUFFER,
 	  GUID,
 	  kForOnEventAttribute,
@@ -2813,7 +2815,6 @@ function requireWebsocket () {
 	const { format, parse } = requireExtension();
 	const { toBuffer } = requireBufferUtil();
 
-	const closeTimeout = 30 * 1000;
 	const kAborted = Symbol('kAborted');
 	const protocolVersions = [8, 13];
 	const readyStates = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'];
@@ -2869,6 +2870,7 @@ function requireWebsocket () {
 	      initAsClient(this, address, protocols, options);
 	    } else {
 	      this._autoPong = options.autoPong;
+	      this._closeTimeout = options.closeTimeout;
 	      this._isServer = true;
 	    }
 	  }
@@ -3410,6 +3412,8 @@ function requireWebsocket () {
 	 *     times in the same tick
 	 * @param {Boolean} [options.autoPong=true] Specifies whether or not to
 	 *     automatically send a pong in response to a ping
+	 * @param {Number} [options.closeTimeout=30000] Duration in milliseconds to wait
+	 *     for the closing handshake to finish after `websocket.close()` is called
 	 * @param {Function} [options.finishRequest] A function which can be used to
 	 *     customize the headers of each http request before it is sent
 	 * @param {Boolean} [options.followRedirects=false] Whether or not to follow
@@ -3436,6 +3440,7 @@ function requireWebsocket () {
 	  const opts = {
 	    allowSynchronousEvents: true,
 	    autoPong: true,
+	    closeTimeout: CLOSE_TIMEOUT,
 	    protocolVersion: protocolVersions[1],
 	    maxPayload: 100 * 1024 * 1024,
 	    skipUTF8Validation: false,
@@ -3454,6 +3459,7 @@ function requireWebsocket () {
 	  };
 
 	  websocket._autoPong = opts.autoPong;
+	  websocket._closeTimeout = opts.closeTimeout;
 
 	  if (!protocolVersions.includes(opts.protocolVersion)) {
 	    throw new RangeError(
@@ -4071,7 +4077,7 @@ function requireWebsocket () {
 	function setCloseTimer(websocket) {
 	  websocket._closeTimer = setTimeout(
 	    websocket._socket.destroy.bind(websocket._socket),
-	    closeTimeout
+	    websocket._closeTimeout
 	  );
 	}
 
@@ -4089,23 +4095,23 @@ function requireWebsocket () {
 
 	  websocket._readyState = WebSocket.CLOSING;
 
-	  let chunk;
-
 	  //
 	  // The close frame might not have been received or the `'end'` event emitted,
 	  // for example, if the socket was destroyed due to an error. Ensure that the
 	  // `receiver` stream is closed after writing any remaining buffered data to
 	  // it. If the readable side of the socket is in flowing mode then there is no
-	  // buffered data as everything has been already written and `readable.read()`
-	  // will return `null`. If instead, the socket is paused, any possible buffered
-	  // data will be read as a single chunk.
+	  // buffered data as everything has been already written. If instead, the
+	  // socket is paused, any possible buffered data will be read as a single
+	  // chunk.
 	  //
 	  if (
 	    !this._readableState.endEmitted &&
 	    !websocket._closeFrameReceived &&
 	    !websocket._receiver._writableState.errorEmitted &&
-	    (chunk = websocket._socket.read()) !== null
+	    this._readableState.length !== 0
 	  ) {
+	    const chunk = this.read(this._readableState.length);
+
 	    websocket._receiver.write(chunk);
 	  }
 
@@ -4437,7 +4443,7 @@ function requireWebsocketServer () {
 	const PerMessageDeflate = requirePermessageDeflate();
 	const subprotocol = requireSubprotocol();
 	const WebSocket = requireWebsocket();
-	const { GUID, kWebSocket } = requireConstants();
+	const { CLOSE_TIMEOUT, GUID, kWebSocket } = requireConstants();
 
 	const keyRegex = /^[+/0-9A-Za-z]{22}==$/;
 
@@ -4464,6 +4470,9 @@ function requireWebsocketServer () {
 	   *     pending connections
 	   * @param {Boolean} [options.clientTracking=true] Specifies whether or not to
 	   *     track clients
+	   * @param {Number} [options.closeTimeout=30000] Duration in milliseconds to
+	   *     wait for the closing handshake to finish after `websocket.close()` is
+	   *     called
 	   * @param {Function} [options.handleProtocols] A hook to handle protocols
 	   * @param {String} [options.host] The hostname where to bind the server
 	   * @param {Number} [options.maxPayload=104857600] The maximum allowed message
@@ -4493,6 +4502,7 @@ function requireWebsocketServer () {
 	      perMessageDeflate: false,
 	      handleProtocols: null,
 	      clientTracking: true,
+	      closeTimeout: CLOSE_TIMEOUT,
 	      verifyClient: null,
 	      noServer: false,
 	      backlog: null, // use default (511 as implemented in net.js)
@@ -4682,9 +4692,11 @@ function requireWebsocketServer () {
 	      return;
 	    }
 
-	    if (version !== 8 && version !== 13) {
+	    if (version !== 13 && version !== 8) {
 	      const message = 'Missing or invalid Sec-WebSocket-Version header';
-	      abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
+	      abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
+	        'Sec-WebSocket-Version': '13, 8'
+	      });
 	      return;
 	    }
 
@@ -4952,16 +4964,24 @@ function requireWebsocketServer () {
 	 * @param {Duplex} socket The socket of the upgrade request
 	 * @param {Number} code The HTTP response status code
 	 * @param {String} message The HTTP response body
+	 * @param {Object} [headers] The HTTP response headers
 	 * @private
 	 */
-	function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
+	function abortHandshakeOrEmitwsClientError(
+	  server,
+	  req,
+	  socket,
+	  code,
+	  message,
+	  headers
+	) {
 	  if (server.listenerCount('wsClientError')) {
 	    const err = new Error(message);
 	    Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);
 
 	    server.emit('wsClientError', err, socket, req);
 	  } else {
-	    abortHandshake(socket, code, message);
+	    abortHandshake(socket, code, message, headers);
 	  }
 	}
 	return websocketServer;

package/dist/shared/{crossws.95-eYp2D.d.mts → crossws.CP-89VBK.d.mts}

@@ -1,4 +1,4 @@
-import { ServerRequest, ServerOptions } from 'srvx/types';
+import { ServerRequest, ServerOptions } from 'srvx';
 import { Hooks } from '../index.mjs';
 import { BunOptions } from '../adapters/bun.mjs';
 import { DenoOptions } from '../adapters/deno.mjs';

package/dist/websocket/node.mjs

@@ -1,4 +1,4 @@
-import { a as _WebSocket } from '../shared/crossws.CipVM6lf.mjs';
+import { a as _WebSocket } from '../shared/crossws.C5pESzqN.mjs';
 import 'stream';
 import 'events';
 import 'http';

package/dist/websocket/sse.mjs

@@ -12,12 +12,10 @@ class WebSocketSSE extends _EventTarget {
   OPEN = 1;
   CLOSING = 2;
   CLOSED = 3;
-  /* eslint-disable unicorn/no-null */
   onclose = null;
   onerror = null;
   onopen = null;
   onmessage = null;
-  /* eslint-enable unicorn/no-null */
   binaryType = "blob";
   readyState = WebSocketSSE.CONNECTING;
   url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crossws",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Cross-platform WebSocket Servers for Node.js, Deno, Bun and Cloudflare Workers",
   "homepage": "https://crossws.h3.dev",
   "repository": "h3js/crossws",
@@ -62,39 +62,40 @@
     "play:uws": "jiti test/fixture/uws.ts",
     "release": "pnpm test && pnpm build && changelogen --release && npm publish && git push --follow-tags",
     "test": "pnpm lint && pnpm test:types && vitest run --coverage",
-    "test:types": "tsc --noEmit --skipLibCheck"
+    "test:types": "tsgo --noEmit --skipLibCheck"
   },
   "resolutions": {
     "crossws": "workspace:*"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250523.0",
-    "@types/bun": "^1.2.14",
-    "@types/deno": "^2.3.0",
-    "@types/node": "^22.15.21",
-    "@types/web": "^0.0.235",
+    "@cloudflare/workers-types": "^4.20260118.0",
+    "@types/bun": "^1.3.6",
+    "@types/deno": "^2.5.0",
+    "@types/node": "^25.0.9",
+    "@types/web": "^0.0.318",
     "@types/ws": "^8.18.1",
-    "@vitest/coverage-v8": "^3.1.4",
-    "automd": "^0.4.0",
-    "changelogen": "^0.6.1",
+    "@typescript/native-preview": "7.0.0-dev.20260119.1",
+    "@vitest/coverage-v8": "^4.0.17",
+    "automd": "^0.4.2",
+    "changelogen": "^0.6.2",
     "consola": "^3.4.2",
-    "eslint": "^9.27.0",
-    "eslint-config-unjs": "^0.4.2",
-    "eventsource": "^4.0.0",
-    "execa": "^9.5.3",
-    "get-port-please": "^3.1.2",
-    "h3": "^1.15.3",
-    "jiti": "^2.4.2",
+    "eslint": "^9.39.2",
+    "eslint-config-unjs": "^0.6.2",
+    "eventsource": "^4.1.0",
+    "execa": "^9.6.1",
+    "get-port-please": "^3.2.0",
+    "h3": "^2.0.1-rc.8",
+    "jiti": "^2.6.1",
     "listhen": "^1.9.0",
-    "prettier": "^3.5.3",
-    "srvx": "^0.7.1",
-    "typescript": "^5.8.3",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.44.0",
-    "unbuild": "^3.5.0",
-    "undici": "^7.10.0",
-    "vitest": "^3.1.4",
-    "wrangler": "^4.16.1",
-    "ws": "^8.18.2"
+    "prettier": "^3.8.0",
+    "srvx": "^0.10.1",
+    "typescript": "^5.9.3",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.57.0",
+    "unbuild": "^3.6.1",
+    "undici": "^7.18.2",
+    "vitest": "^4.0.17",
+    "wrangler": "^4.59.2",
+    "ws": "^8.19.0"
   },
   "peerDependencies": {
     "srvx": ">=0.7.1"
@@ -104,13 +105,19 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@10.11.0",
+  "packageManager": "pnpm@10.28.1",
   "pnpm": {
     "ignoredBuiltDependencies": [
       "@parcel/watcher",
       "esbuild",
       "sharp",
       "workerd"
+    ],
+    "onlyBuiltDependencies": [
+      "@parcel/watcher",
+      "esbuild",
+      "sharp",
+      "workerd"
     ]
   }
 }

package/adapters/cloudflare-durable.d.ts

@@ -1,2 +0,0 @@
-export * from "../dist/adapters/cloudflare-durable";
-export { default } from "../dist/adapters/cloudflare-durable";