From 8d8bd49600871ac4127364e1d9a6a17c8f491dfe Mon Sep 17 00:00:00 2001 From: EYHN Date: Wed, 8 May 2024 09:06:33 +0000 Subject: [PATCH] chore(infra): remove compatible code (#6833) --- packages/common/infra/src/sync/doc/event.ts | 5 --- packages/common/infra/src/sync/doc/local.ts | 7 ---- .../impls/engine/doc-broadcast-channel.ts | 41 +------------------ 3 files changed, 1 insertion(+), 52 deletions(-) diff --git a/packages/common/infra/src/sync/doc/event.ts b/packages/common/infra/src/sync/doc/event.ts index 4dc5bac43..d8e77209d 100644 --- a/packages/common/infra/src/sync/doc/event.ts +++ b/packages/common/infra/src/sync/doc/event.ts @@ -11,11 +11,6 @@ export type DocEvent = docId: string; update: Uint8Array; clientId: string; - } - | { - type: 'LegacyClientUpdateCommitted'; - docId: string; - update: Uint8Array; }; export interface DocEventBus { diff --git a/packages/common/infra/src/sync/doc/local.ts b/packages/common/infra/src/sync/doc/local.ts index 7eea53c7c..560587db7 100644 --- a/packages/common/infra/src/sync/doc/local.ts +++ b/packages/common/infra/src/sync/doc/local.ts @@ -254,13 +254,6 @@ export class DocEngineLocalPart { }); } }, - LegacyClientUpdateCommitted: ({ docId, update }) => { - this.schedule({ - type: 'save', - docId, - update, - }); - }, }; handleDocUpdate = (update: Uint8Array, origin: any, doc: YDoc) => { diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/engine/doc-broadcast-channel.ts b/packages/frontend/core/src/modules/workspace-engine/impls/engine/doc-broadcast-channel.ts index e04a9d9f3..5f8c43e0e 100644 --- a/packages/frontend/core/src/modules/workspace-engine/impls/engine/doc-broadcast-channel.ts +++ b/packages/frontend/core/src/modules/workspace-engine/impls/engine/doc-broadcast-channel.ts @@ -1,48 +1,9 @@ import type { DocEvent, DocEventBus } from '@toeverything/infra'; -type LegacyChannelMessage = { - type: 'db-updated'; - payload: { - docId: string; - update: Uint8Array; - }; - __from_new_doc_engine?: boolean; -}; - export class BroadcastChannelDocEventBus implements DocEventBus { - legacyChannel = new BroadcastChannel('indexeddb:' + this.workspaceId); senderChannel = new BroadcastChannel('doc:' + this.workspaceId); - constructor(private readonly workspaceId: string) { - this.legacyChannel.addEventListener( - 'message', - (event: MessageEvent) => { - if (event.data.__from_new_doc_engine) { - return; - } - if (event.data.type === 'db-updated') { - this.emit({ - type: 'LegacyClientUpdateCommitted', - docId: event.data.payload.docId, - update: event.data.payload.update, - }); - } - } - ); - } + constructor(private readonly workspaceId: string) {} emit(event: DocEvent): void { - if ( - event.type === 'ClientUpdateCommitted' || - event.type === 'ServerUpdateCommitted' - ) { - this.legacyChannel.postMessage({ - type: 'db-updated', - payload: { - docId: event.docId, - update: event.update, - }, - __from_new_doc_engine: true, - } satisfies LegacyChannelMessage); - } this.senderChannel.postMessage(event); }