Revert JSPool package back to 2.0.1 due to breakages in Statiq.Web.

Author: jasonsummers

src/core/Statiq.Core/JavaScript/JavaScriptEnginePool.cs

@@ -11,7 +11,7 @@ internal class JavaScriptEnginePool : IJavaScriptEnginePool
     {
         private static readonly object EngineSwitcherLock = new object();
 
-        private readonly JsPool<PooledJavaScriptEngine, JavaScriptEngine> _pool;
+        private readonly JsPool<JavaScriptEngine> _pool;
         private bool _disposed = false;
 
         public JavaScriptEnginePool(
@@ -34,7 +34,7 @@ public JavaScriptEnginePool(
                 }
             }
 
-            _pool = new JsPool<PooledJavaScriptEngine, JavaScriptEngine>(new JsPoolConfig<JavaScriptEngine>
+            _pool = new JsPool<JavaScriptEngine>(new JsPoolConfig<JavaScriptEngine>
             {
                 EngineFactory = () => new JavaScriptEngine(JsEngineSwitcher.Current.CreateDefaultEngine()),
                 Initializer = x => initializer?.Invoke(x),
@@ -52,7 +52,7 @@ public void Dispose()
             _disposed = true;
         }
 
-        public IJavaScriptEngine GetEngine(TimeSpan? timeout = null) => new PooledJavaScriptEngine(_pool.GetEngine(timeout).Engine, _pool);
+        public IJavaScriptEngine GetEngine(TimeSpan? timeout = null) => new PooledJavaScriptEngine(_pool.GetEngine(timeout), _pool);
 
         public void RecycleEngine(IJavaScriptEngine engine)
         {
@@ -65,7 +65,7 @@ public void RecycleEngine(IJavaScriptEngine engine)
             {
                 throw new ArgumentException("The specified engine is from a different pool");
             }
-            _pool.DisposeEngine(pooledEngine);
+            _pool.DisposeEngine(pooledEngine.Engine);
         }
 
         public void RecycleAllEngines() => _pool.Recycle();

src/core/Statiq.Core/JavaScript/PooledJavaScriptEngine.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Reflection;
 using System.Text;
-using JavaScriptEngineSwitcher.Core;
 using JSPool;
 using Statiq.Common;
 
@@ -12,29 +11,24 @@ namespace Statiq.Core
     /// dispose behavior so that instead of disposing the
     /// underlying engine, it returns the engine to the pool.
     /// </summary>
-    internal class PooledJavaScriptEngine : PooledObject<JavaScriptEngine>, IJavaScriptEngine
+    internal class PooledJavaScriptEngine : IJavaScriptEngine
     {
         private bool _disposed = false;
 
-        public PooledJavaScriptEngine(JavaScriptEngine engine, JsPool<PooledJavaScriptEngine, JavaScriptEngine> pool)
+        public PooledJavaScriptEngine(JavaScriptEngine engine, JsPool<JavaScriptEngine> pool)
         {
             Engine = engine;
             Pool = pool;
         }
 
-        public PooledJavaScriptEngine()
-        {
-            Engine = new JavaScriptEngine(JsEngineSwitcher.Current.CreateDefaultEngine());
-        }
-
         internal JavaScriptEngine Engine { get; }
 
-        internal JsPool<PooledJavaScriptEngine, JavaScriptEngine> Pool { get; }
+        internal JsPool<JavaScriptEngine> Pool { get; }
 
-        public new void Dispose()
+        public void Dispose()
         {
             CheckDisposed();
-            Engine.Dispose();
+            Pool.ReturnEngineToPool(Engine);
             _disposed = true;
         }
 

src/core/Statiq.Core/Statiq.Core.csproj

@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageReference Include="JavaScriptEngineSwitcher.Core" Version="3.24.1" />
     <PackageReference Include="JavaScriptEngineSwitcher.Jint" Version="3.30.3" />
-    <PackageReference Include="JSPool" Version="4.0.0" />
+    <PackageReference Include="JSPool" Version="2.0.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.1" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />