Merge branch 'BNC-Server-Request-Queue-Refactoring-And-Auto-Request-Processing' into feature/remove-bridging-code

Author: wpinho-branch

.gitignore

@@ -1,4 +1,8 @@
 # Mac
+
+.build
+.vscode
+
 .DS_Store
 .LSOverride
 

Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj

@@ -3,37 +3,32 @@
 import PackageDescription
 
 let package = Package(
-    name: "ios-branch-deep-linking-attribution",
+    name: "BranchSDK",
     platforms: [
         .iOS(.v12),
         .tvOS(.v12),
     ],
     products: [
+        // Main product that clients will import
         .library(
             name: "BranchSDK",
-            targets: ["BranchSDK", "BranchSwiftSDK", "BranchObjCSDK"]),
+            targets: ["BranchSDK", "BranchSwiftSDK"]),
     ],
     dependencies: [
+        // Add external dependencies here if needed
+        // .package(url: "https://github.com/google/GoogleUtilities.git", from: "7.0.0"),
+        // .package(url: "https://github.com/firebase/nanopb.git", from: "2.30909.0"),
     ],
     targets: [
-        .target(
-            name: "BranchObjCSDK",
-            path: "Sources/BranchSDK_ObjC",
-            publicHeadersPath: "Public"
-        ),
-        .target(
-            name: "BranchSwiftSDK",
-            dependencies: ["BranchObjCSDK"], // Swift code depends on Objective-C Constants
-            path: "Sources/BranchSDK_Swift"
-            
-        ),
+        // Main Objective-C SDK target
         .target(
             name: "BranchSDK",
-            dependencies: ["BranchSwiftSDK"],
+            dependencies: [],
             path: "Sources/BranchSDK",
             publicHeadersPath: "Public",
             cSettings: [
-                .headerSearchPath("Private")
+                .headerSearchPath("Private"),
+                .define("SWIFT_PACKAGE")
             ],
             linkerSettings: [
                 .linkedFramework("CoreServices"),
@@ -42,6 +37,15 @@ let package = Package(
                 .linkedFramework("CoreSpotlight", .when(platforms: [.iOS])),
                 .linkedFramework("AdServices", .when(platforms: [.iOS]))
             ]
+        ),
+        // Swift Concurrency layer (depends on main SDK)
+        .target(
+            name: "BranchSwiftSDK",
+            dependencies: ["BranchSDK"],
+            path: "Sources/BranchSwiftSDK",
+            swiftSettings: [
+                .define("SWIFT_PACKAGE")
+            ]
         )
     ]
 )

Branch-TestBed/Branch-TestBed.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -33,16 +33,20 @@
 #import "BNCAppGroupsData.h"
 #import "BNCSKAdNetwork.h"
 
-#if SWIFT_PACKAGE
-@import BranchSwiftSDK;
-#else
+// Swift integration - BranchSwiftSDK module is loaded dynamically at runtime
+// No compile-time import needed to avoid circular dependencies in SPM
+#if !SWIFT_PACKAGE
+// Swift bridging header - auto-generated by Xcode when Swift files are present
+#if __has_include("BranchSDK/BranchSDK-Swift.h")
 #import "BranchSDK/BranchSDK-Swift.h"
 #endif
+#endif
 
 
 #import "BNCReferringURLUtility.h"
 #import "BNCPasteboard.h"
 #import "BNCODMInfoCollector.h"
+#import "Private/BranchConfigurationController.h"
 
 @interface BNCRequestFactory()
 
