Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(workflow): fall back when default socket is unavailable (#40191)

非法操作3f89a3c742e1
diff --git a/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.socket-and-subscriptions.spec.ts b/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.socket-and-subscriptions.spec.ts
index e4303aadbea..7ae9f4fa7d5 100644
--- a/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.socket-and-subscriptions.spec.ts
+++ b/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.socket-and-subscriptions.spec.ts
@@ -12,9 +12,11 @@ import type { Edge, Node } from '@/app/components/workflow/types'
import { LoroDoc, LoroMap } from 'loro-crdt'
import { BlockEnum } from '@/app/components/workflow/types'
import { CollaborationManager } from '../collaboration-manager'
-import { webSocketClient } from '../websocket-manager'
+import * as websocketManager from '../websocket-manager'
import { attachCrdtRuntime } from './test-crdt-runtime'
+const { webSocketClient } = websocketManager
+
type ReactFlowStore = {
getState: () => {
getNodes: () => Node[]
@@ -180,6 +182,108 @@ describe('CollaborationManager socket and subscription behavior', () => {
expect(manager.canUseLocalDraftFallback()).toBe(false)
})
+ it('switches to local editing and stops reconnecting when the initial connection fails', async () => {
+ vi.spyOn(websocketManager, 'isDefaultSocketUrl').mockReturnValueOnce(true)
+ const manager = new CollaborationManager()
+ attachCrdtRuntime(manager)
+ const socket = createMockSocket('socket-initial-failure')
+ socket.connected = false
+ const reactFlowStore: ReactFlowStore = {
+ getState: () => ({
+ getNodes: () => [],
+ setNodes: vi.fn(),
+ getEdges: () => [],
+ setEdges: vi.fn(),
+ }),
+ }
+ const connectSpy = vi
+ .spyOn(webSocketClient, 'connect')
+ .mockReturnValue(socket as unknown as Socket)
+ vi.spyOn(webSocketClient, 'getSocket').mockReturnValue(socket as unknown as Socket)
+ vi.spyOn(webSocketClient, 'isConnected').mockReturnValue(false)
+ const disconnectSpy = vi
+ .spyOn(webSocketClient, 'disconnect')
+ .mockImplementation(() => undefined)
+
+ const connectionId = await manager.connect('app-initial-failure', reactFlowStore)
+ const graphReadyStates: boolean[] = []
+ manager.onGraphReadyChange((isReady) => graphReadyStates.push(isReady))
+
+ expect(manager.canPersistLocalGraph()).toBe(false)
+ expect(graphReadyStates.at(-1)).toBe(false)
+
+ socket.trigger('connect_error', new Error('connect failed'))
+
+ expect(manager.canApplyLocalGraphMutation()).toBe(true)
+ expect(manager.canPersistLocalGraph()).toBe(true)
+ expect(disconnectSpy).toHaveBeenCalledWith('app-initial-failure')
+ expect(graphReadyStates.at(-1)).toBe(true)
+
+ const secondConnectionId = await manager.connect('app-initial-failure', reactFlowStore)
+ expect(connectSpy).toHaveBeenCalledTimes(1)
+
+ manager.disconnect(connectionId)
+ manager.disconnect(secondConnectionId)
+ expect(manager.canPersistLocalGraph()).toBe(false)
+ })
+
+ it('keeps editing blocked when a configured socket URL fails to connect', () => {
+ vi.spyOn(websocketManager, 'isDefaultSocketUrl')
+ .mockReturnValueOnce(false)
+ .mockReturnValueOnce(false)
+ const manager = new CollaborationManager()
+ attachCrdtRuntime(manager)
+ const internals = getManagerInternals(manager)
+ const socket = createMockSocket('socket-configured-failure')
+ socket.connected = false
+ internals.currentAppId = 'app-configured-failure'
+ vi.spyOn(webSocketClient, 'getSocket').mockReturnValue(socket as unknown as Socket)
+ vi.spyOn(webSocketClient, 'isConnected').mockReturnValue(false)
+ const disconnectSpy = vi.spyOn(webSocketClient, 'disconnect')
+ internals.setupSocketEventListeners(socket as unknown as Socket)
+
+ socket.trigger('connect_error', new Error('connect failed'))
+
+ expect(manager.canUseLocalDraftFallback()).toBe(false)
+ expect(manager.canApplyLocalGraphMutation()).toBe(false)
+ expect(manager.canPersistLocalGraph()).toBe(false)
+ expect(disconnectSpy).not.toHaveBeenCalled()
+ })
+
+ it('keeps editing blocked when a previously established connection fails', async () => {
+ const manager = new CollaborationManager()
+ attachCrdtRuntime(manager)
+ const socket = createMockSocket('socket-established-failure')
+ const reactFlowStore: ReactFlowStore = {
+ getState: () => ({
+ getNodes: () => [],
+ setNodes: vi.fn(),
+ getEdges: () => [],
+ setEdges: vi.fn(),
+ }),
+ }
+ vi.spyOn(webSocketClient, 'connect').mockReturnValue(socket as unknown as Socket)
+ vi.spyOn(webSocketClient, 'getSocket').mockReturnValue(socket as unknown as Socket)
+ vi.spyOn(webSocketClient, 'isConnected').mockImplementation(() => socket.connected)
+ const disconnectSpy = vi
+ .spyOn(webSocketClient, 'disconnect')
+ .mockImplementation(() => undefined)
+
+ const connectionId = await manager.connect('app-established-failure', reactFlowStore)
+ socket.trigger('status', { isLeader: true })
+ expect(manager.canApplyLocalGraphMutation()).toBe(true)
+
+ socket.connected = false
+ socket.trigger('disconnect', 'transport close')
+ socket.trigger('connect_error', new Error('reconnect failed'))
+
+ expect(manager.canApplyLocalGraphMutation()).toBe(false)
+ expect(manager.canPersistLocalGraph()).toBe(false)
+ expect(disconnectSpy).not.toHaveBeenCalled()
+
+ manager.disconnect(connectionId)
+ })
+
it('emits cursor/sync/workflow events via collaboration_event when connected', async () => {
const { manager, internals } = setupManagerWithDoc()
const socket = createMockSocket('socket-connected')
diff --git a/web/app/components/workflow/collaboration/core/__tests__/websocket-manager.test.ts b/web/app/components/workflow/collaboration/core/__tests__/websocket-manager.test.ts
index f01650f5035..54e03a34dcf 100644
--- a/web/app/components/workflow/collaboration/core/__tests__/websocket-manager.test.ts
+++ b/web/app/components/workflow/collaboration/core/__tests__/websocket-manager.test.ts
@@ -47,6 +47,14 @@ describe('WebSocketClient', () => {
ioMock.mockReset()
})
+ it('identifies the built-in socket URLs', async () => {
+ const { isDefaultSocketUrl } = await import('../websocket-manager')
+
+ expect(isDefaultSocketUrl('ws://localhost')).toBe(true)
+ expect(isDefaultSocketUrl('ws://localhost:5001')).toBe(true)
+ expect(isDefaultSocketUrl('wss://collaboration.example.com')).toBe(false)
+ })
+
it('connects with default url and registers base listeners', async () => {
const mockSocket = createMockSocket('socket-fallback')
ioMock.mockImplementation(() => mockSocket)
diff --git a/web/app/components/workflow/collaboration/core/collaboration-manager.ts b/web/app/components/workflow/collaboration/core/collaboration-manager.ts
index e986c22180a..6323fc4e559 100644
--- a/web/app/components/workflow/collaboration/core/collaboration-manager.ts
+++ b/web/app/components/workflow/collaboration/core/collaboration-manager.ts
@@ -21,7 +21,7 @@ import type { CRDTProvider } from './crdt-provider'
import { cloneDeep } from 'es-toolkit/object'
import { isEqual } from 'es-toolkit/predicate'
import { EventEmitter } from './event-emitter'
-import { emitWithAuthGuard, webSocketClient } from './websocket-manager'
+import { emitWithAuthGuard, isDefaultSocketUrl, webSocketClient } from './websocket-manager'
type CrdtRuntime = (typeof import('./crdt-runtime'))['crdtRuntime']
@@ -185,6 +185,7 @@ export class CollaborationManager {
private visibilityListenerAttached = false
private crdtTrusted = false
private hasEstablishedConnection = false
+ private localDraftFallbackActive = false
private rebuildCrdtOnNextConnect = false
private reconnectedWithFreshDoc = false
private awaitingSnapshotImport = false
@@ -729,6 +730,7 @@ export class CollaborationManager {
private forceDisconnect = ({
preserveConnectIntent = false,
}: { preserveConnectIntent?: boolean } = {}): void => {
+ this.localDraftFallbackActive = false
if (this.currentAppId) webSocketClient.disconnect(this.currentAppId)
this.clearInitialSyncRetry()
@@ -782,7 +784,10 @@ export class CollaborationManager {
canUseLocalDraftFallback(): boolean {
// A graph from a previously connected session must recover through collaboration before saving.
- return !this.isConnected() && !this.hasEstablishedConnection
+ return (
+ this.localDraftFallbackActive ||
+ (isDefaultSocketUrl() && !this.isConnected() && !this.hasEstablishedConnection)
+ )
}
getNodes(): Node[] {
@@ -799,14 +804,30 @@ export class CollaborationManager {
}
canPersistLocalGraph(): boolean {
+ if (this.localDraftFallbackActive) return true
return this.crdtTrusted && !this.graphReloadRequired && this.graphViewActive !== false
}
canApplyLocalGraphMutation(): boolean {
- if (!this.currentAppId) return true
+ if (this.localDraftFallbackActive || !this.currentAppId) return true
return this.canPersistLocalGraph() && this.getActiveSocket()?.connected === true
}
+ private activateLocalDraftFallback(socket: Socket): void {
+ // Before the first connection, ReactFlow still holds the HTTP draft baseline. Once a
+ // collaboration session has existed, that graph may be stale and must recover through CRDT.
+ if (!isDefaultSocketUrl() || this.localDraftFallbackActive || this.hasEstablishedConnection)
+ return
+ if (this.getActiveSocket() !== socket || !this.currentAppId) return
+
+ const appId = this.currentAppId
+ this.localDraftFallbackActive = true
+ this.clearInitialSyncRetry()
+ this.pendingInitialSync = false
+ webSocketClient.disconnect(appId)
+ this.emitGraphReadyState()
+ }
+
private emitGraphReadyState(): void {
this.eventEmitter.emit('graphReadyChange', this.canApplyLocalGraphMutation())
}
@@ -1932,6 +1953,7 @@ export class CollaborationManager {
socket.on('connect_error', (error: Error) => {
console.error('WebSocket connection error:', error)
+ this.activateLocalDraftFallback(socket)
this.eventEmitter.emit('stateChange', { isConnected: false, error: error.message })
})
diff --git a/web/app/components/workflow/collaboration/core/websocket-manager.ts b/web/app/components/workflow/collaboration/core/websocket-manager.ts
index b7c68a94361..918aa22c26d 100644
--- a/web/app/components/workflow/collaboration/core/websocket-manager.ts
+++ b/web/app/components/workflow/collaboration/core/websocket-manager.ts
@@ -5,6 +5,9 @@ import { SOCKET_URL } from '@/config'
type AckArgs = unknown[]
+export const isDefaultSocketUrl = (socketUrl = SOCKET_URL) =>
+ socketUrl === 'ws://localhost' || socketUrl === 'ws://localhost:5001'
+
const isUnauthorizedAck = (...ackArgs: AckArgs): boolean => {
const [first, second] = ackArgs