feat: update typescript version

Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
2021-12-26 01:21:06 +08:00
parent 72173b4778
commit 5ed61829e1
68 changed files with 234 additions and 161 deletions

View File

@ -27,6 +27,6 @@
"@javatypes/tomcat-websocket-api": "^0.0.3",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"typescript": "^4.3.5"
"typescript": "^4.5.3"
}
}

View File

@ -47,7 +47,7 @@ export class WebSocket extends EventEmitter {
let TransportImpl = require('./netty').NettyWebSocket
this.client = new TransportImpl(url, subProtocol, headers)
console.debug('create websocket from ' + this.client.constructor.name)
} catch (error) {
} catch (error: any) {
console.error('create websocket impl error: ' + error)
console.ex(error)
return

View File

@ -31,7 +31,7 @@ var SslHandler: any
try {
SslContextBuilder = Java.type('io.netty.handler.ssl.SslContextBuilder')
InsecureTrustManagerFactory = Java.type('io.netty.handler.ssl.util.InsecureTrustManagerFactory')
} catch (error) {
} catch (error: any) {
SSLContext = Java.type('javax.net.ssl.SSLContext')
SslHandler = Java.type('io.netty.handler.ssl.SslHandler')
}
@ -45,7 +45,7 @@ try {
const EpollSocketChannel = Java.type('io.netty.channel.epoll.EpollSocketChannel')
group = epull ? new EpollEventLoopGroup() : new NioEventLoopGroup()
socketChannelClass = epull ? EpollSocketChannel.class : NioSocketChannel.class
} catch (error) {
} catch (error: any) {
group = new NioEventLoopGroup()
socketChannelClass = NioSocketChannel.class
}
@ -130,7 +130,7 @@ export class NettyWebSocket extends Transport {
future.sync()
// only trigger onconnect when not have error
this.onconnect({})
} catch (error) {
} catch (error: any) {
// ignore error exceptionCaught from handler
// this.onerror({ error })
}

View File

@ -35,7 +35,7 @@ export abstract class Transport extends EventEmitter {
console.debug(`client Transport connect`)
try {
this.doConnect()
} catch (error) {
} catch (error: any) {
console.ex(error)
this.onerror({ error })
}
@ -44,7 +44,7 @@ export abstract class Transport extends EventEmitter {
send(text: string) {
try {
this.doSend(text)
} catch (error) {
} catch (error: any) {
this.onerror({ error })
}
}
@ -55,7 +55,7 @@ export abstract class Transport extends EventEmitter {
try {
this.onclose({ code, reason })
this.doClose(code, reason)
} catch (error) {
} catch (error: any) {
this.onerror({ error })
} finally {
this.removeAllListeners()

View File

@ -191,8 +191,8 @@ export class Socket extends Emitter {
// Retry with the next transport if the transport is disabled (jsonp: false)
try {
transport = this.createTransport(transport)
} catch (e) {
debug("error while creating transport: %s", e)
} catch (error: any) {
debug("error while creating transport: %s", error)
this.transports.shift()
this.open()
return

View File

@ -160,7 +160,7 @@ export class WS extends Transport {
} else {
this.ws.send(data, opts)
}
} catch (e) {
} catch (error: any) {
debug("websocket closed before onclose event")
}

View File

@ -326,7 +326,7 @@ export class Server extends EventEmitter {
let id
try {
id = this.generateId(req)
} catch (e) {
} catch (error: any) {
console.debug("error while generating an id")
this.emit("connection_error", {
req,
@ -334,7 +334,7 @@ export class Server extends EventEmitter {
message: Server.errorMessages[Server.errors.BAD_REQUEST],
context: {
name: "ID_GENERATION_ERROR",
error: e
error
}
})
closeConnection(Server.errors.BAD_REQUEST)
@ -360,7 +360,7 @@ export class Server extends EventEmitter {
} else {
transport.supportsBinary = true
}
} catch (e) {
} catch (e: any) {
console.ex(e)
this.emit("connection_error", {
req,

View File

@ -15,7 +15,7 @@ export class NettyClient extends WebSocketClient {
try {
this.channel.writeAndFlush(new TextWebSocketFrame(text))
callback?.()
} catch (error) {
} catch (error: any) {
callback?.(error)
}
}

View File

@ -7,7 +7,7 @@ export enum Keys {
}
let RequestAttributeKey: any
try { RequestAttributeKey = AttributeKey.valueOf('request') } catch (error) { }
try { RequestAttributeKey = AttributeKey.valueOf('request') } catch (error: any) { }
export enum AttributeKeys {
Request = RequestAttributeKey
}

View File

@ -15,7 +15,7 @@ class NettyWebSocketServer extends WebSocketServer {
protected initialize() {
let connectEvent = this.options.event
try { this.instance.remove(Keys.Detect) } catch (error) { }
try { this.instance.remove(Keys.Detect) } catch (error: any) { }
this.instance.addFirst(Keys.Detect, new WebSocketDetect(connectEvent).getHandler())
connectEvent.on(ServerEvent.detect, (ctx, channel) => {
channel.pipeline().addFirst(Keys.Handler, new WebSocketHandler(this.options).getHandler())
@ -38,7 +38,7 @@ class NettyWebSocketServer extends WebSocketServer {
protected getId(ctx: any) {
try {
return ctx.channel().id() + ''
} catch (error) {
} catch (error: any) {
console.log(Object.toString.apply(ctx))
console.ex(error)
}

View File

@ -13,7 +13,7 @@ export class TomcatClient extends WebSocketClient {
try {
this.session.getBasicRemote().sendText(text)
callback?.()
} catch (error) {
} catch (error: any) {
callback?.(error)
}
}, this.session)()

View File

@ -17,7 +17,7 @@ class TomcatWebSocketServer extends WebSocketServer {
protected initialize(): void {
this.initThreadPool()
try { this.instance.destroySingleton(ProxyBeanName) } catch (error) { }
try { this.instance.destroySingleton(ProxyBeanName) } catch (error: any) { }
let NashornWebSocketServerProxy = Java.extend(Java.type("pw.yumc.MiaoScript.websocket.WebSocketProxy"), {
onOpen: (session: TomcatWebSocketSession) => {
this.onconnect(session)

View File

@ -265,7 +265,7 @@ export class Decoder extends EventEmitter {
function tryParse(str) {
try {
return JSON.parse(str)
} catch (e) {
} catch (error: any) {
return false
}
}

View File

@ -248,8 +248,8 @@ export class Client<
// try/catch is needed for protocol violations (GH-1880)
try {
this.decoder.add(data)
} catch (e) {
this.onerror(e)
} catch (error: any) {
this.onerror(error)
}
}