From 1431ce0a6e36cbea8525f2db8d2aa468f19eafc7 Mon Sep 17 00:00:00 2001 From: MiaoWoo Date: Fri, 24 Apr 2020 16:42:36 +0800 Subject: [PATCH] feat: update plugin & websocket Signed-off-by: MiaoWoo --- packages/websocket/src/server/index.ts | 13 ++++++------- .../websocket/src/server/text_websocket_frame.ts | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/websocket/src/server/index.ts b/packages/websocket/src/server/index.ts index 96449b98..d2a6496f 100644 --- a/packages/websocket/src/server/index.ts +++ b/packages/websocket/src/server/index.ts @@ -1,10 +1,10 @@ import { EventEmitter } from 'events' +import { NettyClient } from './client' +import { ServerOptions } from '../socket-io' import { ServerEvent, Keys } from './constants' import { WebSocketDetect } from './websocket_detect' import { WebSocketHandler } from './websocket_handler' -import { NettyClient } from './client' -import { ServerOptions } from '../socket-io' class NettyWebSocketServer extends EventEmitter { private pipeline: any; @@ -22,10 +22,9 @@ class NettyWebSocketServer extends EventEmitter { ctx.fireChannelRead(channel) }) connectEvent.on(ServerEvent.connect, (ctx) => { - console.log('NettyWebSocketServer ServerEvent.connect', ctx, ctx.channel().id(), ctx.channel().class.name) - let nettyClient = new NettyClient(this, ctx.channel()); - this.allClients[nettyClient.id] = nettyClient; - this.emit(ServerEvent.connect, nettyClient); + let nettyClient = new NettyClient(this, ctx.channel()) + this.allClients[nettyClient.id] = nettyClient + this.emit(ServerEvent.connect, nettyClient) }) connectEvent.on(ServerEvent.message, (ctx, msg) => { this.emit(ServerEvent.message, this.allClients[ctx.channel().id()], msg.text()) @@ -46,4 +45,4 @@ export { NettyWebSocketServer, ServerEvent, NettyClient -}; \ No newline at end of file +} diff --git a/packages/websocket/src/server/text_websocket_frame.ts b/packages/websocket/src/server/text_websocket_frame.ts index 00c4abbf..a566633b 100644 --- a/packages/websocket/src/server/text_websocket_frame.ts +++ b/packages/websocket/src/server/text_websocket_frame.ts @@ -1,7 +1,7 @@ -import { TextWebSocketFrameHandlerAdapter } from '../netty' import { EventEmitter } from 'events' import { ServerEvent } from './constants' import { ServerOptions } from '../socket-io'; +import { TextWebSocketFrameHandlerAdapter } from '../netty' export class TextWebSocketFrameHandler extends TextWebSocketFrameHandlerAdapter { private event: EventEmitter;