Merge pull request #161 from SimformSolutionsPvtLtd/develop

Release v2.1.4

Author: mukesh-simform

README.md

@@ -191,6 +191,33 @@ resumePlayer(): Promise<boolean>
 
 It returns a boolean indicating whether playback is resumed again.
 
+#### stopAllPlayers()
+
+```ts
+stopAllPlayers(): Promise<boolean>
+```
+
+Stops all the players at once and frees their native resources. Useful on unmount!
+It returns a boolean indicating that all players were stopped.
+
+#### stopAllWaveFormExtractors()
+
+```ts
+stopAllWaveFormExtractors(): Promise<boolean>
+```
+
+Stops all the extractors used to build the audio waveform and frees its native resource. Useful on unmount!
+It returns a boolean indicating that all extractors were stopped.
+
+#### stopPlayersAndExtractors()
+
+```ts
+stopPlayersAndExtractors(): Promise<[boolean, boolean]>
+```
+
+Combined the `stopAllWaveFormExtractors` and `stopAllPlayers` in one call to free up the maximum possible resources. Very useful on unmount!
+It returns an array of two booleans indicating if all players and all waveform extractors were stopped.
+
 #### For Live mode
 
 #### startRecord()

android/src/main/java/com/audiowaveform/AudioPlayer.kt

@@ -223,6 +223,7 @@ class AudioPlayer(
             if (requestAudioFocus()) {
                 player.playWhenReady = true
                 player.play()
+                emitCurrentDuration()
                 promise.resolve(true)
                 startListening(promise)}
             else {
@@ -235,6 +236,7 @@ class AudioPlayer(
 
     fun stop() {
         stopListening()
+        emitCurrentDuration()
         if (playerListener != null) {
             player.removeListener(playerListener!!)
         }
@@ -248,6 +250,7 @@ class AudioPlayer(
         try {
             stopListening()
             player.pause()
+            emitCurrentDuration()
             abandonAudioFocus()
             promise?.resolve(true)
         } catch (e: Exception) {
@@ -273,17 +276,22 @@ class AudioPlayer(
         return validateAndSetPlaybackSpeed(player, speed)
     }
 
+
+    fun emitCurrentDuration() {
+        val currentPosition = player.currentPosition.toString()
+        val args: WritableMap = Arguments.createMap()
+        args.putString(Constants.currentDuration, currentPosition)
+        args.putString(Constants.playerKey, key)
+        if (isComponentMounted) {
+            appContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)?.emit("onCurrentDuration", args)
+        }
+    }
+
     private fun startListening(promise: Promise) {
         try {
             audioPlaybackListener = object : CountDownTimer(player.duration, UpdateFrequency.Low.value) {
                 override fun onTick(millisUntilFinished: Long) {
-                    val currentPosition = player.currentPosition.toString()
-                    val args: WritableMap = Arguments.createMap()
-                    args.putString(Constants.currentDuration, currentPosition)
-                    args.putString(Constants.playerKey, key)
-                    if (isComponentMounted) {
-                        appContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)?.emit("onCurrentDuration", args)
-                    }
+                    emitCurrentDuration()
                 }
                 override fun onFinish() {}
             }.start()

android/src/main/java/com/audiowaveform/AudioWaveformModule.kt

@@ -17,6 +17,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import java.io.File
 import java.io.IOException
 import java.text.SimpleDateFormat
+import java.util.Collections
 import java.util.Date
 import java.util.Locale
 
@@ -234,11 +235,28 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
 
     @ReactMethod
     fun stopAllPlayers(promise: Promise) {
-        for ((key, _) in audioPlayers) {
-            audioPlayers[key]?.stop()
-            audioPlayers[key] = null
+        try {
+            audioPlayers.values.forEach{
+                player -> player?.stop()
+            }
+            audioPlayers.clear()
+            promise.resolve(true)
+        } catch (err: Exception) {
+            promise.reject("stopAllPlayers Error", "Error while stopping all players")
+        }
+    }
+
+    @ReactMethod
+    fun stopAllWaveFormExtractors(promise: Promise) {
+        try {
+            extractors.values.forEach{
+                extractor -> extractor?.forceStop()
+            }
+            extractors.clear()
+            promise.resolve(true)
+        } catch (err: Exception) {
+            promise.reject("stopAllExtractors Error", "Error while stopping all extractors")
         }
-        promise.resolve(true)
     }
 
     @ReactMethod
@@ -305,6 +323,9 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
                 override fun onResolve(value: MutableList<MutableList<Float>>) {
                     promise.resolve(Arguments.fromList(value))
                 }
+                override fun onForceStop() {
+                    promise.resolve(Arguments.fromList(mutableListOf(emptyList<Float>())))
+                }
             }
         )
         extractors[playerKey]?.startDecode();

android/src/main/java/com/audiowaveform/WaveformExtractor.kt

@@ -12,7 +12,6 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import java.nio.ByteBuffer
-import java.util.concurrent.CountDownLatch
 import kotlin.math.pow
 import kotlin.math.sqrt
 import java.io.File
@@ -32,7 +31,6 @@ class WaveformExtractor(
 
     @Volatile
     private var inProgress = false
-    private val finishCount = CountDownLatch(1)
     private var inputEof = false
     private var sampleRate = 0
     private var channels = 1
@@ -122,7 +120,6 @@ class WaveformExtractor(
                             Constants.LOG_TAG + " " + e.message,
                             "An error is thrown while decoding the audio file"
                         )
-                        finishCount.countDown()
                     }
 
                     override fun onOutputBufferAvailable(
@@ -256,13 +253,18 @@ class WaveformExtractor(
         }
     }
 
+    fun forceStop() {
+        stop()
+        // When stopped by outside we must notify to resolved the hanging promises
+        extractorCallBack.onForceStop()
+    }
+
     private fun stop() {
         if (!inProgress) return
         inProgress = false
         decoder?.stop()
         decoder?.release()
         extractor?.release()
-        finishCount.countDown()
     }
 }
 
@@ -272,4 +274,5 @@ interface ExtractorCallBack {
     fun onProgress(value: Float)
     fun onReject(error: String?, message: String?)
     fun onResolve(value: MutableList<MutableList<Float>>)
+    fun onForceStop()
 }

example/.gitignore

@@ -20,7 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-ios/.xcode.env.local
+**/.xcode.env.local
 ios/link-assets-manifest.json
 
 # Android/IntelliJ
@@ -33,6 +33,8 @@ local.properties
 *.hprof
 .cxx/
 android/link-assets-manifest.json
+*.keystore
+!debug.keystore
 
 # node.js
 #
@@ -63,5 +65,19 @@ buck-out/
 *.jsbundle
 
 # Ruby / CocoaPods
-/ios/Pods/
+**/Pods/
 /vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# testing
+/coverage
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

example/.node-version

@@ -3,5 +3,8 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.13'
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'

example/.ruby-version

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 
 /**
@@ -7,14 +8,14 @@ apply plugin: "com.facebook.react"
  */
 react {
     /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
+    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
+    // root = file("../../")
+    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
+    // reactNativeDir = file("../../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
+    // codegenDir = file("../../node_modules/@react-native/codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
+    // cliFile = file("../../node_modules/react-native/cli.js")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -48,6 +49,9 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -70,8 +74,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
-
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.audiowaveformexample"
     defaultConfig {
@@ -106,19 +110,10 @@ android {
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
-    implementation 'com.facebook.fresco:animated-gif:2.5.0'
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {
         implementation jscFlavor
     }
 }
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

example/Gemfile

@@ -2,12 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
+        tools:ignore="GoogleAppIndexingWarning"/>
 </manifest>