Send action message correctly

Author: luizmb

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/CodeGen/EnumCodable.generated.swift

@@ -47,63 +47,3 @@ extension MessageType: Codable {
  }
  }
 }
-extension PayloadTree: Codable {
- enum CodingKeys: String, CodingKey {
- case type
- case associatedValues
-
- enum UnkeyedKeys: String, CodingKey {
- case associatedValue0
- }
- enum KeyedKeys: String, CodingKey {
- case key
- case value
- }
- enum ArrayKeys: String, CodingKey {
- case key
- case values
- }
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: CodingKeys.self)
- switch try container.decode(String.self, forKey: .type) {
- case "unkeyed":
- let subContainer = try container.nestedContainer(keyedBy: CodingKeys.UnkeyedKeys.self, forKey: .associatedValues)
- let associatedValues0 = try subContainer.decode(String.self, forKey: .associatedValue0)
- self = .unkeyed(associatedValues0)
- case "keyed":
- let subContainer = try container.nestedContainer(keyedBy: CodingKeys.KeyedKeys.self, forKey: .associatedValues)
- let associatedValues0 = try subContainer.decode(String.self, forKey: .key)
- let associatedValues1 = try subContainer.decode(String.self, forKey: .value)
- self = .keyed(key: associatedValues0, value: associatedValues1)
- case "array":
- let subContainer = try container.nestedContainer(keyedBy: CodingKeys.ArrayKeys.self, forKey: .associatedValues)
- let associatedValues0 = try subContainer.decode(String.self, forKey: .key)
- let associatedValues1 = try subContainer.decode([PayloadTree].self, forKey: .values)
- self = .array(key: associatedValues0, values: associatedValues1)
- default:
- throw DecodingError.keyNotFound(CodingKeys.type, .init(codingPath: container.codingPath, debugDescription: "Unknown key"))
- }
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: CodingKeys.self)
- switch self {
- case let .unkeyed(associatedValue0):
- try container.encode("unkeyed", forKey: .type)
- var subContainer = container.nestedContainer(keyedBy: CodingKeys.UnkeyedKeys.self, forKey: .associatedValues)
- try subContainer.encode(associatedValue0, forKey: .associatedValue0)
- case let .keyed(key, value):
- try container.encode("keyed", forKey: .type)
- var subContainer = container.nestedContainer(keyedBy: CodingKeys.KeyedKeys.self, forKey: .associatedValues)
- try subContainer.encode(key, forKey: .key)
- try subContainer.encode(value, forKey: .value)
- case let .array(key, values):
- try container.encode("array", forKey: .type)
- var subContainer = container.nestedContainer(keyedBy: CodingKeys.ArrayKeys.self, forKey: .associatedValues)
- try subContainer.encode(key, forKey: .key)
- try subContainer.encode(values, forKey: .values)
- }
- }
-}

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/Model/ActionMessage.swift

@@ -4,7 +4,6 @@ import SwiftRex
 public struct ActionMessage: Codable, Equatable {
  public let remoteDate: Date
  public let action: String
- public let actionPayload: PayloadTree
- public let state: PayloadTree
+ public let state: Data?
  public let actionSource: ActionSource
 }

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/Model/PayloadTree.swift

@@ -1,8 +1,8 @@
 import Foundation
 
 // sourcery: EnumCodable
-public indirect enum PayloadTree: Equatable {
- case unkeyed(String)
- case keyed(key: String, value: String)
- case array(key: String, values: [PayloadTree])
-}
+//public indirect enum PayloadTree: Equatable {
+// case unkeyed(String)
+// case keyed(key: String, value: String)
+// case array(key: String, values: [PayloadTree])
+//}

MonitoredAppMiddleware/Sources/MonitoredAppMiddleware/MonitoredAppMiddleware.swift

@@ -5,7 +5,7 @@ import MultipeerConnectivity
 import MultipeerMiddleware
 import SwiftRex
 
