From df1646dc15fcf17c1c01e47751a56de276be61e9 Mon Sep 17 00:00:00 2001
From: MiaoWoo <admin@yumc.pw>
Date: Thu, 17 Dec 2020 17:01:09 +0800
Subject: [PATCH] feat: export server & client

Signed-off-by: MiaoWoo <admin@yumc.pw>
---
 packages/websocket/src/index.ts            | 4 ++++
 packages/websocket/src/netty/index.ts      | 1 -
 packages/websocket/src/socket-io/client.ts | 2 +-
 packages/websocket/src/tomcat/index.ts     | 6 ++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/websocket/src/index.ts b/packages/websocket/src/index.ts
index ac3ae019..146a5262 100644
--- a/packages/websocket/src/index.ts
+++ b/packages/websocket/src/index.ts
@@ -45,3 +45,7 @@ let io: SocketStatic = function (pipeline: any, options: Partial<ServerOptions>)
 io.Instance = Symbol("@ccms/websocket")
 export default io
 export * from './socket-io'
+export * from './client'
+export * from './netty'
+export * from './tomcat'
+export * from './transport'
diff --git a/packages/websocket/src/netty/index.ts b/packages/websocket/src/netty/index.ts
index 7dc96fb1..0f7fe1ab 100644
--- a/packages/websocket/src/netty/index.ts
+++ b/packages/websocket/src/netty/index.ts
@@ -65,6 +65,5 @@ class NettyWebSocketServer extends EventEmitter {
 
 export {
     NettyWebSocketServer,
-    ServerEvent,
     NettyClient
 }
diff --git a/packages/websocket/src/socket-io/client.ts b/packages/websocket/src/socket-io/client.ts
index 7a9773ad..0f20dbd4 100644
--- a/packages/websocket/src/socket-io/client.ts
+++ b/packages/websocket/src/socket-io/client.ts
@@ -350,7 +350,7 @@ export class Client extends EventEmitter {
      *
      * @api private
      */
-    resetPingTimeout(timeout) {
+    resetPingTimeout(timeout: number) {
         clearTimeout(this.pingTimeoutTimer)
         this.pingTimeoutTimer = setTimeout(() => {
             if (this.conn.readyState === "closed") return
diff --git a/packages/websocket/src/tomcat/index.ts b/packages/websocket/src/tomcat/index.ts
index 7b855d49..22e81fd8 100644
--- a/packages/websocket/src/tomcat/index.ts
+++ b/packages/websocket/src/tomcat/index.ts
@@ -5,9 +5,7 @@ import { ServerEvent } from '../socket-io/constants'
 import { ProxyBeanName } from './constants'
 import { TomcatClient } from './client'
 
-const WebSocketServerProxy = Java.type("pw.yumc.MiaoScript.websocket.WebSocketProxy")
 const ThreadPoolExecutor = Java.type('java.util.concurrent.ThreadPoolExecutor')
-const ThreadPoolTaskExecutor = Java.type('org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor')
 
 type TomcatWebSocketSession = javax.websocket.Session
 
@@ -22,7 +20,7 @@ class TomcatWebSocketServer extends EventEmitter {
         this.beanFactory = beanFactory
         this.initThreadPool()
         try { this.beanFactory.destroySingleton(ProxyBeanName) } catch (error) { }
-        let NashornWebSocketServerProxy = Java.extend(WebSocketServerProxy, {
+        let NashornWebSocketServerProxy = Java.extend(Java.type("pw.yumc.MiaoScript.websocket.WebSocketProxy"), {
             onOpen: (session: TomcatWebSocketSession) => {
                 let cid = `${session?.getId()}`
                 let tomcatClient = new TomcatClient(this, session)
@@ -58,6 +56,7 @@ class TomcatWebSocketServer extends EventEmitter {
         this.beanFactory.registerSingleton(ProxyBeanName, new NashornWebSocketServerProxy())
     }
     private initThreadPool() {
+        const ThreadPoolTaskExecutor = Java.type('org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor')
         this.executor = new ThreadPoolTaskExecutor()
         this.executor.setCorePoolSize(10)
         this.executor.setMaxPoolSize(100)
@@ -76,6 +75,5 @@ class TomcatWebSocketServer extends EventEmitter {
 
 export {
     TomcatWebSocketServer,
-    ServerEvent,
     TomcatClient
 }