@pkcprotocol/pkc-js 0.0.11

package/dist/browser/helia/helia-for-pkc.js

@@ -0,0 +1,255 @@
+import { createHelia } from "helia";
+import { ipns } from "@helia/ipns";
+import { gossipsub } from "@libp2p/gossipsub";
+import { identify } from "@libp2p/identify";
+import { CID } from "multiformats/cid";
+import { peerIdFromString } from "@libp2p/peer-id";
+import { bitswap } from "@helia/block-brokers";
+import { MemoryBlockstore } from "blockstore-core";
+import { delegatedRoutingV1HttpApiClient } from "@helia/delegated-routing-v1-http-api-client";
+import { unixfs } from "@helia/unixfs";
+import { fetch as libp2pFetch } from "@libp2p/fetch";
+import { createIpnsFetchRouter } from "./ipns-over-pubsub-with-fetch.js";
+import { pubsub as createIpnsPubusubRouter } from "@helia/ipns/routing";
+import Logger from "../logger.js";
+import { EventEmitter } from "events";
+import { PKCError } from "../pkc-error.js";
+import { Libp2pJsClient } from "./libp2pjsClient.js";
+import { connectToPubsubPeers } from "./util.js";
+const log = Logger("pkc-js:libp2p-js");
+const libp2pJsClients = {}; // key => pkc.clients.libp2pJsClients[key]
+const creatingLibp2pJsClients = {};
+// TODO need to call ipnsRouter.cancel when our community stops updating
+// TODO we may need to remove libp2pJsClients and creatingLibp2pJsClients, I actually don't think they're needed
+// TODO can you verify if we're already content who has a specific and we fetch the CID even though http router says it has no providers, it should be able to load the CID
+function getDelegatedRoutingFields(routers) {
+    const routersObj = {};
+    for (let i = 0; i < routers.length; i++) {
+        const factory = delegatedRoutingV1HttpApiClient({ url: routers[i] });
+        routersObj["delegatedRouting" + i] = (components) => {
+            const client = factory(components);
+            //@ts-expect-error - our routers don't support any of these
+            client.getIPNS = client.getPeers = client.putIPNS = undefined;
+            return client;
+        };
+    }
+    return routersObj;
+}
+export async function createLibp2pJsClientOrUseExistingOne(pkcOptions) {
+    if (!pkcOptions.httpRoutersOptions?.length)
+        throw Error("You need to have pkc.httpRouterOptions to set up helia");
+    const existingClient = libp2pJsClients[pkcOptions.key];
+    if (existingClient) {
+        existingClient.countOfUsesOfInstance++;
+        return existingClient;
+    }
+    const creatingClientPromise = creatingLibp2pJsClients[pkcOptions.key];
+    if (creatingClientPromise) {
+        const client = await creatingClientPromise;
+        client.countOfUsesOfInstance++;
+        return client;
+    }
+    creatingLibp2pJsClients[pkcOptions.key] = (async () => {
+        const mergedHeliaInit = {
+            libp2p: {
+                // for now we're overwriting addresses
+                addresses: { listen: [] }, // TODO at some point we should use addresses, but right now it gets into an infinite loop with random walk
+                peerDiscovery: undefined,
+                ...pkcOptions.libp2pOptions,
+                // Configure connection manager to handle more concurrent streams
+                services: {
+                    identify: identify(),
+                    pubsub: gossipsub(),
+                    fetch: libp2pFetch(),
+                    ...getDelegatedRoutingFields(pkcOptions.httpRoutersOptions),
+                    ...pkcOptions.libp2pOptions?.services
+                }
+            },
+            blockstore: new MemoryBlockstore(), // TODO use indexed db here
+            blockBrokers: [bitswap()],
+            start: false,
+            ...pkcOptions.heliaOptions
+        };
+        const helia = await createHelia(mergedHeliaInit);
+        //@ts-expect-error
+        helia.routing.routers = [helia.routing.routers[0]]; // remove gateway routing
+        log("Initialized libp2pjs helia with key", pkcOptions.key, "peer id", helia.libp2p.peerId.toString());
+        const pubsubEventHandler = new EventEmitter();
+        helia.libp2p.services.pubsub.addEventListener("message", (evt) => {
+            log.trace(`Event from helia libp2p pubsub:`, `on topic ${evt.detail.topic}`);
+            //@ts-expect-error
+            const msgFormatted = { data: evt.detail.data, topic: evt.detail.topic, type: evt.detail.type };
+            pubsubEventHandler.emit(evt.detail.topic, msgFormatted);
+        });
+        const heliaFs = unixfs(helia);
+        const ipnsNameResolver = ipns(helia, {
+            routers: [createIpnsFetchRouter(helia), createIpnsPubusubRouter(helia)]
+        });
+        ipnsNameResolver.routers = ipnsNameResolver.routers.slice(1); // remove gateway ipns routing and keep only pubsub
+        const throwIfHeliaIsStoppingOrStopped = () => {
+            if (helia.libp2p.status === "stopped" || helia.libp2p.status === "stopping")
+                throw new PKCError("ERR_HELIAS_STOPPING_OR_STOPPED", {
+                    heliaStatus: helia.libp2p.status,
+                    heliaKey: pkcOptions.key,
+                    heliaPeerId: helia.libp2p.peerId.toString(),
+                    helia
+                });
+        };
+        const heliaWithKuboRpcClientShape = {
+            name: {
+                resolve: (ipnsName, options) => {
+                    // Create an async generator function
+                    throwIfHeliaIsStoppingOrStopped();
+                    async function* generator() {
+                        const ipnsNameAsPeerId = typeof ipnsName === "string" ? peerIdFromString(ipnsName) : ipnsName;
+                        log.trace("Resolving ipns name", ipnsName, "with options", options);
+                        try {
+                            const result = await ipnsNameResolver.resolve(ipnsNameAsPeerId.toMultihash(), {
+                                ...options,
+                                ipnsName
+                            });
+                            yield result.record.value;
+                            return;
+                        }
+                        catch (err) {
+                            const error = err;
+                            if (error.name === "NotFoundError" || error.name === "RecordNotFoundError")
+                                throw new PKCError("ERR_RESOLVED_IPNS_P2P_TO_UNDEFINED", {
+                                    heliaError: err,
+                                    ipnsName,
+                                    ipnsResolveOptions: options
+                                });
+                            else
+                                throw err;
+                        }
+                    }
+                    return generator();
+                }
+            },
+            cat(ipfsPath, options) {
+                throwIfHeliaIsStoppingOrStopped();
+                // ipfsPath could be a string of cid or ipfs path
+                if (ipfsPath.includes("/")) {
+                    // it's a path <root-cid>/<path>/
+                    const rootCid = ipfsPath.split("/")[0];
+                    const path = ipfsPath.split("/").slice(1).join("/");
+                    return heliaFs.cat(CID.parse(rootCid), { ...options, path });
+                }
+                else {
+                    // a cid string
+                    return heliaFs.cat(CID.parse(ipfsPath), options);
+                }
+            },
+            pubsub: {
+                ls: async () => helia.libp2p.services.pubsub.getTopics(),
+                peers: async (topic, options) => helia.libp2p.services.pubsub.getSubscribers(topic),
+                publish: async (topic, data, options) => {
+                    throwIfHeliaIsStoppingOrStopped();
+                    if (helia.libp2p.services.pubsub.getSubscribers(topic).length === 0) {
+                        console.log("before", "pubsub publish", "connectToPeersProvidingCid", topic);
+                        await connectToPubsubPeers({
+                            helia,
+                            pubsubTopic: topic,
+                            maxPeers: 2,
+                            options,
+                            log: Logger("pkc-js:helia:pubsub:publish:connectToPeersProvidingCid")
+                        });
+                        console.log("after", "pubsub publish", "connectToPeersProvidingCid", topic);
+                    }
+                    const res = await helia.libp2p.services.pubsub.publish(topic, data);
+                    log("Published new data to topic", topic, "And the result is", res);
+                },
+                subscribe: async (topic, handler, options) => {
+                    throwIfHeliaIsStoppingOrStopped();
+                    if (helia.libp2p.services.pubsub.getSubscribers(topic).length === 0) {
+                        console.log("before pubsub-subscribe", "connectToPeersProvidingCid", topic);
+                        await connectToPubsubPeers({
+                            helia,
+                            pubsubTopic: topic,
+                            maxPeers: 2,
+                            options,
+                            log: Logger("pkc-js:helia:pubsub:subscribe:connectToPeersProvidingCid")
+                        });
+                        console.log("after pubsub-subscribe", "connectToPeersProvidingCid", topic);
+                    }
+                    //@ts-expect-error
+                    pubsubEventHandler.on(topic, handler);
+                    helia.libp2p.services.pubsub.subscribe(topic);
+                },
+                unsubscribe: async (topic, handler, options) => {
+                    throwIfHeliaIsStoppingOrStopped();
+                    //@ts-expect-error
+                    pubsubEventHandler.removeListener(topic, handler);
+                    if (pubsubEventHandler.listenerCount(topic) === 0)
+                        helia.libp2p.services.pubsub.unsubscribe(topic);
+                }
+            },
+            async add(entry, // More specific types will be checked internally
+            options) {
+                throw Error("Helia 'add' is not supported at the moment in pkc-js API");
+            },
+            async stop(options) {
+                const clientFromMap = libp2pJsClients[pkcOptions.key];
+                if (!clientFromMap)
+                    return; // already been stopped
+                if (clientFromMap.countOfUsesOfInstance <= 0)
+                    return; // stop already in progress or over-released
+                clientFromMap.countOfUsesOfInstance--;
+                if (clientFromMap.countOfUsesOfInstance === 0) {
+                    for (const topic of helia.libp2p.services.pubsub.getTopics())
+                        helia.libp2p.services.pubsub.unsubscribe(topic);
+                    try {
+                        await helia.stop();
+                    }
+                    catch (e) {
+                        log.error("Error stopping helia", e);
+                    }
+                    delete libp2pJsClients[pkcOptions.key];
+                    log("Helia/libp2p-js stopped with key", pkcOptions.key, "and peer id", helia.libp2p.peerId.toString());
+                }
+            }
+        };
+        const originalSubscribe = helia.libp2p.services.pubsub.subscribe.bind(helia.libp2p.services.pubsub);
+        const connectToPeersProvidingTopic = async (topic) => {
+            console.log("before", "native pubsub-subscribe", "connectToPeersProvidingTopic", topic);
+            await connectToPubsubPeers({
+                helia,
+                pubsubTopic: topic,
+                maxPeers: 2,
+                log: Logger("pkc-js:helia:pubsub:subscribe:connectToPeersProvidingTopic")
+            });
+            console.log("after", "native pubsub-subscribe", "connectToPeersProvidingTopic", topic, "done");
+        };
+        helia.libp2p.services.pubsub.subscribe = (topic) => {
+            throwIfHeliaIsStoppingOrStopped();
+            if (helia.libp2p.services.pubsub.getSubscribers(topic).length === 0)
+                connectToPeersProvidingTopic(topic).catch((err) => log.error("Error connecting to peers providing topic", err));
+            originalSubscribe(topic);
+        };
+        const fullInstanceWithOptions = {
+            helia,
+            heliaWithKuboRpcClientFunctions: heliaWithKuboRpcClientShape,
+            heliaUnixfs: heliaFs,
+            heliaIpnsRouter: ipnsNameResolver,
+            mergedHeliaOptions: mergedHeliaInit,
+            countOfUsesOfInstance: 1,
+            libp2pJsClientsOptions: pkcOptions,
+            key: pkcOptions.key
+        };
+        const client = new Libp2pJsClient(fullInstanceWithOptions);
+        await helia.start();
+        log("Helia/libp2p-js started with key", pkcOptions.key, "and peer id", helia.libp2p.peerId.toString());
+        libp2pJsClients[pkcOptions.key] = client;
+        return client;
+    })();
+    const createdClientPromise = creatingLibp2pJsClients[pkcOptions.key];
+    if (!createdClientPromise)
+        throw new Error("Missing creation promise after initialization");
+    try {
+        return await createdClientPromise;
+    }
+    finally {
+        delete creatingLibp2pJsClients[pkcOptions.key];
+    }
+}
+//# sourceMappingURL=helia-for-pkc.js.map

