@hashtree/worker 0.1.25 → 0.1.26

package/dist/p2p/meshQueryRouter.js

@@ -0,0 +1,228 @@
+import { MAX_HTL, createRequest, decrementHTL, encodeRequest, hashToKey, shouldForward, verifyHash, } from '@hashtree/nostr';
+class SlidingWindowRateLimiter {
+    maxEvents;
+    windowMs;
+    eventsByPeer = new Map();
+    constructor(maxEvents, windowMs) {
+        this.maxEvents = maxEvents;
+        this.windowMs = windowMs;
+    }
+    allow(peerId) {
+        const now = Date.now();
+        const events = this.eventsByPeer.get(peerId) ?? [];
+        let firstActiveIndex = 0;
+        while (firstActiveIndex < events.length && now - events[firstActiveIndex] >= this.windowMs) {
+            firstActiveIndex += 1;
+        }
+        if (firstActiveIndex > 0) {
+            events.splice(0, firstActiveIndex);
+        }
+        if (events.length >= this.maxEvents) {
+            this.eventsByPeer.set(peerId, events);
+            return false;
+        }
+        events.push(now);
+        this.eventsByPeer.set(peerId, events);
+        return true;
+    }
+    resetPeer(peerId) {
+        this.eventsByPeer.delete(peerId);
+    }
+    clear() {
+        this.eventsByPeer.clear();
+    }
+}
+export class MeshQueryRouter {
+    localStore;
+    requestTimeoutMs;
+    rateLimiter;
+    peers = new Map();
+    hashesByRequester = new Map();
+    inFlightByHash = new Map();
+    pendingUpstreamFetches = new Map();
+    upstreamFetch;
+    constructor(config) {
+        this.localStore = config.localStore;
+        this.requestTimeoutMs = config.requestTimeoutMs;
+        this.upstreamFetch = config.upstreamFetch;
+        this.rateLimiter = new SlidingWindowRateLimiter(config.maxForwardsPerPeerWindow ?? 64, config.forwardRateLimitWindowMs ?? 1000);
+    }
+    registerPeer(peer) {
+        this.peers.set(peer.peerId, peer);
+    }
+    removePeer(peerId) {
+        const hashes = this.hashesByRequester.get(peerId);
+        if (hashes) {
+            for (const hashKey of Array.from(hashes)) {
+                const inFlight = this.inFlightByHash.get(hashKey);
+                if (!inFlight)
+                    continue;
+                inFlight.requesterIds.delete(peerId);
+                if (inFlight.requesterIds.size === 0) {
+                    this.clearQuery(hashKey);
+                }
+            }
+        }
+        this.hashesByRequester.delete(peerId);
+        this.peers.delete(peerId);
+        this.rateLimiter.resetPeer(peerId);
+    }
+    setUpstreamFetch(upstreamFetch) {
+        this.upstreamFetch = upstreamFetch;
+    }
+    hasInFlight(hashKey) {
+        return this.inFlightByHash.has(hashKey);
+    }
+    stop() {
+        for (const hashKey of Array.from(this.inFlightByHash.keys())) {
+            this.clearQuery(hashKey);
+        }
+        this.hashesByRequester.clear();
+        this.pendingUpstreamFetches.clear();
+        this.rateLimiter.clear();
+    }
+    async handleRequest(requesterId, req) {
+        const hashKey = hashToKey(req.h);
+        const requester = this.peers.get(requesterId);
+        if (!requester) {
+            return;
+        }
+        const local = await this.localStore.get(req.h);
+        if (local) {
+            await requester.sendResponse(req.h, local);
+            return;
+        }
+        const begin = this.beginQuery(hashKey, requesterId);
+        if (begin === 'suppressed') {
+            requester.onForwardedSuppressed?.();
+            return;
+        }
+        if (begin === 'rate_limited') {
+            return;
+        }
+        const upstreamActive = this.startUpstreamFetch(hashKey, req.h);
+        const forwarded = this.forwardRequest(requesterId, req.h, req.htl ?? MAX_HTL);
+        if (forwarded > 0) {
+            requester.onForwardedRequest?.();
+            return;
+        }
+        if (!upstreamActive) {
+            this.clearQuery(hashKey);
+        }
+    }
+    async resolve(hash, data) {
+        const hashKey = hashToKey(hash);
+        const requesterIds = this.clearQuery(hashKey);
+        if (requesterIds.length === 0) {
+            return;
+        }
+        await this.localStore.put(hash, data).catch(() => false);
+        for (const requesterId of requesterIds) {
+            const requester = this.peers.get(requesterId);
+            if (!requester) {
+                continue;
+            }
+            requester.onForwardedResolved?.();
+            await requester.sendResponse(hash, data);
+        }
+    }
+    beginQuery(hashKey, requesterId) {
+        const existing = this.inFlightByHash.get(hashKey);
+        if (existing) {
+            this.trackRequester(hashKey, existing.requesterIds, requesterId);
+            return 'suppressed';
+        }
+        if (!this.rateLimiter.allow(requesterId)) {
+            return 'rate_limited';
+        }
+        const requesterIds = new Set();
+        this.trackRequester(hashKey, requesterIds, requesterId);
+        const timeoutId = setTimeout(() => {
+            this.clearQuery(hashKey);
+        }, this.requestTimeoutMs);
+        this.inFlightByHash.set(hashKey, { requesterIds, timeoutId });
+        return 'new';
+    }
+    clearQuery(hashKey) {
+        const inFlight = this.inFlightByHash.get(hashKey);
+        if (!inFlight) {
+            return [];
+        }
+        clearTimeout(inFlight.timeoutId);
+        this.inFlightByHash.delete(hashKey);
+        const requesterIds = Array.from(inFlight.requesterIds);
+        for (const requesterId of requesterIds) {
+            const hashes = this.hashesByRequester.get(requesterId);
+            if (!hashes)
+                continue;
+            hashes.delete(hashKey);
+            if (hashes.size === 0) {
+                this.hashesByRequester.delete(requesterId);
+            }
+        }
+        return requesterIds;
+    }
+    trackRequester(hashKey, requesterIds, requesterId) {
+        requesterIds.add(requesterId);
+        let hashes = this.hashesByRequester.get(requesterId);
+        if (!hashes) {
+            hashes = new Set();
+            this.hashesByRequester.set(requesterId, hashes);
+        }
+        hashes.add(hashKey);
+    }
+    forwardRequest(requesterId, hash, htl) {
+        if (!shouldForward(htl)) {
+            return 0;
+        }
+        const requester = this.peers.get(requesterId);
+        if (!requester) {
+            return 0;
+        }
+        const nextHtl = decrementHTL(htl, requester.getHtlConfig());
+        let forwarded = 0;
+        for (const peer of this.peers.values()) {
+            if (peer.peerId === requesterId || !peer.canSend()) {
+                continue;
+            }
+            if (peer.sendRequest(hash, nextHtl)) {
+                forwarded += 1;
+            }
+        }
+        return forwarded;
+    }
+    startUpstreamFetch(hashKey, hash) {
+        if (!this.upstreamFetch) {
+            return false;
+        }
+        const existing = this.pendingUpstreamFetches.get(hashKey);
+        if (existing) {
+            return true;
+        }
+        let pending;
+        pending = this.upstreamFetch(hash)
+            .then(async (data) => {
+            if (!data) {
+                return null;
+            }
+            const valid = await verifyHash(data, hash);
+            if (!valid) {
+                return null;
+            }
+            await this.resolve(hash, data);
+            return data;
+        })
+            .catch(() => null)
+            .finally(() => {
+            if (this.pendingUpstreamFetches.get(hashKey) === pending) {
+                this.pendingUpstreamFetches.delete(hashKey);
+            }
+        });
+        this.pendingUpstreamFetches.set(hashKey, pending);
+        return true;
+    }
+}
+export function encodeForwardRequest(hash, htl) {
+    return new Uint8Array(encodeRequest(createRequest(hash, htl)));
+}
+//# sourceMappingURL=meshQueryRouter.js.map

