isolated-function 0.1.7 → 0.1.9

package/README.md

@@ -22,6 +22,7 @@
   - [Auto install dependencies](#auto-install-dependencies)
   - [Execution profiling](#execution-profiling)
   - [Resource limits](#resource-limits)
+  - [Logging](#logging)
   - [Error handling](#error-handling)
 - [API](#api)
   - [isolatedFunction(code, \[options\])](#isolatedfunctioncode-options)
@@ -57,7 +58,6 @@ const [sum, teardown] = isolatedFunction((y, z) => y + z, {
 
 /* interact with the isolated-function */
 const { value, profiling } = await sum(3, 2)
-console.log({ value, profiling })
 
 /* close resources associated with the isolated-function initialization */
 await teardown()
@@ -167,6 +167,32 @@ await fn(100)
 // =>  TimeoutError: Execution timed out
 ```
 
+### Logging
+
+The logs are collected into a `logging` object returned after the execution:
+
+```js
+const [fn, teardown] = isolatedFunction(() => {
+  console.log('console.log')
+  console.info('console.info')
+  console.debug('console.debug')
+  console.warn('console.warn')
+  console.error('console.error')
+  return 'done'
+})
+
+const { logging } await fn()
+
+console.log(logging)
+// {
+//   log: ['console.log'],
+//   info: ['console.info'],
+//   debug: ['console.debug'],
+//   warn: ['console.warn'],
+//   error: ['console.error']
+// }
+```
+
 ### Error handling
 
 Any error during **isolated-function** execution will be propagated:

package/package.json

@@ -2,7 +2,7 @@
   "name": "isolated-function",
   "description": "Runs untrusted code in a Node.js v8 sandbox.",
   "homepage": "https://github.com/Kikobeats/isolated-function",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js"

package/src/compile/transform-dependencies.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const acorn = require('acorn')
 const walk = require('acorn-walk')
+const acorn = require('acorn')
 
 module.exports = code => {
   const ast = acorn.parse(code, { ecmaVersion: 2020, sourceType: 'module' })

package/src/index.js

@@ -15,7 +15,11 @@ const createError = ({ name, message, ...props }) => {
 }
 
 const flags = ({ filename, memory }) => {
-  const flags = ['--experimental-permission', `--allow-fs-read=${filename}`]
+  const flags = [
+    '--disable-warning=ExperimentalWarning',
+    '--experimental-permission',
+    `--allow-fs-read=${filename}`
+  ]
   if (memory) flags.push(`--max-old-space-size=${memory}`)
   return flags.join(' ')
 }
@@ -39,11 +43,15 @@ module.exports = (snippet, { tmpdir, timeout, memory, throwError = true } = {})
         timeout,
         killSignal: 'SIGKILL'
       })
-      const { isFulfilled, value, profiling } = JSON.parse(stdout)
+      const { isFulfilled, value, profiling, logging } = JSON.parse(stdout)
       profiling.duration = duration()
-      if (isFulfilled) return { isFulfilled, value, profiling }
-      if (throwError) throw deserializeError(value)
-      return { isFulfilled: false, value: deserializeError(value), profiling }
+      return isFulfilled
+        ? { isFulfilled, value, profiling, logging }
+        : throwError
+          ? (() => {
+              throw deserializeError(value)
+            })()
+          : { isFulfilled: false, value: deserializeError(value), profiling, logging }
     } catch (error) {
       if (error.signalCode === 'SIGTRAP') {
         throw createError({

package/src/template/index.js

@@ -2,10 +2,19 @@
 
 const SERIALIZE_ERROR = require('./serialize-error')
 
-const generateTemplate = snippet => `
+module.exports = snippet => `
   const args = JSON.parse(process.argv[2])
 
-  ;(async () => {
+  const logging = Object.create(null)
+
+  for (const method of ['log', 'info', 'debug', 'warn', 'error']) {
+    console[method] = function (...args) {
+      logging[method] === undefined ? logging[method] = [args] : logging[method].push(args)
+    }
+  }
+
+  ;(async (send) => {
+    process.stdout.write = function () {}
     let value
     let isFulfilled
 
@@ -16,12 +25,11 @@ const generateTemplate = snippet => `
       value = ${SERIALIZE_ERROR}(error)
       isFulfilled = false
     } finally {
-      console.log(JSON.stringify({
+      send(JSON.stringify({
         isFulfilled,
+        logging,
         value,
         profiling: { memory: process.memoryUsage().rss }
       }))
     }
-  })()`
-
-module.exports = generateTemplate
+  })(process.stdout.write.bind(process.stdout))`