Improvement: Moved extension objects to runtime lifecycle.

Author: NiffirgkcaJ

gnome-extensions/extension/extension.js

@@ -5,14 +5,21 @@ import * as Gettext from 'gettext';
 import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 import { Extension, gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
 
+import { destroyAllRecentItemsManagers } from './shared/utilities/utilityRecents.js';
 import { initializeMenuRegistry } from './shared/menu/menuRegistry.js';
 import { IOFile } from './shared/utilities/utilityIO.js';
 import { Logger } from './shared/utilities/utilityLogger.js';
 import { MenuIndicator } from './shared/menu/menuIndicator.js';
+import { resetSearchHub } from './shared/services/serviceSearchHub.js';
 import { getAutoPaster, destroyAutoPaster } from './shared/utilities/utilityAutoPaste.js';
 import { initStorage, FileItem } from './shared/constants/storagePaths.js';
 
 import { ClipboardManager } from './features/Clipboard/managers/clipboardManager.js';
+import { resetClipboardSearchProvider } from './features/Clipboard/integrations/clipboardSearchProvider.js';
+import { resetEmojiSearchProvider } from './features/Emoji/integrations/emojiSearchProvider.js';
+import { resetGifSearchProvider } from './features/GIF/integrations/gifSearchProvider.js';
+import { resetKaomojiSearchProvider } from './features/Kaomoji/integrations/kaomojiSearchProvider.js';
+import { resetSymbolsSearchProvider } from './features/Symbols/integrations/symbolsSearchProvider.js';
 import { getGifCacheManager, destroyGifCacheManager } from './features/GIF/logic/gifCacheManager.js';
 import { getSkinnableCharSet, destroySkinnableCharSetCache } from './features/Emoji/logic/emojiDataCache.js';
 
@@ -259,6 +266,14 @@ export default class AllInOneClipboardExtension extends Extension {
         this._clipboardManager?.destroy();
         this._clipboardManager = null;
 
+        resetClipboardSearchProvider();
+        resetEmojiSearchProvider();
+        resetGifSearchProvider();
+        resetKaomojiSearchProvider();
+        resetSymbolsSearchProvider();
+        resetSearchHub();
+        destroyAllRecentItemsManagers();
+
         if (this._resource) {
             Gio.resources_unregister(this._resource);
             this._resource = null;

gnome-extensions/extension/features/Clipboard/integrations/clipboardSearchProvider.js

@@ -1,5 +1,5 @@
 import { IOJson } from '../../../shared/utilities/utilityIO.js';
-import { registerSearchProvider } from '../../../shared/services/serviceSearchHub.js';
+import { registerSearchProvider, unregisterSearchProvider } from '../../../shared/services/serviceSearchHub.js';
 
 import { ClipboardProvider } from '../constants/clipboardConstants.js';
 import { ClipboardSearchUtils } from '../utilities/clipboardSearchUtils.js';
@@ -72,15 +72,15 @@ export function ensureClipboardSearchProviderRegistered() {
             return items.filter((item) => ClipboardSearchUtils.isMatch(item, query));
         },
         applyToTab: async ({ tabActor, query }) => {
-            if (!tabActor || typeof tabActor.applyExternalSearch !== 'function') {
+            if (!tabActor) {
                 return false;
             }
 
             await tabActor.applyExternalSearch(query);
             return true;
         },
         clearOnTab: async ({ tabActor }) => {
-            if (!tabActor || typeof tabActor.clearExternalSearch !== 'function') {
+            if (!tabActor) {
                 return false;
             }
 
@@ -92,3 +92,13 @@ export function ensureClipboardSearchProviderRegistered() {
     _isProviderRegistered = true;
     return ClipboardProvider.SEARCH_PROVIDER_ID;
 }
+
+/**
+ * Unregisters the Clipboard provider and clears module state.
+ *
+ * @returns {void}
+ */
+export function resetClipboardSearchProvider() {
+    unregisterSearchProvider(ClipboardProvider.SEARCH_PROVIDER_ID);
+    _isProviderRegistered = false;
+}

gnome-extensions/extension/features/Emoji/integrations/emojiSearchProvider.js

@@ -1,18 +1,15 @@
-import { registerSearchProvider } from '../../../shared/services/serviceSearchHub.js';
 import { IOResource, ResourceItem } from '../../../shared/constants/storagePaths.js';
+import { registerSearchProvider, unregisterSearchProvider } from '../../../shared/services/serviceSearchHub.js';
 
 import { EmojiJsonParser } from '../parsers/emojiJsonParser.js';
 import { EmojiProvider } from '../constants/emojiConstants.js';
 import { EmojiViewRenderer } from '../view/emojiViewRenderer.js';
 
-// Private Resources
-const _emojiSearchRenderer = new EmojiViewRenderer(null);
-
 // ========================================================================
 // State
 // ========================================================================
 
-let _emojiCatalogItems = [];
+let _emojiCatalogItems = null;
 let _emojiCatalogPromise = null;
 let _emojiExtensionUuid = 'EmojiSearchProvider';
 let _isProviderRegistered = false;
@@ -27,7 +24,7 @@ let _isProviderRegistered = false;
  * @returns {Promise<Array>} A promise that resolves to an array of emoji catalog items.
  */
 async function loadEmojiCatalog() {
-    if (_emojiCatalogItems.length > 0) {
+    if (Array.isArray(_emojiCatalogItems)) {
         return _emojiCatalogItems;
     }
 
@@ -70,6 +67,8 @@ export function ensureEmojiSearchProviderRegistered({ extensionUuid } = {}) {
         return EmojiProvider.SEARCH_PROVIDER_ID;
     }
 
+    let emojiSearchRenderer = null;
+
     registerSearchProvider({
         id: EmojiProvider.SEARCH_PROVIDER_ID,
         targetTabs: ['Emoji'],
@@ -78,19 +77,23 @@ export function ensureEmojiSearchProviderRegistered({ extensionUuid } = {}) {
                 return [];
             }
 
+            if (!emojiSearchRenderer) {
+                emojiSearchRenderer = new EmojiViewRenderer(null);
+            }
+
             const catalogItems = await loadEmojiCatalog();
-            return catalogItems.filter((item) => _emojiSearchRenderer.searchFilter(item || {}, query));
+            return catalogItems.filter((item) => emojiSearchRenderer.searchFilter(item || {}, query));
         },
         applyToTab: async ({ tabActor, query }) => {
-            if (!tabActor || typeof tabActor.applyExternalSearch !== 'function') {
+            if (!tabActor) {
                 return false;
             }
 
             await tabActor.applyExternalSearch(query);
             return true;
         },
         clearOnTab: async ({ tabActor }) => {
-            if (!tabActor || typeof tabActor.clearExternalSearch !== 'function') {
+            if (!tabActor) {
                 return false;
             }
 
@@ -102,3 +105,16 @@ export function ensureEmojiSearchProviderRegistered({ extensionUuid } = {}) {
     _isProviderRegistered = true;
     return EmojiProvider.SEARCH_PROVIDER_ID;
 }
+
+/**
+ * Unregisters the Emoji provider and clears cached module state.
+ *
+ * @returns {void}
+ */
+export function resetEmojiSearchProvider() {
+    unregisterSearchProvider(EmojiProvider.SEARCH_PROVIDER_ID);
+    _emojiCatalogItems = null;
+    _emojiCatalogPromise = null;
+    _emojiExtensionUuid = 'EmojiSearchProvider';
+    _isProviderRegistered = false;
+}

gnome-extensions/extension/features/GIF/integrations/gifSearchProvider.js

@@ -1,4 +1,4 @@
-import { registerSearchProvider } from '../../../shared/services/serviceSearchHub.js';
+import { registerSearchProvider, unregisterSearchProvider } from '../../../shared/services/serviceSearchHub.js';
 
 import { GifManager } from '../managers/gifManager.js';
 import { GifProvider } from '../constants/gifConstants.js';
@@ -9,6 +9,7 @@ import { GifProvider } from '../constants/gifConstants.js';
 
 let _isProviderRegistered = false;
 let _gifManager = null;
+let _ownsGifManager = false;
 
 // ========================================================================
 // Internal Helpers
@@ -29,6 +30,7 @@ function ensureGifManager({ settings, extensionUuid, extensionPath } = {}) {
     }
 
     _gifManager = new GifManager(settings, extensionUuid, extensionPath);
+    _ownsGifManager = true;
     return _gifManager;
 }
 
@@ -48,7 +50,11 @@ function ensureGifManager({ settings, extensionUuid, extensionPath } = {}) {
  */
 export function ensureGifSearchProviderRegistered({ settings, extensionUuid, extensionPath, gifManager } = {}) {
     if (gifManager) {
+        if (_ownsGifManager && _gifManager && _gifManager !== gifManager) {
+            _gifManager.destroy();
+        }
         _gifManager = gifManager;
+        _ownsGifManager = false;
     } else {
         ensureGifManager({ settings, extensionUuid, extensionPath });
     }
@@ -82,15 +88,15 @@ export function ensureGifSearchProviderRegistered({ settings, extensionUuid, ext
             }
         },
         applyToTab: async ({ tabActor, query }) => {
-            if (!tabActor || typeof tabActor.applyExternalSearch !== 'function') {
+            if (!tabActor) {
                 return false;
             }
 
             await tabActor.applyExternalSearch(query);
             return true;
         },
         clearOnTab: async ({ tabActor }) => {
-            if (!tabActor || typeof tabActor.clearExternalSearch !== 'function') {
+            if (!tabActor) {
                 return false;
             }
 
@@ -102,3 +108,20 @@ export function ensureGifSearchProviderRegistered({ settings, extensionUuid, ext
     _isProviderRegistered = true;
     return GifProvider.SEARCH_PROVIDER_ID;
 }
+
+/**
+ * Unregisters the GIF provider and destroys any manager owned by this module.
+ *
+ * @returns {void}
+ */
+export function resetGifSearchProvider() {
+    unregisterSearchProvider(GifProvider.SEARCH_PROVIDER_ID);
+
+    if (_ownsGifManager && _gifManager) {
+        _gifManager.destroy();
+    }
+
+    _gifManager = null;
+    _ownsGifManager = false;
+    _isProviderRegistered = false;
+}

gnome-extensions/extension/features/Kaomoji/integrations/kaomojiSearchProvider.js

@@ -1,18 +1,15 @@
-import { registerSearchProvider } from '../../../shared/services/serviceSearchHub.js';
 import { IOResource, ResourceItem } from '../../../shared/constants/storagePaths.js';
+import { registerSearchProvider, unregisterSearchProvider } from '../../../shared/services/serviceSearchHub.js';
 
 import { KaomojiJsonParser } from '../parsers/kaomojiJsonParser.js';
 import { KaomojiProvider } from '../constants/kaomojiConstants.js';
 import { KaomojiViewRenderer } from '../view/kaomojiViewRenderer.js';
 
-// Private Resource
-const _kaomojiSearchRenderer = new KaomojiViewRenderer();
-
 // ========================================================================
 // State
 // ========================================================================
 
-let _kaomojiCatalogItems = [];
+let _kaomojiCatalogItems = null;
 let _kaomojiCatalogPromise = null;
 let _kaomojiExtensionUuid = 'KaomojiSearchProvider';
 let _isProviderRegistered = false;
@@ -27,7 +24,7 @@ let _isProviderRegistered = false;
  * @returns {Promise<Array>} A promise that resolves to an array of kaomoji catalog items.
  */
 async function loadKaomojiCatalog() {
-    if (_kaomojiCatalogItems.length > 0) {
+    if (Array.isArray(_kaomojiCatalogItems)) {
         return _kaomojiCatalogItems;
     }
 
@@ -70,6 +67,8 @@ export function ensureKaomojiSearchProviderRegistered({ extensionUuid } = {}) {
         return KaomojiProvider.SEARCH_PROVIDER_ID;
     }
 
+    let kaomojiSearchRenderer = null;
+
     registerSearchProvider({
         id: KaomojiProvider.SEARCH_PROVIDER_ID,
         targetTabs: ['Kaomoji'],
@@ -78,19 +77,23 @@ export function ensureKaomojiSearchProviderRegistered({ extensionUuid } = {}) {
                 return [];
             }
 
+            if (!kaomojiSearchRenderer) {
+                kaomojiSearchRenderer = new KaomojiViewRenderer();
+            }
+
             const catalogItems = await loadKaomojiCatalog();
-            return catalogItems.filter((item) => _kaomojiSearchRenderer.searchFilter(item || {}, query));
+            return catalogItems.filter((item) => kaomojiSearchRenderer.searchFilter(item || {}, query));
         },
         applyToTab: async ({ tabActor, query }) => {
-            if (!tabActor || typeof tabActor.applyExternalSearch !== 'function') {
+            if (!tabActor) {
                 return false;
             }
 
             await tabActor.applyExternalSearch(query);
             return true;
         },
         clearOnTab: async ({ tabActor }) => {
-            if (!tabActor || typeof tabActor.clearExternalSearch !== 'function') {
+            if (!tabActor) {
                 return false;
             }
 
@@ -102,3 +105,16 @@ export function ensureKaomojiSearchProviderRegistered({ extensionUuid } = {}) {
     _isProviderRegistered = true;
     return KaomojiProvider.SEARCH_PROVIDER_ID;
 }
+
+/**
+ * Unregisters the Kaomoji provider and clears cached module state.
+ *
+ * @returns {void}
+ */
+export function resetKaomojiSearchProvider() {
+    unregisterSearchProvider(KaomojiProvider.SEARCH_PROVIDER_ID);
+    _kaomojiCatalogItems = null;
+    _kaomojiCatalogPromise = null;
+    _kaomojiExtensionUuid = 'KaomojiSearchProvider';
+    _isProviderRegistered = false;
+}

gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionClipboard.js

@@ -140,11 +140,8 @@ function createRecentlyUsedDefinitionClipboardInstance() {
             return true;
         }
 
-        try {
-            return ClipboardSearchUtils.isMatch(item, query);
-        } catch {
-            return typeof fallbackMatch === 'function' ? fallbackMatch(item) : false;
-        }
+        const fallback = fallbackMatch(item);
+        return ClipboardSearchUtils.isMatch(item, query) || fallback;
     };
 
     /**
@@ -191,4 +188,4 @@ function createRecentlyUsedDefinitionClipboardInstance() {
 /**
  * Section definition template for clipboard history items.
  */
-export const RecentlyUsedDefinitionClipboard = createRecentlyUsedDefinitionClipboardInstance();
+export const RecentlyUsedDefinitionClipboard = () => createRecentlyUsedDefinitionClipboardInstance();

gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionEmoji.js

@@ -9,15 +9,14 @@ import { EmojiProvider } from '../../Emoji/constants/emojiConstants.js';
 import { EmojiViewRenderer } from '../../Emoji/view/emojiViewRenderer.js';
 import { ensureEmojiSearchProviderRegistered } from '../../Emoji/integrations/emojiSearchProvider.js';
 
-const _emojiSearchRenderer = new EmojiViewRenderer(null);
-
 /**
  * Creates a runtime-scoped emoji section definition.
  *
  * @returns {object} Emoji section definition instance.
  */
 function createRecentlyUsedDefinitionEmojiInstance() {
     let recentManager = null;
+    let emojiSearchRenderer = null;
 
     const definition = {
         id: 'emoji',
@@ -49,11 +48,7 @@ function createRecentlyUsedDefinitionEmojiInstance() {
         ensureEmojiSearchProviderRegistered({ extensionUuid });
 
         if (recentManager) {
-            try {
-                recentManager.destroy();
-            } catch {
-                // Ignore stale manager teardown errors before re-init.
-            }
+            recentManager.destroy();
             recentManager = null;
         }
 
@@ -146,11 +141,12 @@ function createRecentlyUsedDefinitionEmojiInstance() {
             return true;
         }
 
-        try {
-            return _emojiSearchRenderer.searchFilter(item || {}, query);
-        } catch {
-            return typeof fallbackMatch === 'function' ? fallbackMatch(item) : false;
+        if (!emojiSearchRenderer) {
+            emojiSearchRenderer = new EmojiViewRenderer(null);
         }
+
+        const fallback = fallbackMatch(item);
+        return emojiSearchRenderer.searchFilter(item || {}, query) || fallback;
     };
 
     /**
@@ -183,4 +179,4 @@ function createRecentlyUsedDefinitionEmojiInstance() {
 /**
  * Section definition template for recently used emoji items.
  */
-export const RecentlyUsedDefinitionEmoji = createRecentlyUsedDefinitionEmojiInstance();
+export const RecentlyUsedDefinitionEmoji = () => createRecentlyUsedDefinitionEmojiInstance();