Merge pull request #110 from SimformSolutionsPvtLtd/fix/UNT-T29402_promise_leaking_and_bug_fixes

mukesh-simform · web-flow · commit c836c68ec7b0 · 2024-10-08T18:09:12.000+05:30
fix(UNT-T29402): promise leaking and bug fixes
diff --git a/android/src/main/java/com/audiowaveform/AudioPlayer.kt b/android/src/main/java/com/audiowaveform/AudioPlayer.kt
@@ -145,15 +145,14 @@ class AudioPlayer(
         }
     }
 
-    fun stop(promise: Promise) {
+    fun stop() {
         stopListening()
         if (playerListener != null) {
             player.removeListener(playerListener!!)
         }
         isPlayerPrepared = false
         player.stop()
         player.release()
-        promise.resolve(true)
     }
 
     fun pause(promise: Promise) {
@@ -180,16 +179,8 @@ class AudioPlayer(
         }
     }
 
-    fun setPlaybackSpeed(speed: Float?, promise: Promise) {
-        try {
-            // Call the custom function to validate and set the playback speed
-            val success = validateAndSetPlaybackSpeed(player, speed)
-            promise.resolve(success)  // Resolve the promise with success
-
-        } catch (e: Exception) {
-            // Handle any exceptions and reject the promise
-            promise.reject("setPlaybackSpeed Error", e.toString())
-        }
+    fun setPlaybackSpeed(speed: Float?): Boolean {
+        return validateAndSetPlaybackSpeed(player, speed)
     }
 
     private fun startListening(promise: Promise) {
diff --git a/android/src/main/java/com/audiowaveform/AudioWaveformModule.kt b/android/src/main/java/com/audiowaveform/AudioWaveformModule.kt
@@ -172,8 +172,9 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
     fun stopPlayer(obj: ReadableMap, promise: Promise) {
         val key = obj.getString(Constants.playerKey)
         if (key != null) {
-            audioPlayers[key]?.stop(promise)
+            audioPlayers[key]?.stop()
             audioPlayers[key] = null // Release the player after stopping it
+            promise.resolve(true)
         } else {
             promise.reject("stopPlayer Error", "Player key can't be null")
         }
@@ -191,19 +192,24 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
 
     @ReactMethod
     fun seekToPlayer(obj: ReadableMap, promise: Promise) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val progress = obj.getInt(Constants.progress)
-            val key = obj.getString(Constants.playerKey)
-            if (key != null) {
-                audioPlayers[key]?.seekToPosition(progress.toLong(), promise)
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val progress = obj.getInt(Constants.progress)
+                val key = obj.getString(Constants.playerKey)
+                if (key != null) {
+                    audioPlayers[key]?.seekToPosition(progress.toLong(), promise)
+                } else {
+                    promise.reject("seekTo Error", "Player key can't be null")
+                }
             } else {
-                promise.reject("seekTo Error", "Player key can't be null")
+                Log.e(
+                    Constants.LOG_TAG,
+                    "Minimum android O is required for seekTo function to works"
+                )
+                promise.resolve(false)
             }
-        } else {
-            Log.e(
-                Constants.LOG_TAG,
-                "Minimum android O is required for seekTo function to works"
-            )
+        } catch(e: Exception) {
+            promise.reject("seekTo Error", e.toString())
         }
     }
 
@@ -245,25 +251,31 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
     @ReactMethod
     fun stopAllPlayers(promise: Promise) {
         for ((key, _) in audioPlayers) {
-            audioPlayers[key]?.stop(promise)
+            audioPlayers[key]?.stop()
             audioPlayers[key] = null
         }
+        promise.resolve(true)
     }
 
     @ReactMethod
     fun setPlaybackSpeed(obj: ReadableMap, promise: Promise) {
-        // If the key doesn't exist or if the value is null or undefined, set default speed to 1.0
-        val speed = if (!obj.hasKey(Constants.speed) || obj.isNull(Constants.speed)) {
-            1.0f // Set default speed to 1.0 if null, undefined, or missing
-        } else {
-            obj.getDouble(Constants.speed).toFloat()
-        }
+        try {
+            // If the key doesn't exist or if the value is null or undefined, set default speed to 1.0
+            val speed = if (!obj.hasKey(Constants.speed) || obj.isNull(Constants.speed)) {
+                1.0f // Set default speed to 1.0 if null, undefined, or missing
+            } else {
+                obj.getDouble(Constants.speed).toFloat()
+            }
 
-        val key = obj.getString(Constants.playerKey)
-        if (key != null) {
-            audioPlayers[key]?.setPlaybackSpeed(speed, promise)
-        } else {
-            promise.reject("setPlaybackSpeed Error", "Player key can't be null")
+            val key = obj.getString(Constants.playerKey)
+            if (key != null) {
+                val status = audioPlayers[key]?.setPlaybackSpeed(speed)
+                promise.resolve(status ?: false)
+            } else {
+                promise.reject("setPlaybackSpeed Error", "Player key can't be null")
+            }
+        } catch(e: Exception) {
+            promise.reject("setPlaybackSpeed Error", e.toString())
         }
     }
 
diff --git a/ios/AudioPlayer.swift b/ios/AudioPlayer.swift
@@ -108,12 +108,11 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
     result(true)
   }
   
-  func stopPlayer(result: @escaping RCTPromiseResolveBlock) {
+  func stopPlayer() {
     stopListening()
     player?.stop()
     player = nil
     timer = nil
-    result(true)
   }
   
   func getDuration(_ type: DurationType, _ result: @escaping RCTPromiseResolveBlock) {
@@ -153,13 +152,13 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         }
     }
     
-    func setPlaybackSpeed(_ speed: Float, _ result: @escaping RCTPromiseResolveBlock) {
+    func setPlaybackSpeed(_ speed: Float) -> Bool {
         if let player = player {
             player.enableRate = true
             player.rate = Float(speed)
-            result(true)
+            return true
         } else {
-            result(false)
+            return false
         }
     }
   
diff --git a/ios/AudioWaveform.swift b/ios/AudioWaveform.swift
@@ -184,8 +184,9 @@ class AudioWaveform: RCTEventEmitter {
   @objc func stopPlayer(_ args: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: RCTPromiseRejectBlock) -> Void {
     let key = args?[Constants.playerKey] as? String
     if(key != nil){
-      audioPlayers[key!]?.stopPlayer(result: resolve)
+      audioPlayers[key!]?.stopPlayer()
       audioPlayers[key!] = nil // Release the player after stopping it
+      resolve(true)
     } else {
       reject(Constants.audioWaveforms, "Can not stop player, Player key is null", NSError())
     }
@@ -229,7 +230,7 @@ class AudioWaveform: RCTEventEmitter {
   
   @objc func stopAllPlayers(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: RCTPromiseRejectBlock) -> Void {
     for (playerKey,_) in audioPlayers{
-      audioPlayers[playerKey]?.stopPlayer(result: resolve)
+      audioPlayers[playerKey]?.stopPlayer()
       audioPlayers[playerKey] = nil
     }
     resolve(true)
@@ -259,7 +260,8 @@ class AudioWaveform: RCTEventEmitter {
         let speed = (args?[Constants.speed] as? NSNumber)?.floatValue ?? 1.0
         
         if(key != nil){
-          audioPlayers[key!]?.setPlaybackSpeed(speed, resolve)
+          let status =  audioPlayers[key!]?.setPlaybackSpeed(speed)
+          resolve(status)
         } else {
           reject(Constants.audioWaveforms, "Can not pause player, Player key is null", NSError())
         }
diff --git a/src/components/Waveform/Waveform.tsx b/src/components/Waveform/Waveform.tsx
@@ -55,7 +55,7 @@ export const Waveform = forwardRef<IWaveformRef, IWaveform>((props, ref) => {
     onPlayerStateChange,
     onRecorderStateChange,
     onPanStateChange = () => {},
-    onError,
+    onError = () => {},
     onCurrentProgressChange = () => {},
     candleHeightScale = 3,
     onChangeWaveformLoadState,
@@ -448,7 +448,6 @@ export const Waveform = forwardRef<IWaveformRef, IWaveform>((props, ref) => {
         if (data.finishType === FinishMode.stop) {
           setPlayerState(PlayerState.stopped);
           setCurrentProgress(0);
-          await preparePlayerForPath();
         }
       }
     });

Original file line number	Diff line number	Diff line change
`@@ -145,15 +145,14 @@ class AudioPlayer(`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`148`		`- fun stop(promise: Promise) {`
	`148`	`+ fun stop() {`
`149`	`149`	`stopListening()`
`150`	`150`	`if (playerListener != null) {`
`151`	`151`	`player.removeListener(playerListener!!)`
`152`	`152`	`}`
`153`	`153`	`isPlayerPrepared = false`
`154`	`154`	`player.stop()`
`155`	`155`	`player.release()`
`156`		`- promise.resolve(true)`
`157`	`156`	`}`
`158`	`157`
`159`	`158`	`fun pause(promise: Promise) {`
`@@ -180,16 +179,8 @@ class AudioPlayer(`
`180`	`179`	`}`
`181`	`180`	`}`
`182`	`181`
`183`		`- fun setPlaybackSpeed(speed: Float?, promise: Promise) {`
`184`		`- try {`
`185`		`- // Call the custom function to validate and set the playback speed`
`186`		`- val success = validateAndSetPlaybackSpeed(player, speed)`
`187`		`- promise.resolve(success) // Resolve the promise with success`
`188`		`-`
`189`		`- } catch (e: Exception) {`
`190`		`- // Handle any exceptions and reject the promise`
`191`		`- promise.reject("setPlaybackSpeed Error", e.toString())`
`192`		`- }`
	`182`	`+ fun setPlaybackSpeed(speed: Float?): Boolean {`
	`183`	`+ return validateAndSetPlaybackSpeed(player, speed)`
`193`	`184`	`}`
`194`	`185`
`195`	`186`	`private fun startListening(promise: Promise) {`
Original file line number	Diff line number	Diff line change
`@@ -108,12 +108,11 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {`
`108`	`108`	`result(true)`
`109`	`109`	`}`
`110`	`110`
`111`		`- func stopPlayer(result: @escaping RCTPromiseResolveBlock) {`
	`111`	`+ func stopPlayer() {`
`112`	`112`	`stopListening()`
`113`	`113`	`player?.stop()`
`114`	`114`	`player = nil`
`115`	`115`	`timer = nil`
`116`		`- result(true)`
`117`	`116`	`}`
`118`	`117`
`119`	`118`	`func getDuration(_ type: DurationType, _ result: @escaping RCTPromiseResolveBlock) {`
`@@ -153,13 +152,13 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {`
`153`	`152`	`}`
`154`	`153`	`}`
`155`	`154`
`156`		`- func setPlaybackSpeed(_ speed: Float, _ result: @escaping RCTPromiseResolveBlock) {`
	`155`	`+ func setPlaybackSpeed(_ speed: Float) -> Bool {`
`157`	`156`	`if let player = player {`
`158`	`157`	`player.enableRate = true`
`159`	`158`	`player.rate = Float(speed)`
`160`		`- result(true)`
	`159`	`+ return true`
`161`	`160`	`} else {`
`162`		`- result(false)`
	`161`	`+ return false`
`163`	`162`	`}`
`164`	`163`	`}`
`165`	`164`