OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-14 23:35:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

connectedイベントはpongパラメータがtrueの時だけ発行するように

Browse source
This commit is contained in:
syuilo 2018-10-13 19:14:05 +09:00
parent 20fe68de05
commit 2b536a7443
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/server/api/stream/index.ts
View file

@ -146,9 +146,9 @@ export default class Connection {
*/ */
@autobind @autobind
private onChannelConnectRequested(payload: any) { private onChannelConnectRequested(payload: any) {
const { channel, id, params } = payload; const { channel, id, params, pong } = payload;
log(`CH CONNECT: ${id} ${channel} by @${this.user.username}`); log(`CH CONNECT: ${id} ${channel} by @${this.user.username}`);
this.connectChannel(id, params, channel); this.connectChannel(id, params, channel, pong);
} }
/** /**
@ -177,7 +177,7 @@ export default class Connection {
* チャンネルに接続 * チャンネルに接続
*/ */
@autobind @autobind
public connectChannel(id: string, params: any, channel: string) { public connectChannel(id: string, params: any, channel: string, pong = false) {
// 共有可能チャンネルに接続しようとしていて、かつそのチャンネルに既に接続していたら無意味なので無視 // 共有可能チャンネルに接続しようとしていて、かつそのチャンネルに既に接続していたら無意味なので無視
if ((channels as any)[channel].shouldShare && this.channels.some(c => c.chName === channel)) { if ((channels as any)[channel].shouldShare && this.channels.some(c => c.chName === channel)) {
return; return;
@ -186,9 +186,12 @@ export default class Connection {
const ch: Channel = new (channels as any)[channel](id, this); const ch: Channel = new (channels as any)[channel](id, this);
this.channels.push(ch); this.channels.push(ch);
ch.init(params); ch.init(params);
this.sendMessageToWs('connected', {
id: id if (pong) {
}); this.sendMessageToWs('connected', {
id: id
});
}
} }
/** /**