@@ -438,7 +442,31 @@ - (void)addLocalURLToOpenJSON:(NSMutableDictionary *)json {
 
 // If the client uses a UIPasteControl, force a new open to fetch the payload
 - (void)addOperationalMetrics:(NSMutableDictionary *)json {
-    [self safeSetValue:[[ConfigurationController shared] getConfiguration] forKey:BRANCH_REQUEST_KEY_OPERATIONAL_METRICS onDict:json];
+    // Try Swift ConfigurationController first, fallback to Objective-C if not available
+    id configuration = nil;
+
+    // Check if Swift ConfigurationController is available
+    Class swiftConfigClass = NSClassFromString(@"ConfigurationController");
+    if (swiftConfigClass) {
+        SEL sharedSelector = NSSelectorFromString(@"shared");
+        if ([swiftConfigClass respondsToSelector:sharedSelector]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+            id sharedInstance = [swiftConfigClass performSelector:sharedSelector];
+            SEL getConfigSelector = NSSelectorFromString(@"getConfiguration");
+            if ([sharedInstance respondsToSelector:getConfigSelector]) {
+                configuration = [sharedInstance performSelector:getConfigSelector];
+            }
+#pragma clang diagnostic pop
+        }
+    }
+
+    // Fallback to Objective-C implementation
+    if (!configuration) {
+        configuration = [[BranchConfigurationController sharedInstance] getConfiguration];
+    }
+
+    [self safeSetValue:configuration forKey:BRANCH_REQUEST_KEY_OPERATIONAL_METRICS onDict:json];
 }
 
 

BranchSDK.xcodeproj/project.pbxproj

@@ -0,0 +1,14 @@
+//
+//  Branch-Bridging-Header.h
+//  Branch SDK
+//
+//  Bridging header to expose Objective-C types to Swift within the Branch target
+//
+
+#import "Public/Branch.h"
+#import "Public/BNCServerRequest.h"
+#import "Public/BNCServerInterface.h"
+#import "Public/BNCServerResponse.h"
+#import "Public/BNCPreferenceHelper.h"
+#import "Public/BranchLogger.h"
+#import "Private/NSError+Branch.h"

Package.swift

@@ -45,12 +45,17 @@
 #import "BNCServerAPI.h"
 #import "BranchPluginSupport.h"
 #import "BranchLogger.h"
+#import "Private/BranchConfigurationController.h"
 
 
-#if SWIFT_PACKAGE
-@import BranchSwiftSDK;
-#else
-#import "BranchSDK/BranchSDK-Swift.h"
+
+// Swift integration - BranchSwiftSDK module is loaded dynamically at runtime
+// No compile-time import needed to avoid circular dependencies in SPM
+#if !SWIFT_PACKAGE
+// Swift bridging header - auto-generated by Xcode when Swift files are present
+#if __has_include("BranchSDK-Swift.h")
+#import "BranchSDK-Swift.h"
+#endif
 #endif
 
 #if !TARGET_OS_TV
@@ -194,7 +199,7 @@ + (Branch *)getInstance {
 
 + (Branch *)getInstance:(NSString *)branchKey {
     self.branchKey = branchKey;
-    [ConfigurationController shared].branchKeySource = BRANCH_KEY_SOURCE_GET_INSTANCE_API;
+    [BranchConfigurationController sharedInstance].branchKeySource = BRANCH_KEY_SOURCE_GET_INSTANCE_API;
     return [Branch getInstanceInternal:self.branchKey];
 }
 
@@ -254,8 +259,8 @@ - (id)initWithInterface:(BNCServerInterface *)interface
 
     BranchJsonConfig *config = BranchJsonConfig.instance;
     self.deferInitForPluginRuntime = config.deferInitForPluginRuntime;
-    [ConfigurationController shared].deferInitForPluginRuntime = self.deferInitForPluginRuntime;
-    
+    [BranchConfigurationController sharedInstance].deferInitForPluginRuntime = self.deferInitForPluginRuntime;
+
     if (config.apiUrl) {
         [Branch setAPIUrl:config.apiUrl];
     }
@@ -282,6 +287,7 @@ - (id)initWithInterface:(BNCServerInterface *)interface
         }
     }
 
+    [self.requestQueue configureWithServerInterface:_serverInterface branchKey:key preferenceHelper:preferenceHelper];
     return self;
 }
 
@@ -416,7 +422,7 @@ + (void)setBranchKey:(NSString*)branchKey error:(NSError **)error {
             [[BranchLogger shared] logError:[NSString stringWithFormat:@"Invalid Branch key format. Did you add your Branch key to your Info.plist? Passed key is '%@'.", branchKey] error:*error];
             return;
         }
-        [ConfigurationController shared].branchKeySource = BRANCH_KEY_SOURCE_SET_BRANCH_KEY_API;
+        [BranchConfigurationController sharedInstance].branchKeySource = BRANCH_KEY_SOURCE_SET_BRANCH_KEY_API;
         bnc_branchKey = branchKey;
     }
 }
@@ -452,7 +458,7 @@ + (NSString *)branchKey {
         if (!bnc_branchKey) {
             [[BranchLogger shared] logError:@"Your Branch key is not set in your Info.plist file. See https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/#configure-xcode-project for configuration instructions." error:nil];
         }
-        [ConfigurationController shared].branchKeySource = branchKeySource;
+        [BranchConfigurationController sharedInstance].branchKeySource = branchKeySource;
         return bnc_branchKey;
     }
 }
