feat close code: v1.5.3-R1

- 4004 Authentication fail #about #40
- -1 CloseFrame.NEVER_CONNECTED

> 测试版本不确定有效

Author: Kloping

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.kloping</groupId>
     <artifactId>bot-qqpd-java</artifactId>
-    <version>1.5.3-L1</version>
+    <version>1.5.3-R1</version>
 
     <packaging>jar</packaging>
     <name>bot-qqpd-java</name>

src/main/java/io/github/kloping/qqbot/Start0.java

@@ -2,7 +2,7 @@
 
 import io.github.kloping.qqbot.entities.qqpd.Channel;
 import io.github.kloping.qqbot.http.AuthV2Base;
-import io.github.kloping.qqbot.http.data.Token;
+import io.github.kloping.qqbot.http.data.AccessToken;
 import io.github.kloping.spt.annotations.AutoStand;
 import io.github.kloping.spt.annotations.ComponentScan;
 import io.github.kloping.spt.interfaces.component.ContextManager;
@@ -24,19 +24,19 @@ public class Start0 {
 
     //ALL req token header
     public synchronized Map<String, String> getHeaders() {
-        if (headers.isEmpty() || isExpired(token)) updateToken();
+        if (headers.isEmpty() || isExpired(accessToken)) updateToken();
         return headers;
     }
 
-    private boolean isExpired(Token token) {
-        return token == null || token.isExpired();
+    private boolean isExpired(AccessToken accessToken) {
+        return accessToken == null || accessToken.isExpired();
     }
 
-    private Token token;
+    private AccessToken accessToken;
 
     public String getAccessToken() {
-        if (isExpired(token)) updateToken();
-        return token.getAccess_token();
+        if (isExpired(accessToken)) updateToken();
+        return accessToken.getAccess_token();
     }
 
     public void updateToken() {
@@ -53,9 +53,9 @@ public void updateToken() {
     private String getV2Token() {
         String appid = contextManager.getContextEntity(String.class, Starter.APPID_ID);
         String secret = contextManager.getContextEntity(String.class, Starter.SECRET_ID);
-        token = authV2Base.auth(new AppidAndSecret(appid, secret),
+        accessToken = authV2Base.auth(new AppidAndSecret(appid, secret),
                 Channel.SEND_MESSAGE_HEADERS).setT0(System.currentTimeMillis());
-        return token.getAccess_token();
+        return accessToken.getAccess_token();
     }
 
     @Data

src/main/java/io/github/kloping/qqbot/http/AuthV2Base.java

@@ -1,7 +1,7 @@
 package io.github.kloping.qqbot.http;
 
 import io.github.kloping.qqbot.Start0;
-import io.github.kloping.qqbot.http.data.Token;
+import io.github.kloping.qqbot.http.data.AccessToken;
 import io.github.kloping.spt.annotations.http.Headers;
 import io.github.kloping.spt.annotations.http.HttpClient;
 import io.github.kloping.spt.annotations.http.PostPath;
@@ -21,5 +21,5 @@ public interface AuthV2Base {
      * @return
      */
     @PostPath("/app/getAppAccessToken")
-    Token auth(@RequestBody(type = io.github.kloping.spt.annotations.http.RequestBody.type.json) Start0.AppidAndSecret aa, @Headers Map<String, String> headers);
+    AccessToken auth(@RequestBody(type = io.github.kloping.spt.annotations.http.RequestBody.type.json) Start0.AppidAndSecret aa, @Headers Map<String, String> headers);
 }

…ithub/kloping/qqbot/http/data/Token.java …kloping/qqbot/http/data/AccessToken.javasrc/main/java/io/github/kloping/qqbot/http/data/Token.java renamed to src/main/java/io/github/kloping/qqbot/http/data/AccessToken.java src/main/java/io/github/kloping/qqbot/http/data/Token.java renamed to src/main/java/io/github/kloping/qqbot/http/data/AccessToken.java

@@ -15,7 +15,7 @@
  */
 @Data
 @Accessors(chain = true)
-public class Token {
+public class AccessToken {
     private String access_token;
     private String expires_in;
 

src/main/java/io/github/kloping/qqbot/impl/BaseConnectedEvent.java

@@ -50,7 +50,7 @@ public String getId() {
         return getMetadata().get("id").toString();
     }
 
-    public static final String VERSION = "1.5.3-L1";
+    public static final String VERSION = "1.5.3-R1";
     public static final String PROJECT_NAME = "qqpd-bot-java";
     public static final String AUTHOR = "kloping";
     public static final String FORMAT = "Bot(%s) connected! By " + AUTHOR + " of " + PROJECT_NAME + " v" + VERSION;

src/main/java/io/github/kloping/qqbot/network/AuthAndHeartbeat.java

@@ -19,6 +19,7 @@
 import io.github.kloping.spt.interfaces.Logger;
 import io.github.kloping.spt.interfaces.component.ContextManager;
 import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.framing.CloseFrame;
 
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledFuture;
@@ -33,6 +34,8 @@
 public class AuthAndHeartbeat implements OnPackReceive, OnCloseListener, Events.EventRegister {
 
     public static final int CODE_ERROR = -10001;
+    //Authentication fail
+    public static final int CODE_4004 = 4004;
     public static final int CODE_4006 = 4006;
     public static final int CODE_4007 = 4007;
     public static final int CODE_4008 = 4008;
@@ -71,17 +74,22 @@ public void onClose(int code, WebSocketClient wss) {
                 code == CODE_4008 || code == CODE_4009 || (code >= CODE_4900 && code <= CODE_4913)) {
             identifyConnect(code, wss);
         } else switch (code) {
+            case CloseFrame.NEVER_CONNECTED:
+            case CODE_1011:
+            case 1001:
+                delayIdentifyConnect(code, wss);
+                break;
+            case CODE_4004:
+                start0.updateToken();
+                identifyConnect(code, wss);
+                break;
             case 4013:
             case 4014:
                 logger.error("无权限订阅事件");
                 break;
             case 1006:
                 identifyConnect(code, wss);
                 break;
-            case CODE_1011:
-            case 1001:
-                delayIdentifyConnect(code, wss);
-                break;
             default:
                 logger.error(String.format("暂未处理的异常code(%s)", code));
                 if (config.getAnyCloseReconnect()) delayIdentifyConnect(code, wss);
@@ -117,6 +125,7 @@ public void identifyConnect(int code, WebSocketClient wss) {
         }
         wssWorker.msgr = 0;
         wssWorker.msgs = 0;
+        wssWorker.webSocket.close();
         future = Public.EXECUTOR_SERVICE1.submit(wssWorker);
         contextManager.append(future, Starter.MAIN_FUTURE_ID);
     }