Merge remote-tracking branch 'Nativescript/main'

Author: farfromrefug

NativeScript/runtime/ArgConverter.mm

@@ -1,12 +1,14 @@
 #include <Foundation/Foundation.h>
 #include <sstream>
+#include <unordered_set>
 #include "ArgConverter.h"
 #include "NativeScriptException.h"
 #include "DictionaryAdapter.h"
 #include "ObjectManager.h"
 #include "Interop.h"
 #include "Helpers.h"
 #include "Runtime.h"
+#include "RuntimeConfig.h"
 
 using namespace v8;
 using namespace std;
@@ -27,7 +29,27 @@
     bool callSuper = false;
     if (instanceMethod) {
         BaseDataWrapper* wrapper = tns::GetValue(isolate, receiver);
-        tns::Assert(wrapper != nullptr, isolate);
+        
+        if (wrapper == nullptr) {
+            // During fast view churn like HMR in development, JS objects can outlive their
+            // native wrappers briefly. In Debug, avoid a crash and just skip the native call.
+            // In Release, assert so crash reporting can capture unexpected cases.
+            if (RuntimeConfig.IsDebug) {
+                const char* selectorStr = meta ? meta->selectorAsString() : "<unknown>";
+                const char* jsNameStr = meta ? meta->jsName() : "<unknown>";
+                const char* classNameStr = klass ? class_getName(klass) : "<unknown>";
+                // Suppress duplicate logs: only log once per class+selector for this process.
+                static std::unordered_set<std::string> s_logged;
+                std::string key = std::string(classNameStr) + ":" + selectorStr;
+                if (s_logged.insert(key).second) {
+                    Log(@"Note: ignore method on non-native receiver (class: %s, selector: %s, jsName: %s, args: %d). Common during HMR.",
+                        classNameStr, selectorStr, jsNameStr, (int)args.Length());
+                }
+                return v8::Undefined(isolate);
+            } else {
+                tns::Assert(false, isolate);
+            }
+        }
 
         if (wrapper->Type() == WrapperType::ObjCAllocObject) {
             ObjCAllocDataWrapper* allocWrapper = static_cast<ObjCAllocDataWrapper*>(wrapper);
@@ -43,7 +65,21 @@
             // For extended classes we will call the base method
             callSuper = isMethodCallback && it != cache->ClassPrototypes.end();
         } else {
-            tns::Assert(false, isolate);
+            if (RuntimeConfig.IsDebug) {
+                const char* selectorStr = meta ? meta->selectorAsString() : "<unknown>";
+                const char* jsNameStr = meta ? meta->jsName() : "<unknown>";
+                const char* classNameStr = klass ? class_getName(klass) : "<unknown>";
+                // Suppress duplicate logs: only log once per class+selector for this process.
+                static std::unordered_set<std::string> s_logged;
+                std::string key = std::string(classNameStr) + ":" + selectorStr;
+                if (s_logged.insert(key).second) {
+                    Log(@"Note: ignore receiver wrapper type %d (class: %s, selector: %s, jsName: %s). Common during HMR.",
+                        (int)wrapper->Type(), classNameStr, selectorStr, jsNameStr);
+                }
+                return v8::Undefined(isolate);
+            } else {
+                tns::Assert(false, isolate);
+            }
         }
     }
 
@@ -878,7 +914,7 @@
     Local<Object> thiz = args.This();
     Isolate* isolate = args.GetIsolate();
     BaseDataWrapper* wrapper = tns::GetValue(isolate, thiz);
-    if (wrapper == nullptr && wrapper->Type() != WrapperType::ObjCObject) {
+    if (wrapper == nullptr || wrapper->Type() != WrapperType::ObjCObject) {
         return;
     }
 

NativeScript/runtime/SymbolLoader.mm

@@ -2,9 +2,17 @@
 #include "SymbolLoader.h"
 #include "Helpers.h"
 #include <dlfcn.h>
+#include <os/log.h>
 
 namespace tns {
 
+// Unified logging: create a dedicated log for the SymbolLoader
+static os_log_t ns_symbolloader_log() {
+    // Function-local static initialization is thread-safe in C++11+.
+    static os_log_t log = os_log_create("@nativescript/ios", "SymbolLoader");
+    return log;
+}
+
 class SymbolResolver {
 public:
     virtual void* loadFunctionSymbol(const char* symbolName) = 0;
@@ -35,7 +43,7 @@ virtual bool load() override {
         CFErrorRef error = nullptr;
         bool loaded = CFBundleLoadExecutableAndReturnError(this->_bundle, &error);
         if (error) {
-            NSLog(@"%s", [[(NSError*)error localizedDescription] UTF8String]);
+            os_log_error(ns_symbolloader_log(), "%{public}s", [[(NSError*)error localizedDescription] UTF8String]);
         }
 
         return loaded;
@@ -100,8 +108,6 @@ virtual bool load() override {
         NSURL* bundleUrl = [NSURL URLWithString:frameworkPathStr relativeToURL:baseUrl];
         if (CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, (CFURLRef)bundleUrl)) {
             resolver = std::make_unique<CFBundleSymbolResolver>(bundle);
-        } else {
-            NSLog(@"NativeScript could not load bundle %s\n", bundleUrl.absoluteString.UTF8String);
         }
     } else if (module->libraries->count == 1) {
         if (module->isSystem()) {
@@ -110,10 +116,9 @@ virtual bool load() override {
             NSString* libraryPath = [NSString stringWithFormat:@"%@/lib%s.dylib", libsPath, module->libraries->first()->value().getName()];
 
             if (void* library = dlopen(libraryPath.UTF8String, RTLD_LAZY | RTLD_LOCAL)) {
-                NSLog(@"NativeScript loaded library %s\n", libraryPath.UTF8String);
                 resolver = std::make_unique<DlSymbolResolver>(library);
             } else if (const char* libraryError = dlerror()) {
-                NSLog(@"NativeScript could not load library %s, error: %s\n", libraryPath.UTF8String, libraryError);
+                os_log_debug(ns_symbolloader_log(), "NativeScript could not load library %{public}s, error: %{public}s", libraryPath.UTF8String, libraryError);
             }
         }
     }