fix(ci): stabilize direct ffi test runs

DjDeveloperr · DjDeveloperr · commit bc6267a66221 · 2026-05-25T23:43:27.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,4 +52,6 @@ jobs:
           IOS_BUILD_TIMEOUT_MS: "600000"
           IOS_TEST_TIMEOUT_MS: "600000"
           IOS_TEST_INACTIVITY_TIMEOUT_MS: "180000"
+          IOS_TEST_VERBOSE_SPECS: "1"
+          IOS_SIMCTL_QUERY_TIMEOUT_MS: "10000"
         run: npm run test:ios
diff --git a/NativeScript/ffi/shared/jsi/NativeApiJsiBridge.h b/NativeScript/ffi/shared/jsi/NativeApiJsiBridge.h
@@ -187,6 +187,32 @@ std::string jsifySelector(const char* selector) {
   return jsifiedSelector;
 }
 
+std::string booleanGetterSelectorForProperty(const std::string& property) {
+  if (property.empty()) {
+    return property;
+  }
+
+  std::string selector = "is";
+  selector += static_cast<char>(toupper(property[0]));
+  selector += property.substr(1);
+  return selector;
+}
+
+std::optional<std::string> runtimeBooleanGetterSelectorForProperty(
+    Class cls, bool staticMethod, const std::string& property) {
+  if (cls == nil || property.empty()) {
+    return std::nullopt;
+  }
+
+  std::string selectorName = booleanGetterSelectorForProperty(property);
+  SEL selector = sel_getUid(selectorName.c_str());
+  if ((!staticMethod && class_getInstanceMethod(cls, selector) != nullptr) ||
+      (staticMethod && class_getClassMethod(cls, selector) != nullptr)) {
+    return selectorName;
+  }
+  return std::nullopt;
+}
+
 std::optional<std::string> runtimeSelectorNameForProperty(
     Class cls, bool staticMethod, const std::string& property) {
   if (cls == nil || property.empty()) {
@@ -221,6 +247,11 @@ std::optional<std::string> runtimeSelectorNameForProperty(
   }
 #endif
 
+  if (auto selectorName =
+          runtimeBooleanGetterSelectorForProperty(cls, staticMethod, property)) {
+    return selectorName;
+  }
+
   Class scan = staticMethod ? object_getClass(cls) : cls;
   while (scan != Nil) {
     unsigned int methodCount = 0;
diff --git a/NativeScript/ffi/shared/jsi/NativeApiJsiHostObjects.h b/NativeScript/ffi/shared/jsi/NativeApiJsiHostObjects.h
@@ -390,9 +390,12 @@ class NativeApiSuperHostObject final : public HostObject {
       const auto& members = bridge_->membersForClass(*symbol);
       if (const NativeApiMember* propertyMember =
               selectPropertyMember(members, property, false)) {
-        return callObjCSelector(runtime, bridge_, receiver_, false,
-                                propertyMember->selectorName, propertyMember,
-                                nullptr, 0, dispatchClass_);
+        SEL selector = sel_getUid(propertyMember->selectorName.c_str());
+        if (class_getInstanceMethod(dispatchClass_, selector) != nullptr) {
+          return callObjCSelector(runtime, bridge_, receiver_, false,
+                                  propertyMember->selectorName, propertyMember,
+                                  nullptr, 0, dispatchClass_);
+        }
       }
 
       if (selectMethodMember(members, property, false, 0) != nullptr) {
@@ -845,12 +848,21 @@ class NativeApiObjectHostObject final
         if (const NativeApiMember* propertyMember =
                 selectPropertyMember(members, property, false)) {
           SEL selector = sel_getUid(propertyMember->selectorName.c_str());
-          if (class_getInstanceMethod(object_getClass(object_), selector) ==
-              nullptr) {
-            return Value::undefined();
+          if ([object_ respondsToSelector:selector]) {
+            return callObjectSelector(runtime, propertyMember->selectorName,
+                                      propertyMember, nullptr, 0);
+          }
+          std::string booleanSelectorName =
+              booleanGetterSelectorForProperty(property);
+          if (booleanSelectorName != propertyMember->selectorName) {
+            SEL booleanSelector = sel_getUid(booleanSelectorName.c_str());
+            if ([object_ respondsToSelector:booleanSelector]) {
+              NativeApiMember getterMember = *propertyMember;
+              getterMember.selectorName = booleanSelectorName;
+              return callObjectSelector(runtime, getterMember.selectorName,
+                                        &getterMember, nullptr, 0);
+            }
           }
-          return callObjectSelector(runtime, propertyMember->selectorName,
-                                    propertyMember, nullptr, 0);
         }
 
         if (selectMethodMember(members, property, false, 0) != nullptr) {
@@ -958,7 +970,7 @@ class NativeApiObjectHostObject final
 
     std::string setterSelectorName = setterSelectorForProperty(property);
     SEL selector = sel_getUid(setterSelectorName.c_str());
-    if (class_getInstanceMethod(object_getClass(object_), selector) != nullptr) {
+    if ([object_ respondsToSelector:selector]) {
       Value args[] = {Value(runtime, value)};
       callObjCSelector(runtime, bridge_, object_, false, setterSelectorName,
                        nullptr, args, 1);
@@ -1163,12 +1175,11 @@ class NativeApiClassHostObject final : public HostObject {
             runtime, "Objective-C class is not available: " + symbol.name);
       }
       SEL selector = sel_getUid(propertyMember->selectorName.c_str());
-      if (class_getClassMethod(cls, selector) == nullptr) {
-        return Value::undefined();
+      if (class_getClassMethod(cls, selector) != nullptr) {
+        return callObjCSelector(runtime, bridge, static_cast<id>(cls), true,
+                                propertyMember->selectorName, propertyMember,
+                                nullptr, 0);
       }
-      return callObjCSelector(runtime, bridge, static_cast<id>(cls), true,
-                              propertyMember->selectorName, propertyMember,
-                              nullptr, 0);
     }
 
     if (selectMethodMember(members, property, true, 0) != nullptr) {
diff --git a/NativeScript/ffi/shared/jsi/NativeApiJsiInvocation.h b/NativeScript/ffi/shared/jsi/NativeApiJsiInvocation.h
@@ -361,6 +361,20 @@ Value callCFunction(Runtime& runtime,
                                   returnStorage.data());
 }
 
+bool signatureSupportedForJsiInvocation(
+    const std::optional<NativeApiJsiSignature>& signature) {
+  if (!signature || !signature->prepared || signature->variadic ||
+      unsupportedJsiType(signature->returnType)) {
+    return false;
+  }
+  for (const auto& argType : signature->argumentTypes) {
+    if (unsupportedJsiType(argType)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 Value callObjCSelector(Runtime& runtime,
                        const std::shared_ptr<NativeApiJsiBridge>& bridge,
                        id receiver, bool receiverIsClass,
@@ -379,7 +393,8 @@ Value callObjCSelector(Runtime& runtime,
   Class lookupClass = dispatchSuperClass != Nil ? dispatchSuperClass : receiverClass;
   Method method = receiverIsClass ? class_getClassMethod(lookupClass, selector)
                                   : class_getInstanceMethod(lookupClass, selector);
-  if (method == nullptr) {
+  if (method == nullptr &&
+      (dispatchSuperClass != Nil || ![receiver respondsToSelector:selector])) {
     throw facebook::jsi::JSError(runtime,
                                  "Objective-C selector is not available: " +
                                      selectorName);
@@ -393,12 +408,11 @@ Value callObjCSelector(Runtime& runtime,
         bridge->metadata(), member->signatureOffset, 2, bridge.get(),
         (member->flags & metagen::mdMemberReturnOwned) != 0);
   }
-  if (!signature) {
+  if (!signatureSupportedForJsiInvocation(signature) && method != nullptr) {
     signature = parseObjCMethodJsiSignature(method, bridge.get());
   }
 
-  if (!signature || !signature->prepared || signature->variadic ||
-      unsupportedJsiType(signature->returnType)) {
+  if (!signatureSupportedForJsiInvocation(signature)) {
     throw facebook::jsi::JSError(
         runtime, "Objective-C signature is not supported by pure JSI: " +
                      selectorName);
diff --git a/NativeScript/runtime/modules/timers/Timers.mm b/NativeScript/runtime/modules/timers/Timers.mm
@@ -229,6 +229,18 @@ bool shouldAvoidMainQueueSyncWhileHoldingHermesLock(napi_env env) {
 #endif
 }
 
+void DrainPendingJobs(napi_env env) {
+  if (env == nullptr) {
+    return;
+  }
+
+#ifdef ENABLE_JS_RUNTIME
+  js_execute_pending_jobs(env);
+#else
+  (void)env;
+#endif
+}
+
 void AddTimerToMainRunLoop(napi_env env, NSTimer* timer) {
   if (timer == nil) {
     return;
@@ -310,9 +322,7 @@ void DisposeTimerHandle(napi_env callEnv, NSTimerHandle* handle, bool invalidate
     uint32_t remaining = 0;
     napi_reference_unref(cleanupEnv, callback, &remaining);
     napi_delete_reference(cleanupEnv, callback);
-#ifdef TARGET_ENGINE_HERMES
-    js_execute_pending_jobs(cleanupEnv);
-#endif
+    DrainPendingJobs(cleanupEnv);
   }
 }
 
@@ -321,6 +331,11 @@ void ScheduleOneShotTimerCleanup(napi_env env, NSTimerHandle* handle) {
     return;
   }
 
+  if ([NSThread isMainThread]) {
+    DisposeTimerHandle(env, handle, false);
+    return;
+  }
+
   [handle retain];
   dispatch_async(dispatch_get_main_queue(), ^{
     DisposeTimerHandle(env, handle, false);
@@ -429,9 +444,7 @@ void ScheduleOneShotTimerCleanup(napi_env env, NSTimerHandle* handle) {
         napi_get_reference_value(callbackEnv, callbackRef, &callbackValue);
         napi_call_function(callbackEnv, global, callbackValue, 0, nullptr, nullptr);
 #endif
-#ifdef TARGET_ENGINE_HERMES
-                        js_execute_pending_jobs(callbackEnv);
-#endif
+                        DrainPendingJobs(callbackEnv);
 
                         ScheduleOneShotTimerCleanup(callbackEnv, handle);
                         [handle release];
@@ -533,9 +546,7 @@ void ScheduleOneShotTimerCleanup(napi_env env, NSTimerHandle* handle) {
         napi_get_reference_value(callbackEnv, callbackRef, &callbackValue);
         napi_call_function(callbackEnv, global, callbackValue, 0, nullptr, nullptr);
 #endif
-#ifdef TARGET_ENGINE_HERMES
-                        js_execute_pending_jobs(callbackEnv);
-#endif
+                        DrainPendingJobs(callbackEnv);
                         [handle release];
                       }];
 
diff --git a/scripts/run-tests-ios.js b/scripts/run-tests-ios.js
@@ -13,6 +13,7 @@
 //    artifacts need rebuilding. Supported: v8, hermes, quickjs, jsc. Defaults to v8.
 //  - IOS_SWIFT_VERSION overrides default Swift version (default: 5.0).
 //  - IOS_COMMAND_TIMEOUT_MS overrides timeout for build/install/simctl commands (default: 3 minutes).
+//  - IOS_SIMCTL_QUERY_TIMEOUT_MS overrides timeout for polling simctl queries (default: 10 seconds).
 //  - IOS_BUILD_TIMEOUT_MS overrides timeout for xcodebuild app build (default: IOS_COMMAND_TIMEOUT_MS).
 //  - IOS_COMMAND_MAX_BUFFER_BYTES overrides spawnSync maxBuffer for captured command output (default: 64 MiB).
 //  - IOS_TEST_TIMEOUT_MS overrides max test runtime (default: 10 minutes).
@@ -95,6 +96,10 @@ const commandTimeoutMs = parseTimeoutMs("IOS_COMMAND_TIMEOUT_MS", 3 * 60 * 1000)
 // Clean CI runners often need substantially longer for the first iOS build than
 // for simulator control commands like boot/install/log collection.
 const buildTimeoutMs = parseTimeoutMs("IOS_BUILD_TIMEOUT_MS", 10 * 60 * 1000);
+const simctlQueryTimeoutMs = parseTimeoutMs(
+    "IOS_SIMCTL_QUERY_TIMEOUT_MS",
+    Math.min(commandTimeoutMs, 10 * 1000)
+);
 const commandMaxBufferBytes = parsePositiveInt("IOS_COMMAND_MAX_BUFFER_BYTES", 64 * 1024 * 1024);
 const testTimeoutMs = Number(process.env.IOS_TEST_TIMEOUT_MS || 10 * 60 * 1000);
 const inactivityTimeoutMs = Number(process.env.IOS_TEST_INACTIVITY_TIMEOUT_MS || 2 * 60 * 1000);
@@ -634,13 +639,25 @@ function buildTestRunnerApp(destination, swiftVersion) {
     return { appPath, reusedBuild: canReuseBuild };
 }
 
+const appContainerPathCache = new Map();
+
 function getAppContainerPath(udid, containerType) {
-    const result = run("xcrun", ["simctl", "get_app_container", udid, bundleId, containerType]);
+    const cacheKey = `${udid}:${containerType}`;
+    if (appContainerPathCache.has(cacheKey)) {
+        return appContainerPathCache.get(cacheKey);
+    }
+
+    const result = run("xcrun", ["simctl", "get_app_container", udid, bundleId, containerType], {
+        timeout: simctlQueryTimeoutMs
+    });
     if (result.status !== 0) {
         return null;
     }
 
     const out = (result.stdout || "").trim();
+    if (out) {
+        appContainerPathCache.set(cacheKey, out);
+    }
     return out || null;
 }
 
@@ -882,7 +899,8 @@ async function waitForCompletedJunitOrLaunchExit(udid, launchProcess, timeoutMs,
 
         if (Date.now() - state.lastActivityAt >= inactivityTimeoutMs) {
             const launchPid = extractLaunchPid(state.logs);
-            if (!isAppProcessRunning(udid, launchPid)) {
+            const appRunning = isAppProcessRunning(udid, launchPid);
+            if (appRunning === false) {
                 return { junitResult: null, launchResult, timedOut: true, inactive: true };
             }
         }
@@ -1002,9 +1020,11 @@ function readJunitFileState(udid) {
 }
 
 function collectSimulatorProcessSnapshot(udid) {
-    const result = run("xcrun", ["simctl", "spawn", udid, "ps", "-axo", "pid,ppid,stat,etime,command"]);
+    const result = run("xcrun", ["simctl", "spawn", udid, "ps", "-axo", "pid,ppid,stat,etime,command"], {
+        timeout: simctlQueryTimeoutMs
+    });
     if (result.status !== 0) {
-        return "";
+        return null;
     }
 
     const lines = (result.stdout || "")
@@ -1016,6 +1036,9 @@ function collectSimulatorProcessSnapshot(udid) {
 
 function isAppProcessRunning(udid, pid) {
     const snapshot = collectSimulatorProcessSnapshot(udid);
+    if (snapshot == null) {
+        return null;
+    }
     if (!snapshot) {
         return false;
     }
