Skip to content

feat(websocket-logs): display ws logs conditionally #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2022
Merged

feat(websocket-logs): display ws logs conditionally #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/composables/services/websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { clearUser, AuthStore } from '@/composables/stores/auth'
import { provide, inject, reactive } from 'vue'

const socketcluster = require('socketcluster-client')
const debug = true

// Public channel idenitfier and general options
let options = { waitForAuth: true }
Expand Down Expand Up @@ -41,13 +40,13 @@ export const socketLogout = socketUser => {
}

export const watchUserChannel = handler => {
if (debug) console.log('Watching user channel.')
if (window.websocket_logs) console.log('Watching user channel.')
if (userChannel) userChannel.watch(handler)
else setTimeout(() => watchUserChannel(handler), 1000)
}

export const unwatchUserChannel = handler => {
if (debug) console.log('Unwatching user channel.')
if (window.websocket_logs) console.log('Unwatching user channel.')
if (userChannel) userChannel.unwatch(handler)
}

Expand All @@ -61,19 +60,19 @@ export default {
const $auth = inject(AuthStore)

// Socket Error logging
socket.on('error', err => debug ? console.log('Websocket error:', err) : null)
socket.on('error', err => window.websocket_logs ? console.log('Websocket error:', err) : null)

// Channel Subscribe
socket.on('subscribe', channelName => {
if (JSON.parse(channelName).type === 'role') {
socket.watch(channelName, d => {
if (debug) console.log('Received role channel message.', d)
if (window.websocket_logs) console.log('Received role channel message.', d)
$auth.reauthenticate()
})
}
else if (JSON.parse(channelName).type === 'user') {
socket.watch(channelName, d => {
if (debug) console.log('Received user channel message', d)
if (window.websocket_logs) console.log('Received user channel message', d)
if (d.action === 'reauthenticate') $auth.reauthenticate()
else if (d.action === 'logout' && d.sessionId === socket.getAuthToken().sessionId) {
$auth.logout()
Expand All @@ -90,22 +89,22 @@ export default {
else if (JSON.parse(channelName).type === 'public') {
socket.watch(channelName, d => d.action === 'announcement' ? alertStore.warn(d.message) : null)
}
else debug ? console.log('Not watching', channelName) : null
else window.websocket_logs ? console.log('Not watching', channelName) : null

if (debug) console.log('Websocket subscribed to', channelName, 'with watchers', socket.watchers(channelName))
if (window.websocket_logs) console.log('Websocket subscribed to', channelName, 'with watchers', socket.watchers(channelName))
})

// Channel Unsubscribe
socket.on('unsubscribe', channelName => {
if (debug) console.log('Websocket unsubscribed from', channelName, socket.watchers(channelName))
if (window.websocket_logs) console.log('Websocket unsubscribed from', channelName, socket.watchers(channelName))

// disconnect all watchers from the channel
socket.unwatch(channelName)
})

// Socket Authentication
socket.on('authenticate', () => {
if (debug) console.log('Authenticated WebSocket Connection')
if (window.websocket_logs) console.log('Authenticated WebSocket Connection')

// Emit LoggedIn event to socket server
socket.emit('loggedIn')
Expand Down