Merge pull request #92 from socketio/compatible-1.8.4

update for engine.io-client 1.8.4

Author: nkzawa

src/main/java/io/socket/engineio/client/Socket.java

@@ -496,7 +496,9 @@ private void onOpen() {
     }
 
     private void onPacket(Packet packet) {
-        if (this.readyState == ReadyState.OPENING || this.readyState == ReadyState.OPEN) {
+        if (this.readyState == ReadyState.OPENING ||
+                this.readyState == ReadyState.OPEN ||
+                this.readyState == ReadyState.CLOSING) {
             logger.fine(String.format("socket received: type '%s', data '%s'", packet.type, packet.data));
 
             this.emit(EVENT_PACKET, packet);

src/main/java/io/socket/engineio/client/transports/PollingXHR.java

@@ -167,6 +167,8 @@ public void create() {
                 headers.put("Content-type", new LinkedList<String>(Collections.singletonList(BINARY_CONTENT_TYPE)));
             }
 
+            headers.put("Accept", new LinkedList<String>(Collections.singletonList("*/*")));
+
             self.onRequestHeaders(headers);
 
             logger.fine(String.format("sending xhr with url %s | data %s", this.uri, Arrays.toString(this.data)));

src/main/java/io/socket/engineio/parser/Parser.java

@@ -76,6 +76,10 @@ public static Packet<String> decodePacket(String data) {
     }
 
     public static Packet<String> decodePacket(String data, boolean utf8decode) {
+        if (data == null) {
+            return err;
+        }
+
         int type;
         try {
             type = Character.getNumericValue(data.charAt(0));

src/test/java/io/socket/engineio/parser/ParserTest.java

@@ -156,6 +156,13 @@ public void call(String data) {
         });
     }
 
+    @Test
+    public void decodeEmptyPayload() {
+        Packet<String> p = decodePacket((String)null);
+        assertThat(p.type, is(Packet.ERROR));
+        assertThat(p.data, is(ERROR_DATA));
+    }
+
     @Test
     public void decodeBadFormat() {
         Packet<String> p = decodePacket(":::");

src/test/resources/package-lock.json

@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "engine.io": "1.6.11"
+    "engine.io": "1.8.4"
   }
 }