-public final class MonitoredAppMiddleware<Action, State>: Middleware {
+public final class MonitoredAppMiddleware<Action, State: Encodable & Equatable>: Middleware {
  public typealias InputActionType = Action
  public typealias OutputActionType = Action
  public typealias StateType = State
@@ -20,7 +20,7 @@ public final class MonitoredAppMiddleware<Action, State>: Middleware {
  public init(
  multipeerSession: (() -> MultipeerSession)? = nil,
  advertiser: (() -> MultipeerAdvertiserPublisher)? = nil,
- encoder: @escaping () -> JSONEncoder = JSONEncoder.init
+ encoder: @escaping () -> JSONEncoder = sortedOrderEncoder
  ) {
  let name = "\(appName()) 📱 \(deviceName())"
  let myselfAsPeer = MCPeerID(displayName: name)
@@ -52,8 +52,10 @@ public final class MonitoredAppMiddleware<Action, State>: Middleware {
  }
 
  public func handle(action: InputActionType, from dispatcher: ActionSource, afterReducer: inout AfterReducer) {
+ let oldState = getState?()
  afterReducer = .do {
- self.sendAction(action: action, from: dispatcher)
+ let newState = self.getState?()
+ self.sendAction(action: action, from: dispatcher, changedState: oldState == newState ? nil : newState)
  }
  }
 
@@ -78,14 +80,13 @@ public final class MonitoredAppMiddleware<Action, State>: Middleware {
  )
  }
 
- private func sendAction(action: InputActionType, from dispatcher: ActionSource) {
+ private func sendAction(action: InputActionType, from dispatcher: ActionSource, changedState: State?) {
  send(message:
  MessageType.action(
  ActionMessage(
  remoteDate: Date(),
  action: "\(action)",
- actionPayload: .unkeyed(""),
- state: .unkeyed(""),
+ state: changedState.flatMap { try? encoder().encode($0) },
  actionSource: dispatcher
  )
  )
@@ -101,6 +102,15 @@ public final class MonitoredAppMiddleware<Action, State>: Middleware {
  }
 }
 
+extension MonitoredAppMiddleware {
+ public static func sortedOrderEncoder() -> JSONEncoder {
+ let encoder = JSONEncoder()
+ encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]
+ encoder.dateEncodingStrategy = .iso8601
+ return encoder
+ }
+}
+
 private func mainBundle() -> Bundle { Bundle.main }
 private func serviceType() -> String { "swiftrex-mon" }
 private func appName() -> String { mainBundle().infoDictionary?["CFBundleName"] as? String ?? "" }

SampleApp/PointFreePrimeTime/Counter/Counter.swift

@@ -117,7 +117,7 @@ public let counterViewReducer: Reducer<CounterViewAction, CounterViewState> =
  stateSetter: setter(\CounterViewState.primeModal)
  )
 
-public struct PrimeAlert: Equatable, Identifiable {
+public struct PrimeAlert: Equatable, Identifiable, Encodable {
  let prime: Int
  public var id: Int { self.prime }
 }

SampleApp/PointFreePrimeTime/PrimeTime/ContentView.swift

@@ -6,7 +6,7 @@ import SwiftRex
 import SwiftUI
 import Utils
 
-struct AppState: Equatable {
+struct AppState: Equatable, Encodable {
  var count = 0
  var favoritePrimes: [Int] = []
  var loggedInUser: User?
@@ -15,17 +15,32 @@ struct AppState: Equatable {
  var isNthPrimeButtonDisabled: Bool = false
  var isPrimeModalShown: Bool = false
 
- struct Activity: Equatable {
+ struct Activity: Equatable, Encodable {
  let timestamp: Date
  let type: ActivityType
 
- enum ActivityType: Equatable {
+ enum ActivityType: Equatable, Encodable {
  case addedFavoritePrime(Int)
  case removedFavoritePrime(Int)
+
+ enum CodingKeys: String, CodingKey {
+ case addedFavoritePrime
+ case removedFavoritePrime
+ }
+
+ func encode(to encoder: Encoder) throws {
+ var container = encoder.container(keyedBy: CodingKeys.self)
+ switch self {
+ case let .addedFavoritePrime(addedFavoritePrime):
+ try container.encode(addedFavoritePrime, forKey: .addedFavoritePrime)
+ case let .removedFavoritePrime(removedFavoritePrime):
+ try container.encode(removedFavoritePrime, forKey: .removedFavoritePrime)
+ }
+ }
  }
  }
 
- struct User: Equatable {
+ struct User: Equatable, Encodable {
  let id: Int
  let name: String
  let bio: String

SwiftRexMonitor/.sourcery.yml

@@ -5,5 +5,5 @@ templates:
 output:
  CodeGen
 args:
- imports: ["MonitoredAppMiddleware", "MultipeerConnectivity", "MultipeerMiddleware"]
+ imports: ["MonitoredAppMiddleware", "MultipeerConnectivity", "MultipeerMiddleware", "SwiftRex"]
  testable-imports: []

SwiftRexMonitor/CodeGen/AutoMockable.generated.swift

@@ -13,4 +13,5 @@ import AppKit
 import MonitoredAppMiddleware
 import MultipeerConnectivity
 import MultipeerMiddleware
+import SwiftRex
 

SwiftRexMonitor/CodeGen/EnumCodable.generated.swift

@@ -5,6 +5,7 @@
 import MonitoredAppMiddleware
 import MultipeerConnectivity
 import MultipeerMiddleware
+import SwiftRex
 extension AppAction: Encodable {
  enum CodingKeys: String, CodingKey {
  case type
@@ -48,7 +49,10 @@ extension MonitorAction: Codable {
  case from
  }
  enum GotActionKeys: String, CodingKey {
- case associatedValue0
+ case action
+ case remoteDate
+ case state
+ case actionSource
  case peer
  }
  enum GotGreetingsKeys: String, CodingKey {
@@ -75,9 +79,12 @@ extension MonitorAction: Codable {
  self = .evaluateData(associatedValues0, from: associatedValues1)
  case "gotAction":
  let subContainer = try container.nestedContainer(keyedBy: CodingKeys.GotActionKeys.self, forKey: .associatedValues)
- let associatedValues0 = try subContainer.decode(ActionMessage.self, forKey: .associatedValue0)
- let associatedValues1 = try subContainer.decode(Peer.self, forKey: .peer)
- self = .gotAction(associatedValues0, peer: associatedValues1)
+ let associatedValues0 = try subContainer.decode(String.self, forKey: .action)
+ let associatedValues1 = try subContainer.decode(Date.self, forKey: .remoteDate)
+ let associatedValues2 = try subContainer.decode(String?.self, forKey: .state)
+ let associatedValues3 = try subContainer.decode(ActionSource.self, forKey: .actionSource)
+ let associatedValues4 = try subContainer.decode(Peer.self, forKey: .peer)
+ self = .gotAction(action: associatedValues0, remoteDate: associatedValues1, state: associatedValues2, actionSource: associatedValues3, peer: associatedValues4)
  case "gotGreetings":
  let subContainer = try container.nestedContainer(keyedBy: CodingKeys.GotGreetingsKeys.self, forKey: .associatedValues)
  let associatedValues0 = try subContainer.decode(PeerMetadata.self, forKey: .associatedValue0)
@@ -104,10 +111,13 @@ extension MonitorAction: Codable {
  var subContainer = container.nestedContainer(keyedBy: CodingKeys.EvaluateDataKeys.self, forKey: .associatedValues)
  try subContainer.encode(associatedValue0, forKey: .associatedValue0)
  try subContainer.encode(from, forKey: .from)
- case let .gotAction(associatedValue0, peer):
+ case let .gotAction(action, remoteDate, state, actionSource, peer):
  try container.encode("gotAction", forKey: .type)
  var subContainer = container.nestedContainer(keyedBy: CodingKeys.GotActionKeys.self, forKey: .associatedValues)
- try subContainer.encode(associatedValue0, forKey: .associatedValue0)
+ try subContainer.encode(action, forKey: .action)
+ try subContainer.encode(remoteDate, forKey: .remoteDate)
+ try subContainer.encode(state, forKey: .state)
+ try subContainer.encode(actionSource, forKey: .actionSource)
  try subContainer.encode(peer, forKey: .peer)
  case let .gotGreetings(associatedValue0, peer):
  try container.encode("gotGreetings", forKey: .type)

SwiftRexMonitor/CodeGen/Prism.generated.swift

@@ -5,6 +5,7 @@
 import MonitoredAppMiddleware
 import MultipeerConnectivity
 import MultipeerMiddleware
+import SwiftRex
 extension AppAction {
  public var start: Void? {
  get {
@@ -101,14 +102,14 @@ extension MonitorAction {
  self.evaluateData != nil
  }
 
- public var gotAction: (ActionMessage, peer: Peer)? {
+ public var gotAction: (action: String, remoteDate: Date, state: String?, actionSource: ActionSource, peer: Peer)? {
  get {
- guard case let .gotAction(associatedValue0, peer) = self else { return nil }
- return (associatedValue0, peer)
+ guard case let .gotAction(action, remoteDate, state, actionSource, peer) = self else { return nil }
+ return (action, remoteDate, state, actionSource, peer)
  }
  set {
  guard case .gotAction = self, let newValue = newValue else { return }
- self = .gotAction(newValue.0, peer: newValue.1)
+ self = .gotAction(action: newValue.0, remoteDate: newValue.1, state: newValue.2, actionSource: newValue.3, peer: newValue.4)
  }
  }