feat: do not show modal message if change screens and page rule enabled

Makefile

@@ -10,7 +10,7 @@ generate:
 	./binny sourcery --sources Sources/MessagingPush --templates Sources/Templates --output Sources/MessagingPush/autogenerated --args imports=CioInternalCommon
 	./binny sourcery --sources Sources/MessagingPushAPN --templates Sources/Templates --output Sources/MessagingPushAPN/autogenerated --args imports=CioMessagingPush-CioInternalCommon
 	./binny sourcery --sources Sources/MessagingPushFCM --templates Sources/Templates --output Sources/MessagingPushFCM/autogenerated --args imports=CioMessagingPush-CioInternalCommon
-	./binny sourcery --sources Sources/MessagingInApp --templates Sources/Templates --output Sources/MessagingInApp/autogenerated --args imports=CioInternalCommon
+	./binny sourcery --sources Sources/MessagingInApp --templates Sources/Templates --output Sources/MessagingInApp/autogenerated --args imports=CioInternalCommon-UIKit
 	./binny sourcery --sources Sources/Migration --templates Sources/Templates --output Sources/Migration/autogenerated --args imports=CioInternalCommon
 
 

Sources/Common/Type/DoNotTrackAutomaticScreenViewEvent.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+/// Inherit in a UIViewController subclass to avoid having an automatic screenview event tracked for it.
+/// Currently only being used internally. `public` only because multiple SDK modules use it.
+public protocol DoNotTrackScreenViewEvent {}

Sources/DataPipeline/Plugins/AutoTrackingScreenViews.swift

@@ -83,6 +83,13 @@ extension AutoTrackingScreenViews {
             return
         }
 
+        // View is an internal Cio View, ignore event.
+        // This logic needs to exist outside of the `filterAutoScreenViewEvents` feature because customers can override the event filter.
+        // There are side effects (such as infinite loops) caused when our SDK tracks screenview events for internal classes.
+        if viewController is DoNotTrackScreenViewEvent {
+            return
+        }
+
         // Before we track event, apply a filter to remove events that could be unhelpful.
         let customerOverridenFilter = filterAutoScreenViewEvents
         let defaultSdkFilter: (UIViewController) -> Bool = { viewController in

Sources/MessagingInApp/Gist/EngineWeb/EngineWeb.swift

@@ -1,3 +1,4 @@
+import CioInternalCommon
 import Foundation
 import UIKit
 import WebKit
@@ -12,7 +13,13 @@ public protocol EngineWebDelegate: AnyObject {
     func error()
 }
 
-public class EngineWeb: NSObject {
+protocol EngineWebInstance: AutoMockable {
+    var delegate: EngineWebDelegate? { get set }
+    var view: UIView { get }
+    func cleanEngineWeb()
+}
+
+public class EngineWeb: NSObject, EngineWebInstance {
     private var _currentRoute = ""
     private var _timeoutTimer: Timer?
     private var _elapsedTimer = ElapsedTimer()

Sources/MessagingInApp/Gist/EngineWeb/EngineWebProvider.swift

@@ -0,0 +1,14 @@
+import CioInternalCommon
+import Foundation
+
+// Allows us to mock EngineWeb instances for testing.
+protocol EngineWebProvider {
+    func getEngineWebInstance(configuration: EngineWebConfiguration) -> EngineWebInstance
+}
+
+// sourcery: InjectRegisterShared = "EngineWebProvider"
+class EngineWebProviderImpl: EngineWebProvider {
+    func getEngineWebInstance(configuration: EngineWebConfiguration) -> EngineWebInstance {
+        EngineWeb(configuration: configuration)
+    }
+}

Sources/MessagingInApp/Gist/Gist.swift

@@ -28,13 +28,22 @@
         _ = Gist.shared.getMessageView(Message(messageId: ""))
     }
 
+    // For testing to reset the singleton state
+    func reset() {
+        clearUserToken()
+        messageQueueManager = MessageQueueManager()
+        messageManagers = []
+        RouteManager.clearCurrentRoute()
+    }
+
     // MARK: User
 
     public func setUserToken(_ userToken: String) {
         UserManager().setUserToken(userToken: userToken)
     }
 
     public func clearUserToken() {
+        cancelModalMessage(ifDoesNotMatchRoute: "") // provide a new route to trigger a modal cancel.
         UserManager().clearUserToken()
         messageQueueManager.clearUserMessagesFromLocalStore()
     }
@@ -46,6 +55,12 @@
     }
 
     public func setCurrentRoute(_ currentRoute: String) {
+        if RouteManager.getCurrentRoute() == currentRoute {
+            return // ignore request, route has not changed.
+        }
+
+        cancelModalMessage(ifDoesNotMatchRoute: currentRoute)
+
         RouteManager.setCurrentRoute(currentRoute)
         messageQueueManager.fetchUserMessagesFromLocalStore()
     }
@@ -97,6 +112,8 @@
         Logger.instance.debug(message: "Message with id: \(message.messageId) dismissed")
         removeMessageManager(instanceId: message.instanceId)
         delegate?.messageDismissed(message: message)
+
+        messageQueueManager.fetchUserMessagesFromLocalStore()
     }
 
     public func messageError(message: Message) {
@@ -126,6 +143,26 @@
             }
     }
 
