From d584c3bd23a12596bb15cf5b937475589da1ee68 Mon Sep 17 00:00:00 2001 From: Amp Date: Sun, 27 Sep 2026 09:10:41 +0000 Subject: [PATCH] refactor: load extensions from the bootstrap step, not extensionService extensionService imported extensions/core/index so loadExtensions could pull the core extensions in. Every core extension imports app, which imports extensionService, so the whole extensions/core tree and its UI sat in the same import cycle as the app object. loadExtensions and shouldLoadExtension move to src/services/extensionLoader.ts. GraphCanvas.vue, which already owns the bootstrap sequence and is outside the cycle, runs the extensions-load phase right before app.setup(). app.setup() no longer loads extensions. Ordering change: extensions now import before syncWorkflows() and fetchSubgraphs() instead of after. Extension hooks (init, setup, registerCustomNodes) still run inside app.setup() as before. browser_tests/types/globals.d.ts imports @/types explicitly: the browser typecheck only saw the app's Window augmentation through app -> extensionService -> extensions/core, and that path is gone. Cyclic modules 669 -> 580, largest cycle 465 -> 371. Amp-Thread-ID: https://ampcode.com/threads/T-01a0dcdd-4461-71d3-be73-0705e36d5297 --- browser_tests/types/globals.d.ts | 2 + src/components/graph/GraphCanvas.test.ts | 4 + src/components/graph/GraphCanvas.vue | 3 + src/components/graph/SelectionToolbox.test.ts | 2 - src/scripts/app.ts | 3 - ...ervice.test.ts => extensionLoader.test.ts} | 16 +-- src/services/extensionLoader.ts | 116 ++++++++++++++++++ src/services/extensionService.ts | 114 ----------------- 8 files changed, 133 insertions(+), 127 deletions(-) rename src/services/{extensionService.test.ts => extensionLoader.test.ts} (93%) create mode 100644 src/services/extensionLoader.ts diff --git a/browser_tests/types/globals.d.ts b/browser_tests/types/globals.d.ts index 581bb43fc4f..fd6cfd96ec0 100644 --- a/browser_tests/types/globals.d.ts +++ b/browser_tests/types/globals.d.ts @@ -1,3 +1,5 @@ +import '@/types' + import type { LGraph } from '@/lib/litegraph/src/LGraph' import type { LGraphBadge as LGraphBadgeClass } from '@/lib/litegraph/src/LGraphBadge' import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' diff --git a/src/components/graph/GraphCanvas.test.ts b/src/components/graph/GraphCanvas.test.ts index e697512b9eb..6bbc45a617b 100644 --- a/src/components/graph/GraphCanvas.test.ts +++ b/src/components/graph/GraphCanvas.test.ts @@ -105,6 +105,10 @@ vi.mock(import('@/scripts/changeTracker'), () => ({ ChangeTracker: { init: vi.fn() } })) +vi.mock(import('@/services/extensionLoader'), () => ({ + loadExtensions: vi.fn(async () => {}) +})) + vi.mock(import('@/services/useNewUserService'), () => ({ useNewUserService: () => ({ initializeIfNewUser: vi.fn(), diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue index 18eff150797..86e93bf194a 100644 --- a/src/components/graph/GraphCanvas.vue +++ b/src/components/graph/GraphCanvas.vue @@ -196,6 +196,7 @@ import { UnauthorizedError } from '@/scripts/api' import { app as comfyApp } from '@/scripts/app' import { ChangeTracker } from '@/scripts/changeTracker' import { IS_CONTROL_WIDGET, updateControlWidgetLabel } from '@/scripts/widgets' +import { loadExtensions } from '@/services/extensionLoader' import { useColorPaletteService } from '@/services/colorPaletteService' import { useNewUserService } from '@/services/useNewUserService' import { @@ -563,6 +564,8 @@ onMounted(async () => { ) } + await bootstrapTracer.settle('bootstrap/extensions-load', loadExtensions) + const canvas = canvasRef.value if (!canvas) throw new TypeError('GraphCanvas mounted without a canvas') await comfyApp.setup(canvas) diff --git a/src/components/graph/SelectionToolbox.test.ts b/src/components/graph/SelectionToolbox.test.ts index b9bb1f87bb7..9713b972558 100644 --- a/src/components/graph/SelectionToolbox.test.ts +++ b/src/components/graph/SelectionToolbox.test.ts @@ -19,7 +19,6 @@ import * as nodeFilterUtil from '@/utils/nodeFilterUtil' function createMockExtensionService(): ReturnType { return { extensionCommands: { value: new Map() }, - loadExtensions: vi.fn(), registerExtension: vi.fn(), invokeExtensions: vi.fn(() => []), invokeExtensionsAsync: vi.fn() @@ -409,7 +408,6 @@ describe('SelectionToolbox', () => { ['test-command', { id: 'test-command', title: 'Test Command' }] ]) }, - loadExtensions: vi.fn(), registerExtension: vi.fn(), invokeExtensions: vi.fn(() => ['test-command']), invokeExtensionsAsync: vi.fn() diff --git a/src/scripts/app.ts b/src/scripts/app.ts index cc901e3fdbf..0a75d6576fc 100644 --- a/src/scripts/app.ts +++ b/src/scripts/app.ts @@ -1003,9 +1003,6 @@ export class ComfyApp { await useWorkspaceStore().workflow.syncWorkflows() //Doesn't need to block. Blueprints will load async void useSubgraphStore().fetchSubgraphs() - await bootstrapTracer.settle('bootstrap/extensions-load', () => - useExtensionService().loadExtensions() - ) this.addProcessKeyHandler() this.addConfigureHandler() diff --git a/src/services/extensionService.test.ts b/src/services/extensionLoader.test.ts similarity index 93% rename from src/services/extensionService.test.ts rename to src/services/extensionLoader.test.ts index 6669ff64b31..d4db2eee340 100644 --- a/src/services/extensionService.test.ts +++ b/src/services/extensionLoader.test.ts @@ -3,12 +3,12 @@ import { assert, describe, expect, it, vi } from 'vitest' import { reportError } from '@/platform/telemetry/reportError' import { api } from '@/scripts/api' -import type { ExtensionLoadFailure } from './extensionService' +import type { ExtensionLoadFailure } from './extensionLoader' import { + loadExtensions, reportExtensionLoadFailures, - shouldLoadExtension, - useExtensionService -} from './extensionService' + shouldLoadExtension +} from './extensionLoader' vi.mock(import('@/platform/telemetry/reportError')) @@ -113,7 +113,7 @@ describe('extension loading', () => { '/extensions/pack-b/main.js' ]) - await useExtensionService().loadExtensions() + await loadExtensions() expect(reportError).toHaveBeenCalledOnce() const [cause, options] = vi.mocked(reportError).mock.calls[0] @@ -128,7 +128,7 @@ describe('extension loading', () => { it('stays silent when no custom extensions are listed', async () => { vi.spyOn(api, 'getExtensions').mockResolvedValue([]) - await useExtensionService().loadExtensions() + await loadExtensions() expect(reportError).not.toHaveBeenCalled() }) @@ -139,7 +139,7 @@ describe('extension loading', () => { '/extensions/pack-a/main.js' ]) - await useExtensionService().loadExtensions() + await loadExtensions() const [cause] = vi.mocked(reportError).mock.calls[0] assert(cause instanceof Error) @@ -154,7 +154,7 @@ describe('extension loading', () => { '/extensions/pack-a/main.js' ]) - await useExtensionService().loadExtensions() + await loadExtensions() expect(mark.mock.calls.map(([name]) => name)).toEqual([ 'bootstrap/extensions-load-core:start', diff --git a/src/services/extensionLoader.ts b/src/services/extensionLoader.ts new file mode 100644 index 00000000000..d82fd208994 --- /dev/null +++ b/src/services/extensionLoader.ts @@ -0,0 +1,116 @@ +import { useSettingStore } from '@/platform/settings/settingStore' +import { bootstrapTracer } from '@/platform/telemetry/perf/bootstrapTracer' +import { reportError } from '@/platform/telemetry/reportError' +import { api } from '@/scripts/api' +import { useExtensionStore } from '@/stores/extensionStore' +import { getErrorMessage } from '@/utils/errorUtil' + +const INLINED_CLOUD_EXTENSIONS = new Set([ + '/extensions/cloud/rum.js', + '/extensions/cloud/sentry.js' +]) + +export function shouldLoadExtension( + extension: string, + isCloudBuild: boolean +): boolean { + if (extension.includes('extensions/core')) return false + return !isCloudBuild || !INLINED_CLOUD_EXTENSIONS.has(extension) +} + +const MAX_NAMED_FAILED_EXTENSIONS = 10 + +export interface ExtensionLoadFailure { + ext: string + error: unknown +} + +/** + * Import one backend-provided extension, returning the failure rather than + * throwing, so one broken pack cannot abort the rest of the parallel load. + * + * Reporting deliberately does not happen here. A systemic failure — a backend + * restart, or a proxy serving HTML for every `.js` — fails every import in the + * list, and one report per extension is then unbounded. Off cloud that is + * actively harmful: with no sink live, each report is held in `reportError`'s + * 25-entry pending buffer, so a handful of broken packs during bootstrap would + * silently crowd out every later error in the session. The batch is reported + * once, by `reportExtensionLoadFailures`. + */ +async function importCustomExtension( + ext: string +): Promise { + try { + await import(/* @vite-ignore */ api.fileURL(ext)) + } catch (error) { + return { ext, error } + } +} + +/** + * The paths go in the message because `reportError` writes its console line + * from the error, not from `options.tags`. The count is tagged; backend paths + * are unbounded and belong in context instead of an indexed facet. + */ +export function reportExtensionLoadFailures( + failures: ExtensionLoadFailure[] +): void { + if (failures.length === 0) return + + const named = failures.slice(0, MAX_NAMED_FAILED_EXTENSIONS) + const elided = failures.length - named.length + const paths = named.map(({ ext }) => ext).join(', ') + const noun = failures.length === 1 ? 'extension' : 'extensions' + + reportError( + new Error( + `Error loading ${failures.length} ${noun}: ${paths}` + + (elided > 0 ? ` (+${elided} more)` : ''), + { cause: failures[0].error } + ), + { + errorType: 'error_loading_extension', + surface: 'platform', + level: 'warning', + tags: { failed_extension_count: failures.length }, + context: { + failures: named.map(({ ext, error }) => ({ + ext, + message: getErrorMessage(error) + })) + } + } + ) +} + +/** + * Loads the core extensions, then every extension served by the backend, in + * parallel. Core extensions load first because custom extensions may depend + * on them. + */ +export async function loadExtensions() { + const extensionStore = useExtensionStore() + extensionStore.loadDisabledExtensionNames( + useSettingStore().get('Comfy.Extension.Disabled') + ) + + const extensions = await api.getExtensions() + + await bootstrapTracer.settle( + 'bootstrap/extensions-load-core', + () => import('@/extensions/core/index') + ) + extensionStore.captureCoreExtensions() + const outcomes = await bootstrapTracer.settle( + 'bootstrap/extensions-load-custom', + () => + Promise.all( + extensions + .filter((extension) => + shouldLoadExtension(extension, __DISTRIBUTION__ === 'cloud') + ) + .map((ext) => importCustomExtension(ext)) + ) + ) + reportExtensionLoadFailures(outcomes.filter((outcome) => !!outcome)) +} diff --git a/src/services/extensionService.ts b/src/services/extensionService.ts index 5dcee47f02a..15d30e62f0f 100644 --- a/src/services/extensionService.ts +++ b/src/services/extensionService.ts @@ -2,9 +2,6 @@ import { useCurrentUser } from '@/composables/auth/useCurrentUser' import { useErrorHandling } from '@/composables/useErrorHandling' import { legacyMenuCompat } from '@/lib/litegraph/src/contextMenuCompat' import { useSettingStore } from '@/platform/settings/settingStore' -import { bootstrapTracer } from '@/platform/telemetry/perf/bootstrapTracer' -import { reportError } from '@/platform/telemetry/reportError' -import { api } from '@/scripts/api' import { useCommandStore } from '@/stores/commandStore' import { useExtensionStore } from '@/stores/extensionStore' import { KeybindingImpl } from '@/platform/keybindings/keybinding' @@ -14,88 +11,9 @@ import { useWidgetStore } from '@/stores/widgetStore' import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore' import type { ComfyExtension } from '@/types/comfy' import type { AuthUserInfo } from '@/types/authTypes' -import { getErrorMessage } from '@/utils/errorUtil' import { app } from '@/scripts/app' import type { ComfyApp } from '@/scripts/app' -const INLINED_CLOUD_EXTENSIONS = new Set([ - '/extensions/cloud/rum.js', - '/extensions/cloud/sentry.js' -]) - -export function shouldLoadExtension( - extension: string, - isCloudBuild: boolean -): boolean { - if (extension.includes('extensions/core')) return false - return !isCloudBuild || !INLINED_CLOUD_EXTENSIONS.has(extension) -} - -const MAX_NAMED_FAILED_EXTENSIONS = 10 - -export interface ExtensionLoadFailure { - ext: string - error: unknown -} - -/** - * Import one backend-provided extension, returning the failure rather than - * throwing, so one broken pack cannot abort the rest of the parallel load. - * - * Reporting deliberately does not happen here. A systemic failure — a backend - * restart, or a proxy serving HTML for every `.js` — fails every import in the - * list, and one report per extension is then unbounded. Off cloud that is - * actively harmful: with no sink live, each report is held in `reportError`'s - * 25-entry pending buffer, so a handful of broken packs during bootstrap would - * silently crowd out every later error in the session. The batch is reported - * once, by `reportExtensionLoadFailures`. - */ -async function importCustomExtension( - ext: string -): Promise { - try { - await import(/* @vite-ignore */ api.fileURL(ext)) - } catch (error) { - return { ext, error } - } -} - -/** - * The paths go in the message because `reportError` writes its console line - * from the error, not from `options.tags`. The count is tagged; backend paths - * are unbounded and belong in context instead of an indexed facet. - */ -export function reportExtensionLoadFailures( - failures: ExtensionLoadFailure[] -): void { - if (failures.length === 0) return - - const named = failures.slice(0, MAX_NAMED_FAILED_EXTENSIONS) - const elided = failures.length - named.length - const paths = named.map(({ ext }) => ext).join(', ') - const noun = failures.length === 1 ? 'extension' : 'extensions' - - reportError( - new Error( - `Error loading ${failures.length} ${noun}: ${paths}` + - (elided > 0 ? ` (+${elided} more)` : ''), - { cause: failures[0].error } - ), - { - errorType: 'error_loading_extension', - surface: 'platform', - level: 'warning', - tags: { failed_extension_count: failures.length }, - context: { - failures: named.map(({ ext, error }) => ({ - ext, - message: getErrorMessage(error) - })) - } - } - ) -} - export const useExtensionService = () => { const extensionStore = useExtensionStore() const settingStore = useSettingStore() @@ -106,37 +24,6 @@ export const useExtensionService = () => { toastErrorHandler } = useErrorHandling() - /** - * Loads all extensions from the API into the window in parallel - */ - const loadExtensions = async () => { - extensionStore.loadDisabledExtensionNames( - settingStore.get('Comfy.Extension.Disabled') - ) - - const extensions = await api.getExtensions() - - // Need to load core extensions first as some custom extensions - // may depend on them. - await bootstrapTracer.settle( - 'bootstrap/extensions-load-core', - () => import('../extensions/core/index') - ) - extensionStore.captureCoreExtensions() - const outcomes = await bootstrapTracer.settle( - 'bootstrap/extensions-load-custom', - () => - Promise.all( - extensions - .filter((extension) => - shouldLoadExtension(extension, __DISTRIBUTION__ === 'cloud') - ) - .map((ext) => importCustomExtension(ext)) - ) - ) - reportExtensionLoadFailures(outcomes.filter((outcome) => !!outcome)) - } - /** * Register an extension with the app * @param extension The extension to register @@ -320,7 +207,6 @@ export const useExtensionService = () => { } return { - loadExtensions, registerExtension, invokeExtensions, invokeExtensionsAsync