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

fix: websocket should be link to blocksuiteWorkspace, not workspace id (#735)

Browse Source
This commit is contained in:
zuomeng wang
2023-01-13 17:10:08 +08:00
committed by GitHub
parent 21d24ad542
commit 2c1eee1194
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ const {
export class AffineProvider extends BaseProvider { export class AffineProvider extends BaseProvider {
public id = 'affine'; public id = 'affine';
private _onTokenRefresh?: Callback = undefined; private _onTokenRefresh?: Callback = undefined;
private _wsMap: Map<string, WebsocketProvider> = new Map(); private _wsMap: Map<BlocksuiteWorkspace, WebsocketProvider> = new Map();
private _apis: Apis; private _apis: Apis;
private _channel?: WebsocketClient; private _channel?: WebsocketClient;
// private _idbMap: Map<string, IndexedDBProvider> = new Map(); // private _idbMap: Map<string, IndexedDBProvider> = new Map();
@@ -147,7 +147,7 @@ export class AffineProvider extends BaseProvider {
const { doc, room } = workspace; const { doc, room } = workspace;
assert(room); assert(room);
assert(doc); assert(doc);
let ws = this._wsMap.get(room); let ws = this._wsMap.get(workspace);
if (!ws) { if (!ws) {
const wsUrl = `${ const wsUrl = `${
window.location.protocol === 'https:' ? 'wss' : 'ws' window.location.protocol === 'https:' ? 'wss' : 'ws'
@@ -155,7 +155,7 @@ export class AffineProvider extends BaseProvider {
ws = new WebsocketProvider(wsUrl, room, doc, { ws = new WebsocketProvider(wsUrl, room, doc, {
params: { token: this._apis.token.refresh }, params: { token: this._apis.token.refresh },
}); });
this._wsMap.set(room, ws); this._wsMap.set(workspace, ws);
} }
return ws; return ws;
} }
@@ -182,8 +182,8 @@ export class AffineProvider extends BaseProvider {
this.linkLocal(workspace); this.linkLocal(workspace);
const ws = this._getWebsocketProvider(workspace); const ws = this._getWebsocketProvider(workspace);
// close all websocket links // close all websocket links
Array.from(this._wsMap.entries()).forEach(([id, ws]) => { Array.from(this._wsMap.entries()).forEach(([blocksuiteWorkspace, ws]) => {
if (id !== room) { if (blocksuiteWorkspace !== workspace) {
ws.disconnect(); ws.disconnect();
} }
}); });
@@ -279,7 +279,13 @@ export class AffineProvider extends BaseProvider {
public override async closeWorkspace(id: string) { public override async closeWorkspace(id: string) {
// const idb = this._idbMap.get(id); // const idb = this._idbMap.get(id);
// idb?.destroy(); // idb?.destroy();
const ws = this._wsMap.get(id); const workspaceUnit = this._workspaces.get(id);
const ws = workspaceUnit?.blocksuiteWorkspace
? this._wsMap.get(workspaceUnit?.blocksuiteWorkspace)
: null;
if (!ws) {
console.error('close workspace websocket which not exist.');
}
ws?.disconnect(); ws?.disconnect();
} }