Doc updated

Positron-JS · Aug 29, 2024 · 0fb5c7f · 0fb5c7f
1 parent 945a4a4
commit 0fb5c7f
Show file tree

Hide file tree

Showing 11 changed files with 436 additions and 215 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "neurospeech"
+    ]
+}
diff --git a/Positron/Controls/PositronWebView.cs b/Positron/Controls/PositronWebView.cs
@@ -16,6 +16,11 @@ static PositronWebView() {
             OnStaticPlatformInit();
         }
 
+        /// <summary>
+        /// Return false to deny execution of native script.
+        /// </summary>
+        public Func<string, bool> ShouldInvokeScript { get; set; }
+
         private DisposableList disposables = new DisposableList();
 
         public IJSContext Context { get;set; }
@@ -26,6 +31,8 @@ static PositronWebView() {
 
         public GlobalClr Clr { get; }
 
+        private string currentUrl;
+
         public PositronWebView()
         {
             Context = JSContextFactory.Instance.Create();
@@ -64,6 +71,8 @@ public PositronWebView()
             Positron.Instance.OnUrlRequested += Instance_OnUrlRequested;
             Positron.Instance.OnDeviceTokenUpdated+= Instance_OnDeviceTokenUpdated;
 
+            this.Navigating += (s, e) => this.currentUrl = e.Url;
+
         }
 
 
@@ -97,6 +106,15 @@ public void RunMainThreadJavaScript(string script)
             Dispatcher.DispatchTask( async () => {
                 try
                 {
+                    var s = this.ShouldInvokeScript;
+                    if (s != null)
+                    {
+                        var url = this.currentUrl;
+                        if (!s(url))
+                        {
+                            throw new UnauthorizedAccessException($"Cannot access nativeShell from {url}");
+                        }
+                    }
                     var result = await this.Clr.SerializeAsync(Context.Evaluate(script));
                 } catch (Exception ex) {
                     System.Diagnostics.Debug.WriteLine(ex.ToString());

diff --git a/Positron/Engine/ClrClassInterop.cs b/Positron/Engine/ClrClassInterop.cs
@@ -292,9 +292,15 @@ private IJSValue Invoke(
             for (int i = 0; i < l; i++)
             {
                 var pm = argTypes[i];
+                var vi = args[i];
                 if (i < args.Count)
                 {
-                    p[i] = c.Deserialize(args[i], pm.ParameterType);
+                    if (vi.CanConvertTo(pm.ParameterType, out var cv))
+                    {
+                        p[i] = cv;
+                        continue;
+                    }
+                    p[i] = c.Deserialize(vi, pm.ParameterType);
                     continue;
                 }
                 if(pm.HasDefaultValue)