@gjsify/fetch 0.3.13 → 0.3.15

package/lib/esm/xhr.js

@@ -1,258 +1,246 @@
-import GLib from "gi://GLib?version=2.0";
 import fetch from "./index.js";
+import GLib from "gi://GLib?version=2.0";
+
+//#region src/xhr.ts
 let _blobCounter = 0;
 function guessBlobExt(url) {
-  const lower = url.toLowerCase().split("?")[0];
-  const dot = lower.lastIndexOf(".");
-  const ext = dot > -1 ? lower.slice(dot) : "";
-  switch (ext) {
-    case ".png":
-    case ".jpg":
-    case ".jpeg":
-    case ".gif":
-    case ".webp":
-    case ".svg":
-    case ".bmp":
-    case ".ttf":
-    case ".otf":
-    case ".woff":
-    case ".woff2":
-    case ".mp3":
-    case ".wav":
-    case ".ogg":
-    case ".flac":
-    case ".m4a":
-    case ".mp4":
-    case ".webm":
-    case ".mkv":
-    case ".xml":
-    case ".tmx":
-    case ".json":
-      return ext;
-    default:
-      return ".bin";
-  }
+	const lower = url.toLowerCase().split("?")[0];
+	const dot = lower.lastIndexOf(".");
+	const ext = dot > -1 ? lower.slice(dot) : "";
+	switch (ext) {
+		case ".png":
+		case ".jpg":
+		case ".jpeg":
+		case ".gif":
+		case ".webp":
+		case ".svg":
+		case ".bmp":
+		case ".ttf":
+		case ".otf":
+		case ".woff":
+		case ".woff2":
+		case ".mp3":
+		case ".wav":
+		case ".ogg":
+		case ".flac":
+		case ".m4a":
+		case ".mp4":
+		case ".webm":
+		case ".mkv":
+		case ".xml":
+		case ".tmx":
+		case ".json": return ext;
+		default: return ".bin";
+	}
 }
 function writeBlobToTempFile(bytes, url) {
-  const tmpPath = GLib.build_filenamev([
-    GLib.get_tmp_dir(),
-    `gjsify-blob-${_blobCounter++}${guessBlobExt(url)}`
-  ]);
-  GLib.file_set_contents(tmpPath, bytes);
-  return tmpPath;
+	const tmpPath = GLib.build_filenamev([GLib.get_tmp_dir(), `gjsify-blob-${_blobCounter++}${guessBlobExt(url)}`]);
+	GLib.file_set_contents(tmpPath, bytes);
+	return tmpPath;
 }
 const UNSENT = 0;
 const OPENED = 1;
 const HEADERS_RECEIVED = 2;
 const LOADING = 3;
 const DONE = 4;
