From f64e386562bf0ac3d6a1f2530f3dff124968ba48 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 31 May 2023 19:26:40 +0200 Subject: [PATCH] added logging --- BroadcastUploadExtension/Debug.xcconfig | 1 + BroadcastUploadExtension/Release.xcconfig | 1 + .../Sources/SampleHandler.swift | 4 +++- .../Sources/SampleUploader.swift | 8 +++++--- .../Sources/SocketConnection.swift | 18 ++++++++++-------- .../BroadcastUploadExtension.entitlements | 4 ---- Podfile | 4 ++++ 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/BroadcastUploadExtension/Debug.xcconfig b/BroadcastUploadExtension/Debug.xcconfig index 61e55f3e6..c8a3620c1 100644 --- a/BroadcastUploadExtension/Debug.xcconfig +++ b/BroadcastUploadExtension/Debug.xcconfig @@ -18,3 +18,4 @@ // https://help.apple.com/xcode/#/dev745c5c974 #include "Common.xcconfig" +#include "Pods/Target Support Files/Pods-RiotPods-BroadcastUploadExtension/Pods-RiotPods-BroadcastUploadExtension.debug.xcconfig" diff --git a/BroadcastUploadExtension/Release.xcconfig b/BroadcastUploadExtension/Release.xcconfig index 2eb172d0b..7a39b7de0 100644 --- a/BroadcastUploadExtension/Release.xcconfig +++ b/BroadcastUploadExtension/Release.xcconfig @@ -18,6 +18,7 @@ // https://help.apple.com/xcode/#/dev745c5c974 #include "Common.xcconfig" +#include "Pods/Target Support Files/Pods-RiotPods-BroadcastUploadExtension/Pods-RiotPods-BroadcastUploadExtension.release.xcconfig" PROVISIONING_PROFILE = $(BROADCAST_UPLOAD_EXTENSION_PROVISIONING_PROFILE) PROVISIONING_PROFILE_SPECIFIER = $(BROADCAST_UPLOAD_EXTENSION_PROVISIONING_PROFILE_SPECIFIER) diff --git a/BroadcastUploadExtension/Sources/SampleHandler.swift b/BroadcastUploadExtension/Sources/SampleHandler.swift index b9eb04f14..ff7be89e9 100644 --- a/BroadcastUploadExtension/Sources/SampleHandler.swift +++ b/BroadcastUploadExtension/Sources/SampleHandler.swift @@ -7,6 +7,8 @@ import ReplayKit +import MatrixSDK + private enum Constants { // the App Group ID value that the app and the broadcast extension targets are setup with. It differs for each app. static let appGroupIdentifier = BuildSettings.applicationGroupIdentifier @@ -74,7 +76,7 @@ private extension SampleHandler { func setupConnection() { clientConnection?.didClose = { [weak self] error in - print("client connection did close \(String(describing: error))") + MXLog.error("client connection did close", context: error) if let error = error { self?.finishBroadcastWithError(error) diff --git a/BroadcastUploadExtension/Sources/SampleUploader.swift b/BroadcastUploadExtension/Sources/SampleUploader.swift index 084deaed0..170a4f8c9 100644 --- a/BroadcastUploadExtension/Sources/SampleUploader.swift +++ b/BroadcastUploadExtension/Sources/SampleUploader.swift @@ -9,6 +9,8 @@ import Foundation import ReplayKit +import MatrixSDK + private enum Constants { static let bufferMaxLength = 10240 } @@ -90,7 +92,7 @@ private extension SampleUploader { byteIndex = 0 } } else { - print("writeBufferToStream failure") + MXLog.error("writeBufferToStream failure") } return true @@ -98,7 +100,7 @@ private extension SampleUploader { func prepare(sample buffer: CMSampleBuffer) -> Data? { guard let imageBuffer = CMSampleBufferGetImageBuffer(buffer) else { - print("image buffer not available") + MXLog.error("image buffer not available") return nil } @@ -115,7 +117,7 @@ private extension SampleUploader { CVPixelBufferUnlockBaseAddress(imageBuffer, .readOnly) guard let messageData = bufferData else { - print("corrupted image buffer") + MXLog.error("corrupted image buffer") return nil } diff --git a/BroadcastUploadExtension/Sources/SocketConnection.swift b/BroadcastUploadExtension/Sources/SocketConnection.swift index 4d178251c..14c2d9f2e 100644 --- a/BroadcastUploadExtension/Sources/SocketConnection.swift +++ b/BroadcastUploadExtension/Sources/SocketConnection.swift @@ -8,6 +8,8 @@ import Foundation +import MatrixSDK + class SocketConnection: NSObject { var didOpen: (() -> Void)? var didClose: ((Error?) -> Void)? @@ -28,16 +30,16 @@ class SocketConnection: NSObject { socketHandle = Darwin.socket(AF_UNIX, SOCK_STREAM, 0) guard socketHandle != -1 else { - print("failure: create socket") + MXLog.error("failure: create socket") return nil } } func open() -> Bool { - print("open socket connection") + MXLog.info("open socket connection") guard FileManager.default.fileExists(atPath: filePath) else { - print("failure: socket file missing") + MXLog.error("failure: socket file missing") return false } @@ -80,7 +82,7 @@ extension SocketConnection: StreamDelegate { func stream(_ aStream: Stream, handle eventCode: Stream.Event) { switch eventCode { case .openCompleted: - print("client stream open completed") + MXLog.info("client stream open completed") if aStream == outputStream { didOpen?() } @@ -89,7 +91,7 @@ extension SocketConnection: StreamDelegate { var buffer: UInt8 = 0 let numberOfBytesRead = inputStream?.read(&buffer, maxLength: 1) if numberOfBytesRead == 0 && aStream.streamStatus == .atEnd { - print("server socket closed") + MXLog.info("server socket closed") close() notifyDidClose(error: nil) } @@ -99,7 +101,7 @@ extension SocketConnection: StreamDelegate { streamHasSpaceAvailable?() } case .errorOccurred: - print("client stream error occured: \(String(describing: aStream.streamError))") + MXLog.error("client stream error occured", context: aStream.streamError) close() notifyDidClose(error: aStream.streamError) @@ -114,7 +116,7 @@ private extension SocketConnection { func setupAddress() -> Bool { var addr = sockaddr_un() guard filePath.count < MemoryLayout.size(ofValue: addr.sun_path) else { - print("failure: fd path is too long") + MXLog.error("failure: fd path is too long") return false } @@ -140,7 +142,7 @@ private extension SocketConnection { } guard status == noErr else { - print("failure: \(status)") + MXLog.error("connect socket failure", context: status) return false } diff --git a/BroadcastUploadExtension/SupportingFiles/BroadcastUploadExtension.entitlements b/BroadcastUploadExtension/SupportingFiles/BroadcastUploadExtension.entitlements index ced577af8..f1123e644 100644 --- a/BroadcastUploadExtension/SupportingFiles/BroadcastUploadExtension.entitlements +++ b/BroadcastUploadExtension/SupportingFiles/BroadcastUploadExtension.entitlements @@ -6,9 +6,5 @@ $(APPLICATION_GROUP_IDENTIFIER) - keychain-access-groups - - $(KEYCHAIN_ACCESS_GROUP) - diff --git a/Podfile b/Podfile index 52ce26306..f2230ef61 100644 --- a/Podfile +++ b/Podfile @@ -127,6 +127,10 @@ abstract_target 'RiotPods' do import_MatrixKit_pods end + target "BroadcastUploadExtension" do + import_MatrixSDK + end + end post_install do |installer|