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

package/ios/ModuleLoader/ModuleLoaderModule.mm

@@ -14,115 +14,249 @@ RCT_EXPORT_MODULE(ModuleLoader);
 // Bundle manifest file name
 static NSString *const BundleManifestFileName = @"bundle-manifest.json";
 
+#pragma mark - Bundle Path Resolution
+
 /**
  * 获取 bundle 文件的完整路径
- * 查找顺序：
- * 1. CodePush 目录（如果可用）
- * 2. MainBundle 的 Bundles 目录
- * 3. MainBundle 根目录
- * 4. MainBundle 的 assets 目录
- * 5. Documents 目录
  */
 - (NSString *)getFullBundlePath:(NSString *)bundlePath {
-    // bundlePath 格式可能是 "modules/home.jsbundle" 或 "home.jsbundle"
     NSString *fileName = [bundlePath lastPathComponent];
     NSString *relativePath = bundlePath;
-    
-    // 如果路径包含 "modules/"，提取文件名
+
     if ([bundlePath containsString:@"modules/"]) {
         fileName = [bundlePath lastPathComponent];
         relativePath = [NSString stringWithFormat:@"modules/%@", fileName];
     }
-    
-    // 使用 NSMutableArray 来避免 nil 值问题
+
     NSMutableArray<NSString *> *searchPaths = [NSMutableArray array];
-    
-    // CodePush 路径（如果可用）
+
+    // CodePush 路径
     NSString *codePushPath = [self getCodePushBundlePath:bundlePath];
     if (codePushPath) {
         [searchPaths addObject:codePushPath];
     }
-    
+
     // MainBundle/Bundles/modules/xxx.jsbundle
     NSString *path1 = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:[@"Bundles/" stringByAppendingString:relativePath]];
-    if (path1) {
-        [searchPaths addObject:path1];
-    }
-    
-    // MainBundle/Bundles/xxx.jsbundle (直接文件名)
+    if (path1) [searchPaths addObject:path1];
+
+    // MainBundle/Bundles/xxx.jsbundle
     NSString *path2 = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:[@"Bundles/" stringByAppendingString:fileName]];
-    if (path2) {
-        [searchPaths addObject:path2];
-    }
-    
-    // MainBundle 根目录下的完整路径
+    if (path2) [searchPaths addObject:path2];
+
+    // MainBundle 根目录
     NSString *path3 = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:bundlePath];
-    if (path3) {
-        [searchPaths addObject:path3];
-    }
-    
-    // MainBundle 根目录下的文件名
+    if (path3) [searchPaths addObject:path3];
+
     NSString *path4 = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:fileName];
-    if (path4) {
-        [searchPaths addObject:path4];
-    }
-    
-    // MainBundle/resourcePath 下的完整路径
+    if (path4) [searchPaths addObject:path4];
+
+    // resourcePath
     NSString *path5 = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:bundlePath];
-    if (path5) {
-        [searchPaths addObject:path5];
-    }
-    
-    // MainBundle/resourcePath 下的文件名
+    if (path5) [searchPaths addObject:path5];
+
     NSString *path6 = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:fileName];
-    if (path6) {
-        [searchPaths addObject:path6];
-    }
-    
+    if (path6) [searchPaths addObject:path6];
+
     // Documents 目录
     NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
     if (documentsPath) {
         NSString *path7 = [documentsPath stringByAppendingPathComponent:bundlePath];
-        if (path7) {
-            [searchPaths addObject:path7];
-        }
+        if (path7) [searchPaths addObject:path7];
     }
-    
+
     for (NSString *fullPath in searchPaths) {
         if (fullPath && [[NSFileManager defaultManager] fileExistsAtPath:fullPath]) {
             RCTLogInfo(@"[ModuleLoader] Found bundle at: %@", fullPath);
             return fullPath;
         }
     }
-    
-    // 记录所有搜索路径用于调试
-    RCTLogWarn(@"[ModuleLoader] Bundle not found in any location: %@", bundlePath);
-    RCTLogWarn(@"[ModuleLoader] Searched locations:");
+
+    RCTLogWarn(@"[ModuleLoader] Bundle not found: %@", bundlePath);
     for (NSString *path in searchPaths) {
-        if (path) {
-            RCTLogWarn(@"[ModuleLoader]   - %@", path);
-        }
+        if (path) RCTLogWarn(@"[ModuleLoader]   - %@", path);
     }