package/dist/p2p/meshQueryRouter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"meshQueryRouter.js","sourceRoot":"","sources":["../../src/p2p/meshQueryRouter.ts"],"names":[],"mappings":"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"}

package/dist/p2p/uploadRateLimiter.d.ts

@@ -0,0 +1,21 @@
+type UploadRateLimiterConfig = {
+    bytesPerSecond?: number | null;
+    now?: () => number;
+};
+type UploadReservation = {
+    allowed: boolean;
+    delayMs: number;
+};
+export declare class UploadRateLimiter {
+    private bytesPerSecond;
+    private availableBytes;
+    private lastRefillMs;
+    private readonly now;
+    constructor(config?: UploadRateLimiterConfig);
+    setBytesPerSecond(bytesPerSecond?: number | null): void;
+    getBytesPerSecond(): number | null;
+    reserve(byteLength: number): UploadReservation;
+    private refill;
+}
+export {};
+//# sourceMappingURL=uploadRateLimiter.d.ts.map

package/dist/p2p/uploadRateLimiter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploadRateLimiter.d.ts","sourceRoot":"","sources":["../../src/p2p/uploadRateLimiter.ts"],"names":[],"mappings":"AAAA,KAAK,uBAAuB,GAAG;IAC7B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AASF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;gBAEvB,MAAM,GAAE,uBAA4B;IAOhD,iBAAiB,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAUvD,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAIlC,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAyB9C,OAAO,CAAC,MAAM;CAef"}

