rotor: fix for isolated-vm leak

jitsucom · Dec 20, 2024 · ffe8e8e · ffe8e8e
1 parent 1f1079f
commit ffe8e8e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/libs/core-functions/src/functions/lib/profiles-udf-wrapper.ts b/libs/core-functions/src/functions/lib/profiles-udf-wrapper.ts
@@ -202,7  202,7 @@ export const ProfileUDFWrapper = (
       throw new Error(`import is not allowed: ${specifier}`);
     });
     wrapper.evaluateSync();
-    const wrapperFunc = wrap(fullId, isolate, context, wrapper);
     const wrapperFunc = wrap(fullId, isolate, context, wrapper, refs);
     log.atInfo().log(`[CON:${fullId}] ${functions.length} UDF functions compiled in: ${sw.elapsedPretty()}`);
     return wrapperFunc;
   } catch (e) {
@@ -220,7  220,9 @@ export const ProfileUDFWrapper = (
               r.release();
             }
             context.release();
-            isolate.dispose();
             if (!isolate.isDisposed) {
               isolate.dispose();
             }
             log.atDebug().log(`[${fullId}] isolate closed`);
           }
         } catch (e) {
@@ -231,7  233,7 @@ export const ProfileUDFWrapper = (
   }
 };
 
-function wrap(connectionId: string, isolate: Isolate, context: Context, wrapper: Module) {
 function wrap(connectionId: string, isolate: Isolate, context: Context, wrapper: Module, refs: Reference[]) {
   const exported = wrapper.namespace;
 
   const ref = exported.getSync("wrappedFunctionChain", {
@@ -328,6  330,9 @@ function wrap(connectionId: string, isolate: Isolate, context: Context, wrapper:
     close: () => {
       try {
         if (isolate) {
           for (const r of refs) {
             r.release();
           }
           context.release();
           if (!isolate.isDisposed) {
             isolate.dispose();
@@ -514,5  519,7 @@ export async function ProfileUDFTestRun({
       store: !realStore && store ? memoryStoreDump(store) : {},
       logs,
     };
   } finally {
     wrapper?.close();
   }
 }
diff --git a/libs/core-functions/src/functions/lib/udf_wrapper.ts b/libs/core-functions/src/functions/lib/udf_wrapper.ts
@@ -191,7  191,7 @@ export const UDFWrapper = (
       throw new Error(`import is not allowed: ${specifier}`);
     });
     wrapper.evaluateSync();
-    const wrapperFunc = wrap(connectionId, isolate, context, wrapper);
     const wrapperFunc = wrap(connectionId, isolate, context, wrapper, refs);
     log.atInfo().log(`[CON:${connectionId}] ${functions.length} UDF functions compiled in: ${sw.elapsedPretty()}`);
     return wrapperFunc;
   } catch (e) {
@@ -209,7  209,9 @@ export const UDFWrapper = (
               r.release();
             }
             context.release();
-            isolate.dispose();
             if (!isolate.isDisposed) {
               isolate.dispose();
             }
             log.atDebug().log(`[${connectionId}] isolate closed`);
           }
         } catch (e) {
@@ -220,7  222,7 @@ export const UDFWrapper = (
   }
 };
 
-function wrap(connectionId: string, isolate: Isolate, context: Context, wrapper: Module) {
 function wrap(connectionId: string, isolate: Isolate, context: Context, wrapper: Module, refs: Reference[]) {
   const exported = wrapper.namespace;
 
   const ref = exported.getSync("wrappedFunctionChain", {
@@ -304,6  306,9 @@ function wrap(connectionId: string, isolate: Isolate, context: Context, wrapper:
     close: () => {
       try {
         if (isolate) {
           for (const r of refs) {
             r.release();
           }
           context.release();
           if (!isolate.isDisposed) {
             isolate.dispose();
@@ -499,5  504,7 @@ export async function UDFTestRun({
       store: !realStore && store ? memoryStoreDump(store) : {},
       logs,
     };
   } finally {
     wrapper?.close();
   }
 }