metadata generator compatibility and some bug fixes, introduce ObjCClass decorator to runtime

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -44,7 +44,7 @@ elseif(TARGET_PLATFORM STREQUAL "ios-sim")
   set(TARGET_PLATFORM_IOS TRUE)
   set(TARGET_PLATFORM_SIM TRUE)
   set(SDK_NAME "iphonesimulator")
-  set(CMAKE_OSX_ARCHITECTURES "arm64")
+  set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
   set(TARGET_PLATFORM_SPEC "ios-arm64_x86_64-simulator")
 
 elseif(TARGET_PLATFORM STREQUAL "macos")
@@ -173,6 +173,11 @@ if(ENABLE_JS_RUNTIME)
   elseif(TARGET_ENGINE_QUICKJS)
     set(MI_BUILD_OBJECT OFF)
     set(MI_OVERRIDE OFF)
+    set(MI_BUILD_SHARED OFF)
+    set(MI_BUILD_TESTS OFF)
+
+    set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+
     add_subdirectory(napi/quickjs/mimalloc-dev mimalloc)
 
     include_directories(

NativeScript/NativeScript.h

@@ -5,31 +5,34 @@
 
 extern "C"
 
-#endif // __cplusplus
+#endif  // __cplusplus
 
-void objc_bridge_init(void *env, const char *metadata_path);
+    void
+    objc_bridge_init(void* env, const char* metadata_path, const void* metadata_ptr);
 
 #ifdef __OBJC__
 
 #import <Foundation/Foundation.h>
 
+__attribute__((visibility("default")))
 @interface Config : NSObject
 
-@property(nonatomic, retain) NSString *BaseDir;
-@property(nonatomic, retain) NSString *ApplicationPath;
-@property(nonatomic) void *MetadataPtr;
+@property(nonatomic, retain) NSString* BaseDir;
+@property(nonatomic, retain) NSString* ApplicationPath;
+@property(nonatomic) void* MetadataPtr;
 @property BOOL IsDebug;
 @property BOOL LogToSystemConsole;
 @property int ArgumentsCount;
-@property(nonatomic) char **Arguments;
+@property(nonatomic) char** Arguments;
 
 @end
 
+__attribute__((visibility("default")))
 @interface NativeScript : NSObject
 
-- (instancetype)initWithConfig:(Config *)config;
-- (void)runScriptString:(NSString *)script runLoop:(BOOL)runLoop;
-- (void)restartWithConfig:(Config *)config;
+- (instancetype)initWithConfig:(Config*)config;
+- (void)runScriptString:(NSString*)script runLoop:(BOOL)runLoop;
+- (void)restartWithConfig:(Config*)config;
 - (void)shutdownRuntime;
 
 /**
@@ -40,6 +43,6 @@ void objc_bridge_init(void *env, const char *metadata_path);
 
 @end
 
-#endif // __OBJC__
+#endif  // __OBJC__
 
 #endif /* NATIVESCRIPT_H */

NativeScript/ffi/Class.h

@@ -13,6 +13,8 @@ using namespace metagen;
 
 namespace objc_bridge {
 
+void setupObjCClassDecorator(napi_env env);
+
 void initFastEnumeratorIteratorFactory(napi_env env,
                                        ObjCBridgeState *bridgeState);
 

NativeScript/ffi/Class.mm

@@ -99,6 +99,27 @@
   return nullptr;
 }
 
+const char *ObjCClassDecorator = R"(
+globalThis.ObjCClass = function ObjCClass(...protocols) {
+  return function (target) {
+    if (target.ObjCProtocols) {
+      target.ObjCProtocols.push(...protocols);
+    } else {
+      target.ObjCProtocols = protocols;
+    }
+
+    return globalThis.NativeClass(target);
+  };
+};
+)";
+
+void setupObjCClassDecorator(napi_env env) {
+  napi_value global, script;
+  napi_get_global(env, &global);
+  napi_create_string_utf8(env, ObjCClassDecorator, NAPI_AUTO_LENGTH, &script);
+  napi_run_script(env, script, &global);
+}
+
 char class_name[256];
 
 // Get a Bridged Class by metadata offset, creating it if it doesn't exist.

NativeScript/ffi/ObjCBridge.h

