@bm-fe/react-native-multi-bundle 1.0.0-beta.6 → 1.0.0-beta.9

package/ios/ModuleLoader/ModuleLoaderModule.mm

@@ -3,6 +3,10 @@
 #import <React/RCTBridge.h>
 #import <React/RCTUtils.h>
 #import <React/RCTLog.h>
+#import <objc/runtime.h>
+#import <jsi/jsi.h>
+
+using namespace facebook;
 
 @implementation ModuleLoaderModule
 
@@ -87,176 +91,202 @@ static NSString *const BundleManifestFileName = @"bundle-manifest.json";
 #pragma mark - Bridge Access
 
 /**
- * 获取当前的 RCTBridge
+ * 获取当前的 RCTBridge（类似 Android 的 ReactContext）
  */
 - (RCTBridge *)getCurrentBridge {
-    // 方法 1: 使用模块自带的 bridge
+    // 方法 1: 使用模块自带的 bridge（最可靠）
     if (self.bridge) {
+        RCTLogInfo(@"[ModuleLoader] Using self.bridge: %@", NSStringFromClass([self.bridge class]));
         return self.bridge;
     }
 
-    // 方法 2: 从 AppDelegate 获取
+    // 方法 2: 使用静态方法获取当前 bridge
+    RCTBridge *currentBridge = [RCTBridge currentBridge];
+    if (currentBridge) {
+        RCTLogInfo(@"[ModuleLoader] Using [RCTBridge currentBridge]: %@", NSStringFromClass([currentBridge class]));
+        return currentBridge;
+    }
+
+    // 方法 3: 从 AppDelegate 获取
     UIApplication *app = [UIApplication sharedApplication];
     id delegate = app.delegate;
 
     if ([delegate respondsToSelector:@selector(bridge)]) {
         RCTBridge *bridge = [delegate performSelector:@selector(bridge)];
-        if (bridge) return bridge;
-    }
-
-    // 方法 3: 通过 reactNativeHost
-    if ([delegate respondsToSelector:@selector(reactNativeHost)]) {
-        id reactNativeHost = [delegate performSelector:@selector(reactNativeHost)];
-        if (reactNativeHost && [reactNativeHost respondsToSelector:@selector(bridge)]) {
-            RCTBridge *bridge = [reactNativeHost performSelector:@selector(bridge)];
-            if (bridge) return bridge;
+        if (bridge) {
+            RCTLogInfo(@"[ModuleLoader] Using AppDelegate.bridge: %@", NSStringFromClass([bridge class]));
+            return bridge;
         }
     }
 
-    // 方法 4: 通过 rootViewFactory (新架构)
+    // 方法 4: 通过 rootViewFactory
     if ([delegate respondsToSelector:@selector(rootViewFactory)]) {
         id factory = [delegate performSelector:@selector(rootViewFactory)];
         if (factory && [factory respondsToSelector:@selector(bridge)]) {
             RCTBridge *bridge = [factory performSelector:@selector(bridge)];
-            if (bridge) return bridge;
+            if (bridge) {
+                RCTLogInfo(@"[ModuleLoader] Using rootViewFactory.bridge: %@", NSStringFromClass([bridge class]));
+                return bridge;
+            }
         }
     }
 
+    RCTLogWarn(@"[ModuleLoader] Could not get bridge from any source");
     return nil;
 }
 
-#pragma mark - Bundle Loading Methods
+#pragma mark - Bundle Loading (JSI)
 
 /**
- * 尝试使用各种方法加载 bundle
+ * 通过 JSI Runtime 加载 bundle
+ * 这是 RN 新架构 (RCTBridgeProxy) 下加载子 bundle 的唯一方式
  */
-- (BOOL)tryLoadBundle:(NSString *)bundleContent
-            sourceURL:(NSURL *)sourceURL
-               bridge:(RCTBridge *)bridge
-                error:(NSError **)outError {
+- (BOOL)loadScriptViaJSI:(NSString *)filePath
+               sourceURL:(NSURL *)sourceURL
+                  bridge:(id)bridge
+                   error:(NSError **)outError {
+
+    RCTLogInfo(@"[ModuleLoader] Loading script via JSI Runtime");
+
+    // 读取 bundle 数据
+    NSError *readError = nil;
+    NSData *bundleData = [NSData dataWithContentsOfFile:filePath options:0 error:&readError];
+    if (readError || !bundleData) {
+        if (outError) {
+            *outError = readError ?: [NSError errorWithDomain:@"ModuleLoader"
+                                                         code:1001
+                                                     userInfo:@{NSLocalizedDescriptionKey: @"Failed to read bundle file"}];
+        }
+        return NO;
+    }
 
-    // 获取 batchedBridge（在新旧架构中都可能存在）
-    id targetBridge = bridge;
-    @try {
-        if ([bridge respondsToSelector:@selector(batchedBridge)]) {
-            id batchedBridge = [bridge performSelector:@selector(batchedBridge)];
-            if (batchedBridge) {
-                targetBridge = batchedBridge;
-                RCTLogInfo(@"[ModuleLoader] Using batchedBridge");
-            }
+    RCTLogInfo(@"[ModuleLoader] Bundle data loaded: %lu bytes", (unsigned long)bundleData.length);
+
+    // 获取 JSI runtime
+    void *runtimePtr = nil;
+
+    // 方法 1: 使用 runtime 方法
+    SEL runtimeSel = NSSelectorFromString(@"runtime");
+    if ([bridge respondsToSelector:runtimeSel]) {
+        NSMethodSignature *sig = [bridge methodSignatureForSelector:runtimeSel];
+        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:sig];
+        [invocation setTarget:bridge];
+        [invocation setSelector:runtimeSel];
+        [invocation invoke];
+        [invocation getReturnValue:&runtimePtr];
+        RCTLogInfo(@"[ModuleLoader] Got runtime via runtime method: %p", runtimePtr);
+    }
+
+    // 方法 2: 直接访问 _runtime ivar
+    if (!runtimePtr) {
+        Ivar runtimeIvar = class_getInstanceVariable([bridge class], "_runtime");
+        if (runtimeIvar) {
+            runtimePtr = (__bridge void *)object_getIvar(bridge, runtimeIvar);
+            RCTLogInfo(@"[ModuleLoader] Got runtime via _runtime ivar: %p", runtimePtr);
         }
-    } @catch (NSException *e) {
-        RCTLogWarn(@"[ModuleLoader] Could not get batchedBridge: %@", e.reason);
     }
 
-    // 方法 1: 尝试 executeSourceCode:withSourceURL:onComplete: (新架构可能支持)
-    SEL executeWithCompleteSel = NSSelectorFromString(@"executeSourceCode:withSourceURL:onComplete:");
-    if ([targetBridge respondsToSelector:executeWithCompleteSel]) {
-        @try {
-            RCTLogInfo(@"[ModuleLoader] Trying executeSourceCode:withSourceURL:onComplete:");
-            NSData *sourceData = [bundleContent dataUsingEncoding:NSUTF8StringEncoding];
-
-            __block BOOL completed = NO;
-            __block NSError *execError = nil;
-
-            void (^onComplete)(NSError *) = ^(NSError *error) {
-                execError = error;
-                completed = YES;
-            };
-
-            NSMethodSignature *sig = [targetBridge methodSignatureForSelector:executeWithCompleteSel];
-            NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:sig];
-            [invocation setTarget:targetBridge];
-            [invocation setSelector:executeWithCompleteSel];
-            [invocation setArgument:&sourceData atIndex:2];
-            [invocation setArgument:&sourceURL atIndex:3];
-            [invocation setArgument:&onComplete atIndex:4];
-            [invocation invoke];
-
-            RCTLogInfo(@"[ModuleLoader] Bundle loaded via executeSourceCode:withSourceURL:onComplete:");
-            return YES;
-        } @catch (NSException *e) {
-            RCTLogWarn(@"[ModuleLoader] executeSourceCode:withSourceURL:onComplete: failed: %@", e.reason);
+    if (!runtimePtr) {
+        if (outError) {
+            *outError = [NSError errorWithDomain:@"ModuleLoader"
+                                            code:1003
+                                        userInfo:@{NSLocalizedDescriptionKey: @"Could not get JSI runtime from bridge"}];
         }
+        return NO;
     }
 
-    // 方法 2: 尝试通过 CatalystInstance（旧架构）
-    id catalystInstance = nil;
-    @try {
-        catalystInstance = [targetBridge valueForKey:@"_catalystInstance"];
-    } @catch (NSException *e) {
-        // 继续尝试其他方法
+    // 转换为 jsi::Runtime
+    jsi::Runtime *runtime = static_cast<jsi::Runtime *>(runtimePtr);
+
+    // 转换 NSData 为字符串
+    NSString *scriptString = [[NSString alloc] initWithData:bundleData encoding:NSUTF8StringEncoding];
+    if (!scriptString) {
+        if (outError) {
+            *outError = [NSError errorWithDomain:@"ModuleLoader"
+                                            code:1004
+                                        userInfo:@{NSLocalizedDescriptionKey: @"Failed to convert bundle data to string"}];
+        }
+        return NO;
     }
 
-    if (catalystInstance) {
-        RCTLogInfo(@"[ModuleLoader] Found CatalystInstance, trying legacy methods");
-
-        // 方法 2a: loadScriptFromString:sourceURL:
-        SEL loadScriptSel = NSSelectorFromString(@"loadScriptFromString:sourceURL:");
-        if ([catalystInstance respondsToSelector:loadScriptSel]) {
-            @try {
-                #pragma clang diagnostic push
-                #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-                [catalystInstance performSelector:loadScriptSel withObject:bundleContent withObject:sourceURL];
-                #pragma clang diagnostic pop
-                RCTLogInfo(@"[ModuleLoader] Bundle loaded via loadScriptFromString");
-                return YES;
-            } @catch (NSException *e) {
-                RCTLogWarn(@"[ModuleLoader] loadScriptFromString failed: %@", e.reason);
-            }
+    std::string script = std::string([scriptString UTF8String]);
+    std::string sourceURLStr = std::string([[sourceURL absoluteString] UTF8String]);
+
+    // 尝试获取 dispatchToJSThread 或使用 invokeAsync
+    __block BOOL success = NO;
+    __block NSError *evalError = nil;
+
+    // 创建执行 block
+    void (^executeBlock)(void) = ^{
+        @try {
+            auto buffer = std::make_shared<jsi::StringBuffer>(script);
+            runtime->evaluateJavaScript(buffer, sourceURLStr);
+            RCTLogInfo(@"[ModuleLoader] ✅ Bundle executed via JSI evaluateJavaScript");
+            success = YES;
+        } @catch (NSException *e) {
+            RCTLogError(@"[ModuleLoader] JSI evaluateJavaScript failed: %@", e.reason);
+            evalError = [NSError errorWithDomain:@"ModuleLoader"
+                                            code:1005
+                                        userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"JSI evaluation failed: %@", e.reason]}];
         }
+    };
 
-        // 方法 2b: executeSourceCode:sync:
-        SEL executeSel = NSSelectorFromString(@"executeSourceCode:sync:");
-        if ([catalystInstance respondsToSelector:executeSel]) {
-            @try {
-                #pragma clang diagnostic push
-                #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-                [catalystInstance performSelector:executeSel withObject:bundleContent withObject:@NO];
-                #pragma clang diagnostic pop
-                RCTLogInfo(@"[ModuleLoader] Bundle loaded via executeSourceCode:sync:");
-                return YES;
-            } @catch (NSException *e) {
-                RCTLogWarn(@"[ModuleLoader] executeSourceCode:sync: failed: %@", e.reason);
-            }
+    // 方法 1: 使用 invokeAsync (RCTBridge 的标准方法)
+    SEL invokeAsyncSel = NSSelectorFromString(@"invokeAsync:");
+    if ([bridge respondsToSelector:invokeAsyncSel]) {
+        RCTLogInfo(@"[ModuleLoader] Using invokeAsync: to dispatch to JS thread");
+
+        dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+        void (^wrappedBlock)(void) = ^{
+            executeBlock();
+            dispatch_semaphore_signal(semaphore);
+        };
+
+        #pragma clang diagnostic push
+        #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+        [bridge performSelector:invokeAsyncSel withObject:wrappedBlock];
+        #pragma clang diagnostic pop
+
+        // 等待执行完成 (最多 10 秒)
+        dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC));
+
+        if (success) {
+            return YES;
         }
-    } else {
-        RCTLogInfo(@"[ModuleLoader] CatalystInstance not available (likely new architecture)");
     }
 
-    // 方法 3: 尝试使用 RCTCxxBridge 的方法
-    if ([NSStringFromClass([targetBridge class]) containsString:@"Cxx"]) {
-        RCTLogInfo(@"[ModuleLoader] Detected RCTCxxBridge, trying Cxx-specific methods");
-
-        SEL runJSBundleSel = NSSelectorFromString(@"runJSBundle:");
-        if ([targetBridge respondsToSelector:runJSBundleSel]) {
-            @try {
-                #pragma clang diagnostic push
-                #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-                [targetBridge performSelector:runJSBundleSel withObject:sourceURL];
-                #pragma clang diagnostic pop
-                RCTLogInfo(@"[ModuleLoader] Bundle loaded via runJSBundle:");
-                return YES;
-            } @catch (NSException *e) {
-                RCTLogWarn(@"[ModuleLoader] runJSBundle: failed: %@", e.reason);
+    // 方法 2: 直接执行 (如果已经在 JS 线程或可以同步执行)
+    if (!success) {
+        RCTLogInfo(@"[ModuleLoader] Executing directly on current thread");
+
+        @try {
+            auto buffer = std::make_shared<jsi::StringBuffer>(script);
+            runtime->evaluateJavaScript(buffer, sourceURLStr);
+            RCTLogInfo(@"[ModuleLoader] ✅ Bundle executed via direct JSI evaluateJavaScript");
+            return YES;
+        } @catch (NSException *e) {
+            RCTLogError(@"[ModuleLoader] Direct JSI evaluateJavaScript failed: %@", e.reason);
+            if (outError) {
+                *outError = [NSError errorWithDomain:@"ModuleLoader"
+                                                code:1005
+                                            userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"JSI evaluation failed: %@", e.reason]}];
             }
+            return NO;
         }
     }
 
-    // 所有方法都失败
-    if (outError) {
-        *outError = [NSError errorWithDomain:@"ModuleLoader"
-                                        code:1001
-                                    userInfo:@{NSLocalizedDescriptionKey: @"No suitable bundle loading method found"}];
+    if (evalError && outError) {
+        *outError = evalError;
     }
-
-    return NO;
+    return success;
 }
 
 #pragma mark - Main Load Method
 
 /**
  * 加载子 bundle
+ * 使用 JSI Runtime 直接执行 JavaScript 代码
  */
 RCT_EXPORT_METHOD(loadBusinessBundle:(NSString *)bundleId
                   bundlePath:(NSString *)bundlePath
@@ -272,44 +302,28 @@ RCT_EXPORT_METHOD(loadBusinessBundle:(NSString *)bundleId
     }
 
     dispatch_async(dispatch_get_main_queue(), ^{
+        // 获取 bridge
         RCTBridge *bridge = [self getCurrentBridge];
-
         if (!bridge) {
             RCTLogError(@"[ModuleLoader] Bridge not available");
             resolve(@{@"success": @NO, @"errorMessage": @"BRIDGE_NOT_AVAILABLE"});
             return;
         }
 
-        // 读取 bundle 内容
-        NSError *readError = nil;
-        NSString *bundleContent = [NSString stringWithContentsOfFile:fullPath
-                                                            encoding:NSUTF8StringEncoding
-                                                               error:&readError];
-        if (readError || !bundleContent) {
-            RCTLogError(@"[ModuleLoader] Failed to read bundle: %@", readError.localizedDescription);
-            resolve(@{@"success": @NO, @"errorMessage": [NSString stringWithFormat:@"READ_ERROR: %@", readError.localizedDescription ?: @"Unknown"]});
-            return;
-        }
+        RCTLogInfo(@"[ModuleLoader] Bridge class: %@", NSStringFromClass([bridge class]));
 
+        // 使用 JSI Runtime 加载脚本
         NSURL *sourceURL = [NSURL fileURLWithPath:fullPath];
         NSError *loadError = nil;
 
-        BOOL success = [self tryLoadBundle:bundleContent sourceURL:sourceURL bridge:bridge error:&loadError];
+        BOOL success = [self loadScriptViaJSI:fullPath sourceURL:sourceURL bridge:bridge error:&loadError];
 
         if (success) {
-            RCTLogInfo(@"[ModuleLoader] Bundle loaded successfully: %@", bundleId);
+            RCTLogInfo(@"[ModuleLoader] ✅ Bundle loaded successfully: %@", bundleId);
             resolve(@{@"success": @YES});
         } else {
-            // 在 DEBUG 模式下返回成功（因为模块可能已经在主 bundle 中）
-            #if DEBUG
-            RCTLogWarn(@"[ModuleLoader] Native loading failed, but continuing (DEBUG mode)");
-            RCTLogWarn(@"[ModuleLoader] Note: In new architecture, dynamic bundle loading has limitations");
-            RCTLogWarn(@"[ModuleLoader] The module may need to be included in the main bundle");
-            resolve(@{@"success": @YES, @"warning": @"NATIVE_LOADING_FAILED_DEBUG_FALLBACK"});
-            #else
-            RCTLogError(@"[ModuleLoader] Failed to load bundle: %@", loadError.localizedDescription);
-            resolve(@{@"success": @NO, @"errorMessage": loadError.localizedDescription ?: @"UNKNOWN_ERROR"});
-            #endif
+            RCTLogError(@"[ModuleLoader] ❌ Failed to load bundle: %@", loadError.localizedDescription);
+            resolve(@{@"success": @NO, @"errorMessage": loadError.localizedDescription ?: @"LOAD_FAILED"});
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bm-fe/react-native-multi-bundle",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.9",
   "description": "React Native 多 Bundle 系统 - 支持模块按需加载和独立更新",
   "main": "src/index.ts",
   "types": "src/index.ts",