@waku/core 0.0.36-a7f52e4.0 → 0.0.36-a8ca168.0

package/bundle/index.js

@@ -1,5 +1,5 @@
-import { v as version_0, a as allocUnsafe, b as alloc, e as encodingLength$1, c as encode$2, d as decode$4, F as FilterSubscribeRequest, f as FilterSubscribeResponse$1, M as MessagePush, P as PushRpc$1, g as PushResponse, S as StoreQueryRequest$1, h as StoreQueryResponse$1, t as toString$1, i as bases, j as fromString, u as utf8ToBytes, k as createEncoder, p as pubsubTopicToSingleShardInfo, l as bytesToUtf8, s as shardInfoToPubsubTopics, W as WakuMetadataRequest, m as pubsubTopicsToShardInfo, n as WakuMetadataResponse } from './version_0-CiYGrPc2.js';
-export { o as createDecoder } from './version_0-CiYGrPc2.js';
+import { v as version_0, a as allocUnsafe, b as alloc, e as encodingLength$1, c as encode$2, d as decode$4, F as FilterSubscribeRequest, f as FilterSubscribeResponse$1, M as MessagePush, P as PushRpc$1, g as PushResponse, S as StoreQueryRequest$1, h as StoreQueryResponse$1, t as toString$1, i as bases, j as fromString, u as utf8ToBytes, k as createEncoder, p as pubsubTopicToSingleShardInfo, l as bytesToUtf8, s as shardInfoToPubsubTopics, W as WakuMetadataRequest, m as pubsubTopicsToShardInfo, n as WakuMetadataResponse, o as concat$1, q as sha256, r as bytesToHex, w as numberToBytes } from './version_0-CyeTW0Vr.js';
+export { x as createDecoder } from './version_0-CyeTW0Vr.js';
 import { e as equals$2, c as coerce, b as base32, a as base58btc, d as base36, L as Logger, P as ProtocolError, T as Tags, E as EPeersByDiscoveryEvents, f as EConnectionStateEvents } from './index-CTo1my9M.js';
 import { B as BaseProtocol } from './base_protocol-DvQrudwy.js';
 export { S as StreamManager } from './base_protocol-DvQrudwy.js';
@@ -514,6 +514,10 @@ function encodeCID(version, code, multihash) {
 }
 const cidSymbol = Symbol.for('@ipld/js-cid/CID');
 
