move csp

Author: mcasimir

packages/compass/src/app/application.tsx

@@ -28,7 +28,7 @@ import { createElectronFileInputBackend } from '@mongodb-js/compass-components';
 import { CompassRendererConnectionStorage } from '@mongodb-js/connection-storage/renderer';
 import type { SettingsTabId } from '@mongodb-js/compass-settings';
 import type { AutoConnectPreferences } from '../main/auto-connect';
-import { injectCSP } from './utils/csp';
+
 const { log, mongoLogId } = createLogger('COMPASS-APP');
 const track = createIpcTrack();
 
@@ -206,21 +206,6 @@ class Application {
     document.querySelector('#loading-placeholder')?.remove();
   }
 
-  private async updateAppVersion() {
-    const { lastKnownVersion, highestInstalledVersion } =
-      defaultPreferencesInstance.getPreferences();
-    this.previousVersion = lastKnownVersion || DEFAULT_APP_VERSION;
-    this.highestInstalledVersion =
-      semver.sort([
-        highestInstalledVersion || DEFAULT_APP_VERSION,
-        this.version,
-      ])?.[1] ?? this.version;
-    await defaultPreferencesInstance.savePreferences({
-      lastKnownVersion: this.version,
-      highestInstalledVersion: this.highestInstalledVersion,
-    });
-  }
-
   private setupDataRefreshListener() {
     ipcRenderer?.on('app:refresh-data', () =>
       globalAppRegistry.emit('refresh-data')
@@ -454,20 +439,15 @@ class Application {
     // unhandled errors are properly logged and reported
     this.setupGlobalErrorHandling();
 
-    // Inject CSP first to prevent any CSP violations.
-    injectCSP();
-
-    this.allowDevFeatureFlagsFromDevTools();
-    this.preventDefaultBrowserBehaviorForDragAndDrop();
-
     // Setup development environment
     this.enableDevelopmentDebug();
+    this.allowDevFeatureFlagsFromDevTools();
+
     this.patchNODE4281();
     this.setupWebVitals();
 
     // Initialize preferences and version
-    await defaultPreferencesInstance.refreshPreferences();
-    await this.updateAppVersion();
+    await this.initializePreferencesAndVersion();
 
     void this.setupIntercomAndLogError();
 
@@ -476,6 +456,7 @@ class Application {
     this.setupAutoUpdateListeners();
     this.setupConnectInNewWindowListeners();
     this.setupZoomControls();
+    this.preventDefaultBrowserBehaviorForDragAndDrop();
 
     // Render the application
     await this.render();
@@ -488,6 +469,27 @@ class Application {
     this.logVersionInfo();
     this.showUpdateToastIfNeeded();
   }
+
+  private async initializePreferencesAndVersion() {
+    await defaultPreferencesInstance.refreshPreferences();
+
+    // This code updates the last known version and highest installed version in preferences after
+    // the first installation, or a potential update or downgrade.
+    // This is useful so that we can track the version history of the application, and
+    // handle auto-updates differently in case of downgrades.
+    const { lastKnownVersion, highestInstalledVersion } =
+      defaultPreferencesInstance.getPreferences();
+    this.previousVersion = lastKnownVersion || DEFAULT_APP_VERSION;
+    this.highestInstalledVersion =
+      semver.sort([
+        highestInstalledVersion || DEFAULT_APP_VERSION,
+        this.version,
+      ])?.[1] ?? this.version;
+    await defaultPreferencesInstance.savePreferences({
+      lastKnownVersion: this.version,
+      highestInstalledVersion: this.highestInstalledVersion,
+    });
+  }
 }
 
 export const app = Application.getInstance();

packages/compass/src/app/index.ts

@@ -19,16 +19,19 @@
  * Rule of thumb: If the code isn't required for other modules to function
  * correctly during import, it probably belongs in application.tsx.
  */
-import { setupHadronDistribution } from '../setup-hadron-distribution';
-import dns from 'dns';
-import EventEmitter from 'events';
+
+// Inject CSP to prevent any CSP violations.
+import { injectCSP } from './utils/csp';
+injectCSP();
 
 // Setup paths and environment variables for electron globals
+import { setupHadronDistribution } from '../setup-hadron-distribution';
 setupHadronDistribution();
 
 // DNS Configuration
 // Ensures IPv4 is preferred over IPv6 to avoid potential connection issues
 // See: https://github.com/nodejs/node/issues/40537
+import dns from 'dns';
 dns.setDefaultResultOrder('ipv4first');
 
 // Configure NODE_OPTIONS to ensure sub-processes (like the shell) also prefer IPv4
@@ -40,6 +43,7 @@ if (!process.env.NODE_OPTIONS.includes('--dns-result-order')) {
 // Event Emitter Configuration
 // Increases the default maximum number of listeners to prevent
 // potential memory leaks in development mode
+import EventEmitter from 'events';
 EventEmitter.defaultMaxListeners = 100;
 
 // ----------------------------------------------------------------------------