重写

jianjianai · jianjianai · commit b6d1bbe23c92 · 2023-04-01T20:08:04.000+08:00
diff --git a/src/main/java/cn/jja8/newbinggogo/NewBingGoGoClientWebSocket.java b/src/main/java/cn/jja8/newbinggogo/NewBingGoGoClientWebSocket.java
@@ -1,21 +1,38 @@
 package cn.jja8.newbinggogo;
 
 import fi.iki.elonen.NanoWSD;
+import org.java_websocket.WebSocket;
 import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.framing.Framedata;
 import org.java_websocket.handshake.ServerHandshake;
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.LinkedList;
 
 public class NewBingGoGoClientWebSocket extends WebSocketClient {
     NewBingGoGoServerWebSocket newBingGoGoServerWebSocket;
-    public NewBingGoGoClientWebSocket(URI serverUri,NewBingGoGoServerWebSocket newBingGoGoServerWebSocket) {
+    LinkedList<String> messList;
+    public NewBingGoGoClientWebSocket(URI serverUri,NewBingGoGoServerWebSocket newBingGoGoServerWebSocket,LinkedList<String> messList) {
         super(serverUri);
         this.newBingGoGoServerWebSocket = newBingGoGoServerWebSocket;
+        this.messList = messList;
     }
 
     @Override
     public void onOpen(ServerHandshake handshakedata) {
+        for (String s : messList) {
+            send(s);
+        }
+    }
+
+    @Override
+    public void onWebsocketPong(WebSocket conn, Framedata f) {
+        try {
+            newBingGoGoServerWebSocket.ping(new byte[0]);
+        } catch (IOException e) {
+            close();
+        }
 
     }
 
diff --git a/src/main/java/cn/jja8/newbinggogo/NewBingGoGoServer.java b/src/main/java/cn/jja8/newbinggogo/NewBingGoGoServer.java
@@ -10,12 +10,9 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
 
 public class NewBingGoGoServer extends NanoWSD {
-    ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
         if(args.length<1){
             System.err.print("需要指定运行端口号！");
             return;
@@ -70,7 +67,7 @@ public Response serve(IHTTPSession session) {
 
     @Override
     protected WebSocket openWebSocket(IHTTPSession handshake) {
-        return new NewBingGoGoServerWebSocket(handshake,executor);
+        return new NewBingGoGoServerWebSocket(handshake);
     }
 
     /*
diff --git a/src/main/java/cn/jja8/newbinggogo/NewBingGoGoServerWebSocket.java b/src/main/java/cn/jja8/newbinggogo/NewBingGoGoServerWebSocket.java
@@ -6,58 +6,49 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
+import java.util.LinkedList;
 
 public class NewBingGoGoServerWebSocket extends NanoWSD.WebSocket {
     NewBingGoGoClientWebSocket newBingGoGoClientWebSocket;
-    ScheduledFuture<?> task;
-    public NewBingGoGoServerWebSocket(NanoHTTPD.IHTTPSession handshakeRequest, ScheduledExecutorService executor) {
+    LinkedList<String> messList = new LinkedList<>();
+    public NewBingGoGoServerWebSocket(NanoHTTPD.IHTTPSession handshakeRequest) {
         super(handshakeRequest);
-        task = executor.scheduleAtFixedRate(() -> {
-            try {
-                ping(new byte[1]);
-            } catch (IOException e) {
-                task.cancel(false);
-            }
-        }, 2, 2, TimeUnit.SECONDS);
-
         URI url;
         try {
             url = new URI("wss://sydney.bing.com/sydney/ChatHub");
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);//这个异常这辈子都不会出的
         }
 
-        newBingGoGoClientWebSocket = new NewBingGoGoClientWebSocket(url,this);
-        newBingGoGoClientWebSocket.connect();
+        newBingGoGoClientWebSocket = new NewBingGoGoClientWebSocket(url,this,messList);
     }
 
     @Override
     protected void onOpen() {
-
+        newBingGoGoClientWebSocket.connect();
     }
 
     @Override
     protected void onClose(NanoWSD.WebSocketFrame.CloseCode code, String reason, boolean initiatedByRemote) {
-        task.cancel(false);
         newBingGoGoClientWebSocket.close();
     }
 
     @Override
     protected void onMessage(NanoWSD.WebSocketFrame message) {
-        newBingGoGoClientWebSocket.send(message.getTextPayload());
+        if(newBingGoGoClientWebSocket.isOpen()){
+            newBingGoGoClientWebSocket.send(message.getTextPayload());
+        }else {
+            messList.addLast(message.getTextPayload());
+        }
     }
 
     @Override
     protected void onPong(NanoWSD.WebSocketFrame pong) {
-
+        newBingGoGoClientWebSocket.sendPing();
     }
 
     @Override
     protected void onException(IOException exception) {
-        task.cancel(false);
         newBingGoGoClientWebSocket.close();
     }
 }
