diff --git a/LibSession-Util b/LibSession-Util index 1d20f5e39..6a1ab5168 160000 --- a/LibSession-Util +++ b/LibSession-Util @@ -1 +1 @@ -Subproject commit 1d20f5e392ba55847a30431f196d638834a4feb0 +Subproject commit 6a1ab5168ff2cd2f967d804ea6e1130a939f2189 diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 684851464..9af165126 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -7706,7 +7706,7 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 484; + CURRENT_PROJECT_VERSION = 485; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -7784,7 +7784,7 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 484; + CURRENT_PROJECT_VERSION = 485; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; diff --git a/Session/Meta/AppDelegate.swift b/Session/Meta/AppDelegate.swift index 85fe1126b..5b615bc71 100644 --- a/Session/Meta/AppDelegate.swift +++ b/Session/Meta/AppDelegate.swift @@ -819,7 +819,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD public func stopPollers(shouldStopUserPoller: Bool = true) { if shouldStopUserPoller { - poller.stopAllPollers() + poller.stop() } ClosedGroupPoller.shared.stopAllPollers() diff --git a/SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift b/SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift index 408720b60..2a2408278 100644 --- a/SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift +++ b/SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift @@ -267,8 +267,8 @@ public extension Crypto.Generator { id: "messageServerHash", args: [swarmPubkey, namespace, data] ) { - var cSwarmPubkey: [CChar] = try swarmPubkey.cString(using: .utf8) ?? { throw LibSessionError.invalidCConversion }() - var cData: [CChar] = try data.base64EncodedString().cString(using: .utf8) ?? { throw LibSessionError.invalidCConversion }() + let cSwarmPubkey: [CChar] = try swarmPubkey.cString(using: .utf8) ?? { throw LibSessionError.invalidCConversion }() + let cData: [CChar] = try data.base64EncodedString().cString(using: .utf8) ?? { throw LibSessionError.invalidCConversion }() var cHash: [CChar] = [CChar](repeating: 0, count: 65) guard session_compute_message_hash(cSwarmPubkey, Int16(namespace.rawValue), cData, &cHash) else { diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift index d6e2caa31..c59049f64 100644 --- a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift +++ b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift @@ -30,7 +30,7 @@ public final class ClosedGroupPoller: Poller { // Fetch all closed groups (excluding any don't contain the current user as a // GroupMemeber as the user is no longer a member of those) dependencies.storage - .read { db in + .read { db -> Set in try ClosedGroup .select(.threadId) .joining( @@ -38,7 +38,7 @@ public final class ClosedGroupPoller: Poller { .filter(GroupMember.Columns.profileId == getUserHexEncodedPublicKey(db, using: dependencies)) ) .asRequest(of: String.self) - .fetchAll(db) + .fetchSet(db) } .defaulting(to: []) .forEach { [weak self] publicKey in diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift b/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift index 167b95649..205df13af 100644 --- a/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift +++ b/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPoller.swift @@ -253,14 +253,14 @@ extension OpenGroupAPI { .handleEvents( receiveOutput: { pollFailureCount, prunedIds in let pollEndTime: TimeInterval = dependencies.dateNow.timeIntervalSince1970 - Log.info("Open group polling to \(server) failed in \(.seconds(pollEndTime - pollStartTime), unit: .s) due to error: \(error). Setting failure count to \(pollFailureCount + 1).") + Log.error("Open group polling to \(server) failed in \(.seconds(pollEndTime - pollStartTime), unit: .s) due to error: \(error). Setting failure count to \(pollFailureCount + 1).") // Add a note to the logs that this happened if !prunedIds.isEmpty { let rooms: String = prunedIds .compactMap { $0.components(separatedBy: server).last } .joined(separator: ", ") - Log.info("Hidden open group failure count surpassed \(Poller.maxHiddenRoomFailureCount), removed hidden rooms \(rooms).") + Log.error("Hidden open group failure count surpassed \(Poller.maxHiddenRoomFailureCount), removed hidden rooms \(rooms).") } } ) diff --git a/SessionNotificationServiceExtension/NotificationServiceExtension.swift b/SessionNotificationServiceExtension/NotificationServiceExtension.swift index 00561de98..1edbd97aa 100644 --- a/SessionNotificationServiceExtension/NotificationServiceExtension.swift +++ b/SessionNotificationServiceExtension/NotificationServiceExtension.swift @@ -36,13 +36,11 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension // Abort if the main app is running guard !(UserDefaults.sharedLokiProject?[.isMainAppActive]).defaulting(to: false) else { - Log.info("didReceive called while main app running.") return self.completeSilenty(handledNotification: false, isMainAppAndActive: true) } guard let notificationContent = request.content.mutableCopy() as? UNMutableNotificationContent else { - Log.info("didReceive called with no content.") - return self.completeSilenty(handledNotification: false) + return self.completeSilenty(handledNotification: false, noContent: true) } Log.info("didReceive called.") @@ -366,7 +364,7 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension completeSilenty(handledNotification: false) } - private func completeSilenty(handledNotification: Bool, isMainAppAndActive: Bool = false) { + private func completeSilenty(handledNotification: Bool, isMainAppAndActive: Bool = false, noContent: Bool = false) { // Ensure we only run this once guard hasCompleted.mutate({ hasCompleted in @@ -387,7 +385,15 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension } let duration: CFTimeInterval = (CACurrentMediaTime() - startTime) - Log.info(handledNotification ? "Completed after handling notification in \(.seconds(duration), unit: .ms)." : "Completed silently after \(.seconds(duration), unit: .ms).") + let logMessage: String = { + switch (isMainAppAndActive, handledNotification, noContent) { + case (true, _, _): return "Called while main app running, ignoring after \(.seconds(duration), unit: .ms)." + case (_, _, true): return "Called with no content, ignoring after \(.seconds(duration), unit: .ms)." + case (_, true, _): return "Completed after handling notification in \(.seconds(duration), unit: .ms)." + default: return "Completed silently after \(.seconds(duration), unit: .ms)." + } + }() + Log.info(logMessage) Log.flush() self.contentHandler!(silentContent) diff --git a/SessionSnodeKit/LibSession/LibSession+Networking.swift b/SessionSnodeKit/LibSession/LibSession+Networking.swift index bc9bdbb81..5d90c0024 100644 --- a/SessionSnodeKit/LibSession/LibSession+Networking.swift +++ b/SessionSnodeKit/LibSession/LibSession+Networking.swift @@ -234,7 +234,7 @@ public extension LibSession { requestAndPathBuildTimeout: TimeInterval?, using dependencies: Dependencies ) -> AnyPublisher<(ResponseInfoType, Data?), Error> { - typealias Output = (success: Bool, timeout: Bool, statusCode: Int, data: Data?) + typealias Output = (success: Bool, timeout: Bool, statusCode: Int, headers: [String: String], data: Data?) return getOrCreateNetwork() .tryFlatMap { network in @@ -272,9 +272,11 @@ public extension LibSession { cSwarmPublicKey, Int64(floor(requestTimeout * 1000)), Int64(floor((requestAndPathBuildTimeout ?? 0) * 1000)), - { success, timeout, statusCode, dataPtr, dataLen, ctx in + { success, timeout, statusCode, cHeaders, cHeaderVals, headerLen, dataPtr, dataLen, ctx in + let headers: [String: String] = CallbackWrapper + .headers(cHeaders, cHeaderVals, headerLen) let data: Data? = dataPtr.map { Data(bytes: $0, count: dataLen) } - CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), data)) + CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), headers, data)) }, wrapper.unsafePointer() ) @@ -287,17 +289,19 @@ public extension LibSession { cPayloadBytes.count, Int64(floor(requestTimeout * 1000)), Int64(floor((requestAndPathBuildTimeout ?? 0) * 1000)), - { success, timeout, statusCode, dataPtr, dataLen, ctx in + { success, timeout, statusCode, cHeaders, cHeaderVals, headerLen, dataPtr, dataLen, ctx in + let headers: [String: String] = CallbackWrapper + .headers(cHeaders, cHeaderVals, headerLen) let data: Data? = dataPtr.map { Data(bytes: $0, count: dataLen) } - CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), data)) + CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), headers, data)) }, wrapper.unsafePointer() ) } } - .tryMap { success, timeout, statusCode, data -> (any ResponseInfoType, Data?) in - try throwErrorIfNeeded(success, timeout, statusCode, data) - return (Network.ResponseInfo(code: statusCode), data) + .tryMap { success, timeout, statusCode, headers, data -> (any ResponseInfoType, Data?) in + try throwErrorIfNeeded(success, timeout, statusCode, headers, data) + return (Network.ResponseInfo(code: statusCode, headers: headers), data) } } .eraseToAnyPublisher() @@ -309,7 +313,7 @@ public extension LibSession { fileName: String?, using dependencies: Dependencies = Dependencies() ) -> AnyPublisher<(ResponseInfoType, FileUploadResponse), Error> { - typealias Output = (success: Bool, timeout: Bool, statusCode: Int, data: Data?) + typealias Output = (success: Bool, timeout: Bool, statusCode: Int, headers: [String: String], data: Data?) return getOrCreateNetwork() .tryFlatMap { network in @@ -323,20 +327,22 @@ public extension LibSession { fileName?.cString(using: .utf8), Int64(floor(Network.fileUploadTimeout * 1000)), 0, - { success, timeout, statusCode, dataPtr, dataLen, ctx in + { success, timeout, statusCode, cHeaders, cHeaderVals, headerLen, dataPtr, dataLen, ctx in + let headers: [String: String] = CallbackWrapper + .headers(cHeaders, cHeaderVals, headerLen) let data: Data? = dataPtr.map { Data(bytes: $0, count: dataLen) } - CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), data)) + CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), headers, data)) }, wrapper.unsafePointer() ) } - .tryMap { success, timeout, statusCode, maybeData -> (any ResponseInfoType, FileUploadResponse) in - try throwErrorIfNeeded(success, timeout, statusCode, maybeData) + .tryMap { success, timeout, statusCode, headers, maybeData -> (any ResponseInfoType, FileUploadResponse) in + try throwErrorIfNeeded(success, timeout, statusCode, headers, maybeData) guard let data: Data = maybeData else { throw NetworkError.parsingFailed } return ( - Network.ResponseInfo(code: statusCode), + Network.ResponseInfo(code: statusCode, headers: headers), try FileUploadResponse.decoded(from: data, using: dependencies) ) } @@ -344,7 +350,7 @@ public extension LibSession { } static func downloadFile(from server: Network.Destination) -> AnyPublisher<(ResponseInfoType, Data), Error> { - typealias Output = (success: Bool, timeout: Bool, statusCode: Int, data: Data?) + typealias Output = (success: Bool, timeout: Bool, statusCode: Int, headers: [String: String], data: Data?) return getOrCreateNetwork() .tryFlatMap { network in @@ -355,20 +361,22 @@ public extension LibSession { try wrapper.cServerDestination(server), Int64(floor(Network.fileDownloadTimeout * 1000)), 0, - { success, timeout, statusCode, dataPtr, dataLen, ctx in + { success, timeout, statusCode, cHeaders, cHeaderVals, headerLen, dataPtr, dataLen, ctx in + let headers: [String: String] = CallbackWrapper + .headers(cHeaders, cHeaderVals, headerLen) let data: Data? = dataPtr.map { Data(bytes: $0, count: dataLen) } - CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), data)) + CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), headers, data)) }, wrapper.unsafePointer() ) } - .tryMap { success, timeout, statusCode, maybeData -> (any ResponseInfoType, Data) in - try throwErrorIfNeeded(success, timeout, statusCode, maybeData) + .tryMap { success, timeout, statusCode, headers, maybeData -> (any ResponseInfoType, Data) in + try throwErrorIfNeeded(success, timeout, statusCode, headers, maybeData) guard let data: Data = maybeData else { throw NetworkError.parsingFailed } return ( - Network.ResponseInfo(code: statusCode), + Network.ResponseInfo(code: statusCode, headers: headers), data ) } @@ -379,7 +387,7 @@ public extension LibSession { ed25519SecretKey: [UInt8], using dependencies: Dependencies = Dependencies() ) -> AnyPublisher<(ResponseInfoType, AppVersionResponse), Error> { - typealias Output = (success: Bool, timeout: Bool, statusCode: Int, data: Data?) + typealias Output = (success: Bool, timeout: Bool, statusCode: Int, headers: [String: String], data: Data?) return getOrCreateNetwork() .tryFlatMap { network in @@ -393,20 +401,22 @@ public extension LibSession { &cEd25519SecretKey, Int64(floor(Network.fileDownloadTimeout * 1000)), 0, - { success, timeout, statusCode, dataPtr, dataLen, ctx in + { success, timeout, statusCode, cHeaders, cHeaderVals, headerLen, dataPtr, dataLen, ctx in + let headers: [String: String] = CallbackWrapper + .headers(cHeaders, cHeaderVals, headerLen) let data: Data? = dataPtr.map { Data(bytes: $0, count: dataLen) } - CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), data)) + CallbackWrapper.run(ctx, (success, timeout, Int(statusCode), headers, data)) }, wrapper.unsafePointer() ) } - .tryMap { success, timeout, statusCode, maybeData -> (any ResponseInfoType, AppVersionResponse) in - try throwErrorIfNeeded(success, timeout, statusCode, maybeData) + .tryMap { success, timeout, statusCode, headers, maybeData -> (any ResponseInfoType, AppVersionResponse) in + try throwErrorIfNeeded(success, timeout, statusCode, headers, maybeData) guard let data: Data = maybeData else { throw NetworkError.parsingFailed } return ( - Network.ResponseInfo(code: statusCode), + Network.ResponseInfo(code: statusCode, headers: headers), try AppVersionResponse.decoded(from: data, using: dependencies) ) } @@ -544,10 +554,16 @@ public extension LibSession { _ success: Bool, _ timeout: Bool, _ statusCode: Int, + _ headers: [String: String], _ data: Data? ) throws { guard !success || statusCode < 200 || statusCode > 299 else { return } - guard !timeout else { throw NetworkError.timeout } + guard !timeout else { + switch data.map({ String(data: $0, encoding: .ascii) }) { + case .none: throw NetworkError.timeout(error: "\(NetworkError.unknown)", rawData: data) + case .some(let responseString): throw NetworkError.timeout(error: responseString, rawData: data) + } + } /// Handle status codes with specific meanings switch (statusCode, data.map { String(data: $0, encoding: .ascii) }) { @@ -675,6 +691,17 @@ public extension Network.Destination { } internal extension LibSession.CallbackWrapper { + static func headers( + _ cHeaders: UnsafeMutablePointer?>?, + _ cHeaderVals: UnsafeMutablePointer?>?, + _ count: Int + ) -> [String: String] { + let headers: [String] = [String](pointer: cHeaders, count: count, defaultValue: []) + let headerVals: [String] = [String](pointer: cHeaderVals, count: count, defaultValue: []) + + return zip(headers, headerVals) + .reduce(into: [:]) { result, next in result[next.0] = next.1 } + } func cServerDestination(_ destination: Network.Destination) throws -> network_server_destination { guard case .server(let url, let method, let headers, let x25519PublicKey) = destination, diff --git a/SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift b/SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift index 89d9f81ca..e42ac4e8f 100644 --- a/SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift +++ b/SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift @@ -425,7 +425,11 @@ public class PagedDatabaseObserver: TransactionObserver where let updatedItems: [T] = { do { return try dataQuery(targetRowIds).fetchAll(db) } catch { - SNLog("[PagedDatabaseObserver] Error fetching data during change: \(error)") + // If the database is suspended then don't bother logging (as we already know why) + if !Storage.shared.isSuspended { + Log.error("[PagedDatabaseObserver] Error fetching data during change: \(error)") + } + return [] } }() diff --git a/SessionUtilitiesKit/General/Logging.swift b/SessionUtilitiesKit/General/Logging.swift index 8aea7d733..eb08e5f2c 100644 --- a/SessionUtilitiesKit/General/Logging.swift +++ b/SessionUtilitiesKit/General/Logging.swift @@ -670,7 +670,7 @@ public struct AllLoggingCategories { /// **Note:** We only want to use the `rawValue` to distinguish between logging categories /// as the `defaultLevel` can change via the dev settings and any additional metadata could /// be file/class specific - category.rawValue != cat.rawValue + category.rawValue == cat.rawValue }) else { return } diff --git a/SessionUtilitiesKit/LibSession/LibSession.swift b/SessionUtilitiesKit/LibSession/LibSession.swift index 07591480b..950b20fc8 100644 --- a/SessionUtilitiesKit/LibSession/LibSession.swift +++ b/SessionUtilitiesKit/LibSession/LibSession.swift @@ -39,24 +39,27 @@ extension LibSession { let cat: String = String(pointer: catPtr, length: catLen, encoding: .utf8) else { return } - /// Logs from libSession come through in the format: - /// `[yyyy-MM-dd hh:mm:ss] [+{lifetime}s] [{cat}:{lvl}|log.hpp:{line}] {message}` - /// We want to remove the extra data because it doesn't help the logs - let processedMessage: String = { - let logParts: [String] = msg.components(separatedBy: "] ") + /// Dispatch to another thread so we don't block thread triggering the log + DispatchQueue.global(qos: .background).async { + /// Logs from libSession come through in the format: + /// `[yyyy-MM-dd hh:mm:ss] [+{lifetime}s] [{cat}:{lvl}|log.hpp:{line}] {message}` + /// We want to remove the extra data because it doesn't help the logs + let processedMessage: String = { + let logParts: [String] = msg.components(separatedBy: "] ") + + guard logParts.count == 4 else { return msg.trimmingCharacters(in: .whitespacesAndNewlines) } + + let message: String = String(logParts[3]).trimmingCharacters(in: .whitespacesAndNewlines) + + return "\(logParts[1])] \(message)" + }() - guard logParts.count == 4 else { return msg.trimmingCharacters(in: .whitespacesAndNewlines) } - - let message: String = String(logParts[3]).trimmingCharacters(in: .whitespacesAndNewlines) - - return "\(logParts[1])] \(message)" - }() - - Log.custom( - Log.Level(lvl), - [Log.Category(rawValue: cat, customPrefix: "libSession:")], - processedMessage - ) + Log.custom( + Log.Level(lvl), + [Log.Category(rawValue: cat, customPrefix: "libSession:")], + processedMessage + ) + } }) } diff --git a/SessionUtilitiesKit/LibSession/Utilities/TypeConversion+Utilities.swift b/SessionUtilitiesKit/LibSession/Utilities/TypeConversion+Utilities.swift index 99934d9ef..75ed5caa3 100644 --- a/SessionUtilitiesKit/LibSession/Utilities/TypeConversion+Utilities.swift +++ b/SessionUtilitiesKit/LibSession/Utilities/TypeConversion+Utilities.swift @@ -22,11 +22,38 @@ public extension String { // MARK: - Array public extension Array where Element == String { - init?( + init?(pointer: UnsafeMutablePointer?>?, count: Int?) { + self.init(pointee: pointer.map { $0.pointee.map { UnsafePointer($0) } }, count: count) + } + + init?(pointer: UnsafeMutablePointer?>?, count: Int?) { + self.init(pointee: pointer.map { $0.pointee }, count: count) + } + + init( pointer: UnsafeMutablePointer?>?, + count: Int?, + defaultValue: [String] + ) { + self = ([String](pointer: pointer, count: count) ?? defaultValue) + } + + init( + pointer: UnsafeMutablePointer?>?, + count: Int?, + defaultValue: [String] + ) { + self = ([String](pointer: pointer, count: count) ?? defaultValue) + } + + init?( + pointee: UnsafePointer?, count: Int? ) { - guard let count: Int = count else { return nil } + guard + let count: Int = count, + let pointee: UnsafePointer = pointee + else { return nil } // If we were given a count but it's 0 then trying to access the pointer could // crash (as it could be bad memory) so just return an empty array @@ -34,27 +61,17 @@ public extension Array where Element == String { self = [] return } - guard let pointee: UnsafeMutablePointer = pointer?.pointee else { return nil } - self = (0..?>?, - count: Int?, - defaultValue: [String] - ) { - self = ([String](pointer: pointer, count: count) ?? defaultValue) + self = (0..?>? = nil + expect([String](pointer: ptr, count: 5, defaultValue: ["Test"])) .to(equal(["Test"])) } }