From 00a17ed5d4ee7f3720dcb5e5b8c8804be3dcb23b Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 9 Oct 2020 14:20:34 +0900 Subject: /streamingに非WebSocketリクエストが来るとおかしくなるのを修正 Fix #6718 (#6719) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/scripts/stream.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/client/scripts/stream.ts') diff --git a/src/client/scripts/stream.ts b/src/client/scripts/stream.ts index 8a525ba002..defb22af8e 100644 --- a/src/client/scripts/stream.ts +++ b/src/client/scripts/stream.ts @@ -3,6 +3,7 @@ import { EventEmitter } from 'eventemitter3'; import ReconnectingWebsocket from 'reconnecting-websocket'; import { wsUrl } from '../config'; import MiOS from '../mios'; +import { query as urlQuery } from '../../prelude/url'; /** * Misskey stream connection @@ -21,7 +22,12 @@ export default class Stream extends EventEmitter { const user = os.store.state.i; - this.stream = new ReconnectingWebsocket(wsUrl + (user ? `?i=${user.token}` : ''), '', { minReconnectionDelay: 1 }); // https://github.com/pladaria/reconnecting-websocket/issues/91 + const query = urlQuery({ + i: user?.token, + _t: Date.now(), + }); + + this.stream = new ReconnectingWebsocket(`${wsUrl}?${query}`, '', { minReconnectionDelay: 1 }); // https://github.com/pladaria/reconnecting-websocket/issues/91 this.stream.addEventListener('open', this.onOpen); this.stream.addEventListener('close', this.onClose); this.stream.addEventListener('message', this.onMessage); -- cgit v1.2.3-freya