@lat-murmeldjur/weeb_3 0.0.332001 → 0.0.333001

package/package.json

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

package/service.js

@@ -10,10 +10,11 @@ const RAW_ROUTE_KINDS = [
 ];
 const FETCH_TIMEOUT_MS = 240000;
 const SERVICE_WORKER_MARKER = "forwarder-default20";
-const SERVICE_WORKER_PROTOCOL = 5;
+const SERVICE_WORKER_PROTOCOL = 7;
 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_REQUEST_FLIGHTS = new Map();
 const CLIENT_RUNTIME_PROBES = new Map();
 const CLIENT_RUNTIME_PROBE_TIMEOUT_MS = 1_500;
@@ -604,13 +605,14 @@ function responseHeaders(headerRows) {
   return headers;
 }
 
-function requestRustRange(clients, url, start, end, networkId) {
+function requestRustRange(clients, url, start, end, networkId, streamToken = "") {
   return messageFirstClient(clients, {
     type: "WEEB3_FETCH_REQUEST",
     url,
     method: "GET",
     range: `bytes=${start}-${end}`,
-    networkId
+    networkId,
+    streamToken
   }).then((response) => {
     if (!response || !response.ok) {
       return response || { ok: false, status: 503, error: "empty weeb-3 range response" };
@@ -630,22 +632,45 @@ function requestRustRange(clients, url, start, end, networkId) {
   });
 }
 
-function createRustRangeStream(clients, url, size, networkId, stagedStart) {
+function createRustRangeStream(clients, url, size, networkId, stagedStart, streamToken = "") {
   let position = 0;
   let schedulePosition = 0;
-  let stagedWindows = stagedStart ? 4 : 0;
+  const lookahead = stagedStart ? HLS_STREAM_LOOKAHEAD_CHUNKS : STREAM_LOOKAHEAD_CHUNKS;
+  let schedulingAdmissionOpen = true;
+  let lookaheadAdmitted = !stagedStart;
   const scheduled = new Map();
 
+  const admitNextRange = () => {
+    if (!schedulingAdmissionOpen || schedulePosition >= size) {
+      return null;
+    }
+
+    const start = schedulePosition;
+    const end = Math.min(start + STREAM_STORAGE_WINDOW_BYTES - 1, size - 1);
+    const request = requestRustRange(clients, url, start, end, networkId, streamToken);
+    scheduled.set(start, request);
+    schedulePosition = end + 1;
+    return { start, request };
+  };
+
   const scheduleMore = () => {
-    const lookahead = stagedWindows > 0 ? 4 : STREAM_LOOKAHEAD_CHUNKS;
+    if (!schedulingAdmissionOpen || !lookaheadAdmitted) {
+      return;
+    }
     while (schedulePosition < size && scheduled.size < lookahead) {
-      const start = schedulePosition;
-      const end = Math.min(start + STREAM_STORAGE_WINDOW_BYTES - 1, size - 1);
-      scheduled.set(start, requestRustRange(clients, url, start, end, networkId));
-      schedulePosition = end + 1;
+      if (!admitNextRange()) {
+        break;
+      }
     }
   };
 
+  const drainScheduledRanges = () => {
+    const dispatched = Array.from(scheduled.values());
+    return Promise.allSettled(dispatched).then(() => {
+      scheduled.clear();
+    });
+  };
+
   return new ReadableStream({
     async pull(controller) {
       try {
@@ -654,16 +679,25 @@ function createRustRangeStream(clients, url, size, networkId, stagedStart) {
           return;
         }
 
-        scheduleMore();
+        if (lookaheadAdmitted) {
+          scheduleMore();
+        }
         const start = Math.floor(position / STREAM_STORAGE_WINDOW_BYTES) * STREAM_STORAGE_WINDOW_BYTES;
-        const request = scheduled.get(start);
+        let request = scheduled.get(start);
         if (!request) {
-          controller.error(new Error("weeb-3 stream window was not scheduled"));
-          return;
+          const foreground = admitNextRange();
+          if (!foreground || foreground.start !== start) {
+            controller.error(new Error("weeb-3 foreground stream window was not admitted"));
+            return;
+          }
+          request = foreground.request;
         }
 
         const response = await request;
         scheduled.delete(start);
+        if (!schedulingAdmissionOpen) {
+          return;
+        }
         if (!response || !response.ok) {
           controller.error(new Error(response && response.error ? response.error : "weeb-3 range request failed"));
           return;
@@ -672,14 +706,18 @@ function createRustRangeStream(clients, url, size, networkId, stagedStart) {
         const body = toUint8Array(response.body);
         position = start + body.byteLength;
         controller.enqueue(body);
-        stagedWindows = Math.max(0, stagedWindows - 1);
+        lookaheadAdmitted = true;
         scheduleMore();
       } catch (error) {
-        controller.error(error);
+        if (schedulingAdmissionOpen) {
+          controller.error(error);
+        }
       }
     },
     cancel() {
-      scheduled.clear();
+      schedulingAdmissionOpen = false;
+      lookaheadAdmitted = false;
+      return drainScheduledRanges();
     }
   });
 }
@@ -715,7 +753,15 @@ 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";
-      return new Response(createRustRangeStream(clients, request.url, size, networkId, stagedStart), {
+      const streamToken = headers.get("X-Weeb3-Stream-Token") || "";
+      return new Response(createRustRangeStream(
+        clients,
+        request.url,
+        size,
+        networkId,
+        stagedStart,
+        streamToken
+      ), {
         status,
         headers
       });

package/weeb_3.d.ts

@@ -84,11 +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_591: (a: number, b: number) => void;
-    readonly __wasm_bindgen_func_elem_1589: (a: number, b: number, c: number, d: number) => void;
-    readonly __wasm_bindgen_func_elem_1591: (a: number, b: number, c: number, d: number) => void;
-    readonly __wasm_bindgen_func_elem_3752: (a: number, b: number, c: number) => void;
-    readonly __wasm_bindgen_func_elem_3678: (a: number, b: number) => void;
+    readonly __wasm_bindgen_func_elem_628: (a: number, b: number) => void;
+    readonly __wasm_bindgen_func_elem_1685: (a: number, b: number, c: number, d: number) => void;
+    readonly __wasm_bindgen_func_elem_1687: (a: number, b: number, c: number, d: number) => void;
+    readonly __wasm_bindgen_func_elem_3888: (a: number, b: number, c: number) => void;
+    readonly __wasm_bindgen_func_elem_3814: (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

@@ -634,6 +634,10 @@ function __wbg_get_imports() {
             const ret = getObject(arg0).done;
             return ret;
         },
+        __wbg_duration_56d63063c1dcc6d7: function(arg0) {
+            const ret = getObject(arg0).duration;
+            return ret;
+        },
         __wbg_encodeURIComponent_46e9eafddd38cb39: function(arg0, arg1) {
             const ret = encodeURIComponent(getStringFromWasm0(arg0, arg1));
             return addHeapObject(ret);
@@ -1182,7 +1186,7 @@ function __wbg_get_imports() {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return __wasm_bindgen_func_elem_1589(a, state0.b, arg0, arg1);
+                        return __wasm_bindgen_func_elem_1685(a, state0.b, arg0, arg1);
                     } finally {
                         state0.a = a;
                     }
@@ -1506,6 +1510,9 @@ 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];
         },
@@ -1593,6 +1600,9 @@ 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);
         },
@@ -1762,38 +1772,38 @@ function __wbg_get_imports() {
             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_591, __wasm_bindgen_func_elem_1589);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [Externref, Externref], shim_idx: 23, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_628, __wasm_bindgen_func_elem_1685);
             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_591, __wasm_bindgen_func_elem_3752);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_628, __wasm_bindgen_func_elem_3888);
             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_591, __wasm_bindgen_func_elem_3752);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_628, __wasm_bindgen_func_elem_3888);
             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_591, __wasm_bindgen_func_elem_3752);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_628, __wasm_bindgen_func_elem_3888);
             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_591, __wasm_bindgen_func_elem_1591);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [NamedExternref("IDBVersionChangeEvent")], shim_idx: 25, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_628, __wasm_bindgen_func_elem_1687);
             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_591, __wasm_bindgen_func_elem_3752);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_628, __wasm_bindgen_func_elem_3888);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000007: function(arg0, arg1) {
             // Cast intrinsic for `Closure(Closure { dtor_idx: 3, function: Function { arguments: [], shim_idx: 99, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_591, __wasm_bindgen_func_elem_3678);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_628, __wasm_bindgen_func_elem_3814);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000008: function(arg0) {
@@ -1846,22 +1856,22 @@ function __wbg_get_imports() {
     };
 }
 
