@helia/ipns 9.1.9-11802dd6 → 9.1.9-1a2ebead

package/dist/src/routing/pubsub.d.ts

@@ -1,6 +1,8 @@
-import type { IPNSRouting } from './index.ts';
-import type { PeerId, TypedEventTarget, ComponentLogger } from '@libp2p/interface';
+import type { GetOptions, IPNSRouting, PutOptions } from './index.ts';
+import type { Fetch } from '@libp2p/fetch';
+import type { PeerId, PublicKey, TypedEventTarget, ComponentLogger, Startable, Metrics, Libp2p } from '@libp2p/interface';
 import type { Datastore } from 'interface-datastore';
+import type { MultihashDigest } from 'multiformats/hashes/interface';
 import type { ProgressEvent } from 'progress-events';
 export interface Message {
     type: 'signed' | 'unsigned';
@@ -8,7 +10,16 @@ export interface Message {
     topic: string;
     data: Uint8Array;
 }
+export interface Subscription {
+    topic: string;
+    subscribe: boolean;
+}
+export interface SubscriptionChangeData {
+    peerId: PeerId;
+    subscriptions: Subscription[];
+}
 export interface PubSubEvents {
+    'subscription-change': CustomEvent<SubscriptionChangeData>;
     message: CustomEvent<Message>;
 }
 export interface PublishResult {
@@ -24,12 +35,31 @@ export interface PubSub extends TypedEventTarget<PubSubEvents> {
 export interface PubsubRoutingComponents {
     datastore: Datastore;
     logger: ComponentLogger;
-    libp2p: {
-        peerId: PeerId;
-        services: {
-            pubsub: PubSub;
-        };
-    };
+    metrics?: Metrics;
+    libp2p: Pick<Libp2p<{
+        pubsub: PubSub;
+        fetch?: Fetch;
+    }>, 'peerId' | 'register' | 'unregister' | 'services'>;
+}
+export interface PubsubRoutingInit {
+    /**
+     * How many fetch requests to run concurrently
+     *
+     * @default 8
+     */
+    fetchConcurrency?: number;
+    /**
+     * How long to allow a fetch request to run for in ms
+     *
+     * @default 2_500
+     */
+    fetchTimeout?: number;
+    /**
+     * How many ms to wait before sending a fetch request to a topic peer
+     *
+     * @default 0
+     */
+    fetchDelay?: number;
 }
 export type PubSubProgressEvents = ProgressEvent<'ipns:pubsub:publish', {
     topic: string;
@@ -37,6 +67,41 @@ export type PubSubProgressEvents = ProgressEvent<'ipns:pubsub:publish', {
 }> | ProgressEvent<'ipns:pubsub:subscribe', {
     topic: string;
 }> | ProgressEvent<'ipns:pubsub:error', Error>;
+export declare class PubSubRouting implements IPNSRouting, Startable {
+    #private;
+    private readonly subscriptions;
+    private readonly localStore;
+    private readonly libp2p;
+    private readonly fetchConcurrency;
+    private readonly fetchTimeout;
+    private readonly fetchDelay;
+    private readonly fetchQueue;
+    private readonly fetchPeers;
+    private shutdownController;
+    private fetchTopologyId?;
+    constructor(components: PubsubRoutingComponents, init?: PubsubRoutingInit);
+    /**
+     * Put a value to the pubsub datastore indexed by the received key properly encoded
+     */
+    put(routingKey: Uint8Array, marshaledRecord: Uint8Array, options?: PutOptions): Promise<void>;
+    /**
+     * Get a value from the pubsub datastore indexed by the received key properly encoded.
+     * Also, the identifier topic is subscribed to and the pubsub datastore records will be
+     * updated once new publishes occur
+     */
+    get(routingKey: Uint8Array, options?: GetOptions): Promise<Uint8Array>;
+    /**
+     * Get pubsub subscriptions related to ipns
+     */
+    getSubscriptions(): string[];
+    /**
+     * Cancel pubsub subscriptions related to ipns
+     */
+    cancel(key: PublicKey | MultihashDigest<0x00 | 0x12>): void;
+    toString(): string;
+    start(): Promise<void>;
+    stop(): void;
+}
 /**
  * This IPNS routing receives IPNS record updates via dedicated
  * pubsub topic.
@@ -45,5 +110,5 @@ export type PubSubProgressEvents = ProgressEvent<'ipns:pubsub:publish', {
  * updated records, so the first call to `.get` should be expected
  * to fail!
  */
-export declare function pubsub(components: PubsubRoutingComponents): IPNSRouting;
+export declare function pubsub(components: PubsubRoutingComponents, init?: PubsubRoutingInit): IPNSRouting;
 //# sourceMappingURL=pubsub.d.ts.map

package/dist/src/routing/pubsub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../../src/routing/pubsub.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAc,WAAW,EAAc,MAAM,YAAY,CAAA;AAErE,OAAO,KAAK,EAAE,MAAM,EAAa,gBAAgB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAC7F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAIpD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,UAAU,CAAA;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB;AAED,MAAM,WAAW,MAAO,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IAC5D,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;IACnE,SAAS,IAAI,MAAM,EAAE,CAAA;IACrB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CACxC;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,CAAA;QACd,QAAQ,EAAE;YACR,MAAM,EAAE,MAAM,CAAA;SACf,CAAA;KACF,CAAA;CACF;AAED,MAAM,MAAM,oBAAoB,GAC9B,aAAa,CAAC,qBAAqB,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC,GAC9E,aAAa,CAAC,uBAAuB,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,GACzD,aAAa,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAA;AAmK3C;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAE,UAAU,EAAE,uBAAuB,GAAG,WAAW,CAExE"}
+{"version":3,"file":"pubsub.d.ts","sourceRoot":"","sources":["../../../src/routing/pubsub.ts"],"names":[],"mappings":"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"}

package/dist/src/routing/pubsub.js

@@ -1,61 +1,172 @@
-import { isPublicKey } from '@libp2p/interface';
+import { isPublicKey, NotFoundError, setMaxListeners } from '@libp2p/interface';
 import { logger } from '@libp2p/logger';
+import { PeerSet } from '@libp2p/peer-collections';
+import { Queue } from '@libp2p/utils';
+import { anySignal } from 'any-signal';
+import delay from 'delay';
 import { multihashToIPNSRoutingKey } from 'ipns';
 import { ipnsSelector } from 'ipns/selector';
 import { ipnsValidator } from 'ipns/validator';
 import { CustomProgressEvent } from 'progress-events';
+import { raceSignal } from 'race-signal';
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
 import { InvalidTopicError } from "../errors.js";
 import { localStore } from "../local-store.js";
+import { IPNS_STRING_PREFIX } from "../utils.js";
 const log = logger('helia:ipns:routing:pubsub');
-class PubSubRouting {
+export class PubSubRouting {
     subscriptions;
     localStore;
-    peerId;
-    pubsub;
-    constructor(components) {
-        this.subscriptions = [];
+    libp2p;
+    fetchConcurrency;
+    fetchTimeout;
+    fetchDelay;
+    fetchQueue;
+    fetchPeers;
+    shutdownController;
+    fetchTopologyId;
+    constructor(components, init = {}) {
+        this.subscriptions = new Set();
+        this.shutdownController = new AbortController();
+        setMaxListeners(Infinity, this.shutdownController.signal);
+        this.fetchPeers = new PeerSet();
         this.localStore = localStore(components.datastore, components.logger.forComponent('helia:ipns:local-store'));
-        this.peerId = components.libp2p.peerId;
-        this.pubsub = components.libp2p.services.pubsub;
-        this.pubsub.addEventListener('message', (evt) => {
+        this.libp2p = components.libp2p;
+        this.fetchConcurrency = init.fetchConcurrency ?? 8;
+        this.fetchDelay = init.fetchDelay ?? 0;
+        // default libp2p-fetch timeout is 10 seconds - we should have an existing
+        // connection to the peer so this can be shortened
+        this.fetchTimeout = init.fetchTimeout ?? 2_500;
+        this.fetchQueue = new Queue({
+            concurrency: this.fetchConcurrency,
+            metrics: components.metrics,
+            metricName: 'helia_ipns_pubsub_fetch_queue'
+        });
+        this.libp2p.services.pubsub.addEventListener('message', (evt) => {
             const message = evt.detail;
-            if (!this.subscriptions.includes(message.topic)) {
+            if (!this.subscriptions.has(message.topic)) {
                 return;
             }
-            this.#processPubSubMessage(message).catch(err => {
+            this.#processPubSubMessage(message, {
+                signal: this.shutdownController.signal
+            }).catch(err => {
                 log.error('Error processing message - %e', err);
             });
         });
+        // ipns over libp2p-fetch feature
+        if (this.libp2p.services.fetch != null) {
+            try {
+                this.libp2p.services.pubsub.addEventListener('subscription-change', (evt) => {
+                    const { peerId, subscriptions } = evt.detail;
+                    if (!this.fetchPeers.has(peerId)) {
+                        return;
+                    }
+                    for (const sub of subscriptions) {
+                        if (!this.subscriptions.has(sub.topic)) {
+                            continue;
+                        }
+                        if (sub.subscribe === false) {
+                            continue;
+                        }
+                        log('peer %s joined topic %s', peerId, sub.topic);
+                        const routingKey = topicToKey(sub.topic);
+                        this.#fetchFromPeer(sub.topic, routingKey, peerId, {
+                            signal: this.shutdownController.signal
+                        })
+                            .catch(err => {
+                            log.error('failed to fetch IPNS record for %m from peer %s - %e', routingKey, peerId, err);
+                        });
+                    }
+                });
+                this.libp2p.services.fetch.registerLookupFunction(IPNS_STRING_PREFIX, async (key) => {
+                    try {
+                        const { record } = await this.localStore.get(key, {
+                            signal: this.shutdownController.signal
+                        });
+                        return record;
+                    }
+                    catch (err) {
+                        if (err.name !== 'NotFoundError') {
+                            throw err;
+                        }
+                    }
+                });
+                log('registered lookup function for IPNS with libp2p/fetch service');
+            }
+            catch (e) {
+                log('unable to register lookup function for IPNS with libp2p/fetch service - %e', e);
+            }
+        }
+        else {
+            log('no libp2p/fetch service found. Skipping registration of lookup function for IPNS.');
+        }
     }
-    async #processPubSubMessage(message) {
+    async #processPubSubMessage(message, options) {
         log('message received for topic', message.topic);
         if (message.type !== 'signed') {
             log.error('unsigned message received, this module can only work with signed messages');
             return;
         }
-        if (message.from.equals(this.peerId)) {
+        if (message.from.equals(this.libp2p.peerId)) {
             log('not storing record from self');
             return;
         }
-        const routingKey = topicToKey(message.topic);
-        await ipnsValidator(routingKey, message.data);
+        await this.#handleRecord(message.topic, topicToKey(message.topic), message.data, false, options);
+    }
+    async #fetchFromPeer(topic, routingKey, peerId, options) {
+        const marshalledRecord = await this.fetchQueue.add(async ({ signal }) => {
+            log('fetching ipns record for %m from peer %s', routingKey, peerId);
+            const sig = anySignal([
+                signal,
+                AbortSignal.timeout(this.fetchTimeout)
+            ]);
+            try {
+                return await this.libp2p.services.fetch?.fetch(peerId, routingKey, {
+                    signal: sig
+                });
+            }
+            finally {
+                sig.clear();
+            }
+        }, options);
+        if (marshalledRecord == null) {
+            throw new NotFoundError(`Peer ${peerId} did not have record for routing key ${uint8ArrayToString(routingKey, 'base64')}`);
+        }
+        log('fetched ipns record for %m from peer %s', routingKey, peerId);
+        return this.#handleRecord(topic, routingKey, marshalledRecord, true, options);
+    }
+    async #handleRecord(topic, routingKey, marshalledRecord, publish, options) {
+        await ipnsValidator(routingKey, marshalledRecord);
+        this.shutdownController.signal.throwIfAborted();
         if (await this.localStore.has(routingKey)) {
-            const { record: currentRecord } = await this.localStore.get(routingKey);
-            if (uint8ArrayEquals(currentRecord, message.data)) {
-                log('not storing record as we already have it');
-                return;
+            const { record: currentRecord } = await this.localStore.get(routingKey, options);
+            if (uint8ArrayEquals(currentRecord, marshalledRecord)) {
+                log.trace('found identical record for %m', routingKey);
+                return currentRecord;
             }
-            const records = [currentRecord, message.data];
+            const records = [currentRecord, marshalledRecord];
             const index = ipnsSelector(routingKey, records);
             if (index === 0) {
-                log('not storing record as the one we have is better');
-                return;
+                log.trace('found old record for %m', routingKey);
+                return currentRecord;
+            }
+        }
+        log('found new record for %m', routingKey);
+        await this.localStore.put(routingKey, marshalledRecord, options);
+        // if the record was received via fetch, republish it
+        if (publish) {
+            log('publish value for topic %s', topic);
+            try {
+                const result = await this.libp2p.services.pubsub.publish(topic, marshalledRecord);
+                log('published record on topic %s to %d recipients', topic, result.recipients);
+            }
+            catch (err) {
+                log.error('could not publish record on topic %s - %e', err);
             }
         }
-        await this.localStore.put(routingKey, message.data);
+        return marshalledRecord;
     }
     /**
      * Put a value to the pubsub datastore indexed by the received key properly encoded
@@ -64,7 +175,8 @@ class PubSubRouting {
         try {
             const topic = keyToTopic(routingKey);
             log('publish value for topic %s', topic);
-            const result = await this.pubsub.publish(topic, marshaledRecord);
+            const result = await this.libp2p.services.pubsub.publish(topic, marshaledRecord);
+            options?.signal?.throwIfAborted();
             log('published record on topic %s to %d recipients', topic, result.recipients);
             options.onProgress?.(new CustomProgressEvent('ipns:pubsub:publish', { topic, result }));
         }
@@ -79,29 +191,53 @@ class PubSubRouting {
      * updated once new publishes occur
      */
     async get(routingKey, options = {}) {
+        const topic = keyToTopic(routingKey);
         try {
-            const topic = keyToTopic(routingKey);
             // ensure we are subscribed to topic
-            if (!this.pubsub.getTopics().includes(topic)) {
+            if (!this.libp2p.services.pubsub.getTopics().includes(topic)) {
                 log('add subscription for topic', topic);
-                this.pubsub.subscribe(topic);
-                this.subscriptions.push(topic);
+                this.libp2p.services.pubsub.subscribe(topic);
+                this.subscriptions.add(topic);
                 options.onProgress?.(new CustomProgressEvent('ipns:pubsub:subscribe', { topic }));
             }
-            // chain through to local store
-            const { record } = await this.localStore.get(routingKey, options);
-            return record;
         }
         catch (err) {
             options.onProgress?.(new CustomProgressEvent('ipns:pubsub:error', err));
             throw err;
         }
+        // delay before fetch to allow pubsub to resolve
+        await raceSignal(delay(this.fetchDelay), this.shutdownController.signal);
+        const fetchController = new AbortController();
+        const promises = [];
+        for (const peerId of this.libp2p.services.pubsub.getSubscribers(topic)) {
+            const signal = anySignal([
+                options?.signal,
+                fetchController.signal
+            ]);
+            promises.push(this.#fetchFromPeer(topic, routingKey, peerId, {
+                ...options,
+                signal
+            })
+                .finally(() => {
+                signal.clear();
+            }));
+        }
+        if (promises.length > 0) {
+            // fetch record from topic peers
+            const record = await Promise.any(promises);
+            // cancel any in-flight requests
+            fetchController.abort();
+            if (record != null) {
+                return record;
+            }
+        }
+        throw new NotFoundError('Pubsub routing does not actively query peers');
     }
     /**
      * Get pubsub subscriptions related to ipns
      */
     getSubscriptions() {
-        return this.subscriptions;
+        return [...this.subscriptions];
     }
     /**
      * Cancel pubsub subscriptions related to ipns
@@ -111,15 +247,38 @@ class PubSubRouting {
         const routingKey = multihashToIPNSRoutingKey(digest);
         const topic = keyToTopic(routingKey);
         // Not found topic
-        if (!this.subscriptions.includes(topic)) {
+        if (!this.subscriptions.has(topic)) {
             return;
         }
-        this.pubsub.unsubscribe(topic);
-        this.subscriptions = this.subscriptions.filter(t => t !== topic);
+        this.libp2p.services.pubsub.unsubscribe(topic);
+        this.subscriptions.delete(topic);
     }
     toString() {
         return 'PubSubRouting()';
     }
+    async start() {
+        this.shutdownController = new AbortController();
+        setMaxListeners(Infinity, this.shutdownController.signal);
+        if (this.libp2p.services.fetch != null) {
+            this.fetchTopologyId = await this.libp2p.register(this.libp2p.services.fetch.protocol, {
+                onConnect: (peerId) => {
+                    this.fetchPeers.add(peerId);
+                },
+                onDisconnect: (peerId) => {
+                    this.fetchPeers.delete(peerId);
+                }
+            }, {
+                signal: this.shutdownController.signal
+            });
+        }
+    }
+    stop() {
+        this.fetchQueue.abort();
+        this.shutdownController.abort();
+        if (this.fetchTopologyId != null) {
+            this.libp2p.unregister(this.fetchTopologyId);
+        }
+    }
 }
 const PUBSUB_NAMESPACE = '/record/';
 /**
@@ -147,7 +306,7 @@ function topicToKey(topic) {
  * updated records, so the first call to `.get` should be expected
  * to fail!
  */
-export function pubsub(components) {
-    return new PubSubRouting(components);
+export function pubsub(components, init = {}) {
+    return new PubSubRouting(components, init);
 }
 //# sourceMappingURL=pubsub.js.map

package/dist/src/routing/pubsub.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/ipns",
-  "version": "9.1.9-11802dd6",
+  "version": "9.1.9-1a2ebead",
   "description": "An implementation of IPNS for Helia",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia/tree/main/packages/ipns#readme",
@@ -73,24 +73,29 @@
     "test:electron-main": "aegir test -t electron-main"
   },
   "dependencies": {
-    "@helia/interface": "6.1.1-11802dd6",
+    "@helia/interface": "6.1.1-1a2ebead",
     "@libp2p/crypto": "^5.1.7",
-    "@libp2p/interface": "^3.1.0",
+    "@libp2p/fetch": "^4.1.0",
+    "@libp2p/interface": "^3.2.0",
     "@libp2p/kad-dht": "^16.1.0",
     "@libp2p/keychain": "^6.0.5",
     "@libp2p/logger": "^6.0.5",
+    "@libp2p/peer-collections": "^7.0.14",
     "@libp2p/utils": "^7.0.5",
+    "any-signal": "^4.2.0",
+    "delay": "^7.0.0",
     "interface-datastore": "^9.0.2",
     "ipns": "^10.1.2",
     "multiformats": "^13.4.1",
     "progress-events": "^1.0.1",
     "protons-runtime": "^6.0.1",
+    "race-signal": "^2.0.0",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
     "@libp2p/crypto": "^5.1.12",
-    "@libp2p/peer-id": "^6.0.3",
+    "@libp2p/peer-id": "^6.0.6",
     "aegir": "^47.0.22",
     "datastore-core": "^11.0.2",
     "it-drain": "^3.0.10",

package/src/routing/pubsub.ts

@@ -1,17 +1,24 @@
-import { isPublicKey } from '@libp2p/interface'
+import { isPublicKey, NotFoundError, setMaxListeners } from '@libp2p/interface'
 import { logger } from '@libp2p/logger'
+import { PeerSet } from '@libp2p/peer-collections'
+import { Queue } from '@libp2p/utils'
+import { anySignal } from 'any-signal'
+import delay from 'delay'
 import { multihashToIPNSRoutingKey } from 'ipns'
 import { ipnsSelector } from 'ipns/selector'
 import { ipnsValidator } from 'ipns/validator'
 import { CustomProgressEvent } from 'progress-events'
+import { raceSignal } from 'race-signal'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { InvalidTopicError } from '../errors.ts'
 import { localStore } from '../local-store.ts'
+import { IPNS_STRING_PREFIX } from '../utils.ts'
 import type { GetOptions, IPNSRouting, PutOptions } from './index.ts'
 import type { LocalStore } from '../local-store.ts'
-import type { PeerId, PublicKey, TypedEventTarget, ComponentLogger } from '@libp2p/interface'
+import type { Fetch } from '@libp2p/fetch'
+import type { PeerId, PublicKey, TypedEventTarget, ComponentLogger, Startable, AbortOptions, Metrics, Libp2p } from '@libp2p/interface'
 import type { Datastore } from 'interface-datastore'
 import type { MultihashDigest } from 'multiformats/hashes/interface'
 import type { ProgressEvent } from 'progress-events'
@@ -25,7 +32,18 @@ export interface Message {
   data: Uint8Array
 }
 
+export interface Subscription {
+  topic: string
+  subscribe: boolean
+}
+
+export interface SubscriptionChangeData {
+  peerId: PeerId
+  subscriptions: Subscription[]
+}
+
 export interface PubSubEvents {
+  'subscription-change': CustomEvent<SubscriptionChangeData>
   message: CustomEvent<Message>
 }
 
@@ -44,12 +62,31 @@ export interface PubSub extends TypedEventTarget<PubSubEvents> {
 export interface PubsubRoutingComponents {
   datastore: Datastore
   logger: ComponentLogger
-  libp2p: {
-    peerId: PeerId
-    services: {
-      pubsub: PubSub
-    }
-  }
+  metrics?: Metrics
+  libp2p: Pick<Libp2p<{ pubsub: PubSub, fetch?: Fetch }>, 'peerId' | 'register' | 'unregister' | 'services'>
+}
+
+export interface PubsubRoutingInit {
+  /**
+   * How many fetch requests to run concurrently
+   *
+   * @default 8
+   */
+  fetchConcurrency?: number
+
+  /**
+   * How long to allow a fetch request to run for in ms
+   *
+   * @default 2_500
+   */
+  fetchTimeout?: number
+
+  /**
+   * How many ms to wait before sending a fetch request to a topic peer
+   *
+   * @default 0
+   */
+  fetchDelay?: number
 }
 
 export type PubSubProgressEvents =
@@ -57,32 +94,105 @@ export type PubSubProgressEvents =
   ProgressEvent<'ipns:pubsub:subscribe', { topic: string }> |
   ProgressEvent<'ipns:pubsub:error', Error>
 
-class PubSubRouting implements IPNSRouting {
-  private subscriptions: string[]
+export class PubSubRouting implements IPNSRouting, Startable {
+  private readonly subscriptions: Set<string>
   private readonly localStore: LocalStore
-  private readonly peerId: PeerId
-  private readonly pubsub: PubSub
-
-  constructor (components: PubsubRoutingComponents) {
-    this.subscriptions = []
+  private readonly libp2p: Pick<Libp2p<{ pubsub: PubSub, fetch?: Fetch }>, 'peerId' | 'register' | 'unregister' | 'services'>
+  private readonly fetchConcurrency: number
+  private readonly fetchTimeout: number
+  private readonly fetchDelay: number
+  private readonly fetchQueue: Queue<Uint8Array | undefined>
+  private readonly fetchPeers: PeerSet
+  private shutdownController: AbortController
+  private fetchTopologyId?: string
+
+  constructor (components: PubsubRoutingComponents, init: PubsubRoutingInit = {}) {
+    this.subscriptions = new Set()
+    this.shutdownController = new AbortController()
+    setMaxListeners(Infinity, this.shutdownController.signal)
+    this.fetchPeers = new PeerSet()
     this.localStore = localStore(components.datastore, components.logger.forComponent('helia:ipns:local-store'))
-    this.peerId = components.libp2p.peerId
-    this.pubsub = components.libp2p.services.pubsub
+    this.libp2p = components.libp2p
+    this.fetchConcurrency = init.fetchConcurrency ?? 8
+    this.fetchDelay = init.fetchDelay ?? 0
+
+    // default libp2p-fetch timeout is 10 seconds - we should have an existing
+    // connection to the peer so this can be shortened
+    this.fetchTimeout = init.fetchTimeout ?? 2_500
+    this.fetchQueue = new Queue<Uint8Array | undefined>({
+      concurrency: this.fetchConcurrency,
+      metrics: components.metrics,
+      metricName: 'helia_ipns_pubsub_fetch_queue'
+    })
 
-    this.pubsub.addEventListener('message', (evt) => {
+    this.libp2p.services.pubsub.addEventListener('message', (evt) => {
       const message = evt.detail
 
-      if (!this.subscriptions.includes(message.topic)) {
+      if (!this.subscriptions.has(message.topic)) {
         return
       }
 
-      this.#processPubSubMessage(message).catch(err => {
+      this.#processPubSubMessage(message, {
+        signal: this.shutdownController.signal
+      }).catch(err => {
         log.error('Error processing message - %e', err)
       })
     })
+
+    // ipns over libp2p-fetch feature
+    if (this.libp2p.services.fetch != null) {
+      try {
+        this.libp2p.services.pubsub.addEventListener('subscription-change', (evt) => {
+          const { peerId, subscriptions } = evt.detail
+
+          if (!this.fetchPeers.has(peerId)) {
+            return
+          }
+
+          for (const sub of subscriptions) {
+            if (!this.subscriptions.has(sub.topic)) {
+              continue
+            }
+
+            if (sub.subscribe === false) {
+              continue
+            }
+
+            log('peer %s joined topic %s', peerId, sub.topic)
+
+            const routingKey = topicToKey(sub.topic)
+            this.#fetchFromPeer(sub.topic, routingKey, peerId, {
+              signal: this.shutdownController.signal
+            })
+              .catch(err => {
+                log.error('failed to fetch IPNS record for %m from peer %s - %e', routingKey, peerId, err)
+              })
+          }
+        })
+
+        this.libp2p.services.fetch.registerLookupFunction(IPNS_STRING_PREFIX, async (key) => {
+          try {
+            const { record } = await this.localStore.get(key, {
+              signal: this.shutdownController.signal
+            })
+
+            return record
+          } catch (err: any) {
+            if (err.name !== 'NotFoundError') {
+              throw err
+            }
+          }
+        })
+        log('registered lookup function for IPNS with libp2p/fetch service')
+      } catch (e) {
+        log('unable to register lookup function for IPNS with libp2p/fetch service - %e', e)
+      }
+    } else {
+      log('no libp2p/fetch service found. Skipping registration of lookup function for IPNS.')
+    }
   }
 
-  async #processPubSubMessage (message: Message): Promise<void> {
+  async #processPubSubMessage (message: Message, options?: AbortOptions): Promise<void> {
     log('message received for topic', message.topic)
 
     if (message.type !== 'signed') {
@@ -90,33 +200,77 @@ class PubSubRouting implements IPNSRouting {
       return
     }
 
-    if (message.from.equals(this.peerId)) {
+    if (message.from.equals(this.libp2p.peerId)) {
       log('not storing record from self')
       return
     }
 
-    const routingKey = topicToKey(message.topic)
+    await this.#handleRecord(message.topic, topicToKey(message.topic), message.data, false, options)
+  }
 
-    await ipnsValidator(routingKey, message.data)
+  async #fetchFromPeer (topic: string, routingKey: Uint8Array, peerId: PeerId, options?: AbortOptions): Promise<Uint8Array> {
+    const marshalledRecord = await this.fetchQueue.add(async ({ signal }) => {
+      log('fetching ipns record for %m from peer %s', routingKey, peerId)
+
+      const sig = anySignal([
+        signal,
+        AbortSignal.timeout(this.fetchTimeout)
+      ])
+
+      try {
+        return await this.libp2p.services.fetch?.fetch(peerId, routingKey, {
+          signal: sig
+        })
+      } finally {
+        sig.clear()
+      }
+    }, options)
+
+    if (marshalledRecord == null) {
+      throw new NotFoundError(`Peer ${peerId} did not have record for routing key ${uint8ArrayToString(routingKey, 'base64')}`)
+    }
+
+    log('fetched ipns record for %m from peer %s', routingKey, peerId)
+    return this.#handleRecord(topic, routingKey, marshalledRecord, true, options)
+  }
+
+  async #handleRecord (topic: string, routingKey: Uint8Array, marshalledRecord: Uint8Array, publish: boolean, options?: AbortOptions): Promise<Uint8Array> {
+    await ipnsValidator(routingKey, marshalledRecord)
+    this.shutdownController.signal.throwIfAborted()
 
     if (await this.localStore.has(routingKey)) {
-      const { record: currentRecord } = await this.localStore.get(routingKey)
+      const { record: currentRecord } = await this.localStore.get(routingKey, options)
 
-      if (uint8ArrayEquals(currentRecord, message.data)) {
-        log('not storing record as we already have it')
-        return
+      if (uint8ArrayEquals(currentRecord, marshalledRecord)) {
+        log.trace('found identical record for %m', routingKey)
+        return currentRecord
       }
 
-      const records = [currentRecord, message.data]
+      const records = [currentRecord, marshalledRecord]
       const index = ipnsSelector(routingKey, records)
 
       if (index === 0) {
-        log('not storing record as the one we have is better')
-        return
+        log.trace('found old record for %m', routingKey)
+        return currentRecord
+      }
+    }
+
+    log('found new record for %m', routingKey)
+    await this.localStore.put(routingKey, marshalledRecord, options)
+
+    // if the record was received via fetch, republish it
+    if (publish) {
+      log('publish value for topic %s', topic)
+
+      try {
+        const result = await this.libp2p.services.pubsub.publish(topic, marshalledRecord)
+        log('published record on topic %s to %d recipients', topic, result.recipients)
+      } catch (err) {
+        log.error('could not publish record on topic %s - %e', err)
       }
     }
 
-    await this.localStore.put(routingKey, message.data)
+    return marshalledRecord
   }
 
   /**
@@ -127,7 +281,8 @@ class PubSubRouting implements IPNSRouting {
       const topic = keyToTopic(routingKey)
 
       log('publish value for topic %s', topic)
-      const result = await this.pubsub.publish(topic, marshaledRecord)
+      const result = await this.libp2p.services.pubsub.publish(topic, marshaledRecord)
+      options?.signal?.throwIfAborted()
 
       log('published record on topic %s to %d recipients', topic, result.recipients)
       options.onProgress?.(new CustomProgressEvent('ipns:pubsub:publish', { topic, result }))
@@ -143,33 +298,65 @@ class PubSubRouting implements IPNSRouting {
    * updated once new publishes occur
    */
   async get (routingKey: Uint8Array, options: GetOptions = {}): Promise<Uint8Array> {
-    try {
-      const topic = keyToTopic(routingKey)
+    const topic = keyToTopic(routingKey)
 
+    try {
       // ensure we are subscribed to topic
-      if (!this.pubsub.getTopics().includes(topic)) {
+      if (!this.libp2p.services.pubsub.getTopics().includes(topic)) {
         log('add subscription for topic', topic)
-        this.pubsub.subscribe(topic)
-        this.subscriptions.push(topic)
+        this.libp2p.services.pubsub.subscribe(topic)
+        this.subscriptions.add(topic)
 
         options.onProgress?.(new CustomProgressEvent('ipns:pubsub:subscribe', { topic }))
       }
-
-      // chain through to local store
-      const { record } = await this.localStore.get(routingKey, options)
-
-      return record
     } catch (err: any) {
       options.onProgress?.(new CustomProgressEvent<Error>('ipns:pubsub:error', err))
       throw err
     }
+
+    // delay before fetch to allow pubsub to resolve
+    await raceSignal(delay(this.fetchDelay), this.shutdownController.signal)
+
+    const fetchController = new AbortController()
+    const promises: Array<Promise<Uint8Array>> = []
+
+    for (const peerId of this.libp2p.services.pubsub.getSubscribers(topic)) {
+      const signal = anySignal([
+        options?.signal,
+        fetchController.signal
+      ])
+
+      promises.push(
+        this.#fetchFromPeer(topic, routingKey, peerId, {
+          ...options,
+          signal
+        })
+          .finally(() => {
+            signal.clear()
+          })
+      )
+    }
+
+    if (promises.length > 0) {
+      // fetch record from topic peers
+      const record = await Promise.any(promises)
+
+      // cancel any in-flight requests
+      fetchController.abort()
+
+      if (record != null) {
+        return record
+      }
+    }
+
+    throw new NotFoundError('Pubsub routing does not actively query peers')
   }
 
   /**
    * Get pubsub subscriptions related to ipns
    */
   getSubscriptions (): string[] {
-    return this.subscriptions
+    return [...this.subscriptions]
   }
 
   /**
@@ -181,17 +368,44 @@ class PubSubRouting implements IPNSRouting {
     const topic = keyToTopic(routingKey)
 
     // Not found topic
-    if (!this.subscriptions.includes(topic)) {
+    if (!this.subscriptions.has(topic)) {
       return
     }
 
-    this.pubsub.unsubscribe(topic)
-    this.subscriptions = this.subscriptions.filter(t => t !== topic)
+    this.libp2p.services.pubsub.unsubscribe(topic)
+    this.subscriptions.delete(topic)
   }
 
   toString (): string {
     return 'PubSubRouting()'
   }
+
+  async start (): Promise<void> {
+    this.shutdownController = new AbortController()
+    setMaxListeners(Infinity, this.shutdownController.signal)
+
+    if (this.libp2p.services.fetch != null) {
+      this.fetchTopologyId = await this.libp2p.register(this.libp2p.services.fetch.protocol, {
+        onConnect: (peerId) => {
+          this.fetchPeers.add(peerId)
+        },
+        onDisconnect: (peerId) => {
+          this.fetchPeers.delete(peerId)
+        }
+      }, {
+        signal: this.shutdownController.signal
+      })
+    }
+  }
+
+  stop (): void {
+    this.fetchQueue.abort()
+    this.shutdownController.abort()
+
+    if (this.fetchTopologyId != null) {
+      this.libp2p.unregister(this.fetchTopologyId)
+    }
+  }
 }
 
 const PUBSUB_NAMESPACE = '/record/'
@@ -226,6 +440,6 @@ function topicToKey (topic: string): Uint8Array {
  * updated records, so the first call to `.get` should be expected
  * to fail!
  */
-export function pubsub (components: PubsubRoutingComponents): IPNSRouting {
-  return new PubSubRouting(components)
+export function pubsub (components: PubsubRoutingComponents, init: PubsubRoutingInit = {}): IPNSRouting {
+  return new PubSubRouting(components, init)
 }