lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2018-08-15 18:13:09 +08:00
parent 14ae44fcac
commit 70ba45c3bd
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/redkale/net/http/WebSocket.java
View File

@@ -37,9 +37,20 @@ import org.redkale.util.Comment;
*/ */
public abstract class WebSocket<G extends Serializable, T> { public abstract class WebSocket<G extends Serializable, T> {
@Comment("强制关闭结果码") //--------------------------- CLOSECODE -------------------------------
public static final int CLOSECODE_FORCED = 1; @Comment("服务器主动关闭")
public static final int CLOSECODE_SERVERCLOSE = 1001;
@Comment("客户端主动关闭")
public static final int CLOSECODE_CLIENTCLOSE = 1002;
@Comment("异常关闭")
public static final int CLOSECODE_WSEXCEPTION = 1003;
@Comment("异常数据强制关闭")
public static final int CLOSECODE_ILLPACKET = 1004;
//---------------------------- RETCODE --------------------------------
@Comment("消息不合法") @Comment("消息不合法")
public static final int RETCODE_SEND_ILLPACKET = 1 << 1; //2 public static final int RETCODE_SEND_ILLPACKET = 1 << 1; //2
@@ -803,7 +814,7 @@ public abstract class WebSocket<G extends Serializable, T> {
*/ */
public final void close() { public final void close() {
if (this._runner != null) { if (this._runner != null) {
CompletableFuture<Void> future = this._runner.closeRunner(CLOSECODE_FORCED, "user close"); CompletableFuture<Void> future = this._runner.closeRunner(CLOSECODE_SERVERCLOSE, "user close");
if (future != null) future.join(); if (future != null) future.join();
} }
} }

14
src/org/redkale/net/http/WebSocketRunner.java
View File

@@ -75,7 +75,7 @@ class WebSocketRunner implements Runnable {
public void completed(Integer count, Void attachment1) { public void completed(Integer count, Void attachment1) {
if (count < 1) { if (count < 1) {
if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner(userid=" + webSocket.getUserid() + ") abort on read buffer count, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds"); if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner(userid=" + webSocket.getUserid() + ") abort on read buffer count, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds");
closeRunner(0, "read buffer count is " + count); closeRunner(CLOSECODE_ILLPACKET, "read buffer count is " + count);
return; return;
} }
try { try {
@@ -182,17 +182,17 @@ class WebSocketRunner implements Runnable {
} }
} else if (packet.type == FrameType.CLOSE) { } else if (packet.type == FrameType.CLOSE) {
if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner onMessage by CLOSE FrameType : " + packet); if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner onMessage by CLOSE FrameType : " + packet);
closeRunner(0, "received CLOSE frame-type message"); closeRunner(CLOSECODE_CLIENTCLOSE, "received CLOSE frame-type message");
return; return;
} else { } else {
context.getLogger().log(Level.WARNING, "WebSocketRunner onMessage by unknown FrameType : " + packet); context.getLogger().log(Level.WARNING, "WebSocketRunner onMessage by unknown FrameType : " + packet);
closeRunner(0, "received unknown frame-type message"); closeRunner(CLOSECODE_ILLPACKET, "received unknown frame-type message");
return; return;
} }
} }
} catch (Exception e) { } catch (Exception e) {
context.getLogger().log(Level.WARNING, "WebSocketRunner(userid=" + webSocket.getUserid() + ") onMessage by received error", e); context.getLogger().log(Level.WARNING, "WebSocketRunner(userid=" + webSocket.getUserid() + ") onMessage by received error", e);
closeRunner(0, "websocket-received error"); closeRunner(CLOSECODE_WSEXCEPTION, "websocket-received error");
} }
} }
@@ -200,9 +200,9 @@ class WebSocketRunner implements Runnable {
public void failed(Throwable exc, Void attachment2) { public void failed(Throwable exc, Void attachment2) {
if (exc != null) { if (exc != null) {
if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner read WebSocketPacket failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc); if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner read WebSocketPacket failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc);
closeRunner(0, "read websocket-packet failed"); closeRunner(CLOSECODE_WSEXCEPTION, "read websocket-packet failed");
} else { } else {
closeRunner(RETCODE_ILLEGALBUFFER, "decode websocket-packet error"); closeRunner(CLOSECODE_WSEXCEPTION, "decode websocket-packet error");
} }
} }
}); });
@@ -212,7 +212,7 @@ class WebSocketRunner implements Runnable {
} }
} catch (Throwable e) { } catch (Throwable e) {
if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner abort on read bytes from channel, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", e); if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner abort on read bytes from channel, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", e);
closeRunner(0, "read bytes from channel error"); closeRunner(CLOSECODE_WSEXCEPTION, "read bytes from channel error");
} }
} }