package/dist/browser/helia/helia-for-pkc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helia-for-pkc.js","sourceRoot":"","sources":["../../../src/helia/helia-for-pkc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,+BAA+B,EAAE,MAAM,6CAA6C,CAAC;AAC9F,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAqB,MAAM,kCAAkC,CAAC;AAC5F,OAAO,EAAE,MAAM,IAAI,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,MAAM,MAAM,cAAc,CAAC;AAIlC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAEjD,MAAM,GAAG,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAEvC,MAAM,eAAe,GAA4C,EAAE,CAAC,CAAC,0CAA0C;AAC/G,MAAM,uBAAuB,GAAqD,EAAE,CAAC;AAErF,wEAAwE;AACxE,gHAAgH;AAEhH,2KAA2K;AAC3K,SAAS,yBAAyB,CAAC,OAAiB;IAChD,MAAM,UAAU,GAAuE,EAAE,CAAC;IAC1F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,+BAA+B,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACrE,UAAU,CAAC,kBAAkB,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE;YAChD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YACnC,2DAA2D;YAC3D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;YAC9D,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;IACN,CAAC;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oCAAoC,CACtD,UAAoI;IAEpI,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,MAAM;QAAE,MAAM,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAClH,MAAM,cAAc,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACvD,IAAI,cAAc,EAAE,CAAC;QACjB,cAAc,CAAC,qBAAqB,EAAE,CAAC;QACvC,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACtE,IAAI,qBAAqB,EAAE,CAAC;QACxB,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC;QAC3C,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,uBAAuB,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QAClD,MAAM,eAAe,GAAG;YACpB,MAAM,EAAE;gBACJ,sCAAsC;gBACtC,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,2GAA2G;gBACtI,aAAa,EAAE,SAAS;gBACxB,GAAG,UAAU,CAAC,aAAa;gBAC3B,iEAAiE;gBAEjE,QAAQ,EAAE;oBACN,QAAQ,EAAE,QAAQ,EAAE;oBACpB,MAAM,EAAE,SAAS,EAAE;oBACnB,KAAK,EAAE,WAAW,EAAE;oBACpB,GAAG,yBAAyB,CAAC,UAAU,CAAC,kBAAkB,CAAC;oBAC3D,GAAG,UAAU,CAAC,aAAa,EAAE,QAAQ;iBACxC;aACJ;YACD,UAAU,EAAE,IAAI,gBAAgB,EAAE,EAAE,2BAA2B;YAC/D,YAAY,EAAE,CAAC,OAAO,EAAE,CAAC;YACzB,KAAK,EAAE,KAAK;YACZ,GAAG,UAAU,CAAC,YAAY;SACY,CAAC;QAE3C,MAAM,KAAK,GAA0B,MAAM,WAAW,CAAC,eAAe,CAAC,CAAC;QAExE,kBAAkB;QAClB,KAAK,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,yBAAyB;QAE7E,GAAG,CAAC,qCAAqC,EAAE,UAAU,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEtG,MAAM,kBAAkB,GAAG,IAAI,YAAY,EAAE,CAAC;QAE9C,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7D,GAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,YAAY,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YAE7E,kBAAkB;YAClB,MAAM,YAAY,GAAgC,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5H,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAE9B,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,EAAE;YACjC,OAAO,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC;SAC1E,CAAC,CAAC;QAEH,gBAAgB,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,mDAAmD;QAEjH,MAAM,+BAA+B,GAAG,GAAG,EAAE;YACzC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU;gBACvE,MAAM,IAAI,QAAQ,CAAC,gCAAgC,EAAE;oBACjD,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM;oBAChC,QAAQ,EAAE,UAAU,CAAC,GAAG;oBACxB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;oBAC3C,KAAK;iBACR,CAAC,CAAC;QACX,CAAC,CAAC;QAEF,MAAM,2BAA2B,GAAsD;YACnF,IAAI,EAAE;gBACF,OAAO,EAAE,CAAC,QAAgB,EAAE,OAAgC,EAAE,EAAE;oBAC5D,qCAAqC;oBACrC,+BAA+B,EAAE,CAAC;oBAClC,KAAK,SAAS,CAAC,CAAC,SAAS;wBACrB,MAAM,gBAAgB,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;wBAC9F,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;wBACpE,IAAI,CAAC;4BACD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE;gCAC1E,GAAG,OAAO;gCACV,QAAQ;6BACU,CAAC,CAAC;4BACxB,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;4BAC1B,OAAO;wBACX,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACX,MAAM,KAAK,GAAU,GAAG,CAAC;4BACzB,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB;gCACtE,MAAM,IAAI,QAAQ,CAAC,oCAAoC,EAAE;oCACrD,UAAU,EAAE,GAAG;oCACf,QAAQ;oCACR,kBAAkB,EAAE,OAAO;iCAC9B,CAAC,CAAC;;gCACF,MAAM,GAAG,CAAC;wBACnB,CAAC;oBACL,CAAC;oBAED,OAAO,SAAS,EAAE,CAAC;gBACvB,CAAC;aACJ;YACD,GAAG,CAAC,QAAgB,EAAE,OAAO;gBACzB,+BAA+B,EAAE,CAAC;gBAClC,iDAAiD;gBACjD,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzB,iCAAiC;oBACjC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAEpD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;qBAAM,CAAC;oBACJ,eAAe;oBACf,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;gBACrD,CAAC;YACL,CAAC;YACD,MAAM,EAAE;gBACJ,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE;gBACxD,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC;gBACnF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;oBACpC,+BAA+B,EAAE,CAAC;oBAClC,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAClE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC;wBAC7E,MAAM,oBAAoB,CAAC;4BACvB,KAAK;4BACL,WAAW,EAAE,KAAK;4BAClB,QAAQ,EAAE,CAAC;4BACX,OAAO;4BACP,GAAG,EAAE,MAAM,CAAC,wDAAwD,CAAC;yBACxE,CAAC,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC;oBAChF,CAAC;oBAED,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBACpE,GAAG,CAAC,6BAA6B,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;gBACxE,CAAC;gBACD,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;oBACzC,+BAA+B,EAAE,CAAC;oBAElC,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAClE,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC;wBAC5E,MAAM,oBAAoB,CAAC;4BACvB,KAAK;4BACL,WAAW,EAAE,KAAK;4BAClB,QAAQ,EAAE,CAAC;4BACX,OAAO;4BACP,GAAG,EAAE,MAAM,CAAC,0DAA0D,CAAC;yBAC1E,CAAC,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC;oBAC/E,CAAC;oBAED,kBAAkB;oBAClB,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;oBACtC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBAClD,CAAC;gBACD,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;oBAC3C,+BAA+B,EAAE,CAAC;oBAClC,kBAAkB;oBAClB,kBAAkB,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;oBAClD,IAAI,kBAAkB,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;wBAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBACvG,CAAC;aACJ;YACD,KAAK,CAAC,GAAG,CACL,KAA8E,EAAE,iDAAiD;YACjI,OAAiF;gBAEjF,MAAM,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAC5E,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,OAAO;gBACd,MAAM,aAAa,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAI,CAAC,aAAa;oBAAE,OAAO,CAAC,uBAAuB;gBACnD,IAAI,aAAa,CAAC,qBAAqB,IAAI,CAAC;oBAAE,OAAO,CAAC,4CAA4C;gBAClG,aAAa,CAAC,qBAAqB,EAAE,CAAC;gBACtC,IAAI,aAAa,CAAC,qBAAqB,KAAK,CAAC,EAAE,CAAC;oBAC5C,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE;wBAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;oBAC9G,IAAI,CAAC;wBACD,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;oBACvB,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACT,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;oBACzC,CAAC;oBAED,OAAO,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBACvC,GAAG,CAAC,kCAAkC,EAAE,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC3G,CAAC;YACL,CAAC;SACJ,CAAC;QAEF,MAAM,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEpG,MAAM,4BAA4B,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;YACzD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,yBAAyB,EAAE,8BAA8B,EAAE,KAAK,CAAC,CAAC;YACxF,MAAM,oBAAoB,CAAC;gBACvB,KAAK;gBACL,WAAW,EAAE,KAAK;gBAClB,QAAQ,EAAE,CAAC;gBACX,GAAG,EAAE,MAAM,CAAC,4DAA4D,CAAC;aAC5E,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACnG,CAAC,CAAC;QAEF,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;YAC/C,+BAA+B,EAAE,CAAC;YAClC,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC;gBAC/D,4BAA4B,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,EAAE,GAAG,CAAC,CAAC,CAAC;YACpH,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,MAAM,uBAAuB,GAAG;YAC5B,KAAK;YACL,+BAA+B,EAAE,2BAA2B;YAC5D,WAAW,EAAE,OAAO;YACpB,eAAe,EAAE,gBAAgB;YACjC,kBAAkB,EAAE,eAAe;YACnC,qBAAqB,EAAE,CAAC;YACxB,sBAAsB,EAAE,UAAU;YAClC,GAAG,EAAE,UAAU,CAAC,GAAG;SACtB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,uBAAuB,CAAC,CAAC;QAE3D,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,kCAAkC,EAAE,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEvG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAEzC,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACrE,IAAI,CAAC,oBAAoB;QAAE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IAE5F,IAAI,CAAC;QACD,OAAO,MAAM,oBAAoB,CAAC;IACtC,CAAC;YAAS,CAAC;QACP,OAAO,uBAAuB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC;AACL,CAAC"}

