chore: bump blocksuite (#7075)

## Features
- toeverything/blocksuite#6937 @Flrande

## Bugfix
- toeverything/blocksuite#7137 @fundon
- toeverything/blocksuite#7126 @golok727
- toeverything/blocksuite#7128 @CatsJuice
- toeverything/blocksuite#7130 @fundon

## Refactor

## Misc
- toeverything/blocksuite#7131 @fundon

## Additional changes

Adjust the awareness provider so that it only obtains awareness instances when connect, and fixes the dependencies between workspace components.

packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts

@@ -18,7 +18,6 @@ import {
   onComplete,
   OnEvent,
   onStart,
-  type Workspace,
   type WorkspaceEngineProvider,
   type WorkspaceFlavourProvider,
   type WorkspaceMetadata,
@@ -96,7 +95,9 @@ export class CloudWorkspaceFlavourProviderService
       id: tempId,
       idGenerator: () => nanoid(),
       schema: globalBlockSuiteSchema,
-      blobStorages: [() => ({ crud: blobStorage })],
+      blobSources: {
+        main: blobStorage,
+      },
     });
 
     // apply initial state
@@ -223,35 +224,31 @@ export class CloudWorkspaceFlavourProviderService
     const cloudBlob = new CloudBlobStorage(id);
     return await cloudBlob.get(blob);
   }
-  getEngineProvider(workspace: Workspace): WorkspaceEngineProvider {
+  getEngineProvider(workspaceId: string): WorkspaceEngineProvider {
     return {
       getAwarenessConnections: () => {
         return [
-          new BroadcastChannelAwarenessConnection(
-            workspace.id,
-            workspace.awareness
-          ),
+          new BroadcastChannelAwarenessConnection(workspaceId),
           new CloudAwarenessConnection(
-            workspace.id,
-            workspace.awareness,
+            workspaceId,
             this.webSocketService.newSocket()
           ),
         ];
       },
       getDocServer: () => {
         return new CloudDocEngineServer(
-          workspace.id,
+          workspaceId,
           this.webSocketService.newSocket()
         );
       },
       getDocStorage: () => {
-        return this.storageProvider.getDocStorage(workspace.id);
+        return this.storageProvider.getDocStorage(workspaceId);
       },
       getLocalBlobStorage: () => {
-        return this.storageProvider.getBlobStorage(workspace.id);
+        return this.storageProvider.getBlobStorage(workspaceId);
       },
       getRemoteBlobStorages() {
-        return [new CloudBlobStorage(workspace.id)];
+        return [new CloudBlobStorage(workspaceId)];
       },
     };
   }

packages/frontend/core/src/modules/workspace-engine/impls/engine/awareness-broadcast-channel.ts

@@ -15,34 +15,32 @@ export class BroadcastChannelAwarenessConnection
   implements AwarenessConnection
 {
   channel: BroadcastChannel | null = null;
+  awareness: Awareness | null = null;
 
-  constructor(
-    private readonly workspaceId: string,
-    private readonly awareness: Awareness
-  ) {}
+  constructor(private readonly workspaceId: string) {}
 
-  connect(): void {
+  connect(awareness: Awareness): void {
+    this.awareness = awareness;
     this.channel = new BroadcastChannel('awareness:' + this.workspaceId);
     this.channel.postMessage({
       type: 'connect',
     } satisfies ChannelMessage);
-    this.awareness.on('update', (changes: AwarenessChanges, origin: unknown) =>
-      this.handleAwarenessUpdate(changes, origin)
-    );
-    this.channel.addEventListener(
-      'message',
-      (event: MessageEvent<ChannelMessage>) => {
-        this.handleChannelMessage(event);
-      }
-    );
+    this.awareness.on('update', this.handleAwarenessUpdate);
+    this.channel.addEventListener('message', this.handleChannelMessage);
   }
 
   disconnect(): void {
     this.channel?.close();
     this.channel = null;
+    this.awareness?.off('update', this.handleAwarenessUpdate);
+    this.awareness = null;
   }
 
-  handleAwarenessUpdate(changes: AwarenessChanges, origin: unknown) {
+  handleAwarenessUpdate = (changes: AwarenessChanges, origin: unknown) => {
+    if (this.awareness === null) {
+      return;
+    }
+
     if (origin === 'remote') {
       return;
     }
@@ -56,9 +54,13 @@ export class BroadcastChannelAwarenessConnection
       type: 'update',
       update: update,
     } satisfies ChannelMessage);
-  }
+  };
+
+  handleChannelMessage = (event: MessageEvent<ChannelMessage>) => {
+    if (this.awareness === null) {
+      return;
+    }
 
-  handleChannelMessage(event: MessageEvent<ChannelMessage>) {
     if (event.data.type === 'update') {
       const update = event.data.update;
       applyAwarenessUpdate(this.awareness, update, 'remote');
@@ -71,5 +73,5 @@ export class BroadcastChannelAwarenessConnection
         ]),
       } satisfies ChannelMessage);
     }
