@mongosh/node-runtime-worker-thread 1.1.7 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/node-runtime-worker-thread",
-  "version": "1.1.7",
+  "version": "1.2.1",
   "description": "MongoDB shell runtime that lives in a worker thread",
   "homepage": "https://github.com/mongodb-js/mongosh",
   "license": "Apache-2.0",
@@ -28,12 +28,12 @@
     "prepublish": "npm run webpack-build"
   },
   "devDependencies": {
-    "@mongosh/browser-runtime-core": "1.1.7",
-    "@mongosh/browser-runtime-electron": "1.1.7",
-    "@mongosh/service-provider-core": "1.1.7",
-    "@mongosh/service-provider-server": "1.1.7",
-    "@mongosh/types": "1.1.7",
-    "bson": "^4.6.0",
+    "@mongosh/browser-runtime-core": "1.2.1",
+    "@mongosh/browser-runtime-electron": "1.2.1",
+    "@mongosh/service-provider-core": "1.2.1",
+    "@mongosh/service-provider-server": "1.2.1",
+    "@mongosh/types": "1.2.1",
+    "bson": "^4.6.1",
     "mocha": "^7.1.2",
     "postmsg-rpc": "^2.4.0",
     "terser-webpack-plugin": "^4.2.3",
@@ -44,5 +44,5 @@
   "dependencies": {
     "interruptor": "^1.0.1"
   },
-  "gitHead": "01997aba3b8e001c8668656731e12d491972756a"
+  "gitHead": "62b1dff4ce48f4dd3706d4fd9ccd4582df403ee3"
 }

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