package/dist/browser/helia/ipns-over-pubsub-with-fetch.d.ts

@@ -0,0 +1,36 @@
+import { GetOptions as ipnsGetOptions, IPNSRouting, PutOptions } from "@helia/ipns/routing";
+import type { Fetch } from "@libp2p/fetch";
+import { peerIdFromString } from "@libp2p/peer-id";
+import type { HeliaWithLibp2pPubsub } from "./types.js";
+export type PKCIpnsGetOptions = ipnsGetOptions & {
+    ipnsName: string;
+};
+type PeerId = ReturnType<typeof peerIdFromString>;
+export declare class IpnsFetchRouter implements IPNSRouting {
+    fetchedIpnsRecordBefore: Record<string, boolean>;
+    _helia: HeliaWithLibp2pPubsub;
+    _fetchService: Fetch;
+    constructor(helia: HeliaWithLibp2pPubsub);
+    put(routingKey: Uint8Array, marshaledRecord: Uint8Array, options?: PutOptions): Promise<void>;
+    private _fetchFromPeer;
+    _handleFetchingFromSubscribedPubsubPeers({ routingKey, topic, pubsubSubscribers, options }: {
+        routingKey: Uint8Array;
+        topic: string;
+        pubsubSubscribers: PeerId[];
+        options: PKCIpnsGetOptions & {
+            signal: AbortSignal;
+            abortController: AbortController;
+        };
+    }): Promise<Uint8Array>;
+    _handleFetchingFromProviders({ routingKey, topic, options }: {
+        routingKey: Uint8Array;
+        topic: string;
+        options: PKCIpnsGetOptions & {
+            signal: AbortSignal;
+            abortController: AbortController;
+        };
+    }): Promise<Uint8Array>;
+    get(routingKey: Uint8Array, options: PKCIpnsGetOptions): Promise<Uint8Array>;
+}
+export declare function createIpnsFetchRouter(helia: HeliaWithLibp2pPubsub): IPNSRouting;
+export {};

