Merge pull request #7513 from mook-as/k3sHelper/online-via-events

k3sHelper: Use events to check online state
rancher-sandbox · Sep 23, 2024 · 5ed9ca4 · 5ed9ca4
2 parents f3ba31b + e55d5f3
commit 5ed9ca4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/pkg/rancher-desktop/backend/k3sHelper.ts b/pkg/rancher-desktop/backend/k3sHelper.ts
@@ -21,7 +21,7 @@ import { Architecture, VMExecutor } from './backend';
 import * as K8s from '@pkg/backend/k8s';
 import { KubeClient } from '@pkg/backend/kube/client';
 import { loadFromString, exportConfig } from '@pkg/backend/kubeconfig';
-import { checkConnectivity } from '@pkg/main/networking';
+import mainEvents from '@pkg/main/mainEvents';
 import { isUnixError } from '@pkg/typings/unix.interface';
 import DownloadProgressListener from '@pkg/utils/DownloadProgressListener';
 import * as childProcess from '@pkg/utils/childProcess';
@@ -46,6 +46,12 @@ const console = Logging.k8s;
  */
 export type ShortVersion = string;
 
+let isOnline = true;
+
+mainEvents.on('update-network-status', (connected) => {
+  isOnline = connected;
+});
+
 export interface ReleaseAPIEntry {
   tag_name: string;
   assets: {
@@ -372,7 +378,7 @@ export default class K3sHelper extends events.EventEmitter {
           { headers: { Accept: this.channelApiAccept } });
       } catch (ex: any) {
         console.log(`updateCache: error: ${ ex }`);
-        if (!(await checkConnectivity('k3s.io'))) {
+        if (!isOnline) {
           return;
         }
 
@@ -565,16 +571,15 @@ export default class K3sHelper extends events.EventEmitter {
   get availableVersions(): Promise<SemanticVersionEntry[]> {
     return (async() => {
       await this.initialize();
-      const upstreamSeemsReachable = await checkConnectivity('k3s.io');
       const wrappedVersions = Object.values(this.versions);
-      const finalOptions = upstreamSeemsReachable ? wrappedVersions : await K3sHelper.filterVersionsAgainstCache(wrappedVersions);
+      const finalOptions = isOnline ? wrappedVersions : await K3sHelper.filterVersionsAgainstCache(wrappedVersions);
 
       return finalOptions.sort((a, b) => b.version.compare(a.version));
     })();
   }
 
-  static async cachedVersionsOnly(): Promise<boolean> {
-    return !(await checkConnectivity('k3s.io'));
+  static cachedVersionsOnly(): Promise<boolean> {
+    return Promise.resolve(!isOnline);
   }
 
   static async filterVersionsAgainstCache(fullVersionList: SemanticVersionEntry[]): Promise<SemanticVersionEntry[]> {

diff --git a/pkg/rancher-desktop/main/mainEvents.ts b/pkg/rancher-desktop/main/mainEvents.ts
@@ -74,6 +74,12 @@ interface MainEventNames {
    */
   'network-ready'(): void;
 
+  /**
+   * Emitted when the network comes online or goes offline.
+   * @param connected The new network state.
+   */
+  'update-network-status'(connected: boolean): void;
+
   /**
    * Emitted when the integration state has changed.
    *

diff --git a/pkg/rancher-desktop/main/tray.ts b/pkg/rancher-desktop/main/tray.ts
@@ -284,6 +284,7 @@ export class Tray {
     } else {
       this.currentNetworkStatus = await checkConnectivity('k3s.io') ? networkStatus.CONNECTED : networkStatus.OFFLINE;
     }
+    mainEvents.emit('update-network-status', this.currentNetworkStatus === networkStatus.CONNECTED);
     send('update-network-status', this.currentNetworkStatus === networkStatus.CONNECTED);
     this.updateMenu();
   }