@waku/core 0.0.28-efe9b8d.0 → 0.0.29-5b03709.0

package/CHANGELOG.md

@@ -5,6 +5,36 @@ All notable changes to this project will be documented in this file.
 The file is maintained by [Release Please](https://github.com/googleapis/release-please) based on [Conventional Commits](https://www.conventionalcommits.org) specification,
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.28](https://github.com/waku-org/js-waku/compare/core-v0.0.27...core-v0.0.28) (2024-04-09)
+
+
+### ⚠ BREAKING CHANGES
+
+* **store:** move protocol implementation opinions to `@waku/sdk` ([#1913](https://github.com/waku-org/js-waku/issues/1913))
+* **lightpush:** move protocol implementation opinions to `@waku/sdk` ([#1887](https://github.com/waku-org/js-waku/issues/1887))
+
+### Features
+
+* Add cross peer dependency for [@waku](https://github.com/waku) packages ([#1889](https://github.com/waku-org/js-waku/issues/1889)) ([8f86740](https://github.com/waku-org/js-waku/commit/8f867404e3e950b6e491c8831068962c6968ed4e))
+* **metadata:** Use error codes ([#1904](https://github.com/waku-org/js-waku/issues/1904)) ([1882023](https://github.com/waku-org/js-waku/commit/1882023c58c830fc31921fe786bce734536ac1da))
+* Peer-exchange uses error codes ([#1907](https://github.com/waku-org/js-waku/issues/1907)) ([877fe1d](https://github.com/waku-org/js-waku/commit/877fe1dc1daf6826b60ac5011af2915c47864d90))
+
+
+### Miscellaneous Chores
+
+* **lightpush:** Move protocol implementation opinions to `@waku/sdk` ([#1887](https://github.com/waku-org/js-waku/issues/1887)) ([8deab11](https://github.com/waku-org/js-waku/commit/8deab11890160b40a22e7d11926a2307afb93af4))
+* **store:** Move protocol implementation opinions to `@waku/sdk` ([#1913](https://github.com/waku-org/js-waku/issues/1913)) ([bf42c8f](https://github.com/waku-org/js-waku/commit/bf42c8f53a291172d6af64cbf72c4092146899df))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @waku/enr bumped from ^0.0.21 to ^0.0.22
+    * @waku/interfaces bumped from 0.0.22 to 0.0.23
+    * @waku/message-hash bumped from ^0.1.11 to ^0.1.12
+    * @waku/utils bumped from 0.0.15 to 0.0.16
+
 ## [0.0.27](https://github.com/waku-org/js-waku/compare/core-v0.0.26...core-v0.0.27) (2024-03-04)
 
 

package/bundle/{base_protocol-D0Zdzb-v.js → base_protocol-CrPXdVvO.js}

@@ -1,4 +1,4 @@
-import { b as bytesToUtf8, L as Logger, j as ensureShardingConfigured } from './index-BJwgMx4y.js';
+import { c as bytesToUtf8, L as Logger, e as ensureShardingConfigured } from './index-NYIjIEV5.js';
 import { T as Tags } from './browser-DoQRY-an.js';
 
 const decodeRelayShard = (bytes) => {

package/bundle/{index-BJwgMx4y.js → index-NYIjIEV5.js}

@@ -379,7 +379,6 @@ const sha256 = /* @__PURE__ */ wrapConstructor(() => new SHA256());
 /**
  * DefaultPubsubTopic is the default gossipsub topic to use for Waku.
  */
-const DefaultPubsubTopic = "/waku/2/default-waku/proto";
 /**
  * The default cluster ID for The Waku Network
  */
@@ -424,9 +423,9 @@ function concat(byteArrays, totalLength) {
 }
 
 const singleShardInfoToPubsubTopic = (shardInfo) => {
-    if (shardInfo.clusterId === undefined || shardInfo.shard === undefined)
+    if (shardInfo.shard === undefined)
         throw new Error("Invalid shard");
-    return `/waku/2/rs/${shardInfo.clusterId}/${shardInfo.shard}`;
+    return `/waku/2/rs/${shardInfo.clusterId ?? DEFAULT_CLUSTER_ID}/${shardInfo.shard}`;
 };
 const shardInfoToPubsubTopics = (shardInfo) => {
     if ("contentTopics" in shardInfo && shardInfo.contentTopics) {
@@ -465,13 +464,6 @@ const pubsubTopicToSingleShardInfo = (pubsubTopics) => {
         shard
     };
 };
-//TODO: move part of BaseProtocol instead of utils
-// return `ProtocolError.TOPIC_NOT_CONFIGURED` instead of throwing
-function ensurePubsubTopicIsConfigured(pubsubTopic, configuredTopics) {
-    if (!configuredTopics.includes(pubsubTopic)) {
-        throw new Error(`Pubsub topic ${pubsubTopic} has not been configured on this instance. Configured topics are: ${configuredTopics}. Please update your configuration by passing in the topic during Waku node instantiation.`);
-    }
-}
 /**
  * Given a string, will throw an error if it is not formatted as a valid content topic for autosharding based on https://rfc.vac.dev/spec/51/
  * @param contentTopic String to validate
@@ -530,23 +522,22 @@ function contentTopicToShardIndex(contentTopic, networkShards = 8) {
     return Number(dataview.getBigUint64(0, false) % BigInt(networkShards));
 }
 function contentTopicToPubsubTopic(contentTopic, clusterId = DEFAULT_CLUSTER_ID, networkShards = 8) {
+    if (!contentTopic) {
+        throw Error("Content topic must be specified");
+    }
     const shardIndex = contentTopicToShardIndex(contentTopic, networkShards);
     return `/waku/2/rs/${clusterId}/${shardIndex}`;
 }
 /**
  * Used when creating encoders/decoders to determine which pubsub topic to use
  */
-function determinePubsubTopic(contentTopic, pubsubTopicShardInfo = DefaultPubsubTopic) {
+function determinePubsubTopic(contentTopic, pubsubTopicShardInfo) {
     if (typeof pubsubTopicShardInfo == "string") {
         return pubsubTopicShardInfo;
     }
-    else {
-        return pubsubTopicShardInfo
-            ? pubsubTopicShardInfo.shard
-                ? singleShardInfoToPubsubTopic(pubsubTopicShardInfo)
-                : contentTopicToPubsubTopic(contentTopic, pubsubTopicShardInfo.clusterId)
-            : DefaultPubsubTopic;
-    }
+    return pubsubTopicShardInfo?.shard !== undefined
+        ? singleShardInfoToPubsubTopic(pubsubTopicShardInfo)
+        : contentTopicToPubsubTopic(contentTopic, pubsubTopicShardInfo?.clusterId ?? DEFAULT_CLUSTER_ID);
 }
 /**
  * Validates sharding configuration and sets defaults where possible.
@@ -620,4 +611,4 @@ class Logger {
     }
 }
 
-export { DefaultPubsubTopic as D, Logger as L, allocUnsafe as a, bytesToUtf8 as b, concat as c, alloc as d, singleShardInfoToPubsubTopic as e, ensurePubsubTopicIsConfigured as f, shardInfoToPubsubTopics as g, fromString as h, determinePubsubTopic as i, ensureShardingConfigured as j, pubsubTopicToSingleShardInfo as p, sha256 as s, utf8ToBytes as u };
+export { Logger as L, allocUnsafe as a, alloc as b, bytesToUtf8 as c, determinePubsubTopic as d, ensureShardingConfigured as e, fromString as f, pubsubTopicToSingleShardInfo as p, shardInfoToPubsubTopics as s, utf8ToBytes as u };

package/bundle/index.js

@@ -1,73 +1,9 @@
-import { v as version_0, e as encodingLength, a as encode$1, d as decode$1, M as MessagePush, F as FilterSubscribeRequest, b as FilterSubscribeResponse$1, P as PushRpc$1, c as PushResponse, H as HistoryRpc$1, f as PagingInfo, g as HistoryResponse, h as createEncoder, W as WakuMetadataResponse, i as WakuMetadataRequest } from './version_0-C6o0DvNW.js';
-export { j as createDecoder } from './version_0-C6o0DvNW.js';
+import { v as version_0, e as encodingLength, a as encode$1, d as decode$1, M as MessagePush, F as FilterSubscribeRequest, b as FilterSubscribeResponse$1, P as PushRpc$1, c as PushResponse, H as HistoryRpc$1, f as PagingInfo, g as HistoryResponse, h as createEncoder, W as WakuMetadataResponse, i as WakuMetadataRequest } from './version_0-C6GyvOeg.js';
+export { j as createDecoder } from './version_0-C6GyvOeg.js';
 import { g as getDefaultExportFromCjs, P as ProtocolError, a as Protocols, E as EConnectionStateEvents, T as Tags, b as EPeersByDiscoveryEvents } from './browser-DoQRY-an.js';
-import { b as bytesToUtf8, u as utf8ToBytes, c as concat$1, s as sha256, a as allocUnsafe, d as alloc, L as Logger, e as singleShardInfoToPubsubTopic, f as ensurePubsubTopicIsConfigured, D as DefaultPubsubTopic, p as pubsubTopicToSingleShardInfo, g as shardInfoToPubsubTopics } from './index-BJwgMx4y.js';
-import { B as BaseProtocol, d as decodeRelayShard, e as encodeRelayShard } from './base_protocol-D0Zdzb-v.js';
-export { S as StreamManager } from './base_protocol-D0Zdzb-v.js';
-
-function groupByContentTopic(values) {
-    const groupedDecoders = new Map();
-    values.forEach((value) => {
-        let decs = groupedDecoders.get(value.contentTopic);
-        if (!decs) {
-            groupedDecoders.set(value.contentTopic, []);
-            decs = groupedDecoders.get(value.contentTopic);
-        }
-        decs.push(value);
-    });
-    return groupedDecoders;
-}
-
-const FRAME_RATE = 60;
-/**
- * Function that transforms IReceiver subscription to iterable stream of data.
- * @param receiver - object that allows to be subscribed to;
- * @param decoder - parameter to be passed to receiver for subscription;
- * @param options - options for receiver for subscription;
- * @param iteratorOptions - optional configuration for iterator;
- * @returns iterator and stop function to terminate it.
- */
-async function toAsyncIterator(receiver, decoder, iteratorOptions) {
-    const iteratorDelay = iteratorOptions?.iteratorDelay ?? FRAME_RATE;
-    const messages = [];
-    let unsubscribe;
-    unsubscribe = await receiver.subscribe(decoder, (message) => {
-        messages.push(message);
-    });
-    const isWithTimeout = Number.isInteger(iteratorOptions?.timeoutMs);
-    const timeoutMs = iteratorOptions?.timeoutMs ?? 0;
-    const startTime = Date.now();
-    async function* iterator() {
-        while (true) {
-            if (isWithTimeout && Date.now() - startTime >= timeoutMs) {
-                return;
-            }
-            await wait(iteratorDelay);
-            const message = messages.shift();
-            if (!unsubscribe && messages.length === 0) {
-                return message;
-            }
-            if (!message && unsubscribe) {
-                continue;
-            }
-            yield message;
-        }
-    }
-    return {
-        iterator: iterator(),
-        async stop() {
-            if (unsubscribe) {
-                await unsubscribe();
-                unsubscribe = undefined;
-            }
-        }
-    };
-}
-function wait(ms) {
-    return new Promise((resolve) => {
-        setTimeout(resolve, ms);
-    });
-}
+import { a as allocUnsafe, b as alloc, L as Logger, u as utf8ToBytes, p as pubsubTopicToSingleShardInfo, s as shardInfoToPubsubTopics } from './index-NYIjIEV5.js';
+import { B as BaseProtocol, d as decodeRelayShard, e as encodeRelayShard } from './base_protocol-CrPXdVvO.js';
+export { S as StreamManager } from './base_protocol-CrPXdVvO.js';
 
 const MB = 1024 ** 2;
 const SIZE_CAP_IN_MB = 1;
@@ -91,33 +27,6 @@ var index$3 = /*#__PURE__*/Object.freeze({
     version_0: version_0
 });
 
-/**
- * Deterministic Message Hashing as defined in
- * [14/WAKU2-MESSAGE](https://rfc.vac.dev/spec/14/#deterministic-message-hashing)
- */
-function messageHash(pubsubTopic, message) {
-    const pubsubTopicBytes = utf8ToBytes(pubsubTopic);
-    const contentTopicBytes = utf8ToBytes(message.contentTopic);
-    let bytes;
-    if (message.meta) {
-        bytes = concat$1([
-            pubsubTopicBytes,
-            message.payload,
-            contentTopicBytes,
-            message.meta
-        ]);
-    }
-    else {
-        bytes = concat$1([pubsubTopicBytes, message.payload, contentTopicBytes]);
-    }
-    return sha256(bytes);
-}
-function messageHashStr(pubsubTopic, message) {
-    const hash = messageHash(pubsubTopic, message);
-    const hashStr = bytesToUtf8(hash);
-    return hashStr;
-}
-
 /**
  * @packageDocumentation
  *
@@ -1701,242 +1610,14 @@ const FilterCodecs = {
     SUBSCRIBE: "/vac/waku/filter-subscribe/2.0.0-beta1",
     PUSH: "/vac/waku/filter-push/2.0.0-beta1"
 };
-/**
- * A subscription object refers to a subscription to a given pubsub topic.
- */
-class Subscription {
-    peers;
-    pubsubTopic;
-    newStream;
-    receivedMessagesHashStr = [];
-    subscriptionCallbacks;
-    constructor(pubsubTopic, remotePeers, newStream) {
-        this.peers = remotePeers;
-        this.pubsubTopic = pubsubTopic;
-        this.newStream = newStream;
-        this.subscriptionCallbacks = new Map();
-    }
-    async subscribe(decoders, callback) {
-        const decodersArray = Array.isArray(decoders) ? decoders : [decoders];
-        // check that all decoders are configured for the same pubsub topic as this subscription
-        decodersArray.forEach((decoder) => {
-            if (decoder.pubsubTopic !== this.pubsubTopic) {
-                throw new Error(`Pubsub topic not configured: decoder is configured for pubsub topic ${decoder.pubsubTopic} but this subscription is for pubsub topic ${this.pubsubTopic}. Please create a new Subscription for the different pubsub topic.`);
-            }
-        });
-        const decodersGroupedByCT = groupByContentTopic(decodersArray);
-        const contentTopics = Array.from(decodersGroupedByCT.keys());
-        const promises = this.peers.map(async (peer) => {
-            const stream = await this.newStream(peer);
-            const request = FilterSubscribeRpc.createSubscribeRequest(this.pubsubTopic, contentTopics);
-            try {
-                const res = await pipe([request.encode()], encode, stream, decode, async (source) => await all(source));
-                if (!res || !res.length) {
-                    throw Error(`No response received for request ${request.requestId}: ${res}`);
-                }
-                const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
-                if (statusCode < 200 || statusCode >= 300) {
-                    throw new Error(`Filter subscribe request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
-                }
-                log$6.info("Subscribed to peer ", peer.id.toString(), "for content topics", contentTopics);
-            }
-            catch (e) {
-                throw new Error("Error subscribing to peer: " +
-                    peer.id.toString() +
-                    " for content topics: " +
-                    contentTopics +
-                    ": " +
-                    e);
-            }
-        });
-        const results = await Promise.allSettled(promises);
-        this.handleErrors(results, "subscribe");
-        // Save the callback functions by content topics so they
-        // can easily be removed (reciprocally replaced) if `unsubscribe` (reciprocally `subscribe`)
-        // is called for those content topics
-        decodersGroupedByCT.forEach((decoders, contentTopic) => {
-            // Cast the type because a given `subscriptionCallbacks` map may hold
-            // Decoder that decode to different implementations of `IDecodedMessage`
-            const subscriptionCallback = {
-                decoders,
-                callback
-            };
-            // The callback and decoder may override previous values, this is on
-            // purpose as the user may call `subscribe` to refresh the subscription
-            this.subscriptionCallbacks.set(contentTopic, subscriptionCallback);
-        });
-    }
-    async unsubscribe(contentTopics) {
-        const promises = this.peers.map(async (peer) => {
-            const stream = await this.newStream(peer);
-            const unsubscribeRequest = FilterSubscribeRpc.createUnsubscribeRequest(this.pubsubTopic, contentTopics);
-            try {
-                await pipe([unsubscribeRequest.encode()], encode, stream.sink);
-            }
-            catch (error) {
-                throw new Error("Error unsubscribing: " + error);
-            }
-            contentTopics.forEach((contentTopic) => {
-                this.subscriptionCallbacks.delete(contentTopic);
-            });
-        });
-        const results = await Promise.allSettled(promises);
-        this.handleErrors(results, "unsubscribe");
-    }
-    async ping() {
-        const promises = this.peers.map(async (peer) => {
-            const stream = await this.newStream(peer);
-            const request = FilterSubscribeRpc.createSubscriberPingRequest();
-            try {
-                const res = await pipe([request.encode()], encode, stream, decode, async (source) => await all(source));
-                if (!res || !res.length) {
-                    throw Error(`No response received for request ${request.requestId}: ${res}`);
-                }
-                const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
-                if (statusCode < 200 || statusCode >= 300) {
-                    throw new Error(`Filter ping request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
-                }
-                log$6.info(`Ping successful for peer ${peer.id.toString()}`);
-            }
-            catch (error) {
-                log$6.error("Error pinging: ", error);
-                throw error; // Rethrow the actual error instead of wrapping it
-            }
-        });
-        const results = await Promise.allSettled(promises);
-        this.handleErrors(results, "ping");
-    }
-    async unsubscribeAll() {
-        const promises = this.peers.map(async (peer) => {
-            const stream = await this.newStream(peer);
-            const request = FilterSubscribeRpc.createUnsubscribeAllRequest(this.pubsubTopic);
-            try {
-                const res = await pipe([request.encode()], encode, stream, decode, async (source) => await all(source));
-                if (!res || !res.length) {
-                    throw Error(`No response received for request ${request.requestId}: ${res}`);
-                }
-                const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
-                if (statusCode < 200 || statusCode >= 300) {
-                    throw new Error(`Filter unsubscribe all request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
-                }
-                this.subscriptionCallbacks.clear();
-                log$6.info(`Unsubscribed from all content topics for pubsub topic ${this.pubsubTopic}`);
-            }
-            catch (error) {
-                throw new Error("Error unsubscribing from all content topics: " + error);
-            }
-        });
-        const results = await Promise.allSettled(promises);
-        this.handleErrors(results, "unsubscribeAll");
-    }
-    async processMessage(message) {
-        const hashedMessageStr = messageHashStr(this.pubsubTopic, message);
-        if (this.receivedMessagesHashStr.includes(hashedMessageStr)) {
-            log$6.info("Message already received, skipping");
-            return;
-        }
-        this.receivedMessagesHashStr.push(hashedMessageStr);
-        const { contentTopic } = message;
-        const subscriptionCallback = this.subscriptionCallbacks.get(contentTopic);
-        if (!subscriptionCallback) {
-            log$6.error("No subscription callback available for ", contentTopic);
-            return;
-        }
-        log$6.info("Processing message with content topic ", contentTopic, " on pubsub topic ", this.pubsubTopic);
-        await pushMessage(subscriptionCallback, this.pubsubTopic, message);
-    }
-    // Filter out only the rejected promises and extract & handle their reasons
-    handleErrors(results, type) {
-        const errors = results
-            .filter((result) => result.status === "rejected")
-            .map((rejectedResult) => rejectedResult.reason);
-        if (errors.length === this.peers.length) {
-            const errorCounts = new Map();
-            // TODO: streamline error logging with https://github.com/orgs/waku-org/projects/2/views/1?pane=issue&itemId=42849952
-            errors.forEach((error) => {
-                const message = error instanceof Error ? error.message : String(error);
-                errorCounts.set(message, (errorCounts.get(message) || 0) + 1);
-            });
-            const uniqueErrorMessages = Array.from(errorCounts, ([message, count]) => `${message} (occurred ${count} times)`).join(", ");
-            throw new Error(`Error ${type} all peers: ${uniqueErrorMessages}`);
-        }
-        else if (errors.length > 0) {
-            // TODO: handle renewing faulty peers with new peers (https://github.com/waku-org/js-waku/issues/1463)
-            log$6.warn(`Some ${type} failed. These will be refreshed with new peers`, errors);
-        }
-        else {
-            log$6.info(`${type} successful for all peers`);
-        }
-    }
-}
-const DEFAULT_NUM_PEERS = 3;
-class Filter extends BaseProtocol {
-    activeSubscriptions = new Map();
-    getActiveSubscription(pubsubTopic) {
-        return this.activeSubscriptions.get(pubsubTopic);
-    }
-    setActiveSubscription(pubsubTopic, subscription) {
-        this.activeSubscriptions.set(pubsubTopic, subscription);
-        return subscription;
-    }
-    //TODO: Remove when FilterCore and FilterSDK are introduced
-    numPeersToUse;
-    constructor(libp2p, options) {
+class FilterCore extends BaseProtocol {
+    handleIncomingMessage;
+    constructor(handleIncomingMessage, libp2p, options) {
         super(FilterCodecs.SUBSCRIBE, libp2p.components, log$6, options.pubsubTopics, options);
-        this.numPeersToUse = options?.numPeersToUse ?? DEFAULT_NUM_PEERS;
+        this.handleIncomingMessage = handleIncomingMessage;
         libp2p.handle(FilterCodecs.PUSH, this.onRequest.bind(this)).catch((e) => {
             log$6.error("Failed to register ", FilterCodecs.PUSH, e);
         });
-        this.activeSubscriptions = new Map();
-    }
-    /**
-     * Creates a new subscription to the given pubsub topic.
-     * The subscription is made to multiple peers for decentralization.
-     * @param pubsubTopicShardInfo The pubsub topic to subscribe to.
-     * @returns The subscription object.
-     */
-    async createSubscription(pubsubTopicShardInfo = DefaultPubsubTopic) {
-        const pubsubTopic = typeof pubsubTopicShardInfo == "string"
-            ? pubsubTopicShardInfo
-            : singleShardInfoToPubsubTopic(pubsubTopicShardInfo);
-        ensurePubsubTopicIsConfigured(pubsubTopic, this.pubsubTopics);
-        const peers = await this.getPeers({
-            maxBootstrapPeers: 1,
-            numPeers: this.numPeersToUse
-        });
-        if (peers.length === 0) {
-            throw new Error("No peer found to initiate subscription.");
-        }
-        log$6.info(`Creating filter subscription with ${peers.length} peers: `, peers.map((peer) => peer.id.toString()));
-        const subscription = this.getActiveSubscription(pubsubTopic) ??
-            this.setActiveSubscription(pubsubTopic, new Subscription(pubsubTopic, peers, this.getStream.bind(this)));
-        return subscription;
-    }
-    toSubscriptionIterator(decoders) {
-        return toAsyncIterator(this, decoders);
-    }
-    /**
-     * This method is used to satisfy the `IReceiver` interface.
-     *
-     * @hidden
-     *
-     * @param decoders The decoders to use for the subscription.
-     * @param callback The callback function to use for the subscription.
-     * @param opts Optional protocol options for the subscription.
-     *
-     * @returns A Promise that resolves to a function that unsubscribes from the subscription.
-     *
-     * @remarks
-     * This method should not be used directly.
-     * Instead, use `createSubscription` to create a new subscription.
-     */
-    async subscribe(decoders, callback) {
-        const subscription = await this.createSubscription();
-        await subscription.subscribe(decoders, callback);
-        const contentTopics = Array.from(groupByContentTopic(Array.isArray(decoders) ? decoders : [decoders]).keys());
-        return async () => {
-            await subscription.unsubscribe(contentTopics);
-        };
     }
     onRequest(streamData) {
         const { connection, stream } = streamData;
@@ -1955,12 +1636,7 @@ class Filter extends BaseProtocol {
                         log$6.error("Pubsub topic missing from push message");
                         return;
                     }
-                    const subscription = this.getActiveSubscription(pubsubTopic);
-                    if (!subscription) {
-                        log$6.error(`No subscription locally registered for topic ${pubsubTopic}`);
-                        return;
-                    }
-                    await subscription.processMessage(wakuMessage);
+                    await this.handleIncomingMessage(pubsubTopic, wakuMessage);
                 }
             }).then(() => {
                 log$6.info("Receiving pipe closed.");
@@ -1972,33 +1648,60 @@ class Filter extends BaseProtocol {
             log$6.error("Error decoding message", e);
         }
     }
-}
-function wakuFilter(init = { pubsubTopics: [] }) {
-    return (libp2p) => new Filter(libp2p, init);
-}
-async function pushMessage(subscriptionCallback, pubsubTopic, message) {
-    const { decoders, callback } = subscriptionCallback;
-    const { contentTopic } = message;
-    if (!contentTopic) {
-        log$6.warn("Message has no content topic, skipping");
-        return;
+    async subscribe(pubsubTopic, peer, contentTopics) {
+        const stream = await this.getStream(peer);
+        const request = FilterSubscribeRpc.createSubscribeRequest(pubsubTopic, contentTopics);
+        const res = await pipe([request.encode()], encode, stream, decode, async (source) => await all(source));
+        if (!res || !res.length) {
+            throw Error(`No response received for request ${request.requestId}: ${res}`);
+        }
+        const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
+        if (statusCode < 200 || statusCode >= 300) {
+            throw new Error(`Filter subscribe request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
+        }
     }
-    try {
-        const decodePromises = decoders.map((dec) => dec
-            .fromProtoObj(pubsubTopic, message)
-            .then((decoded) => decoded || Promise.reject("Decoding failed")));
-        const decodedMessage = await Promise.any(decodePromises);
-        await callback(decodedMessage);
+    async unsubscribe(pubsubTopic, peer, contentTopics) {
+        const stream = await this.getStream(peer);
+        const unsubscribeRequest = FilterSubscribeRpc.createUnsubscribeRequest(pubsubTopic, contentTopics);
+        await pipe([unsubscribeRequest.encode()], encode, stream.sink);
     }
-    catch (e) {
-        log$6.error("Error decoding message", e);
+    async unsubscribeAll(pubsubTopic, peer) {
+        const stream = await this.getStream(peer);
+        const request = FilterSubscribeRpc.createUnsubscribeAllRequest(pubsubTopic);
+        const res = await pipe([request.encode()], encode, stream, decode, async (source) => await all(source));
+        if (!res || !res.length) {
+            throw Error(`No response received for request ${request.requestId}: ${res}`);
+        }
+        const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
+        if (statusCode < 200 || statusCode >= 300) {
+            throw new Error(`Filter unsubscribe all request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
+        }
+    }
+    async ping(peer) {
+        const stream = await this.getStream(peer);
+        const request = FilterSubscribeRpc.createSubscriberPingRequest();
+        try {
+            const res = await pipe([request.encode()], encode, stream, decode, async (source) => await all(source));
+            if (!res || !res.length) {
+                throw Error(`No response received for request ${request.requestId}: ${res}`);
+            }
+            const { statusCode, requestId, statusDesc } = FilterSubscribeResponse.decode(res[0].slice());
+            if (statusCode < 200 || statusCode >= 300) {
+                throw new Error(`Filter ping request ${requestId} failed with status code ${statusCode}: ${statusDesc}`);
+            }
+            log$6.info(`Ping successful for peer ${peer.id.toString()}`);
+        }
+        catch (error) {
+            log$6.error("Error pinging: ", error);
+            throw error; // Rethrow the actual error instead of wrapping it
+        }
     }
 }
 
 var index$2 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     FilterCodecs: FilterCodecs,
-    wakuFilter: wakuFilter
+    FilterCore: FilterCore
 });
 
 class PushRpc {
@@ -2595,7 +2298,7 @@ async function waitForRemotePeer(waku, protocols, timeoutMs) {
     if (protocols.includes(Protocols.Filter)) {
         if (!waku.filter)
             throw new Error("Cannot wait for Filter peer: protocol not mounted");
-        promises.push(waitForConnectedPeer(waku.filter, waku.libp2p.services.metadata));
+        promises.push(waitForConnectedPeer(waku.filter.protocol, waku.libp2p.services.metadata));
     }
     if (timeoutMs) {
         await rejectOnTimeout(Promise.all(promises), timeoutMs, "Timed out waiting for a remote peer.");
@@ -2813,7 +2516,7 @@ class KeepAliveManager {
                             return;
                         }
                         try {
-                            await peerStore.patch(peerId, {
+                            await peerStore.merge(peerId, {
                                 metadata: {
                                     ping: utf8ToBytes(ping.toString())
                                 }
@@ -3385,4 +3088,4 @@ function wakuMetadata(shardInfo) {
     return (components) => new Metadata(shardInfo, components);
 }
 
-export { ConnectionManager, FilterCodecs, KeepAliveManager, LightPushCodec, LightPushCore, MetadataCodec, PageDirection, StoreCore, createEncoder, index$3 as message, waitForRemotePeer, wakuFilter, wakuMetadata, index$2 as waku_filter, index$1 as waku_light_push, index as waku_store };
+export { ConnectionManager, FilterCodecs, FilterCore, KeepAliveManager, LightPushCodec, LightPushCore, MetadataCodec, PageDirection, StoreCore, createEncoder, index$3 as message, waitForRemotePeer, wakuMetadata, index$2 as waku_filter, index$1 as waku_light_push, index as waku_store };

package/bundle/lib/base_protocol.js

@@ -1,3 +1,3 @@
-import '../index-BJwgMx4y.js';
+import '../index-NYIjIEV5.js';
 import '../browser-DoQRY-an.js';
-export { B as BaseProtocol } from '../base_protocol-D0Zdzb-v.js';
+export { B as BaseProtocol } from '../base_protocol-CrPXdVvO.js';

package/bundle/lib/message/version_0.js

@@ -1,3 +1,3 @@
-export { D as DecodedMessage, k as Decoder, E as Encoder, V as Version, j as createDecoder, h as createEncoder, m as proto } from '../../version_0-C6o0DvNW.js';
-import '../../index-BJwgMx4y.js';
+export { D as DecodedMessage, k as Decoder, E as Encoder, V as Version, j as createDecoder, h as createEncoder, m as proto } from '../../version_0-C6GyvOeg.js';
+import '../../index-NYIjIEV5.js';
 import '../../browser-DoQRY-an.js';

package/bundle/{version_0-C6o0DvNW.js → version_0-C6GyvOeg.js}

@@ -1,4 +1,4 @@
-import { a as allocUnsafe, h as fromString, d as alloc$1, L as Logger, i as determinePubsubTopic } from './index-BJwgMx4y.js';
+import { a as allocUnsafe, f as fromString, b as alloc$1, L as Logger, d as determinePubsubTopic } from './index-NYIjIEV5.js';
 
 /* eslint-disable no-fallthrough */
 const N1 = Math.pow(2, 7);
@@ -3228,11 +3228,15 @@ var HistoryResponse;
     (function (HistoryError) {
         HistoryError["NONE"] = "NONE";
         HistoryError["INVALID_CURSOR"] = "INVALID_CURSOR";
+        HistoryError["TOO_MANY_REQUESTS"] = "TOO_MANY_REQUESTS";
+        HistoryError["SERVICE_UNAVAILABLE"] = "SERVICE_UNAVAILABLE";
     })(HistoryError = HistoryResponse.HistoryError || (HistoryResponse.HistoryError = {}));
     let __HistoryErrorValues;
     (function (__HistoryErrorValues) {
         __HistoryErrorValues[__HistoryErrorValues["NONE"] = 0] = "NONE";
         __HistoryErrorValues[__HistoryErrorValues["INVALID_CURSOR"] = 1] = "INVALID_CURSOR";
+        __HistoryErrorValues[__HistoryErrorValues["TOO_MANY_REQUESTS"] = 429] = "TOO_MANY_REQUESTS";
+        __HistoryErrorValues[__HistoryErrorValues["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
     })(__HistoryErrorValues || (__HistoryErrorValues = {}));
     (function (HistoryError) {
         HistoryError.codec = () => {