package/dist/browser/helia/ipns-over-pubsub-with-fetch.js

@@ -0,0 +1,229 @@
+import Logger from "../logger.js";
+import pLimit from "p-limit";
+import pTimeout from "p-timeout";
+import { binaryKeyToPubsubTopic, pubsubTopicToDhtKey, pubsubTopicToDhtKeyCid } from "../util.js";
+import { PKCError } from "../pkc-error.js";
+import { CID } from "kubo-rpc-client";
+const log = Logger("pkc-js:helia:ipns:routing:pubsub-with-fetch");
+const LIMIT_PARALLEL_FETCH_IPNS_FROM_PEERS = 3;
+const IPNS_FETCH_FROM_PEER_TIMEOUT_MS = 10000;
+export class IpnsFetchRouter {
+    constructor(helia) {
+        this.fetchedIpnsRecordBefore = {}; // key is the "topic", value is true if it was fetched before using libp2p/fetch
+        this._helia = helia;
+        this._fetchService = helia.libp2p.services.fetch;
+    }
+    put(routingKey, marshaledRecord, options) {
+        throw new Error("Method not implemented.");
+    }
+    async _fetchFromPeer({ peer, routingKey, topic, options }) {
+        const contentCidString = pubsubTopicToDhtKeyCid(topic);
+        const record = await pTimeout(this._fetchService.fetch(peer, routingKey), {
+            milliseconds: IPNS_FETCH_FROM_PEER_TIMEOUT_MS,
+            signal: options?.signal,
+            message: new PKCError("ERR_LIBP2P_FETCH_IPNS_FROM_PEER_TIMEDOUT", {
+                peerId: peer,
+                routingKey,
+                topic,
+                timeoutMs: IPNS_FETCH_FROM_PEER_TIMEOUT_MS,
+                contentCidString,
+                options
+            })
+        });
+        if (!record) {
+            throw new PKCError("ERR_FETCH_OVER_IPNS_OVER_PUBSUB_RETURNED_UNDEFINED", {
+                peerId: peer,
+                routingKey,
+                topic,
+                contentCidString,
+                options
+            });
+        }
+        return record;
+    }
+    async _handleFetchingFromSubscribedPubsubPeers({ routingKey, topic, pubsubSubscribers, options }) {
+        const limit = pLimit(LIMIT_PARALLEL_FETCH_IPNS_FROM_PEERS);
+        // We already have subscribers, no need to find providers
+        log("Using", pubsubSubscribers.length, "existing pubsub subscribers for topic", topic);
+        // Create individual abort controllers for each fetch
+        const fetchAbortControllers = [];
+        const peerIdToError = {};
+        const cleanUp = () => {
+            fetchAbortControllers.forEach((controller) => controller.abort());
+            if (options.abortController)
+                options.abortController.abort();
+        };
+        // Create fetch promises for all subscribers in parallel
+        const fetchPromises = pubsubSubscribers.map((peer) => {
+            const peerAbortController = new AbortController();
+            fetchAbortControllers.push(peerAbortController);
+            const combinedSignal = AbortSignal.any([options.signal, peerAbortController.signal]);
+            return limit(() => this._fetchFromPeer({
+                peer,
+                routingKey,
+                topic,
+                options: { ...options, signal: combinedSignal }
+            })).catch((error) => {
+                peerIdToError[peer.toString()] = error;
+                throw error;
+            });
+        });
+        // Use Promise.allSettled to wait for all promises and find the first successful one
+        const results = await Promise.allSettled(fetchPromises);
+        // Find the first fulfilled (successful) result
+        const successfulResult = results.find((result) => result.status === "fulfilled");
+        if (successfulResult) {
+            log("Fetched IPNS", options?.ipnsName, "record for topic", topic, "using pubsub subscribers");
+            cleanUp();
+            this.fetchedIpnsRecordBefore[topic] = true;
+            return successfulResult.value;
+        }
+        else {
+            // All promises failed
+            cleanUp();
+            throw new PKCError("ERR_FETCH_OVER_IPNS_OVER_PUBSUB_FAILED", {
+                peerIdToError,
+                topic,
+                routingKey,
+                options,
+                fetchingFromGossipsubTopicSubscribers: true
+            });
+        }
+    }
+    async _handleFetchingFromProviders({ routingKey, topic, options }) {
+        const limit = pLimit(LIMIT_PARALLEL_FETCH_IPNS_FROM_PEERS);
+        // No subscribers, need to find providers using content routing and process them as they come
+        const pubsubTopicCidString = pubsubTopicToDhtKey(topic);
+        const pubsubTopicCid = CID.parse(pubsubTopicToDhtKey(topic));
+        const peerIdToError = {};
+        const fetchAbortControllers = [];
+        const activeFetchPromises = [];
+        const findProvidersAbortController = new AbortController();
+        const cleanUp = () => {
+            findProvidersAbortController.abort();
+            fetchAbortControllers.forEach((controller) => controller.abort());
+            options.abortController.abort();
+        };
+        // Helper function to check if any promise has succeeded
+        const checkForSuccess = async (promises) => {
+            if (promises.length === 0)
+                return null;
+            const results = await Promise.allSettled(promises);
+            const successfulResult = results.find((result) => result.status === "fulfilled");
+            return successfulResult ? successfulResult.value : null;
+        };
+        try {
+            // Process providers as they're discovered, but in parallel up to the limit
+            for await (const peer of this._helia.libp2p.contentRouting.findProviders(pubsubTopicCid, {
+                signal: findProvidersAbortController.signal
+            })) {
+                const peerAbortController = new AbortController();
+                fetchAbortControllers.push(peerAbortController);
+                const combinedSignal = AbortSignal.any([options.signal, peerAbortController.signal]);
+                const fetchPromise = limit(() => this._fetchFromPeer({
+                    peer: peer.id,
+                    routingKey,
+                    topic,
+                    options: { ...options, signal: combinedSignal }
+                })).catch((error) => {
+                    peerIdToError[peer.id.toString()] = error;
+                    throw error;
+                });
+                activeFetchPromises.push(fetchPromise);
+                // Check if any active promises have succeeded
+                const result = await checkForSuccess(activeFetchPromises);
+                if (result) {
+                    cleanUp();
+                    log("Fetched IPNS", options?.ipnsName, "record for topic", topic, "using provider discovery");
+                    return result;
+                }
+                // If we have reached the limit, wait for some to complete before adding more
+                if (activeFetchPromises.length >= LIMIT_PARALLEL_FETCH_IPNS_FROM_PEERS) {
+                    // Remove completed promises
+                    const results = await Promise.allSettled(activeFetchPromises);
+                    const successfulResult = results.find((result) => result.status === "fulfilled");
+                    if (successfulResult) {
+                        cleanUp();
+                        log("Fetched IPNS", options?.ipnsName, "record for topic", topic, "using provider discovery");
+                        return successfulResult.value;
+                    }
+                }
+            }
+            // Final check on any remaining promises
+            const result = await checkForSuccess(activeFetchPromises);
+            if (result) {
+                log("Fetched IPNS", options?.ipnsName, "record for topic", topic, "using provider discovery");
+                this.fetchedIpnsRecordBefore[topic] = true;
+                return result;
+            }
+            cleanUp();
+            // If we get here, all providers have been tried and failed
+            throw new PKCError("ERR_FETCH_OVER_IPNS_OVER_PUBSUB_FAILED", {
+                peerIdToError,
+                fetchingFromProviders: true,
+                topic,
+                routingKey,
+                options
+            });
+        }
+        catch (e) {
+            //@ts-expect-error
+            e.details = {
+                //@ts-expect-error
+                ...e.details,
+                topic,
+                routingKey,
+                peerIdToError,
+                pubsubTopicCid,
+                pubsubTopicCidString,
+                options
+            };
+            throw e;
+        }
+        finally {
+            cleanUp();
+        }
+    }
+    async get(routingKey, options) {
+        const topic = binaryKeyToPubsubTopic(routingKey);
+        // Check if we should use libp2p/fetch based on cooloff period
+        const cooloffKey = `${topic}`;
+        const shouldUseFetch = !this.fetchedIpnsRecordBefore[cooloffKey];
+        if (!shouldUseFetch) {
+            log.trace("Skipping libp2p/fetch for topic", topic, "and IPNS", options?.ipnsName, "since we already fetched it before using libp2p/fetch");
+            throw new Error("Already loaded via libp2p/fetch, should await for updates in gossipsub topic");
+        }
+        // First check if we already have pubsub subscribers
+        const pubsubSubscribers = this._helia.libp2p.services.pubsub.getSubscribers(topic);
+        const abortController = new AbortController();
+        const combinedSignal = options?.signal ? AbortSignal.any([options.signal, abortController.signal]) : abortController.signal;
+        try {
+            if (pubsubSubscribers.length > 0)
+                return await this._handleFetchingFromSubscribedPubsubPeers({
+                    routingKey,
+                    topic,
+                    pubsubSubscribers,
+                    options: { ...options, signal: combinedSignal, abortController }
+                });
+            else
+                return await this._handleFetchingFromProviders({
+                    routingKey,
+                    topic,
+                    options: { ...options, signal: combinedSignal, abortController }
+                });
+        }
+        catch (error) {
+            //@ts-expect-error
+            error.details = { ...error.details, topic, routingKey, options };
+            log.trace("Error in get method:", error);
+            throw error;
+        }
+        finally {
+            abortController.abort(); // make sure to abort
+        }
+    }
+}
+export function createIpnsFetchRouter(helia) {
+    return new IpnsFetchRouter(helia);
+}
+//# sourceMappingURL=ipns-over-pubsub-with-fetch.js.map

