Move "install name" logic into TurboModule

Author: kraenhansen

packages/react-native-node-api-modules/cpp/CxxNodeApiHostModule.cpp

@@ -23,16 +23,17 @@ CxxNodeApiHostModule::requireNodeAddon(jsi::Runtime &rt,
   return jsi::Value::undefined();
 }
 
-jsi::Value CxxNodeApiHostModule::requireNodeAddon(jsi::Runtime &rt,
-                                                  const jsi::String path) {
-  const std::string pathStr = path.utf8(rt);
+jsi::Value
+CxxNodeApiHostModule::requireNodeAddon(jsi::Runtime &rt,
+                                       const jsi::String libraryName) {
+  const std::string libraryNameStr = libraryName.utf8(rt);
 
-  auto [it, inserted] = nodeAddons_.emplace(pathStr, NodeAddon());
+  auto [it, inserted] = nodeAddons_.emplace(libraryNameStr, NodeAddon());
   NodeAddon &addon = it->second;
 
   // Check if this module has been loaded already, if not then load it...
   if (inserted) {
-    if (!loadNodeAddon(addon, pathStr)) {
+    if (!loadNodeAddon(addon, libraryNameStr)) {
       return jsi::Value::undefined();
     }
   }
@@ -47,10 +48,19 @@ jsi::Value CxxNodeApiHostModule::requireNodeAddon(jsi::Runtime &rt,
 }
 
 bool CxxNodeApiHostModule::loadNodeAddon(NodeAddon &addon,
-                                         const std::string &path) const {
+                                         const std::string &libraryName) const {
+#if defined(__APPLE__)
+  std::string libraryPath =
+      "@rpath/" + libraryName + ".framework/" + libraryName;
+#elif defined(__ANDROID__)
+  std::string libraryPath = libraryName
+#else
+  abort()
+#endif
+
   typename LoaderPolicy::Symbol initFn = NULL;
   typename LoaderPolicy::Module library =
-      LoaderPolicy::loadLibrary(path.c_str());
+      LoaderPolicy::loadLibrary(libraryPath.c_str());
   if (NULL != library) {
     addon.moduleHandle = library;
 

packages/react-native-node-api-modules/src/node/babel-plugin/plugin.test.ts

@@ -6,7 +6,7 @@ import { transformFileSync } from "@babel/core";
 
 import { plugin } from "./plugin.js";
 import { setupTempDirectory } from "../test-utils.js";
-import { getLibraryInstallName } from "../path-utils.js";
+import { getLibraryName } from "../path-utils.js";
 
 describe("plugin", () => {
   it("transforms require calls, regardless", (context) => {
@@ -38,11 +38,11 @@ describe("plugin", () => {
       `,
     });
 
-    const ADDON_1_REQUIRE_ARG = getLibraryInstallName(
+    const ADDON_1_REQUIRE_ARG = getLibraryName(
       path.join(tempDirectoryPath, "addon-1"),
       { stripPathSuffix: false }
     );
-    const ADDON_2_REQUIRE_ARG = getLibraryInstallName(
+    const ADDON_2_REQUIRE_ARG = getLibraryName(
       path.join(tempDirectoryPath, "addon-2"),
       { stripPathSuffix: false }
     );

packages/react-native-node-api-modules/src/node/babel-plugin/plugin.ts

@@ -5,7 +5,7 @@ import type { PluginObj, NodePath } from "@babel/core";
 import * as t from "@babel/types";
 
 import {
-  getLibraryInstallName,
+  getLibraryName,
   isNodeApiModule,
   replaceWithNodeExtension,
   NamingStrategy,
@@ -30,7 +30,7 @@ export function replaceWithRequireNodeAddon(
   modulePath: string,
   naming: NamingStrategy
 ) {
-  const requireCallArgument = getLibraryInstallName(
+  const requireCallArgument = getLibraryName(
     replaceWithNodeExtension(modulePath),
     naming
   );

packages/react-native-node-api-modules/src/node/path-utils.ts

@@ -114,11 +114,3 @@ export function getLibraryName(modulePath: string, naming: NamingStrategy) {
     ? packageName
     : `${packageName}--${escapePath(relativePath)}`;
 }
-
-export function getLibraryInstallName(
-  modulePath: string,
-  naming: NamingStrategy
-) {
-  const libraryName = getLibraryName(modulePath, naming);
-  return `@rpath/${libraryName}.framework/${libraryName}`;
-}

packages/react-native-node-api-modules/src/react-native/NativeNodeApiHost.ts

@@ -2,7 +2,7 @@ import type { TurboModule } from "react-native";
 import { TurboModuleRegistry } from "react-native";
 
 export interface Spec extends TurboModule {
-  requireNodeAddon(path: string): void;
+  requireNodeAddon(libraryName: string): void;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>("NodeApiHost");