fix(🍏): support Bridgeless mode via self.bridge and RCTCallInvokerModule (#326)

* fix(ios): support Bridgeless mode by using self.bridge and RCTCallInvokerModule

In Bridgeless mode (forced in RN 0.84+), [RCTBridge currentBridge] returns nil,
causing install() to silently fail and the RNWebGPU JSI global to never be set.

Replace the class method with self.bridge.runtime (works in both Legacy and
Bridgeless via RCTBridgeProxy) and conform to RCTCallInvokerModule so the
TurboModule infra injects the CallInvoker. Also guard the RNWebGPU global
access in JS so a failed install() doesn't crash the module require.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Update WebGPUModule.mm

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: William Candillon <wcandillon@gmail.com>

Author: 3 people

packages/webgpu/apple/WebGPUModule.h

@@ -2,9 +2,10 @@
 
 #import "RNWebGPUManager.h"
 #import <RNWgpuViewSpec/RNWgpuViewSpec.h>
+#import <React/RCTCallInvokerModule.h>
 #import <React/RCTEventEmitter.h>
 
-@interface WebGPUModule : RCTEventEmitter <NativeWebGPUModuleSpec>
+@interface WebGPUModule : RCTEventEmitter <NativeWebGPUModuleSpec, RCTCallInvokerModule>
 
 + (std::shared_ptr<rnwgpu::RNWebGPUManager>)getManager;
 

packages/webgpu/apple/WebGPUModule.mm

@@ -3,6 +3,7 @@
 #import "GPUCanvasContext.h"
 
 #import <React/RCTBridge+Private.h>
+#import <React/RCTCallInvoker.h>
 #import <React/RCTLog.h>
 #import <ReactCommon/RCTTurboModule.h>
 #import <jsi/jsi.h>
@@ -11,12 +12,25 @@
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
+// Category to declare the runtime property on RCTBridge/RCTBridgeProxy.
+// In Bridgeless mode, self.bridge is an RCTBridgeProxy which implements
+// -(void *)runtime. In Legacy mode, self.bridge is the real RCTBridge
+// (backed by RCTCxxBridge) which also implements it.
+@interface RCTBridge (JSIRuntime)
+- (void *)runtime;
+@end
+
 @implementation WebGPUModule
 
 RCT_EXPORT_MODULE(WebGPUModule)
 
 static std::shared_ptr<rnwgpu::RNWebGPUManager> webgpuManager;
 
+// Synthesize callInvoker so RCTTurboModuleManager injects the JS CallInvoker.
+// When the module conforms to RCTCallInvokerModule, the TurboModule infra
+// calls setCallInvoker: during module initialization.
+@synthesize callInvoker = _callInvoker;
+
 + (std::shared_ptr<rnwgpu::RNWebGPUManager>)getManager {
   return webgpuManager;
 }
@@ -28,9 +42,6 @@ + (BOOL)requiresMainQueueSetup {
 }
 
 - (void)invalidate {
-  // if (_webgpuManager != nil) {
-  //   [_webgpuManager invalidate];
-  // }
   webgpuManager = nil;
 }
 
@@ -43,31 +54,26 @@ - (void)invalidate {
     // Already initialized, ignore call.
     return @true;
   }
-  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)[RCTBridge currentBridge];
-  if (!cxxBridge.runtime) {
-    NSLog(@"Failed to install react-native-wgpu: RCTBridge is not a "
-          @"RCTCxxBridge!");
-    return [NSNumber numberWithBool:NO];
-  }
 
-  jsi::Runtime *runtime = (jsi::Runtime *)cxxBridge.runtime;
+  // self.bridge works in both Legacy (RCTBridge) and Bridgeless (RCTBridgeProxy).
+  jsi::Runtime *runtime = (jsi::Runtime *)self.bridge.runtime;
   if (!runtime) {
-    NSLog(@"Failed to install react-native-wgpu: jsi::Runtime* was null!");
+    NSLog(@"Failed to install react-native-wgpu: jsi::Runtime* was null! "
+          @"(self.bridge=%@)", self.bridge);
     return [NSNumber numberWithBool:NO];
   }
-  std::shared_ptr<react::CallInvoker> jsInvoker = cxxBridge.jsCallInvoker;
+
+  // _callInvoker is injected by RCTTurboModuleManager because we conform to
+  // RCTCallInvokerModule. Works in both Legacy and Bridgeless.
+  std::shared_ptr<react::CallInvoker> jsInvoker = _callInvoker.callInvoker;
   if (!jsInvoker) {
     NSLog(@"Failed to install react-native-wgpu: react::CallInvoker was "
           @"null!");
     return [NSNumber numberWithBool:NO];
   }
 
-  if (!jsInvoker) {
-    jsInvoker = cxxBridge.jsCallInvoker;
-  }
   std::shared_ptr<rnwgpu::PlatformContext> platformContext =
       std::make_shared<rnwgpu::ApplePlatformContext>();
-  // TODO: remove allocation here
   webgpuManager = std::make_shared<rnwgpu::RNWebGPUManager>(runtime, jsInvoker,
                                                             platformContext);
   return @true;

packages/webgpu/src/main/index.tsx

@@ -8,28 +8,33 @@ export * from "../hooks";
 
 export { default as WebGPUModule } from "../NativeWebGPUModule";
 
-WebGPUModule.install();
+const _installOk = WebGPUModule.install();
 
 registerWebGPUForReanimated();
 
-if (!navigator) {
-  // @ts-expect-error Navigation object is more complex than this, setting it to an empty object to add gpu property
-  navigator = {
-    gpu: RNWebGPU.gpu,
-    userAgent: "react-native",
-  };
-} else {
-  navigator.gpu = RNWebGPU.gpu;
-  if (typeof navigator.userAgent !== "string") {
-    try {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore - Hermes navigator may not include a userAgent, align with the polyfill if needed
-      navigator.userAgent = "react-native";
-    } catch {
-      // navigator.userAgent can be read-only; ignore if assignment fails
+if (typeof RNWebGPU !== "undefined") {
+  if (!navigator) {
+    // @ts-expect-error Navigation object is more complex than this, setting it to an empty object to add gpu property
+    navigator = {
+      gpu: RNWebGPU.gpu,
+      userAgent: "react-native",
+    };
+  } else {
+    navigator.gpu = RNWebGPU.gpu;
+    if (typeof navigator.userAgent !== "string") {
+      try {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore - Hermes navigator may not include a userAgent, align with the polyfill if needed
+        navigator.userAgent = "react-native";
+      } catch {
+        // navigator.userAgent can be read-only; ignore if assignment fails
+      }
     }
   }
+  global.createImageBitmap =
+    global.createImageBitmap ?? RNWebGPU.createImageBitmap.bind(RNWebGPU);
+} else {
+  console.warn(
+    `[react-native-wgpu] install() returned ${_installOk} but RNWebGPU global is not available`
+  );
 }
-
-global.createImageBitmap =
-  global.createImageBitmap ?? RNWebGPU.createImageBitmap.bind(RNWebGPU);