refactor: move affine utils into @affine/workspace (#2611)

apps/web/src/adapters/affine/fetcher.ts

@@ -1,13 +1,13 @@
 import { Unreachable } from '@affine/env/constant';
+import { affineApis } from '@affine/workspace/affine/shared';
 import { rootStore } from '@affine/workspace/atom';
+import { createAffineProviders } from '@affine/workspace/providers';
 import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
 import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { assertExists } from '@blocksuite/store';
 
 import { workspacesAtom } from '../../atoms';
-import { createAffineProviders } from '../../blocksuite';
-import { affineApis } from '../../shared/apis';
 
 type Query = (typeof QueryKey)[keyof typeof QueryKey];
 

apps/web/src/adapters/affine/index.tsx

@@ -14,8 +14,13 @@ import {
   setLoginStorage,
   SignMethod,
 } from '@affine/workspace/affine/login';
+import { affineApis, affineAuth } from '@affine/workspace/affine/shared';
 import { rootStore, rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
-import { createIndexedDBBackgroundProvider } from '@affine/workspace/providers';
+import {
+  createAffineProviders,
+  createIndexedDBBackgroundProvider,
+} from '@affine/workspace/providers';
+import { createAffineDownloadProvider } from '@affine/workspace/providers';
 import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
 import {
   LoadPriority,
@@ -32,12 +37,9 @@ import { Suspense, useEffect } from 'react';
 import { mutate } from 'swr';
 import { z } from 'zod';
 
-import { createAffineProviders } from '../../blocksuite';
-import { createAffineDownloadProvider } from '../../blocksuite/providers/affine';
 import { PageLoading } from '../../components/pure/loading';
 import { useAffineRefreshAuthToken } from '../../hooks/affine/use-affine-refresh-auth-token';
 import { BlockSuiteWorkspace } from '../../shared';
-import { affineApis, affineAuth } from '../../shared/apis';
 import { toast } from '../../utils';
 import {
   BlockSuitePageList,

apps/web/src/atoms/public-workspace/index.ts

@@ -1,12 +1,12 @@
 import type { BlockSuiteFeatureFlags } from '@affine/env';
 import { config } from '@affine/env';
+import { affineApis } from '@affine/workspace/affine/shared';
 import type { AffinePublicWorkspace } from '@affine/workspace/type';
 import { WorkspaceFlavour } from '@affine/workspace/type';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { atom } from 'jotai';
 
 import { BlockSuiteWorkspace } from '../../shared';
-import { affineApis } from '../../shared/apis';
 
 function createPublicWorkspace(
   workspaceId: string,

apps/web/src/blocksuite/index.ts

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

apps/web/src/blocksuite/logger.ts

@@ -1,3 +0,0 @@
-import { DebugLogger } from '@affine/debug';
-
-export const providerLogger = new DebugLogger('provider');

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

@@ -1,60 +0,0 @@
-import type { AffineDownloadProvider } from '@affine/workspace/type';
-import { assertExists } from '@blocksuite/store';
-
-import { BlockSuiteWorkspace } from '../../../shared';
-import { affineApis } from '../../../shared/apis';
-import { providerLogger } from '../../logger';
-
-const hashMap = new Map<string, ArrayBuffer>();
-
-export const createAffineDownloadProvider = (
-  blockSuiteWorkspace: BlockSuiteWorkspace
-): 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)) {
-        providerLogger.debug('applyUpdate');
-        BlockSuiteWorkspace.Y.applyUpdate(
-          blockSuiteWorkspace.doc,
-          new Uint8Array(hashMap.get(id) as ArrayBuffer)
-        );
-        connected = true;
-        callbacks.forEach(cb => cb());
-        return;
-      }
-      affineApis
-        .downloadWorkspace(id, false)
-        .then(binary => {
-          hashMap.set(id, binary);
-          providerLogger.debug('applyUpdate');
-          BlockSuiteWorkspace.Y.applyUpdate(
-            blockSuiteWorkspace.doc,
-            new Uint8Array(binary)
-          );
-          connected = true;
-          callbacks.forEach(cb => cb());
-        })
-        .catch(e => {
-          providerLogger.error('downloadWorkspace', e);
-        });
-    },
-    disconnect: () => {
-      providerLogger.info('disconnect download provider', id);
-      connected = false;
-    },
-    cleanup: () => {
-      hashMap.delete(id);
-    },
-  };
-};