-  }
+  };
 }

packages/frontend/core/src/modules/workspace-engine/impls/engine/awareness-cloud.ts

@@ -15,23 +15,25 @@ const logger = new DebugLogger('affine:awareness:socketio');
 type AwarenessChanges = Record<'added' | 'updated' | 'removed', number[]>;
 
 export class CloudAwarenessConnection implements AwarenessConnection {
+  awareness: Awareness | null = null;
+
   constructor(
     private readonly workspaceId: string,
-    private readonly awareness: Awareness,
     private readonly socket: Socket
   ) {}
 
-  connect(): void {
+  connect(awareness: Awareness): void {
     this.socket.on('server-awareness-broadcast', this.awarenessBroadcast);
     this.socket.on(
       'new-client-awareness-init',
       this.newClientAwarenessInitHandler
     );
+    this.awareness = awareness;
     this.awareness.on('update', this.awarenessUpdate);
 
     window.addEventListener('beforeunload', this.windowBeforeUnloadHandler);
 
-    this.socket.on('connect', () => this.handleConnect());
+    this.socket.on('connect', this.handleConnect);
     this.socket.on('server-version-rejected', this.handleReject);
 
     if (this.socket.connected) {
@@ -42,12 +44,16 @@ export class CloudAwarenessConnection implements AwarenessConnection {
   }
 
   disconnect(): void {
-    removeAwarenessStates(
-      this.awareness,
-      [this.awareness.clientID],
-      'disconnect'
-    );
-    this.awareness.off('update', this.awarenessUpdate);
+    if (this.awareness) {
+      removeAwarenessStates(
+        this.awareness,
+        [this.awareness.clientID],
+        'disconnect'
+      );
+      this.awareness.off('update', this.awarenessUpdate);
+    }
+    this.awareness = null;
+
     this.socket.emit('client-leave-awareness', this.workspaceId);
     this.socket.off('server-awareness-broadcast', this.awarenessBroadcast);
     this.socket.off(
@@ -66,6 +72,9 @@ export class CloudAwarenessConnection implements AwarenessConnection {
     workspaceId: string;
     awarenessUpdate: string;
   }) => {
+    if (!this.awareness) {
+      return;
+    }
     if (wsId !== this.workspaceId) {
       return;
     }
@@ -77,6 +86,10 @@ export class CloudAwarenessConnection implements AwarenessConnection {
   };
 
   awarenessUpdate = (changes: AwarenessChanges, origin: unknown) => {
+    if (!this.awareness) {
+      return;
+    }
+
     if (origin === 'remote') {
       return;
     }
@@ -97,6 +110,10 @@ export class CloudAwarenessConnection implements AwarenessConnection {
   };
 
   newClientAwarenessInitHandler = () => {
+    if (!this.awareness) {
+      return;
+    }
+
     const awarenessUpdate = encodeAwarenessUpdate(this.awareness, [
       this.awareness.clientID,
     ]);
@@ -111,6 +128,10 @@ export class CloudAwarenessConnection implements AwarenessConnection {
   };
 
   windowBeforeUnloadHandler = () => {
+    if (!this.awareness) {
+      return;
+    }
+
     removeAwarenessStates(
       this.awareness,
       [this.awareness.clientID],

packages/frontend/core/src/modules/workspace-engine/impls/local.ts

@@ -3,7 +3,6 @@ import { WorkspaceFlavour } from '@affine/env/workspace';
 import { DocCollection } from '@blocksuite/store';
 import type {
   BlobStorage,
-  Workspace,
   WorkspaceEngineProvider,
   WorkspaceFlavourProvider,
   WorkspaceMetadata,
@@ -68,7 +67,7 @@ export class LocalWorkspaceFlavourProvider
       id: id,
       idGenerator: () => nanoid(),
       schema: globalBlockSuiteSchema,
-      blobStorages: [() => ({ crud: blobStorage })],
+      blobSources: { main: blobStorage },
     });
 
     // apply initial state
@@ -153,24 +152,19 @@ export class LocalWorkspaceFlavourProvider
     return this.storageProvider.getBlobStorage(id).get(blob);
   }
 
-  getEngineProvider(workspace: Workspace): WorkspaceEngineProvider {
+  getEngineProvider(workspaceId: string): WorkspaceEngineProvider {
     return {
       getAwarenessConnections() {
-        return [
-          new BroadcastChannelAwarenessConnection(
-            workspace.id,
-            workspace.awareness
-          ),
-        ];
+        return [new BroadcastChannelAwarenessConnection(workspaceId)];
       },
       getDocServer() {
         return null;
       },
       getDocStorage: () => {
-        return this.storageProvider.getDocStorage(workspace.id);
+        return this.storageProvider.getDocStorage(workspaceId);
       },
       getLocalBlobStorage: () => {
-        return this.storageProvider.getBlobStorage(workspace.id);
+        return this.storageProvider.getBlobStorage(workspaceId);
       },
       getRemoteBlobStorages() {
         return [];