-class XMLHttpRequest extends EventTarget {
-  static UNSENT = UNSENT;
-  static OPENED = OPENED;
-  static HEADERS_RECEIVED = HEADERS_RECEIVED;
-  static LOADING = LOADING;
-  static DONE = DONE;
-  UNSENT = UNSENT;
-  OPENED = OPENED;
-  HEADERS_RECEIVED = HEADERS_RECEIVED;
-  LOADING = LOADING;
-  DONE = DONE;
-  readyState = UNSENT;
-  status = 0;
-  statusText = "";
-  responseType = "";
-  responseText = "";
-  response = null;
-  responseURL = "";
-  withCredentials = false;
-  timeout = 0;
-  upload = new XMLHttpRequestUpload();
-  onreadystatechange = null;
-  onload = null;
-  onerror = null;
-  onabort = null;
-  ontimeout = null;
-  onloadstart = null;
-  onloadend = null;
-  onprogress = null;
-  _method = "GET";
-  _url = "";
-  _headers = /* @__PURE__ */ new Map();
-  _responseHeaders = /* @__PURE__ */ new Map();
-  _controller = new AbortController();
-  _aborted = false;
-  _timeoutId = null;
-  open(method, url, _async = true, _user, _password) {
-    this._method = method.toUpperCase();
-    this._url = url;
-    this._headers.clear();
-    this._responseHeaders.clear();
-    this._aborted = false;
-    this._controller = new AbortController();
-    this._setReadyState(OPENED);
-  }
-  setRequestHeader(header, value) {
-    if (this.readyState < OPENED) throw new DOMException("Must open first", "InvalidStateError");
-    this._headers.set(header.toLowerCase(), value);
-  }
-  getResponseHeader(header) {
-    return this._responseHeaders.get(header.toLowerCase()) ?? null;
-  }
-  getAllResponseHeaders() {
-    const lines = [];
-    this._responseHeaders.forEach((v, k) => lines.push(`${k}: ${v}`));
-    return lines.join("\r\n");
-  }
-  send(body) {
-    if (this.readyState !== OPENED) throw new DOMException("Must open first", "InvalidStateError");
-    if (this._aborted) return;
-    const headersInit = {};
-    this._headers.forEach((v, k) => {
-      headersInit[k] = v;
-    });
-    const fetchOptions = {
-      method: this._method,
-      headers: headersInit,
-      credentials: this.withCredentials ? "include" : "omit",
-      signal: this._controller.signal
-    };
-    if (body != null && this._method !== "GET" && this._method !== "HEAD") {
-      fetchOptions.body = body;
-    }
-    if (this.timeout > 0) {
-      this._timeoutId = setTimeout(() => {
-        this._controller.abort();
-        this._onTimeout();
-      }, this.timeout);
-    }
-    this.dispatchEvent(new Event("loadstart"));
-    if (this.onloadstart) this.onloadstart(new ProgressEvent("loadstart"));
-    fetch(this._url, fetchOptions).then(async (res) => {
-      if (this._aborted) return;
-      if (this._timeoutId) {
-        clearTimeout(this._timeoutId);
-        this._timeoutId = null;
-      }
-      this.status = res.status;
-      this.statusText = res.statusText;
-      this.responseURL = res.url;
-      res.headers.forEach((v, k) => {
-        this._responseHeaders.set(k.toLowerCase(), v);
-      });
-      this._setReadyState(HEADERS_RECEIVED);
-      this._setReadyState(LOADING);
-      switch (this.responseType) {
-        case "arraybuffer": {
-          const ab = await res.arrayBuffer();
-          this.response = ab;
-          this.responseText = "";
-          break;
-        }
-        case "blob": {
-          const ab = await res.arrayBuffer();
-          const bytes = new Uint8Array(ab);
-          const tmpPath = writeBlobToTempFile(bytes, this._url);
-          const blob = new Blob([ab], {
-            type: this._responseHeaders.get("content-type") ?? ""
-          });
-          blob._tmpPath = tmpPath;
-          this.response = blob;
-          this.responseText = "";
-          break;
-        }
-        case "json": {
-          const text = await res.text();
-          this.responseText = "";
-          try {
-            this.response = text.length > 0 ? JSON.parse(text) : null;
-          } catch {
-            this.response = null;
-          }
-          break;
-        }
-        case "document": {
-          const text = await res.text();
-          this.responseText = text;
-          this.response = text;
-          break;
-        }
-        case "":
-        case "text":
-        default: {
-          const text = await res.text();
-          const stripped = text.charCodeAt(0) === 65279 ? text.slice(1) : text;
-          this.responseText = stripped;
-          this.response = stripped;
-          break;
-        }
-      }
-      this._setReadyState(DONE);
-      this.dispatchEvent(new ProgressEvent("load"));
-      this.dispatchEvent(new ProgressEvent("loadend"));
-      if (this.onload) this.onload(new ProgressEvent("load"));
-      if (this.onloadend) this.onloadend(new ProgressEvent("loadend"));
-    }).catch((_err) => {
-      if (this._timeoutId) {
-        clearTimeout(this._timeoutId);
-        this._timeoutId = null;
-      }
-      if (this._aborted) return;
-      this._setReadyState(DONE);
-      const ev = new ProgressEvent("error");
-      this.dispatchEvent(ev);
-      if (this.onerror) this.onerror(ev);
-      if (this.onloadend) this.onloadend(new ProgressEvent("loadend"));
-    });
-  }
-  abort() {
-    if (this._aborted) return;
-    this._aborted = true;
-    if (this._timeoutId) {
-      clearTimeout(this._timeoutId);
-      this._timeoutId = null;
-    }
-    this._controller.abort();
-    if (this.readyState !== UNSENT && this.readyState !== DONE) {
-      this._setReadyState(DONE);
-      this.status = 0;
-    }
-    const ev = new ProgressEvent("abort");
-    this.dispatchEvent(ev);
-    if (this.onabort) this.onabort(ev);
-    if (this.onloadend) this.onloadend(new ProgressEvent("loadend"));
-  }
-  overrideMimeType(_mime) {
-  }
-  _onTimeout() {
-    if (this._aborted) return;
-    this._aborted = true;
-    this._setReadyState(DONE);
-    const ev = new ProgressEvent("timeout");
-    this.dispatchEvent(ev);
-    if (this.ontimeout) this.ontimeout(ev);
-  }
-  _setReadyState(state) {
-    this.readyState = state;
-    const ev = new Event("readystatechange");
-    this.dispatchEvent(ev);
-    if (this.onreadystatechange) this.onreadystatechange(ev);
-  }
-}
-class XMLHttpRequestUpload extends EventTarget {
-  onprogress = null;
-  onloadstart = null;
-  onloadend = null;
-  onload = null;
-  onerror = null;
-  onabort = null;
-  ontimeout = null;
-}
-export {
-  DONE,
-  HEADERS_RECEIVED,
-  LOADING,
-  OPENED,
-  UNSENT,
-  XMLHttpRequest,
-  XMLHttpRequestUpload
+var XMLHttpRequest = class extends EventTarget {
+	static UNSENT = 0;
+	static OPENED = 1;
+	static HEADERS_RECEIVED = 2;
+	static LOADING = 3;
+	static DONE = 4;
+	UNSENT = 0;
+	OPENED = 1;
+	HEADERS_RECEIVED = 2;
+	LOADING = 3;
+	DONE = 4;
+	readyState = 0;
+	status = 0;
+	statusText = "";
+	responseType = "";
+	responseText = "";
+	response = null;
+	responseURL = "";
+	withCredentials = false;
+	timeout = 0;
+	upload = new XMLHttpRequestUpload();
+	onreadystatechange = null;
+	onload = null;
+	onerror = null;
+	onabort = null;
+	ontimeout = null;
+	onloadstart = null;
+	onloadend = null;
+	onprogress = null;
+	_method = "GET";
+	_url = "";
+	_headers = new Map();
+	_responseHeaders = new Map();
+	_controller = new AbortController();
+	_aborted = false;
+	_timeoutId = null;
+	open(method, url, _async = true, _user, _password) {
+		this._method = method.toUpperCase();
+		this._url = url;
+		this._headers.clear();
+		this._responseHeaders.clear();
+		this._aborted = false;
+		this._controller = new AbortController();
+		this._setReadyState(1);
+	}
+	setRequestHeader(header, value) {
+		if (this.readyState < 1) throw new DOMException("Must open first", "InvalidStateError");
+		this._headers.set(header.toLowerCase(), value);
+	}
+	getResponseHeader(header) {
+		return this._responseHeaders.get(header.toLowerCase()) ?? null;
+	}
+	getAllResponseHeaders() {
+		const lines = [];
+		this._responseHeaders.forEach((v, k) => lines.push(`${k}: ${v}`));
+		return lines.join("\r\n");
+	}
+	send(body) {
+		if (this.readyState !== 1) throw new DOMException("Must open first", "InvalidStateError");
+		if (this._aborted) return;
+		const headersInit = {};
+		this._headers.forEach((v, k) => {
+			headersInit[k] = v;
+		});
+		const fetchOptions = {
+			method: this._method,
+			headers: headersInit,
+			credentials: this.withCredentials ? "include" : "omit",
+			signal: this._controller.signal
+		};
+		if (body != null && this._method !== "GET" && this._method !== "HEAD") {
+			fetchOptions.body = body;
+		}
+		if (this.timeout > 0) {
+			this._timeoutId = setTimeout(() => {
+				this._controller.abort();
+				this._onTimeout();
+			}, this.timeout);
+		}
+		this.dispatchEvent(new Event("loadstart"));
+		if (this.onloadstart) this.onloadstart(new ProgressEvent("loadstart"));
+		fetch(this._url, fetchOptions).then(async (res) => {
+			if (this._aborted) return;
+			if (this._timeoutId) {
+				clearTimeout(this._timeoutId);
+				this._timeoutId = null;
+			}
+			this.status = res.status;
+			this.statusText = res.statusText;
+			this.responseURL = res.url;
+			res.headers.forEach((v, k) => {
+				this._responseHeaders.set(k.toLowerCase(), v);
+			});
+			this._setReadyState(2);
+			this._setReadyState(3);
+			switch (this.responseType) {
+				case "arraybuffer": {
+					const ab = await res.arrayBuffer();
+					this.response = ab;
+					this.responseText = "";
+					break;
+				}
+				case "blob": {
+					const ab = await res.arrayBuffer();
+					const bytes = new Uint8Array(ab);
+					const tmpPath = writeBlobToTempFile(bytes, this._url);
+					const blob = new Blob([ab], { type: this._responseHeaders.get("content-type") ?? "" });
+					blob._tmpPath = tmpPath;
+					this.response = blob;
+					this.responseText = "";
+					break;
+				}
+				case "json": {
+					const text = await res.text();
+					this.responseText = "";
+					try {
+						this.response = text.length > 0 ? JSON.parse(text) : null;
+					} catch {
+						this.response = null;
+					}
+					break;
+				}
+				case "document": {
+					const text = await res.text();
+					this.responseText = text;
+					this.response = text;
+					break;
+				}
+				case "":
+				case "text":
+				default: {
+					const text = await res.text();
+					const stripped = text.charCodeAt(0) === 65279 ? text.slice(1) : text;
+					this.responseText = stripped;
+					this.response = stripped;
+					break;
+				}
+			}
+			this._setReadyState(4);
+			this.dispatchEvent(new ProgressEvent("load"));
+			this.dispatchEvent(new ProgressEvent("loadend"));
+			if (this.onload) this.onload(new ProgressEvent("load"));
+			if (this.onloadend) this.onloadend(new ProgressEvent("loadend"));
+		}).catch((_err) => {
+			if (this._timeoutId) {
+				clearTimeout(this._timeoutId);
+				this._timeoutId = null;
+			}
+			if (this._aborted) return;
+			this._setReadyState(4);
+			const ev = new ProgressEvent("error");
+			this.dispatchEvent(ev);
+			if (this.onerror) this.onerror(ev);
+			if (this.onloadend) this.onloadend(new ProgressEvent("loadend"));
+		});
+	}
+	abort() {
+		if (this._aborted) return;
+		this._aborted = true;
+		if (this._timeoutId) {
+			clearTimeout(this._timeoutId);
+			this._timeoutId = null;
+		}
+		this._controller.abort();
+		if (this.readyState !== 0 && this.readyState !== 4) {
+			this._setReadyState(4);
+			this.status = 0;
+		}
+		const ev = new ProgressEvent("abort");
+		this.dispatchEvent(ev);
+		if (this.onabort) this.onabort(ev);
+		if (this.onloadend) this.onloadend(new ProgressEvent("loadend"));
+	}
+	overrideMimeType(_mime) {}
+	_onTimeout() {
+		if (this._aborted) return;
+		this._aborted = true;
+		this._setReadyState(4);
+		const ev = new ProgressEvent("timeout");
+		this.dispatchEvent(ev);
+		if (this.ontimeout) this.ontimeout(ev);
+	}
+	_setReadyState(state) {
+		this.readyState = state;
+		const ev = new Event("readystatechange");
+		this.dispatchEvent(ev);
+		if (this.onreadystatechange) this.onreadystatechange(ev);
+	}
+};
+var XMLHttpRequestUpload = class extends EventTarget {
+	onprogress = null;
+	onloadstart = null;
+	onloadend = null;
+	onload = null;
+	onerror = null;
+	onabort = null;
+	ontimeout = null;
 };
+
+//#endregion
+export { DONE, HEADERS_RECEIVED, LOADING, OPENED, UNSENT, XMLHttpRequest, XMLHttpRequestUpload };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/fetch",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "Web and Node.js fetch module for Gjs",
   "module": "lib/esm/index.js",
   "types": "lib/index.d.ts",
@@ -45,19 +45,19 @@
     "fetch"
   ],
   "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/formdata": "^0.3.13",
-    "@gjsify/http": "^0.3.13",
-    "@gjsify/url": "^0.3.13",
-    "@gjsify/utils": "^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/formdata": "^0.3.15",
+    "@gjsify/http": "^0.3.15",
+    "@gjsify/url": "^0.3.15",
+    "@gjsify/utils": "^0.3.15"
   }
 }