Commit to change branch

packages/dd-trace/src/appsec/iast/taint-tracking/rewriter-esm.mjs

@@ -1,57 +1,38 @@
 'use strict'
-import fs from 'fs'
-import { join } from 'path'
 
-const ddTraceDir = join(import.meta.dirname, '..', '..', '..', '..', '..', '..')
+import path from 'path'
+import { URL } from 'url'
+
+const currentUrl = new URL(import.meta.url)
+const ddTraceDir = path.join(currentUrl.pathname, '..', '..', '..', '..', '..', '..')
 
 let idCounter = 1
 let initialized = false
-function log (message) {
-  fs.writeSync(0, message + "\n");
-}
+
 
 let port, entryPoint
 
 export async function initialize (data) {
-  if (initialized) {
-    return Promise.reject()
-  }
+  if (initialized) return Promise.reject(new Error('ALREADY INITIALIZED'))
   initialized = true
-  log(initialized)
 
   port = data.port2
   entryPoint = data.entryPoint
-
-  setTimeout(() => {
-    const http = import('http')
-    console.log('http imported', !!http)
-  }, 2000)
-}
-
-export async function resolve(specifier, context, defaultResolve) {
-  const parentURL = context.parentURL ? new URL(context.parentURL).pathname : null;
-
-  const resolved = await defaultResolve(specifier, context, defaultResolve)
-  console.log('specifier, parentURL', specifier, parentURL)
-
-  return resolved;
 }
 
 export async function load(url, context, nextLoad) {
+  console.log('load?', url)
   const result = await nextLoad(url, context)
 
   if (!port) return result
   if (!result.source) return result
   if (url.includes(ddTraceDir) || url.includes('iitm=true')) return result
 
-  console.log(url)
-
   const id = idCounter++
   return new Promise((resolve) => {
     let timeout = setTimeout(() => {
       if (timeout) {
         timeout = null
-        // log('timeout - ' + url)
         resolve(result)
       }
     }, 20)
@@ -68,14 +49,11 @@ export async function load(url, context, nextLoad) {
 
       if (data.source) {
         result.source = Buffer.from(data.source)
-        // console.log('url', url)
-        // console.log('data.source', data.source)
       }
 
       resolve(result)
     }
 
-    // log('postMessage')
     port.on('message', waitAndResolve)
     port.postMessage({ id, url, source: result.source.toString() })
   })

packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js

@@ -145,7 +145,7 @@ function enableRewriter (telemetryVerbosity) {
   }
 }
 
-function enableEsmRewriter (telemetryVerbosity) {
+function enableEsmRewriter () {
   if (isMainThread && Module.register) {
     const { port1, port2 } = new MessageChannel();
     port1.on('message', (message) => {
@@ -155,11 +155,16 @@ function enableEsmRewriter (telemetryVerbosity) {
     const entryPoint = path.resolve(process.argv[1])
 
     process.nextTick(() => {
-      Module.register('./rewriter-esm.mjs', {
-        parentURL: pathToFileURL(__filename),
-        data: { port2, entryPoint },
-        transferList: [port2]
-      })
+      try {
+        Module.register('./rewriter-esm.mjs', {
+          parentURL: pathToFileURL(__filename),
+          data: { port2, entryPoint },
+          transferList: [port2]
+        })
+      } catch (e) {
+        console.error('e.message', e.message)
+        log.error('[ASM] Error enabling ESM Rewriter', e)
+      }
     })
   }
 }