+    // When the user navigates to a different screen, modal messages should only appear if they are meant for the current screen.
+    // If the currently displayed/loading modal message has a page rule, it should not be shown anymore.
+    private func cancelModalMessage(ifDoesNotMatchRoute newRoute: String) {
+        if let messageManager = getModalMessageManager() {
+            let modalMessageLoadingOrDisplayed = messageManager.currentMessage
+
+            if modalMessageLoadingOrDisplayed.doesHavePageRule(), !modalMessageLoadingOrDisplayed.doesPageRuleMatch(route: newRoute) {
+                // the page rule has changed and the currently loading/visible modal has page rules set, it should no longer be shown.
+                Logger.instance.debug(message: "Cancelled showing message with id: \(modalMessageLoadingOrDisplayed.messageId)")
+
+                // Stop showing the current message synchronously meaning to remove from UI instantly.
+                // We want to be sure the message is gone when this function returns and be ready to display another message if needed.
+                messageManager.cancelShowingMessage()
+
+                // Removing the message manager allows you to show a new modal message. Otherwise, request to show will be ignored.
+                removeMessageManager(instanceId: modalMessageLoadingOrDisplayed.instanceId)
+            }
+        }
+    }
+
     // Message Manager
 
     private func createMessageManager(siteId: String, message: Message) -> MessageManager {
@@ -135,7 +172,7 @@
         return messageManager
     }
 
-    private func getModalMessageManager() -> MessageManager? {
+    func getModalMessageManager() -> MessageManager? {
         messageManagers.first(where: { !$0.isMessageEmbed })
     }
 

Sources/MessagingInApp/Gist/Managers/MessageManager.swift

@@ -1,3 +1,4 @@
+import CioInternalCommon
 import Foundation
 import UIKit
 
@@ -6,17 +7,18 @@
 }
 
 class MessageManager: EngineWebDelegate {
-    private var engine: EngineWeb?
+    private var engine: EngineWebInstance
     private let siteId: String
     private var messagePosition: MessagePosition = .top
-    private var messageLoaded = false
+    var messageLoaded = false
     private var modalViewManager: ModalViewManager?
     var isMessageEmbed = false
     let currentMessage: Message
     var gistView: GistView!
     private var currentRoute: String
     private var elapsedTimer = ElapsedTimer()
     weak var delegate: GistDelegate?
+    private let engineWebProvider: EngineWebProvider = DIGraphShared.shared.engineWebProvider
 
     init(siteId: String, message: Message) {
         self.siteId = siteId
@@ -32,11 +34,17 @@
             properties: message.toEngineRoute().properties
         )
 
-        self.engine = EngineWeb(configuration: engineWebConfiguration)
-        if let engine = engine {
-            engine.delegate = self
-            self.gistView = GistView(message: currentMessage, engineView: engine.view)
+        self.engine = engineWebProvider.getEngineWebInstance(configuration: engineWebConfiguration)
+        engine.delegate = self
+        self.gistView = GistView(message: currentMessage, engineView: engine.view)
+    }
+
+    var isShowingMessage: Bool {
+        guard let modalViewManager = modalViewManager else {
+            return false
         }
+
+        return modalViewManager.isShowingMessage
     }
 
     func showMessage(position: MessagePosition) {
@@ -60,6 +68,16 @@
         }
     }
 
