@fishjam-cloud/react-native-client 0.3.0 → 0.4.1

package/ios/Utils/PermissionUtils.swift

@@ -0,0 +1,16 @@
+import AVFoundation
+
+class PermissionUtils {
+    static func requestCameraPermission() async -> Bool { await requestAccessIfNeeded(for: .video) }
+    static func requestMicrophonePermission() async -> Bool { await requestAccessIfNeeded(for: .audio) }
+
+    private static func requestAccessIfNeeded(for mediaType: AVMediaType) async -> Bool {
+        let status = AVCaptureDevice.authorizationStatus(for: mediaType)
+
+        return if status == .notDetermined {
+            await AVCaptureDevice.requestAccess(for: mediaType)
+        } else {
+            status == .authorized
+        }
+    }
+}

package/ios/VideoPreviewView.swift

@@ -1,13 +1,9 @@
 import ExpoModulesCore
 import FishjamCloudClient
 
-protocol OnLocalCameraTrackChangedListener: AnyObject {
-    func onLocalCameraTrackChanged()
-}
-
-class VideoPreviewView: ExpoView, OnLocalCameraTrackChangedListener {
+class VideoPreviewView: ExpoView, LocalCameraTrackChangedListener {
     var videoView: VideoView? = nil
-    private var localVideoTrack: LocalVideoTrack? = nil
+    private var localVideoTrack: LocalCameraTrack? = nil
 
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
@@ -30,8 +26,8 @@ class VideoPreviewView: ExpoView, OnLocalCameraTrackChangedListener {
 
             self.localVideoTrack =
                 tracks.first(where: { (key, track) in
-                    track is LocalVideoTrack
-                })?.value as? LocalVideoTrack
+                    track is LocalCameraTrack
+                })?.value as? LocalCameraTrack
             self.localVideoTrack?.start()
             self.videoView?.track = self.localVideoTrack
         }
