@mongosh/node-runtime-worker-thread 1.3.0 → 1.4.2

package/dist/worker-runtime.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/node-runtime-worker-thread",
-  "version": "1.3.0",
+  "version": "1.4.2",
   "description": "MongoDB shell runtime that lives in a worker thread",
   "homepage": "https://github.com/mongodb-js/mongosh",
   "license": "Apache-2.0",
@@ -22,18 +22,18 @@
     "test-ci": "node ../../scripts/run-if-package-requested.js npm test",
     "lint": "eslint --report-unused-disable-directives \"./{src,test}/**/*.{js,ts,tsx}\"",
     "check": "npm run lint && depcheck",
-    "webpack-build": "webpack --mode production",
-    "webpack-build-dev": "webpack --mode development",
+    "webpack-build": "npm run compile-ts && webpack --mode production",
+    "webpack-build-dev": "npm run compile-ts && webpack --mode development",
     "compile-ts": "tsc -p tsconfig.json",
     "prepublish": "npm run webpack-build"
   },
   "devDependencies": {
-    "@mongosh/browser-runtime-core": "1.3.0",
-    "@mongosh/browser-runtime-electron": "1.3.0",
-    "@mongosh/service-provider-core": "1.3.0",
-    "@mongosh/service-provider-server": "1.3.0",
-    "@mongosh/types": "1.3.0",
-    "bson": "^4.6.1",
+    "@mongosh/browser-runtime-core": "1.4.2",
+    "@mongosh/browser-runtime-electron": "1.4.2",
+    "@mongosh/service-provider-core": "1.4.2",
+    "@mongosh/service-provider-server": "1.4.2",
+    "@mongosh/types": "1.4.2",
+    "bson": "^4.6.2",
     "mocha": "^7.1.2",
     "postmsg-rpc": "^2.4.0",
     "terser-webpack-plugin": "^4.2.3",
@@ -45,5 +45,5 @@
     "interruptor": "^1.0.1",
     "system-ca": "^1.0.2"
   },
-  "gitHead": "df88ce833d498163c966e34c815ab669d2bee50c"
+  "gitHead": "7daf54d237b923567f44725816de7f62f471df11"
 }

package/src/child-process-evaluation-listener.ts

