Rewrite with ScreenCaptureKit (#80)

.gitignore

@@ -4,3 +4,8 @@ xcuserdata
 /*.xcodeproj
 /screen-recording.mp4
 /screen-recording-ios.mp4
+
+
+# SwiftLint Remote Config Cache
+.swiftlint/RemoteConfigCache
+.swiftpm

.spi.yml

@@ -0,0 +1,4 @@
+version: 1
+builder:
+  configs:
+    - documentation_targets: ['Aperture']

.swiftlint.yml

@@ -1,196 +1,3 @@
-only_rules:
-  - anyobject_protocol
-  - array_init
-  - block_based_kvo
-  - class_delegate_protocol
-  - closing_brace
-  - closure_end_indentation
-  - closure_parameter_position
-  - closure_spacing
-  - collection_alignment
-  - colon
-  - comma
-  - compiler_protocol_init
-  - computed_accessors_order
-  - conditional_returns_on_newline
-  - contains_over_filter_count
-  - contains_over_filter_is_empty
-  - contains_over_first_not_nil
-  - contains_over_range_nil_comparison
-  - control_statement
-  - custom_rules
-  - deployment_target
-  - discarded_notification_center_observer
-  - discouraged_assert
-  - discouraged_direct_init
-  - discouraged_none_name
-  - discouraged_object_literal
-  - discouraged_optional_boolean
-  - discouraged_optional_collection
-  - duplicate_enum_cases
-  - duplicate_imports
-  - duplicated_key_in_dictionary_literal
-  - dynamic_inline
-  - empty_collection_literal
-  - empty_count
-  - empty_enum_arguments
-  - empty_parameters
-  - empty_parentheses_with_trailing_closure
-  - empty_string
-  - empty_xctest_method
-  - enum_case_associated_values_count
-  - explicit_init
-  - fallthrough
-  - fatal_error_message
-  - first_where
-  - flatmap_over_map_reduce
-  - for_where
-  - generic_type_name
-  - ibinspectable_in_extension
-  - identical_operands
-  - identifier_name
-  - implicit_getter
-  - implicit_return
-  - inclusive_language
-  - inert_defer
-  - is_disjoint
-  - joined_default_parameter
-  - last_where
-  - leading_whitespace
-  - legacy_cggeometry_functions
-  - legacy_constant
-  - legacy_constructor
-  - legacy_hashing
-  - legacy_multiple
-  - legacy_nsgeometry_functions
-  - legacy_random
-  - literal_expression_end_indentation
-  - lower_acl_than_parent
-  - mark
-  - modifier_order
-  - multiline_arguments
-  - multiline_function_chains
-  - multiline_literal_brackets
-  - multiline_parameters
-  - multiline_parameters_brackets
-  - nimble_operator
-  - no_extension_access_modifier
-  - no_fallthrough_only
-  - no_space_in_method_call
-  - notification_center_detachment
-  - nsobject_prefer_isequal
-  - number_separator
-  - opening_brace
-  - operator_usage_whitespace
-  - operator_whitespace
-  - orphaned_doc_comment
-  - overridden_super_call
-  - prefer_self_type_over_type_of_self
-  - prefer_zero_over_explicit_init
-  - private_action
-  - private_outlet
-  - private_subject
-  - private_unit_test
-  - prohibited_super_call
-  - protocol_property_accessors_order
-  - reduce_boolean
-  - reduce_into
-  - redundant_discardable_let
-  - redundant_nil_coalescing
-  - redundant_objc_attribute
-  - redundant_optional_initialization
-  - redundant_set_access_control
-  - redundant_string_enum_value
-  - redundant_type_annotation
-  - redundant_void_return
-  - required_enum_case
-  - return_arrow_whitespace
-  - shorthand_operator
-  - sorted_first_last
-  - statement_position
-  - static_operator
-  - strong_iboutlet
-  - superfluous_disable_command
-  - switch_case_alignment
-  - switch_case_on_newline
-  - syntactic_sugar
-  - todo
-  - test_case_accessibility
-  - toggle_bool
-  - trailing_closure
-  - trailing_comma
-  - trailing_newline
-  - trailing_semicolon
-  - trailing_whitespace
-  - unavailable_function
-  - unneeded_break_in_switch
-  - unneeded_parentheses_in_closure_argument
-  - unowned_variable_capture
-  - untyped_error_in_catch
-  - unused_capture_list
-  - unused_closure_parameter
-  - unused_control_flow_label
-  - unused_enumerated
-  - unused_optional_binding
-  - unused_setter_value
-  - valid_ibinspectable
-  - vertical_parameter_alignment
-  - vertical_parameter_alignment_on_call
-  - vertical_whitespace_closing_braces
-  - vertical_whitespace_opening_braces
-  - void_return
-  - xct_specific_matcher
-  - xctfail_message
-  - yoda_condition
-analyzer_rules:
-  - capture_variable
-  - unused_declaration
-  - unused_import
-number_separator:
-  minimum_length: 5
-identifier_name:
-  max_length:
-    warning: 100
-    error: 100
-  min_length:
-    warning: 2
-    error: 2
-  validates_start_with_lowercase: false
-  allowed_symbols:
-    - '_'
-  excluded:
-    - 'x'
-    - 'y'
-    - 'z'
-    - 'a'
-    - 'b'
-    - 'x1'
-    - 'x2'
-    - 'y1'
-    - 'y2'
-    - 'z2'
+parent_config: https://raw.githubusercontent.com/sindresorhus/swiftlint-config/main/.swiftlint.yml
 deployment_target:
-  macOS_deployment_target: '10.13'
-custom_rules:
-  no_nsrect:
-    regex: '\bNSRect\b'
-    match_kinds: typeidentifier
-    message: 'Use CGRect instead of NSRect'
-  no_nssize:
-    regex: '\bNSSize\b'
-    match_kinds: typeidentifier
-    message: 'Use CGSize instead of NSSize'
-  no_nspoint:
-    regex: '\bNSPoint\b'
-    match_kinds: typeidentifier
-    message: 'Use CGPoint instead of NSPoint'
-  no_cgfloat:
-    regex: '\bCGFloat\b'
-    match_kinds: typeidentifier
-    message: 'Use Double instead of CGFloat'
-  no_cgfloat2:
-    regex: '\bCGFloat\('
-    message: 'Use Double instead of CGFloat'
-  final_class:
-    regex: '^class [a-zA-Z\d]+[^{]+\{'
-    message: 'Classes should be marked as final whenever possible. If you actually need it to be subclassable, just add `// swiftlint:disable:next final_class`.'
+  macOS_deployment_target: '13'

Example-iOS/Package.swift

@@ -1,10 +1,10 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(
 	name: "Example",
 	platforms: [
-		.macOS(.v10_13)
+		.macOS(.v13)
 	],
 	dependencies: [
 		.package(path: "..")

Example-iOS/Sources/Example/main.swift

@@ -2,44 +2,41 @@ import Foundation
 import AVFoundation
 import Aperture
 
-func delay(seconds: TimeInterval, closure: @escaping () -> Void) {
-	DispatchQueue.main.asyncAfter(deadline: .now() + seconds, execute: closure)
-}
-
-guard
-	let deviceInfo = Aperture.Devices.iOS().first,
-	let device = AVCaptureDevice(uniqueID: deviceInfo.id)
-else {
-	print("Could not find any iOS devices")
-	exit(1)
-}
-
-let url = URL(fileURLWithPath: "../screen-recording-ios.mp4")
-let aperture = try! Aperture(destination: url, iosDevice: device)
-
-aperture.onFinish = {
-	switch $0 {
-	case .success(let warning):
-		print("Finished recording:", url.path)
+let url = URL(filePath: "../screen-recording-ios.mp4")
+do {
+	let recorder = Aperture.Recorder()
 
-		if let warning = warning {
-			print("Warning:", warning.localizedDescription)
-		}
+	let devices = Aperture.Devices.iOS()
 
-		exit(0)
-	case .failure(let error):
-		print(error)
+	guard let device = devices.first else {
+		print("Could not find any iOS devices")
 		exit(1)
 	}
-}
-
-aperture.start()
-
-print("Recording the screen of “\(deviceInfo.name)” for 5 seconds")
 
-delay(seconds: 5) {
-	aperture.stop()
+	print("Available iOS devices:", devices.map(\.name).joined(separator: ", "))
+
+	try await recorder.start(
+		target: .externalDevice,
+		options: Aperture.RecordingOptions(
+			destination: url,
+			targetID: device.id,
+			losslessAudio: true,
+			recordSystemAudio: true,
+			microphoneDeviceID: Aperture.Devices.audio().first?.id
+		)
+	)
+	print("Recording screen for 5 seconds")
+
+	try await Task.sleep(for: .seconds(5))
+	print("Stopping recording")
+
+	try await recorder.stop()
+	print("Finished recording:", url.path)
+	exit(0)
+} catch let error as Aperture.Error {
+	print("Aperture Error: \(error.localizedDescription)")
+	exit(1)
+} catch {
+	print("Unknown Error: \(error.localizedDescription)")
+	exit(1)
 }
-
-setbuf(__stdoutp, nil)
-RunLoop.current.run()

Example/Package.swift

@@ -1,10 +1,10 @@
-// swift-tools-version:5.5
+// swift-tools-version:6.0.2
 import PackageDescription
 
 let package = Package(
 	name: "Example",
 	platforms: [
-		.macOS(.v10_13)
+		.macOS(.v13)
 	],
 	dependencies: [
 		.package(path: "..")

Example/Sources/Example/main.swift

@@ -2,37 +2,49 @@ import Foundation
 import AVFoundation
 import Aperture
 
-func delay(seconds: TimeInterval, closure: @escaping () -> Void) {
-	DispatchQueue.main.asyncAfter(deadline: .now() + seconds, execute: closure)
-}
-
-let url = URL(fileURLWithPath: "../screen-recording.mp4")
-let aperture = try! Aperture(destination: url)
+let url = URL(filePath: "../screen-recording.mp4")
+do {
+	let recorder = Aperture.Recorder()
 
-aperture.onFinish = {
-	switch $0 {
-	case .success(let warning):
-		print("Finished recording:", url.path)
+	let screens = try await Aperture.Devices.screen()
 
-		if let warning = warning {
-			print("Warning:", warning.localizedDescription)
-		}
-
-		exit(0)
-	case .failure(let error):
-		print(error)
+	guard let screen = screens.first else {
+		print("Could not find any screens")
 		exit(1)
 	}
-}
 
-aperture.start()
-
-print("Available screens:", Aperture.Devices.screen().map(\.name).joined(separator: ", "))
-print("Recording screen for 5 seconds")
-
-delay(seconds: 5) {
-	aperture.stop()
+	print("Available screens:", screens.map(\.name).joined(separator: ", "))
+
+	try await recorder.start(
+		target: .screen,
+		options: Aperture.RecordingOptions(
+			destination: url,
+			targetID: screen.id,
+			losslessAudio: true,
+			recordSystemAudio: true,
+			microphoneDeviceID: "BuiltInMicrophoneDevice" //Aperture.Devices.audio().first?.id
+		)
+	)
+	print("Recording screen for 5 seconds")
+
+	try await Task.sleep(for: .seconds(5))
+	print("Pausing for 5 seconds")
+	try recorder.pause()
+
+	try await Task.sleep(for: .seconds(5))
+	print("Resuming for 5 seconds")
+	try await recorder.resume()
+
+	try await Task.sleep(for: .seconds(5))
+	print("Stopping recording")
+
+	try await recorder.stop()
+	print("Finished recording:", url.path)
+	exit(0)
+} catch let error as Aperture.Error {
+	print("Aperture Error: \(error.localizedDescription)")
+	exit(1)
+} catch {
+	print("Unknown Error: \(error.localizedDescription)")
+	exit(1)
 }
-
-setbuf(__stdoutp, nil)
-RunLoop.current.run()