iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

fix logout and save WS url.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-02-08 17:50:12 +01:00
parent 817ea28379
commit f2a9a33cb0
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/component/internal/websocket.ts
View File

@ -14,11 +14,19 @@ export class NekoWebSocket extends EventEmitter<NekoWebSocketEvents> {
private _ws?: WebSocket private _ws?: WebSocket
private _timeout?: NodeJS.Timeout private _timeout?: NodeJS.Timeout
private _log: Logger private _log: Logger
private _url: string
constructor() { constructor() {
super() super()
this._log = new Logger('websocket') this._log = new Logger('websocket')
this._url = ''
this.setUrl(location.href)
}
public setUrl(url: string) {
this._url = url.replace(/^http/, 'ws').replace(/\/+$/, '') + '/api/ws'
} }
get supported() { get supported() {
@ -29,14 +37,14 @@ export class NekoWebSocket extends EventEmitter<NekoWebSocketEvents> {
return typeof this._ws !== 'undefined' && this._ws.readyState === WebSocket.OPEN return typeof this._ws !== 'undefined' && this._ws.readyState === WebSocket.OPEN
} }
public connect(url: string) { public connect() {
if (this.connected) { if (this.connected) {
throw new Error('attempting to create websocket while connection open') throw new Error('attempting to create websocket while connection open')
} }
this.emit('connecting') this.emit('connecting')
this._ws = new WebSocket(url) this._ws = new WebSocket(this._url)
this._log.info(`connecting`) this._log.info(`connecting`)
this._ws.onopen = this.onConnected.bind(this) this._ws.onopen = this.onConnected.bind(this)

21
src/component/main.vue
View File

@ -153,6 +153,7 @@
public setUrl(url: string) { public setUrl(url: string) {
const httpURL = url.replace(/^ws/, 'http').replace(/\/$|\/ws\/?$/, '') const httpURL = url.replace(/^ws/, 'http').replace(/\/$|\/ws\/?$/, '')
this.api.setUrl(httpURL) this.api.setUrl(httpURL)
this.websocket.setUrl(httpURL)
} }
public async login(id: string, secret: string) { public async login(id: string, secret: string) {
@ -162,7 +163,7 @@
await this.api.session.login({ id, secret }) await this.api.session.login({ id, secret })
Vue.set(this.state.connection, 'authenticated', true) Vue.set(this.state.connection, 'authenticated', true)
this.websocketConnect() this.websocket.connect()
} }
public async logout() { public async logout() {
@ -170,9 +171,15 @@
throw new Error('client not authenticated') throw new Error('client not authenticated')
} }
this.websocketDisconnect() if (this.connected) {
await this.api.session.logout() this.websocketDisconnect()
Vue.set(this.state.connection, 'authenticated', false) }
try {
await this.api.session.logout()
} finally {
Vue.set(this.state.connection, 'authenticated', false)
}
} }
public websocketConnect() { public websocketConnect() {
@ -184,7 +191,7 @@
throw new Error('client already connected to websocket') throw new Error('client already connected to websocket')
} }
this.websocket.connect(this.api.url.replace(/^http/, 'ws') + '/api/ws') this.websocket.connect()
} }
public websocketDisconnect() { public websocketDisconnect() {
@ -358,7 +365,7 @@
if (this.authenticated) { if (this.authenticated) {
setTimeout(() => { setTimeout(() => {
try { try {
this.websocketConnect() this.websocket.connect()
} catch (e) {} } catch (e) {}
}, 1000) }, 1000)
} }
@ -427,7 +434,7 @@
// check if is user logged in // check if is user logged in
this.api.session.whoami().then(() => { this.api.session.whoami().then(() => {
Vue.set(this.state.connection, 'authenticated', true) Vue.set(this.state.connection, 'authenticated', true)
this.websocketConnect() this.websocket.connect()
}) })
// unmute on users first interaction // unmute on users first interaction