feat: add channel for get new affine list

This commit is contained in:
MingLiang Wang
2023-01-11 20:57:56 +08:00
parent 15bdd2f31e
commit fc2a5879bd
2 changed files with 69 additions and 21 deletions
@@ -11,12 +11,13 @@ import { storage } from './storage.js';
import assert from 'assert'; import assert from 'assert';
import { WebsocketProvider } from './sync.js'; import { WebsocketProvider } from './sync.js';
// import { IndexedDBProvider } from '../local/indexeddb'; // import { IndexedDBProvider } from '../local/indexeddb';
import { getApis } from './apis/index.js'; import { getApis, Workspace } from './apis/index.js';
import type { Apis, WorkspaceDetail, Callback } from './apis'; import type { Apis, WorkspaceDetail, Callback } from './apis';
import { setDefaultAvatar } from '../utils.js'; import { setDefaultAvatar } from '../utils.js';
import { MessageCode } from '../../message'; import { MessageCode } from '../../message';
import { token } from './apis/token.js'; import { token } from './apis/token.js';
import { WebsocketClient } from './channel'; import { WebsocketClient } from './channel';
import { SyncMode } from '../../workspace-unit';
export interface AffineProviderConstructorParams export interface AffineProviderConstructorParams
extends ProviderConstructorParams { extends ProviderConstructorParams {
@@ -33,21 +34,12 @@ export class AffineProvider extends BaseProvider {
private _onTokenRefresh?: Callback = undefined; private _onTokenRefresh?: Callback = undefined;
private _wsMap: Map<string, WebsocketProvider> = new Map(); private _wsMap: Map<string, 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();
constructor({ apis, ...params }: AffineProviderConstructorParams) { constructor({ apis, ...params }: AffineProviderConstructorParams) {
super(params); super(params);
this._apis = apis || getApis(); this._apis = apis || getApis();
this._channel = new WebsocketClient(
`${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${
window.location.host
}/global/sync/`,
this._logger
);
if (token.isLogin) {
this._connectChannel();
}
} }
override async init() { override async init() {
@@ -76,14 +68,59 @@ export class AffineProvider extends BaseProvider {
} else { } else {
storage.setItem('token', this._apis.token.refresh); storage.setItem('token', this._apis.token.refresh);
} }
if (token.isLogin) {
this._connectChannel();
}
} }
private _connectChannel() { private _connectChannel() {
this._channel.connect(); if (!this._channel) {
this._channel = new WebsocketClient(
`${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${
window.location.host
}/api/global/sync/`,
this._logger,
{
params: {
token: this._apis.token.refresh,
},
}
);
}
this._channel.on('message', this.handlerAffineListMessage);
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any private handlerAffineListMessage({
this._channel.on('message', (message: any) => { ws_details,
console.log('message', message); metadata,
}: {
ws_list: Workspace[];
ws_details: Record<string, WorkspaceDetail>;
metadata: Record<string, { avatar: string; name: string }>;
}) {
Object.entries(ws_details).forEach(([id, detail]) => {
const { name, avatar } = metadata[id];
assert(name);
const workspace = {
name: name,
avatar,
owner: {
name: detail.owner.name,
id: detail.owner.id,
email: detail.owner.email,
avatar: detail.owner.avatar_url,
},
published: detail.public,
memberCount: detail.member_count,
provider: 'affine',
syncMode: 'core' as SyncMode,
};
if (this._workspaces.get(id)) {
this._workspaces.update(id, workspace);
} else {
this._workspaces.add({ id, ...workspace });
}
}); });
} }
@@ -237,7 +274,7 @@ export class AffineProvider extends BaseProvider {
} }
} }
const user = await this._apis.signInWithGoogle?.(); const user = await this._apis.signInWithGoogle?.();
if (!this._channel.connected) { if (!this._channel?.connected) {
this._connectChannel(); this._connectChannel();
} }
if (!user) { if (!user) {
@@ -397,7 +434,7 @@ export class AffineProvider extends BaseProvider {
public override async logout(): Promise<void> { public override async logout(): Promise<void> {
token.clear(); token.clear();
this._channel.disconnect(); this._channel?.disconnect();
this._wsMap.forEach(ws => ws.disconnect()); this._wsMap.forEach(ws => ws.disconnect());
storage.removeItem('token'); storage.removeItem('token');
} }
@@ -1,6 +1,7 @@
import websocket from 'lib0/websocket'; import * as websocket from 'lib0/websocket';
import { Logger } from 'src/types'; import { Logger } from 'src/types';
import { token } from './apis/token'; import { token } from './apis/token';
import * as url from 'lib0/url';
const RECONNECT_INTERVAL_TIME = 5000; const RECONNECT_INTERVAL_TIME = 5000;
const MAX_RECONNECT_TIMES = 50; const MAX_RECONNECT_TIMES = 50;
@@ -10,11 +11,21 @@ export class WebsocketClient extends websocket.WebsocketClient {
private _reconnectInterval: number | null = null; private _reconnectInterval: number | null = null;
private _logger: Logger; private _logger: Logger;
constructor( constructor(
url: string, serverUrl: string,
logger: Logger, logger: Logger,
options?: { binaryType: 'arraybuffer' | 'blob' | null } options?: ConstructorParameters<typeof websocket.WebsocketClient>[1] & {
params: Record<string, string>;
}
) { ) {
super(url, options); const params = options?.params || {};
// ensure that url is always ends with /
while (serverUrl[serverUrl.length - 1] === '/') {
serverUrl = serverUrl.slice(0, serverUrl.length - 1);
}
const encodedParams = url.encodeQueryParams(params);
const newUrl =
serverUrl + '/' + (encodedParams.length === 0 ? '' : '?' + encodedParams);
super(newUrl, options);
this._logger = logger; this._logger = logger;
this._setupChannel(); this._setupChannel();
} }