package/dist/browser/helia/ipns-over-pubsub-with-fetch.js.map

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

package/dist/browser/helia/libp2pjsClient.d.ts

@@ -0,0 +1,27 @@
+import type { createHelia } from "helia";
+import type { HeliaWithKuboRpcClientFunctions, HeliaWithLibp2pPubsub } from "./types.js";
+import type { unixfs } from "@helia/unixfs";
+import type { ipns } from "@helia/ipns";
+import type { ParsedPKCOptions } from "../types.js";
+type Libp2pJsClientInit = {
+    helia: HeliaWithLibp2pPubsub;
+    heliaUnixfs: ReturnType<typeof unixfs>;
+    heliaIpnsRouter: ReturnType<typeof ipns>;
+    heliaWithKuboRpcClientFunctions: HeliaWithKuboRpcClientFunctions;
+    libp2pJsClientsOptions: NonNullable<ParsedPKCOptions["libp2pJsClientsOptions"]>[number];
+    mergedHeliaOptions: Parameters<typeof createHelia>[0];
+    key: string;
+    countOfUsesOfInstance: number;
+};
+export declare class Libp2pJsClient {
+    _helia: HeliaWithLibp2pPubsub;
+    _heliaUnixfs: ReturnType<typeof unixfs>;
+    _heliaIpnsRouter: ReturnType<typeof ipns>;
+    heliaWithKuboRpcClientFunctions: HeliaWithKuboRpcClientFunctions;
+    _libp2pJsClientsOptions: NonNullable<ParsedPKCOptions["libp2pJsClientsOptions"]>[number];
+    _mergedHeliaOptions: Parameters<typeof createHelia>[0];
+    key: Libp2pJsClientInit["key"];
+    countOfUsesOfInstance: number;
+    constructor(libp2pJsClientOptions: Libp2pJsClientInit);
+}
+export {};