+    func cancelShowingMessage() {
+        guard let modalViewManager = modalViewManager else {
+            return // no message being shown to cancel
+        }
+
+        engine.delegate = nil // to make sure we do not get a callback when message loaded and we try to show it.
+
+        modalViewManager.cancel()
+    }
+
     func dismissMessage(completionHandler: (() -> Void)? = nil) {
         if let modalViewManager = modalViewManager {
             modalViewManager.dismissModalView { [weak self] in
@@ -82,7 +100,7 @@
 
         // Cleaning after engine web is bootstrapped and all assets downloaded.
         if currentMessage.messageId == "" {
-            engine?.cleanEngineWeb()
+            engine.cleanEngineWeb()
         }
     }
 
@@ -223,8 +241,7 @@
     }
 
     deinit {
-        engine?.cleanEngineWeb()
-        engine = nil
+        engine.cleanEngineWeb()
     }
 
     private func showNewMessage(url: URL) {

Sources/MessagingInApp/Gist/Managers/MessageQueueManager.swift

@@ -28,6 +28,10 @@
         }
     }
 
+    deinit {
+        queueTimer?.invalidate()
+    }
+
     func fetchUserMessagesFromLocalStore() {
         Logger.instance.info(message: "Checking local store with \(localMessageStore.count) messages")
         let sortedMessages = localMessageStore.sorted {
@@ -44,7 +48,7 @@
             }
         }
         sortedMessages.forEach { message in
-            handleMessage(message: message.value)
+            showMessageIfMeetsCriteria(message: message.value)
         }
     }
 
@@ -59,11 +63,13 @@
         localMessageStore.removeValue(forKey: queueId)
     }
 
-    private func addMessageToLocalStore(message: Message) {
-        guard let queueId = message.queueId else {
-            return
+    func addMessagesToLocalStore(messages: [Message]) {
+        messages.forEach { message in
+            guard let queueId = message.queueId else {
+                return
+            }
+            localMessageStore.updateValue(message, forKey: queueId)
         }
-        localMessageStore.updateValue(message, forKey: queueId)
     }
 
     @objc
@@ -80,13 +86,10 @@
                             guard let responses else {
                                 return
                             }
-                            // To prevent us from showing expired / revoked messages, clear user messages from local queue.
-                            self.clearUserMessagesFromLocalStore()
+
                             Logger.instance.info(message: "Gist queue service found \(responses.count) new messages")
-                            for queueMessage in responses {
-                                let message = queueMessage.toMessage()
-                                self.handleMessage(message: message)
-                            }
+
+                            self.processFetchResponse(responses.map { $0.toMessage() })
                         case .failure(let error):
                             Logger.instance.error(message: "Error fetching messages from Gist queue service. \(error.localizedDescription)")
                         }
@@ -99,7 +102,18 @@
         }
     }
 
