refactor: workspace provider (#2218)

apps/web/src/blocksuite/__tests__/index.spec.ts

@@ -1,30 +0,0 @@
-/**
- * @vitest-environment happy-dom
- */
-import 'fake-indexeddb/auto';
-
-import { beforeEach, describe, expect, test } from 'vitest';
-
-import { BlockSuiteWorkspace } from '../../shared';
-import { createAffineProviders, createLocalProviders } from '..';
-
-let blockSuiteWorkspace: BlockSuiteWorkspace;
-
-beforeEach(() => {
-  blockSuiteWorkspace = new BlockSuiteWorkspace({ id: 'test' });
-});
-
-describe('blocksuite providers', () => {
-  test('should be valid provider', () => {
-    [createLocalProviders, createAffineProviders].forEach(createProviders => {
-      createProviders(blockSuiteWorkspace).forEach(provider => {
-        expect(provider).toBeTypeOf('object');
-        expect(provider).toHaveProperty('flavour');
-        expect(provider).toHaveProperty('connect');
-        expect(provider.connect).toBeTypeOf('function');
-        expect(provider).toHaveProperty('disconnect');
-        expect(provider.disconnect).toBeTypeOf('function');
-      });
-    });
-  });
-});

apps/web/src/blocksuite/index.ts

@@ -1,13 +1,15 @@
 import { config } from '@affine/env';
 import {
-  createIndexedDBProvider,
+  createIndexedDBDownloadProvider,
   createLocalProviders,
 } from '@affine/workspace/providers';
-import { createBroadCastChannelProvider } from '@affine/workspace/providers';
+import {
+  createAffineWebSocketProvider,
+  createBroadCastChannelProvider,
+} from '@affine/workspace/providers';
 import type { Provider } from '@affine/workspace/type';
 
 import type { BlockSuiteWorkspace } from '../shared';
-import { createAffineWebSocketProvider } from './providers';
 import { createAffineDownloadProvider } from './providers/affine';
 
 export const createAffineProviders = (
@@ -19,7 +21,7 @@ export const createAffineProviders = (
       createAffineWebSocketProvider(blockSuiteWorkspace),
       config.enableBroadCastChannelProvider &&
         createBroadCastChannelProvider(blockSuiteWorkspace),
-      createIndexedDBProvider(blockSuiteWorkspace),
+      createIndexedDBDownloadProvider(blockSuiteWorkspace),
     ] as any[]
   ).filter(v => Boolean(v));
 };

apps/web/src/blocksuite/providers/affine/index.ts

@@ -12,9 +12,15 @@ export const createAffineDownloadProvider = (
 ): AffineDownloadProvider => {
   assertExists(blockSuiteWorkspace.id);
   const id = blockSuiteWorkspace.id;
+  let connected = false;
+  const callbacks = new Set<() => void>();
   return {
     flavour: 'affine-download',
     background: true,
+    get connected() {
+      return connected;
+    },
+    callbacks,
     connect: () => {
       providerLogger.info('connect download provider', id);
       if (hashMap.has(id)) {
@@ -23,6 +29,7 @@ export const createAffineDownloadProvider = (
           blockSuiteWorkspace.doc,
           new Uint8Array(hashMap.get(id) as ArrayBuffer)
         );
+        connected = true;
         return;
       }
       affineApis
@@ -41,6 +48,7 @@ export const createAffineDownloadProvider = (
     },
     disconnect: () => {
       providerLogger.info('disconnect download provider', id);
+      connected = false;
     },
     cleanup: () => {
       hashMap.delete(id);

apps/web/src/blocksuite/providers/index.ts

@@ -1,48 +0,0 @@
-import { websocketPrefixUrl } from '@affine/env';
-import { KeckProvider } from '@affine/workspace/affine/keck';
-import { getLoginStorage } from '@affine/workspace/affine/login';
-import type { AffineWebSocketProvider } from '@affine/workspace/type';
-import { assertExists } from '@blocksuite/store';
-
-import type { BlockSuiteWorkspace } from '../../shared';
-import { providerLogger } from '../logger';
-
-const createAffineWebSocketProvider = (
-  blockSuiteWorkspace: BlockSuiteWorkspace
-): AffineWebSocketProvider => {
-  let webSocketProvider: KeckProvider | null = null;
-  return {
-    flavour: 'affine-websocket',
-    background: false,
-    cleanup: () => {
-      assertExists(webSocketProvider);
-      webSocketProvider.destroy();
-      webSocketProvider = null;
-    },
-    connect: () => {
-      webSocketProvider = new KeckProvider(
-        websocketPrefixUrl + '/api/sync/',
-        blockSuiteWorkspace.id,
-        blockSuiteWorkspace.doc,
-        {
-          params: { token: getLoginStorage()?.token ?? '' },
-          awareness: blockSuiteWorkspace.awarenessStore.awareness,
-          // we maintain broadcast channel by ourselves
-          // @ts-expect-error
-          disableBc: true,
-          connect: false,
-        }
-      );
-      providerLogger.info('connect', webSocketProvider.url);
-      webSocketProvider.connect();
-    },
-    disconnect: () => {
-      assertExists(webSocketProvider);
-      providerLogger.info('disconnect', webSocketProvider.url);
-      webSocketProvider.destroy();
-      webSocketProvider = null;
-    },
-  };
-};
-
-export { createAffineWebSocketProvider };