Support for .NET Standard 1.3 and improved loop

FlorianRappl · FlorianRappl · commit 6d14525ca8ad · 2019-08-24T09:43:38.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,13 @@
 # 0.13.0
 
-(tbd)
+Released on Friday, August 23 2019.
 
 - Added thread-based event loop implementation `JsEventLoop`
 - Included new `WithEventLoop` configuration extensions
 - Added constructors to `window` (#12)
 - Fixed `btoa` and `atob` missing (#55)
 - Included `javascript:` URL handler (#47)
+- Included support for .NET Standard 1.3 (#58)
 
 # 0.12.1
 
diff --git a/build.cake b/build.cake
@@ -4,6 +4,7 @@ var solutionName = "AngleSharp.Js";
 var frameworks = new Dictionary<String, String>
 {
     { "net46", "net46" },
+    { "netstandard1.3", "netstandard1.3" },
     { "netstandard2.0", "netstandard2.0" },
 };
 
diff --git a/src/AngleSharp.Js.nuspec b/src/AngleSharp.Js.nuspec
@@ -14,8 +14,19 @@
     <copyright>Copyright 2017-2019, AngleSharp</copyright>
     <tags>html html5 css css3 dom javascript scripting library js scripts runtime jint anglesharp angle</tags>
     <dependencies>
-      <dependency id="AngleSharp" version="0.12.1" />
-      <dependency id="Jint" version="2.10.4" />
+      <group targetFramework="netstandard1.3">
+        <dependency id="AngleSharp" version="0.13.0" />
+        <dependency id="Jint" version="2.10.4" />
+        <dependency id="System.Threading.Thread" version="4.0.0" />
+      </group>
+      <group targetFramework="netstandard2.0">
+        <dependency id="AngleSharp" version="0.13.0" />
+        <dependency id="Jint" version="2.10.4" />
+      </group>
+      <group targetFramework="net46">
+        <dependency id="AngleSharp" version="0.13.0" />
+        <dependency id="Jint" version="2.10.4" />
+      </group>
     </dependencies>
   </metadata>
 </package>
diff --git a/src/AngleSharp.Js/AngleSharp.Js.csproj b/src/AngleSharp.Js/AngleSharp.Js.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <AssemblyName>AngleSharp.Js</AssemblyName>
     <RootNamespace>AngleSharp.Js</RootNamespace>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard1.3;netstandard2.0;net46</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -15,6 +15,10 @@
     <PackageReference Include="Jint" Version="2.10.4" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
+    <PackageReference Include="System.Threading.Thread" Version="4.0.0" />
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <DelaySign>false</DelaySign>
   </PropertyGroup>
diff --git a/src/AngleSharp.Js/Dom/EventAttributeObserver.cs b/src/AngleSharp.Js/Dom/EventAttributeObserver.cs
@@ -91,9 +91,9 @@ public EventAttributeObserver(JsScriptingService service)
         private void RegisterEventCallback<TElement>(String eventName)
             where TElement : IElement
         {
-            _observers.Add("on" + eventName, (element, value) =>
+            _observers.Add("on" + eventName, (sender, value) =>
             {
-                if (element is TElement)
+                if (sender is TElement element)
                 {
                     var document = element.Owner;
                     var engine = _service.GetOrCreateInstance(document);
diff --git a/src/AngleSharp.Js/Dom/Navigator.cs b/src/AngleSharp.Js/Dom/Navigator.cs
@@ -38,6 +38,10 @@ public void WaitForStorageUpdates()
         {
         }
 
+#if NETSTANDARD1_3
+        public Boolean IsOnline => true;
+#else
         public Boolean IsOnline => NetworkInterface.GetIsNetworkAvailable();
+#endif
     }
 }
diff --git a/src/AngleSharp.Js/Dom/XmlHttpRequest.cs b/src/AngleSharp.Js/Dom/XmlHttpRequest.cs
@@ -1,6 +1,7 @@
 namespace AngleSharp.Js.Dom
 {
     using AngleSharp.Attributes;
+    using AngleSharp.Browser;
     using AngleSharp.Dom;
     using AngleSharp.Dom.Events;
     using AngleSharp.Io;
@@ -370,6 +371,9 @@ private async Task Receive(IDocumentLoader loader, DocumentRequest request)
             }
         }
 
+        private IEventLoop GetEventLoop() =>
+            _window?.Document?.Context.GetService<IEventLoop>();
+
         private IDocumentLoader GetLoader() =>
             _window?.Document?.Context.GetService<IDocumentLoader>();
 
@@ -387,7 +391,7 @@ private static Stream Serialize(Object body)
         }
 
         private void Fire(String eventName) =>
-            Dispatch(new Event(eventName));
+            GetEventLoop().Enqueue(() => Dispatch(new Event(eventName)));
 
         #endregion
     }
diff --git a/src/AngleSharp.Js/Extensions/EngineExtensions.cs b/src/AngleSharp.Js/Extensions/EngineExtensions.cs
@@ -225,33 +225,30 @@ public static JsValue RunScript(this EngineInstance engine, String source, INode
 
         public static JsValue Call(this EngineInstance instance, MethodInfo method, JsValue thisObject, JsValue[] arguments)
         {
-            if (method != null && thisObject.Type == Types.Object)
+            if (method != null && thisObject.Type == Types.Object && thisObject.AsObject() is DomNodeInstance node)
             {
-                if (thisObject.AsObject() is DomNodeInstance node)
+                try
                 {
-                    try
+                    if (method.IsStatic)
                     {
-                        if (method.IsStatic)
+                        var newArgs = new List<JsValue>
                         {
-                            var newArgs = new List<JsValue>
-                            {
-                                thisObject,
-                            };
-                            newArgs.AddRange(arguments);
-                            var parameters = instance.BuildArgs(method, newArgs.ToArray());
-                            return method.Invoke(null, parameters).ToJsValue(instance);
-                        }
-                        else
-                        {
-                            var parameters = instance.BuildArgs(method, arguments);
-                            return method.Invoke(node.Value, parameters).ToJsValue(instance);
-                        }
+                            thisObject,
+                        };
+                        newArgs.AddRange(arguments);
+                        var parameters = instance.BuildArgs(method, newArgs.ToArray());
+                        return method.Invoke(null, parameters).ToJsValue(instance);
                     }
-                    catch (TargetInvocationException)
+                    else
                     {
-                        throw new JavaScriptException(instance.Jint.Error);
+                        var parameters = instance.BuildArgs(method, arguments);
+                        return method.Invoke(node.Value, parameters).ToJsValue(instance);
                     }
                 }
+                catch (TargetInvocationException)
+                {
+                    throw new JavaScriptException(instance.Jint.Error);
+                }
             }
 
             return JsValue.Undefined;
diff --git a/src/AngleSharp.Js/Extensions/ReflectionExtensions.cs b/src/AngleSharp.Js/Extensions/ReflectionExtensions.cs
@@ -20,7 +20,7 @@ public static Object GetDefaultValue(this Type type) =>
 
         public static IEnumerable<Type> GetExtensionTypes(this IEnumerable<Assembly> libs, String name) => libs
             .SelectMany(m => m.ExportedTypes)
-            .Where(m => m.GetCustomAttributes<DomExposedAttribute>().Any(n => n.Target.Is(name)))
+            .Where(m => m.GetTypeInfo().GetCustomAttributes<DomExposedAttribute>().Any(n => n.Target.Is(name)))
             .ToArray();
 
         public static IEnumerable<Type> GetTypeTree(this Type root)
@@ -89,7 +89,7 @@ public static String GetOfficialName(this Type currentType, Type baseType)
 
         public static PropertyInfo GetInheritedProperty(this Type type, String propertyName, BindingFlags bindingAttr = BindingFlags.Public | BindingFlags.Instance)
         {
-            if (type.IsInterface)
+            if (type.GetTypeInfo().IsInterface)
             {
                 return type.GetInterfaces()
                     .Union(new[] { type })
@@ -103,7 +103,7 @@ public static PropertyInfo GetInheritedProperty(this Type type, String propertyN
 
         public static IEnumerable<PropertyInfo> GetInheritedProperties(this Type type, BindingFlags bindingAttr = BindingFlags.Public | BindingFlags.Instance)
         {
-            if (type.IsInterface)
+            if (type.GetTypeInfo().IsInterface)
             {
                 return type.GetInterfaces()
                     .Union(new[] { type })
diff --git a/src/AngleSharp.Js/JsEventLoop.cs b/src/AngleSharp.Js/JsEventLoop.cs
@@ -15,6 +15,23 @@ public sealed class JsEventLoop : IEventLoop, IDisposable
         private readonly Object _lockObj = new Object();
         private CancellationTokenSource _cts;
 
+        /// <summary>
+        /// Creates a new event loop thread.
+        /// </summary>
+        public JsEventLoop()
+        {
+            var thread = new Thread(Runner)
+            {
+                IsBackground = true,
+                Name = "AngleSharpEventLoop",
+#if !NETSTANDARD1_3
+                Priority = ThreadPriority.Highest,
+#endif
+            };
+            _cts = new CancellationTokenSource();
+            thread.Start(_cts.Token);
+        }
+
         ICancellable IEventLoop.Enqueue(Action<CancellationToken> action, TaskPriority priority)
         {
             var entry = new LoopEntry(action);
@@ -61,17 +78,6 @@ LoopEntry Dequeue(TaskPriority priority)
 
         void IEventLoop.Spin()
         {
-            if (_cts == null)
-            {
-                var thread = new Thread(Runner)
-                {
-                    IsBackground = true,
-                    Name = "AngleSharpEventLoop",
-                    Priority = ThreadPriority.Highest,
-                };
-                _cts = new CancellationTokenSource();
-                thread.Start(_cts.Token);
-            }
         }
 
         void IEventLoop.CancelAll()
diff --git a/src/AngleSharp.Js/JsScriptingService.cs b/src/AngleSharp.Js/JsScriptingService.cs
@@ -117,7 +117,7 @@ internal EngineInstance GetOrCreateInstance(IDocument document)
 
         private static IEnumerable<Assembly> GetAssemblies(IBrowsingContext context) => context
             .GetServices<Object>()
-            .Select(m => m.GetType().Assembly)
+            .Select(m => m.GetType().GetAssembly())
             .Distinct()
             .Where(m => m.FullName.StartsWith("AngleSharp"));
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ var solutionName = "AngleSharp.Js";`
`4`	`4`	`var frameworks = new Dictionary<String, String>`
`5`	`5`	`{`
`6`	`6`	`{ "net46", "net46" },`
	`7`	`+ { "netstandard1.3", "netstandard1.3" },`
`7`	`8`	`{ "netstandard2.0", "netstandard2.0" },`
`8`	`9`	`};`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ public EventAttributeObserver(JsScriptingService service)`
`91`	`91`	`private void RegisterEventCallback<TElement>(String eventName)`
`92`	`92`	`where TElement : IElement`
`93`	`93`	`{`
`94`		`- _observers.Add("on" + eventName, (element, value) =>`
	`94`	`+ _observers.Add("on" + eventName, (sender, value) =>`
`95`	`95`	`{`
`96`		`- if (element is TElement)`
	`96`	`+ if (sender is TElement element)`
`97`	`97`	`{`
`98`	`98`	`var document = element.Owner;`
`99`	`99`	`var engine = _service.GetOrCreateInstance(document);`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ public void WaitForStorageUpdates()`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
	`41`	`+#if NETSTANDARD1_3`
	`42`	`+ public Boolean IsOnline => true;`
	`43`	`+#else`
`41`	`44`	`public Boolean IsOnline => NetworkInterface.GetIsNetworkAvailable();`
	`45`	`+#endif`
`42`	`46`	`}`
`43`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace AngleSharp.Js.Dom`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Attributes;`
	`4`	`+ using AngleSharp.Browser;`
`4`	`5`	`using AngleSharp.Dom;`
`5`	`6`	`using AngleSharp.Dom.Events;`
`6`	`7`	`using AngleSharp.Io;`
`@@ -370,6 +371,9 @@ private async Task Receive(IDocumentLoader loader, DocumentRequest request)`
`370`	`371`	`}`
`371`	`372`	`}`
`372`	`373`
	`374`	`+ private IEventLoop GetEventLoop() =>`
	`375`	`+ _window?.Document?.Context.GetService<IEventLoop>();`
	`376`	`+`
`373`	`377`	`private IDocumentLoader GetLoader() =>`
`374`	`378`	`_window?.Document?.Context.GetService<IDocumentLoader>();`
`375`	`379`
`@@ -387,7 +391,7 @@ private static Stream Serialize(Object body)`
`387`	`391`	`}`
`388`	`392`
`389`	`393`	`private void Fire(String eventName) =>`
`390`		`- Dispatch(new Event(eventName));`
	`394`	`+ GetEventLoop().Enqueue(() => Dispatch(new Event(eventName)));`
`391`	`395`
`392`	`396`	`#endregion`
`393`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,33 +225,30 @@ public static JsValue RunScript(this EngineInstance engine, String source, INode`
`225`	`225`
`226`	`226`	`public static JsValue Call(this EngineInstance instance, MethodInfo method, JsValue thisObject, JsValue[] arguments)`
`227`	`227`	`{`
`228`		`- if (method != null && thisObject.Type == Types.Object)`
	`228`	`+ if (method != null && thisObject.Type == Types.Object && thisObject.AsObject() is DomNodeInstance node)`
`229`	`229`	`{`
`230`		`- if (thisObject.AsObject() is DomNodeInstance node)`
	`230`	`+ try`
`231`	`231`	`{`
`232`		`- try`
	`232`	`+ if (method.IsStatic)`
`233`	`233`	`{`
`234`		`- if (method.IsStatic)`
	`234`	`+ var newArgs = new List<JsValue>`
`235`	`235`	`{`
`236`		`- var newArgs = new List<JsValue>`
`237`		`- {`
`238`		`- thisObject,`
`239`		`- };`
`240`		`- newArgs.AddRange(arguments);`
`241`		`- var parameters = instance.BuildArgs(method, newArgs.ToArray());`
`242`		`- return method.Invoke(null, parameters).ToJsValue(instance);`
`243`		`- }`
`244`		`- else`
`245`		`- {`
`246`		`- var parameters = instance.BuildArgs(method, arguments);`
`247`		`- return method.Invoke(node.Value, parameters).ToJsValue(instance);`
`248`		`- }`
	`236`	`+ thisObject,`
	`237`	`+ };`
	`238`	`+ newArgs.AddRange(arguments);`
	`239`	`+ var parameters = instance.BuildArgs(method, newArgs.ToArray());`
	`240`	`+ return method.Invoke(null, parameters).ToJsValue(instance);`
`249`	`241`	`}`
`250`		`- catch (TargetInvocationException)`
	`242`	`+ else`
`251`	`243`	`{`
`252`		`- throw new JavaScriptException(instance.Jint.Error);`
	`244`	`+ var parameters = instance.BuildArgs(method, arguments);`
	`245`	`+ return method.Invoke(node.Value, parameters).ToJsValue(instance);`
`253`	`246`	`}`
`254`	`247`	`}`
	`248`	`+ catch (TargetInvocationException)`
	`249`	`+ {`
	`250`	`+ throw new JavaScriptException(instance.Jint.Error);`
	`251`	`+ }`
`255`	`252`	`}`
`256`	`253`
`257`	`254`	`return JsValue.Undefined;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static Object GetDefaultValue(this Type type) =>`
`20`	`20`
`21`	`21`	`public static IEnumerable<Type> GetExtensionTypes(this IEnumerable<Assembly> libs, String name) => libs`
`22`	`22`	`.SelectMany(m => m.ExportedTypes)`
`23`		`- .Where(m => m.GetCustomAttributes<DomExposedAttribute>().Any(n => n.Target.Is(name)))`
	`23`	`+ .Where(m => m.GetTypeInfo().GetCustomAttributes<DomExposedAttribute>().Any(n => n.Target.Is(name)))`
`24`	`24`	`.ToArray();`
`25`	`25`
`26`	`26`	`public static IEnumerable<Type> GetTypeTree(this Type root)`
`@@ -89,7 +89,7 @@ public static String GetOfficialName(this Type currentType, Type baseType)`
`89`	`89`
`90`	`90`	`public static PropertyInfo GetInheritedProperty(this Type type, String propertyName, BindingFlags bindingAttr = BindingFlags.Public \| BindingFlags.Instance)`
`91`	`91`	`{`
`92`		`- if (type.IsInterface)`
	`92`	`+ if (type.GetTypeInfo().IsInterface)`
`93`	`93`	`{`
`94`	`94`	`return type.GetInterfaces()`
`95`	`95`	`.Union(new[] { type })`
`@@ -103,7 +103,7 @@ public static PropertyInfo GetInheritedProperty(this Type type, String propertyN`
`103`	`103`
`104`	`104`	`public static IEnumerable<PropertyInfo> GetInheritedProperties(this Type type, BindingFlags bindingAttr = BindingFlags.Public \| BindingFlags.Instance)`
`105`	`105`	`{`
`106`		`- if (type.IsInterface)`
	`106`	`+ if (type.GetTypeInfo().IsInterface)`
`107`	`107`	`{`
`108`	`108`	`return type.GetInterfaces()`
`109`	`109`	`.Union(new[] { type })`