@capgo/capacitor-screen-recorder 8.3.7 → 8.3.9

package/README.md

@@ -45,7 +45,7 @@ npx cap sync
 
 ## IOS
 
-add NSPhotoLibraryUsageDescription in your info.plist
+add NSPhotoLibraryAddUsageDescription in your info.plist
 
 ## Android
 increase project's minSdk version to 23, it's required by the dependency HBRecorder

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.7";
+    private final String pluginVersion = "8.3.9";
 
     private CapgoScrCast videoRecorder;
     private CapgoScrCast audioRecorder;

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.7"
+    private let pluginVersion: String = "8.3.9"
     public let identifier = "ScreenRecorderPlugin"
     public let jsName = "ScreenRecorder"
     public let pluginMethods: [CAPPluginMethod] = [

package/ios/Sources/ScreenRecorderPlugin/Wyler.swift

@@ -15,6 +15,7 @@ import UIKit
 public enum ScreenRecorderError: Error {
     case notAvailable
     case photoLibraryAccessNotGranted
+    case alreadyRecording
 }
 
 public enum VideoContainerFormat {
@@ -51,6 +52,7 @@ public enum VideoContainerFormat {
 
 public final class ScreenRecorder {
     private var videoOutputURL: URL?
+    private var didCreateOutputFile = false
     private var videoWriter: AVAssetWriter?
     private var videoWriterInput: AVAssetWriterInput?
     private var micAudioWriterInput: AVAssetWriterInput?
@@ -58,6 +60,7 @@ public final class ScreenRecorder {
     private var saveToCameraRoll = false
     private var recordAudio = false
     private var videoFormat: VideoContainerFormat = .mp4
+    private var isRecording = false
     let recorder = RPScreenRecorder.shared()
 
     public func startRecording(to outputURL: URL? = nil,
@@ -66,6 +69,11 @@ public final class ScreenRecorder {
                                recordAudio: Bool = false,
                                videoFormat: VideoContainerFormat = .mp4,
                                handler: @escaping (Error?) -> Void) {
+        guard !isRecording else {
+            return handler(ScreenRecorderError.alreadyRecording)
+        }
+        isRecording = true
+
         self.saveToCameraRoll = saveToCameraRoll
         self.recordAudio = recordAudio
         self.videoFormat = videoFormat
@@ -73,11 +81,16 @@ public final class ScreenRecorder {
 
         recorder.isMicrophoneEnabled = recordAudio
 
+        var attemptOutputURL: URL?
+        var attemptDidCreate = false
+
         do {
             if recordAudio {
                 try configureAudioSession()
             }
             try createVideoWriter(in: outputURL)
+            attemptOutputURL = self.videoOutputURL
+            attemptDidCreate = self.didCreateOutputFile
             addVideoWriterInput(size: size)
             if recordAudio {
                 self.micAudioWriterInput = createAndAddAudioInput()
@@ -85,6 +98,12 @@ public final class ScreenRecorder {
             }
             startCapture(handler: handler)
         } catch let err {
+            isRecording = false
+            if let cleanupURL = attemptOutputURL {
+                self.deleteOutputFileIfNeeded(outputURL: cleanupURL, didCreate: attemptDidCreate)
+            } else if self.didCreateOutputFile, let cleanupURL = self.videoOutputURL {
+                self.deleteOutputFileIfNeeded(outputURL: cleanupURL, didCreate: true)
+            }
             handler(err)
         }
     }
@@ -94,6 +113,8 @@ public final class ScreenRecorder {
         videoWriterInput = nil
         micAudioWriterInput = nil
         appAudioWriterInput = nil
+        videoOutputURL = nil
+        didCreateOutputFile = false
     }
 
     private func configureAudioSession() throws {
@@ -106,12 +127,14 @@ public final class ScreenRecorder {
         let newVideoOutputURL: URL
 
         if let passedVideoOutput = outputURL {
+            self.didCreateOutputFile = false
             self.videoOutputURL = passedVideoOutput
             newVideoOutputURL = passedVideoOutput
         } else {
             let documentsPath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0] as NSString
-            let fileName = "WylerNewVideo.\(videoFormat.fileExtension)"
+            let fileName = "WylerNewVideo-\(UUID().uuidString).\(videoFormat.fileExtension)"
             newVideoOutputURL = URL(fileURLWithPath: documentsPath.appendingPathComponent(fileName))
+            self.didCreateOutputFile = true
             self.videoOutputURL = newVideoOutputURL
         }
 
@@ -148,13 +171,26 @@ public final class ScreenRecorder {
     }
 
     private func startCapture(handler: @escaping (Error?) -> Void) {
+        let outputURL = self.videoOutputURL
+        let didCreate = self.didCreateOutputFile
+
         guard recorder.isAvailable else {
+            self.deleteOutputFileIfNeeded(outputURL: outputURL, didCreate: didCreate)
+            self.isRecording = false
             return handler(ScreenRecorderError.notAvailable)
         }
         var sent = false
         recorder.startCapture(handler: { (sampleBuffer, sampleType, passedError) in
             if let passedError = passedError {
+                self.videoWriterInput?.markAsFinished()
+                self.micAudioWriterInput?.markAsFinished()
+                self.appAudioWriterInput?.markAsFinished()
+                if self.videoWriter?.status == .writing {
+                    self.videoWriter?.cancelWriting()
+                }
+                self.deleteOutputFileIfNeeded(outputURL: outputURL, didCreate: didCreate)
                 if !sent {
+                    self.isRecording = false
                     handler(passedError)
                     sent = true
                 }
@@ -202,8 +238,23 @@ public final class ScreenRecorder {
 
     public func stoprecording(handler: @escaping (Error?) -> Void) {
         recorder.stopCapture(handler: { error in
+            let outputURL = self.videoOutputURL
+            let didCreate = self.didCreateOutputFile
+            let shouldSaveToCameraRoll = self.saveToCameraRoll
+            let complete: (Error?) -> Void = { stopError in
+                self.isRecording = false
+                handler(stopError)
+            }
+
             if let error = error {
-                handler(error)
+                self.videoWriterInput?.markAsFinished()
+                self.micAudioWriterInput?.markAsFinished()
+                self.appAudioWriterInput?.markAsFinished()
+                if self.videoWriter?.status == .writing {
+                    self.videoWriter?.cancelWriting()
+                }
+                self.deleteOutputFileIfNeeded(outputURL: outputURL, didCreate: didCreate)
+                complete(error)
                 return
             }
 
@@ -212,61 +263,108 @@ public final class ScreenRecorder {
             self.appAudioWriterInput?.markAsFinished()
 
             guard let writer = self.videoWriter else {
-                handler(nil)
+                complete(nil)
                 return
             }
 
             if writer.status == .writing {
                 writer.finishWriting {
                     if let finishError = writer.error {
-                        handler(finishError)
+                        self.deleteOutputFileIfNeeded(outputURL: outputURL, didCreate: didCreate)
+                        complete(finishError)
                         return
                     }
-                    if self.saveToCameraRoll {
-                        self.saveVideoToCameraRollAfterAuthorized(handler: handler)
+                    if shouldSaveToCameraRoll {
+                        self.saveVideoToCameraRollAfterAuthorized(outputURL: outputURL,
+                                                                    didCreate: didCreate,
+                                                                    handler: complete)
                     } else {
-                        handler(nil)
+                        self.deleteOutputFileIfNeeded(outputURL: outputURL, didCreate: didCreate)
+                        complete(nil)
                     }
                 }
             } else if writer.status == .failed {
-                handler(writer.error)
+                self.deleteOutputFileIfNeeded(outputURL: outputURL, didCreate: didCreate)
+                complete(writer.error)
             } else {
-                if self.saveToCameraRoll {
-                    self.saveVideoToCameraRollAfterAuthorized(handler: handler)
+                if shouldSaveToCameraRoll {
+                    self.saveVideoToCameraRollAfterAuthorized(outputURL: outputURL,
+                                                                didCreate: didCreate,
+                                                                handler: complete)
                 } else {
-                    handler(nil)
+                    self.deleteOutputFileIfNeeded(outputURL: outputURL, didCreate: didCreate)
+                    complete(nil)
                 }
             }
         })
     }
 
-    private func saveVideoToCameraRollAfterAuthorized(handler: @escaping (Error?) -> Void) {
-        if PHPhotoLibrary.authorizationStatus() == .authorized {
-            self.saveVideoToCameraRoll(handler: handler)
+    private func canSaveToPhotoLibrary(_ status: PHAuthorizationStatus) -> Bool {
+        switch status {
+        case .authorized, .limited:
+            return true
+        default:
+            return false
+        }
+    }
+
+    private func saveVideoToCameraRollAfterAuthorized(outputURL: URL? = nil,
+                                                      didCreate: Bool? = nil,
+                                                      handler: @escaping (Error?) -> Void) {
+        let capturedOutputURL = outputURL ?? self.videoOutputURL
+        let capturedDidCreate = didCreate ?? self.didCreateOutputFile
+        let status = PHPhotoLibrary.authorizationStatus(for: .addOnly)
+
+        if canSaveToPhotoLibrary(status) {
+            self.saveVideoToCameraRoll(outputURL: capturedOutputURL,
+                                       didCreate: capturedDidCreate,
+                                       handler: handler)
         } else {
-            PHPhotoLibrary.requestAuthorization({ (status) in
-                if status == .authorized {
-                    self.saveVideoToCameraRoll(handler: handler)
+            PHPhotoLibrary.requestAuthorization(for: .addOnly, handler: { (status) in
+                if self.canSaveToPhotoLibrary(status) {
+                    self.saveVideoToCameraRoll(outputURL: capturedOutputURL,
+                                               didCreate: capturedDidCreate,
+                                               handler: handler)
                 } else {
+                    self.deleteOutputFileIfNeeded(outputURL: capturedOutputURL, didCreate: capturedDidCreate)
                     handler(ScreenRecorderError.photoLibraryAccessNotGranted)
                 }
             })
         }
     }
 
-    private func saveVideoToCameraRoll(handler: @escaping (Error?) -> Void) {
-        guard let videoOutputURL = self.videoOutputURL else {
+    private func saveVideoToCameraRoll(outputURL: URL?,
+                                       didCreate: Bool,
+                                       handler: @escaping (Error?) -> Void) {
+        guard let videoOutputURL = outputURL else {
             return handler(nil)
         }
 
         PHPhotoLibrary.shared().performChanges({
             PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: videoOutputURL)
-        }, completionHandler: { _, error in
+        }, completionHandler: { success, error in
             if let error = error {
+                self.deleteOutputFileIfNeeded(outputURL: videoOutputURL, didCreate: didCreate)
                 handler(error)
-            } else {
+            } else if success {
+                self.deleteOutputFileIfNeeded(outputURL: videoOutputURL, didCreate: didCreate)
                 handler(nil)
+            } else {
+                self.deleteOutputFileIfNeeded(outputURL: videoOutputURL, didCreate: didCreate)
+                handler(NSError(domain: "ScreenRecorder",
+                                code: -1,
+                                userInfo: [NSLocalizedDescriptionKey: "Failed to save video to photo library"]))
             }
         })
     }
+
+    private func deleteOutputFileIfNeeded(outputURL: URL? = nil, didCreate: Bool? = nil) {
+        let shouldDelete = didCreate ?? didCreateOutputFile
+        guard shouldDelete, let fileURL = outputURL ?? self.videoOutputURL else { return }
+        do {
+            try FileManager.default.removeItem(at: fileURL)
+        } catch {
+            debugPrint("Failed to delete recording file \(fileURL): \(error)")
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-screen-recorder",
-  "version": "8.3.7",
+  "version": "8.3.9",
   "description": "Record device's screen",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -66,7 +66,7 @@
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
-    "@types/node": "^24.10.1",
+    "@types/node": "^26.0.0",
     "eslint": "^8.57.1",
     "eslint-plugin-import": "^2.31.0",
     "prettier": "^3.6.2",