@@ -1014,7 +1020,7 @@ - (void)startLoadingOfODMInfo {
 
 - (void)checkPasteboardOnInstall {
     [BNCPasteboard sharedInstance].checkOnInstall = YES;
-    [ConfigurationController shared].checkPasteboardOnInstall = YES;
+    [BranchConfigurationController sharedInstance].checkPasteboardOnInstall = YES;
 }
 
 - (BOOL)willShowPasteboardToast {
@@ -1150,7 +1156,6 @@ - (void)sendServerRequest:(BNCServerRequest*)request {
     [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         [self.requestQueue enqueue:request];
-        [self processNextQueueItem];
     });
 }
 
@@ -1350,7 +1355,6 @@ - (void)getSpotlightUrlWithParams:(NSDictionary *)params callback:(callbackWithP
     dispatch_async(self.isolationQueue, ^(){
         BranchSpotlightUrlRequest *req = [[BranchSpotlightUrlRequest alloc] initWithParams:params callback:callback];
         [self.requestQueue enqueue:req];
-        [self processNextQueueItem];
     });
 }
 
@@ -1646,7 +1650,6 @@ - (void)generateShortUrl:(NSArray *)tags
                                                                        linkCache:self.linkCache
                                                                         callback:callback];
         [self.requestQueue enqueue:req];
-        [self processNextQueueItem];
     });
 }
 
@@ -1875,14 +1878,6 @@ - (void)setNetworkCount:(NSInteger)networkCount {
     }
 }
 
-- (void)insertRequestAtFront:(BNCServerRequest *)req {
-    if (self.networkCount == 0) {
-        [self.requestQueue insert:req at:0];
-    } else {
-        [self.requestQueue insert:req at:1];
-    }
-}
-
 static inline void BNCPerformBlockOnMainThreadSync(dispatch_block_t block) {
     if (block) {
         if ([NSThread isMainThread]) {
@@ -1902,7 +1897,7 @@ - (void) processRequest:(BNCServerRequest*)req
                   error:(NSError*)error {
 
     // If the request was successful, or was a bad user request, continue processing.
-    if (!error ||
+   /* if (!error ||
         error.code == BNCTrackingDisabledError ||
         error.code == BNCBadRequestError ||
         error.code == BNCDuplicateResourceError) {
@@ -1956,7 +1951,7 @@ - (void) processRequest:(BNCServerRequest*)req
                 }
             });
         }
-    }
+    }*/
 }
 
 - (BOOL)isReplayableRequest:(BNCServerRequest *)request {
@@ -1980,6 +1975,7 @@ - (BOOL)isReplayableRequest:(BNCServerRequest *)request {
 }
 
 - (void)processNextQueueItem {
+    /*
     dispatch_semaphore_wait(self.processing_sema, DISPATCH_TIME_FOREVER);
     
     [[BranchLogger shared] logVerbose:[NSString stringWithFormat:@"Processing next queue item. Network Count: %ld. Queue depth: %ld", (long)self.networkCount, (long)self.requestQueue.queueDepth] error:nil];
@@ -2027,7 +2023,7 @@ - (void)processNextQueueItem {
     }
     else {
         dispatch_semaphore_signal(self.processing_sema);
-    }
+    }*/
 }
 
 - (void)clearNetworkQueue {
@@ -2166,7 +2162,7 @@ - (void)initializeSessionAndCallCallback:(BOOL)callCallback sceneIdentifier:(NSS
                 req.callback = initSessionCallback;
                 req.urlString = urlString;
 
-                [self.requestQueue insert:req at:0];
+                [self.requestQueue enqueue:req withPriority:NSOperationQueuePriorityHigh];
 
                 NSString *message = [NSString stringWithFormat:@"Request %@ callback %@ link %@", req, req.callback, req.urlString];
                 [[BranchLogger shared] logDebug:message error:nil];
@@ -2180,7 +2176,7 @@ - (void)initializeSessionAndCallCallback:(BOOL)callCallback sceneIdentifier:(NSS
                     req.urlString = urlString;
 
                     // put it behind the one that's already on queue
-                    [self.requestQueue insert:req at:1];
+                    [self.requestQueue enqueue:req withPriority:NSOperationQueuePriorityHigh];
 
                     [[BranchLogger shared] logDebug:@"Link resolution request" error:nil];
                     NSString *message = [NSString stringWithFormat:@"Request %@ callback %@ link %@", req, req.callback, req.urlString];
@@ -2190,8 +2186,6 @@ - (void)initializeSessionAndCallCallback:(BOOL)callCallback sceneIdentifier:(NSS
 
             self.initializationStatus = BNCInitStatusInitializing;
             [[BranchLogger shared] logVerbose:[NSString stringWithFormat:@"initializationStatus %ld", self.initializationStatus] error:nil];
-
-            [self processNextQueueItem];
         });
     }
 }