luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev

Browse Source
This commit is contained in:
DiamondThree
2023-01-11 20:57:27 +08:00
parent 179de80c83 15bdd2f31e
commit a0b9ae538a
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/data-center/src/datacenter.ts
View File

@@ -122,8 +122,8 @@ export class DataCenter {
* @param {string} workspaceId workspace id * @param {string} workspaceId workspace id
*/ */
private _getBlocksuiteWorkspace(workspaceId: string) { private _getBlocksuiteWorkspace(workspaceId: string) {
const workspaceInfo = this._workspaceUnitCollection.find(workspaceId); // const workspaceInfo = this._workspaceUnitCollection.find(workspaceId);
assert(workspaceInfo, 'Workspace not found'); // assert(workspaceInfo, 'Workspace not found');
return ( return (
// this._workspaceInstances.get(workspaceId) || // this._workspaceInstances.get(workspaceId) ||
createBlocksuiteWorkspace(workspaceId) createBlocksuiteWorkspace(workspaceId)

9
packages/data-center/src/provider/affine/affine.ts
View File

@@ -104,10 +104,13 @@ export class AffineProvider extends BaseProvider {
return ws; return ws;
} }
private async _applyCloudUpdates(blocksuiteWorkspace: BlocksuiteWorkspace) { private async _applyCloudUpdates(
blocksuiteWorkspace: BlocksuiteWorkspace,
published = false
) {
const { doc, room: workspaceId } = blocksuiteWorkspace; const { doc, room: workspaceId } = blocksuiteWorkspace;
assert(workspaceId, 'Blocksuite Workspace without room(workspaceId).'); assert(workspaceId, 'Blocksuite Workspace without room(workspaceId).');
const updates = await this._apis.downloadWorkspace(workspaceId); const updates = await this._apis.downloadWorkspace(workspaceId, published);
if (updates && updates.byteLength) { if (updates && updates.byteLength) {
await new Promise(resolve => { await new Promise(resolve => {
doc.once('update', resolve); doc.once('update', resolve);
@@ -117,7 +120,7 @@ export class AffineProvider extends BaseProvider {
} }
override async loadPublicWorkspace(blocksuiteWorkspace: BlocksuiteWorkspace) { override async loadPublicWorkspace(blocksuiteWorkspace: BlocksuiteWorkspace) {
await this._applyCloudUpdates(blocksuiteWorkspace); await this._applyCloudUpdates(blocksuiteWorkspace, true);
return blocksuiteWorkspace; return blocksuiteWorkspace;
} }

6
packages/data-center/src/provider/affine/apis/workspace.ts
View File

@@ -172,7 +172,11 @@ export async function leaveWorkspace({ id }: LeaveWorkspaceParams) {
} }
export async function downloadWorkspace( export async function downloadWorkspace(
workspaceId: string workspaceId: string,
published = false
): Promise<ArrayBuffer> { ): Promise<ArrayBuffer> {
if (published) {
return bareClient.get(`api/workspace/${workspaceId}/doc`).arrayBuffer();
}
return client.get(`api/workspace/${workspaceId}/doc`).arrayBuffer(); return client.get(`api/workspace/${workspaceId}/doc`).arrayBuffer();
} }