package/dist/p2p/uploadRateLimiter.js

@@ -0,0 +1,62 @@
+function normalizeBytesPerSecond(value) {
+    if (!Number.isFinite(value) || !value || value <= 0) {
+        return null;
+    }
+    return Math.floor(value);
+}
+export class UploadRateLimiter {
+    bytesPerSecond;
+    availableBytes;
+    lastRefillMs;
+    now;
+    constructor(config = {}) {
+        this.now = config.now ?? (() => performance.now());
+        this.bytesPerSecond = normalizeBytesPerSecond(config.bytesPerSecond);
+        this.availableBytes = this.bytesPerSecond ?? Number.POSITIVE_INFINITY;
+        this.lastRefillMs = this.now();
+    }
+    setBytesPerSecond(bytesPerSecond) {
+        const nowMs = this.now();
+        this.refill(nowMs);
+        this.bytesPerSecond = normalizeBytesPerSecond(bytesPerSecond);
+        this.availableBytes = this.bytesPerSecond
+            ? Math.min(this.availableBytes, this.bytesPerSecond)
+            : Number.POSITIVE_INFINITY;
+        this.lastRefillMs = nowMs;
+    }
+    getBytesPerSecond() {
+        return this.bytesPerSecond;
+    }
+    reserve(byteLength) {
+        if (byteLength <= 0) {
+            return { allowed: true, delayMs: 0 };
+        }
+        const limit = this.bytesPerSecond;
+        if (!limit) {
+            return { allowed: true, delayMs: 0 };
+        }
+        const nowMs = this.now();
+        this.refill(nowMs);
+        if (this.availableBytes >= byteLength) {
+            this.availableBytes = Math.max(0, this.availableBytes - byteLength);
+            return { allowed: true, delayMs: 0 };
+        }
+        const missingBytes = byteLength - this.availableBytes;
+        return {
+            allowed: false,
+            delayMs: Math.max(4, Math.ceil((missingBytes / limit) * 1000)),
+        };
+    }
+    refill(nowMs) {
+        const limit = this.bytesPerSecond;
+        if (!limit) {
+            this.availableBytes = Number.POSITIVE_INFINITY;
+            this.lastRefillMs = nowMs;
+            return;
+        }
+        const elapsedMs = Math.max(0, nowMs - this.lastRefillMs);
+        this.lastRefillMs = nowMs;
+        this.availableBytes = Math.min(limit, this.availableBytes + (elapsedMs * limit) / 1000);
+    }
+}
+//# sourceMappingURL=uploadRateLimiter.js.map

