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

ws connect not async.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-06-20 23:29:00 +02:00
parent e22e5e42a0
commit 97a213c9b3
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,6 @@
import EventEmitter from 'eventemitter3' import EventEmitter from 'eventemitter3'
import { Logger } from '../utils/logger' import { Logger } from '../utils/logger'
export const connTimeout = 15000
export const reconnInterval = 1000
export interface NekoWebSocketEvents { export interface NekoWebSocketEvents {
connecting: () => void connecting: () => void
connected: () => void connected: () => void
@ -29,7 +26,7 @@ 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 async connect(url: string) { public connect(url: string) {
if (!this.supported) { if (!this.supported) {
throw new Error('browser does not support websockets') throw new Error('browser does not support websockets')
} }
@ -43,27 +40,15 @@ export class NekoWebSocket extends EventEmitter<NekoWebSocketEvents> {
this.disconnect() this.disconnect()
} }
await new Promise<void>((res, rej) => { this._ws = new WebSocket(url)
this._ws = new WebSocket(url)
this._log.info(`connecting`) this._log.info(`connecting`)
this.emit('connecting') this.emit('connecting')
this._ws.onclose = rej.bind(this, new Error('connection close')) this._ws.onopen = this.onConnected.bind(this)
this._ws.onerror = rej.bind(this, new Error('connection error')) this._ws.onclose = this.onDisconnected.bind(this, 'close')
this._ws.onmessage = this.onMessage.bind(this) this._ws.onerror = this.onDisconnected.bind(this, 'error')
this._ws.onmessage = this.onMessage.bind(this)
const timeout = window.setTimeout(rej.bind(this, new Error('connection timeout')), connTimeout)
this._ws.onopen = () => {
window.clearTimeout(timeout)
this._ws!.onclose = this.onDisconnected.bind(this, 'close')
this._ws!.onerror = this.onDisconnected.bind(this, 'error')
this.onConnected()
res()
}
})
} }
public disconnect() { public disconnect() {