@waku/core 0.0.36-acc9100.0 → 0.0.36-b0a2e39.0

package/dist/lib/light_push/light_push_v3.d.ts

@@ -0,0 +1,14 @@
+import type { PeerId } from "@libp2p/interface";
+import { type IBaseProtocolCore, type IEncoder, type IMessage, type Libp2p, type LightPushResult, PubsubTopic } from "@waku/interfaces";
+import { BaseProtocol } from "../base_protocol.js";
+export declare class LightPushCoreV3 extends BaseProtocol implements IBaseProtocolCore {
+    readonly pubsubTopics: PubsubTopic[];
+    constructor(pubsubTopics: PubsubTopic[], libp2p: Libp2p);
+    send(encoder: IEncoder, message: IMessage, peerId: PeerId): Promise<LightPushResult>;
+    private validateAndPrepareMessage;
+    private executeRequest;
+    private processResponse;
+    private acquireStream;
+    private sendAndReceive;
+    private decodeResponse;
+}

package/dist/lib/light_push/light_push_v3.js

@@ -0,0 +1,187 @@
+import { getLightPushStatusDescriptionV3, isSuccessStatusCodeV3, LightPushCodecV3, lightPushStatusCodeToProtocolErrorV3, LightPushStatusCodeV3, ProtocolError } from "@waku/interfaces";
+import { proto_lightpush_v3 } from "@waku/proto";
+import { Logger } from "@waku/utils";
+import all from "it-all";
+import * as lp from "it-length-prefixed";
+import { pipe } from "it-pipe";
+import { Uint8ArrayList } from "uint8arraylist";
+import { BaseProtocol } from "../base_protocol.js";
+import { PushRpcV3 } from "./push_rpc_v3.js";
+import { isRLNResponseError, isValidRequestId, validateMessage } from "./utils.js";
+const log = new Logger("light-push-v3");
+const STREAM_TIMEOUT_MS = 30000;
+class LightPushError extends Error {
+    protocol;
+    peerId;
+    response;
+    constructor(protocol, peerId, response, message) {
+        super(message || protocol);
+        this.protocol = protocol;
+        this.peerId = peerId;
+        this.response = response;
+        this.name = "LightPushError";
+    }
+}
+function withTimeout(promise, timeoutMs) {
+    return Promise.race([
+        promise,
+        new Promise((_, reject) => setTimeout(() => reject(new Error("Stream operation timed out")), timeoutMs))
+    ]);
+}
+function createSuccessResult(peerId, response) {
+    return {
+        success: peerId,
+        failure: null,
+        requestId: response.requestId,
+        statusCode: response.statusCode,
+        statusDesc: response.statusDesc,
+        relayPeerCount: response.relayPeerCount
+    };
+}
+function createFailureResult(error) {
+    const result = {
+        success: null,
+        failure: {
+            error: error.protocol,
+            peerId: error.peerId
+        }
+    };
+    if (error.response) {
+        result.requestId = error.response.requestId;
+        result.statusCode = error.response.statusCode;
+        result.statusDesc = error.response.statusDesc;
+        result.relayPeerCount = error.response.relayPeerCount;
+    }
+    return result;
+}
+function validateResponseSemantics(response, query, peerId) {
+    if (!isValidRequestId(response.requestId)) {
+        log.error("Invalid request ID format", { received: response.requestId });
+        throw new LightPushError(ProtocolError.DECODE_FAILED, peerId, response, "Invalid request ID format");
+    }
+    if (response.requestId !== query.query?.requestId &&
+        response.statusCode !== LightPushStatusCodeV3.TOO_MANY_REQUESTS) {
+        log.error("Request ID mismatch", {
+            sent: query.query?.requestId,
+            received: response.requestId
+        });
+        throw new LightPushError(ProtocolError.GENERIC_FAIL, peerId, response, "Request ID mismatch");
+    }
+    if (response.statusDesc && isRLNResponseError(response.statusDesc)) {
+        log.error("Remote peer fault: RLN generation");
+        throw new LightPushError(ProtocolError.RLN_PROOF_GENERATION, peerId, response, "RLN proof generation failed");
+    }
+}
+function ensureSuccessStatus(response, peerId) {
+    if (!isSuccessStatusCodeV3(response.statusCode)) {
+        const errorMessage = getLightPushStatusDescriptionV3(response.statusCode, response.statusDesc);
+        log.error("Remote peer rejected the message:", errorMessage);
+        const protocolError = lightPushStatusCodeToProtocolErrorV3(response.statusCode);
+        throw new LightPushError(protocolError, peerId, response, errorMessage);
+    }
+}
+function logResponseInfo(response) {
+    if (response.statusCode === LightPushStatusCodeV3.TOO_MANY_REQUESTS) {
+        if (response.requestId === "N/A") {
+            log.warn("Rate limited by nwaku node", {
+                statusDesc: response.statusDesc || "Request rejected due to too many requests"
+            });
+        }
+    }
+    if (response.relayPeerCount !== undefined) {
+        log.info(`Message relayed to ${response.relayPeerCount} peers`);
+    }
+}
+export class LightPushCoreV3 extends BaseProtocol {
+    pubsubTopics;
+    constructor(pubsubTopics, libp2p) {
+        super(LightPushCodecV3, libp2p.components, pubsubTopics);
+        this.pubsubTopics = pubsubTopics;
+    }
+    async send(encoder, message, peerId) {
+        try {
+            const validated = await this.validateAndPrepareMessage(encoder, message, peerId);
+            const streamResponse = await this.executeRequest(validated, peerId);
+            const finalResponse = this.processResponse(streamResponse, peerId);
+            logResponseInfo(finalResponse);
+            return createSuccessResult(peerId, finalResponse);
+        }
+        catch (error) {
+            if (error instanceof LightPushError) {
+                return createFailureResult(error);
+            }
+            log.error("Unexpected error in send", error);
+            return createFailureResult(new LightPushError(ProtocolError.GENERIC_FAIL, peerId));
+        }
+    }
+    async validateAndPrepareMessage(encoder, message, peerId) {
+        const validationError = await validateMessage(message, encoder);
+        if (validationError) {
+            throw new LightPushError(validationError, peerId);
+        }
+        const protoMessage = await encoder.toProtoObj(message);
+        if (!protoMessage) {
+            log.error("Failed to encode to protoMessage, aborting push");
+            throw new LightPushError(ProtocolError.ENCODE_FAILED, peerId);
+        }
+        const query = PushRpcV3.createRequest(protoMessage, encoder.pubsubTopic);
+        return { protoMessage: protoMessage, query };
+    }
+    async executeRequest(validated, peerId) {
+        const stream = await this.acquireStream(peerId);
+        try {
+            const rawResponse = await this.sendAndReceive(validated.query, stream);
+            const response = this.decodeResponse(rawResponse, peerId);
+            return { response, query: validated.query };
+        }
+        finally {
+            void stream.close();
+        }
+    }
+    processResponse(streamResponse, peerId) {
+        const { response, query } = streamResponse;
+        validateResponseSemantics(response, query, peerId);
+        ensureSuccessStatus(response, peerId);
+        return response;
+    }
+    async acquireStream(peerId) {
+        try {
+            return await this.getStream(peerId);
+        }
+        catch (error) {
+            log.error("Failed to get stream", error);
+            throw new LightPushError(ProtocolError.NO_STREAM_AVAILABLE, peerId);
+        }
+    }
+    async sendAndReceive(query, stream) {
+        try {
+            return await withTimeout(pipe([query.encode()], lp.encode, stream, lp.decode, async (source) => await all(source)), STREAM_TIMEOUT_MS);
+        }
+        catch (err) {
+            log.error("Failed to send waku light push request", err);
+            throw new Error("Stream operation failed");
+        }
+    }
+    decodeResponse(rawResponse, peerId) {
+        const bytes = rawResponse.reduce((acc, chunk) => {
+            acc.append(chunk);
+            return acc;
+        }, new Uint8ArrayList());
+        try {
+            const response = proto_lightpush_v3.LightpushResponse.decode(bytes);
+            if (!response) {
+                log.error("Remote peer fault: No response received");
+                throw new LightPushError(ProtocolError.NO_RESPONSE, peerId);
+            }
+            return response;
+        }
+        catch (err) {
+            if (err instanceof LightPushError) {
+                throw err;
+            }
+            log.error("Failed to decode push response", err);
+            throw new LightPushError(ProtocolError.DECODE_FAILED, peerId);
+        }
+    }
+}
+//# sourceMappingURL=light_push_v3.js.map

