fix: ensure context closure runs on platform thread in ContextQueue, JSInterceptorFactory, and JSStringService to prevent thread-local issues

See: #663

Author: mkjsix

polyglot/src/main/java/org/restheart/polyglot/ContextQueue.java

@@ -110,9 +110,16 @@ private Context acquire() {
      */
     private void release(Context ctx) {
         if (!pool.offer(ctx)) {
-            // Pool is full, close the context
-            ctx.close();
-            LOGGER.debug("Pool full, closed excess context");
+            try {
+                // Context.close() touches thread locals, must run on a platform thread, see PolyglotThreadUtils
+                PolyglotThreadUtils.onPlatformThread(() -> {
+                    ctx.close();
+                    return null;
+                });
+                LOGGER.debug("Pool full, closed excess context");
+            } catch (Exception e) {
+                LOGGER.warn("Error closing excess context", e);
+            }
         }
     }
 

polyglot/src/main/java/org/restheart/polyglot/interceptors/JSInterceptorFactory.java

@@ -27,7 +27,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.graalvm.polyglot.Context;
 import org.restheart.polyglot.PolyglotClassloaderHelper;
 import org.restheart.polyglot.PolyglotThreadUtils;
 import org.graalvm.polyglot.Engine;
@@ -68,7 +67,7 @@ public JSInterceptorFactory(Optional<MongoClient> mclient, Configuration config)
         try {
             // Engine.create() touches Truffle thread locals, must run on a platform thread (see PolyglotThreadUtils)
             // and needs PluginsClassloader so ServiceLoader can find js-language's TruffleLanguageProvider
-            this.engine = PolyglotThreadUtils.onPlatformThread(() -> PolyglotClassloaderHelper.withPluginsClassloaderResult(Engine::create));
+            this.engine = PolyglotThreadUtils.onPlatformThread(PolyglotThreadUtils::createEngine);
         } catch (Exception e) {
             throw new IllegalStateException("Error creating polyglot Engine", e);
         }
@@ -108,7 +107,8 @@ public JSInterceptorFactory(Optional<MongoClient> mclient, Configuration config)
         var sindexPath = pluginPath.toUri().toString();
         LOGGER.debug("Resolved interceptor path: {}", sindexPath);
 
-        try (Context ctx = ContextQueue.newContext(engine, "foo", config, LOGGER, mclient, "", contextOptions)) {
+        var ctx = ContextQueue.newContext(engine, "foo", config, LOGGER, mclient, "", contextOptions);
+        try {
 
             // ******** evaluate and check options
             var optionsScript = "import { options } from '" + sindexPath + "'; options;";
@@ -352,6 +352,16 @@ public JSInterceptorFactory(Optional<MongoClient> mclient, Configuration config)
                     interceptor.getClass().getName(),
                     interceptor,
                     new HashMap<>());
+        } finally {
+            try {
+                // Context.close() touches thread locals, must run on a platform thread, see PolyglotThreadUtils
+                PolyglotThreadUtils.onPlatformThread(() -> {
+                    ctx.close();
+                    return null;
+                });
+            } catch (Exception e) {
+                LOGGER.warn("Error closing context for {}", pluginPath, e);
+            }
         }
     }
 

polyglot/src/main/java/org/restheart/polyglot/services/JSStringService.java

@@ -26,7 +26,6 @@
 import java.util.HashMap;
 import java.util.Optional;
 
-import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
 import org.restheart.polyglot.PolyglotClassloaderHelper;
 import org.restheart.polyglot.PolyglotThreadUtils;
@@ -97,7 +96,8 @@ private static JSServiceArgs args(Path pluginPath, Optional<MongoClient> mclient
             LOGGER.trace("Enabling require for service {} with require-cwd {} ", pluginPath, requireCwdPath);
         }
 
-        try (Context ctx = ContextQueue.newContext(engine(), "foo", config, LOGGER, mclient, "", contextOptions)) {
+        var ctx = ContextQueue.newContext(engine(), "foo", config, LOGGER, mclient, "", contextOptions);
+        try {
             // check that the plugin script is js (use PluginsClassloader so js-language is visible)
             final var language = PolyglotClassloaderHelper.withPluginsClassloaderResult(
                 () -> Source.findLanguage(pluginPath.toFile()));
@@ -162,6 +162,16 @@ private static JSServiceArgs args(Path pluginPath, Optional<MongoClient> mclient
             checkHandle(handle, pluginPath);
 
             return new JSServiceArgs(name, description, uri, secured, modulesReplacements, matchPolicy, handleSource, config, mclient, contextOptions);
+        } finally {
+            try {
+                // Context.close() touches thread locals, must run on a platform thread, see PolyglotThreadUtils
+                PolyglotThreadUtils.onPlatformThread(() -> {
+                    ctx.close();
+                    return null;
+                });
+            } catch (Exception e) {
+                LOGGER.warn("Error closing context for {}", pluginPath, e);
+            }
         }
     }