better test

This commit is contained in:
2019-09-21 16:45:51 +02:00
parent 8dc8d286ea
commit 26aa50deec
5 changed files with 27 additions and 40 deletions
+10 -10
View File
@@ -27,20 +27,20 @@ export class RPCServer<
if(!conf.visibility) this.visibility = "127.0.0.1"
if(!conf.errorHandler) this.errorHandler =
(socket:I.Socket) => (error:any) => {
this.errorHandler = (socket:I.Socket) => (error:any) => {
if(conf.errorHandler) conf.errorHandler(socket, error)
socket.destroy();
console.error("Caught websocket error", String(error))
}
if(!conf.closeHandler) this.closeHandler =
(socket:I.Socket) => () => {
console.log("Socket on port "+socket.port+" closing")
this.closeHandler = (socket:I.Socket) => {
if(!conf.closeHandler) console.log("Socket on port "+socket.port+" closing")
else conf.closeHandler(socket)
}
if(!conf.connectionHandler) this.connectionHandler =
(socket:I.Socket) => {
console.log("New websocket connection on port "+socket.port)
this.connectionHandler = (socket:I.Socket) => {
if(!conf.connectionHandler) console.log("New websocket connection on port "+socket.port)
else conf.connectionHandler(socket)
}
let badRPC
@@ -60,8 +60,8 @@ export class RPCServer<
try{
this.io.attach(this.ws)
this.io.on('socket', (socket:I.Socket) => {
socket.on('error', this.errorHandler(socket))
socket.on('close', this.closeHandler(socket))
socket.on('error', (err) => this.errorHandler(socket, err))
socket.on('close', ()=> this.closeHandler(socket))
this.connectionHandler(socket)
this.initRPCs(socket)
})
+2 -2
View File
@@ -6,8 +6,8 @@ export type Arg = string
export type Name = Arg
export type Owner = Name
export type ConnectionHandler = (socket:I.Socket) => void
export type ErrorHandler = (socket:I.Socket) => (error:any) => void
export type CloseHandler = (socket:I.Socket) => () => void
export type ErrorHandler = (socket:I.Socket, error:any) => void
export type CloseHandler = (socket:I.Socket) => void
export type SocketConf = {
connectionHandler?: ConnectionHandler
errorHandler?: ErrorHandler