package/dist/browser/helia/libp2pjsClient.js

@@ -0,0 +1,15 @@
+import { hideClassPrivateProps } from "../util.js";
+export class Libp2pJsClient {
+    constructor(libp2pJsClientOptions) {
+        this._helia = libp2pJsClientOptions.helia;
+        this._heliaUnixfs = libp2pJsClientOptions.heliaUnixfs;
+        this._heliaIpnsRouter = libp2pJsClientOptions.heliaIpnsRouter;
+        this.heliaWithKuboRpcClientFunctions = libp2pJsClientOptions.heliaWithKuboRpcClientFunctions;
+        this._libp2pJsClientsOptions = libp2pJsClientOptions.libp2pJsClientsOptions;
+        this._mergedHeliaOptions = libp2pJsClientOptions.mergedHeliaOptions;
+        this.key = libp2pJsClientOptions.key;
+        this.countOfUsesOfInstance = libp2pJsClientOptions.countOfUsesOfInstance;
+        hideClassPrivateProps(this);
+    }
+}
+//# sourceMappingURL=libp2pjsClient.js.map

package/dist/browser/helia/libp2pjsClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"libp2pjsClient.js","sourceRoot":"","sources":["../../../src/helia/libp2pjsClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAenD,MAAM,OAAO,cAAc;IAUvB,YAAY,qBAAyC;QACjD,IAAI,CAAC,MAAM,GAAG,qBAAqB,CAAC,KAAK,CAAC;QAC1C,IAAI,CAAC,YAAY,GAAG,qBAAqB,CAAC,WAAW,CAAC;QACtD,IAAI,CAAC,gBAAgB,GAAG,qBAAqB,CAAC,eAAe,CAAC;QAC9D,IAAI,CAAC,+BAA+B,GAAG,qBAAqB,CAAC,+BAA+B,CAAC;QAC7F,IAAI,CAAC,uBAAuB,GAAG,qBAAqB,CAAC,sBAAsB,CAAC;QAC5E,IAAI,CAAC,mBAAmB,GAAG,qBAAqB,CAAC,kBAAkB,CAAC;QACpE,IAAI,CAAC,GAAG,GAAG,qBAAqB,CAAC,GAAG,CAAC;QACrC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC,qBAAqB,CAAC;QAEzE,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACJ"}

