feat: handle connection reject event

packages/sdk-communication-layer/src/KeyExchange.test.ts

@@ -3,7 +3,7 @@ import { KeyExchange } from './KeyExchange';
 import { SocketService } from './SocketService';
 
 jest.mock('./ECIES');
-jest.mock('./types/CommunicationLayer'); // Assuming CommunicationLayer is a class that can be mocked.
+jest.mock('./SocketService'); // Assuming CommunicationLayer is a class that can be mocked.
 
 describe('KeyExchange', () => {
   let keyExchange: KeyExchange;

packages/sdk-communication-layer/src/RemoteCommunication.ts

@@ -15,7 +15,7 @@
 import {
   connectToChannel,
   disconnect,
-  initCommunicationLayer,
+  initSocketService,
   originatorSessionConnect,
   resume,
 } from './services/RemoteCommunication/ConnectionManager';
@@ -40,6 +40,7 @@
 import { WalletInfo } from './types/WalletInfo';
 import { logger } from './utils/logger';
 import { Channel } from './types/Channel';
+import { rejectChannel } from './services/RemoteCommunication/ConnectionManager/rejectChannel';
 
 type MetaMaskMobile = 'metamask-mobile';
 
@@ -203,41 +204,18 @@
       `[RemoteCommunication: constructor()] protocolVersion=${protocolVersion} relayPersistence=${relayPersistence} isOriginator=${this.state.isOriginator} communicationLayerPreference=${communicationLayerPreference} otherPublicKey=${otherPublicKey} reconnect=${reconnect}`,
     );
 
-    this.initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference,
       otherPublicKey,
       reconnect,
       ecies,
       communicationServerUrl,
+      instance: this,
     });
 
     this.emitServiceStatusEvent({ context: 'constructor' });
   }
 
-  private initCommunicationLayer({
-    communicationLayerPreference,
-    otherPublicKey,
-    reconnect,
-    ecies,
-    communicationServerUrl = DEFAULT_SERVER_URL,
-  }: Pick<
-    RemoteCommunicationProps,
-    | 'communicationLayerPreference'
-    | 'otherPublicKey'
-    | 'reconnect'
-    | 'ecies'
-    | 'communicationServerUrl'
-  >) {
-    return initCommunicationLayer({
-      communicationLayerPreference,
-      otherPublicKey,
-      reconnect,
-      ecies,
-      communicationServerUrl,
-      instance: this,
-    });
-  }
-
   /**
    * Initialize the connection from the dapp side.
    */
@@ -454,6 +432,13 @@
     return this.state.communicationLayer?.getRPCMethodTracker();
   }
 
