Loading plugins via application sandbox

Pr-URL: #1762
metarhia · Jul 26, 2022 · a911979 · a911979
1 parent c21d862
commit a911979
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/dependencies.js b/lib/dependencies.js
@@ -34,6 +34,12 @@ const assignNamespace = (container, name, value) => {
   container[camelKey] = value;
 };
 
+const loadPlugins = (lib) => {
+  for (const plugin of Object.keys(lib.plugins)) {
+    lib.plugins[plugin] = String(lib.plugins[plugin]);
+  }
+};
+
 for (const name of dependencies) {
   if (name === 'impress') continue;
   let lib = null;
@@ -45,6 +51,7 @@ for (const name of dependencies) {
     }
     continue;
   }
+  if (lib.plugins) loadPlugins(lib);
   if (internals.includes(name)) {
     assignNamespace(node, name, lib);
     continue;

diff --git a/lib/interfaces.js b/lib/interfaces.js
@@ -67,7 +67,7 @@ class Interfaces extends Cache {
 
   async change(filePath) {
     if (!filePath.endsWith('.js')) return;
-    let script = await this.createScript(filePath);
+    const script = await this.createScript(filePath);
     if (!script) return;
     const proc = new Procedure(script, 'method', this.application);
     let iface = proc.exports;
@@ -84,10 +84,11 @@ class Interfaces extends Cache {
       if (!lib || !lib.plugins) return;
       const plugin = lib.plugins[name];
       if (!plugin) return;
-      script = plugin(iface);
-      iface = script();
+      const context = this.application.sandbox;
+      const { exports } = metavm.createScript(name, plugin, { context });
+      iface = exports(iface);
     }
-    for (const name of Object.keys(iface)) {
+    for (const [name, script] of Object.entries(iface)) {
       const proc = new Procedure(script, name, this.application);
       this.changeInterface(interfaceName, name, proc);
     }