@capgo/capacitor-screen-recorder 8.3.6 → 8.3.7

package/android/build.gradle

@@ -45,9 +45,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_21
         targetCompatibility JavaVersion.VERSION_21
     }
-    testOptions {
-        unitTests.returnDefaultValues = true
-    }
 }
 
 kotlin {

package/android/src/main/java/ee/forgr/plugin/screenrecorder/CapgoRecordingCoordinator.kt

@@ -0,0 +1,23 @@
+package ee.forgr.plugin.screenrecorder
+
+internal object CapgoRecordingCoordinator {
+    private val lock = Any()
+
+    @Volatile
+    private var active = false
+
+    fun tryAcquire(): Boolean = synchronized(lock) {
+        if (active) {
+            false
+        } else {
+            active = true
+            true
+        }
+    }
+
+    fun release() {
+        synchronized(lock) {
+            active = false
+        }
+    }
+}

package/android/src/main/java/ee/forgr/plugin/screenrecorder/CapgoScrCast.kt

@@ -40,6 +40,7 @@ class CapgoScrCast private constructor(
     private var serviceBinder: CapgoRecorderService? = null
     private var outputFile: File? = null
     private var startListener: StartListener? = null
+    private var receiverRegistered = false
 
     private val metrics by lazy {
         DisplayMetrics().apply { activity.windowManager.defaultDisplay.getMetrics(this) }
@@ -88,8 +89,7 @@ class CapgoScrCast private constructor(
             if (report?.areAllPermissionsGranted() == true) {
                 startProjection.launch(Unit)
             } else {
-                startListener?.onFailed(SecurityException("Required permissions were not granted"))
-                startListener = null
+                notifyStartFailed(SecurityException("Required permissions were not granted"))
             }
         }
 
@@ -103,12 +103,12 @@ class CapgoScrCast private constructor(
 
     private val startProjection = activity.registerForActivityResult(CapgoRecordScreen()) { result ->
         if (result.resultCode != Activity.RESULT_OK) {
-            startListener?.onFailed(IllegalStateException("Screen capture permission denied"))
+            notifyStartFailed(IllegalStateException("Screen capture permission denied"))
             return@registerForActivityResult
         }
         val file = resolveOutputFile()
         if (file == null) {
-            startListener?.onFailed(IllegalStateException("Could not resolve screen recording output file"))
+            notifyStartFailed(IllegalStateException("Could not resolve screen recording output file"))
             return@registerForActivityResult
         }
         startService(result, file)
@@ -126,7 +126,10 @@ class CapgoScrCast private constructor(
         )
     }
 
-    fun record(listener: StartListener) {
+    fun record(listener: StartListener): Boolean {
+        if (!CapgoRecordingCoordinator.tryAcquire()) {
+            return false
+        }
         startListener = listener
         val permissions = buildList {
             add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
@@ -139,6 +142,13 @@ class CapgoScrCast private constructor(
             .withPermissions(permissions)
             .withListener(permissionListener)
             .check()
+        return true
+    }
+
+    private fun notifyStartFailed(error: Throwable) {
+        startListener?.onFailed(error)
+        startListener = null
+        CapgoRecordingCoordinator.release()
     }
 
     fun stopRecording() {
@@ -167,25 +177,45 @@ class CapgoScrCast private constructor(
         }
         recordingSession = session
 
-        broadcaster.registerReceiver(
-            recordingStateHandler,
-            IntentFilter().apply {
-                addAction(STATE_IDLE)
-                addAction(STATE_RECORDING)
-            },
-        )
+        try {
+            broadcaster.registerReceiver(
+                recordingStateHandler,
+                IntentFilter().apply {
+                    addAction(STATE_IDLE)
+                    addAction(STATE_RECORDING)
+                },
+            )
+            receiverRegistered = true
+            activity.bindService(session, connection, Context.BIND_AUTO_CREATE)
+            activity.startService(session)
+        } catch (error: Exception) {
+            Log.e("CapgoScreenRecorder", "Failed to start screen recording service", error)
+            rollbackFailedStart(error)
+        }
+    }
 
-        activity.bindService(session, connection, Context.BIND_AUTO_CREATE)
-        activity.startService(session)
+    private fun rollbackFailedStart(error: Throwable) {
+        unregisterRecordingReceiver()
+        recordingSession = null
+        outputFile = null
+        notifyStartFailed(error)
     }
 
-    private fun cleanupSession() {
-        startListener = null
+    private fun unregisterRecordingReceiver() {
+        if (!receiverRegistered) {
+            return
+        }
         try {
             broadcaster.unregisterReceiver(recordingStateHandler)
         } catch (ignored: Exception) {
             Log.d("CapgoScreenRecorder", "Receiver already unregistered", ignored)
         }
+        receiverRegistered = false
+    }
+
+    private fun cleanupSession() {
+        startListener = null
+        unregisterRecordingReceiver()
 
         try {
             activity.unbindService(connection)
@@ -202,6 +232,7 @@ class CapgoScrCast private constructor(
             }
         }
         outputFile = null
+        CapgoRecordingCoordinator.release()
     }
 
     interface StartListener {

package/android/src/main/java/ee/forgr/plugin/screenrecorder/MediaRecorderPrepare.kt

@@ -1,13 +1,16 @@
 package ee.forgr.plugin.screenrecorder
 
 import android.media.MediaRecorder
+import java.io.IOException
 
 internal object MediaRecorderPrepare {
     fun tryPrepare(recorder: MediaRecorder?): Throwable? {
         return try {
             recorder?.prepare()
             null
-        } catch (error: Throwable) {
+        } catch (error: IOException) {
+            error
+        } catch (error: RuntimeException) {
             error
         }
     }

package/android/src/main/java/ee/forgr/plugin/screenrecorder/ScreenRecorderPlugin.java

@@ -10,7 +10,7 @@ import dev.bmcreations.scrcast.config.Options;
 @CapacitorPlugin(name = "ScreenRecorder")
 public class ScreenRecorderPlugin extends Plugin {
 
-    private final String pluginVersion = "8.3.6";
+    private final String pluginVersion = "8.3.7";
 
     private CapgoScrCast videoRecorder;
     private CapgoScrCast audioRecorder;
@@ -27,33 +27,48 @@ public class ScreenRecorderPlugin extends Plugin {
 
     @PluginMethod
     public void start(final PluginCall call) {
-        final boolean recordAudio = call.getBoolean("recordAudio", false);
-        final String format = call.getString("format");
-        recordingWithAudio = recordAudio;
+        boolean keptAlive = false;
+        try {
+            final boolean recordAudio = call.getBoolean("recordAudio", false);
+            final String format = call.getString("format");
+            recordingWithAudio = recordAudio;
 
-        final CapgoScrCast recorder = recordAudio ? audioRecorder : videoRecorder;
-        final Options configuredOptions = VideoFormatResolver.INSTANCE.applyTo(recorder.getOptions(), format);
-        recorder.updateOptions(configuredOptions);
-        recorder.updateVideoFormat(format);
+            final CapgoScrCast recorder = recordAudio ? audioRecorder : videoRecorder;
+            final Options configuredOptions = VideoFormatResolver.INSTANCE.applyTo(recorder.getOptions(), format);
+            recorder.updateOptions(configuredOptions);
+            recorder.updateVideoFormat(format);
 
-        call.setKeepAlive(true);
-        recorder.record(
-            new CapgoScrCast.StartListener() {
-                @Override
-                public void onStarted() {
-                    call.resolve();
-                    call.release(bridge);
-                }
+            call.setKeepAlive(true);
+            keptAlive = true;
+            final boolean started = recorder.record(
+                new CapgoScrCast.StartListener() {
+                    @Override
+                    public void onStarted() {
+                        call.resolve();
+                        call.release(bridge);
+                    }
 
-                @Override
-                public void onFailed(final Throwable error) {
-                    recordingWithAudio = false;
-                    final Exception exception = error instanceof Exception ? (Exception) error : new Exception(error);
-                    call.reject("Could not start screen recording", exception);
-                    call.release(bridge);
+                    @Override
+                    public void onFailed(final Throwable error) {
+                        recordingWithAudio = false;
+                        final Exception exception = error instanceof Exception ? (Exception) error : new Exception(error);
+                        call.reject("Could not start screen recording", exception);
+                        call.release(bridge);
+                    }
                 }
+            );
+            if (!started) {
+                recordingWithAudio = false;
+                call.reject("Could not start screen recording", new IllegalStateException("A screen recording is already in progress"));
+                call.release(bridge);
+            }
+        } catch (final Exception e) {
+            recordingWithAudio = false;
+            call.reject("Could not start screen recording", e);
+            if (keptAlive) {
+                call.release(bridge);
             }
-        );
+        }
     }
 
     @PluginMethod

package/android/src/main/java/ee/forgr/plugin/screenrecorder/service/CapgoRecorderService.kt

@@ -128,10 +128,12 @@ class CapgoRecorderService : Service() {
         mediaRecorder = createMediaRecorder().apply {
             if (recordAudio) {
                 setAudioSource(AudioSource.MIC)
-                setAudioEncoder(AudioEncoder.AAC)
             }
             setVideoSource(VideoSource.SURFACE)
             setOutputFormat(options.storage.outputFormat)
+            if (recordAudio) {
+                setAudioEncoder(AudioEncoder.AAC)
+            }
             setOutputFile(outputFile)
             with(options.video) {
                 setVideoSize(width, height)

package/ios/Sources/ScreenRecorderPlugin/ScreenRecorderPlugin.swift

@@ -7,7 +7,7 @@ import Capacitor
  */
 @objc(ScreenRecorderPlugin)
 public class ScreenRecorderPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.3.6"
+    private let pluginVersion: String = "8.3.7"
     public let identifier = "ScreenRecorderPlugin"
     public let jsName = "ScreenRecorder"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-screen-recorder",
-  "version": "8.3.6",
+  "version": "8.3.7",
   "description": "Record device's screen",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",