@applicaster/quick-brick-native-apple 5.13.1-alpha.1 → 5.13.3

package/apple/QuickBrickApple.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "QuickBrickApple",
-  "version": "5.13.1-alpha.1",
+  "version": "5.13.3",
   "platforms": {
     "ios": "12.0",
     "tvos": "12.0"
@@ -16,7 +16,7 @@
   "authors": "Applicaster LTD.",
   "source": {
     "git": "https://github.com/applicaster/Zapp-Frameworks.git",
-    "tag": "@@applicaster/quick-brick-native-apple/5.13.1-alpha.1"
+    "tag": "@@applicaster/quick-brick-native-apple/5.13.3"
   },
   "requires_arc": true,
   "source_files": "universal/**/*.{m,swift}",

package/apple/universal/ReactNative/ReactNativeManager.swift

@@ -6,6 +6,7 @@
 //  Copyright © 2018 Applicaster LTD. All rights reserved.
 //
 
+import os.log
 import React
 import UIKit
 import XrayLogger
@@ -15,12 +16,9 @@ public let kQBModuleName = "QuickBrickApp"
 public let suspendApp = "suspend"
 
 /// React Native Manager class for Quick Brick
-open class ReactNativeManager: NSObject, UserInterfaceLayerProtocol {
+open class ReactNativeManager: NSObject, UserInterfaceLayerProtocol, UserInterfaceLayerDelegate {
     lazy var logger = Logger.getLogger(for: ReactNativeManagerLogs.subsystem)
 
-    public var applicationDelegate: UIApplicationDelegate?
-    public var userNotificationCenterDelegate: UNUserNotificationCenterDelegate?
-
     static var applicationData: [String: Any] = [:]
 
     var launchOptions: [UIApplication.LaunchOptionsKey: Any]?
@@ -67,6 +65,11 @@ open class ReactNativeManager: NSObject, UserInterfaceLayerProtocol {
         return retVal
     }
 
+    // MARK: UserInterfaceLayerDelegate
+
+    public var applicationDelegate: UIApplicationDelegate?
+    public var userNotificationCenterDelegate: UNUserNotificationCenterDelegate?
+
     // MARK: UserInterfaceLayerProtocol
 
     public required init(launchOptions: [UIApplication.LaunchOptionsKey: Any]?,
@@ -90,9 +93,11 @@ open class ReactNativeManager: NSObject, UserInterfaceLayerProtocol {
         }
     }
 
-    public func currentOrientationMask() -> UIInterfaceOrientationMask? {
-        return rootViewController?.orientationStack.last
-    }
+    #if os(iOS)
+        public func currentOrientationMask() -> UIInterfaceOrientationMask? {
+            return rootViewController?.orientationStack.last
+        }
+    #endif
 
     // MARK: Public methods
 
@@ -165,6 +170,13 @@ extension ReactNativeManager: RCTBridgeDelegate {
         }
         return nil
     }
+
+    public func extraModules(for bridge: RCTBridge!) -> [RCTBridgeModule]! {
+        let qbExceptionManager = QBExceptionManager()
+        let rctException = RCTExceptionsManager(delegate: qbExceptionManager)
+
+        return [rctException, qbExceptionManager]
+    }
 }
 
 extension ReactNativeManager: QuickBrickManagerDelegate {
@@ -213,3 +225,49 @@ extension ReactNativeManager: QuickBrickManagerDelegate {
         EventsBus.post(EventsBus.Event(type: EventsBusType(.forceAppReload)))
     }
 }
+
+class QBExceptionManager: RCTExceptionsManager, RCTExceptionsManagerDelegate {
+    public lazy var logger = Logger.getLogger(for: ReactNativeManagerLogs.subsystem)
+
+    func handleSoftJSException(withMessage message: String?, stack: [Any]?, exceptionId: NSNumber) {
+        guard let message = message,
+              let stack = stack else {
+            return
+        }
+        
+        let logOrigin = OSLog(subsystem: "\(Self.self)", category: "handleSoftJSException")
+        os_log("handleSoftJSException message: %@, stack: %@",
+               log: logOrigin,
+               type: .error,
+               message, stack)
+        
+        logger?.errorLog(message: ReactNativeManagerLogs.handleSoftJSException.message,
+                         category: ReactNativeManagerLogs.handleSoftJSException.category,
+                         data: [
+                             "message": message,
+                             "stack": stack,
+                             "exceptionId": "\(exceptionId)",
+                         ])
+    }
+
+    func handleFatalJSException(withMessage message: String?, stack: [Any]?, exceptionId: NSNumber) {
+        guard let message = message,
+              let stack = stack else {
+            return
+        }
+
+        let logOrigin = OSLog(subsystem: "\(Self.self)", category: "handleFatalJSException")
+        os_log("handleFatalJSException message: %{public}@, stack: %{public}@",
+               log: logOrigin,
+               type: .error,
+               message, stack)
+
+        logger?.errorLog(message: ReactNativeManagerLogs.handleFatalJSException.message,
+                         category: ReactNativeManagerLogs.handleFatalJSException.category,
+                         data: [
+                             "message": message,
+                             "stack": stack,
+                             "exceptionId": "\(exceptionId)",
+                         ])
+    }
+}

package/apple/universal/Utils/XrayLoggerTemplates/ReactNativeManagerLogs.swift

@@ -19,4 +19,6 @@ public struct ReactNativeManagerLogs: XrayLoggerTemplateProtocol {
     public static var presentingReactViewController = LogTemplate(message: "Presenting React ViewController")
     public static var setRightToLeftFlagError = LogTemplate(message: "Error setting RTL")
     public static var failedToLoadJson = LogTemplate(message: "Failed to load json")
+    public static var handleSoftJSException = LogTemplate(message: "Soft JS Exception")
+    public static var handleFatalJSException = LogTemplate(message: "Fatal JS Exception")
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-native-apple",
-  "version": "5.13.1-alpha.1",
+  "version": "5.13.3",
   "description": "iOS and tvOS native code for QuickBrick applications. This package is used to provide native logic for QuickBrick",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"