@gjsify/fetch 0.38.1 → 0.39.0

package/lib/esm/utils/root-relative.js

@@ -1 +1 @@
-import"../_virtual/_rolldown/runtime.js";function rewriteRootRelativeUrl(e,t){if(!e.startsWith(`/`)||e.startsWith(`//`))return e;let n=t.lastIndexOf(`/`);return n<=0?e:`file://${t.slice(0,n)}${e}`}export{rewriteRootRelativeUrl};
+import"../_virtual/_rolldown/runtime.js";import{lastPathSeparatorIndex as e,pathToFileUrlHref as t}from"@gjsify/utils/core";function rewriteRootRelativeUrl(n,r){if(!n.startsWith(`/`)||n.startsWith(`//`))return n;let i=e(r);return i<=0?n:`${t(r.slice(0,i))}${n}`}export{rewriteRootRelativeUrl};

package/lib/root-relative.spec.js

@@ -34,6 +34,32 @@ export default async () => {
             expect(rewriteRootRelativeUrl('/res/x.png', '')).toBe('/res/x.png');
             expect(rewriteRootRelativeUrl('/res/x.png', 'main.js')).toBe('/res/x.png');
         });
+        // #1143, measured on Windows 11: the program path is `C:\…\dist\main.js`, the old
+        // `lastIndexOf('/')` returned -1, the "no program dir" guard swallowed it, and the
+        // URL reached the `Request` constructor unrewritten — `Invalid URL` on bun and
+        // deno, then a SIGSEGV / 0xC0000005. These run on the LINUX runner: the win32
+        // answer is decided from the path's shape, so it needs no win32 host to check.
+        await it('maps a root-relative URL under a win32 drive program path', async () => {
+            expect(rewriteRootRelativeUrl('/res/tilemaps/level1.tmx', 'C:\\app\\dist\\main.js')).toBe('file:///C:/app/dist/res/tilemaps/level1.tmx');
+        });
+        await it('maps a root-relative URL under a UNC program path', async () => {
+            expect(rewriteRootRelativeUrl('/res/x.png', '\\\\build\\share\\app\\dist\\main.js')).toBe('file://build/share/app/dist/res/x.png');
+        });
+        await it('keeps the query string a cache-busted asset request carries', async () => {
+            // Only the DIRECTORY is percent-encoded. Encoding the URL half would turn
+            // `?v=2` into `%3Fv=2` and ask for a file whose name contains a question mark.
+            expect(rewriteRootRelativeUrl('/res/x.png?v=2', 'C:\\app\\dist\\main.js')).toBe('file:///C:/app/dist/res/x.png?v=2');
+            expect(rewriteRootRelativeUrl('/res/x.png?v=2', '/opt/app/dist/main.js')).toBe('file:///opt/app/dist/res/x.png?v=2');
+        });
+        await it('percent-encodes a program dir that needs it', async () => {
+            // A space in the program directory is ordinary on Windows (`C:\Program Files`)
+            // and was previously emitted raw.
+            expect(rewriteRootRelativeUrl('/res/x.png', 'C:\\Program Files\\app\\main.js')).toBe('file:///C:/Program%20Files/app/res/x.png');
+        });
+        await it('treats a backslash in a POSIX program path as part of the name', async () => {
+            // `\` is legal in a POSIX filename, so this must NOT be read as a separator.
+            expect(rewriteRootRelativeUrl('/res/x.png', '/opt/od\\d/main.js')).toBe('file:///opt/od%5Cd/res/x.png');
+        });
     });
     // The `system`-reading wrapper, end to end on gjs — the runtime where the
     // program path is real. Reached through the aliased package root so the

package/lib/utils/root-relative.d.ts

@@ -8,8 +8,18 @@
  * cases — revisit if these packages ever handle untrusted input.
  *
  * Deliberately no `GLib.path_get_dirname`: `@girs/glib-2.0` is emptied to `{}` in a
