feat: Enhance lifecycle management and improve type handling in ObjC bridge

Author: DjDeveloperr

.gitignore

@@ -59,4 +59,7 @@ v8_build
 
 .cache/
 
+dist
+packages/*/types
+
 SwiftBindgen

NativeScript/ffi/ObjCBridge.mm

@@ -569,6 +569,7 @@ void registerLegacyCompatGlobals(napi_env env, napi_value global, ObjCBridgeStat
   }
 
   objectRefs[nativeObject] = ref;
+  attachObjectLifecycleAssociation(env, nativeObject);
 
   return result;
 }

NativeScript/ffi/Object.h

@@ -6,6 +6,7 @@
 namespace nativescript {
 
 void initProxyFactory(napi_env env, ObjCBridgeState* bridgeState);
+void attachObjectLifecycleAssociation(napi_env env, id object);
 
 }  // namespace nativescript
 

NativeScript/ffi/Object.mm

@@ -6,9 +6,11 @@
 #include "node_api_util.h"
 
 #import <Foundation/Foundation.h>
+#import <dispatch/dispatch.h>
 #include <objc/runtime.h>
 
 static SEL JSWrapperObjectAssociationKey = @selector(JSWrapperObjectAssociationKey);
+static SEL ObjCLifecycleAssociationKey = @selector(ObjCLifecycleAssociationKey);
 
 @interface JSWrapperObjectAssociation : NSObject
 
@@ -23,6 +25,15 @@ - (instancetype)initWithEnv:(napi_env)env ref:(napi_ref)ref;
 
 @end
 
+@interface ObjCLifecycleAssociation : NSObject {
+  napi_env _env;
+  uintptr_t _objectAddress;
+}
+
+- (instancetype)initWithEnv:(napi_env)env object:(id)object;
+
+@end
+
 @implementation JSWrapperObjectAssociation
 
 - (instancetype)initWithEnv:(napi_env)env ref:(napi_ref)ref {
@@ -53,6 +64,33 @@ - (void)dealloc {
 
 @end
 
+@implementation ObjCLifecycleAssociation
+
+- (instancetype)initWithEnv:(napi_env)env object:(id)object {
+  self = [super init];
+  if (self) {
+    _env = env;
+    _objectAddress = (uintptr_t)object;
+  }
+
+  return self;
+}
+
+- (void)dealloc {
+  napi_env env = _env;
+  uintptr_t objectAddress = _objectAddress;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    nativescript::ObjCBridgeState* bridgeState = nativescript::ObjCBridgeState::InstanceData(env);
+    if (bridgeState != nullptr) {
+      bridgeState->objectRefs.erase((id)objectAddress);
+    }
+  });
+
+  [super dealloc];
+}
+
+@end
+
 napi_value JS_transferOwnershipToNative(napi_env env, napi_callback_info cbinfo) {
   size_t argc = 1;
   napi_value arg;
@@ -120,6 +158,22 @@ void initProxyFactory(napi_env env, ObjCBridgeState* state) {
   state->transferOwnershipToNative = make_ref(env, transferOwnershipToNative);
 }
 
+void attachObjectLifecycleAssociation(napi_env env, id object) {
+  if (object == nil) {
+    return;
+  }
+
+  if (objc_getAssociatedObject(object, ObjCLifecycleAssociationKey) != nil) {
+    return;
+  }
+
+  ObjCLifecycleAssociation* association = [[ObjCLifecycleAssociation alloc] initWithEnv:env
+                                                                                  object:object];
+  objc_setAssociatedObject(object, ObjCLifecycleAssociationKey, association,
+                           OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  [association release];
+}
+
 void finalize_objc_object(napi_env /*env*/, void* data, void* hint) {
   id object = static_cast<id>(data);
   ObjCBridgeState* bridgeState = static_cast<ObjCBridgeState*>(hint);

NativeScript/ffi/TypeConv.mm

@@ -173,10 +173,21 @@ MDSectionOffset findProtocolMetadataOffset(MDMetadataReader* metadata, const cha
   std::string structname;
   const char* nameStart = *encoding + 1;  // skip '{'
   const char* c = nameStart;
-  while (*c != '=') {
+  while (*c != '\0' && *c != '=') {
     structname += *c;
     c++;
   }
+  if (*c != '=') {
+    // Malformed struct encoding. Advance to the end of this token and
+    // fallback to pointer conversion to avoid reading past the buffer.
+    while (**encoding != '\0' && **encoding != '}') {
+      (*encoding)++;
+    }
+    if (**encoding == '}') {
+      (*encoding)++;
+    }
+    return &ffi_type_pointer;
+  }
 
   // Check if we're already processing this struct (cycle detection)
   if (processingEncodingStructs.find(structname) != processingEncodingStructs.end()) {
@@ -201,16 +212,18 @@ MDSectionOffset findProtocolMetadataOffset(MDMetadataReader* metadata, const cha
   }
 
   // Check if we already have a forward declaration for this struct
-  auto forwardIt = forwardDeclaredEncodingStructs.find(structname);
-  if (forwardIt != forwardDeclaredEncodingStructs.end()) {
+  auto existingForwardIt = forwardDeclaredEncodingStructs.find(structname);
+  if (existingForwardIt != forwardDeclaredEncodingStructs.end()) {
     // Skip the struct encoding
     (*encoding)++;  // skip '{'
-    while (**encoding != '}') {
+    while (**encoding != '\0' && **encoding != '}') {
       (*encoding)++;
     }
-    (*encoding)++;  // skip '}'
+    if (**encoding == '}') {
+      (*encoding)++;  // skip '}'
+    }
 
-    return forwardIt->second;
+    return existingForwardIt->second;
   }
 
   // Mark this struct as being processed
@@ -226,18 +239,25 @@ MDSectionOffset findProtocolMetadataOffset(MDMetadataReader* metadata, const cha
 
   (*encoding)++;  // skip '{'
 
-  while (**encoding != '=') {
+  while (**encoding != '\0' && **encoding != '=') {
     (*encoding)++;
   }  // skip name
+  if (**encoding == '\0') {
+    processingEncodingStructs.erase(structname);
+    delete type;
+    return &ffi_type_pointer;
+  }
 
   (*encoding)++;  // skip '='
 
-  while (**encoding != '}') {
+  while (**encoding != '\0' && **encoding != '}') {
     ffi_type* elementType = TypeConv::Make(env, encoding)->type;
     elements.push_back(elementType);
   }
 
-  (*encoding)++;  // skip '}'
+  if (**encoding == '}') {
+    (*encoding)++;  // skip '}'
+  }
 
   type->elements = (ffi_type**)malloc(sizeof(ffi_type*) * (elements.size() + 1));
   for (int i = 0; i < elements.size(); i++) {
@@ -247,8 +267,9 @@ MDSectionOffset findProtocolMetadataOffset(MDMetadataReader* metadata, const cha
   type->elements[elements.size()] = nullptr;
 
   // If this was a forward declaration, update it with the real layout
-  if (forwardIt != forwardDeclaredEncodingStructs.end()) {
-    ffi_type* forwardType = forwardIt->second;
+  auto resolvedForwardIt = forwardDeclaredEncodingStructs.find(structname);
+  if (resolvedForwardIt != forwardDeclaredEncodingStructs.end()) {
+    ffi_type* forwardType = resolvedForwardIt->second;
     forwardType->type = type->type;
     forwardType->size = type->size;
     forwardType->alignment = type->alignment;
@@ -257,7 +278,7 @@ MDSectionOffset findProtocolMetadataOffset(MDMetadataReader* metadata, const cha
     // Clean up the temporary type and use the forward declaration
     delete type;
     type = forwardType;
-    forwardDeclaredEncodingStructs.erase(forwardIt);
+    forwardDeclaredEncodingStructs.erase(resolvedForwardIt);
   }
 
   // Remove from processing set
@@ -283,9 +304,9 @@ MDSectionOffset findProtocolMetadataOffset(MDMetadataReader* metadata, const cha
   }
 
   // Check if we already have a forward declaration for this struct
-  auto forwardIt = forwardDeclaredStructs.find(structOffset);
-  if (forwardIt != forwardDeclaredStructs.end()) {
-    return forwardIt->second;
+  auto existingForwardIt = forwardDeclaredStructs.find(structOffset);
+  if (existingForwardIt != forwardDeclaredStructs.end()) {
+    return existingForwardIt->second;
   }
 
   // Mark this struct as being processed
@@ -326,8 +347,9 @@ MDSectionOffset findProtocolMetadataOffset(MDMetadataReader* metadata, const cha
   type->elements[elements.size()] = nullptr;
 
   // If this was a forward declaration, update it with the real layout
-  if (forwardIt != forwardDeclaredStructs.end()) {
-    ffi_type* forwardType = forwardIt->second;
+  auto resolvedForwardIt = forwardDeclaredStructs.find(structOffset);
+  if (resolvedForwardIt != forwardDeclaredStructs.end()) {
+    ffi_type* forwardType = resolvedForwardIt->second;
     forwardType->type = type->type;
     forwardType->size = type->size;
     forwardType->alignment = type->alignment;
@@ -336,7 +358,7 @@ MDSectionOffset findProtocolMetadataOffset(MDMetadataReader* metadata, const cha
     // Clean up the temporary type and use the forward declaration
     delete type;
     type = forwardType;
-    forwardDeclaredStructs.erase(forwardIt);
+    forwardDeclaredStructs.erase(resolvedForwardIt);
   }
 
   // Remove from processing set
@@ -3101,10 +3123,19 @@ void writeFromArrayElements(napi_env env, napi_value value, void* result, bool*
     case '{': {
       std::string structname;
       const char* c = *encoding + 1;
-      while (*c != '=') {
+      while (*c != '\0' && *c != '=') {
         structname += *c;
         c++;
       }
+      if (*c != '=') {
+        while (**encoding != '\0' && **encoding != '}') {
+          (*encoding)++;
+        }
+        if (**encoding == '}') {
+          (*encoding)++;
+        }
+        return pointerTypeConv;
+      }
 
       // Check if we already have a cached StructTypeConv for this encoding-based struct
       auto cacheIt = encodingStructCache.find(structname);
@@ -3113,9 +3144,13 @@ void writeFromArrayElements(napi_env env, napi_value value, void* result, bool*
       }
 
       auto bridgeState = ObjCBridgeState::InstanceData(env);
-      // NSLog(@"struct: %s, %d", structname.c_str(),
-      //       bridgeState->structOffsets[structname]);
-      auto structOffset = bridgeState->structOffsets[structname];
+      MDSectionOffset structOffset = MD_SECTION_OFFSET_NULL;
+      if (bridgeState != nullptr) {
+        auto structOffsetIt = bridgeState->structOffsets.find(structname);
+        if (structOffsetIt != bridgeState->structOffsets.end()) {
+          structOffset = structOffsetIt->second;
+        }
+      }
       auto type = typeFromStruct(env, encoding);
       auto structTypeConv = std::make_shared<StructTypeConv>(StructTypeConv(structOffset, type));
 

NativeScript/napi/common/native_api_util.h

@@ -79,7 +79,7 @@ struct char_traits<unsigned short> {
 
 #define NAPI_CALLBACK_BEGIN_VARGS()                                          \
   napi_status status;                                                        \
-  size_t argc;                                                               \
+  size_t argc = 0;                                                           \
   void* data;                                                                \
   napi_value jsThis;                                                         \
   NAPI_GUARD(napi_get_cb_info(env, info, &argc, nullptr, &jsThis, &data)) {  \
@@ -609,4 +609,4 @@ inline void napi_inherits(napi_env env, napi_value ctor,
 
 }  // namespace napi_util
 
-#endif /* NATIVE_API_UTIL_H_ */
+#endif /* NATIVE_API_UTIL_H_ */