@onekeyfe/react-native-split-bundle-loader 1.1.52 → 1.1.54

package/android/src/main/java/com/splitbundleloader/SplitBundleLoaderModule.kt

@@ -135,15 +135,18 @@ class SplitBundleLoaderModule(reactContext: ReactApplicationContext) :
             // #19: Try CatalystInstance first (bridge mode), fall back to
             // ReactHost registerSegment if available (bridgeless / new arch).
             val reactContext = reactApplicationContext
+            val segStart = System.nanoTime()
             if (reactContext.hasCatalystInstance()) {
                 reactContext.catalystInstance.registerSegment(segId, absolutePath)
-                SBLLogger.info("Loaded segment $segmentKey (id=$segId)")
+                val segMs = (System.nanoTime() - segStart) / 1_000_000.0
+                SBLLogger.info("[SplitBundle] segment $segmentKey (id=$segId) registered in ${String.format("%.1f", segMs)}ms")
                 promise.resolve(null)
             } else {
                 // Bridgeless: try ReactHost via reflection
                 val registered = tryRegisterViaBridgeless(segId, absolutePath)
+                val segMs = (System.nanoTime() - segStart) / 1_000_000.0
                 if (registered) {
-                    SBLLogger.info("Loaded segment $segmentKey (id=$segId) via bridgeless")
+                    SBLLogger.info("[SplitBundle] segment $segmentKey (id=$segId) registered via bridgeless in ${String.format("%.1f", segMs)}ms")
                     promise.resolve(null)
                 } else {
                     promise.reject(

package/ios/SplitBundleLoader.mm

@@ -1,14 +1,11 @@
 #import "SplitBundleLoader.h"
 #import "SBLLogger.h"
-#import <React/RCTBridge.h>
+#import <ReactCommon/RCTHost.h>
+#import <ReactCommon/RCTHost+Internal.h>
+#import <ReactCommon/RCTInstance.h>
 #import <objc/runtime.h>
 #include <jsi/jsi.h>
 
-// Bridgeless (New Architecture) support: RCTHost segment registration
-@interface RCTHost (SplitBundle)
-- (void)registerSegmentWithId:(NSNumber *)segmentId path:(NSString *)path;
-@end
-
 @implementation SplitBundleLoader
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
@@ -66,26 +63,16 @@
 
 // MARK: - Segment registration helper
 
-/// Registers a segment with the current runtime, supporting both legacy bridge
-/// and bridgeless (RCTHost) architectures (#13).
+/// Registers a segment with the current runtime via bridgeless (RCTHost) architecture (#13).
 ///
 /// Thread safety (#57): This method is called from the TurboModule (JS thread).
-/// RCTBridge.registerSegmentWithId:path: internally registers the segment with
-/// the Hermes runtime on the JS thread, which is the correct calling context.
 /// No queue dispatch is needed.
 + (BOOL)registerSegment:(int)segmentId path:(NSString *)path error:(NSError **)outError
 {
-    // Try legacy bridge first
-    RCTBridge *bridge = [RCTBridge currentBridge];
-    if (bridge && [bridge respondsToSelector:@selector(registerSegmentWithId:path:)]) {
-        [bridge registerSegmentWithId:@(segmentId) path:path];
-        return YES;
-    }
-
-    // Try bridgeless RCTHost via AppDelegate
+    // Bridgeless (New Architecture): get RCTHost via AppDelegate
     id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
     if ([appDelegate respondsToSelector:NSSelectorFromString(@"reactHost")]) {
-        id host = [appDelegate performSelector:NSSelectorFromString(@"reactHost")];
+        RCTHost *host = [appDelegate performSelector:NSSelectorFromString(@"reactHost")];
         if (host && [host respondsToSelector:@selector(registerSegmentWithId:path:)]) {
             [host registerSegmentWithId:@(segmentId) path:path];
             return YES;
@@ -95,7 +82,7 @@
     if (outError) {
         *outError = [NSError errorWithDomain:@"SplitBundleLoader"
                                         code:1
-                                    userInfo:@{NSLocalizedDescriptionKey: @"Neither RCTBridge nor RCTHost available for segment registration"}];
+                                    userInfo:@{NSLocalizedDescriptionKey: @"RCTHost not available for segment registration"}];
     }
     return NO;
 }
@@ -205,7 +192,7 @@
     return;
   }
 
-  id instance = object_getIvar(host, ivar);
+  RCTInstance *instance = object_getIvar(host, ivar);
   if (!instance) {
     [SBLLogger warn:@"loadEntryBundle: _instance is nil"];
     return;
@@ -218,15 +205,22 @@
   }
 
   NSString *sourceURL = bundlePath.lastPathComponent ?: bundlePath;
-  [SBLLogger info:[NSString stringWithFormat:@"loadEntryBundle: evaluating %@ (%lu bytes)", sourceURL, (unsigned long)data.length]];
+  CFAbsoluteTime startTime = CFAbsoluteTimeGetCurrent();
+  [SBLLogger info:[NSString stringWithFormat:@"[SplitBundle] loadEntryBundle: evaluating %@ (%lu bytes)", sourceURL, (unsigned long)data.length]];
 
   [instance callFunctionOnBufferedRuntimeExecutor:^(facebook::jsi::Runtime &runtime) {
     @autoreleasepool {
+      CFAbsoluteTime evalStart = CFAbsoluteTimeGetCurrent();
       auto buffer = std::make_shared<facebook::jsi::StringBuffer>(
         std::string(static_cast<const char *>(data.bytes), data.length));
       runtime.evaluateJavaScript(std::move(buffer), [sourceURL UTF8String]);
+      double evalMs = (CFAbsoluteTimeGetCurrent() - evalStart) * 1000.0;
+      [SBLLogger info:[NSString stringWithFormat:@"[SplitBundle] loadEntryBundle: %@ evaluated in %.1fms", sourceURL, evalMs]];
     }
   }];
+
+  double totalMs = (CFAbsoluteTimeGetCurrent() - startTime) * 1000.0;
+  [SBLLogger info:[NSString stringWithFormat:@"[SplitBundle] loadEntryBundle: %@ dispatched in %.1fms (eval is async)", sourceURL, totalMs]];
 }
 
 // MARK: - loadSegment
@@ -240,6 +234,7 @@
 {
     @try {
         int segId = (int)segmentId;
+        CFAbsoluteTime segStart = CFAbsoluteTimeGetCurrent();
 
         // Path traversal guard (#45)
         if ([relativePath containsString:@".."]) {
@@ -261,7 +256,8 @@
         // Register segment (#13: supports both bridge and bridgeless)
         NSError *regError = nil;
         if ([SplitBundleLoader registerSegment:segId path:absolutePath error:&regError]) {
-            [SBLLogger info:[NSString stringWithFormat:@"Loaded segment %@ (id=%d)", segmentKey, segId]];
+            double segMs = (CFAbsoluteTimeGetCurrent() - segStart) * 1000.0;
+            [SBLLogger info:[NSString stringWithFormat:@"[SplitBundle] Loaded segment %@ (id=%d) in %.1fms", segmentKey, segId, segMs]];
             resolve(nil);
         } else {
             reject(@"SPLIT_BUNDLE_NO_RUNTIME",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-split-bundle-loader",
-  "version": "1.1.52",
+  "version": "1.1.54",
   "description": "react-native-split-bundle-loader",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",