elit 3.6.6 → 3.6.7

package/dist/ws.mjs

@@ -6,17 +6,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// src/ws.ts
-import { EventEmitter } from "events";
-
-// src/runtime.ts
-var runtime = (() => {
-  if (typeof Deno !== "undefined") return "deno";
-  if (typeof Bun !== "undefined") return "bun";
-  return "node";
-})();
-
-// src/ws.ts
+// src/server/ws/constants.ts
 var ReadyState = /* @__PURE__ */ ((ReadyState2) => {
   ReadyState2[ReadyState2["CONNECTING"] = 0] = "CONNECTING";
   ReadyState2[ReadyState2["OPEN"] = 1] = "OPEN";
@@ -41,6 +31,18 @@ var CLOSE_CODES = {
   BAD_GATEWAY: 1014,
   TLS_HANDSHAKE_FAIL: 1015
 };
+
+// src/server/ws/server.ts
+import { EventEmitter as EventEmitter2 } from "events";
+
+// src/shares/runtime.ts
+var runtime = (() => {
+  if (typeof Deno !== "undefined") return "deno";
+  if (typeof Bun !== "undefined") return "bun";
+  return "node";
+})();
+
+// src/server/ws/utils.ts
 function queueCallback(callback, error) {
   if (callback) {
     queueMicrotask(() => callback(error));
@@ -56,6 +58,73 @@ function getRequestPath(url) {
   const [pathname = "/"] = (url || "/").split("?");
   return pathname || "/";
 }
+function isIgnorableConnectionError(error) {
+  const errorCode = error?.code;
+  return errorCode === "ECONNABORTED" || errorCode === "ECONNRESET" || errorCode === "EPIPE";
+}
+function coerceBunMessage(message) {
+  const isBinary = typeof message !== "string";
+  const payload = typeof message === "string" ? message : message instanceof ArrayBuffer ? Buffer.from(message) : ArrayBuffer.isView(message) ? Buffer.from(message.buffer, message.byteOffset, message.byteLength) : Buffer.from(String(message));
+  return { payload, isBinary };
+}
+function parseFrame(data) {
+  if (data.length < 2) {
+    return null;
+  }
+  const firstByte = data[0];
+  const secondByte = data[1];
+  const opcode = firstByte & 15;
+  const isMasked = (secondByte & 128) === 128;
+  let payloadLength = secondByte & 127;
+  let offset = 2;
+  if (payloadLength === 126) {
+    payloadLength = data.readUInt16BE(2);
+    offset = 4;
+  } else if (payloadLength === 127) {
+    payloadLength = Number(data.readBigUInt64BE(2));
+    offset = 10;
+  }
+  let payload = data.subarray(offset);
+  if (isMasked) {
+    const maskKey = data.subarray(offset, offset + 4);
+    payload = data.subarray(offset + 4, offset + 4 + payloadLength);
+    for (let index = 0; index < payload.length; index += 1) {
+      payload[index] ^= maskKey[index % 4];
+    }
+  }
+  if (opcode === 1) {
+    return payload.toString("utf8");
+  }
+  return null;
+}
+function createFrame(data) {
+  const payload = typeof data === "string" ? Buffer.from(data) : data;
+  const payloadLength = Buffer.isBuffer(payload) ? payload.length : 0;
+  let frame;
+  let offset = 2;
+  if (payloadLength < 126) {
+    frame = Buffer.allocUnsafe(2 + payloadLength);
+    frame[1] = payloadLength;
+  } else if (payloadLength < 65536) {
+    frame = Buffer.allocUnsafe(4 + payloadLength);
+    frame[1] = 126;
+    frame.writeUInt16BE(payloadLength, 2);
+    offset = 4;
+  } else {
+    frame = Buffer.allocUnsafe(10 + payloadLength);
+    frame[1] = 127;
+    frame.writeBigUInt64BE(BigInt(payloadLength), 2);
+    offset = 10;
+  }
+  frame[0] = 129;
+  if (Buffer.isBuffer(payload)) {
+    payload.copy(frame, offset);
+  }
+  return frame;
+}
+
+// src/server/ws/websocket.ts
+import { EventEmitter } from "events";
 var WebSocket = class extends EventEmitter {
   constructor(address, protocols, _options) {
     super();
@@ -86,12 +155,13 @@ var WebSocket = class extends EventEmitter {
     };
   }
   /**
-   * Send data through WebSocket
+   * Send data through WebSocket.
    */
   send(data, options, callback) {
     const cb = typeof options === "function" ? options : callback;
     if (this.readyState !== 1 /* OPEN */) {
-      return queueCallback(cb, new Error("WebSocket is not open"));
+      queueCallback(cb, new Error("WebSocket is not open"));
+      return;
     }
     try {
       this._socket.send(data);
@@ -101,7 +171,7 @@ var WebSocket = class extends EventEmitter {
     }
   }
   /**
-   * Close the WebSocket connection
+   * Close the WebSocket connection.
    */
   close(code, reason) {
     if (this.readyState === 3 /* CLOSED */ || this.readyState === 2 /* CLOSING */) {
@@ -111,42 +181,44 @@ var WebSocket = class extends EventEmitter {
     this._socket.close(code, typeof reason === "string" ? reason : reason?.toString());
   }
   /**
-   * Pause the socket (no-op for native WebSocket)
+   * Pause the socket (no-op for native WebSocket).
    */
   pause() {
   }
   /**
-   * Resume the socket (no-op for native WebSocket)
+   * Resume the socket (no-op for native WebSocket).
    */
   resume() {
   }
   /**
-   * Send a ping frame (no-op for native WebSocket)
+   * Send a ping frame (no-op for native WebSocket).
    */
   ping(_data, _mask, callback) {
     queueCallback(callback);
   }
   /**
-   * Send a pong frame (no-op for native WebSocket)
+   * Send a pong frame (no-op for native WebSocket).
    */
   pong(_data, _mask, callback) {
     queueCallback(callback);
   }
   /**
-   * Terminate the connection
+   * Terminate the connection.
    */
   terminate() {
     this._socket.close();
     this.readyState = 3 /* CLOSED */;
   }
   /**
-   * Get buffered amount
+   * Get buffered amount.
    */
   get bufferedAmount() {
     return this._socket.bufferedAmount || 0;
   }
 };
-var WebSocketServer = class extends EventEmitter {
+
+// src/server/ws/server.ts
+var WebSocketServer = class extends EventEmitter2 {
   constructor(options, callback) {
     super();
     this.clients = /* @__PURE__ */ new Set();
@@ -157,8 +229,7 @@ var WebSocketServer = class extends EventEmitter {
       if (options?.server) {
         this._httpServer = options.server;
         this._setupUpgradeHandler();
-      } else if (options?.noServer) {
-      } else {
+      } else if (!options?.noServer) {
         const http = __require("http");
         this._httpServer = http.createServer();
         this._ownsHttpServer = true;
@@ -192,7 +263,7 @@ var WebSocketServer = class extends EventEmitter {
     });
   }
   /**
-   * Handle HTTP upgrade for WebSocket
+   * Handle HTTP upgrade for WebSocket.
    */
   handleUpgrade(request, socket, _head, callback) {
     const key = request.headers["sec-websocket-key"];
@@ -222,7 +293,7 @@ var WebSocketServer = class extends EventEmitter {
   }
   _createClientFromSocket(socket) {
     const client = Object.create(WebSocket.prototype);
-    EventEmitter.call(client);
+    EventEmitter2.call(client);
     client.readyState = 1 /* OPEN */;
     client.url = "ws://localhost";
     client.protocol = "";
@@ -231,7 +302,7 @@ var WebSocketServer = class extends EventEmitter {
     client._socket = socket;
     socket.on("data", (data) => {
       try {
-        const message = this._parseFrame(data);
+        const message = parseFrame(data);
         if (message) {
           client.emit("message", message, false);
         }
@@ -244,33 +315,31 @@ var WebSocketServer = class extends EventEmitter {
       client.emit("close", CLOSE_CODES.NORMAL, "");
     });
     socket.on("error", (error) => {
-      const errorCode = error.code;
-      if (errorCode === "ECONNABORTED" || errorCode === "ECONNRESET" || errorCode === "EPIPE") {
+      if (isIgnorableConnectionError(error)) {
         return;
       }
       client.emit("error", error);
     });
     client.send = (data, _options, callback) => {
       if (!socket.writable || client.readyState !== 1 /* OPEN */) {
-        const err = new Error("WebSocket is not open");
-        err.code = "WS_NOT_OPEN";
-        queueCallback(callback, err);
+        const error = new Error("WebSocket is not open");
+        error.code = "WS_NOT_OPEN";
+        queueCallback(callback, error);
         return;
       }
       try {
-        const frame = this._createFrame(data);
-        socket.write(frame, (err) => {
-          if (err) {
-            const errorCode = err.code;
-            if (errorCode !== "ECONNABORTED" && errorCode !== "ECONNRESET" && errorCode !== "EPIPE") {
-              queueCallback(callback, err);
-            } else {
-              client.readyState = 3 /* CLOSED */;
-              queueCallback(callback);
-            }
-          } else {
+        const frame = createFrame(data);
+        socket.write(frame, (error) => {
+          if (!error) {
             queueCallback(callback);
+            return;
           }
+          if (isIgnorableConnectionError(error)) {
+            client.readyState = 3 /* CLOSED */;
+            queueCallback(callback);
+            return;
+          }
+          queueCallback(callback, error);
         });
       } catch (error) {
         queueCallback(callback, error);
@@ -284,7 +353,7 @@ var WebSocketServer = class extends EventEmitter {
   }
   _createClientFromBunSocket(socket) {
     const client = Object.create(WebSocket.prototype);
-    EventEmitter.call(client);
+    EventEmitter2.call(client);
     client.readyState = 1 /* OPEN */;
     client.url = "ws://localhost";
     client.protocol = "";
@@ -308,7 +377,7 @@ var WebSocketServer = class extends EventEmitter {
         return;
       }
       client.readyState = 2 /* CLOSING */;
-      socket.close(code ?? CLOSE_CODES.NORMAL, reason);
+      socket.close(code ?? CLOSE_CODES.NORMAL, typeof reason === "string" ? reason : reason?.toString());
     };
     client.terminate = () => {
       socket.close();
@@ -339,8 +408,7 @@ var WebSocketServer = class extends EventEmitter {
     if (!client) {
       return;
     }
-    const isBinary = typeof message !== "string";
-    const payload = typeof message === "string" ? message : message instanceof ArrayBuffer ? Buffer.from(message) : ArrayBuffer.isView(message) ? Buffer.from(message.buffer, message.byteOffset, message.byteLength) : Buffer.from(String(message));
+    const { payload, isBinary } = coerceBunMessage(message);
     client.emit("message", payload, isBinary);
   }
   _handleBunClose(socket, code, reason) {
@@ -352,77 +420,24 @@ var WebSocketServer = class extends EventEmitter {
     client.emit("close", code, typeof reason === "string" ? reason : reason?.toString() || "");
     this.clients.delete(client);
   }
-  _parseFrame(data) {
-    if (data.length < 2) return null;
-    const firstByte = data[0];
-    const secondByte = data[1];
-    const opcode = firstByte & 15;
-    const isMasked = (secondByte & 128) === 128;
-    let payloadLength = secondByte & 127;
-    let offset = 2;
-    if (payloadLength === 126) {
-      payloadLength = data.readUInt16BE(2);
-      offset = 4;
-    } else if (payloadLength === 127) {
-      payloadLength = Number(data.readBigUInt64BE(2));
-      offset = 10;
-    }
-    let payload = data.subarray(offset);
-    if (isMasked) {
-      const maskKey = data.subarray(offset, offset + 4);
-      payload = data.subarray(offset + 4, offset + 4 + payloadLength);
-      for (let i = 0; i < payload.length; i++) {
-        payload[i] ^= maskKey[i % 4];
-      }
-    }
-    if (opcode === 1) {
-      return payload.toString("utf8");
-    }
-    return null;
-  }
-  _createFrame(data) {
-    const payload = typeof data === "string" ? Buffer.from(data) : data;
-    const payloadLength = Buffer.isBuffer(payload) ? payload.length : 0;
-    let frame;
-    let offset = 2;
-    if (payloadLength < 126) {
-      frame = Buffer.allocUnsafe(2 + payloadLength);
-      frame[1] = payloadLength;
-    } else if (payloadLength < 65536) {
-      frame = Buffer.allocUnsafe(4 + payloadLength);
-      frame[1] = 126;
-      frame.writeUInt16BE(payloadLength, 2);
-      offset = 4;
-    } else {
-      frame = Buffer.allocUnsafe(10 + payloadLength);
-      frame[1] = 127;
-      frame.writeBigUInt64BE(BigInt(payloadLength), 2);
-      offset = 10;
-    }
-    frame[0] = 129;
-    if (Buffer.isBuffer(payload)) {
-      payload.copy(frame, offset);
-    }
-    return frame;
-  }
   /**
-   * Close the server
+   * Close the server.
    */
   close(callback) {
     this.clients.forEach((client) => client.close());
     this.clients.clear();
     if (this._httpServer && this._ownsHttpServer) {
       this._httpServer.close(callback);
-    } else {
-      if (runtime === "bun" && this._httpServer?.unregisterWebSocketServer) {
-        this._httpServer.unregisterWebSocketServer(this);
-      }
-      this.emit("close");
-      queueCallback(callback);
+      return;
+    }
+    if (runtime === "bun" && this._httpServer?.unregisterWebSocketServer) {
+      this._httpServer.unregisterWebSocketServer(this);
     }
+    this.emit("close");
+    queueCallback(callback);
   }
   /**
-   * Check if server should handle request
+   * Check if server should handle request.
    */
   shouldHandle(request) {
     if (this.path && getRequestPath(request.url) !== this.path) {
@@ -431,10 +446,10 @@ var WebSocketServer = class extends EventEmitter {
     return true;
   }
   /**
-   * Get server address
+   * Get server address.
    */
   address() {
-    if (this._httpServer && this._httpServer.address) {
+    if (this._httpServer?.address) {
       return this._httpServer.address();
     }
     return null;
@@ -443,9 +458,13 @@ var WebSocketServer = class extends EventEmitter {
 function createWebSocketServer(options, callback) {
   return new WebSocketServer(options, callback);
 }
+
+// src/server/ws/runtime.ts
 function getRuntime() {
   return runtime;
 }
+
+// src/server/ws/ws.ts
 var ws_default = {
   WebSocket,
   WebSocketServer,