-function __wasm_bindgen_func_elem_3678(arg0, arg1) {
-    wasm.__wasm_bindgen_func_elem_3678(arg0, arg1);
+function __wasm_bindgen_func_elem_3814(arg0, arg1) {
+    wasm.__wasm_bindgen_func_elem_3814(arg0, arg1);
 }
 
-function __wasm_bindgen_func_elem_3752(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_3752(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_3888(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_3888(arg0, arg1, addHeapObject(arg2));
 }
 
-function __wasm_bindgen_func_elem_1589(arg0, arg1, arg2, arg3) {
-    wasm.__wasm_bindgen_func_elem_1589(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wasm_bindgen_func_elem_1685(arg0, arg1, arg2, arg3) {
+    wasm.__wasm_bindgen_func_elem_1685(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
-function __wasm_bindgen_func_elem_1591(arg0, arg1, arg2) {
+function __wasm_bindgen_func_elem_1687(arg0, arg1, arg2) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.__wasm_bindgen_func_elem_1591(retptr, arg0, arg1, addHeapObject(arg2));
+        wasm.__wasm_bindgen_func_elem_1687(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,11 +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_591: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_1589: (a: number, b: number, c: number, d: number) => void;
-export const __wasm_bindgen_func_elem_1591: (a: number, b: number, c: number, d: number) => void;
-export const __wasm_bindgen_func_elem_3752: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_3678: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_628: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_1685: (a: number, b: number, c: number, d: number) => void;
+export const __wasm_bindgen_func_elem_1687: (a: number, b: number, c: number, d: number) => void;
+export const __wasm_bindgen_func_elem_3888: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_3814: (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;