- * plain-Node bundle, so a GLib call here only ever "worked" behind a swallowing catch. The
- * program path is `/`-separated on every runtime this serves, making dirname a slice.
+ * plain-Node bundle, so a GLib call here only ever "worked" behind a swallowing catch.
+ * The separator question goes to `@gjsify/utils/core` instead, which answers it from the
+ * SHAPE of the path — this function's own `lastIndexOf('/')` returned -1 for
+ * `C:\…\dist\main.js`, the `slash <= 0` guard read that as "no program dir", and every
+ * root-relative `fetch()` on win32 died as `Invalid URL` in the `Request` constructor
+ * (#1143).
+ *
+ * The base and the URL are CONCATENATED rather than resolved through `new URL(url, base)`:
+ * resolving a root-relative path against `file:///C:/app/dist` drops the program directory
+ * and keeps only the root — and the runtimes do not agree on what the root is. Measured:
+ * Node keeps the drive (`file:///C:/res/…`), GJS/SpiderMonkey does not (`file:///res/…`).
+ * So resolution is both wrong for this purpose and host-dependent.
  *
  * @param programPath `System.programPath ?? System.programInvocationName` on gjs;
  *   `process.argv[1]` — the bundle itself — on the node-gi reverse bridge.

package/lib/utils/root-relative.js

@@ -9,6 +9,9 @@
 // bare `system` specifier is aliased to `@gjsify/node-gi/system` and kept EXTERNAL, so any
 // module importing it makes the bundle hard-require the bridge at load, and this package's
 // node test bundle must load on plain Node.
+// `/core` and not the `@gjsify/utils` root: the root reaches Gio/GLib, which would undo the
+// plain-Node loadability this module's split exists to protect.
+import { lastPathSeparatorIndex, pathToFileUrlHref } from '@gjsify/utils/core';
 /**
  * Rewrite a root-relative URL (starts with `/` but not `//`) to a `file://` URL under the
  * program path's directory, so a GJS/GTK app loads bundled assets with the same paths a
@@ -19,8 +22,18 @@
  * cases — revisit if these packages ever handle untrusted input.
  *
  * Deliberately no `GLib.path_get_dirname`: `@girs/glib-2.0` is emptied to `{}` in a
- * plain-Node bundle, so a GLib call here only ever "worked" behind a swallowing catch. The
- * program path is `/`-separated on every runtime this serves, making dirname a slice.
+ * plain-Node bundle, so a GLib call here only ever "worked" behind a swallowing catch.
+ * The separator question goes to `@gjsify/utils/core` instead, which answers it from the
+ * SHAPE of the path — this function's own `lastIndexOf('/')` returned -1 for
+ * `C:\…\dist\main.js`, the `slash <= 0` guard read that as "no program dir", and every
+ * root-relative `fetch()` on win32 died as `Invalid URL` in the `Request` constructor
+ * (#1143).
+ *
+ * The base and the URL are CONCATENATED rather than resolved through `new URL(url, base)`:
+ * resolving a root-relative path against `file:///C:/app/dist` drops the program directory
+ * and keeps only the root — and the runtimes do not agree on what the root is. Measured:
+ * Node keeps the drive (`file:///C:/res/…`), GJS/SpiderMonkey does not (`file:///res/…`).
+ * So resolution is both wrong for this purpose and host-dependent.
  *
  * @param programPath `System.programPath ?? System.programInvocationName` on gjs;
  *   `process.argv[1]` — the bundle itself — on the node-gi reverse bridge.
@@ -28,8 +41,11 @@
 export function rewriteRootRelativeUrl(url, programPath) {
     if (!url.startsWith('/') || url.startsWith('//'))
         return url;
-    const slash = programPath.lastIndexOf('/');
-    if (slash <= 0)
+    const separator = lastPathSeparatorIndex(programPath);
+    if (separator <= 0)
         return url; // no usable program dir ('' or a bare name)
-    return `file://${programPath.slice(0, slash)}${url}`;
+    // Only the DIRECTORY is percent-encoded. `url` is already a URL and carries its own
+    // `?query` and `#fragment` semantics — encoding it would turn a cache-busting
+    // `/res/x.png?v=2` into a request for a file literally called `x.png?v=2`.
+    return `${pathToFileUrlHref(programPath.slice(0, separator))}${url}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/fetch",
-    "version": "0.38.1",
+    "version": "0.39.0",
     "description": "Web and Node.js fetch module for Gjs",
     "module": "lib/esm/index.js",
     "types": "lib/index.d.ts",
@@ -51,8 +51,8 @@
         "fetch"
     ],
     "devDependencies": {
-        "@gjsify/cli": "^0.38.1",
-        "@gjsify/unit": "^0.38.1",
+        "@gjsify/cli": "^0.39.0",
+        "@gjsify/unit": "^0.39.0",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"
     },
@@ -61,11 +61,11 @@
         "@girs/gjs": "^4.1.0",
         "@girs/glib-2.0": "^4.1.0",
         "@girs/soup-3.0": "^4.1.0",
-        "@gjsify/dom-events": "^0.38.1",
-        "@gjsify/formdata": "^0.38.1",
-        "@gjsify/http": "^0.38.1",
-        "@gjsify/url": "^0.38.1",
-        "@gjsify/utils": "^0.38.1"
+        "@gjsify/dom-events": "^0.39.0",
+        "@gjsify/formdata": "^0.39.0",
+        "@gjsify/http": "^0.39.0",
+        "@gjsify/url": "^0.39.0",
+        "@gjsify/utils": "^0.39.0"
     },
     "gjsify": {
         "runtimes": {