Merge branch 'main' of github.com:dougg0k/react-native-node-api into generate-project

Author: dougg0k

.changeset/kind-forks-talk.md

@@ -0,0 +1,5 @@
+---
+"react-native-node-api": patch
+---
+
+Added implementation of napi_fatal_error, napi_get_node_version and napi_get_version. Improved the Logger functionalities

.changeset/strong-eggs-yell.md

@@ -0,0 +1,6 @@
+---
+"@react-native-node-api/ferric-example": patch
+"ferric-cli": patch
+---
+
+Updated napi packages.

.github/workflows/check.yml

@@ -132,9 +132,6 @@ jobs:
       - name: Build weak-node-api for all architectures
         run: npm run build-weak-node-api -- --android
         working-directory: packages/host
-      - name: Build ferric-example for all architectures
-        run: npm run build -- --android
-        working-directory: packages/ferric-example
       - name: Run tests (Android)
         timeout-minutes: 75
         uses: reactivecircus/android-emulator-runner@v2

.gitignore

@@ -4,5 +4,3 @@ node_modules/
 dist/
 
 *.tsbuildinfo
-
-TODO.md

apps/test-app/App.tsx

@@ -44,16 +44,6 @@ function loadTests({
       });
     }
   });
-
-  describeIf(ferricExample, "ferric-example", () => {
-    it("exports a callable sum function", () => {
-      const exampleAddon = require("ferric-example");
-      const result = exampleAddon.sum(1, 3);
-      if (result !== 4) {
-        throw new Error(`Expected 1 + 3 to equal 4, but got ${result}`);
-      }
-    });
-  });
 }
 
 export default function App() {

apps/test-app/package.json

@@ -30,7 +30,6 @@
     "@types/mocha": "^10.0.10",
     "@types/react": "^19.0.0",
     "concurrently": "^9.1.2",
-    "ferric-example": "^0.1.0",
     "mocha": "^11.6.0",
     "mocha-remote-cli": "^1.13.2",
     "mocha-remote-react-native": "^1.13.2",

package-lock.json

@@ -9,8 +9,7 @@
     "packages/cmake-rn",
     "packages/ferric",
     "packages/host",
-    "packages/node-addon-examples",
-    "packages/ferric-example"
+    "packages/node-addon-examples"
   ],
   "homepage": "https://github.com/callstackincubator/react-native-node-api#readme",
   "scripts": {

package.json

@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@commander-js/extra-typings": "14.0.0",
-    "@napi-rs/cli": "3.0.4",
+    "@napi-rs/cli": "~3.0.4",
     "bufout": "0.3.4",
     "chalk": "^5.4.1",
     "commander": "14.0.0",

packages/ferric/package.json

@@ -9,27 +9,77 @@
 #include <TargetConditionals.h>
 #endif
 
-namespace callstack::nodeapihost {
-void log_debug(const char *format, ...) {
-  // TODO: Disable logging in release builds
+namespace {
+constexpr auto LineFormat = "[%s] [NodeApiHost] ";
 
-  va_list args;
-  va_start(args, format);
+enum class LogLevel { Debug, Warning, Error };
+
+constexpr std::string_view levelToString(LogLevel level) {
+  switch (level) {
+    case LogLevel::Debug:
+      return "DEBUG";
+    case LogLevel::Warning:
+      return "WARNING";
+    case LogLevel::Error:
+      return "ERROR";
+    default:
+      return "UNKNOWN";
+  }
+}
 
 #if defined(__ANDROID__)
-  __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, format, args);
+constexpr int androidLogLevel(LogLevel level) {
+  switch (level) {
+    case LogLevel::Debug:
+      return ANDROID_LOG_DEBUG;
+    case LogLevel::Warning:
+      return ANDROID_LOG_WARN;
+    case LogLevel::Error:
+      return ANDROID_LOG_ERROR;
+    default:
+      return ANDROID_LOG_UNKNOWN;
+  }
+}
+#endif
+
+void log_message_internal(LogLevel level, const char* format, va_list args) {
+#if defined(__ANDROID__)
+  __android_log_vprint(androidLogLevel(level), LOG_TAG, format, args);
 #elif defined(__APPLE__)
   // iOS or macOS
-  fprintf(stderr, "[NodeApiHost] ");
+  const auto level_str = levelToString(level);
+  fprintf(stderr, LineFormat, level_str.data());
   vfprintf(stderr, format, args);
   fprintf(stderr, "\n");
 #else
   // Fallback for other platforms
-  fprintf(stdout, "[NodeApiHost] ");
+  const auto level_str = levelToString(level);
+  fprintf(stdout, LineFormat, level_str.data());
   vfprintf(stdout, format, args);
   fprintf(stdout, "\n");
 #endif
+}
+}  // anonymous namespace
+
+namespace callstack::nodeapihost {
 
+void log_debug(const char* format, ...) {
+  // TODO: Disable logging in release builds
+  va_list args;
+  va_start(args, format);
+  log_message_internal(LogLevel::Debug, format, args);
+  va_end(args);
+}
+void log_warning(const char* format, ...) {
+  va_list args;
+  va_start(args, format);
+  log_message_internal(LogLevel::Warning, format, args);
+  va_end(args);
+}
+void log_error(const char* format, ...) {
+  va_list args;
+  va_start(args, format);
+  log_message_internal(LogLevel::Error, format, args);
   va_end(args);
 }
-} // namespace callstack::nodeapihost
+}  // namespace callstack::nodeapihost