fix: clean up runtime refactor paths

Author: DjDeveloperr

NativeScript/napi/hermes/README.md

@@ -0,0 +1,14 @@
+# Hermes Node-API bridge
+
+`jsr.cpp` is shared by Apple Hermes builds and Android Hermes builds, but the
+prebuilt Hermes libraries currently expose different header surfaces.
+
+- `include` is the Apple/current Hermes fallback header set used when
+  `Frameworks/hermes-headers` is not available.
+- `include_old` matches Android's legacy `HERMES` prebuilts and their
+  `HermesRuntime::createNapiEnv` API.
+- `include_shermes` matches Android's `SHERMES` prebuilts and their
+  `hermes_node_api.h` API.
+
+Keep these directories aligned with the matching prebuilts. Do not mix headers
+from one Hermes variant with libraries from another variant.

NativeScript/runtime/android/modules/module/ModuleInternal.cpp

@@ -377,12 +377,7 @@ napi_value ModuleInternal::LoadModule(napi_env env, const std::string& modulePat
             if (pendingException) {
                 return nullptr;
             }
-            napi_value error = nullptr;
-            if (error) {
-                throw NativeScriptException(env, error, "Error running script " + modulePath);
-            } else {
-                throw NativeScriptException("Error running script " + modulePath);
-            }
+            throw NativeScriptException("Error running script " + modulePath);
         }
     } else if (Util::EndsWith(modulePath, ".so")) {
         auto handle = dlopen(modulePath.c_str(), RTLD_NOW);
@@ -438,18 +433,19 @@ napi_value ModuleInternal::LoadModule(napi_env env, const std::string& modulePat
     napi_status status = napi_call_function(env, thiz, moduleFunc, 5, requireArgs, &callResult);
     bool pendingException;
     napi_is_exception_pending(env, &pendingException);
-     if (status != napi_ok || pendingException) {
-         if (pendingException) {
-             return nullptr;
-         }
-         napi_value exception;
-         napi_get_and_clear_last_exception(env, &exception);
-         if (exception) {
-             throw NativeScriptException(env, exception, "Error calling module function: ");
-         } else {
-             throw NativeScriptException("Error calling module function: " + modulePath);
-         }
-     }
+    if (status != napi_ok || pendingException) {
+        if (pendingException) {
+            return nullptr;
+        }
+
+        napi_value exception = nullptr;
+        napi_get_and_clear_last_exception(env, &exception);
+        if (exception) {
+            throw NativeScriptException(env, exception, "Error calling module function: ");
+        } else {
+            throw NativeScriptException("Error calling module function: " + modulePath);
+        }
+    }
 
     tempModule.SaveToCache();
     result = moduleObj;

metadata-generator/build-step-metadata-generator.py

@@ -172,7 +172,7 @@ def is_nativescript_source_root(search_path):
 strict_includes = env_or_none("NS_DEBUG_METADATA_STRICT_INCLUDES") or env_or_none("TNS_DEBUG_METADATA_STRICT_INCLUDES")
 signature_bindings_cpp_path = env_or_none("NS_SIGNATURE_BINDINGS_CPP_PATH") or env_or_none("TNS_SIGNATURE_BINDINGS_CPP_PATH")
 if signature_bindings_cpp_path is None:
-    default_signature_bindings_path = os.path.join(src_root, "NativeScript", "ffi", "napi", "GeneratedSignatureDispatch.inc")
+    default_signature_bindings_path = os.path.join(src_root, "NativeScript", "ffi", "objc", "napi", "GeneratedSignatureDispatch.inc")
     if os.path.isdir(os.path.dirname(default_signature_bindings_path)):
         signature_bindings_cpp_path = default_signature_bindings_path
 

platforms/android/docs/extending-inspector.md

@@ -49,13 +49,13 @@ This step involves fetching and building the V8 projectory, explanation for whic
 
 4. Run the ninja build. Upon completion, the inspector protocol files would be at `outgn/$ARCH-release/gen/src/inspector/protocol`.
 
-5. Copy-Paste all `.cpp` and `.h` files in the runtime project at `test-app/runtime/src/main/cpp/v8_inspector/src/inspector/protocol`
+5. Copy-paste all `.cpp` and `.h` files into `NativeScript/napi/android/v8/v8_inspector/src/inspector/protocol`.
 
-6. Create a new C++ class extending the desired Domain (e.g. DOM). Name it according to the convention already established by the V8 team - `v8-<domain>-agent-impl.h/cpp` - See [v8-dom-agent-impl.h](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-dom-agent-impl.h#L18). Implement the Backend::<Domain>'s methods in the `.cpp` file.
+6. Create a new C++ class extending the desired Domain (e.g. DOM). Name it according to the convention already established by the V8 team - `v8-<domain>-agent-impl.h/cpp` - under `NativeScript/napi/android/v8/v8_inspector/src/inspector`. Implement the Backend::<Domain>'s methods in the `.cpp` file.
 
-7. To implement event handlers of a certain domain, check out <Protocol>DomainCallbackHandlers ([DOMDomainCallbackHandlers](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/DOMDomainCallbackHandlers.h#L14)) which are registered in [JsV8InspectorClient.cpp](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/JsV8InspectorClient.cpp#L237)
+7. To implement event handlers for a domain, add the runtime-side callback handlers under `NativeScript/runtime/android/inspector` and register them in `NativeScript/runtime/android/inspector/JsV8InspectorClient.cpp`.
 
-8. Register the newly created agent implementations in [v8-inspector-session-impl.h/cc](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-inspector-session-impl.h#L19) - `V8InspectorSessionImpl` class:
+8. Register the newly created agent implementations in `NativeScript/napi/android/v8/v8_inspector/src/inspector/v8-inspector-session-impl.h/cc` - `V8InspectorSessionImpl` class:
 
 8.1. Changes in v8-inspector-session-impl.`h`
  - `#include "src/inspector/protocol/<Domain>.h`
@@ -65,13 +65,13 @@ This step involves fetching and building the V8 projectory, explanation for whic
 
 8.2. Changes in v8-inspector-session-impl.`cc`
  - `#include "src/inspector/protocol/v8-<domain>-agent-impl.h`
- - register protocol domain command prefix in [canDispatchMethod()](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-inspector-session-impl.cc#L31)
- - in the V8InspectorSessionImpl constructor initialize the new agent implementation with a [nullptr](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-inspector-session-impl.cc#L86)
- - [create a unique pointer wrapper for your new agent impl instance](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-inspector-session-impl.cc#L141), and call the static domain dispatcher's [wire](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-inspector-session-impl.cc#L143) method
- - make sure to call [agent.disable](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-inspector-session-impl.cc#L167) in V8InspectorSessionImpl's destructor.
- - register the newly implemented domain as a supported one inside [ V8InspectorSessionImpl::supportedDomainsImpl()](https://github.com/NativeScript/android-runtime/blob/5a04e09439e2bc6a201577895b9ac6538441e758/test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-inspector-session-impl.cc#L389)
+ - register protocol domain command prefix in `canDispatchMethod()`
+ - in the `V8InspectorSessionImpl` constructor initialize the new agent implementation with `nullptr`
+ - create a unique pointer wrapper for your new agent impl instance, and call the static domain dispatcher's `wire` method
+ - make sure to call `agent.disable` in `V8InspectorSessionImpl`'s destructor
+ - register the newly implemented domain as a supported one inside `V8InspectorSessionImpl::supportedDomainsImpl()`
  - `#include "NSV8DebuggerAgentImpl.h"`
  - replace **V8DebuggerAgentImpl** with **NSV8DebuggerAgentImpl**
 
-9. Don't forget to add the new classes to the CMakeLists!
+9. Don't forget to add the new classes to `platforms/android/test-app/runtime/CMakeLists.txt`.
 11. Test whether the new domain agent is registered by opening Chrome DevTools. In order to debug the Chrome DevTools frontend, you could open the Chrome DevTools inside an Android Chrome DevTools session - Ctrl(Cmd) + Shift + I.

platforms/android/test-app/runtime/CMakeLists.txt

@@ -166,6 +166,8 @@ if (PRIMJS)
 endif ()
 
 if (HERMES)
+    # Android legacy Hermes prebuilts expose HermesRuntime::createNapiEnv in
+    # the older header surface. Keep this separate from Apple/current Hermes.
     include_directories(
             ${NS_NAPI_DIR}/hermes
             ${NS_NAPI_DIR}/hermes/include_old
@@ -177,6 +179,8 @@ if (HERMES)
 endif ()
 
 if (SHERMES)
+    # Android SHERMES prebuilts expose hermes_node_api.h, so they need the
+    # matching header surface even though jsr.cpp is shared.
     include_directories(
             ${NS_NAPI_DIR}/hermes
             ${NS_NAPI_DIR}/hermes/include_shermes