Browse Source

fix an edge case which may cause old messages coming back

pull/629/head
Ryan Zhao 3 months ago
parent
commit
987db2f7ab
  1. 10
      Session/Utilities/BackgroundPoller.swift
  2. 5
      SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift
  3. 5
      SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift
  4. 20
      SessionSnodeKit/SnodeAPI.swift
  5. 1
      SessionSnodeKit/Storage+SnodeAPI.swift

10
Session/Utilities/BackgroundPoller.swift

@ -42,16 +42,19 @@ public final class BackgroundPoller : NSObject {
return attempt(maxRetryCount: 4, recoveringOn: DispatchQueue.main) {
SnodeAPI.getRawMessages(from: snode, associatedWith: publicKey).then(on: DispatchQueue.main) { rawResponse -> Promise<Void> in
let (messages, lastRawMessage) = SnodeAPI.parseRawMessagesResponse(rawResponse, from: snode, associatedWith: publicKey)
var processedMessages: [JSON] = []
let promises = messages.compactMap { json -> Promise<Void>? in
// Use a best attempt approach here; we don't want to fail the entire process if one of the
// messages failed to parse.
guard let envelope = SNProtoEnvelope.from(json),
let data = try? envelope.serializedData() else { return nil }
let job = MessageReceiveJob(data: data, serverHash: json["hash"] as? String, isBackgroundPoll: true)
processedMessages.append(json)
return job.execute()
}
// Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value
// Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value & `receivedMessageHashes`
SnodeAPI.updateLastMessageHashValueIfPossible(for: snode, namespace: SnodeAPI.defaultNamespace, associatedWith: publicKey, from: lastRawMessage)
SnodeAPI.updateReceivedMessages(from: processedMessages, associatedWith: publicKey)
return when(fulfilled: promises) // The promise returned by MessageReceiveJob never rejects
}
@ -82,16 +85,19 @@ public final class BackgroundPoller : NSObject {
for result in results {
if case .fulfilled(let rawResponse) = result {
let (messages, lastRawMessage) = SnodeAPI.parseRawMessagesResponse(rawResponse, from: snode, associatedWith: publicKey)
var processedMessages: [JSON] = []
let jobPromises = messages.compactMap { json -> Promise<Void>? in
// Use a best attempt approach here; we don't want to fail the entire process if one of the
// messages failed to parse.
guard let envelope = SNProtoEnvelope.from(json),
let data = try? envelope.serializedData() else { return nil }
let job = MessageReceiveJob(data: data, serverHash: json["hash"] as? String, isBackgroundPoll: true)
processedMessages.append(json)
return job.execute()
}
// Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value
// Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value & `receivedMessageHashes`
SnodeAPI.updateLastMessageHashValueIfPossible(for: snode, namespace: namespaces[index], associatedWith: publicKey, from: lastRawMessage)
SnodeAPI.updateReceivedMessages(from: processedMessages, associatedWith: publicKey)
promises += jobPromises
}
index += 1

5
SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift

@ -122,6 +122,7 @@ public final class ClosedGroupPoller : NSObject {
if !rawMessages.isEmpty {
SNLog("Received \(rawMessages.count) new message(s) in closed group with public key: \(groupPublicKey).")
}
var processedMessages: [JSON] = []
rawMessages.forEach { json in
guard let envelope = SNProtoEnvelope.from(json) else { return }
do {
@ -130,13 +131,15 @@ public final class ClosedGroupPoller : NSObject {
SNMessagingKitConfiguration.shared.storage.write { transaction in
SessionMessagingKit.JobQueue.shared.add(job, using: transaction)
}
processedMessages.append(json)
} catch {
SNLog("Failed to deserialize envelope due to error: \(error).")
}
}
// Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value
// Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value & `receivedMessageHashes`
SnodeAPI.updateLastMessageHashValueIfPossible(for: snode, namespace: SnodeAPI.closedGroupNamespace, associatedWith: groupPublicKey, from: lastRawMessage)
SnodeAPI.updateReceivedMessages(from: processedMessages, associatedWith: groupPublicKey)
}
promise.catch2 { error in
SNLog("Polling failed for closed group with public key: \(groupPublicKey) due to error: \(error).")

5
SessionMessagingKit/Sending & Receiving/Pollers/Poller.swift

@ -98,6 +98,7 @@ public final class Poller : NSObject {
if !messages.isEmpty {
SNLog("Received \(messages.count) new message(s).")
}
var processedMessages: [JSON] = []
messages.forEach { json in
guard let envelope = SNProtoEnvelope.from(json) else { return }
do {
@ -106,13 +107,15 @@ public final class Poller : NSObject {
SNMessagingKitConfiguration.shared.storage.write { transaction in
SessionMessagingKit.JobQueue.shared.add(job, using: transaction)
}
processedMessages.append(json)
} catch {
SNLog("Failed to deserialize envelope due to error: \(error).")
}
}
// Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value
// Now that the MessageReceiveJob's have been created we can update the `lastMessageHash` value & `receivedMessageHashes`
SnodeAPI.updateLastMessageHashValueIfPossible(for: snode, namespace: SnodeAPI.defaultNamespace, associatedWith: userPublicKey, from: lastRawMessage)
SnodeAPI.updateReceivedMessages(from: processedMessages, associatedWith: userPublicKey)
strongSelf.pollCount += 1
if strongSelf.pollCount == Poller.maxPollCount {

20
SessionSnodeKit/SnodeAPI.swift

@ -705,6 +705,20 @@ public final class SnodeAPI : NSObject {
}
}
public static func updateReceivedMessages(from messages: [JSON], associatedWith publicKey: String) {
let oldReceivedMessages = SNSnodeKitConfiguration.shared.storage.getReceivedMessages(for: publicKey)
var newReceivedMessages = oldReceivedMessages
for message in messages {
guard let hash = message["hash"] as? String else { continue }
newReceivedMessages.insert(hash)
}
if oldReceivedMessages != newReceivedMessages {
SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
SNSnodeKitConfiguration.shared.storage.setReceivedMessages(to: newReceivedMessages, for: publicKey, using: transaction)
}
}
}
private static func removeDuplicates(from rawMessages: [JSON], associatedWith publicKey: String) -> [JSON] {
let oldReceivedMessages = SNSnodeKitConfiguration.shared.storage.getReceivedMessages(for: publicKey)
var newReceivedMessages = oldReceivedMessages
@ -717,12 +731,6 @@ public final class SnodeAPI : NSObject {
newReceivedMessages.insert(hash)
return !isDuplicate
}
// Avoid the sync write transaction if possible
if oldReceivedMessages != newReceivedMessages {
SNSnodeKitConfiguration.shared.storage.writeSync { transaction in
SNSnodeKitConfiguration.shared.storage.setReceivedMessages(to: newReceivedMessages, for: publicKey, using: transaction)
}
}
return result
}

1
SessionSnodeKit/Storage+SnodeAPI.swift

@ -110,7 +110,6 @@ extension Storage {
if now >= expirationDate {
Storage.writeSync { transaction in
self.removeLastMessageHashInfo(for: snode, namespace: namespace, associatedWith: publicKey, using: transaction)
self.setReceivedMessages(to: Set(), for: publicKey, using: transaction)
}
}
}

Loading…
Cancel
Save