feat: memory provider first work

This commit is contained in:
DarkSky
2022-12-29 23:05:19 +08:00
committed by DarkSky
parent 2bf6bf7ed8
commit 6ed2d467b7
10 changed files with 74 additions and 42 deletions

View File

@@ -8,7 +8,6 @@ import type {
import type { EditorContainer } from '@blocksuite/editor';
export type LoadWorkspaceHandler = (
workspaceId: string,
websocket?: boolean,
user?: AccessTokenMessage | null
) => Promise<StoreWorkspace | null> | null;
export type CreateEditorHandler = (page: StorePage) => EditorContainer | null;

View File

@@ -1,13 +1,11 @@
import { useEffect } from 'react';
import type { Page } from '@blocksuite/store';
import {
IndexedDBDocProvider,
Workspace as StoreWorkspace,
} from '@blocksuite/store';
import { Workspace as StoreWorkspace } from '@blocksuite/store';
import '@blocksuite/blocks';
import { EditorContainer } from '@blocksuite/editor';
import { BlockSchema } from '@blocksuite/blocks/models';
import type { LoadWorkspaceHandler, CreateEditorHandler } from './context';
import { downloadWorkspace, getDataCenter } from '@affine/datacenter';
interface Props {
setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void;
@@ -19,18 +17,18 @@ const DynamicBlocksuite = ({
setCreateEditorHandler,
}: Props) => {
useEffect(() => {
const openWorkspace: LoadWorkspaceHandler = (
workspaceId: string,
websocket = false,
user
) =>
const openWorkspace: LoadWorkspaceHandler = (workspaceId: string, user) =>
// eslint-disable-next-line no-async-promise-executor
new Promise(async resolve => {
const workspace = new StoreWorkspace({
room: workspaceId,
providers: [IndexedDBDocProvider],
}).register(BlockSchema);
console.log('websocket', websocket);
const dc = await getDataCenter();
const workspace = await dc.initWorkspace(
workspaceId,
new StoreWorkspace({
room: workspaceId,
}).register(BlockSchema)
);
// console.log('websocket', websocket);
console.log('user', user);
// if (websocket && token.refresh) {
@@ -58,9 +56,9 @@ const DynamicBlocksuite = ({
// workspace.__ws__ = ws;
// }
const indexDBProvider = workspace.providers.find(
p => p instanceof IndexedDBDocProvider
);
// const indexDBProvider = workspace.providers.find(
// p => p instanceof IndexedDBDocProvider
// );
// if (user) {
// const updates = await downloadWorkspace({ workspaceId });
// updates &&
@@ -71,13 +69,14 @@ const DynamicBlocksuite = ({
// // if after update, the space:meta is empty, then we need to get map with doc
// workspace.doc.getMap('space:meta');
// }
if (indexDBProvider) {
(indexDBProvider as IndexedDBDocProvider).whenSynced.then(() => {
resolve(workspace);
});
} else {
resolve(workspace);
}
// if (indexDBProvider) {
// (indexDBProvider as IndexedDBDocProvider).whenSynced.then(() => {
// resolve(workspace);
// });
// } else {
resolve(workspace);
// }
});
setLoadWorkspaceHandler(openWorkspace);

View File

@@ -41,7 +41,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
const workspacesList = await Promise.all(
state.workspacesMeta.map(async ({ id }) => {
const workspace =
(await loadWorkspaceHandler?.(id, false, state.user)) || null;
(await loadWorkspaceHandler?.(id, state.user)) || null;
return { id, workspace };
})
);
@@ -84,7 +84,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
return state.currentWorkspace;
}
const workspace =
(await loadWorkspaceHandler?.(workspaceId, true, state.user)) || null;
(await loadWorkspaceHandler?.(workspaceId, state.user)) || null;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error