-    private func handleMessage(message: Message) {
+    func processFetchResponse(_ fetchedMessages: [Message]) {
+        // To prevent us from showing expired / revoked messages, reset the local queue with the latest queue from the backend service.
+        // The backend service is the single-source-of-truth for in-app messages for each user.
+        clearUserMessagesFromLocalStore()
+        addMessagesToLocalStore(messages: fetchedMessages)
+
+        for message in fetchedMessages {
+            showMessageIfMeetsCriteria(message: message)
+        }
+    }
+
+    private func showMessageIfMeetsCriteria(message: Message) {
         // Skip shown messages
         if let queueId = message.queueId, Gist.shared.shownMessageQueueIds.contains(queueId) {
             Logger.instance.info(message: "Message with queueId: \(queueId) already shown, skipping.")
@@ -108,18 +122,10 @@
 
         let position = message.gistProperties.position
 
-        if let routeRule = message.gistProperties.routeRule {
-            let cleanRouteRule = routeRule.replacingOccurrences(of: "\\", with: "/")
-            if let regex = try? NSRegularExpression(pattern: cleanRouteRule) {
-                let range = NSRange(location: 0, length: Gist.shared.getCurrentRoute().utf16.count)
-                if regex.firstMatch(in: Gist.shared.getCurrentRoute(), options: [], range: range) == nil {
-                    Logger.instance.debug(message: "Current route is \(Gist.shared.getCurrentRoute()), needed \(cleanRouteRule)")
-                    addMessageToLocalStore(message: message)
-                    return
-                }
-            } else {
-                Logger.instance.info(message: "Problem processing route rule message regex: \(cleanRouteRule)")
-                return
+        if message.doesHavePageRule(), let cleanPageRule = message.cleanPageRule {
+            if !message.doesPageRuleMatch(route: Gist.shared.getCurrentRoute()) {
+                Logger.instance.debug(message: "Current route is \(Gist.shared.getCurrentRoute()), needed \(cleanPageRule)")
+                return // exit early to not show the message since page rule doesnt match
             }
         }
 

Sources/MessagingInApp/Gist/Managers/ModalViewManager.swift

@@ -7,9 +7,12 @@
 }
 
 class ModalViewManager {
-    var window: UIWindow!
+    var window: UIWindow?
     var viewController: GistModalViewController!
     var position: MessagePosition
+    var isShowingMessage: Bool {
+        window != nil
+    }
 
     init(gistView: GistView, position: MessagePosition) {
         self.viewController = GistModalViewController()
@@ -21,8 +24,8 @@
     func showModalView(completionHandler: @escaping () -> Void) {
         viewController.view.isHidden = true
         window = getUIWindow()
-        window.rootViewController = viewController
-        window.isHidden = false
+        window?.rootViewController = viewController
+        window?.isHidden = false
         var finalPosition: CGFloat = 0
 
         switch position {
@@ -49,6 +52,11 @@
         viewController.view.isHidden = false
     }
 
+    // Like dismiss, but no animation. Instantly removes the view from the screen.
+    func cancel() {
+        removeModalViewFromScreen()
+    }
+
     func dismissModalView(completionHandler: @escaping () -> Void) {
         var finalPosition: CGFloat = 0
         switch position {
@@ -66,15 +74,21 @@
             UIView.animate(withDuration: 0.1, delay: 0, options: [.curveEaseIn], animations: {
                 self.viewController.view.center.y = finalPosition
             }, completion: { _ in
-                self.window?.isHidden = false
-                self.viewController.removeFromParent()
-                self.window = nil
+                self.removeModalViewFromScreen()
+
                 completionHandler()
             })
         })
     }
 
-    func getUIWindow() -> UIWindow {
+    private func removeModalViewFromScreen() {
+        viewController?.view.isHidden = true
+        window?.isHidden = true
+        viewController.removeFromParent()
+        window = nil
+    }
+
+    private func getUIWindow() -> UIWindow {
         var modalWindow = UIWindow(frame: UIScreen.main.bounds)
         if #available(iOS 13.0, *) {
             for connectedScene in UIApplication.shared.connectedScenes