@lat-murmeldjur/weeb_3 0.0.337001 → 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.337001",
+  "version": "0.0.338001",
   "license": "MIT",
   "repository": {
     "type": "git",

package/service.js

@@ -9,15 +9,17 @@ const RAW_ROUTE_KINDS = [
   ["chunks", "chunk"]
 ];
 const FETCH_TIMEOUT_MS = 240000;
-const SERVICE_WORKER_MARKER = "forwarder-default24";
+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_WINDOW_BYTES = MIB_BYTES / 2;
-const HLS_STREAM_LOOKAHEAD_CHUNKS = 8;
-const HLS_LIVE_STREAM_WINDOW_BYTES = 64 * 1024;
-const HLS_LIVE_STREAM_LOOKAHEAD_CHUNKS = 32;
+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;
 
@@ -556,7 +558,12 @@ function responseHeaders(headerRows) {
 }
 
 function requestRustRange(clients, url, start, end, networkId) {
-  return messageFirstClient(clients, {
+  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",
@@ -579,9 +586,24 @@ function requestRustRange(clients, url, start, end, networkId) {
 
     return { ok: true, body };
   });
+  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(clients, url, size, networkId, windowBytes, lookahead) {
+function createRustRangeStream(
+  clients,
+  url,
+  size,
+  networkId,
+  windowBytes,
+  initialLookahead,
+  lookahead
+) {
   let position = 0;
   let schedulePosition = 0;
   let admissionOpen = true;
@@ -610,7 +632,8 @@ function createRustRangeStream(clients, url, size, networkId, windowBytes, looka
   };
 
   const scheduleMore = () => {
-    while (admissionOpen && schedulePosition < size && scheduled.size < lookahead) {
+    const limit = position < initialLookahead * windowBytes ? initialLookahead : lookahead;
+    while (admissionOpen && schedulePosition < size && scheduled.size < limit) {
       if (!admitRange()) {
         break;
       }
@@ -726,18 +749,23 @@ async function forwardRequestToRust(request, event) {
         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,
         windowBytes,
+        initialLookahead,
         lookahead
       ), {
         status,

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_531: (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_3371: (a: number, b: number, c: number) => void;
-    readonly __wasm_bindgen_func_elem_3297: (a: number, b: 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

@@ -572,10 +572,6 @@ function __wbg_get_imports() {
         __wbg_commit_a54edce65f3858f2: function() { return handleError(function (arg0) {
             getObject(arg0).commit();
         }, arguments); },
-        __wbg_config_deb21a1570effbf6: function(arg0) {
-            const ret = getObject(arg0).config;
-            return addHeapObject(ret);
-        },
         __wbg_confirm_0951f3942a645061: function() { return handleError(function (arg0, arg1, arg2) {
             const ret = getObject(arg0).confirm(getStringFromWasm0(arg1, arg2));
             return ret;
@@ -1729,37 +1725,37 @@ function __wbg_get_imports() {
         },
         __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_531, __wasm_bindgen_func_elem_1388);
+            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_531, __wasm_bindgen_func_elem_3371);
+            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_531, __wasm_bindgen_func_elem_3371);
+            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_531, __wasm_bindgen_func_elem_3371);
+            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_531, __wasm_bindgen_func_elem_1390);
+            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_531, __wasm_bindgen_func_elem_3371);
+            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: 95, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_531, __wasm_bindgen_func_elem_3297);
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_526, __wasm_bindgen_func_elem_3305);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000008: function(arg0) {
@@ -1812,12 +1808,12 @@ function __wbg_get_imports() {
     };
 }
 
-function __wasm_bindgen_func_elem_3297(arg0, arg1) {
-    wasm.__wasm_bindgen_func_elem_3297(arg0, arg1);
+function __wasm_bindgen_func_elem_3305(arg0, arg1) {
+    wasm.__wasm_bindgen_func_elem_3305(arg0, arg1);
 }
 
-function __wasm_bindgen_func_elem_3371(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_3371(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_1388(arg0, arg1, arg2, arg3) {

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_531: (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_3371: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_3297: (a: number, b: 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;