-    
+
     return nil;
 }
 
+- (NSString *)getCodePushBundlePath:(NSString *)bundlePath {
+    return nil;
+}
+
+#pragma mark - Bridge Access
+
 /**
- * 获取 CodePush bundle 路径（如果可用）
+ * 获取当前的 RCTBridge
  */
-- (NSString *)getCodePushBundlePath:(NSString *)bundlePath {
-    // 这里可以集成 CodePush SDK 来获取路径
-    // 暂时返回 nil，表示不使用 CodePush
+- (RCTBridge *)getCurrentBridge {
+    // 方法 1: 使用模块自带的 bridge
+    if (self.bridge) {
+        return self.bridge;
+    }
+
+    // 方法 2: 从 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;
+        }
+    }
+
+    // 方法 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;
+        }
+    }
+
     return nil;
 }
 
+#pragma mark - Bundle Loading Methods
+
+/**
+ * 尝试使用各种方法加载 bundle
+ */
+- (BOOL)tryLoadBundle:(NSString *)bundleContent
+            sourceURL:(NSURL *)sourceURL
+               bridge:(RCTBridge *)bridge
+                error:(NSError **)outError {
+
+    // 获取 batchedBridge（在新旧架构中都可能存在）
+    id targetBridge = bridge;
+    @try {
+        if ([bridge respondsToSelector:@selector(batchedBridge)]) {
+            id batchedBridge = [bridge performSelector:@selector(batchedBridge)];
+            if (batchedBridge) {
+                targetBridge = batchedBridge;
+                RCTLogInfo(@"[ModuleLoader] Using batchedBridge");
+            }
+        }
+    } @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);
+        }
+    }
+
+    // 方法 2: 尝试通过 CatalystInstance（旧架构）
+    id catalystInstance = nil;
+    @try {
+        catalystInstance = [targetBridge valueForKey:@"_catalystInstance"];
+    } @catch (NSException *e) {
+        // 继续尝试其他方法
+    }
+
+    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);
+            }
+        }
+
+        // 方法 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);
+            }
+        }
+    } 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);
+            }
+        }
+    }
+
+    // 所有方法都失败
+    if (outError) {
+        *outError = [NSError errorWithDomain:@"ModuleLoader"
+                                        code:1001
+                                    userInfo:@{NSLocalizedDescriptionKey: @"No suitable bundle loading method found"}];
+    }
+
+    return NO;
+}
+
+#pragma mark - Main Load Method
+
 /**
  * 加载子 bundle
- * 
- * @param bundleId 模块 ID（如 "home", "details", "settings"）
- * @param bundlePath bundle 文件路径（如 "modules/home.jsbundle"）
- * @param resolve 成功回调
- * @param reject 失败回调
  */
 RCT_EXPORT_METHOD(loadBusinessBundle:(NSString *)bundleId
                   bundlePath:(NSString *)bundlePath
@@ -130,191 +264,70 @@ RCT_EXPORT_METHOD(loadBusinessBundle:(NSString *)bundleId
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     RCTLogInfo(@"[ModuleLoader] loadBusinessBundle: bundleId=%@, bundlePath=%@", bundleId, bundlePath);
-    
-    // 获取完整路径
+
     NSString *fullPath = [self getFullBundlePath:bundlePath];
     if (!fullPath) {
-        resolve(@{
-            @"success": @NO,
-            @"errorMessage": @"BUNDLE_PATH_NOT_FOUND"
-        });
+        resolve(@{@"success": @NO, @"errorMessage": @"BUNDLE_PATH_NOT_FOUND"});
         return;
     }
-    
-    // 确保在主线程执行
+
     dispatch_async(dispatch_get_main_queue(), ^{
-        // 尝试多种方式获取 bridge
-        RCTBridge *bridge = nil;
-        
-        // 方法 1: 从 AppDelegate 获取（最可靠的方式）
-        UIApplication *app = [UIApplication sharedApplication];
-        id delegate = app.delegate;
-        if (delegate && [delegate isKindOfClass:NSClassFromString(@"RCTAppDelegate")]) {
-            // 尝试获取 bridge 属性
-            if ([delegate respondsToSelector:@selector(bridge)]) {
-                bridge = [delegate performSelector:@selector(bridge)];
-            }
-            // 尝试获取 reactNativeHost，然后获取 bridge
-            if (!bridge && [delegate respondsToSelector:@selector(reactNativeHost)]) {
-                id reactNativeHost = [delegate performSelector:@selector(reactNativeHost)];
-                if (reactNativeHost && [reactNativeHost respondsToSelector:@selector(bridge)]) {
-                    bridge = [reactNativeHost performSelector:@selector(bridge)];
-                }
-            }
-        }
-        
-        // 方法 2: 使用 self.bridge（如果可用，通过协议方法）
-        if (!bridge) {
-            // RCTBridgeModule 协议应该提供 bridge 属性
-            // 但需要通过 valueForKey 或直接访问
-            @try {
-                bridge = [self valueForKey:@"bridge"];
-            } @catch (NSException *e) {
-                RCTLogWarn(@"[ModuleLoader] Could not access bridge via valueForKey: %@", e.reason);
-            }
-        }
-        
+        RCTBridge *bridge = [self getCurrentBridge];
+
         if (!bridge) {
-            RCTLogError(@"[ModuleLoader] Bridge not available - cannot load bundle");
-            resolve(@{
-                @"success": @NO,
-                @"errorMessage": @"BRIDGE_NOT_AVAILABLE"
-            });
+            RCTLogError(@"[ModuleLoader] Bridge not available");
+            resolve(@{@"success": @NO, @"errorMessage": @"BRIDGE_NOT_AVAILABLE"});
             return;
         }
-        
+
         // 读取 bundle 内容
-        NSError *error = nil;
+        NSError *readError = nil;
         NSString *bundleContent = [NSString stringWithContentsOfFile:fullPath
                                                             encoding:NSUTF8StringEncoding
-                                                               error:&error];
-        if (error || !bundleContent) {
-            RCTLogError(@"[ModuleLoader] Failed to read bundle file: %@", error.localizedDescription);
-            resolve(@{
-                @"success": @NO,
-                @"errorMessage": [NSString stringWithFormat:@"READ_ERROR: %@", error.localizedDescription ?: @"Unknown error"]
-            });
+                                                               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;
         }
-        
-        // 使用 CatalystInstance 执行脚本
-        // 注意：这是 React Native 的内部 API，但这是动态加载 bundle 的标准方式
-        @try {
-            // 获取 CatalystInstance
-            id catalystInstance = nil;
-            
-            // 尝试从 bridge 获取 batchedBridge（旧架构）
-            if ([bridge respondsToSelector:@selector(batchedBridge)]) {
-                catalystInstance = [bridge performSelector:@selector(batchedBridge)];
-            }
-            
-            // 如果失败，尝试直接获取 _catalystInstance（私有属性）
-            if (!catalystInstance) {
-                @try {
-                    catalystInstance = [bridge valueForKey:@"_catalystInstance"];
-                } @catch (NSException *e) {
-                    RCTLogWarn(@"[ModuleLoader] Could not access _catalystInstance: %@", e.reason);
-                }
-            }
-            
-            if (catalystInstance) {
-                // 方法 1: 尝试 loadScriptFromString:sourceURL:
-                SEL loadScriptSelector = NSSelectorFromString(@"loadScriptFromString:sourceURL:");
-                if ([catalystInstance respondsToSelector:loadScriptSelector]) {
-                    NSURL *sourceURL = [NSURL fileURLWithPath:fullPath];
-                    #pragma clang diagnostic push
-                    #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-                    [catalystInstance performSelector:loadScriptSelector withObject:bundleContent withObject:sourceURL];
-                    #pragma clang diagnostic pop
-                    
-                    RCTLogInfo(@"[ModuleLoader] Bundle loaded successfully via loadScriptFromString: %@", bundleId);
-                    resolve(@{@"success": @YES});
-                    return;
-                }
-                
-                // 方法 2: 尝试 executeSourceCode:sync:
-                SEL executeSelector = NSSelectorFromString(@"executeSourceCode:sync:");
-                if ([catalystInstance respondsToSelector:executeSelector]) {
-                    #pragma clang diagnostic push
-                    #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-                    [catalystInstance performSelector:executeSelector withObject:bundleContent withObject:@NO];
-                    #pragma clang diagnostic pop
-                    
-                    RCTLogInfo(@"[ModuleLoader] Bundle loaded successfully via executeSourceCode: %@", bundleId);
-                    resolve(@{@"success": @YES});
-                    return;
-                }
-                
-                // 方法 3: 尝试 loadScriptFromFile:withSourceURL:
-                SEL loadFileSelector = NSSelectorFromString(@"loadScriptFromFile:withSourceURL:");
-                if ([catalystInstance respondsToSelector:loadFileSelector]) {
-                    NSURL *sourceURL = [NSURL fileURLWithPath:fullPath];
-                    #pragma clang diagnostic push
-                    #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-                    [catalystInstance performSelector:loadFileSelector withObject:fullPath withObject:sourceURL];
-                    #pragma clang diagnostic pop
-                    
-                    RCTLogInfo(@"[ModuleLoader] Bundle loaded successfully via loadScriptFromFile: %@", bundleId);
-                    resolve(@{@"success": @YES});
-                    return;
-                }
-                
-                RCTLogError(@"[ModuleLoader] CatalystInstance found but no suitable method available");
-            } else {
-                RCTLogError(@"[ModuleLoader] CatalystInstance not found");
-            }
-            
-            // 如果所有方法都失败，在开发环境下返回成功（用于测试）
-            #if DEBUG
-            RCTLogWarn(@"[ModuleLoader] Using debug fallback - bundle may not execute");
+
+        NSURL *sourceURL = [NSURL fileURLWithPath:fullPath];
+        NSError *loadError = nil;
+
+        BOOL success = [self tryLoadBundle:bundleContent sourceURL:sourceURL bridge:bridge error:&loadError];
+
+        if (success) {
+            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
-            resolve(@{
-                @"success": @NO,
-                @"errorMessage": @"CATALYST_INSTANCE_METHOD_NOT_FOUND"
-            });
+            RCTLogError(@"[ModuleLoader] Failed to load bundle: %@", loadError.localizedDescription);
+            resolve(@{@"success": @NO, @"errorMessage": loadError.localizedDescription ?: @"UNKNOWN_ERROR"});
             #endif
-            
-        } @catch (NSException *exception) {
-            RCTLogError(@"[ModuleLoader] Exception while loading bundle: %@", exception.reason);
-            resolve(@{
-                @"success": @NO,
-                @"errorMessage": [NSString stringWithFormat:@"EXCEPTION: %@", exception.reason ?: @"Unknown exception"]
-            });
         }
     });
 }
 
 #pragma mark - Bundle Manifest Methods
 
-/**
- * 获取 Application Support 目录路径
- */
-+ (NSString *)getApplicationSupportDirectory
-{
-    NSString *applicationSupportDirectory = [NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex:0];
-    return applicationSupportDirectory;
++ (NSString *)getApplicationSupportDirectory {
+    return [NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex:0];
 }
 
-/**
- * 获取 bundle assets 路径
- */
-+ (NSString *)bundleAssetsPath
-{
-    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
-    return [resourcePath stringByAppendingPathComponent:@"assets"];
++ (NSString *)bundleAssetsPath {
+    return [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"assets"];
 }
 
-/**
- * 读取文件内容
- */
-- (NSString *)readFileContent:(NSString *)filePath
-{
+- (NSString *)readFileContent:(NSString *)filePath {
     @try {
         NSError *error;
-        NSString *content = [NSString stringWithContentsOfFile:filePath
-                                                      encoding:NSUTF8StringEncoding
-                                                         error:&error];
+        NSString *content = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:&error];
         if (error) {
             RCTLogWarn(@"[ModuleLoader] Failed to read file: %@ - %@", filePath, error.localizedDescription);
             return nil;
@@ -326,78 +339,62 @@ RCT_EXPORT_METHOD(loadBusinessBundle:(NSString *)bundleId
     }
 }
 
-/**
- * 获取当前 bundle manifest 文件路径
- * 查找顺序：
- * 1. Bundles 目录
- * 2. Documents 目录
- * 3. MainBundle assets 目录
- */
 RCT_EXPORT_METHOD(getCurrentBundleManifest:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     @try {
         NSFileManager *fileManager = [NSFileManager defaultManager];
-        
-        // 1. 先尝试从 MainBundle/Bundles 目录获取
+
+        // 1. MainBundle/Bundles 目录
         NSString *bundlesPath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Bundles"];
         NSString *bundlesManifestPath = [bundlesPath stringByAppendingPathComponent:BundleManifestFileName];
         if ([fileManager fileExistsAtPath:bundlesManifestPath]) {
-            RCTLogInfo(@"[ModuleLoader] Found bundle manifest at Bundles: %@", bundlesManifestPath);
+            RCTLogInfo(@"[ModuleLoader] Found manifest at Bundles: %@", bundlesManifestPath);
             resolve(bundlesManifestPath);
             return;
         }
-        
-        // 2. 尝试从 Documents 目录获取
+
+        // 2. Documents 目录
         NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
         if (documentsPath) {
             NSString *documentsManifestPath = [documentsPath stringByAppendingPathComponent:BundleManifestFileName];
             if ([fileManager fileExistsAtPath:documentsManifestPath]) {
-                RCTLogInfo(@"[ModuleLoader] Found bundle manifest at Documents: %@", documentsManifestPath);
                 resolve(documentsManifestPath);
                 return;
             }
         }
-        
-        // 3. 尝试从 Application Support 目录获取
+
+        // 3. Application Support 目录
         NSString *appSupportPath = [[self class] getApplicationSupportDirectory];
         NSString *appSupportManifestPath = [appSupportPath stringByAppendingPathComponent:BundleManifestFileName];
         if ([fileManager fileExistsAtPath:appSupportManifestPath]) {
-            RCTLogInfo(@"[ModuleLoader] Found bundle manifest at Application Support: %@", appSupportManifestPath);
             resolve(appSupportManifestPath);
             return;
         }
-        
-        // 4. 尝试从 MainBundle assets 目录获取
+
+        // 4. MainBundle assets 目录
         NSString *assetsPath = [[self class] bundleAssetsPath];
         NSString *assetsManifestPath = [assetsPath stringByAppendingPathComponent:BundleManifestFileName];
         if ([fileManager fileExistsAtPath:assetsManifestPath]) {
-            RCTLogInfo(@"[ModuleLoader] Found bundle manifest at assets: %@", assetsManifestPath);
             resolve(assetsManifestPath);
             return;
         }
-        
-        // 5. 尝试从 MainBundle 根目录获取
+
+        // 5. MainBundle 根目录
         NSString *mainBundleManifestPath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:BundleManifestFileName];
         if ([fileManager fileExistsAtPath:mainBundleManifestPath]) {
-            RCTLogInfo(@"[ModuleLoader] Found bundle manifest at MainBundle: %@", mainBundleManifestPath);
             resolve(mainBundleManifestPath);
             return;
         }
-        
-        // 未找到 manifest 文件
-        RCTLogWarn(@"[ModuleLoader] Bundle manifest not found in any location");
+
+        RCTLogWarn(@"[ModuleLoader] Bundle manifest not found");
         resolve(nil);
     } @catch (NSException *exception) {
-        RCTLogError(@"[ModuleLoader] Failed to get current bundle manifest: %@", exception.reason);
+        RCTLogError(@"[ModuleLoader] Failed to get manifest: %@", exception.reason);
         reject(@"MANIFEST_ERROR", @"Failed to get manifest path", nil);
     }
 }
 
-/**
- * 获取当前 bundle manifest 文件内容
- * 查找顺序与 getCurrentBundleManifest 相同
- */
 RCT_EXPORT_METHOD(getCurrentBundleManifestContent:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
@@ -405,85 +402,68 @@ RCT_EXPORT_METHOD(getCurrentBundleManifestContent:(RCTPromiseResolveBlock)resolv
         @try {
             NSFileManager *fileManager = [NSFileManager defaultManager];
             NSString *manifestContent = nil;
-            
-            // 1. 先尝试从 MainBundle/Bundles 目录获取
+
+            // 1. MainBundle/Bundles 目录
             NSString *bundlesPath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"Bundles"];
             NSString *bundlesManifestPath = [bundlesPath stringByAppendingPathComponent:BundleManifestFileName];
             if ([fileManager fileExistsAtPath:bundlesManifestPath]) {
                 manifestContent = [self readFileContent:bundlesManifestPath];
                 if (manifestContent) {
-                    RCTLogInfo(@"[ModuleLoader] Read bundle manifest from Bundles");
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        resolve(manifestContent);
-                    });
+                    RCTLogInfo(@"[ModuleLoader] Read manifest from Bundles");
+                    dispatch_async(dispatch_get_main_queue(), ^{ resolve(manifestContent); });
                     return;
                 }
             }
-            
-            // 2. 尝试从 Documents 目录获取
+
+            // 2. Documents 目录
             NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
             if (documentsPath) {
                 NSString *documentsManifestPath = [documentsPath stringByAppendingPathComponent:BundleManifestFileName];
                 if ([fileManager fileExistsAtPath:documentsManifestPath]) {
                     manifestContent = [self readFileContent:documentsManifestPath];
                     if (manifestContent) {
-                        RCTLogInfo(@"[ModuleLoader] Read bundle manifest from Documents");
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                            resolve(manifestContent);
-                        });
+                        dispatch_async(dispatch_get_main_queue(), ^{ resolve(manifestContent); });
                         return;
                     }
                 }
             }
-            
-            // 3. 尝试从 Application Support 目录获取
+
+            // 3. Application Support 目录
             NSString *appSupportPath = [[self class] getApplicationSupportDirectory];
             NSString *appSupportManifestPath = [appSupportPath stringByAppendingPathComponent:BundleManifestFileName];
             if ([fileManager fileExistsAtPath:appSupportManifestPath]) {
                 manifestContent = [self readFileContent:appSupportManifestPath];
                 if (manifestContent) {
-                    RCTLogInfo(@"[ModuleLoader] Read bundle manifest from Application Support");
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        resolve(manifestContent);
-                    });
+                    dispatch_async(dispatch_get_main_queue(), ^{ resolve(manifestContent); });
                     return;
                 }
             }
-            
-            // 4. 尝试从 MainBundle assets 目录获取
+
+            // 4. MainBundle assets 目录
             NSString *assetsPath = [[self class] bundleAssetsPath];
             NSString *assetsManifestPath = [assetsPath stringByAppendingPathComponent:BundleManifestFileName];
             if ([fileManager fileExistsAtPath:assetsManifestPath]) {
                 manifestContent = [self readFileContent:assetsManifestPath];
                 if (manifestContent) {
-                    RCTLogInfo(@"[ModuleLoader] Read bundle manifest from assets");
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        resolve(manifestContent);
-                    });
+                    dispatch_async(dispatch_get_main_queue(), ^{ resolve(manifestContent); });
                     return;
                 }
             }
