@procivis/react-native-one-core 1.26999.0 → 1.41710.0

package/ios/Util.swift

@@ -6,9 +6,10 @@
 //
 
 import Foundation
+import ProcivisOneCore
 
 // Error handling
-func asyncCall<Result>(_ resolve: @escaping RCTPromiseResolveBlock,
+func syncCall<Result>(_ resolve: @escaping RCTPromiseResolveBlock,
                        _ reject: @escaping RCTPromiseRejectBlock, _ function: () throws -> Result) {
     do {
         resolve(try function());
@@ -17,31 +18,27 @@ func asyncCall<Result>(_ resolve: @escaping RCTPromiseResolveBlock,
     }
 }
 
-private let errorMessageRegex = try! NSRegularExpression(pattern: "^([a-zA-Z0-9]+)\\(message\\: \\\"(.*)\\\"\\)$", options: [])
-private func handleError(error: Error, _ reject: @escaping RCTPromiseRejectBlock) {
-    
-    let input = String(describing: error);
-    let inputRange = NSMakeRange(0, input.count)
-    let result = errorMessageRegex.matches(in: input, options: [], range: inputRange)
-    
-    guard let match = result.first else {
-        reject("UnknownError", input, error)
-        return
-    }
-    
-    if (match.numberOfRanges != 3) {
-        reject("UnknownError", input, error)
-        return
+func asyncCall<Result>(_ resolve: @escaping RCTPromiseResolveBlock,
+                        _ reject: @escaping RCTPromiseRejectBlock, _ function: @escaping () async throws -> Result) {
+    Task {
+        do {
+            resolve(try await function());
+        } catch {
+            handleError(error: error, reject);
+        }
     }
-    
-    let codeRange = Range(match.range(at: 1), in: input)
-    let messageRange = Range(match.range(at: 2), in: input)
-    guard let c = codeRange, let m = messageRange else {
-        reject("UnknownError", input, error)
+}
+
+private func handleError(error: Error, _ reject: @escaping RCTPromiseRejectBlock) {
+    if case BindingError.ErrorResponse(data: let errorResponse) = error {
+        var userInfo: [String: Any] = [NSUnderlyingErrorKey: error]
+        if let cause = errorResponse.cause?.message {
+            userInfo["cause"] = cause
+        }
+        
+        reject(errorResponse.code, errorResponse.message, NSError(domain: "one-core", code: 1, userInfo: userInfo))
         return
     }
     
-    let code = String(input[c])
-    let message = String(input[m])
-    reject(code, message, error)
+    reject("UnknownError", String(describing: error), error)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@procivis/react-native-one-core",
-  "version": "1.26999.0",
+  "version": "1.41710.0",
   "author": "Procivis AG (https://procivis.ch)",
   "license": "Apache-2.0",
   "description": "ONE core bindings for React Native",
@@ -31,10 +31,11 @@
   "devDependencies": {
     "@babel/core": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
-    "@types/react-native": "0.71.6",
+    "react-native": "0.72.17",
     "babel-jest": "^29.5.0",
     "husky": "^7.0.4",
     "jest": "^29.5.0",
     "typescript": "^5.1.6"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

package/react-native-one-core.podspec

@@ -16,11 +16,11 @@ Pod::Spec.new do |s|
   s.source                  = { :git => "https://gitlab.procivis.ch/procivis/one/react-native-one-core.git" }
   s.source_files            = "ios/**/*.{h,m,swift}"
   s.requires_arc            = true
-  s.ios.vendored_frameworks = "ios/one_coreFFI.xcframework"
+  s.ios.vendored_frameworks = "ios/ProcivisOneCore.xcframework", "ios/ProcivisOneCoreFFI.xcframework", "ios/UBQKit.xcframework"
   s.prepare_command         = <<-CMD
                               FRAMEWORK_URL=#{sdk['url']}
                               SHA_1_CHECKSUM=#{sdk['sha1']}
-                              if [ ! -d ./ios/one_coreFFI.xcframework ]; then
+                              if [ ! -d ./ios/ProcivisOneCore.xcframework ]; then
                                 echo "Downloading ONE Core Framework"
                                 curl -L -o ./ios/deploy.zip $FRAMEWORK_URL
                                 pushd ./ios >/dev/null
@@ -33,9 +33,8 @@ Pod::Spec.new do |s|
                                   exit 2
                                 fi
                                 popd >/dev/null
-                                unzip ./ios/deploy.zip "ios/one_core/Sources/*" >/dev/null
-                                mv ./ios/one_core/Sources/* ./ios
-                                rm -rf ./ios/one_core ./ios/deploy.zip
+                                unzip ./ios/deploy.zip "ios/*" >/dev/null
+                                rm ./ios/deploy.zip
                               fi
                               CMD