@builder.io/react 3.0.7-3 → 3.0.8-0

package/src/functions/string-to-function.ts

@@ -1,5 +1,6 @@
 import { Builder, builder } from '@builder.io/sdk';
 import { safeDynamicRequire } from './safe-dynamic-require';
+import { isDebug } from './is-debug';
 
 const fnCache: { [key: string]: BuilderEvanFunction | undefined } = {};
 
@@ -117,21 +118,12 @@ export function stringToFunction(
         // browser bundler's like rollup and webpack. Our rollup plugin strips these comments only
         // for the server build
         // TODO: cache these for better performancs with new VmScript
-        // tslint:disable:comment-format
-        const { VM } = safeDynamicRequire('vm2') as typeof import('vm2');
-        const [state, event, _block, _builder, _Device, _update, _Builder, context] = args;
-
-        return new VM({
-          timeout: 100,
-          sandbox: {
-            ...state,
-            ...{ state },
-            ...{ context },
-            ...{ builder: api },
-            event,
-          },
-        }).run(str.replace(/(^|;)return /, '$1'));
-        // tslint:enable:comment-format
+        const isolateContext = getIsolateContext();
+        const ivm = safeDynamicRequire('isolated-vm') as typeof import('isolated-vm');
+        return isolateContext.evalClosureSync(
+          makeFn(str, useReturn),
+          args.map(arg => (typeof arg === 'object' ? new ivm.Reference(arg) : null))
+        );
       }
     } catch (error: any) {
       if (Builder.isBrowser) {
@@ -143,16 +135,15 @@ export function stringToFunction(
           error.stack || error
         );
       } else {
-        // TODO(SK): test with replacing the below with typeof process !== undefined
-        // if (process?.env?.DEBUG) {
-        console.debug(
-          'Builder custom code error:',
-          error.message || error,
-          'in',
-          str,
-          error.stack || error
-        );
-        // }
+        if (isDebug()) {
+          console.debug(
+            'Builder custom code error:',
+            error.message || error,
+            'in',
+            str,
+            error.stack || error
+          );
+        }
       }
       if (errors) {
         errors.push(error);
@@ -167,3 +158,43 @@ export function stringToFunction(
 
   return final;
 }
+
+const makeFn = (code: string, useReturn: boolean) => {
+  const names = ['state', 'event', 'block', 'builder', 'Device', 'update', 'Builder', 'context'];
+  return `
+  const refToProxy = (obj) => {
+  if (typeof obj !== 'object' || obj === null) {
+    return obj;
+  }
+  return new Proxy({}, {
+      get(target, key) {
+          const val = obj.getSync(key);
+          if (typeof val?.getSync === 'function') {
+              return refToProxy(val);
+          }
+          return val;
+      },
+      set(target, key, value) {
+          obj.setSync(key, value);
+      },
+      deleteProperty(target, key) {
+          obj.deleteSync(key);
+      }
+    })
+}
+`.concat(names.map((arg, index) => `var ${arg} = refToProxy($${index});`).join('\n')).concat(`
+var ctx = context;
+${useReturn ? `return (${code});` : code};
+`);
+};
+
+const getIsolateContext = () => {
+  const _Builder = Builder as any;
+  if (_Builder.serverContext) {
+    return _Builder.serverContext;
+  }
+  const ivm = safeDynamicRequire('isolated-vm') as typeof import('isolated-vm');
+  const isolate = new ivm.Isolate({ memoryLimit: 128 });
+  _Builder.serverContext = isolate.createContextSync();
+  return _Builder.serverContext;
+};

package/src/functions/try-eval.tsx

@@ -1,6 +1,7 @@
 'use client';
 import { Builder } from '@builder.io/sdk';
 import { safeDynamicRequire } from './safe-dynamic-require';
+import { isDebug } from './is-debug';
 
 export const tryEval = (str?: string, data: any = {}, errors?: Error[]): any => {
   const value = str;
@@ -70,10 +71,9 @@ export const tryEval = (str?: string, data: any = {}, errors?: Error[]): any =>
     if (Builder.isBrowser) {
       console.warn('Builder custom code error:', error.message, 'in', str, error.stack);
     } else {
-      // TODO(SK): test with replacing the below with typeof process !== undefined
-      // if (process?.env?.DEBUG) {
-      console.debug('Builder custom code error:', error.message, 'in', str, error.stack);
-      // }
+      if (isDebug()) {
+        console.debug('Builder custom code error:', error.message, 'in', str, error.stack);
+      }
       // Add to req.options.errors to return to client
     }
   }