@@ -4,7 +4,7 @@ import type { WorkerRuntime } from './index';
 import { RuntimeEvaluationListener } from '@mongosh/browser-runtime-core';
 
 export class ChildProcessEvaluationListener {
-  exposedListener: Exposed<Required<Omit<RuntimeEvaluationListener, 'onLoad' | 'startMongocryptd'>>>;
+  exposedListener: Exposed<Required<Omit<RuntimeEvaluationListener, 'onLoad' | 'getCSFLELibraryOptions'>>>;
 
   constructor(workerRuntime: WorkerRuntime, childProcess: ChildProcess) {
     this.exposedListener = exposeAll(

package/src/index.spec.ts

@@ -47,7 +47,7 @@ describe('WorkerRuntime', () => {
 
       try {
         await runtime.evaluate('1+1');
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
 
@@ -66,7 +66,7 @@ describe('WorkerRuntime', () => {
 
       try {
         await runtime.evaluate('1+1');
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
 
@@ -91,7 +91,7 @@ describe('WorkerRuntime', () => {
 
         try {
           await runtime.evaluate('throw new TypeError("Oh no, types!")');
-        } catch (e) {
+        } catch (e: any) {
           err = e;
         }
 
@@ -189,7 +189,7 @@ describe('WorkerRuntime', () => {
       try {
         process.kill(pid, 0);
         return true;
-      } catch (e) {
+      } catch (e: any) {
         return false;
       }
     }
@@ -223,7 +223,7 @@ describe('WorkerRuntime', () => {
             await runtime.terminate();
           })()
         ]);
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
       expect(err).to.be.instanceof(Error);
@@ -250,7 +250,7 @@ describe('WorkerRuntime', () => {
             await runtime.interrupt();
           })()
         ]);
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
 
@@ -275,7 +275,7 @@ describe('WorkerRuntime', () => {
             await runtime.interrupt();
           })()
         ]);
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
 
@@ -298,7 +298,7 @@ describe('WorkerRuntime', () => {
             await runtime.interrupt();
           })()
         ]);
-      } catch (e) {
+      } catch (e: any) {
         // ignore
       }
 

package/src/index.ts

@@ -2,7 +2,6 @@
 /* ^^^ we test the dist directly, so isntanbul can't calculate the coverage correctly */
 
 import { ChildProcess, spawn, SpawnOptionsWithoutStdio } from 'child_process';
-import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server';
 import {
   Runtime,
   RuntimeEvaluationListener,
@@ -15,9 +14,11 @@ import { kill } from './spawn-child-from-source';
 import { Caller, createCaller, cancel } from './rpc';
 import { ChildProcessEvaluationListener } from './child-process-evaluation-listener';
 import type { WorkerRuntime as WorkerThreadWorkerRuntime } from './worker-runtime';
-import { deserializeEvaluationResult } from './serializer';
+import { deserializeEvaluationResult, serializeConnectOptions } from './serializer';
 import { ChildProcessMongoshBus } from './child-process-mongosh-bus';
+import type { CompassServiceProvider } from '@mongosh/service-provider-server';
 
+type DevtoolsConnectOptions = Parameters<(typeof CompassServiceProvider)['connect']>[1];
 type ChildProcessRuntime = Caller<WorkerThreadWorkerRuntime>;
 
 function parseStderrToError(str: string): Error | null {
@@ -158,7 +159,7 @@ class WorkerRuntime implements Runtime {
       this.childProcess
     );
 
-    await this.childProcessRuntime.init(uri, driverOptions, cliOptions);
+    await this.childProcessRuntime.init(uri, serializeConnectOptions(driverOptions), cliOptions);
   }
 
   async evaluate(code: string): Promise<RuntimeEvaluationResult> {

package/src/lock.spec.ts

@@ -30,7 +30,7 @@ describe('Lock', () => {
     try {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       lock.lock();
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     } finally {
       lock.unlock();

package/src/rpc.spec.ts

@@ -115,7 +115,7 @@ describe('rpc', () => {
     try {
       // eslint-disable-next-line @typescript-eslint/await-thenable
       await caller.throws();
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     }
 
@@ -144,7 +144,7 @@ describe('rpc', () => {
 
     try {
       await caller.callMe((a: number, b: number) => a + b);
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     }
 
@@ -171,7 +171,7 @@ describe('rpc', () => {
 
     try {
       await caller.returnsFunction();
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     }
 
@@ -217,7 +217,7 @@ describe('rpc', () => {
               caller[cancel]();
             })()
           ]);
-        } catch (e) {
+        } catch (e: any) {
           err = e;
         }
         expect(err).to.be.instanceof(Error);

package/src/rpc.ts

@@ -98,7 +98,7 @@ function getRPCOptions(messageBus: RPCMessageBus): PostmsgRpcOptions {
         // that was executing the method.
         try {
           data.res = serialize(data.res);
-        } catch (e) {
+        } catch (e: any) {
           data.res = serialize({
             type: RPCMessageTypes.Error,
             payload: serializeError(e)
@@ -141,7 +141,7 @@ export function exposeAll<O>(obj: O, messageBus: RPCMessageBus): Exposed<O> {
       async(...args: unknown[]) => {
         try {
           return { type: RPCMessageTypes.Message, payload: await val(...args) };
-        } catch (e) {
+        } catch (e: any) {
           // If server (whatever is executing the exposed method) throws during
           // the execution, we want to propagate error to the client (whatever
           // issued the call) and re-throw there. We will do this with a special

package/src/serializer.spec.ts

@@ -1,10 +1,14 @@
+import { DevtoolsConnectOptions } from '@mongosh/service-provider-server/lib/cli-service-provider';
 import { expect } from 'chai';
+import { UUID, Long } from 'bson';
 import {
   serializeError,
   deserializeError,
   serializeEvaluationResult,
   deserializeEvaluationResult,
-  SerializedResultTypes
+  SerializedResultTypes,
+  serializeConnectOptions,
+  deserializeConnectOptions
 } from './serializer';
 
 describe('serializer', () => {
@@ -135,4 +139,86 @@ describe('serializer', () => {
       expect(deserialized).to.have.property('printable', 'Hello');
     });
   });
+
+  describe('connection options', () => {
+    it('should serialize and deserialize FLE1 connection options', () => {
+      const options: DevtoolsConnectOptions = {
+        autoEncryption: {
+          schemaMap: {
+            'hr.employees': {
+              bsonType: 'object',
+              properties: {
+                taxid: {
+                  encrypt: {
+                    keyId: [ new UUID('a21ddc6a-8806-4384-9fdf-8ba02a767b5f').toBinary() ],
+                    bsonType: 'string',
+                    algorithm: 'AEAD_AES_256_CBC_HMAC_SHA_512-Random'
+                  }
+                }
+              }
+            }
+          }
+        }
+      };
+
+      const serialized = serializeConnectOptions(options);
+
+      expect(serialized).to.deep.equal({
+        autoEncryption: {
+          schemaMap: {
+            'hr.employees': {
+              bsonType: 'object',
+              properties: {
+                taxid: {
+                  encrypt: {
+                    keyId: [ { $binary: { base64: 'oh3caogGQ4Sf34ugKnZ7Xw==', subType: '04' } } ],
+                    bsonType: 'string',
+                    algorithm: 'AEAD_AES_256_CBC_HMAC_SHA_512-Random'
+                  }
+                }
+              }
+            }
+          }
+        }
+      });
+
+      expect(deserializeConnectOptions(serialized)).to.deep.equal(options);
+    });
+
+    it('should serialize and deserialize FLE2 connection options', () => {
+      const options: DevtoolsConnectOptions = {
+        autoEncryption: {
+          encryptedFieldsMap: {
+            'hr.employees': {
+              fields: [{
+                path: 'phoneNumber',
+                keyId: new UUID('fd6275d7-9260-4e6c-a86b-68ec5240814a').toBinary(),
+                bsonType: 'string',
+                queries: { queryType: 'equality', contention: new Long(0) }
+              }]
+            }
+          }
+        }
+      };
+
+      const serialized = serializeConnectOptions(options);
+
+      expect(serialized).to.deep.equal({
+        autoEncryption: {
+          encryptedFieldsMap: {
+            'hr.employees': {
+              fields: [{
+                path: 'phoneNumber',
+                keyId: { $binary: { base64: '/WJ115JgTmyoa2jsUkCBSg==', subType: '04' } },
+                bsonType: 'string',
+                queries: { queryType: 'equality', contention: { $numberLong: '0' } }
+              }]
+            }
+          }
+        }
+      });
+
+      expect(deserializeConnectOptions(serialized)).to.deep.equal(options);
+    });
+  });
 });

package/src/serializer.ts

@@ -1,6 +1,7 @@
 import { inspect } from 'util';
 import { EJSON } from 'bson';
 import { RuntimeEvaluationResult } from '@mongosh/browser-runtime-core';
+import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server/lib/cli-service-provider';
 
 function isPrimitive(
   val: any
@@ -110,3 +111,34 @@ export function deserializeEvaluationResult({
 
   return { type, printable, source };
 }
+
+const autoEncryptionBSONOptions = [
+  'schemaMap',
+  'encryptedFieldsMap'
+] as const;
+
+export function serializeConnectOptions(options: Readonly<DevtoolsConnectOptions> = {}): DevtoolsConnectOptions {
+  const serializedOptions: any = { ...options };
+  for (const autoEncryptionOption of autoEncryptionBSONOptions) {
+    if (serializedOptions.autoEncryption?.[autoEncryptionOption]) {
+      serializedOptions.autoEncryption = {
+        ...serializedOptions.autoEncryption,
+        [autoEncryptionOption]: EJSON.serialize(serializedOptions.autoEncryption[autoEncryptionOption], { relaxed: false })
+      };
+    }
+  }
+  return serializedOptions;
+}
+
+export function deserializeConnectOptions(options: Readonly<DevtoolsConnectOptions>): DevtoolsConnectOptions {
+  const deserializedOptions: any = { ...options };
+  for (const autoEncryptionOption of autoEncryptionBSONOptions) {
+    if (deserializedOptions.autoEncryption?.[autoEncryptionOption]) {
+      deserializedOptions.autoEncryption = {
+        ...deserializedOptions.autoEncryption,
+        [autoEncryptionOption]: EJSON.deserialize(deserializedOptions.autoEncryption[autoEncryptionOption], { relaxed: false })
+      };
+    }
+  }
+  return deserializedOptions;
+}

package/src/spawn-child-from-source.spec.ts

@@ -23,7 +23,7 @@ describe('spawnChildFromSource', () => {
         // @ts-expect-error
         stdio: 'ignore'
       });
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     }
 
@@ -58,7 +58,7 @@ describe('spawnChildFromSource', () => {
         'ignore',
         'ignore'
       );
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     }
 
@@ -77,7 +77,7 @@ describe('spawnChildFromSource', () => {
         {},
         10
       );
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     }
 

package/src/worker-runtime.spec.ts

@@ -82,7 +82,7 @@ describe('worker', () => {
 
     try {
       await evaluate('1 + 1');
-    } catch (e) {
+    } catch (e: any) {
       err = e;
     }
 
@@ -384,7 +384,7 @@ describe('worker', () => {
         let err: Error;
         try {
           await evaluate('throw new TypeError("Oh no, types!")');
-        } catch (e) {
+        } catch (e: any) {
           err = e;
         }
 
@@ -404,7 +404,7 @@ describe('worker', () => {
         let err: Error;
         try {
           await evaluate('throw Object.assign(new TypeError("Oh no, types!"), { errInfo: { message: "wrong type :S" } })');
-        } catch (e) {
+        } catch (e: any) {
           err = e;
         }
 
@@ -440,7 +440,7 @@ describe('worker', () => {
             evaluate('sleep(50); 1+1'),
             evaluate('sleep(50); 1+1')
           ]);
-        } catch (e) {
+        } catch (e: any) {
           err = e;
         }
 
@@ -653,7 +653,7 @@ describe('worker', () => {
               interrupt(handle);
             })()
           ]);
-        } catch (e) {
+        } catch (e: any) {
           err = e;
         }
 
@@ -681,7 +681,7 @@ describe('worker', () => {
             await interrupt();
           })()
         ]);
-      } catch (e) {
+      } catch (e: any) {
         err = e;
       }
 

package/src/worker-runtime.ts

@@ -8,19 +8,18 @@ import {
   RuntimeEvaluationResult
 } from '@mongosh/browser-runtime-core';
 import { ElectronRuntime } from '@mongosh/browser-runtime-electron';
-import type {
-  ServiceProvider
-} from '@mongosh/service-provider-core';
+import type { ServiceProvider } from '@mongosh/service-provider-core';
 import {
-  CompassServiceProvider,
-  DevtoolsConnectOptions
+  CompassServiceProvider
 } from '@mongosh/service-provider-server';
 import { exposeAll, createCaller } from './rpc';
-import { serializeEvaluationResult } from './serializer';
+import { serializeEvaluationResult, deserializeConnectOptions } from './serializer';
 import type { MongoshBus } from '@mongosh/types';
 import { Lock, UNLOCKED } from './lock';
 import { runInterruptible, InterruptHandle } from 'interruptor';
 
+type DevtoolsConnectOptions = Parameters<(typeof CompassServiceProvider)['connect']>[1];
+
 if (!parentPort || isMainThread) {
   throw new Error('Worker runtime can be used only in a worker thread');
 }
@@ -98,7 +97,7 @@ const workerRuntime: WorkerRuntime = {
     // will have to do for now.
     provider = await (CompassServiceProvider as any).connect(
       uri,
-      driverOptions,
+      deserializeConnectOptions(driverOptions),
       cliOptions,
       messageBus
     );