@mongosh/node-runtime-worker-thread 2.3.0 → 2.3.2

package/dist/worker-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-runtime.js","sourceRoot":"","sources":["../src/worker-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-runtime.js","sourceRoot":"","sources":["../src/worker-runtime.ts"],"names":[],"mappings":"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"}

package/dist/{child-process-evaluation-listener.d.ts → worker-thread-evaluation-listener.d.ts}

@@ -1,10 +1,8 @@
-/// <reference types="node" />
-import type { ChildProcess } from 'child_process';
 import type { Exposed } from './rpc';
 import type { WorkerRuntime } from './index';
 import type { RuntimeEvaluationListener } from '@mongosh/browser-runtime-core';
-export declare class ChildProcessEvaluationListener {
+export declare class WorkerThreadEvaluationListener {
     exposedListener: Exposed<Required<Omit<RuntimeEvaluationListener, 'onLoad' | 'getCryptLibraryOptions'>>>;
-    constructor(workerRuntime: WorkerRuntime, childProcess: ChildProcess);
+    constructor(workerRuntime: WorkerRuntime, worker: Worker);
     terminate(): void;
 }

package/dist/{child-process-evaluation-listener.js → worker-thread-evaluation-listener.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChildProcessEvaluationListener = void 0;
+exports.WorkerThreadEvaluationListener = void 0;
 const rpc_1 = require("./rpc");
 const serializer_1 = require("./serializer");
-class ChildProcessEvaluationListener {
-    constructor(workerRuntime, childProcess) {
+class WorkerThreadEvaluationListener {
+    constructor(workerRuntime, worker) {
         this.exposedListener = (0, rpc_1.exposeAll)({
             onPrompt(question, type) {
                 var _a, _b, _c;
@@ -43,11 +43,11 @@ class ChildProcessEvaluationListener {
                 var _a, _b, _c;
                 return ((_c = (_b = (_a = workerRuntime.evaluationListener) === null || _a === void 0 ? void 0 : _a.onExit) === null || _b === void 0 ? void 0 : _b.call(_a, exitCode)) !== null && _c !== void 0 ? _c : Promise.resolve());
             },
-        }, childProcess);
+        }, worker);
     }
     terminate() {
         this.exposedListener[rpc_1.close]();
     }
 }
-exports.ChildProcessEvaluationListener = ChildProcessEvaluationListener;
-//# sourceMappingURL=child-process-evaluation-listener.js.map
+exports.WorkerThreadEvaluationListener = WorkerThreadEvaluationListener;
+//# sourceMappingURL=worker-thread-evaluation-listener.js.map

package/dist/worker-thread-evaluation-listener.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-thread-evaluation-listener.js","sourceRoot":"","sources":["../src/worker-thread-evaluation-listener.ts"],"names":[],"mappings":";;;AACA,+BAAyC;AAEzC,6CAA2D;AAG3D,MAAa,8BAA8B;IAOzC,YAAY,aAA4B,EAAE,MAAc;QACtD,IAAI,CAAC,eAAe,GAAG,IAAA,eAAS,EAC9B;YACE,QAAQ,CAAC,QAAQ,EAAE,IAAI;;gBACrB,OAAO,CACL,MAAA,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,QAAQ,mDAAG,QAAQ,EAAE,IAAI,CAAC,mCAAI,EAAE,CACnE,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,MAAM;;gBACZ,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,wCAA2B,CAAC,CAAC;gBACjD,OAAO,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,OAAO,mDAAG,MAAM,CAAC,CAAC;YAC7D,CAAC;YACD,SAAS,CAAC,GAAG,EAAE,KAAK;;gBAClB,OAAO,CACL,MAAA,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,SAAS,mDAAG,GAAG,EAAE,KAAK,CAAC,mCACzD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAC3B,CAAC;YACJ,CAAC;YACD,WAAW,CAAC,GAAG;;gBACb,OAAO,CACL,MAAA,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,WAAW,mDAAG,GAAG,CAAC,mCACpD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAC3B,CAAC;YACJ,CAAC;YACD,cAAc,CAAC,GAAG,EAAE,KAAK;;gBACvB,OAAO,CACL,MAAA,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,cAAc,mDAAG,GAAG,EAAE,KAAK,CAAC,mCAC9D,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CACtB,CAAC;YACJ,CAAC;YACD,SAAS,CAAC,GAAG;;gBACX,OAAO,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,SAAS,mDAAG,GAAG,CAAC,CAAC;YAC5D,CAAC;YACD,iBAAiB;;gBACf,OAAO,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,iBAAiB,kDAAI,CAAC;YACjE,CAAC;YACD,cAAc;;gBACZ,OAAO,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,cAAc,kDAAI,CAAC;YAC9D,CAAC;YACD,MAAM,CAAC,QAAQ;;gBACb,OAAO,CACL,MAAA,MAAA,MAAA,aAAa,CAAC,kBAAkB,0CAAE,MAAM,mDAAG,QAAQ,CAAC,mCACnD,OAAO,CAAC,OAAO,EAAqB,CACtC,CAAC;YACJ,CAAC;SACF,EACD,MAAM,CACP,CAAC;IACJ,CAAC;IAED,SAAS;QACP,IAAI,CAAC,eAAe,CAAC,WAAK,CAAC,EAAE,CAAC;IAChC,CAAC;CACF;AA5DD,wEA4DC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/node-runtime-worker-thread",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "MongoDB shell runtime that lives in a worker thread",
   "homepage": "https://github.com/mongodb-js/mongosh",
   "license": "Apache-2.0",
@@ -17,7 +17,7 @@
     "node": ">=14.15.1"
   },
   "scripts": {
-    "test": "cross-env TS_NODE_PROJECT=./tsconfig.test.json mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 -r ts-node/register \"./src/**/*.spec.ts\"",
+    "test": "mocha -r \"../../scripts/import-expansions.js\" -r \"./tests/register-worker.js \" --timeout 15000 -r ts-node/register \"./src/**/*.spec.ts\"",
     "pretest-ci": "node ../../scripts/run-if-package-requested.js npm run webpack-build -- --no-stats --no-devtool",
     "test-ci": "node ../../scripts/run-if-package-requested.js npm test",
     "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test",
@@ -34,15 +34,15 @@
     "reformat": "npm run prettier -- --write . && npm run eslint --fix"
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-mongosh": "2.3.0",
+    "@mongodb-js/eslint-config-mongosh": "2.3.2",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
-    "@mongodb-js/tsconfig-mongosh": "2.3.0",
-    "@mongosh/browser-runtime-core": "2.3.0",
-    "@mongosh/browser-runtime-electron": "2.3.0",
-    "@mongosh/service-provider-core": "2.3.0",
-    "@mongosh/service-provider-server": "2.3.0",
-    "@mongosh/types": "2.3.0",
-    "bson": "^6.7.0",
+    "@mongodb-js/tsconfig-mongosh": "2.3.2",
+    "@mongosh/browser-runtime-core": "2.3.2",
+    "@mongosh/browser-runtime-electron": "2.3.2",
+    "@mongosh/service-provider-core": "2.3.2",
+    "@mongosh/service-provider-server": "2.3.2",
+    "@mongosh/types": "2.3.2",
+    "bson": "^6.8.0",
     "depcheck": "^1.4.3",
     "eslint": "^7.25.0",
     "mocha": "^10.2.0",
@@ -52,7 +52,8 @@
   },
   "dependencies": {
     "interruptor": "^1.0.1",
-    "system-ca": "^2.0.1"
+    "system-ca": "^2.0.1",
+    "web-worker": "^1.3.0"
   },
-  "gitHead": "2013159f06f902b4e9a2060df411c6b5646d49d4"
+  "gitHead": "591aaa54de23dfd7a4457835353dbfed40524057"
 }

package/src/index.spec.ts

@@ -1,4 +1,3 @@
-import path from 'path';
 import chai, { expect } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
@@ -24,7 +23,7 @@ function sleep(ms: number) {
 }
 
 describe('WorkerRuntime', function () {
-  let runtime: WorkerRuntime;
+  let runtime: WorkerRuntime | null = null;
 
   afterEach(async function () {
     if (runtime) {
@@ -33,69 +32,6 @@ describe('WorkerRuntime', function () {
     }
   });
 
-  describe('spawn errors', function () {
-    const brokenScript = path.resolve(
-      __dirname,
-      '..',
-      '__fixtures__',
-      'script-that-throws.js'
-    );
-
-    afterEach(function () {
-      delete process
-        .env.CHILD_PROCESS_PROXY_SRC_PATH_DO_NOT_USE_THIS_EXCEPT_FOR_TESTING;
-    });
-
-    it('should return init error if child process failed to spawn', async function () {
-      process.env.CHILD_PROCESS_PROXY_SRC_PATH_DO_NOT_USE_THIS_EXCEPT_FOR_TESTING =
-        brokenScript;
-
-      runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
-        nodb: true,
-      });
-
-      let err;
-
-      try {
-        await runtime.evaluate('1+1');
-      } catch (e: any) {
-        err = e;
-      }
-
-      expect(err).to.be.instanceof(Error);
-      expect(err)
-        .to.have.property('message')
-        .match(/Child process failed to start/);
-    });
-
-    it('should return init error if worker in child process failed to spawn', async function () {
-      runtime = new WorkerRuntime(
-        'mongodb://nodb/',
-        dummyOptions,
-        { nodb: true },
-        {
-          env: {
-            WORKER_RUNTIME_SRC_PATH_DO_NOT_USE_THIS_EXCEPT_FOR_TESTING:
-              brokenScript,
-          },
-        }
-      );
-
-      let err;
-
-      try {
-        await runtime.evaluate('1+1');
-      } catch (e: any) {
-        err = e;
-      }
-
-      expect(err).to.be.instanceof(Error);
-      expect(err)
-        .to.have.property('message')
-        .match(/Worker thread failed to start/);
-    });
-  });
-
   describe('evaluate', function () {
     it('should evaluate and return basic values', async function () {
       runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
@@ -112,7 +48,7 @@ describe('WorkerRuntime', function () {
           nodb: true,
         });
 
-        let err: Error;
+        let err!: Error;
 
         try {
           await runtime.evaluate('throw new TypeError("Oh no, types!")');
@@ -267,39 +203,23 @@ describe('WorkerRuntime', function () {
   });
 
   describe('terminate', function () {
-    function isRunning(pid: number): boolean {
-      try {
-        process.kill(pid, 0);
-        return true;
-      } catch (e: any) {
-        return false;
-      }
-    }
-
     // We will be testing a bunch of private props that can be accessed only with
     // strings to make TS happy
     it('should terminate child process', async function () {
       const runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
         nodb: true,
       });
+      await runtime.waitForRuntimeToBeReady();
+      const terminateSpy = sinon.spy(runtime['workerProcess'], 'terminate');
       await runtime.terminate();
-      expect(runtime['childProcess']).to.have.property('killed', true);
-      expect(isRunning(runtime['childProcess'].pid)).to.equal(false);
-    });
-
-    it('should remove all listeners from childProcess', async function () {
-      const runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
-        nodb: true,
-      });
-      await runtime.terminate();
-      expect(runtime['childProcess'].listenerCount('message')).to.equal(0);
+      expect(terminateSpy.calledOnce).to.be.true;
     });
 
     it('should cancel any in-flight runtime calls', async function () {
       const runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
         nodb: true,
       });
-      let err: Error;
+      let err!: Error;
       try {
         await Promise.all([
           runtime.evaluate('while(true){}'),
@@ -318,85 +238,166 @@ describe('WorkerRuntime', function () {
   });
 
   describe('interrupt', function () {
-    it('should interrupt in-flight async tasks', async function () {
-      runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
-        nodb: true,
+    context('async tasks', function () {
+      it('should interrupt in-flight tasks', async function () {
+        runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
+          nodb: true,
+        });
+
+        await runtime.waitForRuntimeToBeReady();
+
+        let err!: Error;
+
+        try {
+          await Promise.all([
+            runtime.evaluate('sleep(1000000)'),
+            (async () => {
+              // This is flaky when not enough time is given to the worker to
+              // finish the sync part of the work. If it causes too much issues
+              // it would be okay to disable this test completely
+              await sleep(5000);
+              await runtime.interrupt();
+            })(),
+          ]);
+        } catch (e: any) {
+          err = e;
+        }
+
+        expect(err).to.be.instanceof(Error);
+        expect(err)
+          .to.have.property('message')
+          .match(/Async script execution was interrupted/);
       });
 
-      await runtime.waitForRuntimeToBeReady();
+      it('should allow to evaluate again after interruption', async function () {
+        runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
+          nodb: true,
+        });
 
-      let err: Error;
+        await runtime.waitForRuntimeToBeReady();
 
-      try {
-        await Promise.all([
-          runtime.evaluate('sleep(1000000)'),
-          (async () => {
-            // This is flaky when not enought time given to the worker to
-            // finish the sync part of the work. If it causes too much issues
-            // it would be okay to disable this test completely
-            await sleep(5000);
-            await runtime.interrupt();
-          })(),
-        ]);
-      } catch (e: any) {
-        err = e;
-      }
+        try {
+          await Promise.all([
+            runtime.evaluate('sleep(1000000)'),
+            (async () => {
+              await sleep(200);
+              await runtime.interrupt();
+            })(),
+          ]);
+        } catch (e: any) {
+          // ignore
+        }
 
-      expect(err).to.be.instanceof(Error);
-      expect(err)
-        .to.have.property('message')
-        .match(/Async script execution was interrupted/);
-    });
+        const result = await runtime.evaluate('1+1');
 
-    it('should interrupt in-flight synchronous tasks', async function () {
-      runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
-        nodb: true,
+        expect(result).to.have.property('printable', 2);
       });
 
-      await runtime.waitForRuntimeToBeReady();
+      it('should preserve the context after interruption', async function () {
+        runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
+          nodb: true,
+        });
 
-      let err: Error;
+        await runtime.waitForRuntimeToBeReady();
 
-      try {
-        await Promise.all([
-          runtime.evaluate('while(true){}'),
-          (async () => {
-            await sleep(200);
-            await runtime.interrupt();
-          })(),
-        ]);
-      } catch (e: any) {
-        err = e;
-      }
+        await runtime.evaluate('let x = 1');
+        await runtime.evaluate('x = x + 2');
 
-      expect(err).to.be.instanceof(Error);
-      expect(err)
-        .to.have.property('message')
-        .match(/Script execution was interrupted/);
+        try {
+          await Promise.all([
+            runtime.evaluate('sleep(1000000)'),
+            (async () => {
+              await sleep(200);
+              await runtime.interrupt();
+            })(),
+          ]);
+        } catch (e: any) {
+          // ignore
+        }
+
+        const result = await runtime.evaluate('x + 3');
+
+        expect(result).to.have.property('printable', 6);
+      });
     });
 
-    it('should allow to evaluate again after interruption', async function () {
-      runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
-        nodb: true,
+    context('sync tasks', function () {
+      it('should interrupt in-flight tasks', async function () {
+        runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
+          nodb: true,
+        });
+
+        await runtime.waitForRuntimeToBeReady();
+
+        let err!: Error;
+
+        try {
+          await Promise.all([
+            runtime.evaluate('while(true){}'),
+            (async () => {
+              await sleep(200);
+              await runtime.interrupt();
+            })(),
+          ]);
+        } catch (e: any) {
+          err = e;
+        }
+
+        expect(err).to.be.instanceof(Error);
+        expect(err)
+          .to.have.property('message')
+          .match(/Script execution was interrupted/);
       });
 
-      await runtime.waitForRuntimeToBeReady();
+      it('should allow to evaluate again after interruption', async function () {
+        runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
+          nodb: true,
+        });
 
-      try {
-        await Promise.all([
-          runtime.evaluate('while(true){}'),
-          (async () => {
-            await sleep(200);
-            await runtime.interrupt();
-          })(),
-        ]);
-      } catch (e: any) {
-        // ignore
-      }
+        await runtime.waitForRuntimeToBeReady();
 
-      const result = await runtime.evaluate('1+1');
+        try {
+          await Promise.all([
+            runtime.evaluate('while(true){}'),
+            (async () => {
+              await sleep(200);
+              await runtime.interrupt();
+            })(),
+          ]);
+        } catch (e: any) {
+          // ignore
+        }
 
-      expect(result).to.have.property('printable', 2);
+        const result = await runtime.evaluate('1+1');
+
+        expect(result).to.have.property('printable', 2);
+      });
+
+      it('should preserve the context after interruption', async function () {
+        runtime = new WorkerRuntime('mongodb://nodb/', dummyOptions, {
+          nodb: true,
+        });
+
+        await runtime.waitForRuntimeToBeReady();
+
+        await runtime.evaluate('let x = 1');
+        await runtime.evaluate('x = x + 2');
+
+        try {
+          await Promise.all([
+            runtime.evaluate('while(true){}'),
+            (async () => {
+              await sleep(200);
+              await runtime.interrupt();
+            })(),
+          ]);
+        } catch (e: any) {
+          // ignore
+        }
+
+        const result = await runtime.evaluate('x + 3');
+        expect(result).to.have.property('printable', 6);
+      });
     });
   });
 });