Pass error message to onSocketError method (#481)

Author: anna1901

internal/fishjam-chat/screens/RoomScreen/RoomScreen.tsx

@@ -1,5 +1,5 @@
 import {
-  leaveRoom,
+  useConnection,
   useAudioSettings,
   useCamera,
   useForegroundService,
@@ -46,10 +46,12 @@ const RoomScreen = ({ navigation, route }: Props) => {
 
   const { toggleScreenShare, isScreenShareOn } = useScreenShare();
 
+  const { leaveRoom } = useConnection();
+
   const onDisconnectPress = useCallback(() => {
     leaveRoom();
     navigation.navigate('Home');
-  }, [navigation]);
+  }, [navigation, leaveRoom]);
 
   useForegroundService({
     channelId: 'io.fishjam.example.fishjamchat.foregroundservice.channel',

packages/ios-client/Sources/FishjamClient/FishjamClientInternal.swift

@@ -452,7 +452,7 @@ class FishjamClientInternal {
 
     func websocketDidReceiveMessage(text: String) {
         sdkLogger.error("Unsupported socket callback 'websocketDidReceiveMessage' was called.")
-        onSocketError()
+        onSocketError("Unsupported socket callback 'websocketDidReceiveMessage' was called.")
     }
 
     func onSocketClose(code: UInt16, reason: String) {
@@ -466,9 +466,9 @@ class FishjamClientInternal {
         listener.onAuthError(reason: reason)
     }
 
-    func onSocketError() {
+    func onSocketError(_ errorMessage: String? = nil) {
         roomState.isAuthenticated = false
-        listener.onSocketError()
+        listener.onSocketError(errorMessage)
     }
 
     func onDisconnected() {
@@ -547,7 +547,7 @@ extension FishjamClientInternal: WebSocketDelegate {
         ///viabilityChanged is called when there is no internet
         case .viabilityChanged(let isViable):
             if !isViable {
-                onSocketError()
+                onSocketError("No internet connection")
                 commandsQueue.clear()
                 prepareToReconnect()
                 reconnectionManager?.onDisconnected()
@@ -556,8 +556,8 @@ extension FishjamClientInternal: WebSocketDelegate {
         case .cancelled:
             onDisconnected()
             break
-        case .error(_):
-            onSocketError()
+        case .error(let error):
+            onSocketError(error?.localizedDescription)
             commandsQueue.clear()
             prepareToReconnect()
             reconnectionManager?.onDisconnected()

packages/ios-client/Sources/FishjamClient/FishjamClientListener.swift

@@ -7,9 +7,9 @@ public protocol FishjamClientListener: ReconnectionManagerListener {
     func onSocketClose(code: UInt16, reason: String)
 
     /**
-     * Emitted when occurs an error in the websocket connection
+     * Emitted when an error occurs in the websocket connection
      */
-    func onSocketError()
+    func onSocketError(_ errorMessage: String?)
 
     /**
      * Emitted when authentication fails

packages/react-native-client/ios/RNFishjamClient.swift

@@ -866,10 +866,8 @@ class RNFishjamClient: FishjamClientListener {
         peerStatus = .idle
     }
 
-    func onSocketError() {
-        if let connectPromise = connectPromise {
-            connectPromise.reject("E_MEMBRANE_CONNECT", "Failed to connect: socket error")
-        }
+    func onSocketError(_ errorMessage: String? = nil) {
+        connectPromise?.reject("E_MEMBRANE_CONNECT", "Failed to connect: socket error\(errorMessage.map { " - \($0)" } ?? "")")
         connectPromise = nil
         peerStatus = .error
     }

packages/react-native-client/src/RNFishjamClientModule.ts

@@ -1,15 +1,18 @@
 import { PermissionResponse, requireNativeModule } from 'expo-modules-core';
 
 import type { NativeModule } from 'expo-modules-core/types';
-import type { ConnectionConfig } from './common/client';
 import type { RTCStats } from './debug/stats/types';
 import type { OnAudioDeviceEvent } from './hooks/useAudioSettings';
 import type {
   Camera,
   CameraConfigInternal,
   CurrentCameraChangedType,
 } from './hooks/useCamera';
-import type { PeerStatus, ReconnectionStatus } from './hooks/useConnection';
+import type {
+  PeerStatus,
+  ReconnectionStatus,
+  ConnectionConfig,
+} from './hooks/useConnection';
 import type { ForegroundServiceConfig } from './hooks/useForegroundService';
 import type { Peer } from './hooks/usePeers';
 import type { ScreenShareOptionsInternal } from './hooks/useScreenShare';

packages/react-native-client/src/common/client.ts

@@ -1,10 +1,4 @@
 import { useCallback } from 'react';
-import {
-  ConnectionConfig,
-  joinRoom as joinRoomClient,
-  leaveRoom as leaveRoomClient,
-} from '../common/client';
-
 import RNFishjamClientModule, {
   ReceivableEvents,
 } from '../RNFishjamClientModule';
@@ -79,6 +73,42 @@ export type JoinRoomConfig<
     }
 );
 
+export type ConnectionConfig = {
+  /**
+   * Configuration for automatic reconnection
+   * sdk uses a linear backoff algorithm, that is the formula
+   * for the delay of the nth attempt is
+   * n * delayMs + initialDelayMs
+   *
+   * Pass 0 for maxAttempts to disable automatic reconnection
+   */
+  reconnectConfig?: {
+    maxAttempts?: number;
+    initialDelayMs?: number;
+    delayMs?: number;
+  };
+};
+
+async function joinRoomClient<
+  PeerMetadata extends GenericMetadata = GenericMetadata,
+>(
+  url: string,
+  peerToken: string,
+  peerMetadata?: PeerMetadata,
+  config?: ConnectionConfig,
+) {
+  await RNFishjamClientModule.joinRoom(
+    url,
+    peerToken,
+    peerMetadata ?? {},
+    config ?? {},
+  );
+}
+
+async function leaveRoomClient() {
+  await RNFishjamClientModule.leaveRoom();
+}
+
 /**
  * Connect/leave room. And get connection status.
  * @group Hooks

packages/react-native-client/src/hooks/useConnection.ts

@@ -9,18 +9,10 @@ export type {
   Brand,
   RoomType,
 } from './types';
-export type { ConnectionConfig } from './common/client';
 // #endregion
 
 // #region methods
 export { updatePeerMetadata } from './common/metadata';
-export {
-  /** @deprecated */
-  joinRoom,
-  /** @deprecated */
-  leaveRoom,
-} from './common/client';
-// #endregion
 
 // #region components
 export type { VideoPreviewViewProps } from './components/VideoPreviewView';
@@ -78,6 +70,7 @@ export type {
   JoinRoomConfig,
   ReconnectionStatus,
   PeerStatus,
+  ConnectionConfig,
 } from './hooks/useConnection';
 export type { AppScreenShareData } from './hooks/useAppScreenShare';
 export type { useLivestreamViewerResult } from './hooks/useLivestreamViewer';