@@ -20,6 +20,9 @@ export class ChildProcessEvaluationListener {
         setConfig(key, value) {
           return workerRuntime.evaluationListener?.setConfig?.(key, value) ?? Promise.resolve('ignored');
         },
+        resetConfig(key) {
+          return workerRuntime.evaluationListener?.resetConfig?.(key) ?? Promise.resolve('ignored');
+        },
         validateConfig(key, value) {
           return workerRuntime.evaluationListener?.validateConfig?.(key, value) ?? Promise.resolve(null);
         },

package/src/child-process-proxy.ts

@@ -95,7 +95,10 @@ exposeAll(worker, process);
 
 const evaluationListener = Object.assign(
   createCaller(
-    ['onPrint', 'onPrompt', 'getConfig', 'setConfig', 'validateConfig', 'listConfigOptions', 'onClearCommand', 'onExit'],
+    [
+      'onPrint', 'onPrompt', 'getConfig', 'setConfig', 'resetConfig',
+      'validateConfig', 'listConfigOptions', 'onClearCommand', 'onExit'
+    ],
     process
   ),
   {

package/src/index.ts

@@ -2,13 +2,13 @@
 /* ^^^ we test the dist directly, so isntanbul can't calculate the coverage correctly */
 
 import { ChildProcess, spawn, SpawnOptionsWithoutStdio } from 'child_process';
-import { MongoClientOptions } from '@mongosh/service-provider-core';
+import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server';
 import {
   Runtime,
   RuntimeEvaluationListener,
   RuntimeEvaluationResult
 } from '@mongosh/browser-runtime-core';
-import { MongoshBus } from '@mongosh/types';
+import type { MongoshBus } from '@mongosh/types';
 import path from 'path';
 import { EventEmitter, once } from 'events';
 import { kill } from './spawn-child-from-source';
@@ -48,7 +48,7 @@ function parseStderrToError(str: string): Error | null {
 class WorkerRuntime implements Runtime {
   private initOptions: {
     uri: string;
-    driverOptions: MongoClientOptions;
+    driverOptions: DevtoolsConnectOptions;
     cliOptions: { nodb?: boolean };
     spawnOptions: SpawnOptionsWithoutStdio;
   };
@@ -74,7 +74,7 @@ class WorkerRuntime implements Runtime {
 
   constructor(
     uri: string,
-    driverOptions: MongoClientOptions = {},
+    driverOptions: DevtoolsConnectOptions = {},
     cliOptions: { nodb?: boolean } = {},
     spawnOptions: SpawnOptionsWithoutStdio = {},
     eventEmitter: MongoshBus = new EventEmitter()

package/src/worker-runtime.spec.ts

@@ -495,6 +495,7 @@ describe('worker', () => {
         },
         getConfig() {},
         setConfig() {},
+        resetConfig() {},
         validateConfig() {},
         listConfigOptions() { return ['displayBatchSize']; },
         onRunInterruptible() {}
@@ -504,6 +505,7 @@ describe('worker', () => {
       spySandbox.spy(evalListener, 'onPrompt');
       spySandbox.spy(evalListener, 'getConfig');
       spySandbox.spy(evalListener, 'setConfig');
+      spySandbox.spy(evalListener, 'resetConfig');
       spySandbox.spy(evalListener, 'validateConfig');
       spySandbox.spy(evalListener, 'listConfigOptions');
       spySandbox.spy(evalListener, 'onRunInterruptible');
@@ -582,6 +584,20 @@ describe('worker', () => {
       });
     });
 
+    describe('resetConfig', () => {
+      it('should be called when shell evaluates `config.reset()`', async() => {
+        const { init, evaluate } = caller;
+        const evalListener = createSpiedEvaluationListener();
+
+        exposed = exposeAll(evalListener, worker);
+
+        await init('mongodb://nodb/', {}, { nodb: true });
+
+        await evaluate('config.reset("displayBatchSize")');
+        expect(evalListener.resetConfig).to.have.been.calledWith('displayBatchSize');
+      });
+    });
+
     describe('listConfigOptions', () => {
       it('should be called when shell evaluates `config[asPrintable]`', async() => {
         const { init, evaluate } = caller;

package/src/worker-runtime.ts

@@ -8,14 +8,16 @@ import {
   RuntimeEvaluationResult
 } from '@mongosh/browser-runtime-core';
 import { ElectronRuntime } from '@mongosh/browser-runtime-electron';
-import {
-  MongoClientOptions,
+import type {
   ServiceProvider
 } from '@mongosh/service-provider-core';
-import { CompassServiceProvider } from '@mongosh/service-provider-server';
+import {
+  CompassServiceProvider,
+  DevtoolsConnectOptions
+} from '@mongosh/service-provider-server';
 import { exposeAll, createCaller } from './rpc';
 import { serializeEvaluationResult } from './serializer';
-import { MongoshBus } from '@mongosh/types';
+import type { MongoshBus } from '@mongosh/types';
 import { Lock, UNLOCKED } from './lock';
 import { runInterruptible, InterruptHandle } from 'interruptor';
 
@@ -48,6 +50,7 @@ const evaluationListener = createCaller<WorkerRuntimeEvaluationListener>(
     'onPrompt',
     'getConfig',
     'setConfig',
+    'resetConfig',
     'validateConfig',
     'listConfigOptions',
     'onClearCommand',
@@ -72,7 +75,7 @@ const messageBus: MongoshBus = Object.assign(
 export type WorkerRuntime = Runtime & {
   init(
     uri: string,
-    driverOptions?: MongoClientOptions,
+    driverOptions?: DevtoolsConnectOptions,
     cliOptions?: { nodb?: boolean }
   ): Promise<void>;
 
@@ -82,7 +85,7 @@ export type WorkerRuntime = Runtime & {
 const workerRuntime: WorkerRuntime = {
   async init(
     uri: string,
-    driverOptions: MongoClientOptions = {},
+    driverOptions: DevtoolsConnectOptions = {},
     cliOptions: { nodb?: boolean } = {}
   ) {
     // XXX The types here work out fine, and tsc accepts this code

package/webpack.config.js

@@ -42,7 +42,8 @@ const config = {
     'mongodb-client-encryption': 'commonjs2 mongodb-client-encryption',
     kerberos: 'commonjs2 kerberos',
     snappy: 'commonjs2 snappy',
-    interruptor: 'commonjs2 interruptor'
+    interruptor: 'commonjs2 interruptor',
+    'os-dns-native': 'commonjs2 os-dns-native',
   }
 };