From: Enrique H. Oliva Date: Tue, 13 Jul 2021 13:32:05 +0000 (-0500) Subject: add socket close connection code and reason X-Git-Tag: v2.0.1~10^2~2 X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=f2c69516df2e671ce23c86009cb1d80673f6a9a1;p=mime-chat add socket close connection code and reason --- diff --git a/src/composables/useWebsockets.ts b/src/composables/useWebsockets.ts index 13d47c3..3b9f2c9 100644 --- a/src/composables/useWebsockets.ts +++ b/src/composables/useWebsockets.ts @@ -69,10 +69,10 @@ export default function useWebSockets( messageCallback(event.toString()) }); - socket.on("close", (event: WebSocket.CloseEvent) => { + socket.on("close", (code: number, reason: string) => { connectionStatusCallback(statusOptions ? statusOptions.closeMessage : "Connection Closed"); clearInterval(_connectionCheckInterval); - if (!event.wasClean) { + if (code !== 1000 || reason !== 'session-logout') { setTimeout(() => { connect(socketUrl, secret), _reconnectTimeout }); @@ -86,9 +86,9 @@ export default function useWebSockets( } - const close = () => { + const close = (code: number, reason: string) => { if (socket) { - socket.close(); + socket.close(code, reason); } }; diff --git a/src/session.ts b/src/session.ts index cbf2b10..9446cd0 100644 --- a/src/session.ts +++ b/src/session.ts @@ -57,14 +57,14 @@ export function launchSession(platformKey: string) { /* connect to the platform */ connect(config.PLATFORM_URL, platformKey); - // initialize the audio streams + // initialize the audio streams // audio.record(); } export function endSession() { - close(); + close(1000, 'session-logout'); uiState.reset(); diff --git a/yarn.lock b/yarn.lock index 465adc9..e79f19f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4898,11 +4898,6 @@ dotenv-expand@^5.1.0: resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== -dotenv@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" - integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== - dotenv@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"