@gjsify/xmlhttprequest 0.23.0 → 0.24.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/xmlhttprequest",
-    "version": "0.23.0",
+    "version": "0.24.1",
     "description": "XMLHttpRequest and URL.createObjectURL/revokeObjectURL for GJS — backed by @gjsify/fetch and GLib",
     "module": "lib/esm/index.js",
     "types": "lib/types/index.d.ts",
@@ -42,10 +42,10 @@
         "@girs/gio-2.0": "^4.1.0",
         "@girs/gjs": "^4.1.0",
         "@girs/glib-2.0": "^4.1.0",
-        "@gjsify/fetch": "^0.23.0"
+        "@gjsify/fetch": "^0.24.1"
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.23.0",
+        "@gjsify/cli": "^0.24.1",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"
     },

package/lib/index.js

@@ -1,306 +0,0 @@
-// XMLHttpRequest and URL.createObjectURL/revokeObjectURL for GJS
-// Backed by @gjsify/fetch (Soup 3.0) for HTTP and GLib for file:// + temp files.
-// Reference: https://xhr.spec.whatwg.org/
-// oxlint-disable typescript/no-explicit-any -- W3C XMLHttpRequest surface uses `any` deliberately: `response: any` in lib.dom matches our impl (the actual shape varies by `responseType`: text/json/arraybuffer/blob); the `on{load,error,progress,…}` handler return types are `=> any` in lib.dom; the simplified progress events we dispatch carry varying-shape payloads. The remaining `any`s in send()'s body parameter, fetch-callback narrowing at the Soup boundary, listener-map value type, and catch-block error sit inside this same W3C surface and a `gioAsync`-style introspection boundary.
-import GLib from 'gi://GLib?version=2.0';
-import System from 'system';
-import fetch from '@gjsify/fetch';
-let _blobCounter = 0;
-// ---------------------------------------------------------------------------
-// FakeBlob — carries raw bytes + temp file path for the createObjectURL cycle
-// ---------------------------------------------------------------------------
-export class FakeBlob {
-    _tmpPath;
-    type;
-    size;
-    constructor(type, size) {
-        this.type = type;
-        this.size = size;
-    }
-    async arrayBuffer() {
-        if (this._tmpPath) {
-            const [ok, contents] = GLib.file_get_contents(this._tmpPath);
-            if (ok)
-                return contents.buffer;
-        }
-        return new ArrayBuffer(0);
-    }
-    async text() {
-        return new TextDecoder().decode(await this.arrayBuffer());
-    }
-    stream() {
-        const self = this;
-        return new ReadableStream({
-            async start(controller) {
-                const buf = await self.arrayBuffer();
-                controller.enqueue(new Uint8Array(buf));
-                controller.close();
-            },
-        });
-    }
-}
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-function guessExt(url) {
-    const lower = url.toLowerCase();
-    if (lower.endsWith('.png'))
-        return '.png';
-    if (lower.endsWith('.jpg') || lower.endsWith('.jpeg'))
-        return '.jpg';
-    if (lower.endsWith('.gif'))
-        return '.gif';
-    if (lower.endsWith('.svg'))
-        return '.svg';
-    if (lower.endsWith('.ttf'))
-        return '.ttf';
-    if (lower.endsWith('.otf'))
-        return '.otf';
-    if (lower.endsWith('.woff'))
-        return '.woff';
-    if (lower.endsWith('.woff2'))
-        return '.woff2';
-    if (lower.endsWith('.mp3'))
-        return '.mp3';
-    if (lower.endsWith('.wav'))
-        return '.wav';
-    if (lower.endsWith('.ogg'))
-        return '.ogg';
-    if (lower.endsWith('.tmx') || lower.endsWith('.xml'))
-        return '.xml';
-    if (lower.endsWith('.json'))
-        return '.json';
-    return '.bin';
-}
-function guessMime(url) {
-    const lower = url.toLowerCase();
-    if (lower.endsWith('.png'))
-        return 'image/png';
-    if (lower.endsWith('.jpg') || lower.endsWith('.jpeg'))
-        return 'image/jpeg';
-    if (lower.endsWith('.gif'))
-        return 'image/gif';
-    if (lower.endsWith('.svg'))
-        return 'image/svg+xml';
-    if (lower.endsWith('.ttf'))
-        return 'font/truetype';
-    if (lower.endsWith('.otf'))
-        return 'font/otf';
-    if (lower.endsWith('.woff'))
-        return 'font/woff';
-    if (lower.endsWith('.woff2'))
-        return 'font/woff2';
-    if (lower.endsWith('.mp3'))
-        return 'audio/mpeg';
-    if (lower.endsWith('.wav'))
-        return 'audio/wav';
-    if (lower.endsWith('.ogg'))
-        return 'audio/ogg';
-    if (lower.endsWith('.json'))
-        return 'application/json';
-    return 'application/octet-stream';
-}
-/** Read a file:// URL synchronously using GLib. */
-async function readFileUrl(url) {
-    const path = GLib.filename_from_uri(url)[0];
-    const [ok, contents] = GLib.file_get_contents(path);
-    if (!ok)
-        throw new Error(`XMLHttpRequest: cannot read file ${path}`);
-    // GLib-backed Uint8Array's .buffer may not be a standard JS ArrayBuffer.
-    // Copy into a fresh Uint8Array so callers get a proper ArrayBuffer.
-    const src = contents;
-    const copy = new Uint8Array(src.byteLength);
-    copy.set(src);
-    return copy.buffer;
-}
-/** Write bytes to a temp file and return the path. */
-function writeToTmp(bytes, ext) {
-    const tmpPath = GLib.build_filenamev([GLib.get_tmp_dir(), `gjsify-blob-${_blobCounter++}${ext}`]);
-    GLib.file_set_contents(tmpPath, bytes);
-    return tmpPath;
-}
-export class XMLHttpRequest {
-    // State
-    UNSENT = 0;
-    OPENED = 1;
-    HEADERS_RECEIVED = 2;
-    LOADING = 3;
-    DONE = 4;
-    readyState = 0;
-    status = 0;
-    statusText = '';
-    response = null;
-    responseText = '';
-    responseType = '';
-    responseURL = '';
-    timeout = 0;
-    withCredentials = false;
-    // Event handler properties
-    onloadstart = null;
-    onprogress = null;
-    onload = null;
-    onloadend = null;
-    onerror = null;
-    onabort = null;
-    ontimeout = null;
-    onreadystatechange = null;
-    _url = '';
-    _method = 'GET';
-    _aborted = false;
-    _listeners = {};
-    open(method, url, _async = true) {
-        this._method = method.toUpperCase();
-        this._url = url;
-        this._aborted = false;
-        this.readyState = this.OPENED;
-    }
-    setRequestHeader(_name, _value) {
-        // Not needed for the XHR→Blob→Image chain
-    }
-    overrideMimeType(_mime) { }
-    send(_body) {
-        let url = this._url;
-        const responseType = this.responseType;
-        const DEBUG = globalThis.__GJSIFY_DEBUG_XHR === true;
-        // Root-relative URLs (start with '/', not '//') have no host to
-        // resolve against in GJS. Rewrite to file:// relative to the program
-        // directory — matches how an HTTP static server would resolve them.
-        if (url.startsWith('/') && !url.startsWith('//')) {
-            const prog = System.programPath ?? System.programInvocationName ?? '';
-            if (prog) {
-                const programDir = GLib.path_get_dirname(prog);
-                url = `file://${programDir}${this._url}`;
-                if (DEBUG)
-                    console.log(`[xmlhttprequest] rewrite ${this._url} → ${url}`);
-            }
-        }
-        if (DEBUG)
-            console.log(`[xmlhttprequest] ${this._method} ${url} responseType=${responseType}`);
-        const doFetch = () => {
-            // Use GLib direct read for file:// URLs (avoids Soup for local files)
-            if (url.startsWith('file://')) {
-                return readFileUrl(url);
-            }
-            return fetch(url, { method: this._method }).then((r) => {
-                if (DEBUG)
-                    console.log(`[xmlhttprequest] fetch ok ${url} status=${r.status}`);
-                this.status = r.status === 0 ? 200 : r.status;
-                this.statusText = r.statusText || 'OK';
-                this.responseURL = r.url || url;
-                return r.arrayBuffer();
-            });
-        };
-        this.readyState = this.LOADING;
-        this._emit('loadstart', { loaded: 0, total: 0, lengthComputable: false });
-        // Wrap doFetch() in Promise.resolve().then(...) so synchronous throws
-        // (e.g. new URL('/path') when fetch parses the input) propagate into
-        // the .catch chain instead of escaping send() as an uncaught exception.
-        Promise.resolve()
-            .then(doFetch)
-            .then((arrBuf) => {
-            if (this._aborted)
-                return;
-            if (this.status === 0)
-                this.status = 200;
-            if (!this.statusText)
-                this.statusText = 'OK';
-            this.readyState = this.DONE;
-            const bytes = new Uint8Array(arrBuf);
-            const len = bytes.byteLength;
-            this._emit('progress', { loaded: len, total: len, lengthComputable: true });
-            if (responseType === 'blob' || responseType === '') {
-                // Write to temp file so HTMLImageElement.src can load it via file://
-                const ext = guessExt(url);
-                const tmpPath = writeToTmp(bytes, ext);
-                const blob = new FakeBlob(guessMime(url), len);
-                blob._tmpPath = tmpPath;
-                this.response = blob;
-            }
-            else if (responseType === 'arraybuffer') {
-                this.response = arrBuf;
-            }
-            else if (responseType === 'json') {
-                this.response = JSON.parse(new TextDecoder().decode(bytes));
-            }
-            else {
-                // 'text' or ''
-                this.responseText = new TextDecoder().decode(bytes);
-                this.response = this.responseText;
-            }
-            this._emit('load', { target: this, loaded: len, total: len, lengthComputable: true });
-            this._emit('loadend', { target: this, loaded: len, total: len, lengthComputable: true });
-            if (this.onreadystatechange)
-                this.onreadystatechange({});
-        })
-            .catch((err) => {
-            if (this._aborted)
-                return;
-            console.warn(`[xmlhttprequest] ${this._method} ${url} — ${err?.message ?? err}`);
-            this.readyState = this.DONE;
-            this._emit('error', { error: err });
-            this._emit('loadend', {});
-        });
-    }
-    abort() {
-        this._aborted = true;
-        this.readyState = this.DONE;
-        this._emit('abort', {});
-        this._emit('loadend', {});
-    }
-    addEventListener(type, fn) {
-        (this._listeners[type] ??= []).push(fn);
-    }
-    removeEventListener(type, fn) {
-        this._listeners[type] = (this._listeners[type] ?? []).filter((f) => f !== fn);
-    }
-    getResponseHeader(_name) {
-        return null;
-    }
-    getAllResponseHeaders() {
-        return '';
-    }
-    _emit(type, event) {
-        // Look up the matching `on<type>` handler property. The Node-style
-        // `XMLHttpRequest` surface declares specific `onload` / `onerror` /
-        // `onprogress` / `ontimeout` / `onabort` / `onreadystatechange`
-        // properties, but indexing by computed `'on' + type` defeats
-        // structural typing. Cast through a typed view keyed on the union.
-        const handler = this[('on' + type)];
-        if (typeof handler === 'function')
-            handler.call(this, { type, ...event });
-        for (const fn of this._listeners[type] ?? [])
-            fn.call(this, { type, ...event });
-    }
-}
-export function installObjectURLSupport() {
-    const urlPatch = URL;
-    // Only install if not already a real implementation
-    if (typeof urlPatch.createObjectURL !== 'function' || urlPatch.__gjsify_objecturl !== true) {
-        const _objectURLPaths = new Map();
-        urlPatch.createObjectURL = function (blob) {
-            if (blob._tmpPath) {
-                const url = `file://${blob._tmpPath}`;
-                _objectURLPaths.set(url, blob._tmpPath);
-                return url;
-            }
-            // Fallback for real Blobs (shouldn't happen in GJS but handle gracefully)
-            console.warn('[createObjectURL] received non-FakeBlob — cannot create file:// URL');
-            return 'file:///dev/null';
-        };
-        urlPatch.revokeObjectURL = function (url) {
-            const path = _objectURLPaths.get(url);
-            if (path) {
-                try {
-                    // Optionally clean up temp file
-                    const file = GLib.build_filenamev([path]);
-                    GLib.unlink(file);
-                }
-                catch {
-                    // ignore cleanup errors
-                }
-                _objectURLPaths.delete(url);
-            }
-        };
-        urlPatch.__gjsify_objecturl = true;
-    }
-}

package/lib/register.js

@@ -1,12 +0,0 @@
-// Side-effect module: registers XMLHttpRequest, URL.createObjectURL and
-// URL.revokeObjectURL as globals on GJS.
-// On Node.js the alias layer routes this subpath to @gjsify/empty — the native
-// implementations are already present there.
-import { XMLHttpRequest, installObjectURLSupport } from './index.js';
-const g = globalThis;
-if (typeof g.XMLHttpRequest === 'undefined') {
-    g.XMLHttpRequest = XMLHttpRequest;
-}
-// Patch URL.createObjectURL / revokeObjectURL
-// URL is expected to be on globalThis already (via @gjsify/node-globals or @gjsify/url).
-installObjectURLSupport();