chore: dispatch loading failed event

Sources/MessagingInApp/Gist/EngineWeb/EngineWeb.swift

@@ -21,6 +21,8 @@ protocol EngineWebInstance: AutoMockable {
 
 public class EngineWeb: NSObject, EngineWebInstance {
     private let logger: Logger = DIGraphShared.shared.logger
+    private let inAppMessageManager: InAppMessageManager = DIGraphShared.shared.inAppMessageManager
+    private let _currentMessage: Message?
     private var _currentRoute = ""
     private var _timeoutTimer: Timer?
     private var _elapsedTimer = ElapsedTimer()
@@ -42,6 +44,8 @@ public class EngineWeb: NSObject, EngineWebInstance {
     }
 
     init(configuration: EngineWebConfiguration, state: InAppMessageState) {
+        self._currentMessage = state.currentMessageState.message
+
         super.init()
 
         _elapsedTimer.start(title: "Engine render for message: \(configuration.messageId)")
@@ -91,6 +95,9 @@ public class EngineWeb: NSObject, EngineWebInstance {
     @objc
     func forcedTimeout() {
         logger.info("Timeout triggered, triggering message error.")
+        if let message = _currentMessage {
+            inAppMessageManager.dispatch(action: .engineAction(action: .messageLoadingFailed(message: message)))
+        }
         delegate?.error()
     }
 }

Sources/MessagingInApp/Gist/Managers/MessageManager.swift

@@ -40,7 +40,7 @@ class MessageManager: EngineWebDelegate {
             instanceId: message.instanceId,
             endpoint: state.environment.networkSettings.engineAPI,
             messageId: message.messageId,
-            properties: message.toEngineRoute().properties
+            properties: message.properties.mapValues { AnyEncodable($0) }
         )
 
         self.engine = engineWebProvider.getEngineWebInstance(configuration: engineWebConfiguration, state: state)
@@ -221,7 +221,7 @@ class MessageManager: EngineWebDelegate {
 
     func error() {
         logger.error("Error loading message with id: \(currentMessage.messageId)")
-        inAppMessageManager.dispatch(action: .engineAction(action: .error(message: currentMessage)))
+        inAppMessageManager.dispatch(action: .engineAction(action: .messageLoadingFailed(message: currentMessage)))
     }
 
     func routeLoaded(route: String) {

Sources/MessagingInApp/Gist/Managers/Models/Message.swift

@@ -18,41 +18,28 @@ public class GistProperties {
 }
 
 public class Message {
-    public let instanceId = UUID().uuidString.lowercased()
-    public let queueId: String?
-    public let priority: Int?
-    public let messageId: String
-    public let gistProperties: GistProperties
-
-    var properties = [String: Any]()
+    let instanceId = UUID().uuidString.lowercased()
+    let queueId: String?
+    let priority: Int?
+    let messageId: String
+    let gistProperties: GistProperties
+    let properties: [String: Any]
 
     public var isEmbedded: Bool {
         gistProperties.elementId != nil
     }
 
     public init(
+        messageId: String,
         queueId: String? = nil,
         priority: Int? = nil,
-        messageId: String,
-        properties: [String: Any]? = nil,
-        gistProperties: GistProperties? = nil
+        properties: [String: Any]?
     ) {
+        self.messageId = messageId
         self.queueId = queueId
         self.priority = priority
-        self.messageId = messageId
-        self.gistProperties = gistProperties ?? Message.parseGistProperties(from: properties)
-        if let props = properties {
-            self.properties = props
-        }
-    }
-
-    public convenience init(messageId: String, properties: [String: Any]?) {
-        self.init(
-            queueId: properties?["queueId"] as? String,
-            priority: properties?["priority"] as? Int,
-            messageId: messageId,
-            gistProperties: Message.parseGistProperties(from: properties?["gist"] as? [String: Any])
-        )
+        self.gistProperties = Message.parseGistProperties(from: properties?["gist"] as? [String: Any])
+        self.properties = properties ?? [:]
     }
 
     private static func parseGistProperties(from gist: [String: Any]?) -> GistProperties {
@@ -75,20 +62,6 @@ public class Message {
             persistent: persistent
         )
     }
-
-    public func addProperty(key: String, value: Any) {
-        properties[key] = AnyEncodable(value)
-    }
-
-    func toEngineRoute() -> EngineRoute {
-        let engineRoute = EngineRoute(route: messageId)
-        properties.keys.forEach { key in
-            if let value = properties[key] {
-                engineRoute.addProperty(key: key, value: value)
-            }
-        }
-        return engineRoute
-    }
 }
 
 extension Message {

Sources/MessagingInApp/Gist/Network/Models/UserQueueResponse.swift

@@ -30,9 +30,9 @@ struct UserQueueResponse {
 
     func toMessage() -> Message {
         Message(
+            messageId: messageId,
             queueId: queueId,
             priority: priority,
-            messageId: messageId,
             properties: properties
         )
     }

Sources/MessagingInApp/Gist/Views/GistView.swift

@@ -20,7 +20,7 @@ public class GistView: UIView {
 
     override public func removeFromSuperview() {
         super.removeFromSuperview()
-        if let message = message {
+        if let _ = message {
             DIGraphShared.shared.gist.dismissMessage()
         }
     }

Sources/MessagingInApp/State/InAppMessageAction.swift

@@ -23,7 +23,6 @@ enum InAppMessageAction: Equatable, Action {
     enum EngineAction: Equatable {
         case tap(message: Message, route: String, name: String, action: String)
         case messageLoadingFailed(message: Message)
-        case error(message: Message)
     }
 
     // swiftlint:disable cyclomatic_complexity

Sources/MessagingInApp/State/InAppMessageMiddleware.swift

@@ -204,9 +204,6 @@ func messageEventCallbacksMiddleware(delegate: GistDelegate) -> InAppMessageMidd
 
             case .messageLoadingFailed(let message):
                 delegate.messageError(message: message)
-
-            case .error(let message):
-                delegate.messageError(message: message)
             }
 
         default:

Sources/MessagingInApp/State/InAppMessageReducer.swift

@@ -69,8 +69,15 @@ private func reducer(action: InAppMessageAction, state: InAppMessageState) -> In
     case .dismissMessage(let message, _, _):
         return state.copy(currentMessageState: .dismissed(message: message))
 
+    case .engineAction(let engineAction):
+        switch engineAction {
+        case .tap:
+            return state
+        case .messageLoadingFailed(let message):
+            return state.copy(currentMessageState: .dismissed(message: message))
+        }
+
     case .embedMessage,
-         .engineAction,
          .reportError:
         return state