@gjsify/ws 0.3.19 → 0.3.21

package/lib/esm/stream.js

@@ -1 +1 @@
-import{Duplex as e}from"node:stream";function t(e){e.emit(`close`)}function n(){!this.destroyed&&this._writableState.finished&&this.destroy()}function r(e){this.removeListener(`error`,r),this.destroy(),this.listenerCount(`error`)===0&&this.emit(`error`,e)}function i(i,a={}){let o=!0,s=new e({...a,autoDestroy:!1,emitClose:!1,objectMode:!1,writableObjectMode:!1});return i.on(`message`,(e,t)=>{let n;n=t||s.readableObjectMode?e:typeof e==`string`?Buffer.from(e):e,!s.push(n)&&typeof i.pause==`function`&&i.pause()}),i.once(`error`,e=>{s.destroyed||(o=!1,s.destroy(e))}),i.once(`close`,()=>{s.destroyed||s.push(null)}),s._destroy=function(e,n){if(i.readyState===i.CLOSED){n(e),process.nextTick(t,s);return}let r=!1;i.once(`error`,e=>{r=!0,n(e)}),i.once(`close`,()=>{r||n(e),process.nextTick(t,s)}),o&&i.terminate()},s._final=function(e){if(i.readyState===i.CONNECTING){i.once(`open`,()=>s._final(e));return}if(i.readyState===i.CLOSED||i.readyState===i.CLOSING){e();return}i.once(`close`,e),i.close()},s._read=function(){typeof i.resume==`function`&&i.resume()},s._write=function(e,t,n){if(i.readyState===i.CONNECTING){i.once(`open`,()=>s._write(e,t,n));return}i.send(e,n)},s.on(`end`,n),s.on(`error`,r),s}export{i as createWebSocketStream};
+import{Duplex as e}from"node:stream";function emitClose(e){e.emit(`close`)}function duplexOnEnd(){!this.destroyed&&this._writableState.finished&&this.destroy()}function duplexOnError(e){this.removeListener(`error`,duplexOnError),this.destroy(),this.listenerCount(`error`)===0&&this.emit(`error`,e)}function createWebSocketStream(t,n={}){let r=!0,i=new e({...n,autoDestroy:!1,emitClose:!1,objectMode:!1,writableObjectMode:!1});return t.on(`message`,(e,n)=>{let r;r=n||i.readableObjectMode?e:typeof e==`string`?Buffer.from(e):e,!i.push(r)&&typeof t.pause==`function`&&t.pause()}),t.once(`error`,e=>{i.destroyed||(r=!1,i.destroy(e))}),t.once(`close`,()=>{i.destroyed||i.push(null)}),i._destroy=function(e,n){if(t.readyState===t.CLOSED){n(e),process.nextTick(emitClose,i);return}let a=!1;t.once(`error`,e=>{a=!0,n(e)}),t.once(`close`,()=>{a||n(e),process.nextTick(emitClose,i)}),r&&t.terminate()},i._final=function(e){if(t.readyState===t.CONNECTING){t.once(`open`,()=>i._final(e));return}if(t.readyState===t.CLOSED||t.readyState===t.CLOSING){e();return}t.once(`close`,e),t.close()},i._read=function(){typeof t.resume==`function`&&t.resume()},i._write=function(e,n,r){if(t.readyState===t.CONNECTING){t.once(`open`,()=>i._write(e,n,r));return}t.send(e,r)},i.on(`end`,duplexOnEnd),i.on(`error`,duplexOnError),i}export{createWebSocketStream};

package/lib/esm/websocket-server.js

