chore(data-service, connections): make sure that instance info is only fetched once on initial connection COMPASS-9549 COMPASS-7675

packages/compass-app-stores/src/stores/instance-store.ts

@@ -2,6 +2,7 @@ import type { MongoDBInstanceProps } from 'mongodb-instance-model';
 import { MongoDBInstance } from 'mongodb-instance-model';
 import toNS from 'mongodb-ns';
 import type {
+  ConnectionInfo,
   ConnectionsService,
   DataService,
 } from '@mongodb-js/compass-connections/provider';
@@ -14,6 +15,8 @@ import { openToast } from '@mongodb-js/compass-components';
 import { MongoDBInstancesManager } from '../instances-manager';
 import type { PreferencesAccess } from 'compass-preferences-model';
 
+type InstanceDetails = Awaited<ReturnType<DataService['instance']>>;
+
 function serversArray(
   serversMap: NonNullable<
     ReturnType<DataService['getLastSeenTopology']>
@@ -305,20 +308,42 @@ export function createInstancesStore(
     instancesManager.removeMongoDBInstanceForConnection(connectionInfoId);
   });
 
-  on(connections, 'connected', function (instanceConnectionId: string) {
+  on(
+    connections,
+    'connected',
+    function (
+      instanceConnectionId: string,
+      _connectionInfo: ConnectionInfo,
+      instanceInfo: InstanceDetails
+    ) {
       const dataService =
         connections.getDataServiceForConnection(instanceConnectionId);
       const connectionString = dataService.getConnectionString();
       const firstHost = connectionString.hosts[0] || '';
-    const [hostname, port] = firstHost.split(':');
+      const [hostname, port] = (() => {
+        if (firstHost.startsWith('[')) {
+          return firstHost.slice(1).split(']'); // IPv6
+        }
+        return firstHost.split(':');
+      })();
 
       const initialInstanceProps: Partial<MongoDBInstanceProps> = {
+        // We pre-fetched instance info and so can right away construct it in a
+        // "ready" state
+        ...(instanceInfo as Partial<MongoDBInstanceProps>),
+        status: 'ready',
+        statusError: null,
+
+        // Required initial values that are not returned with instance info
         _id: firstHost,
         hostname: hostname,
         port: port ? +port : undefined,
         topologyDescription: getTopologyDescription(
           dataService.getLastSeenTopology()
         ),
+
+        // Service injection for preferences (currently only controls namespace
+        // stats fetching)
         preferences,
       };
       const instance = instancesManager.createMongoDBInstanceForConnection(
@@ -353,7 +378,8 @@ export function createInstancesStore(
           });
         }
       );
-  });
+    }
+  );
 
   on(
     globalAppRegistry,

packages/compass-connections/src/stores/connections-store-redux.ts

@@ -16,6 +16,7 @@ import type {
   ConnectionAttempt,
   ConnectionOptions,
   DataService,
+  InstanceDetails,
 } from 'mongodb-data-service';
 import { createConnectionAttempt } from 'mongodb-data-service';
 import { UUID } from 'bson';
@@ -43,7 +44,8 @@ import type { ImportConnectionOptions } from '@mongodb-js/connection-storage/pro
 export type ConnectionsEventMap = {
   connected: (
     connectionId: ConnectionId,
-    connectionInfo: ConnectionInfo
+    connectionInfo: ConnectionInfo,
+    instanceInfo: InstanceDetails
   ) => void;
   disconnected: (
     connectionId: ConnectionId,
@@ -1658,6 +1660,14 @@ const connectWithOptions = (
           return;
         }
 
+        // We're trying to optimise the initial Compass loading times here: to
+        // make sure that the driver connection pool doesn't immediately get
+        // overwhelmed with requests, we fetch instance info only once and then
+        // pass it down to telemetry and instance model. This is a relatively
+        // expensive dataService operation so we're trying to keep the usage
+        // very limited
+        const instanceInfo = await dataService.instance();
+
         let showedNonRetryableErrorToast = false;
         // Listen for non-retry-able errors on failed server heartbeats.
         // These can happen on compass web when:
@@ -1762,13 +1772,17 @@ const connectWithOptions = (
         track(
           'New Connection',
           async () => {
-            const [
-              { dataLake, genuineMongoDB, host, build, isAtlas, isLocalAtlas },
-              [extraInfo, resolvedHostname],
-            ] = await Promise.all([
-              dataService.instance(),
-              getExtraConnectionData(connectionInfo),
-            ]);
+            const {
+              dataLake,
+              genuineMongoDB,
+              host,
+              build,
+              isAtlas,
+              isLocalAtlas,
+            } = instanceInfo;
+            const [extraInfo, resolvedHostname] = await getExtraConnectionData(
+              connectionInfo
+            );
 
             const connections = getState().connections;
             // Counting all connections, we need to filter out any connections currently being created
@@ -1811,45 +1825,34 @@ const connectWithOptions = (
         connectionsEventEmitter.emit(
           'connected',
           connectionInfo.id,
-          connectionInfo
+          connectionInfo,
+          instanceInfo
         );
 
         dispatch({
           type: ActionTypes.ConnectionAttemptSuccess,
           connectionId: connectionInfo.id,
         });
 
-        const { networkTraffic, showEndOfLifeConnectionModal } =
-          preferences.getPreferences();
-
         if (
           getGenuineMongoDB(connectionInfo.connectionOptions.connectionString)
             .isGenuine === false
         ) {
           dispatch(showNonGenuineMongoDBWarningModal(connectionInfo.id));
-        } else if (showEndOfLifeConnectionModal) {
-          void dataService
-            .instance()
-            .then(async (instance) => {
-              const { version } = instance.build;
-              const latestEndOfLifeServerVersion =
-                await getLatestEndOfLifeServerVersion(networkTraffic);
-              if (isEndOfLifeVersion(version, latestEndOfLifeServerVersion)) {
+        } else if (
+          await shouldShowEndOfLifeWarning(
+            instanceInfo.build.version,
+            preferences,
+            debug
+          )
+        ) {
           dispatch(
             showEndOfLifeMongoDBWarningModal(
               connectionInfo.id,
-                    instance.build.version
+              instanceInfo.build.version
             )
           );
         }
-            })
-            .catch((err) => {
-              debug(
-                'failed to get instance details to determine if the server version is end-of-life',
-                err
-              );
-            });
-        }
       } catch (err) {
         dispatch(connectionAttemptError(connectionInfo, err));
       } finally {
@@ -2173,6 +2176,30 @@ export const showNonGenuineMongoDBWarningModal = (
   };
 };
 
+async function shouldShowEndOfLifeWarning(
+  serverVersion: string,
+  preferences: PreferencesAccess,
+  debug: Logger['debug']
+) {
+  try {
+    const { showEndOfLifeConnectionModal, networkTraffic } =
+      preferences.getPreferences();
+    if (!showEndOfLifeConnectionModal) {
+      return;
+    }
+    const latestEndOfLifeServerVersion = await getLatestEndOfLifeServerVersion(
+      networkTraffic
+    );
+    return isEndOfLifeVersion(serverVersion, latestEndOfLifeServerVersion);
+  } catch (err) {
+    debug(
+      'failed to get instance details to determine if the server version is end-of-life',
+      err
+    );
+    return false;
+  }
+}
+
 export const showEndOfLifeMongoDBWarningModal = (
   connectionId: string,
   version: string

packages/data-service/src/data-service.ts

@@ -310,6 +310,8 @@ export interface DataService {
 
   /**
    * Get the current instance details.
+   *
+   * @deprecated avoid using `instance` directly and use `InstanceModel` instead
    */
   instance(): Promise<InstanceDetails>;
 
@@ -340,6 +342,9 @@ export interface DataService {
 
   /**
    * List all collections for a database.
+   *
+   * @deprecated avoid using `listCollections` directly and use
+   * `CollectionModel` instead
    */
   listCollections(
     databaseName: string,
@@ -448,6 +453,9 @@ export interface DataService {
 
   /**
    * List all databases on the currently connected instance.
+   *
+   * @deprecated avoid using `listDatabases` directly and use `DatabaseModel`
+   * instead
    */
   listDatabases(options?: {
     nameOnly?: true;