chore: use more c++ and less objc++

Author: CAMOBAP

apps/p2p-counter/ios/P2PCounter/LaunchScreen.storyboard

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <device id="retina6_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
@@ -14,28 +14,28 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="440" height="956"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cs-gradient" translatesAutoresizingMaskIntoConstraints="NO" id="bg-image">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                                <rect key="frame" x="0.0" y="0.0" width="440" height="956"/>
                             </imageView>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{callstack}" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="callstack-label">
-                                <rect key="frame" x="233.5" y="20" width="91.5" height="21"/>
+                                <rect key="frame" x="298.66666666666669" y="124" width="91.333333333333314" height="21"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="middleTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
-                                <rect key="frame" x="0.0" y="225" width="375" height="86"/>
+                                <rect key="frame" x="0.0" y="340.33333333333331" width="440" height="86"/>
                                 <string key="text">Sandbox:
 P2P Counter</string>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="MN2-I3-ftu">
-                                <rect key="frame" x="0.0" y="626" width="375" height="21"/>
+                                <rect key="frame" x="0.0" y="847" width="440" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
@@ -65,7 +65,7 @@ P2P Counter</string>
         </scene>
     </scenes>
     <resources>
-        <image name="cs-gradient" width="300" height="533.5"/>
+        <image name="cs-gradient" width="200" height="355.66665649414062"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

package.json

@@ -11,7 +11,7 @@
     "lint": "eslint . && bun --filter=@callstack/react-native-sandbox lint",
     "format": "eslint . --fix && bun --filter=@callstack/react-native-sandbox format",
     "typecheck": "bun --filter=@callstack/react-native-sandbox typecheck",
-    "test": "bun run jest && bun --filter=@callstack/react-native-sandbox xctest"
+    "test": "bun run jest && bun --filter=@callstack/react-native-sandbox ctest"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

packages/react-native-sandbox/React-Sandbox.podspec

