npm - @pkcprotocol/pkc-js - Versions diffs - 0.0.22 → 0.0.23 - Mend

@pkcprotocol/pkc-js 0.0.22 → 0.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/README.md +1 -1
package/dist/browser/generated-version.d.ts +1 -1
package/dist/browser/generated-version.js +1 -1
package/dist/browser/helia/helia-for-pkc.js +24 -8
package/dist/browser/helia/helia-for-pkc.js.map +1 -1
package/dist/browser/test/test-util.js +3 -1
package/dist/browser/test/test-util.js.map +1 -1
package/dist/node/generated-version.d.ts +1 -1
package/dist/node/generated-version.js +1 -1
package/dist/node/helia/helia-for-pkc.js +24 -8
package/dist/node/helia/helia-for-pkc.js.map +1 -1
package/dist/node/test/test-util.js +3 -1
package/dist/node/test/test-util.js.map +1 -1
package/package.json +16 -15
package/dist/browser/helia/ipns-over-pubsub-with-fetch.d.ts +0 -36
package/dist/browser/helia/ipns-over-pubsub-with-fetch.js +0 -229
package/dist/browser/helia/ipns-over-pubsub-with-fetch.js.map +0 -1
package/dist/node/helia/ipns-over-pubsub-with-fetch.d.ts +0 -36
package/dist/node/helia/ipns-over-pubsub-with-fetch.js +0 -229
package/dist/node/helia/ipns-over-pubsub-with-fetch.js.map +0 -1

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

@@ -1,229 +0,0 @@
-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 DELETED Viewed

@@ -1 +0,0 @@

- {"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/node/helia/ipns-over-pubsub-with-fetch.d.ts DELETED Viewed

@@ -1,36 +0,0 @@
-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/node/helia/ipns-over-pubsub-with-fetch.js DELETED Viewed

@@ -1,229 +0,0 @@
-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/node/helia/ipns-over-pubsub-with-fetch.js.map DELETED Viewed

@@ -1 +0,0 @@