@nativescript/windows 0.1.0-alpha.62 → 0.1.0-alpha.63

package/framework/dotnet-bridge/Bridge.cs

@@ -161,12 +161,7 @@ public static partial class Bridge
         }
     }
 
-    // Helper invoked from JS runtime to schedule a previously-registered
-    // JS callback id to run on the application's UI thread. This method
-    // attempts several common dispatcher abstractions (SynchronizationContext,
-    // WPF Dispatcher, UWP/CoreDispatcher, WinUI DispatcherQueue) and falls
-    // back to running the callback on the current thread if none are found.
-    public static object? RunJsCallbackOnUIThread(int callbackId)
+    public static object? RunOnUIThread(int callbackId)
     {
         var action = new Action(() =>
         {
@@ -180,43 +175,6 @@ public static partial class Bridge
             }
         });
 
-        // 1) SynchronizationContext (WinForms/WPF/UWP if present)
-        var sc = SynchronizationContext.Current;
-        if (sc != null)
-        {
-            var mre = new ManualResetEventSlim(false);
-            sc.Post(_ => { try { action(); } finally { mre.Set(); } }, null);
-            mre.Wait();
-            return null;
-        }
-
-        // 2) WPF Dispatcher.CurrentDispatcher
-        try
-        {
-            var wpfDispatcherType = AppDomain.CurrentDomain.GetAssemblies()
-                .Select(a => a.GetType("System.Windows.Threading.Dispatcher"))
-                .FirstOrDefault(t => t != null);
-            if (wpfDispatcherType != null)
-            {
-                var currentDispatcherProp = wpfDispatcherType.GetProperty("CurrentDispatcher", BindingFlags.Public | BindingFlags.Static);
-                var dispatcher = currentDispatcherProp?.GetValue(null);
-                if (dispatcher != null)
-                {
-                    var beginInvoke = dispatcher.GetType().GetMethod("BeginInvoke", new[] { typeof(Action) })
-                        ?? dispatcher.GetType().GetMethods().FirstOrDefault(m => m.Name == "BeginInvoke" && m.GetParameters().Length == 1);
-                    if (beginInvoke != null)
-                    {
-                        var mre = new ManualResetEventSlim(false);
-                        beginInvoke.Invoke(dispatcher, new object[] { new Action(() => { try { action(); } finally { mre.Set(); } }) });
-                        mre.Wait();
-                        return null;
-                    }
-                }
-            }
-        }
-        catch { }
-
-        // 3) Try CoreDispatcher (UWP) via reflection
         try
         {
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
@@ -229,29 +187,37 @@ public static partial class Bridge
                 var dispatcherProp = mainView.GetType().GetProperty("Dispatcher", BindingFlags.Public | BindingFlags.Instance);
                 var dispatcher = dispatcherProp?.GetValue(mainView);
                 if (dispatcher == null) continue;
-                var runAsyncMethods = dispatcher.GetType().GetMethods().Where(m => m.Name == "RunAsync");
-                foreach (var m in runAsyncMethods)
+
+                var hasAccessProp = dispatcher.GetType().GetProperty("HasThreadAccess", BindingFlags.Public | BindingFlags.Instance);
+                if (hasAccessProp?.GetValue(dispatcher) is true)
+                {
+                    action();
+                    return null;
+                }
+
+                foreach (var m in dispatcher.GetType().GetMethods().Where(m => m.Name == "RunAsync"))
                 {
                     var parameters = m.GetParameters();
                     if (parameters.Length != 2) continue;
                     var enumType = parameters[0].ParameterType;
                     object priority = enumType.IsEnum ? Enum.ToObject(enumType, 0) : Activator.CreateInstance(enumType)!;
                     var handlerType = parameters[1].ParameterType;
-                    var d = Delegate.CreateDelegate(handlerType, action.Target, action.Method);
-                    var result = m.Invoke(dispatcher, new object[] { priority, d });
-                    var asTask = result?.GetType().GetMethod("AsTask");
-                    if (asTask != null)
+                    var mre = new ManualResetEventSlim(false);
+                    var wrapped = new Action(() => { try { action(); } finally { mre.Set(); } });
+                    try
                     {
-                        var t = (Task)asTask.Invoke(result, null)!;
-                        t.GetAwaiter().GetResult();
+                        var d = Delegate.CreateDelegate(handlerType, wrapped.Target, wrapped.Method);
+                        m.Invoke(dispatcher, new object[] { priority, d });
+                        mre.Wait();
+                        return null;
                     }
-                    return null;
+                    catch { }
                 }
+                break;
             }
         }
         catch { }
 
-        // 4) Try Microsoft.UI.Dispatching.DispatcherQueue
         try
         {
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
@@ -261,19 +227,48 @@ public static partial class Bridge
                 var getForCurrent = dqType.GetMethod("GetForCurrentThread", BindingFlags.Public | BindingFlags.Static);
                 var dq = getForCurrent?.Invoke(null, null);
                 if (dq == null) continue;
-                var tryEnqueueMethods = dq.GetType().GetMethods().Where(m => m.Name == "TryEnqueue" && m.GetParameters().Length == 1);
-                foreach (var m in tryEnqueueMethods)
+
+                if (dq.GetType().GetProperty("HasThreadAccess")?.GetValue(dq) is true)
                 {
-                    var paramType = m.GetParameters()[0].ParameterType;
-                    var d = Delegate.CreateDelegate(paramType, action.Target, action.Method);
-                    var ok = m.Invoke(dq, new object[] { d });
+                    action();
                     return null;
                 }
+                break;
+            }
+        }
+        catch { }
+
+        try
+        {
+            var wpfDispatcherType = AppDomain.CurrentDomain.GetAssemblies()
+                .Select(a => a.GetType("System.Windows.Threading.Dispatcher"))
+                .FirstOrDefault(t => t != null);
+            if (wpfDispatcherType != null)
+            {
+                var currentDispatcherProp = wpfDispatcherType.GetProperty("CurrentDispatcher", BindingFlags.Public | BindingFlags.Static);
+                var dispatcher = currentDispatcherProp?.GetValue(null);
+                if (dispatcher != null)
+                {
+                    var checkAccess = dispatcher.GetType().GetMethod("CheckAccess");
+                    if (checkAccess?.Invoke(dispatcher, null) is true)
+                    {
+                        action();
+                        return null;
+                    }
+                    var beginInvoke = dispatcher.GetType().GetMethod("BeginInvoke", new[] { typeof(Action) })
+                        ?? dispatcher.GetType().GetMethods().FirstOrDefault(m => m.Name == "BeginInvoke" && m.GetParameters().Length == 1);
+                    if (beginInvoke != null)
+                    {
+                        var mre = new ManualResetEventSlim(false);
+                        beginInvoke.Invoke(dispatcher, new object[] { new Action(() => { try { action(); } finally { mre.Set(); } }) });
+                        mre.Wait();
+                        return null;
+                    }
+                }
             }
         }
         catch { }
 
-        // Fallback: run directly on current thread.
         action();
         return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows",
-  "version": "0.1.0-alpha.62",
+  "version": "0.1.0-alpha.63",
   "description": "NativeScript for using Windows v8",
   "repository": {
         "type": "git",