package/dist/lib/light_push/light_push_v3.js.map

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

package/dist/lib/light_push/{push_rpc.d.ts → push_rpc_v2.d.ts}

@@ -1,10 +1,10 @@
 import { proto_lightpush as proto } from "@waku/proto";
 import type { Uint8ArrayList } from "uint8arraylist";
-export declare class PushRpc {
+export declare class PushRpcV2 {
     proto: proto.PushRpc;
     constructor(proto: proto.PushRpc);
-    static createRequest(message: proto.WakuMessage, pubsubTopic: string): PushRpc;
-    static decode(bytes: Uint8ArrayList): PushRpc;
+    static createRequest(message: proto.WakuMessage, pubsubTopic: string): PushRpcV2;
+    static decode(bytes: Uint8ArrayList): PushRpcV2;
     encode(): Uint8Array;
     get query(): proto.PushRequest | undefined;
     get response(): proto.PushResponse | undefined;

package/dist/lib/light_push/{push_rpc.js → push_rpc_v2.js}

@@ -1,12 +1,12 @@
 import { proto_lightpush as proto } from "@waku/proto";
 import { v4 as uuid } from "uuid";
-export class PushRpc {
+export class PushRpcV2 {
     proto;
     constructor(proto) {
         this.proto = proto;
     }
     static createRequest(message, pubsubTopic) {
-        return new PushRpc({
+        return new PushRpcV2({
             requestId: uuid(),
             request: {
                 message: message,
@@ -17,7 +17,7 @@ export class PushRpc {
     }
     static decode(bytes) {
         const res = proto.PushRpc.decode(bytes);
-        return new PushRpc(res);
+        return new PushRpcV2(res);
     }
     encode() {
         return proto.PushRpc.encode(this.proto);
@@ -29,4 +29,4 @@ export class PushRpc {
         return this.proto.response;
     }
 }
-//# sourceMappingURL=push_rpc.js.map
+//# sourceMappingURL=push_rpc_v2.js.map

package/dist/lib/light_push/push_rpc_v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push_rpc_v2.js","sourceRoot":"","sources":["../../../src/lib/light_push/push_rpc_v2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,KAAK,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,MAAM,OAAO,SAAS;IACM;IAA1B,YAA0B,KAAoB;QAApB,UAAK,GAAL,KAAK,CAAe;IAAG,CAAC;IAE3C,MAAM,CAAC,aAAa,CACzB,OAA0B,EAC1B,WAAmB;QAEnB,OAAO,IAAI,SAAS,CAAC;YACnB,SAAS,EAAE,IAAI,EAAE;YACjB,OAAO,EAAE;gBACP,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,WAAW;aACzB;YACD,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,KAAqB;QACxC,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAEM,MAAM;QACX,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7B,CAAC;CACF"}

package/dist/lib/light_push/push_rpc_v3.d.ts

@@ -0,0 +1,11 @@
+import { proto_lightpush_v3, WakuMessage } from "@waku/proto";
+import type { Uint8ArrayList } from "uint8arraylist";
+export declare class PushRpcV3 {
+    request?: proto_lightpush_v3.LightpushRequest;
+    response?: proto_lightpush_v3.LightpushResponse;
+    private constructor();
+    static createRequest(message: WakuMessage, pubsubTopic?: string): PushRpcV3;
+    static decode(bytes: Uint8ArrayList | Uint8Array): PushRpcV3;
+    encode(): Uint8Array;
+    get query(): proto_lightpush_v3.LightpushRequest | undefined;
+}

package/dist/lib/light_push/push_rpc_v3.js

@@ -0,0 +1,32 @@
+import { proto_lightpush_v3 } from "@waku/proto";
+import { v4 as uuid } from "uuid";
+export class PushRpcV3 {
+    request;
+    response;
+    constructor(request, response) {
+        this.request = request;
+        this.response = response;
+    }
+    static createRequest(message, pubsubTopic) {
+        const request = {
+            requestId: uuid(),
+            message: message,
+            ...(pubsubTopic && { pubsubTopic })
+        };
+        return new PushRpcV3(request, undefined);
+    }
+    static decode(bytes) {
+        const response = proto_lightpush_v3.LightpushResponse.decode(bytes);
+        return new PushRpcV3(undefined, response);
+    }
+    encode() {
+        if (!this.request) {
+            throw new Error("Cannot encode without a request");
+        }
+        return proto_lightpush_v3.LightpushRequest.encode(this.request);
+    }
+    get query() {
+        return this.request;
+    }
+}
+//# sourceMappingURL=push_rpc_v3.js.map

package/dist/lib/light_push/push_rpc_v3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push_rpc_v3.js","sourceRoot":"","sources":["../../../src/lib/light_push/push_rpc_v3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAe,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,MAAM,OAAO,SAAS;IACb,OAAO,CAAuC;IAC9C,QAAQ,CAAwC;IAEvD,YACE,OAA6C,EAC7C,QAA+C;QAE/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,aAAa,CACzB,OAAoB,EACpB,WAAoB;QAEpB,MAAM,OAAO,GAAwC;YACnD,SAAS,EAAE,IAAI,EAAE;YACjB,OAAO,EAAE,OAAO;YAChB,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;SACpC,CAAC;QAEF,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,KAAkC;QACrD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpE,OAAO,IAAI,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM;QACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,kBAAkB,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF"}

package/dist/lib/light_push/utils.d.ts

@@ -1 +1,25 @@
+import type { IEncoder, IMessage } from "@waku/interfaces";
+import { ProtocolError } from "@waku/interfaces";
+/**
+ * Validates a Light Push v3 request ID format.
+ * Request IDs should be valid UUIDs, with special handling for "N/A" when rate limited.
+ *
+ * @param requestId - The request ID to validate
+ * @returns true if the request ID is valid, false otherwise
+ */
+export declare function isValidRequestId(requestId: string | undefined): boolean;
 export declare const isRLNResponseError: (info?: string) => boolean;
+export declare function mapInfoToProtocolError(info?: string): ProtocolError;
+/**
+ * Validates that a message conforms to Light Push protocol requirements.
+ *
+ * @param message - The message to validate
+ * @param encoder - The encoder to use for message size validation
+ * @returns A ProtocolError if validation fails, null if the message is valid
+ *
+ * @remarks
+ * This function performs the following validations:
+ * - Checks if the message payload exists and is not empty
+ * - Verifies the encoded message size is under the network cap (1MB)
+ */
+export declare function validateMessage(message: IMessage, encoder: IEncoder): Promise<ProtocolError | null>;

package/dist/lib/light_push/utils.js

@@ -1,3 +1,21 @@
+import { ProtocolError } from "@waku/interfaces";
+import { isMessageSizeUnderCap, Logger } from "@waku/utils";
+const log = new Logger("waku:light-push:utils");
+const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/**
+ * Validates a Light Push v3 request ID format.
+ * Request IDs should be valid UUIDs, with special handling for "N/A" when rate limited.
+ *
+ * @param requestId - The request ID to validate
+ * @returns true if the request ID is valid, false otherwise
+ */
+export function isValidRequestId(requestId) {
+    if (!requestId)
+        return false;
+    if (requestId === "N/A")
+        return true; // Special case for rate-limited responses
+    return UUID_REGEX.test(requestId);
+}
 // should match nwaku
 // https://github.com/waku-org/nwaku/blob/c3cb06ac6c03f0f382d3941ea53b330f6a8dd127/waku/waku_rln_relay/rln_relay.nim#L309
 // https://github.com/waku-org/nwaku/blob/c3cb06ac6c03f0f382d3941ea53b330f6a8dd127/tests/waku_rln_relay/rln/waku_rln_relay_utils.nim#L20
@@ -15,4 +33,56 @@ export const isRLNResponseError = (info) => {
         info.includes(RLN_MESSAGE_ID_PREFIX_ERROR) ||
         info.includes(RLN_REMOTE_VALIDATION));
 };
+export function mapInfoToProtocolError(info) {
+    if (!info) {
+        return ProtocolError.REMOTE_PEER_REJECTED;
+    }
+    const lowerInfo = info.toLowerCase();
+    if (isRLNResponseError(info)) {
+        return ProtocolError.RLN_PROOF_GENERATION;
+    }
+    if (lowerInfo.includes("rate limit") ||
+        lowerInfo.includes("too many requests")) {
+        return ProtocolError.REMOTE_PEER_REJECTED;
+    }
+    if (lowerInfo.includes("topic") &&
+        (lowerInfo.includes("not found") || lowerInfo.includes("not configured"))) {
+        return ProtocolError.TOPIC_NOT_CONFIGURED;
+    }
+    if (lowerInfo.includes("too large") || lowerInfo.includes("size")) {
+        return ProtocolError.SIZE_TOO_BIG;
+    }
+    if (lowerInfo.includes("decode") ||
+        lowerInfo.includes("invalid") ||
+        lowerInfo.includes("malformed")) {
+        return ProtocolError.DECODE_FAILED;
+    }
+    if (lowerInfo.includes("empty") && lowerInfo.includes("payload")) {
+        return ProtocolError.EMPTY_PAYLOAD;
+    }
+    return ProtocolError.REMOTE_PEER_REJECTED;
+}
+/**
+ * Validates that a message conforms to Light Push protocol requirements.
+ *
+ * @param message - The message to validate
+ * @param encoder - The encoder to use for message size validation
+ * @returns A ProtocolError if validation fails, null if the message is valid
+ *
+ * @remarks
+ * This function performs the following validations:
+ * - Checks if the message payload exists and is not empty
+ * - Verifies the encoded message size is under the network cap (1MB)
+ */
+export async function validateMessage(message, encoder) {
+    if (!message.payload?.length) {
+        log.error("Failed to send waku light push: payload is empty");
+        return ProtocolError.EMPTY_PAYLOAD;
+    }
+    if (!(await isMessageSizeUnderCap(encoder, message))) {
+        log.error("Failed to send waku light push: message is bigger than 1MB");
+        return ProtocolError.SIZE_TOO_BIG;
+    }
+    return null;
+}
 //# sourceMappingURL=utils.js.map

package/dist/lib/light_push/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/light_push/utils.ts"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,yHAAyH;AACzH,wIAAwI;AACxI,MAAM,2BAA2B,GAAG,8BAA8B,CAAC;AACnE,MAAM,2BAA2B,GAC/B,uDAAuD,CAAC;AAE1D,0BAA0B;AAC1B,wHAAwH;AACxH,gHAAgH;AAChH,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAEtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAa,EAAW,EAAE;IAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CACrC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/light_push/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1 +1 @@
-{"name":"@waku/core","version":"0.0.36-acc9100.0","description":"TypeScript implementation of the Waku v2 protocol","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"},"./lib/message/version_0":{"types":"./dist/lib/message/version_0.d.ts","import":"./dist/lib/message/version_0.js"},"./lib/base_protocol":{"types":"./dist/lib/base_protocol.d.ts","import":"./dist/lib/base_protocol.js"}},"typesVersions":{"*":{"lib/*":["dist/lib/*"],"constants/*":["dist/constants/*"]}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/core#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralised","communication","web3","ethereum","dapps"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint src *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha","test:browser":"NODE_ENV=test karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"dependencies":{"@waku/enr":"0.0.30-acc9100.0","@waku/interfaces":"0.0.31-acc9100.0","@libp2p/ping":"2.0.1","@waku/proto":"0.0.11-acc9100.0","@waku/utils":"0.0.24-acc9100.0","debug":"^4.3.4","@noble/hashes":"^1.3.2","it-all":"^3.0.4","it-length-prefixed":"^9.0.4","it-pipe":"^3.0.1","uint8arraylist":"^2.4.3","uuid":"^9.0.0"},"devDependencies":{"@libp2p/peer-id":"^5.0.1","@libp2p/interface":"^2.1.3","@multiformats/multiaddr":"^12.0.0","@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/debug":"^4.1.12","@types/mocha":"^10.0.6","@types/uuid":"^9.0.8","@waku/build-utils":"*","chai":"^4.3.10","sinon":"^18.0.0","cspell":"^8.6.1","fast-check":"^3.19.0","ignore-loader":"^0.1.2","isomorphic-fetch":"^3.0.0","mocha":"^10.3.0","npm-run-all":"^4.1.5","process":"^0.11.10","rollup":"^4.12.0"},"peerDependencies":{"@multiformats/multiaddr":"^12.0.0","libp2p":"2.1.8"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true},"libp2p":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}
+{"name":"@waku/core","version":"0.0.36-b0a2e39.0","description":"TypeScript implementation of the Waku v2 protocol","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"},"./lib/message/version_0":{"types":"./dist/lib/message/version_0.d.ts","import":"./dist/lib/message/version_0.js"},"./lib/base_protocol":{"types":"./dist/lib/base_protocol.d.ts","import":"./dist/lib/base_protocol.js"}},"typesVersions":{"*":{"lib/*":["dist/lib/*"],"constants/*":["dist/constants/*"]}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/core#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralised","communication","web3","ethereum","dapps"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint src *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha","test:browser":"NODE_ENV=test karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"dependencies":{"@waku/enr":"0.0.30-b0a2e39.0","@waku/interfaces":"0.0.31-b0a2e39.0","@libp2p/ping":"2.0.1","@waku/proto":"0.0.11-b0a2e39.0","@waku/utils":"0.0.24-b0a2e39.0","debug":"^4.3.4","@noble/hashes":"^1.3.2","it-all":"^3.0.4","it-length-prefixed":"^9.0.4","it-pipe":"^3.0.1","uint8arraylist":"^2.4.3","uuid":"^9.0.0"},"devDependencies":{"@libp2p/peer-id":"^5.0.1","@libp2p/interface":"^2.1.3","@multiformats/multiaddr":"^12.0.0","@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/debug":"^4.1.12","@types/mocha":"^10.0.6","@types/uuid":"^9.0.8","@waku/build-utils":"*","chai":"^4.3.10","sinon":"^18.0.0","cspell":"^8.6.1","fast-check":"^3.19.0","ignore-loader":"^0.1.2","isomorphic-fetch":"^3.0.0","mocha":"^10.3.0","npm-run-all":"^4.1.5","process":"^0.11.10","rollup":"^4.12.0"},"peerDependencies":{"@multiformats/multiaddr":"^12.0.0","libp2p":"2.1.8"},"peerDependenciesMeta":{"@multiformats/multiaddr":{"optional":true},"libp2p":{"optional":true}},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}

package/src/index.ts

@@ -10,7 +10,11 @@ export * as waku_filter from "./lib/filter/index.js";
 export { FilterCore, FilterCodecs } from "./lib/filter/index.js";
 
 export * as waku_light_push from "./lib/light_push/index.js";
-export { LightPushCodec, LightPushCore } from "./lib/light_push/index.js";
+export {
+  LightPushCodec,
+  LightPushCore,
+  LightPushCoreV3
+} from "./lib/light_push/index.js";
 
 export * as waku_store from "./lib/store/index.js";
 export { StoreCore, StoreCodec } from "./lib/store/index.js";

package/src/lib/connection_manager/connection_manager.ts

@@ -267,7 +267,7 @@ export class ConnectionManager
    * // Dial using multiaddr with specific protocols
    * await connectionManager.dialPeer(multiaddr, [
    *   "/vac/waku/relay/2.0.0",
-   *   "/vac/waku/lightpush/2.0.0-beta1"
+   *   "/vac/waku/lightpush/3.0.0"
    * ]);
    * ```
    *

package/src/lib/light_push/index.ts

@@ -1 +1,2 @@
-export { LightPushCore, LightPushCodec, PushResponse } from "./light_push.js";
+export { LightPushCore, LightPushCodec } from "./light_push.js";
+export { LightPushCoreV3 } from "./light_push_v3.js";

package/src/lib/light_push/light_push.ts

@@ -1,16 +1,15 @@
 import type { PeerId, Stream } from "@libp2p/interface";
 import {
-  type CoreProtocolResult,
   type IBaseProtocolCore,
   type IEncoder,
   type IMessage,
   type Libp2p,
+  type LightPushResult,
   ProtocolError,
   PubsubTopic,
   type ThisOrThat
 } from "@waku/interfaces";
-import { PushResponse } from "@waku/proto";
-import { isMessageSizeUnderCap } from "@waku/utils";
+import { proto_lightpush as proto_lightpush_v2 } from "@waku/proto";
 import { Logger } from "@waku/utils";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
@@ -19,19 +18,13 @@ import { Uint8ArrayList } from "uint8arraylist";
 
 import { BaseProtocol } from "../base_protocol.js";
 
-import { PushRpc } from "./push_rpc.js";
-import { isRLNResponseError } from "./utils.js";
+import { PushRpcV2 } from "./push_rpc_v2.js";
+import { mapInfoToProtocolError, validateMessage } from "./utils.js";
 
 const log = new Logger("light-push");
 
 export const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
-export { PushResponse };
 
-type PreparePushMessageResult = ThisOrThat<"query", PushRpc>;
-
-/**
- * Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
- */
 export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
   public constructor(
     public readonly pubsubTopics: PubsubTopic[],
@@ -43,16 +36,11 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
   private async preparePushMessage(
     encoder: IEncoder,
     message: IMessage
-  ): Promise<PreparePushMessageResult> {
+  ): Promise<ThisOrThat<"query", PushRpcV2>> {
     try {
-      if (!message.payload || message.payload.length === 0) {
-        log.error("Failed to send waku light push: payload is empty");
-        return { query: null, error: ProtocolError.EMPTY_PAYLOAD };
-      }
-
-      if (!(await isMessageSizeUnderCap(encoder, message))) {
-        log.error("Failed to send waku light push: message is bigger than 1MB");
-        return { query: null, error: ProtocolError.SIZE_TOO_BIG };
+      const validationError = await validateMessage(message, encoder);
+      if (validationError) {
+        return { query: null, error: validationError };
       }
 
       const protoMessage = await encoder.toProtoObj(message);
@@ -64,7 +52,7 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
         };
       }
 
-      const query = PushRpc.createRequest(protoMessage, encoder.pubsubTopic);
+      const query = PushRpcV2.createRequest(protoMessage, encoder.pubsubTopic);
       return { query, error: null };
     } catch (error) {
       log.error("Failed to prepare push message", error);
@@ -80,7 +68,7 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
     encoder: IEncoder,
     message: IMessage,
     peerId: PeerId
-  ): Promise<CoreProtocolResult> {
+  ): Promise<LightPushResult> {
     const { query, error: preparationError } = await this.preparePushMessage(
       encoder,
       message
@@ -120,7 +108,6 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
         async (source) => await all(source)
       );
     } catch (err) {
-      // can fail only because of `stream` abortion
       log.error("Failed to send waku light push request", err);
       return {
         success: null,
@@ -131,14 +118,14 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
       };
     }
 
-    const bytes = new Uint8ArrayList();
-    res.forEach((chunk) => {
-      bytes.append(chunk);
-    });
+    const bytes = res.reduce((acc, chunk) => {
+      acc.append(chunk);
+      return acc;
+    }, new Uint8ArrayList());
 
-    let response: PushResponse | undefined;
+    let response: proto_lightpush_v2.PushResponse | undefined;
     try {
-      response = PushRpc.decode(bytes).response;
+      response = PushRpcV2.decode(bytes).response;
     } catch (err) {
       log.error("Failed to decode push reply", err);
       return {
@@ -161,28 +148,24 @@ export class LightPushCore extends BaseProtocol implements IBaseProtocolCore {
       };
     }
 
-    if (isRLNResponseError(response.info)) {
-      log.error("Remote peer fault: RLN generation");
-      return {
-        success: null,
-        failure: {
-          error: ProtocolError.RLN_PROOF_GENERATION,
-          peerId: peerId
-        }
-      };
-    }
-
     if (!response.isSuccess) {
-      log.error("Remote peer rejected the message: ", response.info);
+      const errorMessage = response.info || "Message rejected";
+      log.error("Remote peer rejected the message: ", errorMessage);
+
+      const error = mapInfoToProtocolError(response.info);
+
       return {
         success: null,
         failure: {
-          error: ProtocolError.REMOTE_PEER_REJECTED,
+          error: error,
           peerId: peerId
         }
       };
     }
 
-    return { success: peerId, failure: null };
+    return {
+      success: peerId,
+      failure: null
+    };
   }
 }