Updated WebSocket to toggle waiting for pending writes.

Author: joshmg

build.gradle

@@ -1,12 +1,12 @@
 group 'com.softwareverde'
-version '2.2.5'
+version '2.2.6'
 
 apply plugin: 'java'
 apply plugin: 'java-library'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 repositories {
@@ -15,9 +15,9 @@ repositories {
 }
 
 dependencies {
-    api                 group: 'com.github.softwareverde',  name: 'json',                   version: 'v2.0.0'
-    implementation      group: 'com.github.softwareverde',  name: 'java-logging',           version: 'v2.2.0'
-    implementation      group: 'com.github.softwareverde',  name: 'java-util',              version: 'v2.7.3'
+    api                 group: 'com.github.softwareverde',  name: 'json',                   version: 'v2.0.2'
+    implementation      group: 'com.github.softwareverde',  name: 'java-logging',           version: 'v2.3.0'
+    implementation      group: 'com.github.softwareverde',  name: 'java-util',              version: 'v2.9.2'
     implementation      group: 'com.github.softwareverde',  name: 'java-cryptography',      version: 'v3.2.1'
 
     testImplementation  group: 'junit', name: 'junit', version: '4.12'

src/main/java/com/softwareverde/http/websocket/SocketStreams.java

@@ -11,7 +11,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-class SocketStreams implements EndPoint {
+public class SocketStreams implements EndPoint {
     protected final AtomicBoolean _isShutdown = new AtomicBoolean(false);
     protected final ByteBuffer _packetBuffer = new ByteBuffer();
 

src/main/java/com/softwareverde/http/websocket/WebSocket.java

@@ -36,8 +36,8 @@ public interface ConnectionClosedCallback {
     protected final Integer _maxPacketByteCount;
     protected final ConnectionLayer _connectionLayer;
 
-    protected final WebSocketReader _webSocketReader;
-    protected final WebSocketWriter _webSocketWriter;
+    protected WebSocketReader _webSocketReader;
+    protected WebSocketWriter _webSocketWriter;
 
     protected final Runnable _pingRunnable = new Runnable() {
         @Override

src/main/java/com/softwareverde/http/websocket/WebSocketReader.java

@@ -8,7 +8,7 @@
 import java.io.InputStream;
 import java.net.SocketTimeoutException;
 
-class WebSocketReader {
+public class WebSocketReader {
     public interface MessageReceivedCallback {
         void onTextMessage(String message);
         void onBinaryMessage(byte[] message);
@@ -24,6 +24,8 @@ public interface MessageReceivedCallback {
 
     protected final Thread _readThread;
 
+    protected volatile boolean _waitForNoPendingWrites = false;
+
     public WebSocketReader(final WebSocket.Mode mode, final SocketStreams endPoint, final WebSocketBuffers webSocketBuffers, final MessageReceivedCallback messageReceivedCallback) {
         _messageReceivedCallback = messageReceivedCallback;
 
@@ -80,9 +82,11 @@ public void run() {
                     }
 
                     while (true) {
-                        do {
-                            Thread.sleep(100); // Prioritize writes since reading will block writes...
-                        } while ( (endPoint.getQueuedWriteByteCount() > 0) && (inputStream.available() < 1) );
+                        if (_waitForNoPendingWrites) {
+                            do {
+                                Thread.sleep(100); // Prioritize writes since reading will block writes...
+                            } while ((endPoint.getQueuedWriteByteCount() > 0) && (inputStream.available() < 1));
+                        }
 
                         final int readByteCount;
                         if (endPoint.isInputShutdown()) { break; }
@@ -108,6 +112,10 @@ public void run() {
         });
     }
 
+    public void waitUntilWritesAreCompleted(final boolean value) {
+        _waitForNoPendingWrites = value;
+    }
+
     public void start() {
         if (! _readThread.isAlive()) {
             _readThread.start();

src/main/java/com/softwareverde/http/websocket/WebSocketWriter.java

@@ -9,7 +9,7 @@
 import java.io.IOException;
 import java.security.SecureRandom;
 
-class WebSocketWriter {
+public class WebSocketWriter {
     protected final SocketStreams _endPoint;
     protected final WebSocketGeneratorRFC6455 _webSocketGeneratorRFC6455;