apps/web/src/components/blocksuite/workspace-header/header-right-items/sync-user.tsx

@@ -6,6 +6,7 @@ import {
   setLoginStorage,
   SignMethod,
 } from '@affine/workspace/affine/login';
+import { affineAuth } from '@affine/workspace/affine/shared';
 import type { LocalWorkspace } from '@affine/workspace/type';
 import { WorkspaceFlavour } from '@affine/workspace/type';
 import {
@@ -20,7 +21,6 @@ import React, { useEffect, useState } from 'react';
 import { useCurrentWorkspace } from '../../../../hooks/current/use-current-workspace';
 import { useTransformWorkspace } from '../../../../hooks/use-transform-workspace';
 import type { AffineOfficialWorkspace } from '../../../../shared';
-import { affineAuth } from '../../../../shared/apis';
 import { TransformWorkspaceToAffineModal } from '../../../affine/transform-workspace-to-affine-modal';
 
 const IconWrapper = styled('div')(() => {

apps/web/src/components/pure/message-center/index.tsx

@@ -1,10 +1,10 @@
 import { MessageCode, Messages } from '@affine/env/constant';
 import { setLoginStorage, SignMethod } from '@affine/workspace/affine/login';
-import type React from 'react';
+import { affineAuth } from '@affine/workspace/affine/shared';
+import type { FC } from 'react';
 import { memo, useEffect, useState } from 'react';
 
 import { useAffineLogOut } from '../../../hooks/affine/use-affine-log-out';
-import { affineAuth } from '../../../shared/apis';
 import { toast } from '../../../utils';
 
 declare global {
@@ -15,7 +15,7 @@ declare global {
   }
 }
 
-export const MessageCenter: React.FC = memo(function MessageCenter() {
+export const MessageCenter: FC = memo(function MessageCenter() {
   const [popup, setPopup] = useState(false);
   const onLogout = useAffineLogOut();
   useEffect(() => {

apps/web/src/hooks/affine/use-affine-refresh-auth-token.ts

@@ -6,10 +6,9 @@ import {
   setLoginStorage,
   storageChangeSlot,
 } from '@affine/workspace/affine/login';
+import { affineAuth } from '@affine/workspace/affine/shared';
 import useSWR from 'swr';
 
-import { affineAuth } from '../../shared/apis';
-
 const logger = new DebugLogger('auth-token');
 
 const revalidate = async () => {

apps/web/src/hooks/affine/use-members.ts

@@ -1,9 +1,9 @@
 import type { Member } from '@affine/workspace/affine/api';
+import { affineApis } from '@affine/workspace/affine/shared';
 import { useCallback } from 'react';
 import useSWR from 'swr';
 
 import { QueryKey } from '../../adapters/affine/fetcher';
-import { affineApis } from '../../shared/apis';
 
 export function useMembers(workspaceId: string) {
   const { data, mutate } = useSWR<Member[]>(

apps/web/src/hooks/affine/use-toggle-workspace-publish.ts

@@ -1,10 +1,10 @@
+import { affineApis } from '@affine/workspace/affine/shared';
 import { rootStore, rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
 import type { AffineLegacyCloudWorkspace } from '@affine/workspace/type';
 import { useCallback } from 'react';
 import useSWR from 'swr';
 
 import { QueryKey } from '../../adapters/affine/fetcher';
-import { affineApis } from '../../shared/apis';
 
 export function useToggleWorkspacePublish(
   workspace: AffineLegacyCloudWorkspace

apps/web/src/hooks/root/use-on-transform-workspace.ts

@@ -6,13 +6,13 @@ import {
   SignMethod,
   storageChangeSlot,
 } from '@affine/workspace/affine/login';
+import { affineAuth } from '@affine/workspace/affine/shared';
 import { rootCurrentWorkspaceIdAtom } from '@affine/workspace/atom';
 import type { WorkspaceRegistry } from '@affine/workspace/type';
 import { WorkspaceFlavour } from '@affine/workspace/type';
 import { useSetAtom } from 'jotai';
 import { useCallback } from 'react';
 
-import { affineAuth } from '../../shared/apis';
 import { useTransformWorkspace } from '../use-transform-workspace';
 
 export function useOnTransformWorkspace() {

apps/web/src/shared/__tests__/apis.spec.ts

@@ -2,16 +2,15 @@
  * @vitest-environment node
  */
 import { loginResponseSchema } from '@affine/workspace/affine/login';
+import type { affineApis as API } from '@affine/workspace/affine/shared';
 import { beforeAll, describe, expect, it, vi } from 'vitest';
 
-import type { affineApis as API } from '../apis';
-
 let affineApis: typeof API;
 
 beforeAll(async () => {
   // @ts-expect-error
   globalThis.window = undefined;
-  affineApis = (await import('../apis')).affineApis;
+  affineApis = (await import('@affine/workspace/affine/shared')).affineApis;
 });
 
 describe('apis', () => {

apps/web/src/shared/apis.ts

@@ -1,79 +0,0 @@
-import { DebugLogger } from '@affine/debug';
-import { prefixUrl } from '@affine/env';
-import {
-  createUserApis,
-  createWorkspaceApis,
-} from '@affine/workspace/affine/api';
-import { currentAffineUserAtom } from '@affine/workspace/affine/atom';
-import type { LoginResponse } from '@affine/workspace/affine/login';
-import {
-  createAffineAuth,
-  parseIdToken,
-  setLoginStorage,
-} from '@affine/workspace/affine/login';
-import { rootStore } from '@affine/workspace/atom';
-
-export const affineAuth = createAffineAuth(prefixUrl);
-const affineApis = {} as ReturnType<typeof createUserApis> &
-  ReturnType<typeof createWorkspaceApis>;
-Object.assign(affineApis, createUserApis(prefixUrl));
-Object.assign(affineApis, createWorkspaceApis(prefixUrl));
-
-const _debugLogger = new DebugLogger('affine-debug-apis');
-
-if (!globalThis.AFFINE_APIS) {
-  globalThis.AFFINE_APIS = affineApis;
-  globalThis.setLogin = (response: LoginResponse) => {
-    rootStore.set(currentAffineUserAtom, parseIdToken(response.token));
-    setLoginStorage(response);
-  };
-  const loginMockUser1 = async () => {
-    const user1 = await import('@affine-test/fixtures/built-in-user1.json');
-    const data = await fetch(prefixUrl + 'api/user/token', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        type: 'DebugLoginUser',
-        email: user1.email,
-        password: user1.password,
-      }),
-    }).then(r => r.json());
-    setLogin(data);
-  };
-  const loginMockUser2 = async () => {
-    const user2 = await import('@affine-test/fixtures/built-in-user2.json');
-    const data = await fetch(prefixUrl + 'api/user/token', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        type: 'DebugLoginUser',
-        email: user2.email,
-        password: user2.password,
-      }),
-    }).then(r => r.json());
-    setLogin(data);
-  };
-
-  globalThis.AFFINE_DEBUG = {
-    loginMockUser1,
-    loginMockUser2,
-  };
-}
-
-declare global {
-  // eslint-disable-next-line no-var
-  var setLogin: typeof setLoginStorage;
-  // eslint-disable-next-line no-var
-  var AFFINE_APIS:
-    | undefined
-    | (ReturnType<typeof createUserApis> &
-        ReturnType<typeof createWorkspaceApis>);
-  // eslint-disable-next-line no-var
-  var AFFINE_DEBUG: Record<string, unknown>;
-}
-
-export { affineApis };