From 0c852e42012b86304c13b7a119fc404ed81f32f4 Mon Sep 17 00:00:00 2001
From: Sasha <oleksandr@status.im>
Date: Mon, 29 Sep 2025 22:40:53 +0200
Subject: [PATCH] add utils, fix typings

---
 packages/sdk/src/messaging/message_store.ts | 2 +-
 packages/sdk/src/messaging/messaging.ts     | 5 +++--
 packages/sdk/src/messaging/sender.ts        | 3 ++-
 packages/sdk/src/messaging/utils.ts         | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/sdk/src/messaging/message_store.ts b/packages/sdk/src/messaging/message_store.ts
index a315fca268..a1babfde75 100644
--- a/packages/sdk/src/messaging/message_store.ts
+++ b/packages/sdk/src/messaging/message_store.ts
@@ -1,4 +1,4 @@
-import { message, messageHashStr } from "@waku/core";
+import { messageHashStr } from "@waku/core";
 import { IDecodedMessage, IEncoder, IMessage } from "@waku/interfaces";
 
 type QueuedMessage = {
diff --git a/packages/sdk/src/messaging/messaging.ts b/packages/sdk/src/messaging/messaging.ts
index 94e2d72006..e843bd122a 100644
--- a/packages/sdk/src/messaging/messaging.ts
+++ b/packages/sdk/src/messaging/messaging.ts
@@ -9,9 +9,10 @@ import {
 import { AckManager } from "./ack_manager.js";
 import { MessageStore } from "./message_store.js";
 import { Sender } from "./sender.js";
+import type { RequestId } from "./utils.js";
 
 interface IMessaging {
-  send(encoder: IEncoder, message: IMessage): Promise<void>;
+  send(encoder: IEncoder, message: IMessage): Promise<RequestId>;
 }
 
 type MessagingConstructorParams = {
@@ -48,7 +49,7 @@ export class Messaging implements IMessaging {
     await this.ackManager.stop();
   }
 
-  public send(encoder: IEncoder, message: IMessage): Promise<void> {
+  public send(encoder: IEncoder, message: IMessage): Promise<string> {
     return this.sender.send(encoder, message);
   }
 }
diff --git a/packages/sdk/src/messaging/sender.ts b/packages/sdk/src/messaging/sender.ts
index bc1fc4ece3..a7a49aa7d6 100644
--- a/packages/sdk/src/messaging/sender.ts
+++ b/packages/sdk/src/messaging/sender.ts
@@ -1,6 +1,7 @@
 import { IEncoder, ILightPush, IMessage } from "@waku/interfaces";
 
 import type { MessageStore } from "./message_store.js";
+import type { RequestId } from "./utils.js";
 
 type SenderConstructorParams = {
   messageStore: MessageStore;
@@ -29,7 +30,7 @@ export class Sender {
     }
   }
 
-  public async send(encoder: IEncoder, message: IMessage): Promise<string> {
+  public async send(encoder: IEncoder, message: IMessage): Promise<RequestId> {
     const requestId = await this.messageStore.queue(encoder, message);
     const response = await this.lightPush.send(encoder, message);
 
diff --git a/packages/sdk/src/messaging/utils.ts b/packages/sdk/src/messaging/utils.ts
index db4b5ba758..3f270e5bbe 100644
--- a/packages/sdk/src/messaging/utils.ts
+++ b/packages/sdk/src/messaging/utils.ts
@@ -3,6 +3,8 @@ import { IDecodedMessage, IDecoder, IEncoder } from "@waku/interfaces";
 // TODO: create a local entity for that that will literally extend existing encoder and decoder from package/core
 export type ICodec = IEncoder & IDecoder<IDecodedMessage>;
 
+export type RequestId = string;
+
 export interface IAckManager {
   start(): void;
   stop(): void;