From 6bf47e7bacb59dc3fe73e6cdb247f75378df24f1 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 7 May 2019 16:03:57 +1000 Subject: [PATCH] Start implementing snode API --- .../src/Loki/LokiMessagingAPI.swift | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/SignalServiceKit/src/Loki/LokiMessagingAPI.swift b/SignalServiceKit/src/Loki/LokiMessagingAPI.swift index 91498a201..145cd2447 100644 --- a/SignalServiceKit/src/Loki/LokiMessagingAPI.swift +++ b/SignalServiceKit/src/Loki/LokiMessagingAPI.swift @@ -7,11 +7,12 @@ import PromiseKit // MARK: Types private enum Method : String { - case retrieveNewMessages = "retrieve" + case getMessages = "retrieve" case sendMessage = "store" + case getSwarm = "get_snodes_for_pubkey" } - private struct Target { + public struct Target { let address: String let port: UInt16 } @@ -38,26 +39,30 @@ import PromiseKit return TSNetworkManager.shared().makePromise(request: request).map { $0.responseObject } } - public static func sendSignalMessage(_ signalMessage: SignalMessage, to destination: String, requiringPoW isPoWRequired: Bool) -> Promise { - return LokiMessage.fromSignalMessage(signalMessage, requiringPoW: isPoWRequired).then(sendMessage) - } - - public static func sendMessage(_ lokiMessage: LokiMessage) -> Promise { - let target = Target(address: "http://13.238.53.205", port: 8080) // TODO: Temporary - return invoke(.sendMessage, on: target, with: lokiMessage.toJSON()) + public static func getRandomSnode() -> Promise { + return Promise { seal in + seal.fulfill(Target(address: "http://13.238.53.205", port: 8080)) // TODO: Temporary + } } - public static func retrieveAllMessages() -> Promise { - let target = Target(address: "http://13.238.53.205", port: 8080) // TODO: Temporary + public static func getMessages() -> Promise { let parameters = [ "pubKey" : OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey, "lastHash" : "" // TODO: Implement ] - return invoke(.retrieveNewMessages, on: target, with: parameters) + return getRandomSnode().then { invoke(.getMessages, on: $0, with: parameters) } // TODO: This shouldn't be a random snode + } + + public static func sendMessage(_ lokiMessage: LokiMessage) -> Promise { + return getRandomSnode().then { invoke(.sendMessage, on: $0, with: lokiMessage.toJSON()) } // TODO: This shouldn't be a random snode + } + + public static func getSwarm(for publicKey: String) -> Promise { + return getRandomSnode().then { invoke(.getSwarm, on: $0, with: [ "pubKey" : publicKey ]) } } // MARK: Obj-C API @objc public static func sendSignalMessage(_ signalMessage: SignalMessage, to destination: String, requiringPoW isPoWRequired: Bool, completionHandler: ((RawResponse?, NSError?) -> Void)? = nil) { - sendSignalMessage(signalMessage, to: destination, requiringPoW: isPoWRequired).done { completionHandler?($0, nil) }.catch { completionHandler?(nil, $0 as NSError) } + LokiMessage.fromSignalMessage(signalMessage, requiringPoW: isPoWRequired).then(sendMessage).done { completionHandler?($0, nil) }.catch { completionHandler?(nil, $0 as NSError) } } }