@gjsify/websocket 0.3.13 → 0.3.15

package/lib/esm/index.js

@@ -1,216 +1,224 @@
 import GLib from "@girs/glib-2.0";
 import Soup from "@girs/soup-3.0";
 import Gio from "@girs/gio-2.0";
-import { Event, EventTarget, MessageEvent, CloseEvent } from "@gjsify/dom-events";
+import { CloseEvent, Event, EventTarget, MessageEvent } from "@gjsify/dom-events";
+
+//#region src/index.ts
 const CONNECTING = 0;
 const OPEN = 1;
 const CLOSING = 2;
 const CLOSED = 3;
 function extensionName(ext) {
-  if (ext instanceof Soup.WebsocketExtensionDeflate) return "permessage-deflate";
-  const gtype = ext.constructor.$gtype?.name ?? "";
-  return gtype.replace(/^SoupWebsocketExtension/, "").toLowerCase();
+	if (ext instanceof Soup.WebsocketExtensionDeflate) return "permessage-deflate";
+	const gtype = ext.constructor.$gtype?.name ?? "";
+	return gtype.replace(/^SoupWebsocketExtension/, "").toLowerCase();
 }
 function serializeExtensions(exts) {
-  if (!exts || exts.length === 0) return "";
-  return exts.map((ext) => {
-    const params = ext.get_response_params();
-    return params ? `${extensionName(ext)}${params}` : extensionName(ext);
-  }).join(", ");
+	if (!exts || exts.length === 0) return "";
+	return exts.map((ext) => {
+		const params = ext.get_response_params();
+		return params ? `${extensionName(ext)}${params}` : extensionName(ext);
+	}).join(", ");
 }