package/dist/browser/helia/types.d.ts

@@ -0,0 +1,19 @@
+import type { createHelia } from "helia";
+import type { KuboRpcClient } from "../types.js";
+import type { PubsubRoutingComponents } from "@helia/ipns/routing";
+export interface HeliaWithKuboRpcClientFunctions extends Pick<NonNullable<KuboRpcClient["_client"]>, "add" | "cat" | "pubsub" | "stop"> {
+    add: KuboRpcClient["_client"]["add"];
+    name: Pick<KuboRpcClient["_client"]["name"], "resolve">;
+    cat: KuboRpcClient["_client"]["cat"];
+    pubsub: KuboRpcClient["_client"]["pubsub"];
+    stop: KuboRpcClient["_client"]["stop"];
+}
+type baseHelia = Awaited<ReturnType<typeof createHelia>>;
+export interface HeliaWithLibp2pPubsub extends baseHelia {
+    libp2p: baseHelia["libp2p"] & {
+        services: baseHelia["libp2p"]["services"] & {
+            pubsub: PubsubRoutingComponents["libp2p"]["services"]["pubsub"];
+        };
+    };
+}
+export {};

package/dist/browser/helia/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/browser/helia/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/helia/types.ts"],"names":[],"mappings":""}

package/dist/browser/helia/util.d.ts

@@ -0,0 +1,13 @@
+import type { HeliaWithLibp2pPubsub } from "./types.js";
+import type { PeerId } from "@libp2p/interface";
+import Logger from "../logger.js";
+export declare function connectToPubsubPeers({ helia, pubsubTopic, maxPeers, options, log }: {
+    helia: HeliaWithLibp2pPubsub;
+    pubsubTopic: string;
+    maxPeers: number;
+    log: Logger;
+    options?: {
+        signal?: AbortSignal;
+    };
+}): Promise<Awaited<ReturnType<typeof helia.libp2p.dial>>[]>;
+export declare function waitForTopicPeers(helia: HeliaWithLibp2pPubsub, topic: string, minPeers?: number, timeoutMs?: number): Promise<PeerId[]>;