package/dist/p2p/uploadRateLimiter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploadRateLimiter.js","sourceRoot":"","sources":["../../src/p2p/uploadRateLimiter.ts"],"names":[],"mappings":"AAUA,SAAS,uBAAuB,CAAC,KAAqB;IACpD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,OAAO,iBAAiB;IACpB,cAAc,CAAgB;IAC9B,cAAc,CAAS;IACvB,YAAY,CAAS;IACZ,GAAG,CAAe;IAEnC,YAAY,SAAkC,EAAE;QAC9C,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,uBAAuB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACrE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,iBAAiB,CAAC;QACtE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;IAED,iBAAiB,CAAC,cAA8B;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,uBAAuB,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc;YACvC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC;YACpD,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC5B,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,OAAO,CAAC,UAAkB;QACxB,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;YACpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QACvC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QACvC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEnB,IAAI,IAAI,CAAC,cAAc,IAAI,UAAU,EAAE,CAAC;YACtC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,CAAC;YACpE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QACvC,CAAC;QAED,MAAM,YAAY,GAAG,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC;QACtD,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;SAC/D,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,KAAa;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,iBAAiB,CAAC;YAC/C,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QACzD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAC5B,KAAK,EACL,IAAI,CAAC,cAAc,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,GAAG,IAAI,CACjD,CAAC;IACJ,CAAC;CACF"}

package/dist/p2p/webrtcController.d.ts