-class WebSocket extends EventTarget {
-  // readyState constants
-  static CONNECTING = CONNECTING;
-  static OPEN = OPEN;
-  static CLOSING = CLOSING;
-  static CLOSED = CLOSED;
-  CONNECTING = CONNECTING;
-  OPEN = OPEN;
-  CLOSING = CLOSING;
-  CLOSED = CLOSED;
-  url;
-  readyState = CONNECTING;
-  bufferedAmount = 0;
-  extensions = "";
-  protocol = "";
-  binaryType = "blob";
-  // Event handlers (attribute-style)
-  onopen = null;
-  onmessage = null;
-  onerror = null;
-  onclose = null;
-  _connection = null;
-  _session;
-  _protocols;
-  _cancellable = null;
-  _handshakeTimedOut = false;
-  _handshakeTimer = null;
-  constructor(url, protocols, options) {
-    super();
-    this.url = typeof url === "string" ? url : url.toString();
-    this._protocols = typeof protocols === "string" ? [protocols] : protocols ?? [];
-    this._session = new Soup.Session();
-    if (options?.perMessageDeflate) {
-      this._session.add_feature_by_type(Soup.WebsocketExtensionManager.$gtype);
-      this._session.add_feature_by_type(Soup.WebsocketExtensionDeflate.$gtype);
-    }
-    this._connect(options);
-  }
-  _connect(options) {
-    const uri = GLib.Uri.parse(this.url, GLib.UriFlags.NONE);
-    const msg = new Soup.Message({ method: "GET", uri });
-    if (options?.headers) {
-      const reqHeaders = msg.get_request_headers();
-      for (const [name, value] of Object.entries(options.headers)) {
-        if (Array.isArray(value)) {
-          value.forEach((v) => reqHeaders.append(name, v));
-        } else {
-          reqHeaders.replace(name, value);
-        }
-      }
-    }
-    if (options?.handshakeTimeout) {
-      this._cancellable = new Gio.Cancellable();
-      const cancellable = this._cancellable;
-      this._handshakeTimer = setTimeout(() => {
-        this._handshakeTimedOut = true;
-        this._handshakeTimer = null;
-        cancellable.cancel();
-      }, options.handshakeTimeout);
-    }
-    this._session.websocket_connect_async(
-      msg,
-      options?.origin ?? null,
-      this._protocols.length > 0 ? this._protocols : null,
-      GLib.PRIORITY_DEFAULT,
-      this._cancellable,
-      (_self, asyncRes) => {
-        if (this._handshakeTimer !== null) {
-          clearTimeout(this._handshakeTimer);
-          this._handshakeTimer = null;
-        }
-        try {
-          this._connection = this._session.websocket_connect_finish(asyncRes);
-          this._connection.max_incoming_payload_size = 100 * 1024 * 1024;
-          this.readyState = OPEN;
-          this.protocol = this._connection.get_protocol() ?? "";
-          this.extensions = serializeExtensions(this._connection.get_extensions());
-          this._connection.connect("message", (_conn, type, message) => {
-            this._onMessage(type, message);
-          });
-          this._connection.connect("closed", () => {
-            this._onClosed();
-          });
-          this._connection.connect("error", (_conn, error) => {
-            this._onError(error);
-          });
-          const openEvent = new Event("open");
-          this.dispatchEvent(openEvent);
-          if (this.onopen) this.onopen.call(this, openEvent);
-        } catch (error) {
-          this.readyState = CLOSED;
-          const errorMessage = this._handshakeTimedOut ? "Opening handshake has timed out" : error instanceof Error ? error.message : String(error);
-          const err = new Error(errorMessage);
-          const errorEvent = new Event("error");
-          errorEvent.error = err;
-          errorEvent.message = errorMessage;
-          this.dispatchEvent(errorEvent);
-          if (this.onerror) this.onerror.call(this, errorEvent);
-          const closeEvent = new CloseEvent("close", {
-            code: 1006,
-            reason: errorMessage,
-            wasClean: false
-          });
-          this.dispatchEvent(closeEvent);
-          if (this.onclose) this.onclose.call(this, closeEvent);
-        }
-      }
-    );
-  }
-  _onMessage(type, message) {
-    let data;
-    if (type === Soup.WebsocketDataType.TEXT) {
-      const decoder = new TextDecoder();
-      data = decoder.decode(message.toArray());
-    } else {
-      const arr = message.toArray();
-      data = arr.buffer.slice(arr.byteOffset, arr.byteOffset + arr.byteLength);
-    }
-    const event = new MessageEvent("message", { data, origin: this.url });
-    this.dispatchEvent(event);
-    if (this.onmessage) this.onmessage.call(this, event);
-  }
-  _onError(error) {
-    const event = new Event("error");
-    this.dispatchEvent(event);
-    if (this.onerror) this.onerror.call(this, event);
-  }
-  _onClosed() {
-    const code = this._connection?.get_close_code() ?? 1006;
-    const reason = this._connection?.get_close_data() ?? "";
-    const wasClean = code === 1e3;
-    this.readyState = CLOSED;
-    this._connection = null;
-    const event = new CloseEvent("close", { code, reason, wasClean });
-    this.dispatchEvent(event);
-    if (this.onclose) this.onclose.call(this, event);
-  }
-  /**
-   * Send data through the WebSocket connection.
-   *
-   * For strings, we intentionally route through `send_message(TEXT, bytes)`
-   * rather than the simpler `send_text(str)` API. Reason: `send_text()`
-   * takes a C `const char*` (null-terminated), so any embedded `\x00` in
-   * the JS string gets truncated at the first NUL at the GI boundary —
-   * Autobahn case 6.7.1 (single NUL in a text frame) was returned as an
-   * empty string. Going through `GLib.Bytes` preserves the exact byte
-   * sequence; Soup still sets the text-frame opcode because we pass
-   * `Soup.WebsocketDataType.TEXT` explicitly.
-   */
-  send(data) {
-    if (this.readyState !== OPEN) {
-      throw new DOMException("WebSocket is not open", "InvalidStateError");
-    }
-    if (!this._connection) return;
-    if (typeof data === "string") {
-      const bytes = new TextEncoder().encode(data);
-      this._connection.send_message(Soup.WebsocketDataType.TEXT, new GLib.Bytes(bytes));
-    } else {
-      let bytes;
-      if (data instanceof ArrayBuffer) {
-        bytes = new Uint8Array(data);
-      } else {
-        bytes = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
-      }
-      this._connection.send_message(Soup.WebsocketDataType.BINARY, new GLib.Bytes(bytes));
-    }
-  }
-  /**
-   * Close the WebSocket connection.
-   */
-  close(code, reason) {
-    if (this.readyState === CLOSED || this.readyState === CLOSING) return;
-    if (code !== void 0 && code !== 1e3 && (code < 3e3 || code > 4999)) {
-      throw new DOMException(
-        `The code must be either 1000, or between 3000 and 4999. ${code} is neither.`,
-        "InvalidAccessError"
-      );
-    }
-    this.readyState = CLOSING;
-    if (this._connection) {
-      this._connection.close(code ?? 1e3, reason ?? null);
-    } else {
-      this.readyState = CLOSED;
-      const event = new CloseEvent("close", { code: 1006, wasClean: false });
-      this.dispatchEvent(event);
-      if (this.onclose) this.onclose.call(this, event);
-    }
-  }
-}
-var index_default = WebSocket;
-export {
-  CloseEvent,
-  MessageEvent,
-  WebSocket,
-  index_default as default
+/**
+* W3C WebSocket API implementation using Soup 3.0.
+*
+* Usage:
+*   const ws = new WebSocket('ws://localhost:8080/');
+*   ws.onopen = () => ws.send('hello');
+*   ws.onmessage = (e) => console.log(e.data);
+*   ws.onclose = (e) => console.log('closed', e.code);
+*/
+var WebSocket = class extends EventTarget {
+	static CONNECTING = CONNECTING;
+	static OPEN = OPEN;
+	static CLOSING = CLOSING;
+	static CLOSED = CLOSED;
+	CONNECTING = CONNECTING;
+	OPEN = OPEN;
+	CLOSING = CLOSING;
+	CLOSED = CLOSED;
+	url;
+	readyState = CONNECTING;
+	bufferedAmount = 0;
+	extensions = "";
+	protocol = "";
+	binaryType = "blob";
+	onopen = null;
+	onmessage = null;
+	onerror = null;
+	onclose = null;
+	_connection = null;
+	_session;
+	_protocols;
+	_cancellable = null;
+	_handshakeTimedOut = false;
+	_handshakeTimer = null;
+	constructor(url, protocols, options) {
+		super();
+		this.url = typeof url === "string" ? url : url.toString();
+		this._protocols = typeof protocols === "string" ? [protocols] : protocols ?? [];
+		this._session = new Soup.Session();
+		if (options?.perMessageDeflate) {
+			this._session.add_feature_by_type(Soup.WebsocketExtensionManager.$gtype);
+			this._session.add_feature_by_type(Soup.WebsocketExtensionDeflate.$gtype);
+		}
+		this._connect(options);
+	}
+	_connect(options) {
+		const uri = GLib.Uri.parse(this.url, GLib.UriFlags.NONE);
+		const msg = new Soup.Message({
+			method: "GET",
+			uri
+		});
+		if (options?.headers) {
+			const reqHeaders = msg.get_request_headers();
+			for (const [name, value] of Object.entries(options.headers)) {
+				if (Array.isArray(value)) {
+					value.forEach((v) => reqHeaders.append(name, v));
+				} else {
+					reqHeaders.replace(name, value);
+				}
+			}
+		}
+		if (options?.handshakeTimeout) {
+			this._cancellable = new Gio.Cancellable();
+			const cancellable = this._cancellable;
+			this._handshakeTimer = setTimeout(() => {
+				this._handshakeTimedOut = true;
+				this._handshakeTimer = null;
+				cancellable.cancel();
+			}, options.handshakeTimeout);
+		}
+		this._session.websocket_connect_async(msg, options?.origin ?? null, this._protocols.length > 0 ? this._protocols : null, GLib.PRIORITY_DEFAULT, this._cancellable, (_self, asyncRes) => {
+			if (this._handshakeTimer !== null) {
+				clearTimeout(this._handshakeTimer);
+				this._handshakeTimer = null;
+			}
+			try {
+				this._connection = this._session.websocket_connect_finish(asyncRes);
+				this._connection.max_incoming_payload_size = 100 * 1024 * 1024;
+				this.readyState = OPEN;
+				this.protocol = this._connection.get_protocol() ?? "";
+				this.extensions = serializeExtensions(this._connection.get_extensions());
+				this._connection.connect("message", (_conn, type, message) => {
+					this._onMessage(type, message);
+				});
+				this._connection.connect("closed", () => {
+					this._onClosed();
+				});
+				this._connection.connect("error", (_conn, error) => {
+					this._onError(error);
+				});
+				const openEvent = new Event("open");
+				this.dispatchEvent(openEvent);
+				if (this.onopen) this.onopen.call(this, openEvent);
+			} catch (error) {
+				this.readyState = CLOSED;
+				const errorMessage = this._handshakeTimedOut ? "Opening handshake has timed out" : error instanceof Error ? error.message : String(error);
+				const err = new Error(errorMessage);
+				const errorEvent = new Event("error");
+				errorEvent.error = err;
+				errorEvent.message = errorMessage;
+				this.dispatchEvent(errorEvent);
+				if (this.onerror) this.onerror.call(this, errorEvent);
+				const closeEvent = new CloseEvent("close", {
+					code: 1006,
+					reason: errorMessage,
+					wasClean: false
+				});
+				this.dispatchEvent(closeEvent);
+				if (this.onclose) this.onclose.call(this, closeEvent);
+			}
+		});
+	}
+	_onMessage(type, message) {
+		let data;
+		if (type === Soup.WebsocketDataType.TEXT) {
+			const decoder = new TextDecoder();
+			data = decoder.decode(message.toArray());
+		} else {
+			const arr = message.toArray();
+			data = arr.buffer.slice(arr.byteOffset, arr.byteOffset + arr.byteLength);
+		}
+		const event = new MessageEvent("message", {
+			data,
+			origin: this.url
+		});
+		this.dispatchEvent(event);
+		if (this.onmessage) this.onmessage.call(this, event);
+	}
+	_onError(error) {
+		const event = new Event("error");
+		this.dispatchEvent(event);
+		if (this.onerror) this.onerror.call(this, event);
+	}
+	_onClosed() {
+		const code = this._connection?.get_close_code() ?? 1006;
+		const reason = this._connection?.get_close_data() ?? "";
+		const wasClean = code === 1e3;
+		this.readyState = CLOSED;
+		this._connection = null;
+		const event = new CloseEvent("close", {
+			code,
+			reason,
+			wasClean
+		});
+		this.dispatchEvent(event);
+		if (this.onclose) this.onclose.call(this, event);
+	}
+	/**
+	* Send data through the WebSocket connection.
+	*
+	* For strings, we intentionally route through `send_message(TEXT, bytes)`
+	* rather than the simpler `send_text(str)` API. Reason: `send_text()`
+	* takes a C `const char*` (null-terminated), so any embedded `\x00` in
+	* the JS string gets truncated at the first NUL at the GI boundary —
+	* Autobahn case 6.7.1 (single NUL in a text frame) was returned as an
+	* empty string. Going through `GLib.Bytes` preserves the exact byte
+	* sequence; Soup still sets the text-frame opcode because we pass
+	* `Soup.WebsocketDataType.TEXT` explicitly.
+	*/
+	send(data) {
+		if (this.readyState !== OPEN) {
+			throw new DOMException("WebSocket is not open", "InvalidStateError");
+		}
+		if (!this._connection) return;
+		if (typeof data === "string") {
+			const bytes = new TextEncoder().encode(data);
+			this._connection.send_message(Soup.WebsocketDataType.TEXT, new GLib.Bytes(bytes));
+		} else {
+			let bytes;
+			if (data instanceof ArrayBuffer) {
+				bytes = new Uint8Array(data);
+			} else {
+				bytes = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+			}
+			this._connection.send_message(Soup.WebsocketDataType.BINARY, new GLib.Bytes(bytes));
+		}
+	}
+	/**
+	* Close the WebSocket connection.
+	*/
+	close(code, reason) {
+		if (this.readyState === CLOSED || this.readyState === CLOSING) return;
+		if (code !== undefined && code !== 1e3 && (code < 3e3 || code > 4999)) {
+			throw new DOMException(`The code must be either 1000, or between 3000 and 4999. ${code} is neither.`, "InvalidAccessError");
+		}
+		this.readyState = CLOSING;
+		if (this._connection) {
+			this._connection.close(code ?? 1e3, reason ?? null);
+		} else {
+			this.readyState = CLOSED;
+			const event = new CloseEvent("close", {
+				code: 1006,
+				wasClean: false
+			});
+			this.dispatchEvent(event);
+			if (this.onclose) this.onclose.call(this, event);
+		}
+	}
 };
+
+//#endregion
+export { CloseEvent, MessageEvent, WebSocket, WebSocket as default };

package/lib/esm/register.js

@@ -1,10 +1,14 @@
-import { WebSocket, MessageEvent, CloseEvent } from "./index.js";
+import { CloseEvent, MessageEvent, WebSocket } from "./index.js";
+
+//#region src/register.ts
 if (typeof globalThis.WebSocket === "undefined") {
-  globalThis.WebSocket = WebSocket;
+	globalThis.WebSocket = WebSocket;
 }
 if (typeof globalThis.MessageEvent === "undefined") {
-  globalThis.MessageEvent = MessageEvent;
+	globalThis.MessageEvent = MessageEvent;
 }
 if (typeof globalThis.CloseEvent === "undefined") {
-  globalThis.CloseEvent = CloseEvent;
+	globalThis.CloseEvent = CloseEvent;
 }
+
+//#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/websocket",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "W3C WebSocket API for GJS using Soup 3.0",
   "type": "module",
   "module": "lib/esm/index.js",
@@ -38,16 +38,16 @@
     "soup"
   ],
   "devDependencies": {
-    "@gjsify/cli": "^0.3.13",
-    "@gjsify/unit": "^0.3.13",
+    "@gjsify/cli": "^0.3.15",
+    "@gjsify/unit": "^0.3.15",
     "@types/node": "^25.6.0",
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@girs/gio-2.0": "^2.88.0-4.0.0-rc.9",
-    "@girs/gjs": "^4.0.0-rc.9",
-    "@girs/glib-2.0": "^2.88.0-4.0.0-rc.9",
-    "@girs/soup-3.0": "^3.6.6-4.0.0-rc.9",
-    "@gjsify/dom-events": "^0.3.13"
+    "@girs/gio-2.0": "2.88.0-4.0.0-rc.9",
+    "@girs/gjs": "4.0.0-rc.9",
+    "@girs/glib-2.0": "2.88.0-4.0.0-rc.9",
+    "@girs/soup-3.0": "3.6.6-4.0.0-rc.9",
+    "@gjsify/dom-events": "^0.3.15"
   }
 }