remove redundant dapp fetching during notif send

Author: tsmbl

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dialectlabs/sdk",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "type": "module",
   "repository": "[email protected]:dialectlabs/sdk.git",
   "author": "dialectlabs",

packages/sdk/src/internal/dapp/alerts-v2-dapp-messages.ts

@@ -15,8 +15,6 @@ import {
   Channel,
   type SendAlertRequest,
 } from '../../dialect-cloud-api/v2/application-api';
-import { IllegalStateError } from '../../sdk/errors';
-import type { DataServiceDappsApi } from '../../dialect-cloud-api/data-service-dapps-api';
 import { withErrorParsing } from '../../dialect-cloud-api/data-service-errors';
 
 export const AddressTypeToChannel = {
@@ -28,23 +26,21 @@ export const AddressTypeToChannel = {
 
 export class AlertsV2DappMessages implements DappMessages {
   constructor(
-    private readonly dapps: DataServiceDappsApi,
+    private readonly dappId: string,
     private readonly api: AppV2Api,
   ) {}
 
   async send(command: SendDappMessageCommand): Promise<void> {
-    const dapp = await withErrorParsing(this.dapps.find()); // TODO: cache
-
     if (command.addressTypes?.length === 0) {
       return;
     }
     if ('recipient' in command) {
-      return this.unicast(command, dapp.id);
+      return this.unicast(command);
     }
     if ('recipients' in command) {
-      return this.multicast(command, dapp.id);
+      return this.multicast(command);
     }
-    return this.broadcast(command, dapp.id);
+    return this.broadcast(command);
   }
 
   static mapChannels(addressTypes?: AddressType[]) {
@@ -76,9 +72,9 @@ export class AlertsV2DappMessages implements DappMessages {
     }
   }
 
-  private async unicast(command: UnicastDappMessageCommand, appId: string) {
+  private async unicast(command: UnicastDappMessageCommand) {
     await withErrorParsing(
-      this.api.sendAlert(appId, {
+      this.api.sendAlert(this.dappId, {
         recipient: {
           type: 'subscriber',
           walletAddress: command.recipient.toString(),
@@ -95,7 +91,7 @@ export class AlertsV2DappMessages implements DappMessages {
     );
   }
 
-  private async multicast(command: MulticastDappMessageCommand, appId: string) {
+  private async multicast(command: MulticastDappMessageCommand) {
     if (command.recipients.length === 0) {
       return;
     }
@@ -117,15 +113,15 @@ export class AlertsV2DappMessages implements DappMessages {
         } satisfies SendAlertRequest),
     );
     await withErrorParsing(
-      this.api.sendBatch(appId, {
+      this.api.sendBatch(this.dappId, {
         alerts: commands,
       }),
     );
   }
 
-  private async broadcast(command: BroadcastDappMessageCommand, appId: string) {
+  private async broadcast(command: BroadcastDappMessageCommand) {
     await withErrorParsing(
-      this.api.sendAlert(appId, {
+      this.api.sendAlert(this.dappId, {
         recipient: {
           type: 'all-subscribers',
         },

packages/sdk/src/internal/dapp/dapp.ts

@@ -26,7 +26,7 @@ import type { ApiClientError } from '../../dialect-cloud-api/utils';
 export class DappsImpl implements Dapps {
   constructor(
     private readonly dappAddresses: DappAddresses,
-    private readonly dappMessages: DappMessages,
+    private readonly dappMessagesFactory: (dappId: string) => DappMessages,
     private readonly notificationTypes: DataServiceDappNotificationTypes,
     private readonly notificationSubscriptions: DataServiceDappNotificationSubscriptions,
     private readonly dappsApi: DataServiceDappsApi,
@@ -54,7 +54,7 @@ export class DappsImpl implements Dapps {
       dappDto.telegramBotUserName,
       dappDto.blockchainType,
       this.dappAddresses,
-      this.dappMessages,
+      this.dappMessagesFactory(dappDto.id),
       this.notificationTypes,
       this.notificationSubscriptions,
       dappDto.description,

packages/sdk/src/internal/sdk/sdk-factory.ts

@@ -195,16 +195,16 @@ export class DialectSdkFactory<ChainSdk extends BlockchainSdk> {
         dataServiceApi.dappNotificationSubscriptions,
       );
 
-    const dappMessages = this.createDappMessages(
-      dataServiceApi,
-      appV2Api,
-      blockchainSdk,
-      dataServiceApi.dapps,
-      config,
-    );
     return new DappsImpl(
       dappAddresses,
-      dappMessages,
+      (dappId) =>
+        this.createDappMessages(
+          dappId,
+          dataServiceApi,
+          appV2Api,
+          blockchainSdk,
+          config,
+        ),
       dappNotificationTypes,
       dappNotificationSubscriptions,
       dataServiceApi.dapps,
@@ -227,10 +227,10 @@ export class DialectSdkFactory<ChainSdk extends BlockchainSdk> {
   }
 
   private createDappMessages(
+    dappId: string,
     dataServiceApi: DataServiceApi,
     appV2Api: AppV2Api,
     blockchainSdk: BlockchainSdk,
-    dapps: DataServiceDappsApi,
     config: Config,
   ): DappMessages {
     const dappMessages: DappMessages[] = [];
@@ -243,7 +243,7 @@ export class DialectSdkFactory<ChainSdk extends BlockchainSdk> {
     }
 
     if (config.dialectCloud.apiVersion === 2) {
-      const alertsV2DappMessages = new AlertsV2DappMessages(dapps, appV2Api);
+      const alertsV2DappMessages = new AlertsV2DappMessages(dappId, appV2Api);
       dappMessages.push(alertsV2DappMessages);
     }