Fixed a few issues

• Fixed some duplicate content in Logging
• Fixed broken service node batch requests
• Fixed a crash which could occur when using the storage publisher functions

Author: mpretty-cyro

Scripts/build_libSession_util.sh

@@ -338,7 +338,6 @@ if [ "${REQUIRES_BUILD}" == 1 ]; then
 
   echo "- Touching timestamp file to signal update to Xcode"
   touch "${BUILT_LIB_FINAL_TIMESTAMP_FILE}"
-  cp "${BUILT_LIB_FINAL_TIMESTAMP_FILE}" "${SPM_TIMESTAMP_FILE}"
 
   echo "- Build complete"
 fi

Session.xcodeproj/project.pbxproj

@@ -988,6 +988,7 @@
 		FDD20C162A09E64A003898FB /* GetExpiriesRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD20C152A09E64A003898FB /* GetExpiriesRequest.swift */; };
 		FDD20C182A09E7D3003898FB /* GetExpiriesResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD20C172A09E7D3003898FB /* GetExpiriesResponse.swift */; };
 		FDD20C1A2A0A03AC003898FB /* DeleteInboxResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD20C192A0A03AC003898FB /* DeleteInboxResponse.swift */; };
+		FDD23ADE2E44501E0057E853 /* RequestCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD23ADD2E44501B0057E853 /* RequestCategory.swift */; };
 		FDD23ADF2E457CAA0057E853 /* _016_ThemePreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD37E9F828A5F14A003AE748 /* _016_ThemePreferences.swift */; };
 		FDD23AE02E457CD40057E853 /* _004_SNK_InitialSetupMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD17D79F27F40CC800122BE0 /* _004_SNK_InitialSetupMigration.swift */; };
 		FDD23AE12E457CDE0057E853 /* _005_SNK_SetupStandardJobs.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6A7A6C2818C61500035AC1 /* _005_SNK_SetupStandardJobs.swift */; };
@@ -1006,7 +1007,6 @@
 		FDD23AEE2E459E470057E853 /* _001_SUK_InitialSetupMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD17D7C927F546D900122BE0 /* _001_SUK_InitialSetupMigration.swift */; };
 		FDD23AEF2E459EC90057E853 /* _012_AddJobPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDBB25E22988B13800F1508E /* _012_AddJobPriority.swift */; };
 		FDD23AF02E459EDD0057E853 /* _020_AddJobUniqueHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945D9C572D6FDBE7003C4C0C /* _020_AddJobUniqueHash.swift */; };
-		FDD23ADE2E44501E0057E853 /* RequestCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD23ADD2E44501B0057E853 /* RequestCategory.swift */; };
 		FDD2506E283711D600198BDA /* DifferenceKit+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD2506D283711D600198BDA /* DifferenceKit+Utilities.swift */; };
 		FDD250722837234B00198BDA /* MediaGalleryNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD250712837234B00198BDA /* MediaGalleryNavigationController.swift */; };
 		FDD82C3F2A205D0A00425F05 /* ProcessResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDD82C3E2A205D0A00425F05 /* ProcessResult.swift */; };
@@ -4231,18 +4231,10 @@
 			isa = PBXGroup;
 			children = (
 				FD78EA082DDFE45000D55B50 /* Convenience */,
-				FD37E9F728A5F143003AE748 /* Migrations */,
 			);
 			path = Database;
 			sourceTree = "<group>";
 		};
