@contrast/rewriter 1.5.0 → 1.7.0

package/lib/cache.js

@@ -19,6 +19,7 @@ const fs = require('node:fs');
 const fsPromises = require('node:fs/promises');
 const os = require('node:os');
 const path = require('node:path');
+const { version } = require('../package.json');
 
 /**
  * Returns the modification time of a file as a number.
@@ -47,7 +48,7 @@ module.exports.Cache = class Cache {
     this.cacheDir = path.join(
       core.config.agent.node.rewrite.cache.path,
       core.appInfo.name.replace('/', '_'),
-      core.agentVersion,
+      version,
     );
   }
 
@@ -86,12 +87,12 @@ module.exports.Cache = class Cache {
   }
 
   /**
-   * Looks up and returns the string content of a previously rewritten file
+   * Looks up and returns the cached filename for a previously rewritten file
    * asynchronously.
    * @param {string} filename
    * @returns {Promise<string | undefined>}
    */
-  async read(filename) {
+  async find(filename) {
     const filenameCached = this.getCachedFilename(filename);
 
     try {
@@ -120,7 +121,7 @@ module.exports.Cache = class Cache {
         'Cache current.'
       );
 
-      return fsPromises.readFile(filenameCached, 'utf8');
+      return filenameCached;
     } catch (err) {
       // @ts-expect-error ts treats errors poorly.
       if (err.code !== 'ENOENT') {

package/lib/index.js

@@ -18,11 +18,18 @@
 const { transform, transformSync } = require('@swc/core');
 const Module = require('node:module');
 const { Cache } = require('./cache');
+const INJECTION_FIXES = [
+  // assigning to global breaks things like `"string".constructor === global.String`
+  { search: 'global.Function = global.ContrastMethods.Function', replace: 'var Function = global.ContrastMethods?.Function' },
+  { search: 'global.Number = global.ContrastMethods.Number', replace: 'var Number = global.ContrastMethods?.Number' },
+  { search: 'global.Object = global.ContrastMethods.Object', replace: 'var Object = global.ContrastMethods?.Object' },
+  { search: 'global.String = global.ContrastMethods.String', replace: 'var String = global.ContrastMethods?.String' },
+];
+
 
 /**
  * @typedef {Object} Core
  * @prop {import('@contrast/common').AppInfo} appInfo
- * @prop {string} agentVersion
  * @prop {import('@contrast/config').Config} config
  * @prop {import('@contrast/logger').Logger} logger
  */
@@ -166,6 +173,12 @@ class Rewriter {
       result = trim(content, result);
     }
 
+    for (const { search, replace } of INJECTION_FIXES) {
+      if (result.code.indexOf(search) >= 0) {
+        result.code = result.code.replace(search, replace);
+      }
+    }
+
     return result;
   }
 
@@ -189,6 +202,12 @@ class Rewriter {
       result = trim(content, result);
     }
 
+    for (const { search, replace } of INJECTION_FIXES) {
+      if (result.code.indexOf(search) >= 0) {
+        result.code = result.code.replace(search, replace);
+      }
+    }
+
     return result;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/rewriter",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "A transpilation tool mainly used for instrumentation",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,9 +14,9 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/agent-swc-plugin": "^1.3.0",
-    "@contrast/agent-swc-plugin-unwrite": "^1.3.0",
-    "@contrast/common": "^1.16.0",
+    "@contrast/agent-swc-plugin": "1.3.0",
+    "@contrast/agent-swc-plugin-unwrite": "1.3.0",
+    "@contrast/common": "1.20.0",
     "@contrast/synchronous-source-maps": "^1.1.3",
     "@swc/core": "1.3.39",
     "multi-stage-sourcemap": "^0.3.1"