@@ -22,6 +22,7 @@ export interface WebRTCControllerConfig {
     localStore: Store;
     sendCommand: (cmd: WebRTCCommand) => void;
     sendSignaling: (msg: SignalingMessage, recipientPubkey?: string) => Promise<void>;
+    upstreamFetch?: (hash: Uint8Array) => Promise<Uint8Array | null>;
     getFollows?: () => Set<string>;
     requestTimeout?: number;
     forwardRateLimit?: {
@@ -44,7 +45,7 @@ export declare class WebRTCController {
     private requestTimeout;
     private debug;
     private recentRequests;
-    private forwardingMachine;
+    private readonly meshRouter;
     private readonly peerSelector;
     private routing;
     private poolConfig;
@@ -117,10 +118,7 @@ export declare class WebRTCController {
     private processRequest;
     private handleResponse;
     private sendResponse;
-    private getForwardTargets;
-    private forwardRequest;
-    private pushToRequesters;
-    private clearRequesterMarkers;
+    private sendRequestToPeer;
     /**
      * Request data from peers
      */

package/dist/p2p/webrtcController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webrtcController.d.ts","sourceRoot":"","sources":["../../src/p2p/webrtcController.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAiBL,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EAKb,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAK3B,MAAM,iBAAiB,CAAC;AAqDzB,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,KAAK,CAAC;IAClB,WAAW,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,aAAa,EAAE,CAAC,GAAG,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClF,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE;QACjB,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,wBAAwB,CAAC,EAAE,iBAAiB,CAAC;IAC7C,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AASD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,uBAAuB,CAA4C;IAC3E,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,aAAa,CAAqE;IAC1F,OAAO,CAAC,YAAY,CAAiB;IACrC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,cAAc,CAAsC;IAC5D,OAAO,CAAC,iBAAiB,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,OAAO,CAIb;IAGF,OAAO,CAAC,UAAU,CAGhB;IAGF,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;gBAE3B,MAAM,EAAE,sBAAsB;IAoC1C,KAAK,IAAI,IAAI;IAYb,IAAI,IAAI,IAAI;IAmBZ,OAAO,CAAC,SAAS;IAUjB;;;OAGG;IACH,cAAc,IAAI,IAAI;IAItB;;;;OAIG;IACG,sBAAsB,CAAC,GAAG,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2DxF,OAAO,CAAC,cAAc;YAOR,WAAW;YA+BX,WAAW;YAgCX,YAAY;YAUZ,kBAAkB;IAgBhC,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,YAAY;IAUpB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,UAAU;YAmCJ,kBAAkB;IAKhC,OAAO,CAAC,SAAS;IAwBjB;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAwD1C,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,WAAW;YAWL,uBAAuB;IAOrC,OAAO,CAAC,qBAAqB;YAsBf,uBAAuB;IAIrC,OAAO,CAAC,qBAAqB;YAkCf,qBAAqB;IAsBnC,OAAO,CAAC,yBAAyB;IAUjC;;;OAGG;IACG,mBAAmB,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAYvD;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IA6B1C,OAAO,CAAC,cAAc;YAKR,oBAAoB;YAoBpB,aAAa;YAeb,cAAc;YAmDd,cAAc;YAoDd,YAAY;IAuB1B,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,cAAc;YA6BR,gBAAgB;IAe9B,OAAO,CAAC,qBAAqB;IAU7B;;OAEG;IACG,GAAG,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IA+CvD;;OAEG;IACH,YAAY,IAAI,KAAK,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;QACnB,IAAI,EAAE,QAAQ,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,gBAAgB,EAAE,MAAM,CAAC;QACzB,aAAa,EAAE,MAAM,CAAC;QACtB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,EAAE,MAAM,CAAC;QACtB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,iBAAiB,EAAE,MAAM,CAAC;QAC1B,mBAAmB,EAAE,MAAM,CAAC;KAC7B,CAAC;IAkBF;;OAEG;IACH,iBAAiB,IAAI,MAAM;IAU3B;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,KAAK,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAAG,IAAI;IAWvH;;;OAGG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAejC,OAAO,CAAC,GAAG;CAKZ"}
+{"version":3,"file":"webrtcController.d.ts","sourceRoot":"","sources":["../../src/p2p/webrtcController.ts"],"names":[],"mappings":"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"}

package/dist/p2p/webrtcController.js

@@ -15,9 +15,9 @@
  * - Data channel I/O
  */
 import { fromHex, sha256, toHex } from '@hashtree/core';
-import { MAX_HTL, MSG_TYPE_REQUEST, MSG_TYPE_RESPONSE, FRAGMENT_SIZE, PeerId, encodeRequest, encodeResponse, parseMessage, createRequest, createResponse, createFragmentResponse, hashToKey, verifyHash, generatePeerHTLConfig, decrementHTL, shouldForward, PeerSelector, buildHedgedWavePlan, normalizeDispatchConfig, syncSelectorPeers, } from '@hashtree/nostr';
+import { MAX_HTL, MSG_TYPE_REQUEST, MSG_TYPE_RESPONSE, FRAGMENT_SIZE, PeerId, encodeRequest, encodeResponse, parseMessage, createRequest, createResponse, createFragmentResponse, hashToKey, verifyHash, generatePeerHTLConfig, PeerSelector, buildHedgedWavePlan, normalizeDispatchConfig, syncSelectorPeers, } from '@hashtree/nostr';
 import { LRUCache } from './lruCache.js';
-import { QueryForwardingMachine } from './queryForwardingMachine.js';
+import { MeshQueryRouter, encodeForwardRequest } from './meshQueryRouter.js';
 const PEER_METADATA_POINTER_SLOT_KEY = 'hashtree-webrtc/peer-metadata/latest/v1';
 const DEFAULT_REQUEST_DISPATCH = {
     initialFanout: 2,
@@ -39,7 +39,7 @@ export class WebRTCController {
     requestTimeout;
     debug;
     recentRequests = new LRUCache(1000);
-    forwardingMachine;
+    meshRouter;
     peerSelector;
     routing;
     // Pool configuration - reasonable defaults, settings sync will override
@@ -64,13 +64,12 @@ export class WebRTCController {
         };
         this.peerSelector = PeerSelector.withStrategy(this.routing.selectionStrategy);
         this.peerSelector.setFairness(this.routing.fairnessEnabled);
-        this.forwardingMachine = new QueryForwardingMachine({
+        this.meshRouter = new MeshQueryRouter({
+            localStore: this.localStore,
             requestTimeoutMs: this.requestTimeout,
+            upstreamFetch: config.upstreamFetch,
             maxForwardsPerPeerWindow: config.forwardRateLimit?.maxForwardsPerPeerWindow,
             forwardRateLimitWindowMs: config.forwardRateLimit?.windowMs,
-            onForwardTimeout: ({ hashKey, requesterIds }) => {
-                this.clearRequesterMarkers(hashKey, requesterIds);
-            },
         });
         // Default classifier: check if pubkey is in follows
         const getFollows = config.getFollows ?? (() => new Set());
@@ -102,7 +101,7 @@ export class WebRTCController {
         for (const peerId of this.peers.keys()) {
             this.closePeer(peerId);
         }
-        this.forwardingMachine.stop();
+        this.meshRouter.stop();
     }
     // ============================================================================
     // Signaling
@@ -302,7 +301,6 @@ export class WebRTCController {
             answerCreated: false,
             htlConfig: generatePeerHTLConfig(),
             pendingRequests: new Map(),
-            theirRequests: new LRUCache(200),
             stats: {
                 requestsSent: 0,
                 requestsReceived: 0,
@@ -320,6 +318,22 @@ export class WebRTCController {
         };
         this.peers.set(peerId, peer);
         this.peerSelector.addPeer(peerId);
+        this.meshRouter.registerPeer({
+            peerId,
+            canSend: () => peer.dataChannelReady,
+            getHtlConfig: () => peer.htlConfig,
+            sendRequest: (hash, htl) => this.sendRequestToPeer(peer, hash, htl),
+            sendResponse: async (hash, data) => this.sendResponse(peer, hash, data),
+            onForwardedRequest: () => {
+                peer.stats.forwardedRequests++;
+            },
+            onForwardedResolved: () => {
+                peer.stats.forwardedResolved++;
+            },
+            onForwardedSuppressed: () => {
+                peer.stats.forwardedSuppressed++;
+            },
+        });
         this.sendCommand({ type: 'rtc:createPeer', peerId, pubkey });
         return peer;
     }
@@ -341,7 +355,7 @@ export class WebRTCController {
         this.peers.delete(peerId);
         this.pendingRemoteCandidates.delete(peerId);
         this.peerSelector.removePeer(peerId);
-        this.forwardingMachine.removePeer(peerId);
+        this.meshRouter.removePeer(peerId);
         this.log(`Closed peer: ${peerId.slice(0, 20)}`);
     }
     // ============================================================================
@@ -694,53 +708,14 @@ export class WebRTCController {
         await this.processRequest(peer, req);
     }
     async processRequest(peer, req) {
-        const hashKey = hashToKey(req.h);
-        // Try to get from local store
-        const data = await this.localStore.get(req.h);
-        if (data) {
-            // Send response
-            await this.sendResponse(peer, req.h, data);
-        }
-        else {
-            // Track their request for later push
-            peer.theirRequests.set(hashKey, {
-                hash: req.h,
-                requestedAt: Date.now(),
-            });
-            // Forward if HTL allows
-            const htl = req.htl ?? MAX_HTL;
-            if (shouldForward(htl)) {
-                const newHtl = decrementHTL(htl, peer.htlConfig);
-                const decision = this.forwardingMachine.beginForward(hashKey, peer.peerId, this.getForwardTargets(peer.peerId));
-                if (decision.kind === 'suppressed') {
-                    peer.stats.forwardedSuppressed++;
-                    return;
-                }
-                if (decision.kind === 'rate_limited') {
-                    peer.theirRequests.delete(hashKey);
-                    this.log(`Forward rate-limited for ${peer.peerId.slice(0, 20)} hash ${hashKey.slice(0, 16)}`);
-                    return;
-                }
-                if (decision.kind === 'no_targets') {
-                    peer.theirRequests.delete(hashKey);
-                    return;
-                }
-                const forwarded = this.forwardRequest(req.h, decision.targets, newHtl);
-                if (forwarded <= 0) {
-                    const requesterIds = this.forwardingMachine.cancelForward(hashKey);
-                    this.clearRequesterMarkers(hashKey, requesterIds);
-                    return;
-                }
-                peer.stats.forwardedRequests++;
-            }
-        }
+        await this.meshRouter.handleRequest(peer.peerId, req);
     }
     async handleResponse(peer, res) {
         peer.stats.responsesReceived++;
         const hashKey = hashToKey(res.h);
         const pending = peer.pendingRequests.get(hashKey);
         if (!pending) {
-            const hasRequesters = Array.from(this.peers.values()).some(p => p.theirRequests.has(hashKey));
+            const hasRequesters = this.meshRouter.hasInFlight(hashKey);
             // Late response: cache if we requested this hash recently
             const requestedAt = this.recentRequests.get(hashKey);
             if (!requestedAt && !hasRequesters)
@@ -757,8 +732,7 @@ export class WebRTCController {
                     this.recentRequests.delete(hashKey);
                 }
                 if (hasRequesters) {
-                    await this.pushToRequesters(res.h, res.d, peer.peerId);
-                    this.forwardingMachine.resolveForward(hashKey);
+                    await this.meshRouter.resolve(res.h, res.d);
                 }
             }
             return;
@@ -773,9 +747,7 @@ export class WebRTCController {
             await this.localStore.put(res.h, res.d);
             this.peerSelector.recordSuccess(peer.peerId, elapsedMs, res.d.length);
             pending.resolve(res.d);
-            // Push to peers who requested this
-            await this.pushToRequesters(res.h, res.d, peer.peerId);
-            this.forwardingMachine.resolveForward(hashKey);
+            await this.meshRouter.resolve(res.h, res.d);
         }
         else {
             this.log(`Hash mismatch from ${peer.peerId}`);
@@ -805,59 +777,13 @@ export class WebRTCController {
             this.sendDataToPeer(peer, encoded);
         }
     }
-    getForwardTargets(excludePeerId) {
-        const targets = [];
-        for (const [peerId, peer] of this.peers) {
-            if (peerId === excludePeerId)
-                continue;
-            if (!peer.dataChannelReady)
-                continue;
-            targets.push(peerId);
-        }
-        return targets;
-    }
-    forwardRequest(hash, targetPeerIds, htl) {
-        const hashKey = hashToKey(hash);
-        let forwarded = 0;
-        for (const peerId of targetPeerIds) {
-            const peer = this.peers.get(peerId);
-            if (!peer || !peer.dataChannelReady)
-                continue;
-            // Set up pending request so we can process the response
-            const timeout = setTimeout(() => {
-                peer.pendingRequests.delete(hashKey);
-            }, this.requestTimeout);
-            peer.pendingRequests.set(hashKey, {
-                hash,
-                resolve: () => {
-                    // Response will be pushed to original requester via pushToRequesters
-                },
-                timeout,
-            });
-            const req = createRequest(hash, htl);
-            const encoded = new Uint8Array(encodeRequest(req));
-            this.sendDataToPeer(peer, encoded);
-            forwarded++;
-        }
-        return forwarded;
-    }
-    async pushToRequesters(hash, data, excludePeerId) {
-        const hashKey = hashToKey(hash);
-        for (const [peerId, peer] of this.peers) {
-            if (peerId === excludePeerId)
-                continue;
-            const theirReq = peer.theirRequests.get(hashKey);
-            if (theirReq) {
-                peer.theirRequests.delete(hashKey);
-                peer.stats.forwardedResolved++;
-                await this.sendResponse(peer, hash, data);
-            }
-        }
-    }
-    clearRequesterMarkers(hashKey, requesterIds) {
-        for (const requesterId of requesterIds) {
-            this.peers.get(requesterId)?.theirRequests.delete(hashKey);
+    sendRequestToPeer(peer, hash, htl) {
+        if (!peer.dataChannelReady) {
+            return false;
         }
+        const encoded = encodeForwardRequest(hash, htl);
+        this.sendDataToPeer(peer, encoded);
+        return true;
     }
     // ============================================================================
     // Public API