@@ -1,4 +1,4 @@
-import"./constants.js";import{EventEmitter as e}from"@gjsify/events";import{Buffer as t}from"@gjsify/buffer";import{createHash as n}from"@gjsify/crypto";import r from"@girs/soup-3.0";import i from"@girs/glib-2.0";import a from"@girs/gio-2.0";import{ensureMainLoop as o}from"@gjsify/utils";const s=/^[+/0-9A-Za-z]{22}==$/;var c=class extends e{static CONNECTING=0;static OPEN=1;static CLOSING=2;static CLOSED=3;CONNECTING=0;OPEN=1;CLOSING=2;CLOSED=3;readyState=1;protocol=``;extensions=``;url=``;_conn;constructor(e,n){super(),this._conn=e,this.url=n,e.connect(`message`,(e,n,i)=>{let a=i.get_data();if(n===r.WebsocketDataType.TEXT){let e=typeof a==`string`?a:a?new TextDecoder(`utf-8`).decode(a):``;this.emit(`message`,e,!1)}else{let e=a?t.from(a):t.alloc(0);this.emit(`message`,e,!0)}}),e.connect(`closed`,()=>{this.readyState=3;let n=e.get_close_code()||1005,r=e.get_close_data()||``;this.emit(`close`,n,t.from(r))}),e.connect(`error`,(e,t)=>{this.emit(`error`,Error(t.message))})}send(e,n,a){let o=typeof n==`function`?n:a;try{if(typeof e==`string`){let t=new TextEncoder().encode(e);this._conn.send_message(r.WebsocketDataType.TEXT,new i.Bytes(t))}else{let n;if(t.isBuffer(e)){let t=e;n=new i.Bytes(new Uint8Array(t.buffer,t.byteOffset,t.byteLength))}else if(e instanceof ArrayBuffer)n=new i.Bytes(new Uint8Array(e));else if(ArrayBuffer.isView(e)){let t=e;n=new i.Bytes(new Uint8Array(t.buffer,t.byteOffset,t.byteLength))}else throw TypeError(`Unsupported send() payload type`);this._conn.send_message(r.WebsocketDataType.BINARY,n)}o&&queueMicrotask(()=>o())}catch(e){let t=e instanceof Error?e:Error(String(e));queueMicrotask(o?()=>o(t):()=>this.emit(`error`,t))}}close(e,n){if(!(this.readyState===3||this.readyState===2)){this.readyState=2;try{let r=n===void 0?null:t.isBuffer(n)?n.toString(`utf8`):String(n);this._conn.close(e??1e3,r)}catch(e){this.emit(`error`,e instanceof Error?e:Error(String(e)))}}}terminate(){if(this.readyState!==3){this.readyState=2;try{this._conn.close(1006,null)}catch{}}}},l=class extends e{options;clients=new Set;path;_server=null;_address=null;constructor(e={},t){if(super(),this.options=e,this.path=e.path??`/`,e.noServer){if(e.port!==void 0||e.server!==void 0)throw Error(`ws.WebSocketServer: { noServer: true } is mutually exclusive with port and server.`);t&&this.once(`listening`,t);return}if(e.port===void 0&&!e.server)throw Error(`ws.WebSocketServer requires either options.port or options.server on Gjs.`);t&&this.once(`listening`,t),this._start(e)}_buildVerifyClientInfo(e){let t=e.get_request_headers(),n={};t.foreach((e,t)=>{let r=e.toLowerCase(),i=n[r];i===void 0?n[r]=t:Array.isArray(i)?i.push(t):n[r]=[i,t]});let r=e.get_uri(),i=r.get_path()??`/`,o=r.get_query(),s=o?`${i}?${o}`:i,c=e.get_remote_host()??`127.0.0.1`,l=e.get_remote_address(),u=l instanceof a.InetSocketAddress?l.get_port():0;return{origin:n.origin??``,secure:!1,req:{method:e.get_method(),url:s,headers:n,socket:{remoteAddress:c,remotePort:u}}}}_setupHandlers(e,t){if(t.verifyClient){let n=t.verifyClient;e.add_handler(this.path,(e,t)=>{if((t.get_request_headers().get_one(`Upgrade`)??``).toLowerCase()!==`websocket`)return;let r=this._buildVerifyClientInfo(t);n.length>=2?(t.pause(),n(r,(e,n=401)=>{e||t.set_status(n,null),t.unpause()})):n(r)||t.set_status(401,null)})}e.add_websocket_handler(this.path,null,null,(e,n,r,i)=>{let a=new c(i,n.get_uri()?.to_string()??this.path);if(t.handleProtocols){let e=n.get_request_headers().get_one(`Sec-WebSocket-Protocol`)??``,r=new Set(e.split(`,`).map(e=>e.trim()).filter(Boolean)),i=this._buildVerifyClientInfo(n).req,o=t.handleProtocols(r,i);o&&(a.protocol=o)}t.clientTracking!==!1&&(this.clients.add(a),a.on(`close`,()=>this.clients.delete(a))),this.emit(`connection`,a,n)})}_start(e){try{if(e.server){let t=e.server,n=t.soupServer;if(!n)throw Error(`options.server has no active Soup.Server. Ensure httpServer.listen() was called before creating WebSocketServer.`);this._server=n,this._setupHandlers(n,e),o();let r=t.address();r&&(this._address={address:r.address,family:r.family,port:r.port}),queueMicrotask(()=>this.emit(`listening`))}else{this._server=new r.Server({}),this._setupHandlers(this._server,e);let t=e.host??`0.0.0.0`,n=e.port;t===`127.0.0.1`||t===`localhost`?this._server.listen_local(n,r.ServerListenOptions.IPV4_ONLY):t===`::1`?this._server.listen_local(n,r.ServerListenOptions.IPV6_ONLY):this._server.listen_all(n,0);let i=this._server.get_listeners(),a=n;if(i&&i.length>0){let e=i[0].get_local_address();e&&typeof e.get_port==`function`&&(a=e.get_port())}o(),this._address={address:t,family:`IPv4`,port:a},queueMicrotask(()=>this.emit(`listening`))}}catch(e){queueMicrotask(()=>this.emit(`error`,e instanceof Error?e:Error(String(e))))}}address(){return this._address}close(e){try{for(let e of this.clients)e.close();this.clients.clear(),this.options.server||this._server?.disconnect(),this._server=null,this._address=null,this.emit(`close`),e&&queueMicrotask(()=>e())}catch(t){let n=t instanceof Error?t:Error(String(t));this.emit(`error`,n),e&&queueMicrotask(()=>e(n))}}handleUpgrade(e,t,n,r){if(!this._validateUpgradeHeaders(e,t))return;let i=e.headers?.[`sec-websocket-key`]??``,a=()=>this._completeUpgrade(e,t,i,r);if(this.options.verifyClient){let n=this.options.verifyClient,r=this._buildVerifyClientInfoFromReq(e);if(n.length>=2){n(r,(e,n=401)=>{if(!e){this._abortHandshake(t,n);return}a()});return}if(!n(r)){this._abortHandshake(t,401);return}}a()}shouldHandle(e){if(this.path===`/`)return!0;let t=e?.url??`/`;return t===this.path||t.startsWith(this.path+`?`)||t.startsWith(this.path+`/`)}_validateUpgradeHeaders(e,t){let n=e.headers??{};if(e.method!==`GET`)return this._abortHandshake(t,405),!1;if((n.upgrade??``).toLowerCase()!==`websocket`||!s.test(n[`sec-websocket-key`]??``))return this._abortHandshake(t,400),!1;let r=Number(n[`sec-websocket-version`]??`0`);return r!==13&&r!==8?(this._abortHandshake(t,426),!1):this.shouldHandle(e)?!0:(this._abortHandshake(t,400),!1)}_completeUpgrade(e,t,a,o){let s=[`HTTP/1.1 101 Switching Protocols`,`Upgrade: websocket`,`Connection: Upgrade`,`Sec-WebSocket-Accept: ${n(`sha1`).update(a+`258EAFA5-E914-47DA-95CA-C5AB0DC85B11`).digest(`base64`)}`],l=null;if(this.options.handleProtocols){let t=e.headers?.[`sec-websocket-protocol`]??``,n=new Set(t.split(`,`).map(e=>e.trim()).filter(Boolean)),r=this.options.handleProtocols(n,this._buildVerifyClientInfoFromReq(e).req);r&&(l=r,s.push(`Sec-WebSocket-Protocol: ${r}`))}this.emit(`headers`,s,e);let u=s.join(`\r
+import"./constants.js";import{EventEmitter as e}from"@gjsify/events";import{Buffer as t}from"@gjsify/buffer";import{createHash as n}from"@gjsify/crypto";import r from"@girs/soup-3.0";import i from"@girs/glib-2.0";import a from"@girs/gio-2.0";import{ensureMainLoop as o}from"@gjsify/utils";const s=/^[+/0-9A-Za-z]{22}==$/;var ServerSideWebSocket=class extends e{static CONNECTING=0;static OPEN=1;static CLOSING=2;static CLOSED=3;CONNECTING=0;OPEN=1;CLOSING=2;CLOSED=3;readyState=1;protocol=``;extensions=``;url=``;_conn;constructor(e,n){super(),this._conn=e,this.url=n,e.connect(`message`,(e,n,i)=>{let a=i.get_data();if(n===r.WebsocketDataType.TEXT){let e=typeof a==`string`?a:a?new TextDecoder(`utf-8`).decode(a):``;this.emit(`message`,e,!1)}else{let e=a?t.from(a):t.alloc(0);this.emit(`message`,e,!0)}}),e.connect(`closed`,()=>{this.readyState=3;let n=e.get_close_code()||1005,r=e.get_close_data()||``;this.emit(`close`,n,t.from(r))}),e.connect(`error`,(e,t)=>{this.emit(`error`,Error(t.message))})}send(e,n,a){let o=typeof n==`function`?n:a;try{if(typeof e==`string`){let t=new TextEncoder().encode(e);this._conn.send_message(r.WebsocketDataType.TEXT,new i.Bytes(t))}else{let n;if(t.isBuffer(e)){let t=e;n=new i.Bytes(new Uint8Array(t.buffer,t.byteOffset,t.byteLength))}else if(e instanceof ArrayBuffer)n=new i.Bytes(new Uint8Array(e));else if(ArrayBuffer.isView(e)){let t=e;n=new i.Bytes(new Uint8Array(t.buffer,t.byteOffset,t.byteLength))}else throw TypeError(`Unsupported send() payload type`);this._conn.send_message(r.WebsocketDataType.BINARY,n)}o&&queueMicrotask(()=>o())}catch(e){let t=e instanceof Error?e:Error(String(e));queueMicrotask(o?()=>o(t):()=>this.emit(`error`,t))}}close(e,n){if(!(this.readyState===3||this.readyState===2)){this.readyState=2;try{let r=n===void 0?null:t.isBuffer(n)?n.toString(`utf8`):String(n);this._conn.close(e??1e3,r)}catch(e){this.emit(`error`,e instanceof Error?e:Error(String(e)))}}}terminate(){if(this.readyState!==3){this.readyState=2;try{this._conn.close(1006,null)}catch{}}}},WebSocketServer=class extends e{options;clients=new Set;path;_server=null;_address=null;constructor(e={},t){if(super(),this.options=e,this.path=e.path??`/`,e.noServer){if(e.port!==void 0||e.server!==void 0)throw Error(`ws.WebSocketServer: { noServer: true } is mutually exclusive with port and server.`);t&&this.once(`listening`,t);return}if(e.port===void 0&&!e.server)throw Error(`ws.WebSocketServer requires either options.port or options.server on Gjs.`);t&&this.once(`listening`,t),this._start(e)}_buildVerifyClientInfo(e){let t=e.get_request_headers(),n={};t.foreach((e,t)=>{let r=e.toLowerCase(),i=n[r];i===void 0?n[r]=t:Array.isArray(i)?i.push(t):n[r]=[i,t]});let r=e.get_uri(),i=r.get_path()??`/`,o=r.get_query(),s=o?`${i}?${o}`:i,c=e.get_remote_host()??`127.0.0.1`,l=e.get_remote_address(),u=l instanceof a.InetSocketAddress?l.get_port():0;return{origin:n.origin??``,secure:!1,req:{method:e.get_method(),url:s,headers:n,socket:{remoteAddress:c,remotePort:u}}}}_setupHandlers(e,t){if(t.verifyClient){let n=t.verifyClient;e.add_handler(this.path,(e,t)=>{if((t.get_request_headers().get_one(`Upgrade`)??``).toLowerCase()!==`websocket`)return;let r=this._buildVerifyClientInfo(t);n.length>=2?(t.pause(),n(r,(e,n=401)=>{e||t.set_status(n,null),t.unpause()})):n(r)||t.set_status(401,null)})}e.add_websocket_handler(this.path,null,null,(e,n,r,i)=>{let a=new ServerSideWebSocket(i,n.get_uri()?.to_string()??this.path);if(t.handleProtocols){let e=n.get_request_headers().get_one(`Sec-WebSocket-Protocol`)??``,r=new Set(e.split(`,`).map(e=>e.trim()).filter(Boolean)),i=this._buildVerifyClientInfo(n).req,o=t.handleProtocols(r,i);o&&(a.protocol=o)}t.clientTracking!==!1&&(this.clients.add(a),a.on(`close`,()=>this.clients.delete(a))),this.emit(`connection`,a,n)})}_start(e){try{if(e.server){let t=e.server,n=t.soupServer;if(!n)throw Error(`options.server has no active Soup.Server. Ensure httpServer.listen() was called before creating WebSocketServer.`);this._server=n,this._setupHandlers(n,e),o();let r=t.address();r&&(this._address={address:r.address,family:r.family,port:r.port}),queueMicrotask(()=>this.emit(`listening`))}else{this._server=new r.Server({}),this._setupHandlers(this._server,e);let t=e.host??`0.0.0.0`,n=e.port;t===`127.0.0.1`||t===`localhost`?this._server.listen_local(n,r.ServerListenOptions.IPV4_ONLY):t===`::1`?this._server.listen_local(n,r.ServerListenOptions.IPV6_ONLY):this._server.listen_all(n,0);let i=this._server.get_listeners(),a=n;if(i&&i.length>0){let e=i[0].get_local_address();e&&typeof e.get_port==`function`&&(a=e.get_port())}o(),this._address={address:t,family:`IPv4`,port:a},queueMicrotask(()=>this.emit(`listening`))}}catch(e){queueMicrotask(()=>this.emit(`error`,e instanceof Error?e:Error(String(e))))}}address(){return this._address}close(e){try{for(let e of this.clients)e.close();this.clients.clear(),this.options.server||this._server?.disconnect(),this._server=null,this._address=null,this.emit(`close`),e&&queueMicrotask(()=>e())}catch(t){let n=t instanceof Error?t:Error(String(t));this.emit(`error`,n),e&&queueMicrotask(()=>e(n))}}handleUpgrade(e,t,n,r){if(!this._validateUpgradeHeaders(e,t))return;let i=e.headers?.[`sec-websocket-key`]??``,doUpgrade=()=>this._completeUpgrade(e,t,i,r);if(this.options.verifyClient){let n=this.options.verifyClient,r=this._buildVerifyClientInfoFromReq(e);if(n.length>=2){n(r,(e,n=401)=>{if(!e){this._abortHandshake(t,n);return}doUpgrade()});return}if(!n(r)){this._abortHandshake(t,401);return}}doUpgrade()}shouldHandle(e){if(this.path===`/`)return!0;let t=e?.url??`/`;return t===this.path||t.startsWith(this.path+`?`)||t.startsWith(this.path+`/`)}_validateUpgradeHeaders(e,t){let n=e.headers??{};if(e.method!==`GET`)return this._abortHandshake(t,405),!1;if((n.upgrade??``).toLowerCase()!==`websocket`||!s.test(n[`sec-websocket-key`]??``))return this._abortHandshake(t,400),!1;let r=Number(n[`sec-websocket-version`]??`0`);return r!==13&&r!==8?(this._abortHandshake(t,426),!1):this.shouldHandle(e)?!0:(this._abortHandshake(t,400),!1)}_completeUpgrade(e,t,a,o){let s=[`HTTP/1.1 101 Switching Protocols`,`Upgrade: websocket`,`Connection: Upgrade`,`Sec-WebSocket-Accept: ${n(`sha1`).update(a+`258EAFA5-E914-47DA-95CA-C5AB0DC85B11`).digest(`base64`)}`],c=null;if(this.options.handleProtocols){let t=e.headers?.[`sec-websocket-protocol`]??``,n=new Set(t.split(`,`).map(e=>e.trim()).filter(Boolean)),r=this.options.handleProtocols(n,this._buildVerifyClientInfoFromReq(e).req);r&&(c=r,s.push(`Sec-WebSocket-Protocol: ${r}`))}this.emit(`headers`,s,e);let l=s.join(`\r
 `)+`\r
 \r
-`;t.write(u,()=>{let n=typeof t._releaseIOStream==`function`?t._releaseIOStream():null;if(!n){t.destroy?.();return}let a=e.url??`/`,s=i.Uri.parse(`ws://localhost${a}`,i.UriFlags.NONE),u=new c(r.WebsocketConnection.new(n,s,r.WebsocketConnectionType.SERVER,null,l,[]),a);l&&(u.protocol=l),this.options.clientTracking!==!1&&(this.clients.add(u),u.on(`close`,()=>this.clients.delete(u))),o(u,e)})}_abortHandshake(e,t){let n={400:`Bad Request`,401:`Unauthorized`,403:`Forbidden`,405:`Method Not Allowed`,426:`Upgrade Required`}[t]??`Error`;e.write?.(`HTTP/1.1 ${t} ${n}\r\nContent-Length: 0\r\nConnection: close\r\n\r\n`,()=>{e.destroy?.()})}_buildVerifyClientInfoFromReq(e){let t=e.headers??{};return{origin:t.origin??``,secure:!1,req:{method:e.method??`GET`,url:e.url??`/`,headers:t,socket:{remoteAddress:e.socket?.remoteAddress??`127.0.0.1`,remotePort:e.socket?.remotePort??0}}}}};export{l as WebSocketServer};
+`;t.write(l,()=>{let n=typeof t._releaseIOStream==`function`?t._releaseIOStream():null;if(!n){t.destroy?.();return}let a=e.url??`/`,s=i.Uri.parse(`ws://localhost${a}`,i.UriFlags.NONE),l=new ServerSideWebSocket(r.WebsocketConnection.new(n,s,r.WebsocketConnectionType.SERVER,null,c,[]),a);c&&(l.protocol=c),this.options.clientTracking!==!1&&(this.clients.add(l),l.on(`close`,()=>this.clients.delete(l))),o(l,e)})}_abortHandshake(e,t){let n={400:`Bad Request`,401:`Unauthorized`,403:`Forbidden`,405:`Method Not Allowed`,426:`Upgrade Required`}[t]??`Error`;e.write?.(`HTTP/1.1 ${t} ${n}\r\nContent-Length: 0\r\nConnection: close\r\n\r\n`,()=>{e.destroy?.()})}_buildVerifyClientInfoFromReq(e){let t=e.headers??{};return{origin:t.origin??``,secure:!1,req:{method:e.method??`GET`,url:e.url??`/`,headers:t,socket:{remoteAddress:e.socket?.remoteAddress??`127.0.0.1`,remotePort:e.socket?.remotePort??0}}}}};export{WebSocketServer};

package/lib/esm/websocket.js

@@ -1 +1 @@
-import{BINARY_TYPES as e}from"./constants.js";import{EventEmitter as t}from"@gjsify/events";import{Buffer as n}from"@gjsify/buffer";import{WebSocket as r}from"@gjsify/websocket";var i=class extends t{static CONNECTING=0;static OPEN=1;static CLOSING=2;static CLOSED=3;CONNECTING=0;OPEN=1;CLOSING=2;CLOSED=3;readyState=0;url=``;protocol=``;extensions=``;bufferedAmount=0;binaryType=`nodebuffer`;_native=null;constructor(e,t,n={}){if(super(),e===null){queueMicrotask(()=>this._fail(`Constructing ws.WebSocket with null address is not supported on Gjs`));return}this.url=typeof e==`string`?e:String(e);let r=this._resolveProtocols(t,n);this._openNative(this.url,r,n)}_resolveProtocols(e,t){if(e!==void 0)return Array.isArray(e)?e:[e];if(t.protocols!==void 0)return Array.isArray(t.protocols)?t.protocols:[t.protocols];if(t.protocol!==void 0)return[t.protocol]}_openNative(e,t,n){if(typeof r!=`function`){queueMicrotask(()=>this._fail("@gjsify/websocket provided no WebSocket constructor. On Node.js 22+ globalThis.WebSocket is native; on older Node install `ws` directly, or ensure globalThis.WebSocket is set before @gjsify/ws is imported."));return}let i={perMessageDeflate:n.perMessageDeflate!==!1,headers:n.headers,origin:n.origin,handshakeTimeout:n.handshakeTimeout};try{this._native=new r(e,t,i)}catch(e){queueMicrotask(()=>this._fail(e instanceof Error?e:Error(String(e))));return}this._native.binaryType=`arraybuffer`,this._native.addEventListener(`open`,()=>this._onOpen()),this._native.addEventListener(`message`,e=>this._onMessage(e)),this._native.addEventListener(`close`,e=>this._onClose(e)),this._native.addEventListener(`error`,e=>this._onError(e))}_fail(e){let t=typeof e==`string`?Error(e):e;this.readyState=3,this.emit(`error`,t),this._dispatchEvent(`error`,{error:t,message:t.message}),this.emit(`close`,1006,n.from(t.message)),this._dispatchEvent(`close`,{code:1006,reason:t.message,wasClean:!1})}_onOpen(){this.readyState=1,typeof this._native.protocol==`string`&&(this.protocol=this._native.protocol),typeof this._native.extensions==`string`&&(this.extensions=this._native.extensions),this.emit(`open`),this._dispatchEvent(`open`,{})}_onMessage(e){let t=e?.data,n,r=!1;typeof t==`string`?(n=t,r=!1):t instanceof ArrayBuffer?(r=!0,n=this._decodeBinary(t)):ArrayBuffer.isView(t)?(r=!0,n=this._decodeBinary(t.buffer)):(n=t,r=!1),this.emit(`message`,n,r),this._dispatchEvent(`message`,{data:n,type:r?`binary`:`text`})}_decodeBinary(e){switch(this.binaryType){case`arraybuffer`:return e;case`fragments`:return[n.from(e)];case`blob`:{let t=globalThis.Blob;return t?new t([new Uint8Array(e)]):n.from(e)}default:return n.from(e)}}_onClose(e){let t=typeof e?.code==`number`?e.code:1006,r=typeof e?.reason==`string`?e.reason:``;this.readyState=3,this.emit(`close`,t,n.from(r)),this._dispatchEvent(`close`,{code:t,reason:r,wasClean:!!e?.wasClean})}_onError(e){let t=e?.message||`WebSocket error`,n=e?.error instanceof Error?e.error:Error(t);this.emit(`error`,n),this._dispatchEvent(`error`,{error:n,message:t})}send(e,t,n){let r=typeof t==`function`?t:n;if(this.readyState===0)throw Error(`WebSocket is not open: readyState 0 (CONNECTING)`);if(this.readyState!==1){let e=Error(`WebSocket is not open: readyState `+this.readyState);queueMicrotask(r?()=>r(e):()=>this.emit(`error`,e));return}this._nativeSend(e,r)}_nativeSend(e,t){try{let r=e;if(typeof e==`number`||typeof e==`boolean`)r=String(e);else if(n.isBuffer(e)){let t=e;r=t.buffer.slice(t.byteOffset,t.byteOffset+t.byteLength)}this._native.send(r),t&&queueMicrotask(()=>t())}catch(e){let n=e instanceof Error?e:Error(String(e));queueMicrotask(t?()=>t(n):()=>this.emit(`error`,n))}}_sizeOf(e){return typeof e==`string`?e.length:e instanceof ArrayBuffer||ArrayBuffer.isView(e)?e.byteLength:0}close(e,t){if(this.readyState!==3&&this.readyState!==2){this.readyState=2;try{let r=t===void 0?void 0:n.isBuffer(t)?t.toString(`utf8`):String(t);e===void 0?this._native?.close():r===void 0?this._native?.close(e):this._native?.close(e,r)}catch(e){this.emit(`error`,e instanceof Error?e:Error(String(e)))}}}terminate(){if(this.readyState!==3){this.readyState=2;try{this._native?.close(1006,`terminated`)}catch{}}}get isPaused(){return this.readyState===2||this.readyState===3}_eventTargetListeners=new Map;addEventListener(e,t){let n=this._eventTargetListeners.get(e);n||(n=new Set,this._eventTargetListeners.set(e,n)),n.add(t)}removeEventListener(e,t){this._eventTargetListeners.get(e)?.delete(t)}_dispatchEvent(e,t){let n=this._eventTargetListeners.get(e);if(!n||n.size===0)return;let r=Object.assign({type:e,target:this},t);for(let e of n)try{e(r)}catch(e){queueMicrotask(()=>this.emit(`error`,e))}}static get BINARY_TYPES(){return e}};i.WebSocket=i;export{i as WebSocket};
+import{BINARY_TYPES as e}from"./constants.js";import{EventEmitter as t}from"@gjsify/events";import{Buffer as n}from"@gjsify/buffer";import{WebSocket as r}from"@gjsify/websocket";var WebSocket=class extends t{static CONNECTING=0;static OPEN=1;static CLOSING=2;static CLOSED=3;CONNECTING=0;OPEN=1;CLOSING=2;CLOSED=3;readyState=0;url=``;protocol=``;extensions=``;bufferedAmount=0;binaryType=`nodebuffer`;_native=null;constructor(e,t,n={}){if(super(),e===null){queueMicrotask(()=>this._fail(`Constructing ws.WebSocket with null address is not supported on Gjs`));return}this.url=typeof e==`string`?e:String(e);let r=this._resolveProtocols(t,n);this._openNative(this.url,r,n)}_resolveProtocols(e,t){if(e!==void 0)return Array.isArray(e)?e:[e];if(t.protocols!==void 0)return Array.isArray(t.protocols)?t.protocols:[t.protocols];if(t.protocol!==void 0)return[t.protocol]}_openNative(e,t,n){if(typeof r!=`function`){queueMicrotask(()=>this._fail("@gjsify/websocket provided no WebSocket constructor. On Node.js 22+ globalThis.WebSocket is native; on older Node install `ws` directly, or ensure globalThis.WebSocket is set before @gjsify/ws is imported."));return}let i={perMessageDeflate:n.perMessageDeflate!==!1,headers:n.headers,origin:n.origin,handshakeTimeout:n.handshakeTimeout};try{this._native=new r(e,t,i)}catch(e){queueMicrotask(()=>this._fail(e instanceof Error?e:Error(String(e))));return}this._native.binaryType=`arraybuffer`,this._native.addEventListener(`open`,()=>this._onOpen()),this._native.addEventListener(`message`,e=>this._onMessage(e)),this._native.addEventListener(`close`,e=>this._onClose(e)),this._native.addEventListener(`error`,e=>this._onError(e))}_fail(e){let t=typeof e==`string`?Error(e):e;this.readyState=3,this.emit(`error`,t),this._dispatchEvent(`error`,{error:t,message:t.message}),this.emit(`close`,1006,n.from(t.message)),this._dispatchEvent(`close`,{code:1006,reason:t.message,wasClean:!1})}_onOpen(){this.readyState=1,typeof this._native.protocol==`string`&&(this.protocol=this._native.protocol),typeof this._native.extensions==`string`&&(this.extensions=this._native.extensions),this.emit(`open`),this._dispatchEvent(`open`,{})}_onMessage(e){let t=e?.data,n,r=!1;typeof t==`string`?(n=t,r=!1):t instanceof ArrayBuffer?(r=!0,n=this._decodeBinary(t)):ArrayBuffer.isView(t)?(r=!0,n=this._decodeBinary(t.buffer)):(n=t,r=!1),this.emit(`message`,n,r),this._dispatchEvent(`message`,{data:n,type:r?`binary`:`text`})}_decodeBinary(e){switch(this.binaryType){case`arraybuffer`:return e;case`fragments`:return[n.from(e)];case`blob`:{let t=globalThis.Blob;return t?new t([new Uint8Array(e)]):n.from(e)}default:return n.from(e)}}_onClose(e){let t=typeof e?.code==`number`?e.code:1006,r=typeof e?.reason==`string`?e.reason:``;this.readyState=3,this.emit(`close`,t,n.from(r)),this._dispatchEvent(`close`,{code:t,reason:r,wasClean:!!e?.wasClean})}_onError(e){let t=e?.message||`WebSocket error`,n=e?.error instanceof Error?e.error:Error(t);this.emit(`error`,n),this._dispatchEvent(`error`,{error:n,message:t})}send(e,t,n){let r=typeof t==`function`?t:n;if(this.readyState===0)throw Error(`WebSocket is not open: readyState 0 (CONNECTING)`);if(this.readyState!==1){let e=Error(`WebSocket is not open: readyState `+this.readyState);queueMicrotask(r?()=>r(e):()=>this.emit(`error`,e));return}this._nativeSend(e,r)}_nativeSend(e,t){try{let r=e;if(typeof e==`number`||typeof e==`boolean`)r=String(e);else if(n.isBuffer(e)){let t=e;r=t.buffer.slice(t.byteOffset,t.byteOffset+t.byteLength)}this._native.send(r),t&&queueMicrotask(()=>t())}catch(e){let n=e instanceof Error?e:Error(String(e));queueMicrotask(t?()=>t(n):()=>this.emit(`error`,n))}}_sizeOf(e){return typeof e==`string`?e.length:e instanceof ArrayBuffer||ArrayBuffer.isView(e)?e.byteLength:0}close(e,t){if(this.readyState!==3&&this.readyState!==2){this.readyState=2;try{let r=t===void 0?void 0:n.isBuffer(t)?t.toString(`utf8`):String(t);e===void 0?this._native?.close():r===void 0?this._native?.close(e):this._native?.close(e,r)}catch(e){this.emit(`error`,e instanceof Error?e:Error(String(e)))}}}terminate(){if(this.readyState!==3){this.readyState=2;try{this._native?.close(1006,`terminated`)}catch{}}}get isPaused(){return this.readyState===2||this.readyState===3}_eventTargetListeners=new Map;addEventListener(e,t){let n=this._eventTargetListeners.get(e);n||(n=new Set,this._eventTargetListeners.set(e,n)),n.add(t)}removeEventListener(e,t){this._eventTargetListeners.get(e)?.delete(t)}_dispatchEvent(e,t){let n=this._eventTargetListeners.get(e);if(!n||n.size===0)return;let r=Object.assign({type:e,target:this},t);for(let e of n)try{e(r)}catch(e){queueMicrotask(()=>this.emit(`error`,e))}}static get BINARY_TYPES(){return e}};WebSocket.WebSocket=WebSocket;export{WebSocket};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/ws",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "description": "Drop-in replacement for the `ws` npm package on Gjs — wraps globalThis.WebSocket (Soup.WebsocketConnection) and Soup.Server for the WebSocketServer side",
   "type": "module",
   "module": "lib/esm/index.js",
@@ -34,15 +34,15 @@
     "@girs/gio-2.0": "2.88.0-4.0.0-rc.14",
     "@girs/glib-2.0": "2.88.0-4.0.0-rc.14",
     "@girs/soup-3.0": "3.6.6-4.0.0-rc.14",
-    "@gjsify/buffer": "^0.3.19",
-    "@gjsify/crypto": "^0.3.19",
-    "@gjsify/events": "^0.3.19",
-    "@gjsify/utils": "^0.3.19",
-    "@gjsify/websocket": "^0.3.19"
+    "@gjsify/buffer": "^0.3.21",
+    "@gjsify/crypto": "^0.3.21",
+    "@gjsify/events": "^0.3.21",
+    "@gjsify/utils": "^0.3.21",
+    "@gjsify/websocket": "^0.3.21"
   },
   "devDependencies": {
-    "@gjsify/cli": "^0.3.19",
-    "@gjsify/unit": "^0.3.19",
+    "@gjsify/cli": "^0.3.21",
+    "@gjsify/unit": "^0.3.21",
     "@types/node": "^25.6.2",
     "typescript": "^6.0.3"
   }