removing devtools-connect indirection

Author: nbbeeken

packages/compass-web/polyfills/@mongodb-js/devtools-connect/devtools-connect-original.d.ts

@@ -11,16 +11,13 @@ export function hookLogger(): void {
   // no-op
 }
 export function createFetch(): typeof fetch {
-  // eslint-disable-next-line @typescript-eslint/require-await
-  return async () => {
-    throw new Error('node-fetch not available in compass web');
-  };
+  return async () =>
+    Promise.reject(new Error('node-fetch not available in compass web'));
 }
-// eslint-disable-next-line @typescript-eslint/require-await
-export async function systemCA(): Promise<never> {
-  const error = new Error('system CA access not available in compass-web');
-  (error as unknown as { code: 'OUT_OF_MEM' }).code = 'OUT_OF_MEM'; // This is a "tls" error code that makes devtools-connect not use the systemCA
-  throw error;
+export async function systemCA() {
+  await Promise.reject(
+    new Error('system CA access not available in compass-web')
+  );
 }
 export function resetSystemCACache(): never {
   throw new Error('reset system CA access not available in compass-web');

packages/compass-web/polyfills/@mongodb-js/devtools-connect/index.ts

@@ -130,6 +130,7 @@ export class AtlasCloudConnectionStorage
           ...connectionInfo,
           connectionOptions: {
             ...connectionInfo.connectionOptions,
+            useSystemCA: false,
             lookup: () => {
               return {
                 wsURL: this.atlasService.driverProxyEndpoint(

packages/compass-web/polyfills/@mongodb-js/devtools-proxy-support/index.ts

@@ -57,17 +57,6 @@ module.exports = (env, args) => {
             }
           : {}),
 
-        // We replace the direct import without own the sanitizes unsupported options
-        // from the web env that are never relevant to connecting on web.
-        '@mongodb-js/devtools-connect': localPolyfill(
-          '@mongodb-js/devtools-connect'
-        ),
-
-        // Then we call into the real devtools-connect package
-        'devtools-connect-original': require.resolve(
-          '@mongodb-js/devtools-connect'
-        ),
-
         // TODO(COMPASS-7407): compass-logging
         // hard to disable the whole thing while there are direct dependencies
         // on log-writer

packages/compass-web/src/connection-storage.tsx

@@ -19,7 +19,8 @@ export type OIDCOptions = Omit<
   >[];
 };
 
-export interface ConnectionOptions {
+export interface ConnectionOptions
+  extends Pick<DevtoolsConnectOptions, 'useSystemCA'> {
   /**
    * The connection string to connect to the MongoDB instance including all options set by the user.
    */