+function isDefined(value) {
+    return Boolean(value);
+}
+
 const MB = 1024 ** 2;
 const SIZE_CAP_IN_MB = 1;
 /**
@@ -2300,12 +2304,30 @@ const FilterCodecs = {
     PUSH: "/vac/waku/filter-push/2.0.0-beta1"
 };
 class FilterCore extends BaseProtocol {
-    handleIncomingMessage;
     pubsubTopics;
+    static handleIncomingMessage;
     constructor(handleIncomingMessage, pubsubTopics, libp2p) {
         super(FilterCodecs.SUBSCRIBE, libp2p.components, pubsubTopics);
-        this.handleIncomingMessage = handleIncomingMessage;
         this.pubsubTopics = pubsubTopics;
+        // TODO(weboko): remove when @waku/sdk 0.0.33 is released
+        const prevHandler = FilterCore.handleIncomingMessage;
+        FilterCore.handleIncomingMessage = !prevHandler
+            ? handleIncomingMessage
+            : async (pubsubTopic, message, peerIdStr) => {
+                try {
+                    await prevHandler(pubsubTopic, message, peerIdStr);
+                }
+                catch (e) {
+                    log$5.error("Previous FilterCore incoming message handler failed ", e);
+                }
+                try {
+                    await handleIncomingMessage(pubsubTopic, message, peerIdStr);
+                }
+                catch (e) {
+                    log$5.error("Present FilterCore incoming message handler failed ", e);
+                }
+                return;
+            };
         libp2p
             .handle(FilterCodecs.PUSH, this.onRequest.bind(this), {
             maxInboundStreams: 100
@@ -2482,7 +2504,7 @@ class FilterCore extends BaseProtocol {
                         log$5.error("Pubsub topic missing from push message");
                         return;
                     }
-                    await this.handleIncomingMessage(pubsubTopic, wakuMessage, connection.remotePeer.toString());
+                    await FilterCore.handleIncomingMessage?.(pubsubTopic, wakuMessage, connection.remotePeer.toString());
                 }
             }).then(() => {
                 log$5.info("Receiving pipe closed.");
@@ -2714,6 +2736,7 @@ class StoreQueryRequest {
     static create(params) {
         const request = new StoreQueryRequest({
             ...params,
+            contentTopics: params.contentTopics || [],
             requestId: v4(),
             timeStart: params.timeStart
                 ? BigInt(params.timeStart.getTime() * ONE_MILLION)
@@ -2726,17 +2749,22 @@ class StoreQueryRequest {
                 ? BigInt(params.paginationLimit)
                 : undefined
         });
-        // Validate request parameters based on RFC
-        if ((params.pubsubTopic && !params.contentTopics) ||
-            (!params.pubsubTopic && params.contentTopics)) {
-            throw new Error("Both pubsubTopic and contentTopics must be set or unset");
-        }
-        if (params.messageHashes &&
-            (params.pubsubTopic ||
-                params.contentTopics ||
-                params.timeStart ||
-                params.timeEnd)) {
-            throw new Error("Message hash lookup queries cannot include content filter criteria");
+        const isHashQuery = params.messageHashes && params.messageHashes.length > 0;
+        const hasContentTopics = params.contentTopics && params.contentTopics.length > 0;
+        const hasTimeFilter = params.timeStart || params.timeEnd;
+        if (isHashQuery) {
+            if (hasContentTopics || hasTimeFilter) {
+                throw new Error("Message hash lookup queries cannot include content filter criteria (contentTopics, timeStart, or timeEnd)");
+            }
+        }
+        else {
+            if ((params.pubsubTopic &&
+                (!params.contentTopics || params.contentTopics.length === 0)) ||
+                (!params.pubsubTopic &&
+                    params.contentTopics &&
+                    params.contentTopics.length > 0)) {
+                throw new Error("Both pubsubTopic and contentTopics must be set together for content-filtered queries");
+            }
         }
         return request;
     }
@@ -2783,8 +2811,12 @@ class StoreCore extends BaseProtocol {
         this.pubsubTopics = pubsubTopics;
     }
     async *queryPerPage(queryOpts, decoders, peerId) {
-        if (queryOpts.contentTopics.toString() !==
-            Array.from(decoders.keys()).toString()) {
+        // Only validate decoder content topics for content-filtered queries
+        const isHashQuery = queryOpts.messageHashes && queryOpts.messageHashes.length > 0;
+        if (!isHashQuery &&
+            queryOpts.contentTopics &&
+            queryOpts.contentTopics.toString() !==
+                Array.from(decoders.keys()).toString()) {
             throw new Error("Internal error, the decoders should match the query's content topics");
         }
         let currentCursor = queryOpts.paginationCursor;
@@ -2793,6 +2825,12 @@ class StoreCore extends BaseProtocol {
                 ...queryOpts,
                 paginationCursor: currentCursor
             });
+            log$3.info("Sending store query request:", {
+                hasMessageHashes: !!queryOpts.messageHashes?.length,
+                messageHashCount: queryOpts.messageHashes?.length,
+                pubsubTopic: queryOpts.pubsubTopic,
+                contentTopics: queryOpts.contentTopics
+            });
             let stream;
             try {
                 stream = await this.getStream(peerId);
@@ -4854,4 +4892,85 @@ function wakuMetadata(pubsubTopics) {
     return (components) => new Metadata(pubsubTopics, components);
 }
 
-export { ConnectionManager, FilterCodecs, FilterCore, LightPushCodec, LightPushCore, MetadataCodec, StoreCodec, StoreCore, createEncoder, index$3 as message, wakuMetadata, index$2 as waku_filter, index$1 as waku_light_push, index as waku_store };
+/**
+ * Deterministic Message Hashing as defined in
+ * [14/WAKU2-MESSAGE](https://rfc.vac.dev/spec/14/#deterministic-message-hashing)
+ *
+ * Computes a SHA-256 hash of the concatenation of pubsub topic, payload, content topic, meta, and timestamp.
+ *
+ * @param pubsubTopic - The pubsub topic string
+ * @param message - The message to be hashed
+ * @returns A Uint8Array containing the SHA-256 hash
+ *
+ * @example
+ * ```typescript
+ * import { messageHash } from "@waku/core";
+ *
+ * const pubsubTopic = "/waku/2/default-waku/proto";
+ * const message = {
+ *   payload: new Uint8Array([1, 2, 3, 4]),
+ *   contentTopic: "/waku/2/default-content/proto",
+ *   meta: new Uint8Array([5, 6, 7, 8]),
+ *   timestamp: new Date()
+ * };
+ *
+ * const hash = messageHash(pubsubTopic, message);
+ * ```
+ */
+function messageHash(pubsubTopic, message) {
+    const pubsubTopicBytes = utf8ToBytes(pubsubTopic);
+    const contentTopicBytes = utf8ToBytes(message.contentTopic);
+    const timestampBytes = tryConvertTimestampToBytes(message.timestamp);
+    const bytes = concat$1([
+        pubsubTopicBytes,
+        message.payload,
+        contentTopicBytes,
+        message.meta,
+        timestampBytes
+    ].filter(isDefined));
+    return sha256(bytes);
+}
+function tryConvertTimestampToBytes(timestamp) {
+    if (!timestamp) {
+        return;
+    }
+    let bigIntTimestamp;
+    if (typeof timestamp === "bigint") {
+        bigIntTimestamp = timestamp;
+    }
+    else {
+        bigIntTimestamp = BigInt(timestamp.valueOf()) * 1000000n;
+    }
+    return numberToBytes(bigIntTimestamp);
+}
+/**
+ * Computes a deterministic message hash and returns it as a hexadecimal string.
+ * This is a convenience wrapper around messageHash that converts the result to a hex string.
+ *
+ * @param pubsubTopic - The pubsub topic string
+ * @param message - The message to be hashed
+ * @returns A string containing the hex representation of the SHA-256 hash
+ *
+ * @example
+ * ```typescript
+ * import { messageHashStr } from "@waku/core";
+ *
+ * const pubsubTopic = "/waku/2/default-waku/proto";
+ * const message = {
+ *   payload: new Uint8Array([1, 2, 3, 4]),
+ *   contentTopic: "/waku/2/default-content/proto",
+ *   meta: new Uint8Array([5, 6, 7, 8]),
+ *   timestamp: new Date()
+ * };
+ *
+ * const hashString = messageHashStr(pubsubTopic, message);
+ * console.log(hashString); // e.g. "a1b2c3d4..."
+ * ```
+ */
+function messageHashStr(pubsubTopic, message) {
+    const hash = messageHash(pubsubTopic, message);
+    const hashStr = bytesToHex(hash);
+    return hashStr;
+}
+
+export { ConnectionManager, FilterCodecs, FilterCore, LightPushCodec, LightPushCore, MetadataCodec, StoreCodec, StoreCore, createEncoder, index$3 as message, messageHash, messageHashStr, wakuMetadata, index$2 as waku_filter, index$1 as waku_light_push, index as waku_store };