@@ -42,7 +42,7 @@ typedef enum ObjectOwnership {
 
 class ObjCBridgeState {
 public:
-  ObjCBridgeState(napi_env env, const char *metadata_path = nullptr);
+  ObjCBridgeState(napi_env env, const char *metadata_path = nullptr, const void *metadata_ptr = nullptr);
   ~ObjCBridgeState();
 
   static inline ObjCBridgeState *InstanceData(napi_env env) {

NativeScript/ffi/ObjCBridge.mm

@@ -55,30 +55,35 @@ void finalize_bridge_data(napi_env env, void* data, void* hint) {
   auto buffer = (uint8_t*)malloc(size);
   fread(buffer, 1, size, f);
   fclose(f);
-  return new MDMetadataReader(buffer, size);
+  return new MDMetadataReader(buffer);
 }
 
-ObjCBridgeState::ObjCBridgeState(napi_env env, const char* metadata_path) {
+ObjCBridgeState::ObjCBridgeState(napi_env env, const char* metadata_path,
+                                 const void* metadata_ptr) {
   napi_set_instance_data(env, this, finalize_bridge_data, nil);
 
   self_dl = dlopen(nullptr, RTLD_NOW);
 
-#ifdef EMBED_METADATA_SIZE
-  if (metadata_path != nullptr) {
-    metadata = loadMetadataFromFile(metadata_path);
+  if (metadata_ptr) {
+    metadata = new MDMetadataReader((void*)metadata_ptr);
   } else {
-    metadata = new MDMetadataReader((void*)embedded_metadata, EMBED_METADATA_SIZE);
-  }
+#ifdef EMBED_METADATA_SIZE
+    if (metadata_path != nullptr) {
+      metadata = loadMetadataFromFile(metadata_path);
+    } else {
+      metadata = new MDMetadataReader((void*)embedded_metadata, EMBED_METADATA_SIZE);
+    }
 #else
-  unsigned long segmentSize = 0;
-  auto segmentData = getsegmentdata((const mach_header_64*)_dyld_get_image_header(0),
-                                    "__objc_metadata", &segmentSize);
-  if (segmentData != nullptr) {
-    metadata = new MDMetadataReader(segmentData, segmentSize);
-  } else {
-    metadata = loadMetadataFromFile(metadata_path);
-  }
+    unsigned long segmentSize = 0;
+    auto segmentData = getsegmentdata((const mach_header_64*)_dyld_get_image_header(0),
+                                      "__objc_metadata", &segmentSize);
+    if (segmentData != nullptr) {
+      metadata = new MDMetadataReader(segmentData);
+    } else {
+      metadata = loadMetadataFromFile(metadata_path);
+    }
 #endif
+  }
 
   objc_autoreleasePool = objc_autoreleasePoolPush();
 }
@@ -143,7 +148,7 @@ void finalize_bridge_data(napi_env env, void* data, void* hint) {
     metadata_path = (char*)malloc(len + 1);
     napi_get_value_string_utf8(env, argv[0], (char*)metadata_path, len + 1, &len);
   }
-  objc_bridge_init(env, metadata_path);
+  objc_bridge_init(env, metadata_path, nullptr);
   return nullptr;
 }
 
@@ -153,10 +158,10 @@ void finalize_bridge_data(napi_env env, void* data, void* hint) {
   return exports;
 }
 
-NAPI_EXPORT void objc_bridge_init(void* _env, const char* metadata_path) {
+NAPI_EXPORT void objc_bridge_init(void* _env, const char* metadata_path, const void* metadata_ptr) {
   napi_env env = (napi_env)_env;
 
-  ObjCBridgeState* bridgeState = new ObjCBridgeState(env, metadata_path);
+  ObjCBridgeState* bridgeState = new ObjCBridgeState(env, metadata_path, metadata_ptr);
 
   napi_value objc;
   napi_create_object(env, &objc);
@@ -202,6 +207,8 @@ NAPI_EXPORT void objc_bridge_init(void* _env, const char* metadata_path) {
 
   napi_define_properties(env, global, 3, globalProperties);
 
+  setupObjCClassDecorator(env);
+
   initProxyFactory(env, bridgeState);
   initFastEnumeratorIteratorFactory(env, bridgeState);
 

NativeScript/ffi/Struct.mm

@@ -52,8 +52,8 @@
 
 void ObjCBridgeState::registerUnionGlobals(napi_env env, napi_value global) {
   MDSectionOffset offset = metadata->unionsOffset;
-  while (offset < metadata->size) {
-    // Sometimes there is padding after file ends.
+  while (true) {
+    // It's the last section, always ends with 4 bytes of 0.
     if (metadata->getOffset(offset) == 0) break;
     MDSectionOffset originalOffset = offset;
     auto name = metadata->getString(offset);

NativeScript/napi/v8/v8-api.cpp

@@ -354,10 +354,14 @@ inline napi_status Unwrap(napi_env env, napi_value js_object, void** result,
   }
 
   if (obj->IsFunction()) {
-    obj = obj->Get(context, v8::String::NewFromUtf8(env->isolate, "prototype")
+    auto newObj = obj->Get(context, v8::String::NewFromUtf8(env->isolate, "prototype")
                                 .ToLocalChecked())
               .ToLocalChecked()
               .As<v8::Object>();
+
+    if (!newObj->IsUndefined()) {
+      obj = newObj;
+    }
   }
 
   bool isInternalField = obj->InternalFieldCount() > 0;
@@ -375,7 +379,9 @@ inline napi_status Unwrap(napi_env env, napi_value js_object, void** result,
     auto pkey = v8::Private::ForApi(
         env->isolate,
         v8::String::NewFromUtf8(env->isolate, "napi_private").ToLocalChecked());
-    auto val = obj->GetPrivate(context, pkey).ToLocalChecked();
+    auto maybe_value = obj->GetPrivate(context, pkey);
+    CHECK_MAYBE_EMPTY_WITH_PREAMBLE(env, maybe_value, napi_generic_failure);
+    v8::Local<v8::Value> val = maybe_value.ToLocalChecked();
     RETURN_STATUS_IF_FALSE(env, val->IsExternal(), napi_invalid_arg);
     reference =
         static_cast<v8impl::Reference*>(val.As<v8::External>()->Value());