sdk: 2.0.0-beta.5 - dedup dapp message sending in compat mode

Author: tsmbl

packages/sdk/package.json

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

packages/sdk/src/internal/dapp/data-service-dapp-messages.ts

@@ -8,7 +8,10 @@ import {
   type SendDappMessageCommand,
   type UnicastDappMessageCommand,
 } from '../../dapp/dapp.interface';
-import { toAddressTypeDto } from '../../address/addresses.interface';
+import {
+  AddressType,
+  toAddressTypeDto,
+} from '../../address/addresses.interface';
 import {
   DappMessageActionTypeDto,
   DappMessageLinksActionDto,
@@ -18,19 +21,42 @@ import {
 import { withErrorParsing } from '../../dialect-cloud-api/data-service-errors';
 
 export class DataServiceDappMessages implements DappMessages {
-  constructor(private readonly api: DataServiceDappsApi) {}
+  constructor(
+    private readonly api: DataServiceDappsApi,
+    private readonly addressTypePredicate: (at: AddressType) => boolean = () =>
+      true,
+  ) {}
 
   async send(command: SendDappMessageCommand): Promise<void> {
     if (command.addressTypes?.length === 0) {
       return;
     }
+    const addressTypesNormalized = command.addressTypes ?? [
+      AddressType.Email,
+      AddressType.Telegram,
+      AddressType.Wallet,
+    ];
+
+    const addressTypesFiltered = addressTypesNormalized.filter(
+      this.addressTypePredicate,
+    );
+
     if ('recipient' in command) {
-      return this.unicast(command);
+      return this.unicast({
+        ...command,
+        addressTypes: addressTypesFiltered,
+      });
     }
     if ('recipients' in command) {
-      return this.multicast(command);
+      return this.multicast({
+        ...command,
+        addressTypes: addressTypesFiltered,
+      });
     }
-    return this.broadcast(command);
+    return this.broadcast({
+      ...command,
+      addressTypes: addressTypesFiltered,
+    });
   }
 
   private async unicast(command: UnicastDappMessageCommand) {

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

@@ -46,6 +46,7 @@ import type { DataServiceApi } from '../../dialect-cloud-api/data-service-api';
 import { DataServiceWalletsApiClientV1 } from '../../dialect-cloud-api/data-service-wallets-api.v1';
 import { AlertsV2DappMessages } from '../dapp/alerts-v2-dapp-messages';
 import { AppV2Api } from '../../dialect-cloud-api/v2/application-api';
+import { AddressType } from '../../address/addresses.interface';
 
 export class InternalDialectSdk<ChainSdk extends BlockchainSdk>
   implements DialectSdk<ChainSdk>
@@ -234,21 +235,25 @@ export class DialectSdkFactory<ChainSdk extends BlockchainSdk> {
   ): DappMessages {
     const dappMessages: DappMessages[] = [];
 
-    const dataServiceDappMessages = new DataServiceDappMessages(
-      dataServiceApi.dapps,
-    );
-    const alertsV2DappMessages = new AlertsV2DappMessages(dappId, appV2Api);
-
     switch (config.dialectCloud.apiVersion) {
       case 1:
-        dappMessages.push(dataServiceDappMessages);
+        dappMessages.push(new DataServiceDappMessages(dataServiceApi.dapps));
         break;
       case 2:
-        dappMessages.push(alertsV2DappMessages);
+        dappMessages.push(new AlertsV2DappMessages(dappId, appV2Api));
         break;
       case '2_compat':
-        dappMessages.push(dataServiceDappMessages);
-        dappMessages.push(alertsV2DappMessages);
+        dappMessages.push(
+          new DataServiceDappMessages(
+            dataServiceApi.dapps,
+            // The V2 API ensures compatibility with Telegram and the email server side,
+            // so we avoid dispatching duplicate alerts. Therefore, we use only the V2 API
+            // for the WALLET channel in compatibility mode. As a result, alerts to the
+            // TELEGRAM and EMAIL channels will be sent to user only once.
+            (at) => at === AddressType.Wallet,
+          ),
+        );
+        dappMessages.push(new AlertsV2DappMessages(dappId, appV2Api));
         break;
       default:
         throw new IllegalArgumentError(

yarn.lock

@@ -493,6 +493,19 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
+"@dialectlabs/[email protected]":
+  version "2.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@dialectlabs/sdk/-/sdk-2.0.0-beta.4.tgz#bc839428cf8d99250df05f5d6608c7c139c67e06"
+  integrity sha512-CGZe46uSQq1AtB7n71tabHVABMM2D5FAGOc3GV3O4KIePTU1+3nhCCCNMpT8zpz7IOXzRQCZdGiJ738xKNuFSg==
+  dependencies:
+    "@stablelib/base64" "^1.0.1"
+    axios "^0.27.2"
+    bs58 "^5.0.0"
+    ed2curve "^0.3.0"
+    js-sha3 "^0.8.0"
+    nanoid "^3.3.4"
+    tweetnacl "^1.0.3"
+
 "@esbuild/[email protected]":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"