From 14d333ff0ddc67c98678b5d55c2cb4cd21bb664b Mon Sep 17 00:00:00 2001 From: Danish Arora Date: Sat, 30 Aug 2025 17:25:12 +0530 Subject: [PATCH] chore: return void for sds.sendMessage() --- src/lib/services/index.ts | 2 +- src/lib/waku/core/ReliableMessaging.ts | 5 ++-- src/lib/waku/index.ts | 5 ++-- src/lib/waku/services/MessageService.ts | 34 ++++++++++++------------- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/lib/services/index.ts b/src/lib/services/index.ts index 8a49d31..2a154a6 100644 --- a/src/lib/services/index.ts +++ b/src/lib/services/index.ts @@ -1,3 +1,3 @@ -export { AuthService, type AuthServiceInterface } from './AuthService'; +export { AuthService, type AuthServiceInterface, type AuthResult } from './AuthService'; export { MessageService, type MessageServiceInterface } from './MessageService'; export { CryptoService, type CryptoServiceInterface, type DelegationDuration } from './CryptoService'; \ No newline at end of file diff --git a/src/lib/waku/core/ReliableMessaging.ts b/src/lib/waku/core/ReliableMessaging.ts index 9b28fbb..be4edc1 100644 --- a/src/lib/waku/core/ReliableMessaging.ts +++ b/src/lib/waku/core/ReliableMessaging.ts @@ -76,7 +76,7 @@ export class ReliableMessaging { }); } - public async sendMessage(message: OpchanMessage, statusCallback?: MessageStatusCallback): Promise { + public async sendMessage(message: OpchanMessage, statusCallback?: MessageStatusCallback): Promise { const channel = this.channels.get(message.type); if (!channel) { throw new Error(`No reliable channel for message type: ${message.type}`); @@ -90,8 +90,7 @@ export class ReliableMessaging { } try { - await channel.send(encodedMessage); - return messageId; + return channel.send(encodedMessage); } catch (error) { this.messageCallbacks.delete(messageId); throw error; diff --git a/src/lib/waku/index.ts b/src/lib/waku/index.ts index 5a9d377..5f59e4c 100644 --- a/src/lib/waku/index.ts +++ b/src/lib/waku/index.ts @@ -90,11 +90,12 @@ class MessageManager { return this.nodeManager.onHealthChange(callback); } - public async sendMessage(message: OpchanMessage, statusCallback?: MessageStatusCallback): Promise { + //TODO: return event handlers? + public async sendMessage(message: OpchanMessage, statusCallback?: MessageStatusCallback): Promise { if (!this.messageService) { throw new Error("MessageManager not fully initialized"); } - return this.messageService.sendMessage(message, statusCallback); + this.messageService.sendMessage(message, statusCallback); } public onMessageReceived(callback: (message: OpchanMessage) => void): () => void { diff --git a/src/lib/waku/services/MessageService.ts b/src/lib/waku/services/MessageService.ts index daff2a0..575d1e1 100644 --- a/src/lib/waku/services/MessageService.ts +++ b/src/lib/waku/services/MessageService.ts @@ -28,7 +28,7 @@ export class MessageService { } } - public async sendMessage(message: OpchanMessage, statusCallback?: MessageStatusCallback): Promise { + public async sendMessage(message: OpchanMessage, statusCallback?: MessageStatusCallback): Promise { if (!this.reliableMessaging) { throw new Error("Reliable messaging not initialized"); } @@ -41,23 +41,21 @@ export class MessageService { this.cacheService.updateCache(message); // Send via reliable messaging with status tracking - const messageId = await this.reliableMessaging.sendMessage(message, { - onSent: (id) => { - console.log(`Message ${id} sent`); - statusCallback?.onSent?.(id); - }, - onAcknowledged: (id) => { - console.log(`Message ${id} acknowledged`); - statusCallback?.onAcknowledged?.(id); - }, - onError: (id, error) => { - console.error(`Message ${id} failed:`, error); - statusCallback?.onError?.(id, error); - } - }); - - return messageId; - } + await this.reliableMessaging.sendMessage(message, { + onSent: (id) => { + console.log(`Message ${id} sent`); + statusCallback?.onSent?.(id); + }, + onAcknowledged: (id) => { + console.log(`Message ${id} acknowledged`); + statusCallback?.onAcknowledged?.(id); + }, + onError: (id, error) => { + console.error(`Message ${id} failed:`, error); + statusCallback?.onError?.(id, error); + } + }); + } public onMessageReceived(callback: MessageReceivedCallback): () => void { this.messageReceivedCallbacks.add(callback);