package/bundle/lib/message/version_0.js

@@ -1,2 +1,2 @@
-export { D as DecodedMessage, r as Decoder, E as Encoder, V as Version, o as createDecoder, k as createEncoder, q as proto } from '../../version_0-CiYGrPc2.js';
+export { D as DecodedMessage, z as Decoder, E as Encoder, V as Version, x as createDecoder, k as createEncoder, y as proto } from '../../version_0-CyeTW0Vr.js';
 import '../../index-CTo1my9M.js';

package/bundle/{version_0-CiYGrPc2.js → version_0-CyeTW0Vr.js}

@@ -4350,6 +4350,21 @@ function toString(array, encoding = 'utf8') {
     return base.encoder.encode(array).substring(1);
 }
 
+function numberToBytes(value) {
+    const buffer = new ArrayBuffer(8);
+    const view = new DataView(buffer);
+    if (typeof value === "number") {
+        view.setFloat64(0, value, false);
+    }
+    else {
+        view.setBigInt64(0, value, false);
+    }
+    return new Uint8Array(buffer);
+}
+/**
+ * Convert byte array to hex string (no `0x` prefix).
+ */
+const bytesToHex = (bytes) => toString(bytes, "base16");
 /**
  * Decode byte array to utf-8 string.
  */
@@ -4532,9 +4547,6 @@ class DecodedMessage {
     get contentTopic() {
         return this.proto.contentTopic;
     }
-    get _rawTimestamp() {
-        return this.proto.timestamp;
-    }
     get timestamp() {
         // In the case we receive a value that is bigger than JS's max number,
         // we catch the error and return undefined.
@@ -4556,7 +4568,7 @@ class DecodedMessage {
     get version() {
         // https://rfc.vac.dev/spec/14/
         // > If omitted, the value SHOULD be interpreted as version 0.
-        return this.proto.version ?? 0;
+        return this.proto.version ?? Version;
     }
     get rateLimitProof() {
         return this.proto.rateLimitProof;
@@ -4665,4 +4677,4 @@ var version_0 = /*#__PURE__*/Object.freeze({
     proto: message
 });
 
-export { DecodedMessage as D, Encoder as E, FilterSubscribeRequest as F, MessagePush as M, PushRpc$1 as P, StoreQueryRequest$1 as S, Version as V, WakuMetadataRequest as W, allocUnsafe as a, alloc$1 as b, encode as c, decode as d, encodingLength as e, FilterSubscribeResponse$1 as f, PushResponse as g, StoreQueryResponse$1 as h, bases as i, fromString as j, createEncoder as k, bytesToUtf8 as l, pubsubTopicsToShardInfo as m, WakuMetadataResponse as n, createDecoder as o, pubsubTopicToSingleShardInfo as p, message as q, Decoder as r, shardInfoToPubsubTopics as s, toString as t, utf8ToBytes as u, version_0 as v };
+export { DecodedMessage as D, Encoder as E, FilterSubscribeRequest as F, MessagePush as M, PushRpc$1 as P, StoreQueryRequest$1 as S, Version as V, WakuMetadataRequest as W, allocUnsafe as a, alloc$1 as b, encode as c, decode as d, encodingLength as e, FilterSubscribeResponse$1 as f, PushResponse as g, StoreQueryResponse$1 as h, bases as i, fromString as j, createEncoder as k, bytesToUtf8 as l, pubsubTopicsToShardInfo as m, WakuMetadataResponse as n, concat as o, pubsubTopicToSingleShardInfo as p, sha256 as q, bytesToHex as r, shardInfoToPubsubTopics as s, toString as t, utf8ToBytes as u, version_0 as v, numberToBytes as w, createDecoder as x, message as y, Decoder as z };