@@ -40,10 +36,10 @@ class VideoPreviewView: ExpoView, OnLocalCameraTrackChangedListener {
     override func willMove(toSuperview newSuperview: UIView?) {
         super.willMove(toSuperview: newSuperview)
         if newSuperview == nil {
-            RNFishjamClient.localCameraTrackListeners.removeAll(where: { $0 === self })
+            RNFishjamClient.localCameraTracksChangedListenersManager.remove(self)
             localVideoTrack?.stop()
         } else {
-            RNFishjamClient.localCameraTrackListeners.append(self)
+            RNFishjamClient.localCameraTracksChangedListenersManager.add(self)
             trySetLocalCameraTrack()
         }
     }

package/ios/VideoRendererView.swift

@@ -2,17 +2,13 @@ import Combine
 import ExpoModulesCore
 import FishjamCloudClient
 
-protocol OnTrackUpdateListener {
-    func onTrackUpdate()
-}
-
-class VideoRendererView: ExpoView, OnTrackUpdateListener {
+class VideoRendererView: ExpoView, TrackUpdateListener {
     var videoView: VideoView? = nil
     var cancellableEndpoints: Cancellable? = nil
 
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
-        RNFishjamClient.onTracksUpdateListeners.append(self)
+        RNFishjamClient.tracksUpdateListenersManager.add(self)
         videoView = VideoView()
         videoView?.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         videoView?.clipsToBounds = true
@@ -20,12 +16,7 @@ class VideoRendererView: ExpoView, OnTrackUpdateListener {
     }
 
     deinit {
-        RNFishjamClient.onTracksUpdateListeners.removeAll(where: {
-            if let view = $0 as? VideoRendererView {
-                return view === self
-            }
-            return false
-        })
+        RNFishjamClient.tracksUpdateListenersManager.remove(self)
     }
 
     override func willMove(toSuperview newSuperview: UIView?) {
@@ -41,7 +32,7 @@ class VideoRendererView: ExpoView, OnTrackUpdateListener {
             if self.superview != nil {
                 for endpoint in RNFishjamClient.getLocalAndRemoteEndpoints() {
                     if let track = endpoint.tracks[self.trackId] as? VideoTrack {
-                        if let track = track as? LocalVideoTrack {
+                        if let track = track as? LocalCameraTrack {
                             self.mirrorVideo = track.isFrontCamera
                         }
                         self.videoView?.track = track
@@ -52,7 +43,7 @@ class VideoRendererView: ExpoView, OnTrackUpdateListener {
         }
     }
 
-    func onTrackUpdate() {
+    func onTracksUpdate() {
         updateVideoTrack()
     }
 

package/ios/managers/LocalCameraTracksChangedListenersManager.swift

@@ -0,0 +1,23 @@
+import Foundation
+
+protocol LocalCameraTrackChangedListener: AnyObject {
+    func onLocalCameraTrackChanged()
+}
+
+class LocalCameraTracksChangedListenersManager {
+    private var listeners: [LocalCameraTrackChangedListener] = []
+
+    func add(_ listener: LocalCameraTrackChangedListener) {
+        listeners.append(listener)
+    }
+
+    func remove(_ listener: LocalCameraTrackChangedListener) {
+        listeners.removeAll { $0 === listener }
+    }
+
+    func notifyListeners() {
+        for listener in listeners {
+            listener.onLocalCameraTrackChanged()
+        }
+    }
+}

package/ios/managers/TracksUpdateListenersManager.swift

@@ -0,0 +1,21 @@
+protocol TrackUpdateListener: AnyObject {
+    func onTracksUpdate()
+}
+
+class TracksUpdateListenersManager {
+    private var listeners: [TrackUpdateListener] = []
+
+    func add(_ listener: TrackUpdateListener) {
+        listeners.append(listener)
+    }
+
+    func remove(_ listener: TrackUpdateListener) {
+        listeners.removeAll { $0 === listener }
+    }
+
+    func notifyListeners() {
+        for listener in listeners {
+            listener.onTracksUpdate()
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/react-native-client",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "A React Native client for Fishjam Cloud",
   "author": "Fishjam Cloud Team",
   "license": "Apache-2.0",
@@ -45,10 +45,10 @@
   },
   "devDependencies": {
     "@testing-library/react": "^15.0.7",
-    "@types/lodash": "^4.17.9",
+    "@types/lodash": "^4.17.10",
     "@types/phoenix": "^1.6.5",
     "@types/promise-fs": "^2.1.2",
-    "@types/react": "^18.3.9",
+    "@types/react": "^18.3.11",
     "expo": "^51.0.32",
     "expo-module-scripts": "^3.5.2",
     "expo-modules-core": "^1.12.24",
@@ -61,10 +61,10 @@
     "react": "^18.2.0",
     "react-dom": "^18.3.1",
     "react-native": "^0.75.2",
-    "ts-proto": "^2.1.0",
-    "typedoc": "^0.26.6",
+    "ts-proto": "^2.2.3",
+    "typedoc": "^0.26.8",
     "typedoc-plugin-mark-react-functional-components": "^0.2.2",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.3"
   },
   "peerDependencies": {
     "expo": "*",
@@ -84,7 +84,7 @@
     "debug",
     "android/build.gradle",
     "android/src/**",
-    "ios/*.swift",
+    "ios/**/*.swift",
     "ios/RNFishjamClient.podspec",
     "plugin/build/**",
     "plugin/broadcastExtensionFiles/**",

package/plugin/build/withFishjamAndroid.js

@@ -9,7 +9,7 @@ const withFishjamForegroundService = (config) => {
         mainApplication.service = mainApplication.service || [];
         const newService = {
             $: {
-                'android:name': 'io.fishjam.reactnative.FishjamForegroundService',
+                'android:name': 'io.fishjam.reactnative.foregroundService.FishjamForegroundService',
                 'android:foregroundServiceType': 'camera|microphone|mediaProjection',
             },
         };

package/build/utils/foregroundService.d.ts

@@ -1,32 +0,0 @@
-import { ForegroundServiceOptions } from '../types';
-/**
-    * Launches a foreground service on Android.
-    * Does nothing on other platforms.
-    *
-    * @remarks
-    * You must have have the following permissions enabled before calling this function:
-    * @example
-    ```
-     "android.permission.FOREGROUND_SERVICE"
-     "android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION"
-     "android.permission.FOREGROUND_SERVICE_CAMERA"
-     "android.permission.FOREGROUND_SERVICE_MICROPHONE"
-     "android.permission.POST_NOTIFICATIONS"
-    *```
-    * as well as FishjamForegroundService in your AndroidManifest:
-    * @example
-    ```
-      <service android:name="io.fishjam.reactnative.FishjamForegroundService" android:foregroundServiceType="camera|microphone|mediaProjection"/>
-    ```
-    * @category Screenshare
-    */
-export declare const startForegroundService: (options: ForegroundServiceOptions) => void;
-/**
- * Stops previously launched Android foreground service.
- * @see {@link startForegroundService} for further information.
- *
- * Does nothing on other platforms.
- * @category Screenshare
- */
-export declare const stopForegroundService: () => void;
-//# sourceMappingURL=foregroundService.d.ts.map

package/build/utils/foregroundService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"foregroundService.d.ts","sourceRoot":"","sources":["../../src/utils/foregroundService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD;;;;;;;;;;;;;;;;;;;;MAoBM;AACN,eAAO,MAAM,sBAAsB,YAAa,wBAAwB,SAKvE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,YAKjC,CAAC"}

package/build/utils/foregroundService.js

@@ -1,43 +0,0 @@
-import { Platform } from 'react-native';
-import RNFishjamClientModule from '../RNFishjamClientModule';
-/**
-    * Launches a foreground service on Android.
-    * Does nothing on other platforms.
-    *
-    * @remarks
-    * You must have have the following permissions enabled before calling this function:
-    * @example
-    ```
-     "android.permission.FOREGROUND_SERVICE"
-     "android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION"
-     "android.permission.FOREGROUND_SERVICE_CAMERA"
-     "android.permission.FOREGROUND_SERVICE_MICROPHONE"
-     "android.permission.POST_NOTIFICATIONS"
-    *```
-    * as well as FishjamForegroundService in your AndroidManifest:
-    * @example
-    ```
-      <service android:name="io.fishjam.reactnative.FishjamForegroundService" android:foregroundServiceType="camera|microphone|mediaProjection"/>
-    ```
-    * @category Screenshare
-    */
-export const startForegroundService = (options) => {
-    if (Platform.OS !== 'android') {
-        return;
-    }
-    RNFishjamClientModule.startForegroundService(options);
-};
-/**
- * Stops previously launched Android foreground service.
- * @see {@link startForegroundService} for further information.
- *
- * Does nothing on other platforms.
- * @category Screenshare
- */
-export const stopForegroundService = () => {
-    if (Platform.OS !== 'android') {
-        return;
-    }
-    RNFishjamClientModule.stopForegroundService();
-};
-//# sourceMappingURL=foregroundService.js.map

package/build/utils/foregroundService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"foregroundService.js","sourceRoot":"","sources":["../../src/utils/foregroundService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,qBAAqB,MAAM,0BAA0B,CAAC;AAG7D;;;;;;;;;;;;;;;;;;;;MAoBM;AACN,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAiC,EAAE,EAAE;IAC1E,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO;IACT,CAAC;IACD,qBAAqB,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO;IACT,CAAC;IACD,qBAAqB,CAAC,qBAAqB,EAAE,CAAC;AAChD,CAAC,CAAC","sourcesContent":["import { Platform } from 'react-native';\nimport RNFishjamClientModule from '../RNFishjamClientModule';\nimport { ForegroundServiceOptions } from '../types';\n\n/**\n    * Launches a foreground service on Android.\n    * Does nothing on other platforms.\n    * \n    * @remarks\n    * You must have have the following permissions enabled before calling this function:\n    * @example\n    ```\n     \"android.permission.FOREGROUND_SERVICE\"\n     \"android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION\"\n     \"android.permission.FOREGROUND_SERVICE_CAMERA\"\n     \"android.permission.FOREGROUND_SERVICE_MICROPHONE\"\n     \"android.permission.POST_NOTIFICATIONS\"\n    *```\n    * as well as FishjamForegroundService in your AndroidManifest:\n    * @example\n    ```\n      <service android:name=\"io.fishjam.reactnative.FishjamForegroundService\" android:foregroundServiceType=\"camera|microphone|mediaProjection\"/>\n    ```\n    * @category Screenshare\n    */\nexport const startForegroundService = (options: ForegroundServiceOptions) => {\n  if (Platform.OS !== 'android') {\n    return;\n  }\n  RNFishjamClientModule.startForegroundService(options);\n};\n\n/**\n * Stops previously launched Android foreground service.\n * @see {@link startForegroundService} for further information.\n *\n * Does nothing on other platforms.\n * @category Screenshare\n */\nexport const stopForegroundService = () => {\n  if (Platform.OS !== 'android') {\n    return;\n  }\n  RNFishjamClientModule.stopForegroundService();\n};\n"]}