Merge pull request #82 from pyscript/better-fetch

Use a better fetch utility

Author: WebReflection

docs/core.js

@@ -1,6 +1,5 @@
 // this file simply exports enough stuff to allow
 // 3rd party libraries, including PyScript, to work
-export * from './fetch-utils.js';
 export * from './index.js';
 export * from './script-handler.js';
 export * from './utils.js';

docs/core.js.map

@@ -1,6 +1,6 @@
 import '@ungap/with-resolvers';
+import fetch from '@webreflection/fetch';
 
-import { getBuffer } from '../fetch-utils.js';
 import { absoluteURL, all, entries, importCSS, importJS, isArray, isCSS } from '../utils.js';
 
 export const RUNNING_IN_WORKER = !globalThis.window;
@@ -94,17 +94,16 @@ const joinPaths = (parts) => {
     return parts[0].startsWith('/') ? `/${res}` : res;
 };
 
-const fetchResolved = (config_fetch, url) =>
-    fetch(absoluteURL(url, base.get(config_fetch)));
+const fetchBuffer = (config_fetch, url) =>
+    fetch(absoluteURL(url, base.get(config_fetch))).arrayBuffer();
 
 export const base = new WeakMap();
 
 /* c8 ignore start */
 export const fetchPaths = (module, interpreter, config_fetch) =>
     all(
         calculateFetchPaths(config_fetch).map(({ url, path }) =>
-            fetchResolved(config_fetch, url)
-                .then(getBuffer)
+            fetchBuffer(config_fetch, url)
                 .then((buffer) => module.writeFile(interpreter, path, buffer)),
         ),
     );
@@ -146,8 +145,7 @@ const calculateFilesPaths = files => {
 export const fetchFiles = (module, interpreter, config_files) =>
     all(
         calculateFilesPaths(config_files).map(({ url, path }) =>
-            fetchResolved(config_files, url)
-                .then(getBuffer)
+            fetchBuffer(config_files, url)
                 .then((buffer) => module.writeFile(interpreter, path, buffer)),
         ),
     );

esm/exports.js

@@ -1,3 +1,5 @@
+import fetch from '@webreflection/fetch';
+
 import { dedent } from '../utils.js';
 import { fetchFiles, fetchJSModules, fetchPaths } from './_utils.js';
 
@@ -17,10 +19,9 @@ export default {
     module: (version = '2.2.0') =>
         `https://cdn.jsdelivr.net/npm/ruby-3_2-wasm-wasi@${version}/dist/browser.esm.js`,
     async engine({ DefaultRubyVM }, config, url) {
-        const response = await fetch(
-            `${url.slice(0, url.lastIndexOf('/'))}/ruby.wasm`,
-        );
-        const module = await WebAssembly.compile(await response.arrayBuffer());
+        url = `${url.slice(0, url.lastIndexOf('/'))}/ruby.wasm`;
+        const buffer = await fetch(url).arrayBuffer();
+        const module = await WebAssembly.compile(buffer);
         const { vm: interpreter } = await DefaultRubyVM(module);
         if (config.files) await fetchFiles(this, interpreter, config.files);
         if (config.fetch) await fetchPaths(this, interpreter, config.fetch);

esm/fetch-utils.js

@@ -1,7 +1,8 @@
+import fetch from '@webreflection/fetch';
+
 import { interpreter } from './interpreters.js';
 import { absoluteURL, resolve } from './utils.js';
 import { parse } from './toml.js';
-import { getJSON, getText } from './fetch-utils.js';
 
 // REQUIRES INTEGRATION TEST
 /* c8 ignore start */
@@ -40,9 +41,9 @@ export const getRuntime = (id, config, configURL, options = {}) => {
         /* c8 ignore start */
         const [absolute, type] = getConfigURLAndType(config, configURL);
         if (type === 'json') {
-            options = fetch(absolute).then(getJSON);
+            options = fetch(absolute).json();
         } else if (type === 'toml') {
-            options = fetch(absolute).then(getText).then(parse);
+            options = fetch(absolute).text().then(parse);
         } else if (type === 'string') {
             options = parseString(config);
         } else if (type === 'object' && config) {

esm/interpreter/_utils.js

@@ -1,11 +1,11 @@
+import fetch from '@webreflection/fetch';
 import { $ } from 'basic-devtools';
 
 import $xworker from './worker/class.js';
 import workerURL from './worker/url.js';
 import { getRuntime, getRuntimeID } from './loader.js';
 import { registry } from './interpreters.js';
 import { JSModules, all, dispatch, resolve, defineProperty, nodeInfo, registerJSModules } from './utils.js';
-import { getText } from './fetch-utils.js';
 
 const getRoot = (script) => {
     let parent = script;
@@ -161,7 +161,7 @@ export const handle = async (script) => {
         if (targetValue) targets.set(script, queryTarget(script, targetValue));
 
         // start fetching external resources ASAP
-        const source = src ? fetch(src).then(getText) : script.textContent;
+        const source = src ? fetch(src).text() : script.textContent;
         details.queue = details.queue.then(() =>
             execute(script, source, details.XWorker, !!isAsync),
         );

esm/interpreter/ruby-wasm-wasi.js

@@ -1,9 +1,9 @@
 import * as JSON from '@ungap/structured-clone/json';
+import fetch from '@webreflection/fetch';
 import coincident from 'coincident/window';
 import xworker from './xworker.js';
 import { getConfigURLAndType } from '../loader.js';
 import { assign, create, defineProperties, importCSS, importJS } from '../utils.js';
-import { getText } from '../fetch-utils.js';
 import Hook from './hook.js';
 
 /**
@@ -38,7 +38,7 @@ export default (...args) =>
         const [ config ] = getConfigURLAndType(options.config, options.configURL);
 
         const bootstrap = fetch(url)
-            .then(getText)
+            .text()
             .then(code => {
                 const hooks = isHook ? this.toJSON() : void 0;
                 postMessage.call(worker, { options, config, code, hooks });