fix: update CI workflow and improve logger initialization (#44)

* fix: update CI workflow and improve logger initialization

* chore: update version-name to 50.6

Author: leandromqrs

.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
+  merge_group:
   workflow_call:
 
 concurrency:

metadata.json

@@ -1,7 +1,7 @@
 {
     "name": "Aurora Shell",
     "description": "A customizable GNOME Shell extension that enhances the user experience with various modules and features. The optional Clipboard History module reads and stores clipboard text locally so it can be browsed and restored; no clipboard data is shared with third parties, and its open shortcut is unset by default.",
-    "version-name": "50.5",
+    "version-name": "50.6",
     "uuid": "aurora-shell@luminusos.github.io",
     "url": "https://github.com/luminusOS/aurora-shell",
     "settings-schema": "org.gnome.shell.extensions.aurora-shell",

src/core/logger.ts

@@ -80,14 +80,19 @@ export class ConsoleLogger implements Logger {
   }
 }
 
-let _activeLogger: Logger = new ConsoleLogger();
+let _activeLogger: Logger | null = null;
+
+function _getActiveLogger(): Logger {
+  _activeLogger ??= new ConsoleLogger();
+  return _activeLogger;
+}
 
 export const logger: Logger = {
-  log: (...args) => _activeLogger.log(...args),
-  debug: (...args) => _activeLogger.debug(...args),
-  info: (...args) => _activeLogger.info(...args),
-  warn: (...args) => _activeLogger.warn(...args),
-  error: (...args) => _activeLogger.error(...args),
+  log: (...args) => _getActiveLogger().log(...args),
+  debug: (...args) => _getActiveLogger().debug(...args),
+  info: (...args) => _getActiveLogger().info(...args),
+  warn: (...args) => _getActiveLogger().warn(...args),
+  error: (...args) => _getActiveLogger().error(...args),
 };
 
 export function setGlobalLogger(l: Logger): void {

src/modules/clipboardHistory/clipboardPanel.ts

@@ -199,6 +199,12 @@ export class ClipboardPanel extends St.BoxLayout {
     this._isOpen = false;
   }
 
+  override destroy(): void {
+    this.close();
+    this._disconnectDragSignals();
+    super.destroy();
+  }
+
   refresh(): void {
     if (this._isOpen) this._syncList(this._searchEntry.get_text());
   }
@@ -298,8 +304,11 @@ export class ClipboardPanel extends St.BoxLayout {
   }
 
   private _endDrag(): void {
-    if (!this._isDragging) return;
     this._isDragging = false;
+    this._disconnectDragSignals();
+  }
+
+  private _disconnectDragSignals(): void {
     if (this._dragMotionId !== 0) {
       global.stage.disconnect(this._dragMotionId);
       this._dragMotionId = 0;

src/modules/trayIcons/trayIconItem.ts

@@ -265,9 +265,15 @@ export class TrayIconItem extends St.Button {
   override destroy(): void {
     _hideTooltip();
     this._dbusMenuClient?.destroy();
+    if (this._menu && this._menuManager) {
+      this._menuManager.removeMenu(this._menu);
+    }
     this._menu?.destroy();
     this._menu = null;
     this._menuManager = null;
+    if (this._localMenu && this._localMenuManager) {
+      this._localMenuManager.removeMenu(this._localMenu);
+    }
     this._localMenu?.destroy();
     this._localMenu = null;
     this._localMenuManager = null;

src/modules/volumeMixer/mixerPanel.ts

@@ -18,7 +18,6 @@ export const MAX_MIXER_HEIGHT = 300;
 export class VolumeMixerPanel extends St.BoxLayout {
   declare private _emptyLabel: St.Label;
   declare private _list: VolumeMixerList;
-  declare private _scroll: St.ScrollView | null;
 
   override _init(context?: ExtensionContext | Partial<St.BoxLayout.ConstructorProps>): void {
     super._init({
@@ -53,16 +52,15 @@ export class VolumeMixerPanel extends St.BoxLayout {
       context as ExtensionContext,
     );
     sections.add_child(this._list);
-    this._scroll = scroll;
     this.add_child(scroll);
 
-    this._list.connectObject('notify::should-show', () => this._sync(), this);
-    this._sync();
+    this._list.connectObject('notify::should-show', () => this._sync(scroll), this);
+    this._sync(scroll);
   }
 
-  private _sync(): void {
+  private _sync(scroll: St.ScrollView): void {
     const hasStreams = this._list.shouldShow;
-    this._scroll!.visible = hasStreams;
+    scroll.visible = hasStreams;
     this._emptyLabel.visible = !hasStreams;
   }
 

src/shared/ui/dash.ts

@@ -19,13 +19,6 @@ export interface DashBounds {
 const TARGET_BOX_PADDING = 8;
 
 type TargetBoxListener = (bounds: DashBounds | null) => void;
-type TimeoutProp =
-  | '_autohideTimeoutId'
-  | '_delayEnsureAutoHideId'
-  | '_blockAutoHideDelayId'
-  | '_workAreaUpdateId'
-  | '_iconResizeTimeoutId'
-  | '_springLoadTimerId';
 
 const AUTOHIDE_TIMEOUT = 100;
 const SPRING_LOAD_DELAY = 400;
@@ -139,7 +132,30 @@ export class AuroraDash extends Dash {
 
   override destroy(): void {
     this._isDestroyed = true;
-    this._clearAllTimeouts();
+    if (this._autohideTimeoutId !== 0) {
+      GLib.source_remove(this._autohideTimeoutId);
+      this._autohideTimeoutId = 0;
+    }
+    if (this._delayEnsureAutoHideId !== 0) {
+      GLib.source_remove(this._delayEnsureAutoHideId);
+      this._delayEnsureAutoHideId = 0;
+    }
+    if (this._blockAutoHideDelayId !== 0) {
+      GLib.source_remove(this._blockAutoHideDelayId);
+      this._blockAutoHideDelayId = 0;
+    }
+    if (this._workAreaUpdateId !== 0) {
+      GLib.source_remove(this._workAreaUpdateId);
+      this._workAreaUpdateId = 0;
+    }
+    if (this._iconResizeTimeoutId !== 0) {
+      GLib.source_remove(this._iconResizeTimeoutId);
+      this._iconResizeTimeoutId = 0;
+    }
+    if (this._springLoadTimerId !== 0) {
+      GLib.source_remove(this._springLoadTimerId);
+      this._springLoadTimerId = 0;
+    }
 
     // Remove the global DND drag monitor so its captured `this` doesn't
     // keep firing against a disposed AuroraDash if the dash is destroyed
@@ -291,7 +307,10 @@ export class AuroraDash extends Dash {
 
   /** Schedule a delayed hover re-evaluation after visibility changes. */
   ensureAutoHide(): void {
-    this._clearTimeout('_delayEnsureAutoHideId');
+    if (this._delayEnsureAutoHideId !== 0) {
+      GLib.source_remove(this._delayEnsureAutoHideId);
+      this._delayEnsureAutoHideId = 0;
+    }
     this._delayEnsureAutoHideId = GLib.timeout_add(
       GLib.PRIORITY_DEFAULT,
       VISIBILITY_ANIMATION_TIME,
@@ -594,7 +613,10 @@ export class AuroraDash extends Dash {
     this._overrideIconActivation();
 
     if (dashAny.iconSize !== oldIconSize) {
-      this._clearTimeout('_iconResizeTimeoutId');
+      if (this._iconResizeTimeoutId !== 0) {
+        GLib.source_remove(this._iconResizeTimeoutId);
+        this._iconResizeTimeoutId = 0;
+      }
       this._iconResizeTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, ANIMATION_TIME, () => {
         this._iconResizeTimeoutId = 0;
         if (this._workArea) this.applyWorkArea(this._workArea);
@@ -817,14 +839,20 @@ export class AuroraDash extends Dash {
 
   private _clearSpringLoad(): void {
     this._springLoadTarget?.remove_style_class_name?.('aurora-drag-hover');
-    this._clearTimeout('_springLoadTimerId');
+    if (this._springLoadTimerId !== 0) {
+      GLib.source_remove(this._springLoadTimerId);
+      this._springLoadTimerId = 0;
+    }
     this._springLoadTarget = null;
   }
 
   /** Start or restart the autohide timeout — hides the dock if not hovered/blocked. */
   private _onHover(): void {
     if (this._isDestroyed) return;
-    this._clearTimeout('_autohideTimeoutId');
+    if (this._autohideTimeoutId !== 0) {
+      GLib.source_remove(this._autohideTimeoutId);
+      this._autohideTimeoutId = 0;
+    }
     this._autohideTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, AUTOHIDE_TIMEOUT, () => {
       if (this._isDestroyed) {
         this._autohideTimeoutId = 0;
@@ -845,7 +873,10 @@ export class AuroraDash extends Dash {
   /** If the cursor is still over the dash container, ensure the dock stays shown. */
   private _ensureHoverState(): void {
     if (this._isDestroyed) return;
-    this._clearTimeout('_blockAutoHideDelayId');
+    if (this._blockAutoHideDelayId !== 0) {
+      GLib.source_remove(this._blockAutoHideDelayId);
+      this._blockAutoHideDelayId = 0;
+    }
     this._blockAutoHideDelayId = GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
       if (!this._isDestroyed) {
         const dashContainer = (this as any)._dashContainer as St.Widget | undefined;
@@ -953,22 +984,6 @@ export class AuroraDash extends Dash {
     });
   }
 
-  private _clearTimeout(prop: TimeoutProp): void {
-    if (this[prop]) {
-      GLib.source_remove(this[prop]);
-      this[prop] = 0;
-    }
-  }
-
-  private _clearAllTimeouts(): void {
-    this._clearTimeout('_autohideTimeoutId');
-    this._clearTimeout('_delayEnsureAutoHideId');
-    this._clearTimeout('_blockAutoHideDelayId');
-    this._clearTimeout('_workAreaUpdateId');
-    this._clearTimeout('_iconResizeTimeoutId');
-    this._clearTimeout('_springLoadTimerId');
-  }
-
   private static _boundsEqual(a: DashBounds | null, b: DashBounds | null): boolean {
     if (a === b) return true;
     if (!a || !b) return false;