Merge branch 'development' into dev/update-bindings

Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterForNotifications.swift

+import Foundation
+import XXClient
+import XCTestDynamicOverlay
+
+public struct MessengerRegisterForNotifications {
+  public enum Error: Swift.Error, Equatable {
+    case notConnected
+  }
+
+  public var run: (Data) throws -> Void
+
+  public func callAsFunction(token: Data) throws -> Void {
+    try run(token)
+  }
+}
+
+extension MessengerRegisterForNotifications {
+  public static func live(_ env: MessengerEnvironment) -> MessengerRegisterForNotifications {
+    MessengerRegisterForNotifications { token in
+      guard let e2e = env.e2e() else {
+        throw Error.notConnected
+      }
+      try env.registerForNotifications(
+        e2eId: e2e.getId(),
+        token: token.map { String(format: "%02hhx", $0) }.joined()
+      )
+    }
+  }
+}
+
+extension MessengerRegisterForNotifications {
+  public static let unimplemented = MessengerRegisterForNotifications(
+    run: XCTUnimplemented("\(Self.self)")
+  )
+}

Sources/XXMessengerClient/Messenger/Messenger.swift

@@ -20,6 +20,7 @@ public struct Messenger {
   public var waitForNodes: MessengerWaitForNodes
   public var destroy: MessengerDestroy
   public var searchUsers: MessengerSearchUsers
+  public var registerForNotifications: MessengerRegisterForNotifications
 }
 
 extension Messenger {
@@ -43,7 +44,8 @@ extension Messenger {
       waitForNetwork: .live(env),
       waitForNodes: .live(env),
       destroy: .live(env),
-      searchUsers: .live(env)
+      searchUsers: .live(env),
+      registerForNotifications: .live(env)
     )
   }
 }
@@ -68,6 +70,7 @@ extension Messenger {
     waitForNetwork: .unimplemented,
     waitForNodes: .unimplemented,
     destroy: .unimplemented,
-    searchUsers: .unimplemented
+    searchUsers: .unimplemented,
+    registerForNotifications: .unimplemented
   )
 }

Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift

@@ -19,6 +19,7 @@ public struct MessengerEnvironment {
   public var newCMix: NewCMix
   public var newOrLoadUd: NewOrLoadUd
   public var passwordStorage: PasswordStorage
+  public var registerForNotifications: RegisterForNotifications
   public var searchUD: SearchUD
   public var sleep: (TimeInterval) -> Void
   public var storageDir: String
@@ -53,6 +54,7 @@ extension MessengerEnvironment {
       newCMix: .live,
       newOrLoadUd: .live,
       passwordStorage: .keychain,
+      registerForNotifications: .live,
       searchUD: .live,
       sleep: { Thread.sleep(forTimeInterval: $0) },
       storageDir: MessengerEnvironment.defaultStorageDir,
@@ -82,6 +84,7 @@ extension MessengerEnvironment {
     newCMix: .unimplemented,
     newOrLoadUd: .unimplemented,
     passwordStorage: .unimplemented,
+    registerForNotifications: .unimplemented,
     searchUD: .unimplemented,
     sleep: XCTUnimplemented("\(Self.self).sleep"),
     storageDir: "unimplemented",

Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterForNotificationsTests.swift

+import CustomDump
+import XCTest
+import XXClient
+@testable import XXMessengerClient
+
+final class MessengerRegisterForNotificationsTest: XCTestCase {
+  func testRegister() throws {
+    struct DidRegister: Equatable {
+      var e2eId: Int
+      var token: String
+    }
+    var didRegister: [DidRegister] = []
+
+    var env: MessengerEnvironment = .unimplemented
+    env.e2e.get = {
+      var e2e: E2E = .unimplemented
+      e2e.getId.run = { 1234 }
+      return e2e
+    }
+    env.registerForNotifications.run = { e2eId, token in
+      didRegister.append(.init(e2eId: e2eId, token: token))
+    }
+
+    let register: MessengerRegisterForNotifications = .live(env)
+    let token = "test-token".data(using: .utf8)!
+
+    try register(token: token)
+
+    XCTAssertNoDifference(didRegister, [.init(e2eId: 1234, token: "746573742d746f6b656e")])
+  }
+
+  func testRegisterWhenNotConnected() {
+    var env: MessengerEnvironment = .unimplemented
+    env.e2e.get = { nil }
+    let register: MessengerRegisterForNotifications = .live(env)
+    let token = "test-token".data(using: .utf8)!
+
+    XCTAssertThrowsError(try register(token: token)) { error in
+      XCTAssertEqual(error as? MessengerRegisterForNotifications.Error, .notConnected)
+    }
+  }
+
+  func testRegisterFailure() {
+    struct Failure: Error, Equatable {}
+    let failure = Failure()
+
+    var env: MessengerEnvironment = .unimplemented
+    env.e2e.get = {
+      var e2e: E2E = .unimplemented
+      e2e.getId.run = { 1234 }
+      return e2e
+    }
+    env.registerForNotifications.run = { _, _ in throw failure }
+    let register: MessengerRegisterForNotifications = .live(env)
+    let token = "test-token".data(using: .utf8)!
+
+    XCTAssertThrowsError(try register(token: token)) { error in
+      XCTAssertEqual(error as? Failure, failure)
+    }
+  }
+}