feat: init workspace & test case

This commit is contained in:
DarkSky
2022-12-30 12:06:08 +08:00
committed by DarkSky
parent 6ed2d467b7
commit 3aca098bee
5 changed files with 65 additions and 46 deletions

View File

@@ -1,11 +1,10 @@
import { useEffect } from 'react'; import { useEffect } from 'react';
import type { Page } from '@blocksuite/store'; import type { Page } from '@blocksuite/store';
import { 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'; import { getDataCenter } from '@affine/datacenter';
interface Props { interface Props {
setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void; setLoadWorkspaceHandler: (handler: LoadWorkspaceHandler) => void;
@@ -20,13 +19,9 @@ const DynamicBlocksuite = ({
const openWorkspace: LoadWorkspaceHandler = (workspaceId: string, user) => const openWorkspace: LoadWorkspaceHandler = (workspaceId: string, 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 dc = await getDataCenter(); const workspace = await getDataCenter()
const workspace = await dc.initWorkspace( .then(dc => dc.initWorkspace(workspaceId))
workspaceId, .then(w => w.register(BlockSchema));
new StoreWorkspace({
room: workspaceId,
}).register(BlockSchema)
);
// console.log('websocket', websocket); // console.log('websocket', websocket);
console.log('user', user); console.log('user', user);
@@ -59,16 +54,11 @@ const DynamicBlocksuite = ({
// const indexDBProvider = workspace.providers.find( // const indexDBProvider = workspace.providers.find(
// p => p instanceof IndexedDBDocProvider // p => p instanceof IndexedDBDocProvider
// ); // );
// if (user) {
// const updates = await downloadWorkspace({ workspaceId }); if (user) {
// updates && // if after update, the space:meta is empty, then we need to get map with doc
// StoreWorkspace.Y.applyUpdate( workspace.doc.getMap('space:meta');
// workspace.doc, }
// new Uint8Array(updates)
// );
// // if after update, the space:meta is empty, then we need to get map with doc
// workspace.doc.getMap('space:meta');
// }
// if (indexDBProvider) { // if (indexDBProvider) {
// (indexDBProvider as IndexedDBDocProvider).whenSynced.then(() => { // (indexDBProvider as IndexedDBDocProvider).whenSynced.then(() => {

View File

@@ -1,4 +1,5 @@
import { Workspace } from '@blocksuite/store'; import { Workspace } from '@blocksuite/store';
import assert from 'assert';
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 +7,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<Workspace>>(); private readonly _workspaces = new Map<string, Promise<BaseProvider>>();
private readonly _config; private readonly _config;
static async init(): Promise<DataCenter> { static async init(): Promise<DataCenter> {
@@ -24,34 +25,50 @@ export class DataCenter {
this._providers.set(provider.id, provider); this._providers.set(provider.id, provider);
} }
private async _initWithProvider(id: string, providerId: string) {
const workspace = new Workspace({ room: id });
const Provider = this._providers.get(providerId);
assert(Provider);
const provider = new Provider();
console.log(`Loading workspace ${id} with provider ${Provider.id}`);
await provider.init(getKVConfigure(id), workspace);
await provider.initData();
console.log(`Workspace ${id} loaded`);
return provider;
}
private async _initWorkspace( private async _initWorkspace(
id: string, id: string,
workspace: Workspace,
providerId: string providerId: string
): Promise<Workspace> { ): Promise<BaseProvider> {
const providerKey = `workspace:${id}:provider`; const providerKey = `workspace:${id}:provider`;
const providerValue = await this._config.get(providerKey); const providerValue = await this._config.get(providerKey);
if (this._providers.has(providerValue || providerId)) { if (this._providers.has(providerValue || providerId)) {
if (!providerValue) { if (!providerValue) {
await this._config.set(providerKey, providerId); await this._config.set(providerKey, providerId);
} }
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const Provider = this._providers.get(providerId)!; return this._initWithProvider(id, await this._config.get(providerKey));
const provider = new Provider(); } else {
await provider.init(getKVConfigure(id), workspace); throw Error(`provider ${providerId} not found`);
} }
return workspace;
} }
async initWorkspace( async initWorkspace(id: string, provider = 'memory'): Promise<Workspace> {
id: string,
workspace: Workspace,
provider = 'memory'
): Promise<Workspace> {
if (!this._workspaces.has(id)) { if (!this._workspaces.has(id)) {
this._workspaces.set(id, this._initWorkspace(id, workspace, provider)); this._workspaces.set(id, this._initWorkspace(id, provider));
} }
const workspace = this._workspaces.get(id);
assert(workspace);
return workspace.then(w => w.workspace);
}
return this._workspaces.get(id)!; setWorkspaceConfig(workspace: string, key: string, value: any) {
const config = getKVConfigure(workspace);
return config.set(key, value);
} }
} }

View File

@@ -4,15 +4,23 @@ 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;
protected _workspace: Workspace | undefined; protected _workspace!: Workspace;
constructor() { constructor() {
// TODO // Nothing to do here
} }
async init(config: ConfigStore, workspace: Workspace) { async init(config: ConfigStore, workspace: Workspace) {
this._config = config; this._config = config;
this._workspace = workspace; this._workspace = workspace;
} }
async initData() {
throw Error('Not implemented: initData');
}
get workspace() {
return this._workspace;
}
} }

View File

@@ -5,7 +5,7 @@ export class MemoryProvider extends BaseProvider {
super(); super();
} }
test() { async initData() {
console.log(this._config, this._workspace); console.log('Skip data reload in memory provider');
} }
} }

View File

@@ -1,5 +1,4 @@
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';
@@ -9,11 +8,16 @@ test('can init data center', async () => {
const dataCenter = await getDataCenter(); const dataCenter = await getDataCenter();
expect(dataCenter).toBeTruthy(); expect(dataCenter).toBeTruthy();
const workspace = await dataCenter.initWorkspace( dataCenter.setWorkspaceConfig('test', 'key', 'value');
'test',
new Workspace({ const workspace = await dataCenter.initWorkspace('test');
room: 'test',
})
);
expect(workspace).toBeTruthy(); expect(workspace).toBeTruthy();
}); });
test('should init error', async () => {
const dataCenter = await getDataCenter();
test.fail();
await dataCenter.initWorkspace('test', 'not exist provider');
});