@gjsify/net 0.3.13 → 0.3.15

package/lib/esm/socket.js

@@ -3,380 +3,354 @@ import GLib from "@girs/glib-2.0";
 import { Duplex } from "node:stream";
 import { Buffer } from "node:buffer";
 import { createNodeError, gbytesToUint8Array } from "@gjsify/utils";
-class Socket extends Duplex {
-  // Public properties matching Node.js net.Socket
-  remoteAddress;
-  remotePort;
-  remoteFamily;
-  localAddress;
-  localPort;
-  bytesRead = 0;
-  bytesWritten = 0;
-  connecting = false;
-  destroyed = false;
-  pending = true;
-  readyState = "closed";
-  _connection = null;
-  _ioStream = null;
-  _inputStream = null;
-  _outputStream = null;
-  _cancellable = new Gio.Cancellable();
-  _reading = false;
-  _timeout = 0;
-  _timeoutId = null;
-  constructor(options) {
-    super(options);
-    this.allowHalfOpen = options?.allowHalfOpen ?? false;
-  }
-  /** @internal Set the connection from an accepted server socket. */
-  _setConnection(connection) {
-    this._connection = connection;
-  }
-  /**
-   * @internal Set up this socket from a raw Gio.IOStream (e.g., stolen from Soup.Server
-   * during an HTTP upgrade). Extracts I/O streams, attempts to read address info
-   * if the underlying stream is a SocketConnection, and starts reading.
-   */
-  _setupFromIOStream(ioStream) {
-    this._ioStream = ioStream;
-    try {
-      const sockConn = ioStream;
-      if (typeof sockConn.get_socket === "function") {
-        this._connection = sockConn;
-        const remoteAddr = sockConn.get_remote_address();
-        this.remoteAddress = remoteAddr.get_address().to_string();
-        this.remotePort = remoteAddr.get_port();
-        this.remoteFamily = remoteAddr.get_address().get_family() === Gio.SocketFamily.IPV6 ? "IPv6" : "IPv4";
-        const localAddr = sockConn.get_local_address();
-        this.localAddress = localAddr.get_address().to_string();
-        this.localPort = localAddr.get_port();
-      }
-    } catch {
-    }
-    this._inputStream = ioStream.get_input_stream();
-    this._outputStream = ioStream.get_output_stream();
-    this.connecting = false;
-    this.pending = false;
-    this.readyState = "open";
-    this.emit("connect");
-    this.emit("ready");
-    this._startReading();
-  }
-  /**
-   * @internal For HTTP upgrade handoff: configures write capability and address
-   * info from the IOStream but does NOT start the async read loop. Used by
-   * http.Server._handleRequest so handleUpgrade() can write the 101 response and
-   * then hand the IOStream to Soup.WebsocketConnection without a read-loop race.
-   */
-  _attachOutputOnly(ioStream) {
-    this._ioStream = ioStream;
-    try {
-      const sockConn = ioStream;
-      if (typeof sockConn.get_socket === "function") {
-        this._connection = sockConn;
-        const remoteAddr = sockConn.get_remote_address();
-        this.remoteAddress = remoteAddr.get_address().to_string();
-        this.remotePort = remoteAddr.get_port();
-        this.remoteFamily = remoteAddr.get_address().get_family() === Gio.SocketFamily.IPV6 ? "IPv6" : "IPv4";
-        const localAddr = sockConn.get_local_address();
-        this.localAddress = localAddr.get_address().to_string();
-        this.localPort = localAddr.get_port();
-      }
-    } catch {
-    }
-    this._inputStream = ioStream.get_input_stream();
-    this._outputStream = ioStream.get_output_stream();
-    this.connecting = false;
-    this.pending = false;
-    this.readyState = "open";
-    this.emit("connect");
-    this.emit("ready");
-  }
-  /** Release IOStream ownership to the caller (Soup.WebsocketConnection handoff).
-   *  Nullifies the socket's stream references so they are not closed when the
-   *  socket itself is later destroyed. */
-  _releaseIOStream() {
-    const s = this._ioStream;
-    this._ioStream = null;
-    this._inputStream = null;
-    this._outputStream = null;
-    this._connection = null;
-    return s;
-  }
-  connect(options, host, connectionListener) {
-    let opts;
-    if (typeof options === "number") {
-      opts = { port: options, host: typeof host === "string" ? host : "localhost" };
-      if (typeof host === "function") connectionListener = host;
-    } else {
-      opts = options;
-      if (typeof host === "function") connectionListener = host;
-    }
-    if (connectionListener) {
-      this.once("connect", connectionListener);
-    }
-    this.connecting = true;
-    this.readyState = "opening";
-    this.pending = true;
-    const targetHost = opts.host || "localhost";
-    const targetPort = opts.port;
-    const client = new Gio.SocketClient();
-    if (opts.timeout) {
-      client.set_timeout(Math.ceil(opts.timeout / 1e3));
-    }
-    client.connect_to_host_async(
-      targetHost,
-      targetPort,
-      this._cancellable,
-      (_source, asyncResult) => {
-        try {
-          this._connection = client.connect_to_host_finish(asyncResult);
-          this._setupConnection(opts);
-        } catch (err) {
-          this.connecting = false;
-          this.readyState = "closed";
-          const nodeErr = createNodeError(err, "connect", {
-            address: targetHost,
-            port: targetPort
-          });
-          this.destroy(nodeErr);
-        }
-      }
-    );
-    return this;
-  }
-  /** @internal Set up streams and emit connect after connection is established. */
-  _setupConnection(opts) {
-    if (!this._connection) return;
-    const sock = this._connection.get_socket();
-    this._inputStream = this._connection.get_input_stream();
-    this._outputStream = this._connection.get_output_stream();
-    if ("keepAlive" in opts && opts.keepAlive) {
-      sock.set_keepalive(true);
-    }
-    if (!("noDelay" in opts) || opts.noDelay !== false) {
-      try {
-        sock.set_option(6, 1, 1);
-      } catch {
-      }
-    }
-    try {
-      const remoteAddr = this._connection.get_remote_address();
-      this.remoteAddress = remoteAddr.get_address().to_string();
-      this.remotePort = remoteAddr.get_port();
-      this.remoteFamily = remoteAddr.get_address().get_family() === Gio.SocketFamily.IPV6 ? "IPv6" : "IPv4";
-    } catch {
-    }
-    try {
-      const localAddr = this._connection.get_local_address();
-      this.localAddress = localAddr.get_address().to_string();
-      this.localPort = localAddr.get_port();
-    } catch {
-    }
-    this.connecting = false;
-    this.pending = false;
-    this.readyState = "open";
-    this.emit("connect");
-    this.emit("ready");
-    this._startReading();
-  }
-  _startReading() {
-    if (this._reading || !this._inputStream) return;
-    this._reading = true;
-    this._readLoop();
-  }
-  async _readLoop() {
-    const inputStream = this._inputStream;
-    if (!inputStream) return;
-    const CHUNK_SIZE = 16384;
-    try {
-      while (this._reading && inputStream) {
-        const bytes = await new Promise((resolve, reject) => {
-          inputStream.read_bytes_async(
-            CHUNK_SIZE,
-            GLib.PRIORITY_DEFAULT,
-            this._cancellable,
-            (_source, asyncResult) => {
-              try {
-                resolve(inputStream.read_bytes_finish(asyncResult));
-              } catch (err) {
-                reject(err);
-              }
-            }
-          );
-        });
-        if (!bytes || bytes.get_size() === 0) {
-          this._reading = false;
-          if (!this.allowHalfOpen) {
-            this.once("end", () => {
-              this.end();
-              this.readyState = "closed";
-            });
-          } else {
-            this.readyState = this.writable ? "writeOnly" : "closed";
-          }
-          this.push(null);
-          break;
-        }
-        const data = gbytesToUint8Array(bytes);
-        this.bytesRead += data.length;
-        this._resetTimeout();
-        if (!this.push(Buffer.from(data))) {
-          this._reading = false;
-          break;
-        }
-      }
-    } catch (err) {
-      if (!this._cancellable.is_cancelled()) {
-        this.destroy(createNodeError(err, "read", { address: this.remoteAddress }));
-      }
-    }
-  }
-  // Duplex stream interface
-  _read(_size) {
-    if (!this._reading && this._inputStream) {
-      this._startReading();
-    }
-  }
-  _write(chunk, encoding, callback) {
-    if (!this._outputStream) {
-      callback(new Error("Socket is not connected"));
-      return;
-    }
-    const data = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, encoding);
-    this._outputStream.write_bytes_async(
-      new GLib.Bytes(data),
-      GLib.PRIORITY_DEFAULT,
-      this._cancellable,
-      (_source, asyncResult) => {
-        try {
-          const written = this._outputStream.write_bytes_finish(asyncResult);
-          this.bytesWritten += written;
-          this._resetTimeout();
-          callback(null);
-        } catch (err) {
-          callback(createNodeError(err, "write", { address: this.remoteAddress }));
-        }
-      }
-    );
-  }
-  _final(callback) {
-    if (this._connection) {
-      try {
-        this._connection.get_socket().shutdown(false, true);
-        this.readyState = this.readable ? "readOnly" : "closed";
-      } catch {
-      }
-    } else if (this._ioStream) {
-      try {
-        this._ioStream.close(null);
-        this.readyState = "closed";
-      } catch {
-      }
-      this._ioStream = null;
-      this._inputStream = null;
-      this._outputStream = null;
-    }
-    callback();
-  }
-  _destroy(err, callback) {
-    this._reading = false;
-    this._clearTimeout();
-    this._cancellable.cancel();
-    if (this._connection) {
-      try {
-        this._connection.close(null);
-      } catch {
-      }
-      this._connection = null;
-    } else if (this._ioStream) {
-      try {
-        this._ioStream.close(null);
-      } catch {
-      }
-    }
-    this._ioStream = null;
-    this._inputStream = null;
-    this._outputStream = null;
-    this.readyState = "closed";
-    this.destroyed = true;
-    callback(err);
-  }
-  /** Set the socket timeout in milliseconds. 0 disables. */
-  setTimeout(timeout, callback) {
-    this._timeout = timeout;
-    this._clearTimeout();
-    if (callback) {
-      this.once("timeout", callback);
-    }
-    if (timeout > 0) {
-      this._resetTimeout();
-    }
-    return this;
-  }
-  _resetTimeout() {
-    this._clearTimeout();
-    if (this._timeout > 0) {
-      this._timeoutId = setTimeout(() => {
-        this.emit("timeout");
-      }, this._timeout);
-    }
-  }
-  _clearTimeout() {
-    if (this._timeoutId !== null) {
-      clearTimeout(this._timeoutId);
-      this._timeoutId = null;
-    }
-  }
-  /** Enable/disable TCP keep-alive. */
-  setKeepAlive(enable, _initialDelay) {
-    if (this._connection) {
-      try {
-        this._connection.get_socket().set_keepalive(enable ?? false);
-      } catch {
-      }
-    }
-    return this;
-  }
-  /** Enable/disable TCP_NODELAY (disable Nagle algorithm). */
-  setNoDelay(noDelay) {
-    if (this._connection) {
-      try {
-        this._connection.get_socket().set_option(6, 1, noDelay !== false ? 1 : 0);
-      } catch {
-      }
-    }
-    return this;
-  }
-  /** Half-close then destroy: end() if writable, destroy() once finished. */
-  destroySoon() {
-    if (this.writable)
-      this.end();
-    if (this.writableFinished)
-      this.destroy();
-    else
-      this.once("finish", this.destroy.bind(this));
-  }
-  /** Get the underlying socket address info. */
-  address() {
-    if (this.localAddress && this.localPort) {
-      return {
-        port: this.localPort,
-        family: this.remoteFamily || "IPv4",
-        address: this.localAddress
-      };
-    }
-    return {};
-  }
-  /** Reference this socket (keep event loop alive). No-op in GJS. */
-  ref() {
-    return this;
-  }
-  /** Unreference this socket. No-op in GJS. */
-  unref() {
-    return this;
-  }
-}
-export {
-  Socket
+
+//#region src/socket.ts
+var Socket = class extends Duplex {
+	remoteAddress;
+	remotePort;
+	remoteFamily;
+	localAddress;
+	localPort;
+	bytesRead = 0;
+	bytesWritten = 0;
+	connecting = false;
+	destroyed = false;
+	pending = true;
+	readyState = "closed";
+	_connection = null;
+	_ioStream = null;
+	_inputStream = null;
+	_outputStream = null;
+	_cancellable = new Gio.Cancellable();
+	_reading = false;
+	_timeout = 0;
+	_timeoutId = null;
+	constructor(options) {
+		super(options);
+		this.allowHalfOpen = options?.allowHalfOpen ?? false;
+	}
+	/** @internal Set the connection from an accepted server socket. */
+	_setConnection(connection) {
+		this._connection = connection;
+	}
+	/**
+	* @internal Set up this socket from a raw Gio.IOStream (e.g., stolen from Soup.Server
+	* during an HTTP upgrade). Extracts I/O streams, attempts to read address info
+	* if the underlying stream is a SocketConnection, and starts reading.
+	*/
+	_setupFromIOStream(ioStream) {
+		this._ioStream = ioStream;
+		try {
+			const sockConn = ioStream;
+			if (typeof sockConn.get_socket === "function") {
+				this._connection = sockConn;
+				const remoteAddr = sockConn.get_remote_address();
+				this.remoteAddress = remoteAddr.get_address().to_string();
+				this.remotePort = remoteAddr.get_port();
+				this.remoteFamily = remoteAddr.get_address().get_family() === Gio.SocketFamily.IPV6 ? "IPv6" : "IPv4";
+				const localAddr = sockConn.get_local_address();
+				this.localAddress = localAddr.get_address().to_string();
+				this.localPort = localAddr.get_port();
+			}
+		} catch {}
+		this._inputStream = ioStream.get_input_stream();
+		this._outputStream = ioStream.get_output_stream();
+		this.connecting = false;
+		this.pending = false;
+		this.readyState = "open";
+		this.emit("connect");
+		this.emit("ready");
+		this._startReading();
+	}
+	/**
+	* @internal For HTTP upgrade handoff: configures write capability and address
+	* info from the IOStream but does NOT start the async read loop. Used by
+	* http.Server._handleRequest so handleUpgrade() can write the 101 response and
+	* then hand the IOStream to Soup.WebsocketConnection without a read-loop race.
+	*/
+	_attachOutputOnly(ioStream) {
+		this._ioStream = ioStream;
+		try {
+			const sockConn = ioStream;
+			if (typeof sockConn.get_socket === "function") {
+				this._connection = sockConn;
+				const remoteAddr = sockConn.get_remote_address();
+				this.remoteAddress = remoteAddr.get_address().to_string();
+				this.remotePort = remoteAddr.get_port();
+				this.remoteFamily = remoteAddr.get_address().get_family() === Gio.SocketFamily.IPV6 ? "IPv6" : "IPv4";
+				const localAddr = sockConn.get_local_address();
+				this.localAddress = localAddr.get_address().to_string();
+				this.localPort = localAddr.get_port();
+			}
+		} catch {}
+		this._inputStream = ioStream.get_input_stream();
+		this._outputStream = ioStream.get_output_stream();
+		this.connecting = false;
+		this.pending = false;
+		this.readyState = "open";
+		this.emit("connect");
+		this.emit("ready");
+	}
+	/** Release IOStream ownership to the caller (Soup.WebsocketConnection handoff).
+	*  Nullifies the socket's stream references so they are not closed when the
+	*  socket itself is later destroyed. */
+	_releaseIOStream() {
+		const s = this._ioStream;
+		this._ioStream = null;
+		this._inputStream = null;
+		this._outputStream = null;
+		this._connection = null;
+		return s;
+	}
+	connect(options, host, connectionListener) {
+		let opts;
+		if (typeof options === "number") {
+			opts = {
+				port: options,
+				host: typeof host === "string" ? host : "localhost"
+			};
+			if (typeof host === "function") connectionListener = host;
+		} else {
+			opts = options;
+			if (typeof host === "function") connectionListener = host;
+		}
+		if (connectionListener) {
+			this.once("connect", connectionListener);
+		}
+		this.connecting = true;
+		this.readyState = "opening";
+		this.pending = true;
+		const targetHost = opts.host || "localhost";
+		const targetPort = opts.port;
+		const client = new Gio.SocketClient();
+		if (opts.timeout) {
+			client.set_timeout(Math.ceil(opts.timeout / 1e3));
+		}
+		client.connect_to_host_async(targetHost, targetPort, this._cancellable, (_source, asyncResult) => {
+			try {
+				this._connection = client.connect_to_host_finish(asyncResult);
+				this._setupConnection(opts);
+			} catch (err) {
+				this.connecting = false;
+				this.readyState = "closed";
+				const nodeErr = createNodeError(err, "connect", {
+					address: targetHost,
+					port: targetPort
+				});
+				this.destroy(nodeErr);
+			}
+		});
+		return this;
+	}
+	/** @internal Set up streams and emit connect after connection is established. */
+	_setupConnection(opts) {
+		if (!this._connection) return;
+		const sock = this._connection.get_socket();
+		this._inputStream = this._connection.get_input_stream();
+		this._outputStream = this._connection.get_output_stream();
+		if ("keepAlive" in opts && opts.keepAlive) {
+			sock.set_keepalive(true);
+		}
+		if (!("noDelay" in opts) || opts.noDelay !== false) {
+			try {
+				sock.set_option(6, 1, 1);
+			} catch {}
+		}
+		try {
+			const remoteAddr = this._connection.get_remote_address();
+			this.remoteAddress = remoteAddr.get_address().to_string();
+			this.remotePort = remoteAddr.get_port();
+			this.remoteFamily = remoteAddr.get_address().get_family() === Gio.SocketFamily.IPV6 ? "IPv6" : "IPv4";
+		} catch {}
+		try {
+			const localAddr = this._connection.get_local_address();
+			this.localAddress = localAddr.get_address().to_string();
+			this.localPort = localAddr.get_port();
+		} catch {}
+		this.connecting = false;
+		this.pending = false;
+		this.readyState = "open";
+		this.emit("connect");
+		this.emit("ready");
+		this._startReading();
+	}
+	_startReading() {
+		if (this._reading || !this._inputStream) return;
+		this._reading = true;
+		this._readLoop();
+	}
+	async _readLoop() {
+		const inputStream = this._inputStream;
+		if (!inputStream) return;
+		const CHUNK_SIZE = 16384;
+		try {
+			while (this._reading && inputStream) {
+				const bytes = await new Promise((resolve, reject) => {
+					inputStream.read_bytes_async(CHUNK_SIZE, GLib.PRIORITY_DEFAULT, this._cancellable, (_source, asyncResult) => {
+						try {
+							resolve(inputStream.read_bytes_finish(asyncResult));
+						} catch (err) {
+							reject(err);
+						}
+					});
+				});
+				if (!bytes || bytes.get_size() === 0) {
+					this._reading = false;
+					if (!this.allowHalfOpen) {
+						this.once("end", () => {
+							this.end();
+							this.readyState = "closed";
+						});
+					} else {
+						this.readyState = this.writable ? "writeOnly" : "closed";
+					}
+					this.push(null);
+					break;
+				}
+				const data = gbytesToUint8Array(bytes);
+				this.bytesRead += data.length;
+				this._resetTimeout();
+				if (!this.push(Buffer.from(data))) {
+					this._reading = false;
+					break;
+				}
+			}
+		} catch (err) {
+			if (!this._cancellable.is_cancelled()) {
+				this.destroy(createNodeError(err, "read", { address: this.remoteAddress }));
+			}
+		}
+	}
+	_read(_size) {
+		if (!this._reading && this._inputStream) {
+			this._startReading();
+		}
+	}
+	_write(chunk, encoding, callback) {
+		if (!this._outputStream) {
+			callback(new Error("Socket is not connected"));
+			return;
+		}
+		const data = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, encoding);
+		this._outputStream.write_bytes_async(new GLib.Bytes(data), GLib.PRIORITY_DEFAULT, this._cancellable, (_source, asyncResult) => {
+			try {
+				const written = this._outputStream.write_bytes_finish(asyncResult);
+				this.bytesWritten += written;
+				this._resetTimeout();
+				callback(null);
+			} catch (err) {
+				callback(createNodeError(err, "write", { address: this.remoteAddress }));
+			}
+		});
+	}
+	_final(callback) {
+		if (this._connection) {
+			try {
+				this._connection.get_socket().shutdown(false, true);
+				this.readyState = this.readable ? "readOnly" : "closed";
+			} catch {}
+		} else if (this._ioStream) {
+			try {
+				this._ioStream.close(null);
+				this.readyState = "closed";
+			} catch {}
+			this._ioStream = null;
+			this._inputStream = null;
+			this._outputStream = null;
+		}
+		callback();
+	}
+	_destroy(err, callback) {
+		this._reading = false;
+		this._clearTimeout();
+		this._cancellable.cancel();
+		if (this._connection) {
+			try {
+				this._connection.close(null);
+			} catch {}
+			this._connection = null;
+		} else if (this._ioStream) {
+			try {
+				this._ioStream.close(null);
+			} catch {}
+		}
+		this._ioStream = null;
+		this._inputStream = null;
+		this._outputStream = null;
+		this.readyState = "closed";
+		this.destroyed = true;
+		callback(err);
+	}
+	/** Set the socket timeout in milliseconds. 0 disables. */
+	setTimeout(timeout, callback) {
+		this._timeout = timeout;
+		this._clearTimeout();
+		if (callback) {
+			this.once("timeout", callback);
+		}
+		if (timeout > 0) {
+			this._resetTimeout();
+		}
+		return this;
+	}
+	_resetTimeout() {
+		this._clearTimeout();
+		if (this._timeout > 0) {
+			this._timeoutId = setTimeout(() => {
+				this.emit("timeout");
+			}, this._timeout);
+		}
+	}
+	_clearTimeout() {
+		if (this._timeoutId !== null) {
+			clearTimeout(this._timeoutId);
+			this._timeoutId = null;
+		}
+	}
+	/** Enable/disable TCP keep-alive. */
+	setKeepAlive(enable, _initialDelay) {
+		if (this._connection) {
+			try {
+				this._connection.get_socket().set_keepalive(enable ?? false);
+			} catch {}
+		}
+		return this;
+	}
+	/** Enable/disable TCP_NODELAY (disable Nagle algorithm). */
+	setNoDelay(noDelay) {
+		if (this._connection) {
+			try {
+				this._connection.get_socket().set_option(6, 1, noDelay !== false ? 1 : 0);
+			} catch {}
+		}
+		return this;
+	}
+	/** Half-close then destroy: end() if writable, destroy() once finished. */
+	destroySoon() {
+		if (this.writable) this.end();
+		if (this.writableFinished) this.destroy();
+		else this.once("finish", this.destroy.bind(this));
+	}
+	/** Get the underlying socket address info. */
+	address() {
+		if (this.localAddress && this.localPort) {
+			return {
+				port: this.localPort,
+				family: this.remoteFamily || "IPv4",
+				address: this.localAddress
+			};
+		}
+		return {};
+	}
+	/** Reference this socket (keep event loop alive). No-op in GJS. */
+	ref() {
+		return this;
+	}
+	/** Unreference this socket. No-op in GJS. */
+	unref() {
+		return this;
+	}
 };
+
+//#endregion
+export { Socket };