change where packages are installed

Author: W-A-James

packages/bson-bench/src/base.ts

@@ -1,5 +1,6 @@
 import * as BSON from 'bson';
 import { readFileSync } from 'fs';
+import { join } from 'path';
 import { performance } from 'perf_hooks';
 import * as process from 'process';
 
@@ -116,10 +117,12 @@ function run(bson: BSONLib | ConstructibleBSON, config: BenchmarkSpecification)
 
 function listener(message: RunBenchmarkMessage) {
   if (message.type === 'runBenchmark') {
-    const packageSpec = new Package(message.benchmark.library);
+    const packageSpec = new Package(message.benchmark.library, message.benchmark.installLocation);
     let bson: BSONLib;
     try {
-      bson = require(packageSpec.computedModuleName);
+      bson = require(
+        join(message.benchmark.installLocation, 'node_modules', packageSpec.computedModuleName)
+      );
     } catch (error) {
       reportErrorAndQuit(error as Error);
       return;

packages/bson-bench/src/common.ts

@@ -1,6 +1,6 @@
 import * as cp from 'child_process';
 import { once } from 'events';
-import * as path from 'path';
+import { join, sep } from 'path';
 
 import { exists } from './utils';
 
@@ -26,8 +26,10 @@ export class Package {
   gitCommitish?: string;
   // path to local library
   localPath?: string;
+  installPath: string;
 
-  constructor(libSpec: string) {
+  constructor(libSpec: string, installPath: string) {
+    this.installPath = installPath;
     let match: RegExpExecArray | null;
     if ((match = NPM_PACKAGE_REGEX.exec(libSpec))) {
       this.type = 'npm';
@@ -44,7 +46,7 @@ export class Package {
       this.library = match[1] as 'bson' | 'bson-ext';
 
       this.localPath = match[2];
-      this.computedModuleName = `${this.library}-local-${this.localPath.replaceAll(path.sep, '_')}`;
+      this.computedModuleName = `${this.library}-local-${this.localPath.replaceAll(sep, '_')}`;
     } else {
       throw new Error('unknown package specifier');
     }
@@ -55,7 +57,7 @@ export class Package {
    */
   check<B extends BSONLib>(): B | undefined {
     try {
-      return require(this.computedModuleName);
+      return require(join(this.installPath, 'node_modules', this.computedModuleName));
     } catch {
       return undefined;
     }
@@ -90,10 +92,10 @@ export class Package {
         break;
     }
 
-    const npmInstallProcess = cp.exec(
-      `npm install ${this.computedModuleName}@${source} --no-save`,
-      { encoding: 'utf8', cwd: __dirname }
-    );
+    const npmInstallProcess = cp.exec(`npm install ${this.computedModuleName}@${source}`, {
+      encoding: 'utf8',
+      cwd: this.installPath
+    });
 
     const exitCode: number = (await once(npmInstallProcess, 'exit'))[0];
     if (exitCode !== 0) {
@@ -130,11 +132,12 @@ export type BenchmarkSpecification = {
   /** Specifier of the bson or bson-ext library to be used. Can be an npm package, git repository or
    * local package */
   library: string;
+  installLocation?: string;
 };
 
 export interface RunBenchmarkMessage {
   type: 'runBenchmark';
-  benchmark: BenchmarkSpecification;
+  benchmark: Omit<BenchmarkSpecification, 'installLocation'> & { installLocation: string };
 }
 
 export interface ResultMessage {

packages/bson-bench/src/task.ts

@@ -1,6 +1,7 @@
 import { type ChildProcess, fork } from 'child_process';
 import { once } from 'events';
-import { writeFile } from 'fs/promises';
+import { mkdir, rm, writeFile } from 'fs/promises';
+import { tmpdir } from 'os';
 import * as path from 'path';
 
 import {
@@ -11,25 +12,28 @@ import {
   type PerfSendResult,
   type ResultMessage
 } from './common';
+import { exists } from './utils';
 
 /**
  * An individual benchmark task that runs in its own Node.js process
  */
 export class Task {
   result: BenchmarkResult | undefined;
-  benchmark: BenchmarkSpecification;
+  benchmark: Omit<BenchmarkSpecification, 'installLocation'> & { installLocation: string };
   taskName: string;
   testName: string;
   /** @internal */
   children: ChildProcess[];
   /** @internal */
   hasRun: boolean;
 
+  static packageInstallLocation: string = path.join(tmpdir(), 'bsonBench');
+
   constructor(benchmarkSpec: BenchmarkSpecification) {
     this.result = undefined;
-    this.benchmark = benchmarkSpec;
     this.children = [];
     this.hasRun = false;
+    this.benchmark = { ...benchmarkSpec, installLocation: Task.packageInstallLocation };
 
     this.taskName = `${path.basename(this.benchmark.documentPath, 'json')}_${
       this.benchmark.operation
@@ -174,31 +178,39 @@ export class Task {
 
     // install required modules before running child process as new Node processes need to know that
     // it exists before they can require it.
-    const pack = new Package(this.benchmark.library);
-    if (!pack.check()) await pack.install();
-    // spawn child process
-    const child = fork(`${__dirname}/base`, {
-      stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-      serialization: 'advanced'
-    });
-    child.send({ type: 'runBenchmark', benchmark: this.benchmark });
-    this.children.push(child);
-
-    // listen for results or error
-    const resultOrError: ResultMessage | ErrorMessage = (await once(child, 'message'))[0];
-
-    // wait for child to close
-    await once(child, 'exit');
-
-    this.hasRun = true;
-    switch (resultOrError.type) {
-      case 'returnResult':
-        this.result = resultOrError.result;
-        return resultOrError.result;
-      case 'returnError':
-        throw resultOrError.error;
-      default:
-        throw new Error('Unexpected result returned from child process');
+    if (!(await exists(Task.packageInstallLocation))) {
+      await mkdir(Task.packageInstallLocation);
+    }
+
+    try {
+      const pack = new Package(this.benchmark.library, Task.packageInstallLocation);
+      if (!pack.check()) await pack.install();
+      // spawn child process
+      const child = fork(`${__dirname}/base`, {
+        stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
+        serialization: 'advanced'
+      });
+      child.send({ type: 'runBenchmark', benchmark: this.benchmark });
+      this.children.push(child);
+
+      // listen for results or error
+      const resultOrError: ResultMessage | ErrorMessage = (await once(child, 'message'))[0];
+
+      // wait for child to close
+      await once(child, 'exit');
+
+      this.hasRun = true;
+      switch (resultOrError.type) {
+        case 'returnResult':
+          this.result = resultOrError.result;
+          return resultOrError.result;
+        case 'returnError':
+          throw resultOrError.error;
+        default:
+          throw new Error('Unexpected result returned from child process');
+      }
+    } finally {
+      await rm(Task.packageInstallLocation, { recursive: true, force: true });
     }
   }
 }

packages/bson-bench/test/unit/common.test.ts

@@ -1,5 +1,7 @@
 import { expect } from 'chai';
-import { sep } from 'path';
+import { mkdir, rm } from 'fs/promises';
+import { tmpdir } from 'os';
+import { join, sep } from 'path';
 
 import { Package } from '../../lib/common';
 import { clearTestedDeps } from '../utils';
@@ -8,20 +10,32 @@ describe('common functionality', function () {
   const BSON_PATH = process.env.BSON_PATH;
 
   context('Package', function () {
-    beforeEach(clearTestedDeps);
-    after(clearTestedDeps);
+    let installDir: string;
+
+    after(async function () {
+      await rm(installDir, { recursive: true, force: true });
+    });
+
+    beforeEach(async function () {
+      await clearTestedDeps(installDir);
+    });
+
+    before(async function () {
+      installDir = join(tmpdir(), 'bsonBenchTest');
+      await mkdir(installDir);
+    });
 
     context('constructor()', function () {
       context('when given a correctly formatted npm package', function () {
         it('sets computedModuleName correctly', function () {
-          const pack = new Package('[email protected]');
+          const pack = new Package('[email protected]', installDir);
           expect(pack).to.haveOwnProperty('computedModuleName', 'bson-6.0.0');
         });
       });
 
       context('when given a correctly formatted git repository', function () {
         it('sets computedModuleName correctly', function () {
-          const pack = new Package('bson#eb98b8c39d6d5ba4ce7231ab9e0f29495d74b994');
+          const pack = new Package('bson#eb98b8c39d6d5ba4ce7231ab9e0f29495d74b994', installDir);
           expect(pack).to.haveOwnProperty(
             'computedModuleName',
             'bson-git-eb98b8c39d6d5ba4ce7231ab9e0f29495d74b994'
@@ -31,13 +45,16 @@ describe('common functionality', function () {
 
       context('when trying to install an npm package apart from bson or bson-ext', function () {
         it('throws an error', function () {
-          expect(() => new Package('[email protected]')).to.throw(Error, /unknown package specifier/);
+          expect(() => new Package('[email protected]', installDir)).to.throw(
+            Error,
+            /unknown package specifier/
+          );
         });
       });
 
       context('when trying to install a git package apart from bson or bson-ext', function () {
         it('throws an error', function () {
-          expect(() => new Package('notBson#abcdabcdabcd')).to.throw(
+          expect(() => new Package('notBson#abcdabcdabcd', installDir)).to.throw(
             Error,
             /unknown package specifier/
           );
@@ -50,7 +67,7 @@ describe('common functionality', function () {
             console.log('Skipping since BSON_PATH is undefined');
             this.skip();
           }
-          const pack = new Package(`bson:${BSON_PATH}`);
+          const pack = new Package(`bson:${BSON_PATH}`, installDir);
           expect(pack).to.haveOwnProperty(
             'computedModuleName',
             `bson-local-${BSON_PATH.replaceAll(sep, '_')}`
@@ -62,14 +79,14 @@ describe('common functionality', function () {
     context('#check()', function () {
       context('when package is not installed', function () {
         it('returns undefined', function () {
-          const pack = new Package('bson@6');
+          const pack = new Package('bson@6', installDir);
           expect(pack.check()).to.be.undefined;
         });
       });
 
       context('when package is installed', function () {
         it('returns the module', async function () {
-          const pack = new Package('[email protected]');
+          const pack = new Package('[email protected]', installDir);
           await pack.install();
           expect(pack.check()).to.not.be.undefined;
         });
@@ -80,23 +97,23 @@ describe('common functionality', function () {
       context('when given a correctly formatted npm package that exists', function () {
         for (const lib of ['[email protected]', '[email protected]', 'bson@latest', 'bson-ext@latest']) {
           it(`installs ${lib} successfully`, async function () {
-            const pack = new Package(lib);
+            const pack = new Package(lib, installDir);
             await pack.install();
           });
         }
       });
 
       context('when given a correctly formatted npm package that does not exist', function () {
         it('throws an error', async function () {
-          const bson9000 = new Package('bson@9000');
+          const bson9000 = new Package('bson@9000', installDir);
           const error = await bson9000.install().catch(error => error);
           expect(error).to.be.instanceOf(Error);
         });
       });
 
       context('when given a correctly formatted git package using commit that exists', function () {
         it('installs successfully', async function () {
-          const bson6Git = new Package('bson#58c002d');
+          const bson6Git = new Package('bson#58c002d', installDir);
           const maybeError = await bson6Git.install().catch(error => error);
           expect(maybeError).to.be.undefined;
         });
@@ -107,7 +124,10 @@ describe('common functionality', function () {
         function () {
           // TODO: NODE-6361: Unskip and fix this test.
           it.skip('throws an error', async function () {
-            const bson6Git = new Package('bson#58c002d87bca9bbe7c7001cc6acae54e90a951bcf');
+            const bson6Git = new Package(
+              'bson#58c002d87bca9bbe7c7001cc6acae54e90a951bcf',
+              installDir
+            );
             const maybeError = await bson6Git.install().catch(error => error);
             expect(maybeError).to.be.instanceOf(Error);
           });
@@ -118,7 +138,7 @@ describe('common functionality', function () {
         'when given a correctly formatted git package using git tag that exists',
         function () {
           it('installs successfully', async function () {
-            const bson6Git = new Package('bson#v6.0.0');
+            const bson6Git = new Package('bson#v6.0.0', installDir);
             const maybeError = await bson6Git.install().catch(error => error);
             expect(maybeError).to.be.undefined;
           });
@@ -129,7 +149,7 @@ describe('common functionality', function () {
         'when given a correctly formatted git package using git tag that does not exist',
         function () {
           it('throws an error', async function () {
-            const bson6Git = new Package('bson#v999.999.9');
+            const bson6Git = new Package('bson#v999.999.9', installDir);
             const maybeError = await bson6Git.install().catch(error => error);
             expect(maybeError).to.be.instanceOf(Error);
           });
@@ -143,7 +163,7 @@ describe('common functionality', function () {
             this.skip();
           }
 
-          const bsonLocal = new Package(`bson:${BSON_PATH}`);
+          const bsonLocal = new Package(`bson:${BSON_PATH}`, installDir);
           const maybeError = await bsonLocal.install().catch(error => error);
           expect(maybeError).to.not.be.instanceOf(Error, maybeError.message);
         });
@@ -152,7 +172,8 @@ describe('common functionality', function () {
       context('when given a path that does not exist', function () {
         it('throws an error', async function () {
           const bsonLocal = new Package(
-            `bson:/highly/unlikely/path/to/exist/that/should/point/to/bson`
+            `bson:/highly/unlikely/path/to/exist/that/should/point/to/bson`,
+            installDir
           );
           const maybeError = await bsonLocal.install().catch(error => error);
           expect(maybeError).to.be.instanceOf(Error);

packages/bson-bench/test/unit/suite.test.ts

@@ -1,13 +1,18 @@
 import { expect } from 'chai';
 import { readFile } from 'fs/promises';
 
-import { Suite } from '../../lib';
+import { Suite, Task } from '../../lib';
 import { exists } from '../../src/utils';
 import { clearTestedDeps } from '../utils';
 
 describe('Suite', function () {
-  beforeEach(clearTestedDeps);
-  after(clearTestedDeps);
+  beforeEach(async function () {
+    await clearTestedDeps(Task.packageInstallLocation);
+  });
+
+  after(async function () {
+    await clearTestedDeps(Task.packageInstallLocation);
+  });
 
   describe('#task()', function () {
     it('returns the Suite it was called on', function () {

packages/bson-bench/test/unit/task.test.ts

@@ -10,8 +10,13 @@ import { clearTestedDeps } from '../utils';
 const LOCAL_BSON = path.join(__dirname, '..', '..', 'node_modules', 'bson');
 
 describe('Task', function () {
-  beforeEach(clearTestedDeps);
-  after(clearTestedDeps);
+  beforeEach(async function () {
+    await clearTestedDeps(Task.packageInstallLocation);
+  });
+
+  after(async function () {
+    await clearTestedDeps(Task.packageInstallLocation);
+  });
 
   const BSON_PATH = process.env.BSON_PATH;
   const BSON_EXT_PATH = process.env.BSON_EXT_PATH;