opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-02 23:28:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix imported updates also broadcast to other clients

Browse Source
This commit is contained in:
hjlarry 2025-08-05 10:21:22 +08:00
parent 9455476705
commit 2395d4be26
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/controllers/console/app/online_user.py
View File

@ -140,10 +140,10 @@ def handle_collaboration_event(sid, data):
return {"msg": "event_broadcasted"} return {"msg": "event_broadcasted"}
@sio.on("graph_update") @sio.on("graph_event")
def handle_graph_update(sid, data): def handle_graph_event(sid, data):
""" """
Handle graph updates - simple broadcast relay. Handle graph events - simple broadcast relay.
""" """
mapping = redis_client.get(f"ws_sid_map:{sid}") mapping = redis_client.get(f"ws_sid_map:{sid}")

20
web/app/components/workflow/collaboration/manage.ts
View File

@ -1,13 +1,13 @@
import { LoroDoc } from 'loro-crdt' import { LoroDoc } from 'loro-crdt'
import { isEqual } from 'lodash-es' import { isEqual } from 'lodash-es'
import { useWebSocketStore } from '../store/websocket-store' import { type WebSocketInstance, useWebSocketStore } from '../store/websocket-store'
import type { Edge, Node } from '../types' import type { Edge, Node } from '../types'
class LoroSocketIOProvider { class LoroSocketIOProvider {
private doc: any private doc: LoroDoc
private socket: any private socket: WebSocketInstance
constructor(socket: any, doc: any) { constructor(socket: WebSocketInstance, doc: LoroDoc) {
this.socket = socket this.socket = socket
this.doc = doc this.doc = doc
this.setupEventListeners() this.setupEventListeners()
@ -15,9 +15,9 @@ class LoroSocketIOProvider {
private setupEventListeners() { private setupEventListeners() {
this.doc.subscribe((event: any) => { this.doc.subscribe((event: any) => {
if (event.origin !== 'remote') { if (event.by === 'local') {
const update = this.doc.export({ mode: 'update' }) const update = this.doc.export({ mode: 'update' })
this.socket.emit('graph_update', update) this.socket.emit('graph_event', update)
} }
}) })
@ -59,9 +59,9 @@ class CollaborationManager {
console.log('nodesMap', event) console.log('nodesMap', event)
if (event.by === 'import') { if (event.by === 'import') {
requestAnimationFrame(() => { requestAnimationFrame(() => {
const { setNodes } = reactFlowStore.getState() const { setNodes: reactFlowSetNodes } = reactFlowStore.getState()
const updatedNodes = Array.from(this.nodesMap.values()) const updatedNodes = Array.from(this.nodesMap.values())
setNodes(updatedNodes) reactFlowSetNodes(updatedNodes)
}) })
} }
}) })
@ -69,9 +69,9 @@ class CollaborationManager {
this.edgesMap?.subscribe((event: any) => { this.edgesMap?.subscribe((event: any) => {
if (event.by === 'import') { if (event.by === 'import') {
requestAnimationFrame(() => { requestAnimationFrame(() => {
const { setEdges } = reactFlowStore.getState() const { setEdges: reactFlowSetEdges } = reactFlowStore.getState()
const updatedEdges = Array.from(this.edgesMap.values()) const updatedEdges = Array.from(this.edgesMap.values())
setEdges(updatedEdges) reactFlowSetEdges(updatedEdges)
}) })
} }
}) })

4
web/app/components/workflow/store/websocket-store.ts
View File

@ -1,7 +1,7 @@
import { create } from 'zustand' import { create } from 'zustand'
import { connectOnlineUserWebSocket } from '@/service/demo/online-user' import { connectOnlineUserWebSocket } from '@/service/demo/online-user'
type WebSocketInstance = ReturnType<typeof connectOnlineUserWebSocket> export type WebSocketInstance = ReturnType<typeof connectOnlineUserWebSocket>
type WebSocketStore = { type WebSocketStore = {
socket: WebSocketInstance | null socket: WebSocketInstance | null
@ -35,7 +35,7 @@ export const useWebSocketStore = create<WebSocketStore>((set, get) => ({
try { try {
handler(update) handler(update)
} }
catch (error) { catch (error) {
console.error(`Error in collaboration event handler for ${update.type}:`, error) console.error(`Error in collaboration event handler for ${update.type}:`, error)
} }
}) })