VSCODE-311: new data service and connection model

.vscode/settings.json

@@ -17,11 +17,5 @@
     "out": true
   },
   // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
-  "typescript.tsc.autoDetect": "off",
-  // Language server logging for
-  // https://github.com/Microsoft/language-server-protocol-inspector
-  "mongodbLanguageServer.trace.server": {
-    "format": "json",
-    "verbosity": "verbose"
-  }
+  "typescript.tsc.autoDetect": "off"
 }

package.json

@@ -389,10 +389,6 @@
           "light": "images/light/plus-circle.svg",
           "dark": "images/dark/plus-circle.svg"
         }
-      },
-      {
-        "command": "mdb.startStreamLanguageServerLogs",
-        "title": "LSP Inspector: Start Stream LSP Logs"
       }
     ],
     "menus": {
@@ -920,12 +916,13 @@
     "classnames": "^2.3.1",
     "debug": "^4.3.2",
     "dotenv": "^8.6.0",
+    "lodash.clonedeep": "^4.5.0",
     "micromatch": "^4.0.4",
     "mongodb": "^4.2.0",
     "mongodb-cloud-info": "^1.1.3",
-    "mongodb-connection-model": "^21.5.4",
-    "mongodb-data-service": "^21.5.4",
-    "mongodb-js-errors": "^0.5.0",
+    "mongodb-connection-model": "^21.9.0",
+    "mongodb-connection-string-url": "^1.1.0",
+    "mongodb-data-service": "^21.13.0",
     "mongodb-ns": "^2.2.0",
     "mongodb-schema": "^9.0.0",
     "numeral": "^2.0.6",
@@ -937,8 +934,7 @@
     "uuid": "^8.3.2",
     "vscode-languageclient": "^7.0.0",
     "vscode-languageserver": "^7.0.0",
-    "vscode-languageserver-textdocument": "^1.0.2",
-    "ws": "^7.5.5"
+    "vscode-languageserver-textdocument": "^1.0.2"
   },
   "devDependencies": {
     "@types/analytics-node": "^3.1.7",
@@ -958,7 +954,6 @@
     "@types/sinon": "^9.0.11",
     "@types/uuid": "^8.3.3",
     "@types/vscode": "^1.58.1",
-    "@types/ws": "^7.4.7",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "autoprefixer": "^9.8.8",

src/commands/index.ts

@@ -26,7 +26,6 @@ enum EXTENSION_COMMANDS {
 
   MDB_CHANGE_ACTIVE_CONNECTION = 'mdb.changeActiveConnection',
   MDB_REFRESH_PLAYGROUNDS = 'mdb.refreshPlaygrounds',
-  MDB_START_LANGUAGE_STREAM_LOGS = 'mdb.startStreamLanguageServerLogs',
 
   MDB_CODELENS_SHOW_MORE_DOCUMENTS = 'mdb.codeLens.showMoreDocumentsClicked',
 

src/commands/launchMongoShell.ts

@@ -2,42 +2,9 @@ import * as vscode from 'vscode';
 
 import ConnectionController from '../connectionController';
 
-const isSslConnection = (activeConnectionModel: any): boolean => {
-  return !!(
-    activeConnectionModel &&
-    activeConnectionModel.driverOptions &&
-    (activeConnectionModel.driverOptions.sslCA ||
-      activeConnectionModel.driverOptions.sslCert ||
-      activeConnectionModel.driverOptions.sslPass)
-  );
-};
-
-const getSslOptions = (driverOptions: any): string[] => {
-  const mdbSslOptions = ['--tls'];
-
-  if (!driverOptions.checkServerIdentity) {
-    mdbSslOptions.push('--tlsAllowInvalidHostnames');
-  }
-
-  if (driverOptions.sslCA) {
-    mdbSslOptions.push(`--tlsCAFile="${driverOptions.sslCA}"`);
-  }
-
-  if (driverOptions.sslCert) {
-    mdbSslOptions.push(`--tlsCertificateKeyFile="${driverOptions.sslCert}"`);
-  }
-
-  if (driverOptions.sslPass) {
-    mdbSslOptions.push(`--tlsCertificateKeyFilePassword="${driverOptions.sslPass}"`);
-  }
-
-  return mdbSslOptions;
-};
-
 const launchMongoDBShellWithEnv = (
   shellCommand: string,
   mdbConnectionString: string,
-  mdbSslOptions: string[],
   envVariableString: string
 ) => {
   const mongoDBShell = vscode.window.createTerminal({
@@ -47,51 +14,41 @@ const launchMongoDBShellWithEnv = (
     }
   });
 
-  const mdbSslOptionsString = mdbSslOptions.length > 0
-    ? `${mdbSslOptions.join(' ')} `
-    : '';
-
   mongoDBShell.sendText(
-    `${shellCommand} ${mdbSslOptionsString}${envVariableString};`
+    `${shellCommand} ${envVariableString};`
   );
   mongoDBShell.show();
 };
 
 const launchMongoDBShellOnPowershell = (
   shellCommand: string,
-  mdbConnectionString: string,
-  mdbSslOptions: string[]
+  mdbConnectionString: string
 ): void => {
-  launchMongoDBShellWithEnv(shellCommand, mdbConnectionString, mdbSslOptions, '$Env:MDB_CONNECTION_STRING');
+  launchMongoDBShellWithEnv(shellCommand, mdbConnectionString, '$Env:MDB_CONNECTION_STRING');
 };
 
 const launchMongoDBShellOnCmd = (
   shellCommand: string,
-  mdbConnectionString: string,
-  mdbSslOptions: string[]
+  mdbConnectionString: string
 ): void => {
-  launchMongoDBShellWithEnv(shellCommand, mdbConnectionString, mdbSslOptions, '%MDB_CONNECTION_STRING%');
+  launchMongoDBShellWithEnv(shellCommand, mdbConnectionString, '%MDB_CONNECTION_STRING%');
 };
 
 const launchMongoDBShellOnGitBash = (
   shellCommand: string,
-  mdbConnectionString: string,
-  mdbSslOptions: string[]
+  mdbConnectionString: string
 ): void => {
-  launchMongoDBShellWithEnv(shellCommand, mdbConnectionString, mdbSslOptions, '$MDB_CONNECTION_STRING');
+  launchMongoDBShellWithEnv(shellCommand, mdbConnectionString, '$MDB_CONNECTION_STRING');
 };
 
 const launchMongoDBShellOnBash = (
   shellCommand: string,
-  mdbConnectionString: string,
-  mdbSslOptions: string[]
+  mdbConnectionString: string
 ): void => {
-  launchMongoDBShellWithEnv(shellCommand, mdbConnectionString, mdbSslOptions, '$MDB_CONNECTION_STRING');
+  launchMongoDBShellWithEnv(shellCommand, mdbConnectionString, '$MDB_CONNECTION_STRING');
 };
 
 const openMongoDBShell = (connectionController: ConnectionController): Promise<boolean> => {
-  let mdbSslOptions: string[] = [];
-
   if (
     !connectionController.isCurrentlyConnected()
   ) {
@@ -120,28 +77,28 @@ const openMongoDBShell = (connectionController: ConnectionController): Promise<b
     return Promise.resolve(false);
   }
 
-  const activeConnectionModel = connectionController
-    .getActiveConnectionModel()
-    ?.getAttributes({ derived: true });
+  const activeMongoClientOptions = connectionController.getMongoClientConnectionOptions();
 
-  const mdbConnectionString = activeConnectionModel
-    ? activeConnectionModel.driverUrlWithSsh
-    : '';
+  if (!activeMongoClientOptions) {
+    void vscode.window.showErrorMessage(
+      'No active connection found.'
+    );
 
-  if (activeConnectionModel && isSslConnection(activeConnectionModel)) {
-    mdbSslOptions = getSslOptions(activeConnectionModel.driverOptions);
+    return Promise.resolve(false);
   }
 
+  const mdbConnectionString = activeMongoClientOptions.url || '';
+
   if (userShell.includes('powershell.exe')) {
-    launchMongoDBShellOnPowershell(shellCommand, mdbConnectionString, mdbSslOptions);
+    launchMongoDBShellOnPowershell(shellCommand, mdbConnectionString);
   } else if (userShell.includes('cmd.exe')) {
-    launchMongoDBShellOnCmd(shellCommand, mdbConnectionString, mdbSslOptions);
+    launchMongoDBShellOnCmd(shellCommand, mdbConnectionString);
   } else if (userShell.toLocaleLowerCase().includes('git\\bin\\bash.exe')) {
-    launchMongoDBShellOnGitBash(shellCommand, mdbConnectionString, mdbSslOptions);
+    launchMongoDBShellOnGitBash(shellCommand, mdbConnectionString);
   } else {
     // Assume it's a bash environment. This may fail on certain
     // shells but should cover most cases.
-    launchMongoDBShellOnBash(shellCommand, mdbConnectionString, mdbSslOptions);
+    launchMongoDBShellOnBash(shellCommand, mdbConnectionString);
   }
 
   return Promise.resolve(true);