-            
-            // 5. 尝试从 MainBundle 根目录获取
+
+            // 5. MainBundle 根目录
             NSString *mainBundleManifestPath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:BundleManifestFileName];
             if ([fileManager fileExistsAtPath:mainBundleManifestPath]) {
                 manifestContent = [self readFileContent:mainBundleManifestPath];
                 if (manifestContent) {
-                    RCTLogInfo(@"[ModuleLoader] Read bundle manifest from MainBundle");
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        resolve(manifestContent);
-                    });
+                    dispatch_async(dispatch_get_main_queue(), ^{ resolve(manifestContent); });
                     return;
                 }
             }
-            
-            // 未找到 manifest 文件
-            RCTLogWarn(@"[ModuleLoader] Bundle manifest content not found in any location");
-            dispatch_async(dispatch_get_main_queue(), ^{
-                resolve(nil);
-            });
+
+            RCTLogWarn(@"[ModuleLoader] Bundle manifest content not found");
+            dispatch_async(dispatch_get_main_queue(), ^{ resolve(nil); });
         } @catch (NSException *exception) {
-            RCTLogError(@"[ModuleLoader] Failed to get bundle manifest content: %@", exception.reason);
+            RCTLogError(@"[ModuleLoader] Failed to get manifest content: %@", exception.reason);
             dispatch_async(dispatch_get_main_queue(), ^{
                 reject(@"MANIFEST_CONTENT_ERROR", @"Failed to read manifest content", nil);
             });
@@ -492,4 +472,3 @@ RCT_EXPORT_METHOD(getCurrentBundleManifestContent:(RCTPromiseResolveBlock)resolv
 }
 
 @end
-

package/package.json

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

package/src/multi-bundle/README.md

@@ -342,3 +342,4 @@ function preloadModule(moduleId: string): Promise<void>
 - [多 Bundle 架构设计](../docs/React%20Native%20多%20bundle%20技术方案.md)
 
 
+