feat: jsBundleName -> jsBundleSource + accept URL

Author: alexbabrykovich

README.md

@@ -77,10 +77,9 @@ function HostApp() {
   return (
     <View>
       <Button onPress={sendMessageToSandbox} title="Send to Sandbox" />
-      <SandboxReactNativeView
-        ref={sandboxRef}
-        jsBundleName={"sandbox"} // The name of the JS bundle for the sandbox
-        moduleName={"SandboxApp"} // The registered module name in the sandbox
+      <SandboxReactNativeView ref={sandboxRef}
+        moduleName={"ModuleName"} // The name of your JS module
+        jsBundleSource={"sandbox"} // The JS bundle: file name or URL
         onMessage={handleMessage}
         onError={handleError}
       />

docs/presentation.md

@@ -73,7 +73,7 @@ function App() {
       <Button onPress={onPress} title="Send to sandbox" />
       ...
       <SandboxReactNativeView ref={sandbox1Ref}
-        jsBundleName={"sandbox"}
+        jsBundleSource={"sandbox"}
         moduleName={"SandboxApp"}
         onMessage={onMessage}
         onError={onError}
@@ -178,7 +178,7 @@ function App() {
       <Button onPress={onPress} title="Send to sandbox" />
       ...
       <SandboxReactNativeView ref={sandbox1Ref}
-        jsBundleName={"sandbox"}
+        jsBundleSource={"sandbox"}
         moduleName={"SandboxApp"}
         onMessage={onMessage}
         onError={onError}

packages/examples/side-by-side/App.tsx

@@ -28,7 +28,7 @@ function SandboxDemoView({initialProperties}: {initialProperties: any}) {
         {isVisible ?
           <SandboxReactNativeView
             ref={sandboxRef}
-            jsBundleName={'sandbox'}
+            jsBundleSource={'sandbox'}
             moduleName={'SandboxApp'}
             style={styles.sandboxView}
             initialProperties={initialProperties}

packages/react-native-multinstance/ios/SandboxReactNativeDelegate.h

@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy, nullable) RCTDirectEventBlock onErrorHost;
 @property (nonatomic, copy) NSArray<NSString *> *allowedTurboModules;
 
-- (instancetype)initWithJSBundleName:(NSString *)jsBundleName;
+- (instancetype)initWithJSBundleSource:(NSString *)jsBundleSource;
 - (void)postMessage:(NSDictionary *)message;
 
 @end

packages/react-native-multinstance/ios/SandboxReactNativeDelegate.mm

@@ -44,7 +44,7 @@ @interface SandboxReactNativeDelegate () {
   std::set<std::string> _allowedModules;
 }
 
-@property (nonatomic, strong) NSString *jsBundleName;
+@property (nonatomic, strong) NSString *jsBundleSource;
 
 @end
 
@@ -57,9 +57,9 @@ - (void)setAllowedTurboModules:(NSArray<NSString *> *)allowedTurboModules {
   }
 }
 
-- (instancetype)initWithJSBundleName:(NSString *)jsBundleName {
+- (instancetype)initWithJSBundleSource:(NSString *)jsBundleSource {
   if (self = [super init]) {
-    _jsBundleName = jsBundleName;
+    _jsBundleSource = jsBundleSource;
     _onMessageHost = nil;
     _onErrorHost = nil;
     self.dependencyProvider = [[RCTAppDependencyProvider alloc] init];
@@ -72,11 +72,18 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
 }
 
 - (NSURL *)bundleURL {
-#if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:self.jsBundleName];
-#else
-  return [[NSBundle mainBundle] URLForResource:self.jsBundleName withExtension:@"jsbundle"];
-#endif
+  NSURL *url = [NSURL URLWithString:self.jsBundleSource];
+  if (url && url.scheme) {
+    return url;
+  }
+
+  if ([self.jsBundleSource hasSuffix:@".jsbundle"]) {
+    return [[NSBundle mainBundle] URLForResource:self.jsBundleSource withExtension:nil];
+  }
+
+  NSString *bundleName = [self.jsBundleSource hasSuffix:@".bundle"] ?
+    [self.jsBundleSource stringByDeletingPathExtension] : self.jsBundleSource;
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:bundleName];
 }
 
 - (void)postMessage:(NSDictionary *)message {
@@ -202,7 +209,6 @@ - (void)hostDidStart:(RCTHost *)host {
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
                                                       jsInvoker:
 (std::shared_ptr<facebook::react::CallInvoker>)jsInvoker {
-  NSLog(@"SandboxReactNativeDelegate.getTurboModule:jsInvoker %s", name.c_str());
   return _allowedModules.contains(name) ? [super getTurboModule:name jsInvoker:jsInvoker] : nullptr;
 }
 

packages/react-native-multinstance/ios/SandboxReactNativeView.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SandboxReactNativeView : RCTView
 
 @property (nonatomic, copy) NSString *moduleName;
-@property (nonatomic, copy) NSString *jsBundleName;
+@property (nonatomic, copy) NSString *jsBundleSource;
 @property (nonatomic, copy) NSDictionary *initialProperties;
 @property (nonatomic, copy) NSDictionary *launchOptions;
 @property (nonatomic, copy) NSArray<NSString *> *allowedTurboModules;

packages/react-native-multinstance/ios/SandboxReactNativeView.mm

@@ -25,12 +25,13 @@ @implementation SandboxReactNativeView
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    _moduleName = @"sandbox";
-    _jsBundleName = @"index";
+    _moduleName = @"App";
+    _jsBundleSource = @"sandbox";
+    _allowedTurboModules = @[@"NativeMicrotasksCxx"];
     _initialProperties = @{};
     _launchOptions = @{};
-    _onError = nil;
     _onMessage = nil;
+    _onError = nil;
   }
   return self;
 }
@@ -42,9 +43,9 @@ - (void)setModuleName:(NSString *)moduleName {
   }
 }
 
-- (void)setJsBundleName:(NSString *)jsBundleName {
-  if (![_jsBundleName isEqualToString:jsBundleName]) {
-    _jsBundleName = [jsBundleName copy];
+- (void)setJsBundleSource:(NSString *)jsBundleSource {
+  if (![_jsBundleSource isEqualToString:jsBundleSource]) {
+    _jsBundleSource = [jsBundleSource copy];
     [self scheduleReactViewLoad];
   }
 }
@@ -77,7 +78,7 @@ - (void)setOnError:(RCTDirectEventBlock)onError {
   }
 }
 
-- (void)setallowedTurboModules:(NSArray<NSString *> *)allowedTurboModules {
+- (void)setAllowedTurboModules:(NSArray<NSString *> *)allowedTurboModules {
   if (![allowedTurboModules isEqual:_allowedTurboModules]) {
     _allowedTurboModules = [allowedTurboModules copy];
     [self scheduleReactViewLoad];
@@ -99,19 +100,16 @@ - (void)scheduleReactViewLoad {
 }
 
 - (void)loadReactNativeView {
-  if (_moduleName.length == 0 || _jsBundleName.length == 0 || _allowedTurboModules == nil) {
+  if (_moduleName.length == 0 || _jsBundleSource.length == 0 || _allowedTurboModules == nil) {
     return;
   }
 
-  // TODO is it possible to get hostRtcInstance?
-
-  SandboxReactNativeDelegate *delegate = [[SandboxReactNativeDelegate alloc] initWithJSBundleName:_jsBundleName];
+  SandboxReactNativeDelegate *delegate = [[SandboxReactNativeDelegate alloc] initWithJSBundleSource:_jsBundleSource];
   delegate.onMessageHost = _onMessage;
   delegate.onErrorHost = _onError;
   delegate.allowedTurboModules = _allowedTurboModules;
 
   RCTReactNativeFactory *factory = [[RCTReactNativeFactory alloc] initWithDelegate:delegate];
-  factory.delegate = delegate;
 
   UIView *rnView = [factory.rootViewFactory viewWithModuleName:_moduleName
                                             initialProperties:_initialProperties

packages/react-native-multinstance/ios/SandboxReactNativeViewManager.mm

@@ -12,8 +12,8 @@
 
 @interface RCT_EXTERN_MODULE(SandboxReactNativeViewManager, RCTViewManager)
 
-RCT_EXPORT_VIEW_PROPERTY(jsBundleName, NSString)
 RCT_EXPORT_VIEW_PROPERTY(moduleName, NSString)
+RCT_EXPORT_VIEW_PROPERTY(jsBundleSource, NSString)
 RCT_EXPORT_VIEW_PROPERTY(initialProperties, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(launchOptions, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(allowedTurboModules, NSArray<NSString *>)

packages/react-native-multinstance/src/index.tsx

@@ -16,7 +16,7 @@ interface IsFatalError extends Error {
 
 export interface NativeSandboxReactNativeViewProps extends ViewProps {
   moduleName: string;
-  jsBundleName?: string;
+  jsBundleSource?: string;
   initialProperties?: GenericProps;
   launchOptions?: GenericProps;
   allowedTurboModules?: string[];
@@ -26,7 +26,7 @@ export interface NativeSandboxReactNativeViewProps extends ViewProps {
 
 export interface SandboxReactNativeViewProps extends ViewProps {
   moduleName: string;
-  jsBundleName?: string;
+  jsBundleSource?: string;
   initialProperties?: GenericProps;
   launchOptions?: GenericProps;
   allowedTurboModules?: string[];