Merge branch 'last-message-hash' into swarms

Pods

@@ -1 +1 @@
-Subproject commit e5b45b28d5e8e409c1acf15c32d3734bb3e8acd7
+Subproject commit c1bf4bf2fb27eaacb36e60b17d30f92f626d4368

SignalServiceKit/src/Loki/API/LokiAPI.swift

@@ -11,7 +11,7 @@ import PromiseKit
     public static let defaultMessageTTL: UInt64 = 4 * 24 * 60 * 60
     
     // MARK: Types
-    private struct Target : Hashable {
+    fileprivate struct Target : Hashable {
         let address: String
         let port: UInt16
         
@@ -69,10 +69,16 @@ import PromiseKit
     // MARK: Public API
     public static func getMessages() -> Promise<[MessagesPromise]> {
         let hexEncodedPublicKey = OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey
-        let lastHash = "" // TODO: Implement
-        let parameters: [String:Any] = [ "pubKey" : hexEncodedPublicKey, "lastHash" : "" ]
         return getTargetSnodes(for: hexEncodedPublicKey).mapValues { targetSnode in
-            return invoke(.getMessages, on: targetSnode, with: parameters).map { parseProtoEnvelopes(from: $0) }
+            let lastHash = getLastHash(for: targetSnode) ?? ""
+            let parameters: [String:Any] = [ "pubKey" : hexEncodedPublicKey, "lastHash" : lastHash ]
+            return invoke(.getMessages, on: targetSnode, with: parameters).map { response in
+                if let json = response as? JSON, let messages = json["messages"] as? [JSON], let lastMessage = messages.last,
+                    let hash = lastMessage["hash"] as? String, let expiresAt = lastMessage["expiration"] as? Int {
+                    updateLastHash(for: targetSnode, hash: hash, expiresAt: UInt64(expiresAt))
+                }
+                return parseProtoEnvelopes(from: response)
+            }
         }
     }
     
@@ -120,3 +126,26 @@ private extension Promise {
         }
     }
 }
+
+// MARK: Last Hash
+
+fileprivate extension LokiAPI {
+    
+    private static var primaryStorage: OWSPrimaryStorage {
+        return OWSPrimaryStorage.shared()
+    }
+    
+    fileprivate static func updateLastHash(for node: Target, hash: String, expiresAt: UInt64) {
+        primaryStorage.dbReadWriteConnection.readWrite { transaction in
+            self.primaryStorage.setLastMessageHash(hash, expiresAt: expiresAt, serviceNode: node.address, transaction: transaction)
+        }
+    }
+    
+    fileprivate static func getLastHash(for node: Target) -> String? {
+        var lastHash: String? = nil
+        primaryStorage.dbReadWriteConnection.readWrite { transaction in
+            lastHash = self.primaryStorage.getLastMessageHash(forServiceNode: node.address, transaction: transaction)
+        }
+        return lastHash
+    }
+}

SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.h

@@ -1,8 +1,9 @@
 #import "OWSPrimaryStorage.h"
-#import "PreKeyRecord.h"
-#import "PreKeyBundle.h"
 #import <YapDatabase/YapDatabase.h>
 
+@class PreKeyRecord;
+@class PreKeyBundle;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface OWSPrimaryStorage (Loki)
@@ -72,6 +73,29 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)removePreKeyBundleForContact:(NSString *)pubKey transaction:(YapDatabaseReadWriteTransaction *)transaction;
 
+# pragma mark - Last Hash
+
+/**
+ Get the last message hash for the given service node.
+ This function will check the stored last hash and remove it if the `expireAt` has already passed.
+
+ @param serviceNode The service node id
+ @param transaction A read write transaction
+ @return The last hash or nil if it doesn't exist
+ */
+- (NSString *_Nullable)getLastMessageHashForServiceNode:(NSString *)serviceNode transaction:(YapDatabaseReadWriteTransaction *)transaction;
+
+/**
+ Set the last message hash for the given service node.
+ This will override any previous hashes stored for the given service node.
+
+ @param hash The last message hash
+ @param expiresAt The time the message expires on the server
+ @param serviceNode The service node
+ @param transaction A read write transaction
+ */
+- (void)setLastMessageHash:(NSString *)hash expiresAt:(u_int64_t)expiresAt serviceNode:(NSString *)serviceNode transaction:(YapDatabaseReadWriteTransaction *)transaction;
+
 @end
 
 NS_ASSUME_NONNULL_END

SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.m

@@ -4,6 +4,9 @@
 #import "OWSPrimaryStorage+keyFromIntLong.h"
 #import "OWSDevice.h"
 #import "OWSIdentityManager.h"
+#import "NSDate+OWS.h"
+#import "PreKeyRecord.h"
+#import "PreKeyBundle.h"
 #import "TSAccountManager.h"
 #import "TSPreKeyManager.h"
 #import "YapDatabaseConnection+OWS.h"
@@ -13,6 +16,7 @@
 #define OWSPrimaryStoragePreKeyStoreCollection @"TSStorageManagerPreKeyStoreCollection"
 #define LokiPreKeyContactCollection @"LokiPreKeyContactCollection"
 #define LokiPreKeyBundleCollection @"LokiPreKeyBundleCollection"
+#define LokiLastHashCollection @"LokiLastHashCollection"
 
 @implementation OWSPrimaryStorage (Loki)
 
@@ -118,4 +122,37 @@
     [transaction removeObjectForKey:pubKey inCollection:LokiPreKeyBundleCollection];
 }
 
+# pragma mark - Last Hash
+
+- (NSString *_Nullable)getLastMessageHashForServiceNode:(NSString *)serviceNode transaction:(YapDatabaseReadWriteTransaction *)transaction {
+    NSDictionary *_Nullable dict = [transaction objectForKey:serviceNode inCollection:LokiLastHashCollection];
+    if (!dict) { return nil; }
+    
+    NSString *_Nullable hash = dict[@"hash"];
+    if (!hash) { return nil; }
+    
+    // Check if the hash isn't expired
+    uint64_t now = NSDate.ows_millisecondTimeStamp;
+    NSNumber *_Nullable expiresAt = dict[@"expiresAt"];
+    if (expiresAt && expiresAt.unsignedLongLongValue <= now) {
+        // The last message has expired from the storage server
+        [self removeLastMessageHashForServiceNode:serviceNode transaction:transaction];
+        return nil;
+    }
+    
+    return hash;
+}
+
+- (void)setLastMessageHash:(NSString *)hash expiresAt:(u_int64_t)expiresAt serviceNode:(NSString *)serviceNode transaction:(YapDatabaseReadWriteTransaction *)transaction {
+    NSDictionary *dict = @{
+                           @"hash": hash,
+                           @"expiresAt": @(expiresAt)
+                           };
+    [transaction setObject:dict forKey:serviceNode inCollection:LokiLastHashCollection];
+}
+
+- (void)removeLastMessageHashForServiceNode:(NSString *)serviceNode transaction:(YapDatabaseReadWriteTransaction *)transaction {
+    [transaction removeObjectForKey:serviceNode inCollection:LokiLastHashCollection];
+}
+
 @end