+  reject({ channelId }: { channelId: string }) {
+    return rejectChannel({
+      channelId,
+      state: this.state,
+    });
+  }
+
   disconnect(options?: DisconnectOptions) {
     return disconnect({
       options,

packages/sdk-communication-layer/src/SocketService.ts

@@ -16,7 +16,6 @@ import {
 } from './services/SocketService/ConnectionManager';
 import { keyCheck, resetKeys } from './services/SocketService/KeysManager';
 import { handleSendMessage } from './services/SocketService/MessageHandlers';
-import { CommunicationLayer } from './types/CommunicationLayer';
 import { CommunicationLayerMessage } from './types/CommunicationLayerMessage';
 import { CommunicationLayerPreference } from './types/CommunicationLayerPreference';
 import { ConnectToChannelOptions } from './types/ConnectToChannelOptions';
@@ -75,11 +74,7 @@ export interface RPCMethodCache {
   [id: string]: RPCMethodResult;
 }
 
-export type SocketServiceInstanceType = SocketService &
-  EventEmitter2 &
-  CommunicationLayer;
-
-export class SocketService extends EventEmitter2 implements CommunicationLayer {
+export class SocketService extends EventEmitter2 {
   public state: SocketServiceState = {
     clientsConnected: false,
     /**

packages/sdk-communication-layer/src/services/RemoteCommunication/ChannelManager/generateChannelIdConnect.test.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { RemoteCommunicationState } from '../../../RemoteCommunication';
 import { SocketService } from '../../../SocketService';
-import { CommunicationLayer } from '../../../types/CommunicationLayer';
 import { StorageManager } from '../../../types/StorageManager';
 import { logger } from '../../../utils/logger';
 import { generateChannelIdConnect } from './generateChannelIdConnect';
@@ -27,7 +26,7 @@ describe('generateChannelIdConnect', () => {
         })),
         isConnected: jest.fn(() => false),
         getKeyInfo: jest.fn(() => ({ ecies: { public: 'mockPublicKey' } })),
-      } as unknown as CommunicationLayer,
+      } as unknown as SocketService,
       ready: false,
       channelId: undefined,
       sessionDuration: 1000,

packages/sdk-communication-layer/src/services/RemoteCommunication/ConnectionManager/disconnect.test.ts

@@ -1,6 +1,5 @@
 import { RemoteCommunication } from '../../../RemoteCommunication';
 import { SocketService } from '../../../SocketService';
-import { CommunicationLayer } from '../../../types/CommunicationLayer';
 import { ConnectionStatus } from '../../../types/ConnectionStatus';
 import { MessageType } from '../../../types/MessageType';
 import { StorageManager } from '../../../types/StorageManager';
@@ -22,7 +21,7 @@ describe('disconnect', () => {
           getKeyInfo: jest.fn(() => ({ keysExchanged: false })),
           sendMessage: jest.fn(),
           disconnect: jest.fn(),
-        } as unknown as CommunicationLayer,
+        } as unknown as SocketService,
         debug: false,
         channelId: 'sampleChannelId',
       },

packages/sdk-communication-layer/src/services/RemoteCommunication/ConnectionManager/index.ts

@@ -1,6 +1,6 @@
 export * from './connectToChannel';
 export * from './originatorSessionConnect';
 export * from './resume';
-export * from './initCommunicationLayer';
+export * from './initSocketService';
 export * from './disconnect';
 export * from './handleAuthorization';

packages/sdk-communication-layer/src/services/RemoteCommunication/ConnectionManager/initCommunicationLayer.test.ts → packages/sdk-communication-layer/src/services/RemoteCommunication/ConnectionManager/initSocketService.test.ts

@@ -2,11 +2,11 @@ import { CommunicationLayerPreference } from '../../../types/CommunicationLayerP
 import { SocketService } from '../../../SocketService';
 import { DEFAULT_SERVER_URL } from '../../../config';
 import { ECIESProps } from '../../../ECIES';
-import { initCommunicationLayer } from './initCommunicationLayer';
+import { initSocketService } from './initSocketService';
 
 jest.mock('../../../SocketService');
 
-describe('initCommunicationLayer', () => {
+describe('initSocketService', () => {
   let instance: any;
 
   const mockOn = jest.fn();
@@ -39,15 +39,15 @@ describe('initCommunicationLayer', () => {
 
   it('should throw error for invalid communication protocol', () => {
     expect(() => {
-      initCommunicationLayer({
+      initSocketService({
         communicationLayerPreference: 'UNKNOWN' as CommunicationLayerPreference,
         instance,
       });
     }).toThrow('Invalid communication protocol');
   });
 
   it('should initialize socket service for SOCKET communication preference', () => {
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       instance,
     });
@@ -61,7 +61,7 @@ describe('initCommunicationLayer', () => {
   });
 
   it('should populate originatorInfo using dappMetadata', () => {
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       instance,
     });
@@ -84,7 +84,7 @@ describe('initCommunicationLayer', () => {
       writable: true,
     });
 
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       instance,
     });
@@ -98,7 +98,7 @@ describe('initCommunicationLayer', () => {
   });
 
   it('should use DEFAULT_SERVER_URL if communicationServerUrl is not provided', () => {
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       instance,
     });
@@ -116,7 +116,7 @@ describe('initCommunicationLayer', () => {
       privateKey: 'mockPrivateKey',
     };
 
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       instance,
       ecies: eciesProps,
@@ -130,7 +130,7 @@ describe('initCommunicationLayer', () => {
   });
 
   it('should register event listeners for the communication layer', () => {
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       instance,
     });
@@ -141,7 +141,7 @@ describe('initCommunicationLayer', () => {
   it('should pass otherPublicKey to SocketService if provided', () => {
     const publicKey = 'samplePublicKey';
 
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       otherPublicKey: publicKey,
       instance,
@@ -155,7 +155,7 @@ describe('initCommunicationLayer', () => {
   });
 
   it('should enable reconnect in SocketService if reconnect is true', () => {
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       reconnect: true,
       instance,
@@ -171,7 +171,7 @@ describe('initCommunicationLayer', () => {
   it('should pass logging option to SocketService', () => {
     instance.state.logging = true;
 
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       instance,
     });
@@ -189,7 +189,7 @@ describe('initCommunicationLayer', () => {
       throw new Error('Mock Event Listener Error');
     });
 
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       instance,
     });
@@ -205,7 +205,7 @@ describe('initCommunicationLayer', () => {
   it('should use provided communicationServerUrl', () => {
     const customServerUrl = 'https://custom-server-url.com';
 
-    initCommunicationLayer({
+    initSocketService({
       communicationLayerPreference: CommunicationLayerPreference.SOCKET,
       communicationServerUrl: customServerUrl,
       instance,

packages/sdk-communication-layer/src/services/RemoteCommunication/ConnectionManager/initCommunicationLayer.ts → packages/sdk-communication-layer/src/services/RemoteCommunication/ConnectionManager/initSocketService.ts

@@ -48,7 +48,7 @@ type CommunicationLayerHandledEvents =
  * @param instance The current instance of the RemoteCommunication class.
  * @throws Error when an invalid communication protocol is specified.
  */
-export function initCommunicationLayer({
+export function initSocketService({
   communicationLayerPreference,
   otherPublicKey,
   reconnect,

packages/sdk-communication-layer/src/services/RemoteCommunication/ConnectionManager/rejectChannel.ts

@@ -0,0 +1,76 @@
+// packages/sdk-communication-layer/src/services/RemoteCommunication/ConnectionManager/connectToChannel.ts
+import { validate } from 'uuid';
+import { RemoteCommunicationState } from '../../../RemoteCommunication';
+import { EventType } from '../../../types/EventType';
+// import { logger } from '../../../utils/logger';
+
+const logger = {
+  RemoteCommunication: (message: string, ...args: unknown[]) => {
+    console.log(message, ...args);
+  },
+};
+
+/**
+ * Rejects a channel connection from the wallet.
+ *
+ * @param channelId Unique identifier for the channel.
+ * @param state Current state of the RemoteCommunication class instance.
+ * @returns void
+ */
+export async function rejectChannel({
+  channelId,
+  state,
+}: {
+  channelId: string;
+  state: RemoteCommunicationState;
+}): Promise<unknown> {
+  if (!validate(channelId)) {
+    logger.RemoteCommunication(
+      `[RemoteCommunication: connectToChannel()] context=${state.context} invalid channel channelId=${channelId}`,
+    );
+    throw new Error(`Invalid channel ${channelId}`);
+  }
+
+  if (state.isOriginator) {
+    // only wallet can reject
+    logger.RemoteCommunication(
+      `[RemoteCommunication: reject()] context=${state.context} isOriginator=${state.isOriginator} channelId=${channelId}`,
+    );
+    return;
+  }
+
+  const { socket } = state.communicationLayer?.state ?? {};
+
+  if (!socket?.connected) {
+    logger.RemoteCommunication(
+      `[RemoteCommunication: reject()] context=${state.context} socket already connected`,
+    );
+    socket?.connect();
+  }
+
+  logger.RemoteCommunication(
+    `[RemoteCommunication: reject()] context=${state.context} channelId=${channelId} socket=${socket} emitting ${EventType.REJECTED}`,
+  );
+
+  // emit reject event
+  await new Promise<unknown>((resolve, reject) => {
+    socket?.emit(
+      EventType.REJECTED,
+      {
+        channelId,
+      },
+      (error: unknown, response: unknown) => {
+        logger.RemoteCommunication(
+          `[RemoteCommunication: reject()] context=${state.context} socket=${socket?.id}`,
+          { error, response },
+        );
+
+        if (error) {
+          reject(error);
+        } else {
+          resolve(response);
+        }
+      },
+    );
+  });
+}

packages/sdk-communication-layer/src/services/SocketService/ChannelManager/createChannel.ts

@@ -2,7 +2,10 @@ import { v4 as uuidv4 } from 'uuid';
 import { SocketService } from '../../../SocketService';
 import { EventType } from '../../../types/EventType';
 import { logger } from '../../../utils/logger';
-import { handleJoinChannelResults } from '../ConnectionManager/handleJoinChannelResult';
+import {
+  handleJoinChannelResults,
+  JoinChannelResult,
+} from '../ConnectionManager/handleJoinChannelResult';
 import { Channel } from '../../../types/Channel';
 import { setupChannelListeners } from './setupChannelListeners';
 
@@ -47,14 +50,7 @@ export async function createChannel(instance: SocketService): Promise<Channel> {
         context: `${instance.state.context}createChannel`,
         clientType: 'dapp', // only dapp can create channel
       },
-      async (
-        error: string | null,
-        result?: {
-          ready: boolean;
-          persistence?: boolean;
-          walletKey?: string;
-        },
-      ) => {
+      async (error: string | null, result?: JoinChannelResult) => {
         try {
           await handleJoinChannelResults(instance, error, result);
           resolve();