-		FD37E9F728A5F143003AE748 /* Migrations */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Migrations;
-			sourceTree = "<group>";
-		};
 		FD37EA1228AB3F60003AE748 /* Database */ = {
 			isa = PBXGroup;
 			children = (

SessionNetworkingKit/LibSession/LibSession+Networking.swift

@@ -268,7 +268,6 @@ class LibSessionNetwork: NetworkType {
                 switch destination {
                     case .snode(let snode, _):
                         try LibSessionNetwork.withSnodeRequestParams(request, snode) { paramsPtr in
-//                            var mutableParams = params
                             session_network_send_request(network, paramsPtr, cCallback, ctx)
                         }
 
@@ -990,13 +989,13 @@ public extension LibSession {
                     var error: [CChar] = [CChar](repeating: 0, count: 256)
                     var network: UnsafeMutablePointer<network_object_v2>?
                     var config: session_network_config = session_network_config_default()
+                    config.cache_refresh_using_legacy_endpoint = true
 
                     if dependencies[feature: .serviceNetwork] == .testnet {
                         config.netid = SESSION_NETWORK_TESTNET
                         config.enforce_subnet_diversity = false // On testnet we can't do this as nodes share IPs
                     }
 
-                    
                     let result: Result<Void, Error> = cCachePath.withUnsafeBufferPointer { cachePtr in
                         config.cache_dir = cachePtr.baseAddress
 

SessionNetworkingKit/Types/PreparedRequest.swift

@@ -417,13 +417,13 @@ extension Network.PreparedRequest: ErasedPreparedRequest {
     }
 
     public func encodeForBatchRequest(to encoder: Encoder) throws {
+        var container: KeyedEncodingContainer<Network.BatchRequest.Child.CodingKeys> = encoder.container(keyedBy: Network.BatchRequest.Child.CodingKeys.self)
+        
         switch batchRequestVariant {
             case .unsupported:
                 Log.critical("Attempted to encode unsupported request type \(endpointName) as a batch subrequest")
 
             case .sogs:
-                var container: KeyedEncodingContainer<Network.BatchRequest.Child.CodingKeys> = encoder.container(keyedBy: Network.BatchRequest.Child.CodingKeys.self)
-                
                 // Exclude request signature headers (not used for sub-requests)
                 let excludedSubRequestHeaders: [HTTPHeader] = excludedSubRequestHeaders
                 let batchRequestHeaders: [HTTPHeader: String] = headers
@@ -440,9 +440,9 @@ extension Network.PreparedRequest: ErasedPreparedRequest {
                 try container.encodeIfPresent(bytes, forKey: .bytes)
 
             case .storageServer:
-                var container: SingleValueEncodingContainer = encoder.singleValueContainer()
+                try container.encode(endpoint.path, forKey: .method)
+                try jsonKeyedBodyEncoder?(&container, .params)
 
-                try jsonBodyEncoder?(&container)
         }
     }
 }

SessionUtilitiesKit/Database/Storage.swift

@@ -1319,7 +1319,7 @@ public protocol IdentifiableTransactionObserver: TransactionObserver {
 
 private extension Storage {
     actor PublisherBridge<T> {
-        private weak var subject: PassthroughSubject<T, Error>?
+        private var subject: PassthroughSubject<T, Error>?
         private var isFinished: Bool = false
 
         init(subject: PassthroughSubject<T, Error>) {
@@ -1329,7 +1329,8 @@ private extension Storage {
         func send(result: Result<T, Error>, info: CallInfo) {
             guard !isFinished, let subject = self.subject else { return }
 
-            isFinished = true
+            self.isFinished = true
+            self.subject = nil
 
             switch result {
                 case .success(let value):
@@ -1346,7 +1347,8 @@ private extension Storage {
         func cancel() {
             guard !isFinished else { return }
 
-            isFinished = true
+            self.isFinished = true
+            self.subject = nil
         }
     }
 }

SessionUtilitiesKit/General/Logging.swift

@@ -730,8 +730,7 @@ public actor Logger: LoggerType {
         }()
 
         /// Clean up the message if needed (replace double periods with single, trim whitespace, truncate pubkeys)
-        let cleanedMessage: String = logPrefix
-            .appending(message)
+        let cleanedMessage: String = message
             .replacingOccurrences(of: "...", with: "|||")
             .replacingOccurrences(of: "..", with: ".")
             .replacingOccurrences(of: "|||", with: "...")