@@ -20,6 +20,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/callstackincubator/react-native-sandbox.git", :tag => "#{s.version}" }
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   install_modules_dependencies(s)
+  s.dependency "fmt"
   s.pod_target_xcconfig    = {
     "HEADER_SEARCH_PATHS" => header_search_paths,
     # "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",

packages/react-native-sandbox/ios/ISandboxDelegate.h

@@ -0,0 +1,61 @@
+#pragma once
+
+#include <memory>
+#include <set>
+#include <string>
+
+namespace facebook {
+namespace react {
+
+/**
+ * Interface for sandbox delegates that provides a clean abstraction
+ * for sandbox functionality without React Native dependencies.
+ *
+ * This interface enables:
+ * - Better testability (can be mocked without React Native)
+ * - Cleaner separation of concerns
+ * - Elimination of string conversions between std::string and NSString
+ */
+class ISandboxDelegate {
+ public:
+  virtual ~ISandboxDelegate() = default;
+
+  /**
+   * Posts a message to the JavaScript runtime.
+   * @param message JSON-serialized message string
+   */
+  virtual void postMessage(const std::string& message) = 0;
+
+  /**
+   * Routes a message to a specific sandbox delegate.
+   * @param message The message to route
+   * @param targetId The ID of the target sandbox
+   * @return true if the message was successfully routed, false otherwise
+   */
+  virtual bool routeMessage(
+      const std::string& message,
+      const std::string& targetId) = 0;
+
+  /**
+   * Sets the origin identifier for this sandbox.
+   * @param origin Unique identifier for the sandbox
+   */
+  virtual void setOrigin(const std::string& origin) = 0;
+
+  /**
+   * Sets the list of allowed origins for this sandbox instance.
+   * Only sandboxes with origins in this list can send messages to this sandbox.
+   * @param origins Set of allowed origin strings
+   */
+  virtual void setAllowedOrigins(const std::set<std::string>& origins) = 0;
+
+  /**
+   * Sets the list of allowed TurboModules for this sandbox instance.
+   * Only modules in this list will be accessible to the JavaScript runtime.
+   * @param modules Set of allowed TurboModule names
+   */
+  virtual void setAllowedTurboModules(const std::set<std::string>& modules) = 0;
+};
+
+} // namespace react
+} // namespace facebook

packages/react-native-sandbox/ios/SandboxDelegateWrapper.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+#include "ISandboxDelegate.h"
+
+// Forward declaration to avoid including Objective-C headers in C++ interface
+#ifdef __OBJC__
+@class SandboxReactNativeDelegate;
+#else
+typedef struct objc_object SandboxReactNativeDelegate;
+#endif
+
+namespace facebook {
+namespace react {
+
+/**
+ * C++ wrapper for SandboxReactNativeDelegate that implements ISandboxDelegate.
+ * This allows the C++ registry to work with Objective-C++ objects through
+ * a proper C++ interface.
+ */
+class SandboxDelegateWrapper : public ISandboxDelegate {
+ public:
+  /**
+   * Creates a wrapper around the given Objective-C++ delegate.
+   * @param delegate The Objective-C++ delegate to wrap (must not be null)
+   */
+  explicit SandboxDelegateWrapper(SandboxReactNativeDelegate* delegate);
+
+  /**
+   * Destructor - does not delete the wrapped delegate
+   */
+  ~SandboxDelegateWrapper() override = default;
+
+  // ISandboxDelegate implementation
+  void postMessage(const std::string& message) override;
+  bool routeMessage(const std::string& message, const std::string& targetId)
+      override;
+  void setOrigin(const std::string& origin) override;
+  void setAllowedOrigins(const std::set<std::string>& origins) override;
+  void setAllowedTurboModules(const std::set<std::string>& modules) override;
+
+ private:
+  // Non-owning pointer to the Objective-C++ delegate
+  SandboxReactNativeDelegate* delegate_;
+};
+
+} // namespace react
+} // namespace facebook

packages/react-native-sandbox/ios/SandboxDelegateWrapper.mm

@@ -0,0 +1,51 @@
+#include "SandboxDelegateWrapper.h"
+#import "SandboxReactNativeDelegate.h"
+
+namespace facebook {
+namespace react {
+
+SandboxDelegateWrapper::SandboxDelegateWrapper(SandboxReactNativeDelegate *delegate) : delegate_(delegate)
+{
+  // Validate that delegate is not null
+  if (!delegate_) {
+    throw std::invalid_argument("SandboxReactNativeDelegate cannot be null");
+  }
+}
+
+void SandboxDelegateWrapper::postMessage(const std::string &message)
+{
+  if (!delegate_)
+    return;
+  [delegate_ postMessage:message];
+}
+
+bool SandboxDelegateWrapper::routeMessage(const std::string &message, const std::string &targetId)
+{
+  if (!delegate_)
+    return false;
+  return [delegate_ routeMessage:message toSandbox:targetId];
+}
+
+void SandboxDelegateWrapper::setOrigin(const std::string &origin)
+{
+  if (!delegate_)
+    return;
+  [delegate_ setOrigin:origin];
+}
+
+void SandboxDelegateWrapper::setAllowedOrigins(const std::set<std::string> &origins)
+{
+  if (!delegate_)
+    return;
+  [delegate_ setAllowedOrigins:origins];
+}
+
+void SandboxDelegateWrapper::setAllowedTurboModules(const std::set<std::string> &modules)
+{
+  if (!delegate_)
+    return;
+  [delegate_ setAllowedTurboModules:modules];
+}
+
+} // namespace react
+} // namespace facebook

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

@@ -11,34 +11,38 @@
 #import <React/RCTComponent.h>
 #import <react/renderer/components/RNSandboxSpec/EventEmitters.h>
 
+#include <string>
+#include <vector>
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  * A React Native delegate that provides sandboxed environments with filtered module access.
  * This delegate uses RCTFilteredAppDependencyProvider to restrict which native modules
  * are available to the JavaScript runtime, enhancing security in multi-instance scenarios.
  *
- * Registry functionality has been moved to SandboxRegistry class to maintain single responsibility.
+ * This class provides the core React Native integration functionality.
+ * For C++ registry integration, use SandboxDelegateWrapper.
  */
 @interface SandboxReactNativeDelegate : RCTDefaultReactNativeFactoryDelegate
 
 @property (nonatomic) std::shared_ptr<const facebook::react::SandboxReactNativeViewEventEmitter> eventEmitter;
 @property (nonatomic, assign) BOOL hasOnMessageHandler;
 @property (nonatomic, assign) BOOL hasOnErrorHandler;
-@property (nonatomic, copy, nullable) NSString *origin;
-@property (nonatomic, copy, nullable) NSString *jsBundleSource;
+@property (nonatomic, readwrite) std::string origin;
+@property (nonatomic, readwrite) std::string jsBundleSource;
 
 /**
  * Sets the list of allowed TurboModules for this sandbox instance.
  * Only modules in this list will be accessible to the JavaScript runtime.
  */
-@property (nonatomic, copy) NSArray<NSString *> *allowedTurboModules;
+@property (nonatomic, readwrite) std::set<std::string> allowedTurboModules;
 
 /**
  * Sets the list of allowed origins for this sandbox instance.
  * Only sandboxes with origins in this list can send messages to this sandbox.
  */
-@property (nonatomic, copy) NSArray<NSString *> *allowedOrigins;
+@property (nonatomic, readwrite) std::set<std::string> allowedOrigins;
 
 /**
  * Initializes the delegate.
@@ -48,17 +52,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Posts a message to the JavaScript runtime.
- * @param message String containing the JSON.stringified message
+ * @param message C++ string containing the JSON.stringified message
  */
-- (void)postMessage:(NSString *)message;
+- (void)postMessage:(const std::string &)message;
 
 /**
  * Routes a message to a specific sandbox delegate.
  * @param message The message to route
  * @param targetId The ID of the target sandbox
- * @return YES if the message was successfully routed, NO otherwise
+ * @return true if the message was successfully routed, false otherwise
  */
-- (BOOL)routeMessage:(NSString *)message toSandbox:(NSString *)targetId;
+- (bool)routeMessage:(const std::string &)message toSandbox:(const std::string &)targetId;
 
 @end