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
@@ -8,7 +8,6 @@ import type {
import type { EditorContainer } from '@blocksuite/editor'; import type { EditorContainer } from '@blocksuite/editor';
export type LoadWorkspaceHandler = ( export type LoadWorkspaceHandler = (
workspaceId: string, workspaceId: string,
websocket?: boolean,
user?: AccessTokenMessage | null user?: AccessTokenMessage | null
) => Promise<StoreWorkspace | null> | null; ) => Promise<StoreWorkspace | null> | null;
export type CreateEditorHandler = (page: StorePage) => EditorContainer | null; export type CreateEditorHandler = (page: StorePage) => EditorContainer | null;
@@ -1,13 +1,11 @@
import { useEffect } from 'react'; import { useEffect } from 'react';
import type { Page } from '@blocksuite/store'; import type { Page } from '@blocksuite/store';
import { import { Workspace as StoreWorkspace } from '@blocksuite/store';
IndexedDBDocProvider,
Workspace as StoreWorkspace,
} from '@blocksuite/store';
import '@blocksuite/blocks'; import '@blocksuite/blocks';
import { EditorContainer } from '@blocksuite/editor'; import { EditorContainer } from '@blocksuite/editor';
import { BlockSchema } from '@blocksuite/blocks/models'; import { BlockSchema } from '@blocksuite/blocks/models';
import type { LoadWorkspaceHandler, CreateEditorHandler } from './context'; import type { LoadWorkspaceHandler, CreateEditorHandler } from './context';
import { downloadWorkspace, getDataCenter } from '@affine/datacenter';
interface Props { interface Props {
setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void; setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void;
@@ -19,18 +17,18 @@ const DynamicBlocksuite = ({
setCreateEditorHandler, setCreateEditorHandler,
}: Props) => { }: Props) => {
useEffect(() => { useEffect(() => {
const openWorkspace: LoadWorkspaceHandler = ( const openWorkspace: LoadWorkspaceHandler = (workspaceId: string, user) =>
workspaceId: string,
websocket = false,
user
) =>
// eslint-disable-next-line no-async-promise-executor // eslint-disable-next-line no-async-promise-executor
new Promise(async resolve => { new Promise(async resolve => {
const workspace = new StoreWorkspace({ const dc = await getDataCenter();
room: workspaceId, const workspace = await dc.initWorkspace(
providers: [IndexedDBDocProvider], workspaceId,
}).register(BlockSchema); new StoreWorkspace({
console.log('websocket', websocket); room: workspaceId,
}).register(BlockSchema)
);
// console.log('websocket', websocket);
console.log('user', user); console.log('user', user);
// if (websocket && token.refresh) { // if (websocket && token.refresh) {
@@ -58,9 +56,9 @@ const DynamicBlocksuite = ({
// workspace.__ws__ = ws; // workspace.__ws__ = ws;
// } // }
const indexDBProvider = workspace.providers.find( // const indexDBProvider = workspace.providers.find(
p => p instanceof IndexedDBDocProvider // p => p instanceof IndexedDBDocProvider
); // );
// if (user) { // if (user) {
// const updates = await downloadWorkspace({ workspaceId }); // const updates = await downloadWorkspace({ workspaceId });
// updates && // updates &&
@@ -71,13 +69,14 @@ const DynamicBlocksuite = ({
// // if after update, the space:meta is empty, then we need to get map with doc // // if after update, the space:meta is empty, then we need to get map with doc
// workspace.doc.getMap('space:meta'); // workspace.doc.getMap('space:meta');
// } // }
if (indexDBProvider) {
(indexDBProvider as IndexedDBDocProvider).whenSynced.then(() => { // if (indexDBProvider) {
resolve(workspace); // (indexDBProvider as IndexedDBDocProvider).whenSynced.then(() => {
}); // resolve(workspace);
} else { // });
resolve(workspace); // } else {
} resolve(workspace);
// }
}); });
setLoadWorkspaceHandler(openWorkspace); setLoadWorkspaceHandler(openWorkspace);
@@ -41,7 +41,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
const workspacesList = await Promise.all( const workspacesList = await Promise.all(
state.workspacesMeta.map(async ({ id }) => { state.workspacesMeta.map(async ({ id }) => {
const workspace = const workspace =
(await loadWorkspaceHandler?.(id, false, state.user)) || null; (await loadWorkspaceHandler?.(id, state.user)) || null;
return { id, workspace }; return { id, workspace };
}) })
); );
@@ -84,7 +84,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
return state.currentWorkspace; return state.currentWorkspace;
} }
const workspace = const workspace =
(await loadWorkspaceHandler?.(workspaceId, true, state.user)) || null; (await loadWorkspaceHandler?.(workspaceId, state.user)) || null;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error // @ts-expect-error
+1
View File
@@ -25,6 +25,7 @@
"typescript": "^4.8.4" "typescript": "^4.8.4"
}, },
"dependencies": { "dependencies": {
"@blocksuite/store": "0.3.0-20221228162706-9576a3a",
"encoding": "^0.1.13", "encoding": "^0.1.13",
"firebase": "^9.15.0", "firebase": "^9.15.0",
"idb-keyval": "^6.2.0", "idb-keyval": "^6.2.0",
@@ -1,4 +1,4 @@
import { Doc } from 'yjs'; import { Workspace } from '@blocksuite/store';
import type { BaseProvider } from './provider/index.js'; import type { BaseProvider } from './provider/index.js';
import { MemoryProvider } from './provider/index.js'; import { MemoryProvider } from './provider/index.js';
@@ -6,7 +6,7 @@ import { getKVConfigure } from './store.js';
export class DataCenter { export class DataCenter {
private readonly _providers = new Map<string, typeof BaseProvider>(); private readonly _providers = new Map<string, typeof BaseProvider>();
private readonly _workspaces = new Map<string, Promise<Doc | undefined>>(); private readonly _workspaces = new Map<string, Promise<Workspace>>();
private readonly _config; private readonly _config;
static async init(): Promise<DataCenter> { static async init(): Promise<DataCenter> {
@@ -24,25 +24,34 @@ export class DataCenter {
this._providers.set(provider.id, provider); this._providers.set(provider.id, provider);
} }
private async _initWorkspace(id: string): Promise<Doc> { private async _initWorkspace(
const workspace = new Doc(); id: string,
workspace: Workspace,
const providerId = await this._config.get(`workspace:${id}:provider`); providerId: string
if (this._providers.has(providerId)) { ): Promise<Workspace> {
const providerKey = `workspace:${id}:provider`;
const providerValue = await this._config.get(providerKey);
if (this._providers.has(providerValue || providerId)) {
if (!providerValue) {
await this._config.set(providerKey, providerId);
}
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const Provider = this._providers.get(providerId)!; const Provider = this._providers.get(providerId)!;
const provider = new Provider(); const provider = new Provider();
provider.init(getKVConfigure(id)); await provider.init(getKVConfigure(id), workspace);
} }
return workspace; return workspace;
} }
async getWorkspace(id: string): Promise<Doc | undefined> { async initWorkspace(
id: string,
workspace: Workspace,
provider = 'memory'
): Promise<Workspace> {
if (!this._workspaces.has(id)) { if (!this._workspaces.has(id)) {
const workspace = this._initWorkspace(id); this._workspaces.set(id, this._initWorkspace(id, workspace, provider));
this._workspaces.set(id, workspace);
} }
return this._workspaces.get(id); return this._workspaces.get(id)!;
} }
} }
@@ -1,14 +1,18 @@
import { Workspace } from '@blocksuite/store';
import type { ConfigStore } from '../store.js'; import type { ConfigStore } from '../store.js';
export class BaseProvider { export class BaseProvider {
static id = 'memory'; static id = 'memory';
protected _config: ConfigStore | undefined; protected _config: ConfigStore | undefined;
protected _workspace: Workspace | undefined;
constructor() { constructor() {
// TODO // TODO
} }
init(config: ConfigStore) { async init(config: ConfigStore, workspace: Workspace) {
this._config = config; this._config = config;
this._workspace = workspace;
} }
} }
@@ -4,4 +4,8 @@ export class MemoryProvider extends BaseProvider {
constructor() { constructor() {
super(); super();
} }
test() {
console.log(this._config, this._workspace);
}
} }
+8 -1
View File
@@ -44,4 +44,11 @@ const scopedIndexedDB = () => {
}; };
}; };
export const getKVConfigure = scopedIndexedDB(); let lazyKVConfigure: ReturnType<typeof scopedIndexedDB> | undefined = undefined;
export const getKVConfigure = (scope: string) => {
if (!lazyKVConfigure) {
lazyKVConfigure = scopedIndexedDB();
}
return lazyKVConfigure(scope);
};
@@ -1,4 +1,6 @@
import { test, expect } from '@playwright/test'; import { test, expect } from '@playwright/test';
import { Workspace } from '@blocksuite/store';
import { getDataCenter } from './utils.js'; import { getDataCenter } from './utils.js';
import 'fake-indexeddb/auto'; import 'fake-indexeddb/auto';
@@ -7,6 +9,11 @@ test('can init data center', async () => {
const dataCenter = await getDataCenter(); const dataCenter = await getDataCenter();
expect(dataCenter).toBeTruthy(); expect(dataCenter).toBeTruthy();
const workspace = await dataCenter.getWorkspace('test'); const workspace = await dataCenter.initWorkspace(
'test',
new Workspace({
room: 'test',
})
);
expect(workspace).toBeTruthy(); expect(workspace).toBeTruthy();
}); });
+2
View File
@@ -131,6 +131,7 @@ importers:
packages/data-center: packages/data-center:
specifiers: specifiers:
'@blocksuite/store': 0.3.0-20221228162706-9576a3a
'@playwright/test': ^1.29.1 '@playwright/test': ^1.29.1
encoding: ^0.1.13 encoding: ^0.1.13
fake-indexeddb: 4.0.1 fake-indexeddb: 4.0.1
@@ -143,6 +144,7 @@ importers:
y-protocols: ^1.0.5 y-protocols: ^1.0.5
yjs: ^13.5.43 yjs: ^13.5.43
dependencies: dependencies:
'@blocksuite/store': 0.3.0-20221228162706-9576a3a_yjs@13.5.43
encoding: 0.1.13 encoding: 0.1.13
firebase: 9.15.0_encoding@0.1.13 firebase: 9.15.0_encoding@0.1.13
idb-keyval: 6.2.0 idb-keyval: 6.2.0