@lat-murmeldjur/weeb_3 0.0.336001 → 0.0.338001

package/package.json

@@ -2,7 +2,7 @@
   "name": "@lat-murmeldjur/weeb_3",
   "type": "module",
   "description": "A Swarm client for browsers",
-  "version": "0.0.336001",
+  "version": "0.0.338001",
   "license": "MIT",
   "repository": {
     "type": "git",

package/service.js

@@ -9,16 +9,17 @@ const RAW_ROUTE_KINDS = [
   ["chunks", "chunk"]
 ];
 const FETCH_TIMEOUT_MS = 240000;
-const SERVICE_WORKER_MARKER = "forwarder-default20";
-const SERVICE_WORKER_PROTOCOL = 8;
+const SERVICE_WORKER_MARKER = "forwarder-default28";
+const SERVICE_WORKER_PROTOCOL = 10;
 const MIB_BYTES = 1024 * 1024;
 const STREAM_STORAGE_WINDOW_BYTES = MIB_BYTES / 2;
 const STREAM_LOOKAHEAD_CHUNKS = 8;
-const HLS_STREAM_LOOKAHEAD_CHUNKS = 4;
-const HLS_STREAM_READY_ADMISSION_THRESHOLD = HLS_STREAM_LOOKAHEAD_CHUNKS - 1;
-const HLS_STREAM_MAX_OUTSTANDING =
-  HLS_STREAM_LOOKAHEAD_CHUNKS + HLS_STREAM_READY_ADMISSION_THRESHOLD - 1;
-const HLS_REQUEST_FLIGHTS = new Map();
+const HLS_STREAM_WINDOW_BYTES = MIB_BYTES;
+const HLS_STREAM_INITIAL_LOOKAHEAD_CHUNKS = 2;
+const HLS_STREAM_LOOKAHEAD_CHUNKS = 5;
+const HLS_LIVE_STREAM_WINDOW_BYTES = MIB_BYTES;
+const HLS_LIVE_STREAM_LOOKAHEAD_CHUNKS = 5;
+const RANGE_REQUEST_FLIGHTS = new Map();
 const CLIENT_RUNTIME_PROBES = new Map();
 const CLIENT_RUNTIME_PROBE_TIMEOUT_MS = 1_500;
 
@@ -166,6 +167,17 @@ function canonicalFeedResource(url) {
   return null;
 }
 
+function isHlsResource(url) {
+  if (canonicalFeedResource(url) !== null) {
+    return true;
+  }
+  return rawRouteMarkers().some(([marker, rawType]) =>
+    rawType === "hls-bytes" &&
+    url.pathname.startsWith(marker) &&
+    canonicalRawResource(url) !== null
+  );
+}
+
 function isAppShellNavigation(request) {
   const headerDestination = request.headers.get("Sec-Fetch-Dest") || "";
   return request.method === "GET" &&
@@ -202,6 +214,12 @@ self.addEventListener("activate", (event) => {
 });
 
 self.addEventListener("message", (event) => {
+  if (
+    (event.data?.type === "WEEB3_CLAIM" || event.data?.type === "WEEB3_PING") &&
+    event.data?.protocol !== SERVICE_WORKER_PROTOCOL
+  ) {
+    return;
+  }
   if (event.data?.type === "WEEB3_CLAIM") {
     const port = event.ports?.[0];
     event.waitUntil((async () => {
@@ -209,7 +227,8 @@ self.addEventListener("message", (event) => {
       port?.postMessage({
         type: "WEEB3_CLAIMED",
         protocol: SERVICE_WORKER_PROTOCOL,
-        scope: SCOPE_PATH
+        scope: SCOPE_PATH,
+        marker: SERVICE_WORKER_MARKER
       });
     })());
     return;
@@ -225,7 +244,8 @@ self.addEventListener("message", (event) => {
   port.postMessage({
     type: "WEEB3_PONG",
     protocol: SERVICE_WORKER_PROTOCOL,
-    scope: SCOPE_PATH
+    scope: SCOPE_PATH,
+    marker: SERVICE_WORKER_MARKER
   });
 });
 
@@ -377,12 +397,7 @@ async function requestClients(event, requestUrl, requiredNetworkId) {
   const eventClientId = event.clientId || "";
   const eventClient = eventClientId ? await self.clients.get(eventClientId) : null;
   const requestUrlObject = requestUrl ? new URL(requestUrl) : null;
-  const directHlsRequest = requestUrlObject !== null && (
-    canonicalFeedResource(requestUrlObject) !== null ||
-    rawRouteMarkers().some(([marker, rawType]) =>
-      rawType === "hls-bytes" && requestUrlObject.pathname.startsWith(marker)
-    )
-  );
+  const directHlsRequest = requestUrlObject !== null && isHlsResource(requestUrlObject);
 
   // Direct top-level HLS requests skip the redundant liveness probe.
   if (
@@ -499,39 +514,6 @@ function messageFirstClient(clients, message, timeoutMs = FETCH_TIMEOUT_MS) {
   return messageClient(clients[0], message, timeoutMs);
 }
 
-function hlsRequestFlightKey(
-  clients,
-  requestUrl,
-  method,
-  range,
-  ifNoneMatch,
-  ifRange
-) {
-  if (!clients.length || !clients[0] || !clients[0].id) {
-    return null;
-  }
-
-  const url = new URL(requestUrl);
-  const hlsRoute = rawRouteMarkers().some(([marker, rawType]) =>
-    rawType === "hls-bytes" && url.pathname.startsWith(marker)
-  );
-  const hlsAsset = hlsRoute && canonicalRawResource(url) !== null;
-  const feedManifest = canonicalFeedResource(url) !== null;
-  if (!hlsAsset && !feedManifest) {
-    return null;
-  }
-
-  return [
-    clients[0].id,
-    method.toUpperCase(),
-    url.pathname.toLowerCase(),
-    url.search,
-    range.trim().toLowerCase(),
-    ifNoneMatch.trim(),
-    ifRange.trim()
-  ].join("|");
-}
-
 function requestRustFetch(
   clients,
   requestUrl,
@@ -541,32 +523,7 @@ function requestRustFetch(
   ifNoneMatch = "",
   ifRange = ""
 ) {
-  const key = hlsRequestFlightKey(
-    clients,
-    requestUrl,
-    method,
-    range,
-    ifNoneMatch,
-    ifRange
-  );
-  if (!key) {
-    return messageFirstClient(clients, {
-      type: "WEEB3_FETCH_REQUEST",
-      url: requestUrl,
-      method,
-      range,
-      networkId,
-      ifNoneMatch,
-      ifRange
-    });
-  }
-
-  const existing = HLS_REQUEST_FLIGHTS.get(key);
-  if (existing) {
-    return existing;
-  }
-
-  const pending = messageFirstClient(clients, {
+  return messageFirstClient(clients, {
     type: "WEEB3_FETCH_REQUEST",
     url: requestUrl,
     method,
@@ -575,14 +532,6 @@ function requestRustFetch(
     ifNoneMatch,
     ifRange
   });
-  let tracked;
-  tracked = pending.finally(() => {
-    if (HLS_REQUEST_FLIGHTS.get(key) === tracked) {
-      HLS_REQUEST_FLIGHTS.delete(key);
-    }
-  });
-  HLS_REQUEST_FLIGHTS.set(key, tracked);
-  return tracked;
 }
 
 function toUint8Array(body) {
@@ -608,14 +557,18 @@ function responseHeaders(headerRows) {
   return headers;
 }
 
-function requestRustRange(clients, url, start, end, networkId, streamToken = "") {
-  return messageFirstClient(clients, {
+function requestRustRange(clients, url, start, end, networkId) {
+  const key = `${clients[0]?.id || ""}|${networkId}|${url}|${start}|${end}`;
+  const existing = RANGE_REQUEST_FLIGHTS.get(key);
+  if (existing) {
+    return existing;
+  }
+  const request = messageFirstClient(clients, {
     type: "WEEB3_FETCH_REQUEST",
     url,
     method: "GET",
     range: `bytes=${start}-${end}`,
-    networkId,
-    streamToken
+    networkId
   }).then((response) => {
     if (!response || !response.ok) {
       return response || { ok: false, status: 503, error: "empty weeb-3 range response" };
@@ -633,17 +586,13 @@ function requestRustRange(clients, url, start, end, networkId, streamToken = "")
 
     return { ok: true, body };
   });
-}
-
-function parseCriticalPrefixWindows(value, size) {
-  if (!/^[1-9][0-9]*$/.test(value || "") || !Number.isSafeInteger(size) || size <= 0) {
-    return null;
-  }
-  const requested = Number(value);
-  const total = Math.ceil(size / STREAM_STORAGE_WINDOW_BYTES);
-  return Number.isSafeInteger(requested) && requested > 0
-    ? Math.min(requested, total)
-    : null;
+  RANGE_REQUEST_FLIGHTS.set(key, request);
+  request.finally(() => {
+    if (RANGE_REQUEST_FLIGHTS.get(key) === request) {
+      RANGE_REQUEST_FLIGHTS.delete(key);
+    }
+  }).catch(() => {});
+  return request;
 }
 
 function createRustRangeStream(
@@ -651,128 +600,58 @@ function createRustRangeStream(
   url,
   size,
   networkId,
-  stagedStart,
-  streamToken = "",
-  criticalPrefixWindows = null
+  windowBytes,
+  initialLookahead,
+  lookahead
 ) {
   let position = 0;
   let schedulePosition = 0;
-  const lookahead = stagedStart ? HLS_STREAM_LOOKAHEAD_CHUNKS : STREAM_LOOKAHEAD_CHUNKS;
-  const managedPrefixEnd = stagedStart && Number.isSafeInteger(criticalPrefixWindows)
-    ? Math.min(size, criticalPrefixWindows * STREAM_STORAGE_WINDOW_BYTES)
-    : 0;
-  let schedulingAdmissionOpen = true;
-  let lookaheadAdmitted = !stagedStart;
-  let knownRangeFailure = false;
+  let admissionOpen = true;
   const scheduled = new Map();
-  const activeRequests = new Map();
-  const retainedResponses = new Map();
 
   const nextRangeBounds = () => {
-    if (!schedulingAdmissionOpen || schedulePosition >= size) {
+    if (!admissionOpen || schedulePosition >= size) {
       return null;
     }
 
     const start = schedulePosition;
-    const end = Math.min(start + STREAM_STORAGE_WINDOW_BYTES - 1, size - 1);
+    const end = Math.min(start + windowBytes - 1, size - 1);
     schedulePosition = end + 1;
     return { start, end };
   };
 
-  const admitOrdinaryRange = () => {
+  const admitRange = () => {
     const range = nextRangeBounds();
     if (!range) {
       return null;
     }
     const { start, end } = range;
-    const request = requestRustRange(clients, url, start, end, networkId, streamToken);
+    const request = requestRustRange(clients, url, start, end, networkId);
     scheduled.set(start, request);
     return { start, request };
   };
 
-  const admitStagedRange = () => {
-    const range = nextRangeBounds();
-    if (!range) {
-      return null;
-    }
-    const { start, end } = range;
-    const pending = requestRustRange(clients, url, start, end, networkId, streamToken);
-    let request;
-    request = pending.then(
-      (response) => {
-        activeRequests.delete(start);
-        const result = { response };
-        retainedResponses.set(start, result);
-        if (!response || !response.ok) {
-          knownRangeFailure = true;
-        } else if (schedulingAdmissionOpen && position >= managedPrefixEnd) {
-          scheduleMore();
-        }
-        return result;
-      },
-      (error) => {
-        activeRequests.delete(start);
-        const result = { error };
-        retainedResponses.set(start, result);
-        knownRangeFailure = true;
-        return result;
-      }
-    );
-    activeRequests.set(start, request);
-    return { start, request };
-  };
-
   const scheduleMore = () => {
-    if (!schedulingAdmissionOpen || !lookaheadAdmitted || knownRangeFailure) {
-      return;
-    }
-
-    if (!stagedStart) {
-      while (schedulePosition < size && scheduled.size < lookahead) {
-        if (!admitOrdinaryRange()) {
-          break;
-        }
-      }
-      return;
-    }
-
-    if (position < managedPrefixEnd) {
-      if (activeRequests.size + retainedResponses.size < 1) {
-        admitStagedRange();
-      }
-      return;
-    }
-
-    while (
-      schedulePosition < size
-      && activeRequests.size < HLS_STREAM_LOOKAHEAD_CHUNKS
-      && retainedResponses.size < HLS_STREAM_READY_ADMISSION_THRESHOLD
-      && activeRequests.size + retainedResponses.size < HLS_STREAM_MAX_OUTSTANDING
-    ) {
-      if (!admitStagedRange()) {
+    const limit = position < initialLookahead * windowBytes ? initialLookahead : lookahead;
+    while (admissionOpen && schedulePosition < size && scheduled.size < limit) {
+      if (!admitRange()) {
         break;
       }
     }
   };
 
   const drainScheduledRanges = () => {
-    const dispatched = stagedStart
-      ? Array.from(activeRequests.values())
-      : Array.from(scheduled.values());
-    return Promise.allSettled(dispatched).then(() => {
-      activeRequests.clear();
-      retainedResponses.clear();
+    return Promise.allSettled(Array.from(scheduled.values())).then(() => {
       scheduled.clear();
     });
   };
 
   const closeAdmission = () => {
-    schedulingAdmissionOpen = false;
-    lookaheadAdmitted = false;
+    admissionOpen = false;
   };
 
   const failStream = async (controller, error) => {
-    if (!schedulingAdmissionOpen) {
+    if (!admissionOpen) {
       return;
     }
     closeAdmission();
@@ -790,58 +669,24 @@ function createRustRangeStream(
           return;
         }
 
-        if (lookaheadAdmitted) {
-          scheduleMore();
-        }
-        const start = Math.floor(position / STREAM_STORAGE_WINDOW_BYTES) * STREAM_STORAGE_WINDOW_BYTES;
-        let response;
-        if (stagedStart) {
-          let result = retainedResponses.get(start);
-          if (!result) {
-            let request = activeRequests.get(start);
-            if (!request) {
-              const foreground = admitStagedRange();
-              if (!foreground || foreground.start !== start) {
-                await failStream(
-                  controller,
-                  new Error("weeb-3 foreground stream window was not admitted")
-                );
-                return;
-              }
-              request = foreground.request;
-            }
-            result = await request;
-          }
-          retainedResponses.delete(start);
-          if (!schedulingAdmissionOpen) {
-            return;
-          }
-          if (result.error) {
+        scheduleMore();
+        const start = Math.floor(position / windowBytes) * windowBytes;
+        let pending = scheduled.get(start);
+        if (!pending) {
+          const foreground = admitRange();
+          if (!foreground || foreground.start !== start) {
             await failStream(
               controller,
-              result.error instanceof Error ? result.error : new Error(String(result.error))
+              new Error("weeb-3 foreground stream window was not admitted")
             );
             return;
           }
-          response = result.response;
-        } else {
-          let request = scheduled.get(start);
-          if (!request) {
-            const foreground = admitOrdinaryRange();
-            if (!foreground || foreground.start !== start) {
-              await failStream(
-                controller,
-                new Error("weeb-3 foreground stream window was not admitted")
-              );
-              return;
-            }
-            request = foreground.request;
-          }
-          response = await request;
-          scheduled.delete(start);
+          pending = foreground.request;
         }
+        const response = await pending;
+        scheduled.delete(start);
 
-        if (!schedulingAdmissionOpen) {
+        if (!admissionOpen) {
           return;
         }
         if (!response || !response.ok) {
@@ -855,10 +700,9 @@ function createRustRangeStream(
         const body = toUint8Array(response.body);
         position = start + body.byteLength;
         controller.enqueue(body);
-        lookaheadAdmitted = true;
         scheduleMore();
       } catch (error) {
-        if (schedulingAdmissionOpen) {
+        if (admissionOpen) {
           await failStream(controller, error);
         }
       }
@@ -878,14 +722,15 @@ async function forwardRequestToRust(request, event) {
       return new Response("weeb-3 route is outside the configured scope", { status: 400 });
     }
     const clients = await requestClients(event, request.url, networkId);
+    const hlsResource = isHlsResource(url);
     const response = await requestRustFetch(
       clients,
       request.url,
       request.method,
-      request.headers.get("Range") || "",
+      hlsResource ? "" : request.headers.get("Range") || "",
       networkId,
       request.headers.get("If-None-Match") || "",
-      request.headers.get("If-Range") || ""
+      hlsResource ? "" : request.headers.get("If-Range") || ""
     );
 
     const status = Number(response.status || (response.ok ? 200 : 404));
@@ -900,22 +745,28 @@ async function forwardRequestToRust(request, event) {
 
     if (response.stream && request.method !== "HEAD") {
       const size = Number(headers.get("Content-Length") || "0");
-      const stagedStart = headers.get("X-Weeb3-Stream-Start") === "1";
-      const streamToken = headers.get("X-Weeb3-Stream-Token") || "";
-      const criticalPrefixWindows = stagedStart
-        ? parseCriticalPrefixWindows(
-            headers.get("X-Weeb3-HLS-Critical-Prefix-Windows"),
-            size
-          )
-        : null;
+      if (!Number.isSafeInteger(size) || size <= 0) {
+        return new Response("weeb-3 stream response has an invalid length", { status: 502 });
+      }
+      const liveHlsResource = hlsResource && url.searchParams.get("start") === "live";
+      const startupHlsResource = hlsResource && url.searchParams.get("startup") === "1";
+      const windowBytes = liveHlsResource
+        ? HLS_LIVE_STREAM_WINDOW_BYTES
+        : hlsResource ? HLS_STREAM_WINDOW_BYTES : STREAM_STORAGE_WINDOW_BYTES;
+      const lookahead = liveHlsResource
+        ? HLS_LIVE_STREAM_LOOKAHEAD_CHUNKS
+        : hlsResource ? HLS_STREAM_LOOKAHEAD_CHUNKS : STREAM_LOOKAHEAD_CHUNKS;
+      const initialLookahead = startupHlsResource
+        ? HLS_STREAM_INITIAL_LOOKAHEAD_CHUNKS
+        : lookahead;
       return new Response(createRustRangeStream(
         clients,
         request.url,
         size,
         networkId,
-        stagedStart,
-        streamToken,
-        criticalPrefixWindows
+        windowBytes,
+        initialLookahead,
+        lookahead
       ), {
         status,
         headers

package/weeb_3.d.ts

@@ -84,12 +84,11 @@ export interface InitOutput {
     readonly __wbg_requestarguments_free: (a: number, b: number) => void;
     readonly requestarguments_method: (a: number, b: number) => void;
     readonly requestarguments_params: (a: number) => number;
-    readonly __wasm_bindgen_func_elem_655: (a: number, b: number) => void;
-    readonly __wasm_bindgen_func_elem_1763: (a: number, b: number, c: number, d: number) => void;
-    readonly __wasm_bindgen_func_elem_1765: (a: number, b: number, c: number, d: number) => void;
-    readonly __wasm_bindgen_func_elem_4122: (a: number, b: number, c: number) => void;
-    readonly __wasm_bindgen_func_elem_1768: (a: number, b: number) => number;
-    readonly __wasm_bindgen_func_elem_4048: (a: number, b: number) => void;
+    readonly __wasm_bindgen_func_elem_526: (a: number, b: number) => void;
+    readonly __wasm_bindgen_func_elem_1388: (a: number, b: number, c: number, d: number) => void;
+    readonly __wasm_bindgen_func_elem_1390: (a: number, b: number, c: number, d: number) => void;
+    readonly __wasm_bindgen_func_elem_3379: (a: number, b: number, c: number) => void;
+    readonly __wasm_bindgen_func_elem_3305: (a: number, b: number) => void;
     readonly __wbindgen_export: (a: number, b: number) => number;
     readonly __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;
     readonly __wbindgen_export3: (a: number) => void;

package/weeb_3.js

@@ -507,10 +507,6 @@ function __wbg_get_imports() {
         __wbg_attachMedia_82d779df2fa8e98f: function() { return handleError(function (arg0, arg1) {
             getObject(arg0).attachMedia(getObject(arg1));
         }, arguments); },
-        __wbg_autoplay_f8612a2035bfaa92: function(arg0) {
-            const ret = getObject(arg0).autoplay;
-            return ret;
-        },
         __wbg_body_f67922363a220026: function(arg0) {
             const ret = getObject(arg0).body;
             return isLikeNone(ret) ? 0 : addHeapObject(ret);
@@ -619,17 +615,9 @@ function __wbg_get_imports() {
             const ret = decodeURIComponent(getStringFromWasm0(arg0, arg1));
             return addHeapObject(ret);
         }, arguments); },
-        __wbg_deleteProperty_8c8a05da881fea59: function() { return handleError(function (arg0, arg1) {
-            const ret = Reflect.deleteProperty(getObject(arg0), getObject(arg1));
-            return ret;
-        }, arguments); },
         __wbg_destroy_91b983e1d85d5306: function() { return handleError(function (arg0) {
             getObject(arg0).destroy();
         }, arguments); },
-        __wbg_dispatchEvent_dc8dcc7ddca11378: function() { return handleError(function (arg0, arg1) {
-            const ret = getObject(arg0).dispatchEvent(getObject(arg1));
-            return ret;
-        }, arguments); },
         __wbg_document_ee35a3d3ae34ef6c: function(arg0) {
             const ret = getObject(arg0).document;
             return isLikeNone(ret) ? 0 : addHeapObject(ret);
@@ -673,13 +661,6 @@ function __wbg_get_imports() {
                 wasm.__wbindgen_export4(deferred0_0, deferred0_1, 1);
             }
         },
-        __wbg_error_92029508b8bd6459: function(arg0) {
-            const ret = getObject(arg0).error;
-            return isLikeNone(ret) ? 0 : addHeapObject(ret);
-        },
-        __wbg_error_f852e41c69b0bd84: function(arg0, arg1) {
-            console.error(getObject(arg0), getObject(arg1));
-        },
         __wbg_fetch_afb6a4b6cacf876d: function(arg0, arg1) {
             const ret = getObject(arg0).fetch(getObject(arg1));
             return addHeapObject(ret);
@@ -710,13 +691,6 @@ function __wbg_get_imports() {
             const ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2));
             return isLikeNone(ret) ? 0 : addHeapObject(ret);
         },
-        __wbg_getItem_0c792d344808dcf5: function() { return handleError(function (arg0, arg1, arg2, arg3) {
-            const ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3));
-            var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_export, wasm.__wbindgen_export2);
-            var len1 = WASM_VECTOR_LEN;
-            getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
-            getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
-        }, arguments); },
         __wbg_getRandomValues_a8ddca022803a145: function() { return handleError(function (arg0, arg1) {
             globalThis.crypto.getRandomValues(getArrayU8FromWasm0(arg0, arg1));
         }, arguments); },
@@ -1057,10 +1031,6 @@ function __wbg_get_imports() {
             const ret = Number.isSafeInteger(getObject(arg0));
             return ret;
         },
-        __wbg_is_f29129f676e5410c: function(arg0, arg1) {
-            const ret = Object.is(getObject(arg0), getObject(arg1));
-            return ret;
-        },
         __wbg_item_c79c0bccbcfd8735: function(arg0, arg1) {
             const ret = getObject(arg0).item(arg1 >>> 0);
             return isLikeNone(ret) ? 0 : addHeapObject(ret);
@@ -1095,10 +1065,6 @@ function __wbg_get_imports() {
         __wbg_load_fd01b3436024937e: function(arg0) {
             getObject(arg0).load();
         },
-        __wbg_localStorage_a22d31b9eacc4594: function() { return handleError(function (arg0) {
-            const ret = getObject(arg0).localStorage;
-            return isLikeNone(ret) ? 0 : addHeapObject(ret);
-        }, arguments); },
         __wbg_location_df7ca06c93e51763: function(arg0) {
             const ret = getObject(arg0).location;
             return addHeapObject(ret);
@@ -1121,13 +1087,6 @@ function __wbg_get_imports() {
             getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
             getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
         },
-        __wbg_message_93b760d80b5095a7: function(arg0, arg1) {
-            const ret = getObject(arg1).message;
-            const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export, wasm.__wbindgen_export2);
-            const len1 = WASM_VECTOR_LEN;
-            getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
-            getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
-        },
         __wbg_message_9ddc4b9a62a7c379: function(arg0) {
             const ret = getObject(arg0).message;
             return addHeapObject(ret);
@@ -1194,7 +1153,7 @@ function __wbg_get_imports() {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return __wasm_bindgen_func_elem_1763(a, state0.b, arg0, arg1);
+                        return __wasm_bindgen_func_elem_1388(a, state0.b, arg0, arg1);
                     } finally {
                         state0.a = a;
                     }
@@ -1237,10 +1196,6 @@ function __wbg_get_imports() {
             const ret = new URL(getStringFromWasm0(arg0, arg1), getStringFromWasm0(arg2, arg3));
             return addHeapObject(ret);
         }, arguments); },
-        __wbg_new_with_event_init_dict_48877e7ca125f3c1: function() { return handleError(function (arg0, arg1, arg2) {
-            const ret = new CustomEvent(getStringFromWasm0(arg0, arg1), getObject(arg2));
-            return addHeapObject(ret);
-        }, arguments); },
         __wbg_new_with_length_a2c39cbe88fd8ff1: function(arg0) {
             const ret = new Uint8Array(arg0 >>> 0);
             return addHeapObject(ret);
@@ -1317,10 +1272,6 @@ function __wbg_get_imports() {
             const ret = getObject(arg0).parentNode;
             return isLikeNone(ret) ? 0 : addHeapObject(ret);
         },
-        __wbg_parse_708461a1feddfb38: function() { return handleError(function (arg0, arg1) {
-            const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
-            return addHeapObject(ret);
-        }, arguments); },
         __wbg_pathname_b2267fae358b49a7: function() { return handleError(function (arg0, arg1) {
             const ret = getObject(arg1).pathname;
             const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export, wasm.__wbindgen_export2);
@@ -1411,6 +1362,10 @@ function __wbg_get_imports() {
             const ret = getObject(arg0).readyState;
             return ret;
         },
+        __wbg_readyState_ce115112bd7cd7fd: function(arg0) {
+            const ret = getObject(arg0).readyState;
+            return ret;
+        },
         __wbg_ready_7150dfa3536a3a07: function() { return handleError(function (arg0) {
             const ret = getObject(arg0).ready;
             return addHeapObject(ret);
@@ -1496,9 +1451,6 @@ function __wbg_get_imports() {
             const ret = getObject(arg0).setInterval(getObject(arg1), arg2, ...getObject(arg3));
             return ret;
         }, arguments); },
-        __wbg_setItem_cf340bb2edbd3089: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
-            getObject(arg0).setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
-        }, arguments); },
         __wbg_setTimeout_db2dbaeefb6f39c7: function() { return handleError(function (arg0, arg1) {
             const ret = setTimeout(getObject(arg0), arg1);
             return addHeapObject(ret);
@@ -1525,9 +1477,6 @@ function __wbg_get_imports() {
         __wbg_set_auto_increment_5ef604f4f193fa58: function(arg0, arg1) {
             getObject(arg0).autoIncrement = arg1 !== 0;
         },
-        __wbg_set_autoplay_a63d23ab32fd1826: function(arg0, arg1) {
-            getObject(arg0).autoplay = arg1 !== 0;
-        },
         __wbg_set_binaryType_5bbf62e9f705dc1a: function(arg0, arg1) {
             getObject(arg0).binaryType = __wbindgen_enum_BinaryType[arg1];
         },
@@ -1549,9 +1498,6 @@ function __wbg_get_imports() {
         __wbg_set_defaultMuted_0914fbde28650af7: function(arg0, arg1) {
             getObject(arg0).defaultMuted = arg1 !== 0;
         },
-        __wbg_set_detail_fa3b358526be3a85: function(arg0, arg1) {
-            getObject(arg0).detail = getObject(arg1);
-        },
         __wbg_set_f43e577aea94465b: function(arg0, arg1, arg2) {
             getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
         },
@@ -1615,9 +1561,6 @@ function __wbg_get_imports() {
         __wbg_set_onupgradeneeded_c887b74722b6ce77: function(arg0, arg1) {
             getObject(arg0).onupgradeneeded = getObject(arg1);
         },
-        __wbg_set_preload_8046ead18b4d246a: function(arg0, arg1, arg2) {
-            getObject(arg0).preload = getStringFromWasm0(arg1, arg2);
-        },
         __wbg_set_scope_c18e6f8045aa3843: function(arg0, arg1, arg2) {
             getObject(arg0).scope = getStringFromWasm0(arg1, arg2);
         },
@@ -1658,9 +1601,6 @@ function __wbg_get_imports() {
             getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
             getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
         },
-        __wbg_startLoad_d877e6e759d0a5db: function() { return handleError(function (arg0) {
-            getObject(arg0).startLoad();
-        }, arguments); },
         __wbg_startLoad_fd7412d1aeb0bf78: function() { return handleError(function (arg0, arg1) {
             getObject(arg0).startLoad(arg1);
         }, arguments); },
@@ -1780,78 +1720,70 @@ function __wbg_get_imports() {
             const ret = getObject(arg0).waiting;
             return isLikeNone(ret) ? 0 : addHeapObject(ret);
         },
-        __wbg_warn_675337722fd1fc03: function(arg0, arg1) {
-            console.warn(getObject(arg0), getObject(arg1));
-        },
         __wbg_warn_f7ae1b2e66ccb930: function(arg0) {
             console.warn(getObject(arg0));
         },
         __wbindgen_cast_0000000000000001: function(arg0, arg1) {
             // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [Externref, Externref], shim_idx: 21, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_655, __wasm_bindgen_func_elem_1763);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_526, __wasm_bindgen_func_elem_1388);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000002: function(arg0, arg1) {
             // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [Externref], shim_idx: 4, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_655, __wasm_bindgen_func_elem_4122);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_526, __wasm_bindgen_func_elem_3379);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000003: function(arg0, arg1) {
             // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [NamedExternref("CloseEvent")], shim_idx: 4, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_655, __wasm_bindgen_func_elem_4122);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_526, __wasm_bindgen_func_elem_3379);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000004: function(arg0, arg1) {
             // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [NamedExternref("Event")], shim_idx: 4, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_655, __wasm_bindgen_func_elem_4122);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_526, __wasm_bindgen_func_elem_3379);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000005: function(arg0, arg1) {
             // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [NamedExternref("IDBVersionChangeEvent")], shim_idx: 23, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_655, __wasm_bindgen_func_elem_1765);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_526, __wasm_bindgen_func_elem_1390);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000006: function(arg0, arg1) {
             // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 4, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_655, __wasm_bindgen_func_elem_4122);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_526, __wasm_bindgen_func_elem_3379);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000007: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [], shim_idx: 101, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_655, __wasm_bindgen_func_elem_4048);
-            return addHeapObject(ret);
-        },
-        __wbindgen_cast_0000000000000008: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [], shim_idx: 25, ret: Externref, inner_ret: Some(Externref) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_655, __wasm_bindgen_func_elem_1768);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [], shim_idx: 95, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_526, __wasm_bindgen_func_elem_3305);
             return addHeapObject(ret);
         },
-        __wbindgen_cast_0000000000000009: function(arg0) {
+        __wbindgen_cast_0000000000000008: function(arg0) {
             // Cast intrinsic for `F64 -> Externref`.
             const ret = arg0;
             return addHeapObject(ret);
         },
-        __wbindgen_cast_000000000000000a: function(arg0) {
+        __wbindgen_cast_0000000000000009: function(arg0) {
             // Cast intrinsic for `I64 -> Externref`.
             const ret = arg0;
             return addHeapObject(ret);
         },
-        __wbindgen_cast_000000000000000b: function(arg0, arg1) {
+        __wbindgen_cast_000000000000000a: function(arg0, arg1) {
             // Cast intrinsic for `Ref(Slice(U8)) -> NamedExternref("Uint8Array")`.
             const ret = getArrayU8FromWasm0(arg0, arg1);
             return addHeapObject(ret);
         },
-        __wbindgen_cast_000000000000000c: function(arg0, arg1) {
+        __wbindgen_cast_000000000000000b: function(arg0, arg1) {
             // Cast intrinsic for `Ref(String) -> Externref`.
             const ret = getStringFromWasm0(arg0, arg1);
             return addHeapObject(ret);
         },
-        __wbindgen_cast_000000000000000d: function(arg0) {
+        __wbindgen_cast_000000000000000c: function(arg0) {
             // Cast intrinsic for `U64 -> Externref`.
             const ret = BigInt.asUintN(64, arg0);
             return addHeapObject(ret);
         },
-        __wbindgen_cast_000000000000000e: function(arg0, arg1) {
+        __wbindgen_cast_000000000000000d: function(arg0, arg1) {
             var v0 = getArrayU8FromWasm0(arg0, arg1).slice();
             wasm.__wbindgen_export4(arg0, arg1 * 1, 1);
             // Cast intrinsic for `Vector(U8) -> Externref`.
@@ -1876,27 +1808,22 @@ function __wbg_get_imports() {
     };
 }
 
-function __wasm_bindgen_func_elem_4048(arg0, arg1) {
-    wasm.__wasm_bindgen_func_elem_4048(arg0, arg1);
-}
-
-function __wasm_bindgen_func_elem_1768(arg0, arg1) {
-    const ret = wasm.__wasm_bindgen_func_elem_1768(arg0, arg1);
-    return takeObject(ret);
+function __wasm_bindgen_func_elem_3305(arg0, arg1) {
+    wasm.__wasm_bindgen_func_elem_3305(arg0, arg1);
 }
 
-function __wasm_bindgen_func_elem_4122(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_4122(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_3379(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_3379(arg0, arg1, addHeapObject(arg2));
 }
 
-function __wasm_bindgen_func_elem_1763(arg0, arg1, arg2, arg3) {
-    wasm.__wasm_bindgen_func_elem_1763(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wasm_bindgen_func_elem_1388(arg0, arg1, arg2, arg3) {
+    wasm.__wasm_bindgen_func_elem_1388(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
-function __wasm_bindgen_func_elem_1765(arg0, arg1, arg2) {
+function __wasm_bindgen_func_elem_1390(arg0, arg1, arg2) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.__wasm_bindgen_func_elem_1765(retptr, arg0, arg1, addHeapObject(arg2));
+        wasm.__wasm_bindgen_func_elem_1390(retptr, arg0, arg1, addHeapObject(arg2));
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         if (r1) {

package/weeb_3_bg.wasm.d.ts

@@ -32,12 +32,11 @@ export const weeb3no103_uploadWithRedundancy: (a: number, b: number, c: number,
 export const __wbg_requestarguments_free: (a: number, b: number) => void;
 export const requestarguments_method: (a: number, b: number) => void;
 export const requestarguments_params: (a: number) => number;
-export const __wasm_bindgen_func_elem_655: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_1763: (a: number, b: number, c: number, d: number) => void;
-export const __wasm_bindgen_func_elem_1765: (a: number, b: number, c: number, d: number) => void;
-export const __wasm_bindgen_func_elem_4122: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_1768: (a: number, b: number) => number;
-export const __wasm_bindgen_func_elem_4048: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_526: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_1388: (a: number, b: number, c: number, d: number) => void;
+export const __wasm_bindgen_func_elem_1390: (a: number, b: number, c: number, d: number) => void;
+export const __wasm_bindgen_func_elem_3379: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_3305: (a: number, b: number) => void;
 export const __wbindgen_export: (a: number, b: number) => number;
 export const __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export3: (a: number) => void;