@swiftbrowser/web 0.18.0 → 0.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swiftbrowser/web",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "type": "module",
   "description": "SwiftBrowser web renderer and dev server: applies render ops from a Swift/Wasm app to the DOM inside an iPhone frame.",
   "repository": {

package/src/blockedHosts.ts

@@ -5,6 +5,8 @@
 // TelemetryDeck signals): the app keeps working, those requests do not go out.
 
 /** Whether `url` is on one of `hosts` (or a subdomain of one). */
+import type { FetchLike } from './hostRequests';
+
 export function isBlocked(url: string, hosts: readonly string[]): boolean {
   let host: string;
   try {
@@ -19,7 +21,7 @@ export function isBlocked(url: string, hosts: readonly string[]): boolean {
 }
 
 /** `fetchImpl`, failing requests to `hosts` as a network error does. */
-export function withBlockedHosts(fetchImpl: typeof fetch, hosts: readonly string[]): typeof fetch {
+export function withBlockedHosts(fetchImpl: FetchLike, hosts: readonly string[]): FetchLike {
   if (hosts.length === 0) return fetchImpl;
   return async (input, init) => {
     const url = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;

package/src/corsProxy.ts

@@ -8,6 +8,8 @@
 // request that may change something (POST, PUT…) is never sent twice.
 
 /** Whether `url` (absolute) is http(s) on another origin than `pageOrigin`. */
+import type { FetchLike } from './hostRequests';
+
 export function isCrossOrigin(url: string, pageOrigin: string): boolean {
   try {
     const target = new URL(url);
@@ -30,7 +32,7 @@ export function proxiedURL(proxy: string, target: string): string {
  * to a page); an answer with any status is the server's and is kept. An
  * aborted request is not retried.
  */
-export function withCORSProxy(fetchImpl: typeof fetch, proxy: string, pageOrigin: string): typeof fetch {
+export function withCORSProxy(fetchImpl: FetchLike, proxy: string, pageOrigin: string): FetchLike {
   return async (input, init) => {
     try {
       return await fetchImpl(input, init);

package/src/hostRequests.ts

@@ -95,8 +95,16 @@ export interface PickFilesResult {
 }
 
 /** The browser facilities a request handler uses; tests substitute them. */
+/**
+ * What the environment fetches with: the global `fetch`'s call, and no more.
+ * Not `typeof fetch`, which in Bun's types also carries `fetch.preconnect`,
+ * so a wrapper (the CORS proxy's, the blocked hosts', an app's own) would
+ * not be one.
+ */
+export type FetchLike = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
+
 export interface HostRequestEnvironment {
-  fetch: typeof fetch;
+  fetch: FetchLike;
   /** Decodes an image and resolves with its natural size; rejects when it cannot be loaded. */
   loadImage: (url: string) => Promise<ImageResult>;
   /** The Web Share API (`navigator.share`), where the browser has it. */