@mongosh/node-runtime-worker-thread 1.5.4 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/node-runtime-worker-thread",
-  "version": "1.5.4",
+  "version": "1.6.1",
   "description": "MongoDB shell runtime that lives in a worker thread",
   "homepage": "https://github.com/mongodb-js/mongosh",
   "license": "Apache-2.0",
@@ -28,22 +28,22 @@
     "prepublish": "npm run webpack-build"
   },
   "devDependencies": {
-    "@mongosh/browser-runtime-core": "1.5.4",
-    "@mongosh/browser-runtime-electron": "1.5.4",
-    "@mongosh/service-provider-core": "1.5.4",
-    "@mongosh/service-provider-server": "1.5.4",
-    "@mongosh/types": "1.5.4",
-    "bson": "^4.6.5",
+    "@mongosh/browser-runtime-core": "1.6.1",
+    "@mongosh/browser-runtime-electron": "1.6.1",
+    "@mongosh/service-provider-core": "1.6.1",
+    "@mongosh/service-provider-server": "1.6.1",
+    "@mongosh/types": "1.6.1",
+    "bson": "^4.7.0",
     "mocha": "^7.1.2",
     "postmsg-rpc": "^2.4.0",
     "terser-webpack-plugin": "^4.2.3",
     "ts-loader": "^8.0.14",
-    "webpack": "^4.44.2",
+    "webpack": "^5.75.0",
     "webpack-cli": "^4.3.1"
   },
   "dependencies": {
     "interruptor": "^1.0.1",
     "system-ca": "^1.0.2"
   },
-  "gitHead": "92fc4d6ce4b4eed4d8d29bc0d38a9eb50831d14e"
+  "gitHead": "51c067456d3e0127156ef1722a44659151e01a12"
 }

package/src/child-process-proxy.spec.ts

@@ -1,8 +1,10 @@
 import path from 'path';
-import { ChildProcess, fork } from 'child_process';
+import { ChildProcess, fork, spawn } from 'child_process';
 import { Caller, cancel, createCaller } from './rpc';
 import { expect } from 'chai';
 import { WorkerRuntime } from './worker-runtime';
+import { once } from 'events';
+import { promisify } from 'util';
 
 const childProcessModulePath = path.resolve(
   __dirname,
@@ -22,7 +24,7 @@ describe('child process worker proxy', () => {
     }
 
     if (childProcess) {
-      childProcess.kill('SIGTERM');
+      childProcess.disconnect();
       childProcess = null;
     }
   });
@@ -34,4 +36,38 @@ describe('child process worker proxy', () => {
     const result = await caller.evaluate('1 + 1');
     expect(result.printable).to.equal(2);
   });
+
+  it('should exit on its own when the parent process disconnects', async() => {
+    const intermediateProcess = spawn(process.execPath,
+      ['-e', `require("child_process")
+         .fork(${JSON.stringify(childProcessModulePath)})
+         .on("message", function(m) { console.log("message " + m + " from " + this.pid) })`],
+      { stdio: ['pipe', 'pipe', 'inherit'] });
+
+    // Make sure the outer child process runs and has created the inner child process
+    const [message] = await once(intermediateProcess.stdout.setEncoding('utf8'), 'data');
+    const match = message.trim().match(/^message ready from (?<pid>\d+)$/);
+    expect(match).to.not.equal(null);
+
+    // Make sure the inner child process runs
+    const childPid = +match.groups.pid;
+    process.kill(childPid, 0);
+
+    // Kill the intermediate process and wait for the inner child process to also close
+    intermediateProcess.kill('SIGTERM');
+    let innerChildHasStoppedRunning = false;
+    for (let i = 0; i < 200; i++) {
+      try {
+        process.kill(childPid, 0);
+      } catch (err) {
+        if (err.code === 'ESRCH') {
+          innerChildHasStoppedRunning = true;
+          break;
+        }
+        throw err;
+      }
+      await promisify(setTimeout)(10);
+    }
+    expect(innerChildHasStoppedRunning).to.equal(true);
+  });
 });

package/src/child-process-proxy.ts

@@ -114,6 +114,7 @@ const messageBus = createCaller(['emit', 'on'], process);
 
 exposeAll(messageBus, workerProcess);
 
+process.once('disconnect', () => process.exit());
 process.nextTick(() => {
   // eslint-disable-next-line chai-friendly/no-unused-expressions
   process.send?.('ready');

package/src/serializer.spec.ts

@@ -150,7 +150,7 @@ describe('serializer', () => {
               properties: {
                 taxid: {
                   encrypt: {
-                    keyId: [ new UUID('a21ddc6a-8806-4384-9fdf-8ba02a767b5f').toBinary() ],
+                    keyId: [ new UUID('a21ddc6a-8806-4384-9fdf-8ba02a767b5f') ],
                     bsonType: 'string',
                     algorithm: 'AEAD_AES_256_CBC_HMAC_SHA_512-Random'
                   }
@@ -192,7 +192,7 @@ describe('serializer', () => {
             'hr.employees': {
               fields: [{
                 path: 'phoneNumber',
-                keyId: new UUID('fd6275d7-9260-4e6c-a86b-68ec5240814a').toBinary(),
+                keyId: new UUID('fd6275d7-9260-4e6c-a86b-68ec5240814a'),
                 bsonType: 'string',
                 queries: { queryType: 'equality', contention: new Long(0) }
               }]