diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..439755f9 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,34 @@ +name: CI + +on: + push: + pull_request: + schedule: + - cron: '0 0 * * 0' + +jobs: + verify: + runs-on: ubuntu-latest + + strategy: + matrix: + java: [7, 8, 11] + + steps: + - uses: actions/checkout@v2 + - name: Setup java + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Cache Maven packages + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Setup Node.js + uses: actions/setup-node@v1 + with: + node-version: 14.x + - name: Run the Maven verify phase + run: mvn verify -Dgpg.skip=true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 84c2bc29..00000000 --- a/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: java -sudo: false -install: mvn install -DskipTests=true -Dgpg.skip=true -jdk: - - openjdk7 - - oraclejdk8 -dist: trusty diff --git a/History.md b/History.md index 1d187084..6adbf3cf 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,24 @@ +2.0.0 / 2020-12-11 +================== + +### Features + +* add an extraHeaders option ([dfe65e3](https://github.com/socketio/engine.io-client-java/commit/dfe65e3b3b5eab4c3fddb9dfbf53d684fe461043)) +* add support for Engine.IO v4 ([41f89a3](https://github.com/socketio/engine.io-client-java/commit/41f89a38b7594f54ee9906bc91051874a60b690d)) + +### Bug Fixes + +* check the type of the initial packet ([2b5dfb9](https://github.com/socketio/engine.io-client-java/commit/2b5dfb99f8f865362ddc0a17f52e8b70269d7572)) + + +1.0.1 / 2020-12-10 +================== + +### Bug Fixes + +* handle responses without content type ([#101](https://github.com/socketio/engine.io-client-java/issues/101)) ([6f065b7](https://github.com/socketio/engine.io-client-java/commit/6f065b7a62603730979d43cec71af0046ca4ab7c)) + 1.0.0 / 2017-07-14 ================== diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..cc752f8b --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +help: ## print this message + @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' + +build-site: ## build the site + mvn javadoc:javadoc site -DskipTests + +.PHONY: build-site diff --git a/README.md b/README.md index 8abe70ae..643fbdc4 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,31 @@ # Engine.IO-client Java -[![Build Status](https://travis-ci.org/socketio/engine.io-client-java.png?branch=master)](https://travis-ci.org/socketio/engine.io-client-java) + +[![Build Status](https://github.com/socketio/engine.io-client-java/workflows/CI/badge.svg)](https://github.com/socketio/engine.io-client-java/actions) This is the Engine.IO Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/socketio/engine.io-client). See also: [Socket.IO-client Java](https://github.com/socketio/socket.io-client-java) +## Table of content + +- [Compatibility](#compatibility) +- [Installation](#installation) + - [Maven](#maven) + - [Gradle](#gradle) +- [Usage](#usage) +- [Features](#features) +- [License](#license) + +## Compatibility + +| Client version | Engine.IO server | Socket.IO server | +| -------------- | ---------------- | ---------------- | +| 0.9.x | 1.x | 1.x | +| 1.x | 3.x | 2.x | +| 2.x | 4.x | 3.x | + ## Installation -The latest artifact is available on Maven Central. To install manually, please refer [dependencies](https://socketio.github.io/engine.io-client-java/dependencies.html). +The latest artifact is available on Maven Central. ### Maven Add the following dependency to your `pom.xml`. @@ -16,7 +35,7 @@ Add the following dependency to your `pom.xml`. io.socket engine.io-client - 1.0.0 + 2.0.0 ``` @@ -25,17 +44,12 @@ Add the following dependency to your `pom.xml`. Add it as a gradle dependency for Android Studio, in `build.gradle`: ```groovy -compile ('io.socket:engine.io-client:1.0.0') { +compile ('io.socket:engine.io-client:2.0.0') { // excluding org.json which is provided by Android exclude group: 'org.json', module: 'json' } ``` -#### Engine.IO Server 1.x suppport - -The current version of engine.io-client-java doesn't support engine.io server 1.x. -Please use engine.io-client-java 0.9.x for that instead. - ## Usage Engine.IO-client Java has the similar api with the JS client. You can use `Socket` to connect: @@ -118,43 +132,6 @@ socket = new Socket(opts); ## Features This library supports all of the features the JS client does, including events, options and upgrading transport. Android is fully supported. -### Extra features only for Java client - -#### Accessing HTTP Headers -You can access HTTP headers like the following. - -```java -socket.on(Socket.EVENT_TRANSPORT, new Emitter.listener() { - @Override - public void call(Object... args) { - // Called on a new transport created. - Transport transport = (Transport)args[0]; - - transport.on(Transport.EVENT_REQUEST_HEADERS, new Emitter.Listener() { - @Override - public void call(Object... args) { - @SuppressWarnings("unchecked") - Map> headers = (Map>)args[0]; - // send cookie value to server. - headers.put("Cookie", Arrays.asList("foo=1;")); - } - }).on(Transport.EVENT_RESPONSE_HEADERS, new Emitter.Listener() { - @Override - public void call(Object... args) { - @SuppressWarnings("unchecked") - Map> headers = (Map>)args[0]; - // receive cookie value from server. - String cookie = headers.get("Set-Cookie").get(0); - } - }); - } -}); -``` - -See the Javadoc for more details. - -http://socketio.github.io/engine.io-client-java/apidocs/ - ## License MIT diff --git a/pom.xml b/pom.xml index e722fc2f..3e9e3c97 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.socket engine.io-client - 1.0.1-SNAPSHOT + 2.0.1-SNAPSHOT jar engine.io-client Engine.IO Client Library for Java @@ -49,7 +49,7 @@ com.squareup.okhttp3 okhttp - 3.8.1 + 3.12.12 org.json @@ -200,20 +200,9 @@ 2.3 - com.github.github - site-maven-plugin - 0.12 - - Creating site for ${project.version} - - - - - site - - site - - + org.apache.maven.plugins + maven-site-plugin + 3.9.1 diff --git a/src/main/java/io/socket/engineio/client/Socket.java b/src/main/java/io/socket/engineio/client/Socket.java index 3f61f9ad..02de6bd5 100644 --- a/src/main/java/io/socket/engineio/client/Socket.java +++ b/src/main/java/io/socket/engineio/client/Socket.java @@ -4,16 +4,9 @@ import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; @@ -37,6 +30,8 @@ public class Socket extends Emitter { private static final Logger logger = Logger.getLogger(Socket.class.getName()); + private static final AtomicInteger HEARTBEAT_THREAD_COUNTER = new AtomicInteger(); + private static final String PROBE_ERROR = "probe error"; @@ -128,16 +123,16 @@ public String toString() { /*package*/ LinkedList writeBuffer = new LinkedList(); /*package*/ Transport transport; private Future pingTimeoutTimer; - private Future pingIntervalTimer; private okhttp3.WebSocket.Factory webSocketFactory; private okhttp3.Call.Factory callFactory; + private final Map> extraHeaders; private ReadyState readyState; private ScheduledExecutorService heartbeatScheduler; private final Listener onHeartbeatAsListener = new Listener() { @Override public void call(Object... args) { - Socket.this.onHeartbeat(args.length > 0 ? (Long)args[0]: 0); + Socket.this.onHeartbeat(); } }; @@ -222,6 +217,7 @@ public Socket(Options opts) { } webSocketFactory = defaultOkHttpClient; } + this.extraHeaders = opts.extraHeaders; } public static void setDefaultOkHttpWebSocketFactory(okhttp3.WebSocket.Factory factory) { @@ -294,6 +290,7 @@ private Transport createTransport(String name) { opts.policyPort = options != null ? options.policyPort : this.policyPort; opts.callFactory = options != null ? options.callFactory : this.callFactory; opts.webSocketFactory = options != null ? options.webSocketFactory : this.webSocketFactory; + opts.extraHeaders = this.extraHeaders; Transport transport; if (WebSocket.NAME.equals(name)) { @@ -540,9 +537,14 @@ private void onPacket(Packet packet) { } catch (JSONException e) { this.emit(EVENT_ERROR, new EngineIOException(e)); } - } else if (Packet.PONG.equals(packet.type)) { - this.setPing(); - this.emit(EVENT_PONG); + } else if (Packet.PING.equals(packet.type)) { + this.emit(EVENT_PING); + EventThread.exec(new Runnable() { + @Override + public void run() { + Socket.this.sendPacket(Packet.PONG, null); + } + }); } else if (Packet.ERROR.equals(packet.type)) { EngineIOException err = new EngineIOException("server error"); err.code = packet.data; @@ -568,20 +570,18 @@ private void onHandshake(HandshakeData data) { this.onOpen(); // In case open handler closes socket if (ReadyState.CLOSED == this.readyState) return; - this.setPing(); + this.onHeartbeat(); this.off(EVENT_HEARTBEAT, this.onHeartbeatAsListener); this.on(EVENT_HEARTBEAT, this.onHeartbeatAsListener); } - private void onHeartbeat(long timeout) { + private void onHeartbeat() { if (this.pingTimeoutTimer != null) { pingTimeoutTimer.cancel(false); } - if (timeout <= 0) { - timeout = this.pingInterval + this.pingTimeout; - } + long timeout = this.pingInterval + this.pingTimeout; final Socket self = this; this.pingTimeoutTimer = this.getHeartbeatScheduler().schedule(new Runnable() { @@ -598,46 +598,6 @@ public void run() { }, timeout, TimeUnit.MILLISECONDS); } - private void setPing() { - if (this.pingIntervalTimer != null) { - pingIntervalTimer.cancel(false); - } - - final Socket self = this; - this.pingIntervalTimer = this.getHeartbeatScheduler().schedule(new Runnable() { - @Override - public void run() { - EventThread.exec(new Runnable() { - @Override - public void run() { - if (logger.isLoggable(Level.FINE)) { - logger.fine(String.format("writing ping packet - expecting pong within %sms", self.pingTimeout)); - } - self.ping(); - self.onHeartbeat(self.pingTimeout); - } - }); - } - }, this.pingInterval, TimeUnit.MILLISECONDS); - } - - /** - * Sends a ping packet. - */ - private void ping() { - EventThread.exec(new Runnable() { - @Override - public void run() { - Socket.this.sendPacket(Packet.PING, new Runnable() { - @Override - public void run() { - Socket.this.emit(EVENT_PING); - } - }); - } - }); - } - private void onDrain() { for (int i = 0; i < this.prevBufferLen; i++) { this.writeBuffer.poll(); @@ -833,9 +793,6 @@ private void onClose(String reason, Exception desc) { final Socket self = this; // clear timers - if (this.pingIntervalTimer != null) { - this.pingIntervalTimer.cancel(false); - } if (this.pingTimeoutTimer != null) { this.pingTimeoutTimer.cancel(false); } @@ -886,11 +843,22 @@ public String id() { private ScheduledExecutorService getHeartbeatScheduler() { if (this.heartbeatScheduler == null || this.heartbeatScheduler.isShutdown()) { - this.heartbeatScheduler = Executors.newSingleThreadScheduledExecutor(); + this.heartbeatScheduler = createHeartbeatScheduler(); } return this.heartbeatScheduler; } + private ScheduledExecutorService createHeartbeatScheduler() { + return Executors.newSingleThreadScheduledExecutor(new ThreadFactory() { + @Override + public Thread newThread(Runnable r) { + Thread thread = new Thread(r, "engine.io-client.heartbeat-" + HEARTBEAT_THREAD_COUNTER.getAndIncrement()); + thread.setDaemon(true); + return thread; + } + }); + } + public static class Options extends Transport.Options { /** diff --git a/src/main/java/io/socket/engineio/client/Transport.java b/src/main/java/io/socket/engineio/client/Transport.java index 442c7762..7a8ce5cf 100644 --- a/src/main/java/io/socket/engineio/client/Transport.java +++ b/src/main/java/io/socket/engineio/client/Transport.java @@ -1,13 +1,13 @@ package io.socket.engineio.client; +import java.util.List; import java.util.Map; import io.socket.emitter.Emitter; import io.socket.engineio.parser.Packet; import io.socket.engineio.parser.Parser; import io.socket.thread.EventThread; -import io.socket.utf8.UTF8Exception; import okhttp3.Call; import okhttp3.WebSocket; @@ -44,6 +44,7 @@ public String toString() { protected ReadyState readyState; protected WebSocket.Factory webSocketFactory; protected Call.Factory callFactory; + protected Map> extraHeaders; public Transport(Options opts) { this.path = opts.path; @@ -56,6 +57,7 @@ public Transport(Options opts) { this.socket = opts.socket; this.webSocketFactory = opts.webSocketFactory; this.callFactory = opts.callFactory; + this.extraHeaders = opts.extraHeaders; } protected Transport onError(String msg, Exception desc) { @@ -96,11 +98,7 @@ public void send(final Packet[] packets) { @Override public void run() { if (Transport.this.readyState == ReadyState.OPEN) { - try { - Transport.this.write(packets); - } catch (UTF8Exception err) { - throw new RuntimeException(err); - } + Transport.this.write(packets); } else { throw new RuntimeException("Transport not open"); } @@ -131,7 +129,7 @@ protected void onClose() { this.emit(EVENT_CLOSE); } - abstract protected void write(Packet[] packets) throws UTF8Exception; + abstract protected void write(Packet[] packets); abstract protected void doOpen(); @@ -151,5 +149,6 @@ public static class Options { protected Socket socket; public WebSocket.Factory webSocketFactory; public Call.Factory callFactory; + public Map> extraHeaders; } } diff --git a/src/main/java/io/socket/engineio/client/transports/Polling.java b/src/main/java/io/socket/engineio/client/transports/Polling.java index 9341d9ac..3ac62f27 100644 --- a/src/main/java/io/socket/engineio/client/transports/Polling.java +++ b/src/main/java/io/socket/engineio/client/transports/Polling.java @@ -7,7 +7,6 @@ import io.socket.engineio.parser.Parser; import io.socket.parseqs.ParseQS; import io.socket.thread.EventThread; -import io.socket.utf8.UTF8Exception; import io.socket.yeast.Yeast; import java.util.HashMap; @@ -115,7 +114,7 @@ private void _onData(Object data) { Parser.DecodePayloadCallback callback = new Parser.DecodePayloadCallback() { @Override public boolean call(Packet packet, int index, int total) { - if (self.readyState == ReadyState.OPENING) { + if (self.readyState == ReadyState.OPENING && Packet.OPEN.equals(packet.type)) { self.onOpen(); } @@ -129,13 +128,7 @@ public boolean call(Packet packet, int index, int total) { } }; - if (data instanceof String) { - @SuppressWarnings("unchecked") - Parser.DecodePayloadCallback tempCallback = callback; - Parser.decodePayload((String)data, tempCallback); - } else if (data instanceof byte[]) { - Parser.decodePayload((byte[])data, callback); - } + Parser.decodePayload((String) data, callback); if (this.readyState != ReadyState.CLOSED) { this.polling = false; @@ -158,11 +151,7 @@ protected void doClose() { @Override public void call(Object... args) { logger.fine("writing close packet"); - try { - self.write(new Packet[]{new Packet(Packet.CLOSE)}); - } catch (UTF8Exception err) { - throw new RuntimeException(err); - } + self.write(new Packet[]{new Packet(Packet.CLOSE)}); } }; @@ -177,7 +166,7 @@ public void call(Object... args) { } } - protected void write(Packet[] packets) throws UTF8Exception { + protected void write(Packet[] packets) { final Polling self = this; this.writable = false; final Runnable callbackfn = new Runnable() { @@ -188,16 +177,10 @@ public void run() { } }; - Parser.encodePayload(packets, new Parser.EncodeCallback() { + Parser.encodePayload(packets, new Parser.EncodeCallback() { @Override - public void call(Object data) { - if (data instanceof byte[]) { - self.doWrite((byte[])data, callbackfn); - } else if (data instanceof String) { - self.doWrite((String)data, callbackfn); - } else { - logger.warning("Unexpected data: " + data); - } + public void call(String data) { + self.doWrite(data, callbackfn); } }); } @@ -229,8 +212,6 @@ protected String uri() { return schema + "://" + (ipv6 ? "[" + this.hostname + "]" : this.hostname) + port + this.path + derivedQuery; } - abstract protected void doWrite(byte[] data, Runnable fn); - abstract protected void doWrite(String data, Runnable fn); abstract protected void doPoll(); diff --git a/src/main/java/io/socket/engineio/client/transports/PollingXHR.java b/src/main/java/io/socket/engineio/client/transports/PollingXHR.java index ed118eb3..11ec6b38 100644 --- a/src/main/java/io/socket/engineio/client/transports/PollingXHR.java +++ b/src/main/java/io/socket/engineio/client/transports/PollingXHR.java @@ -43,6 +43,7 @@ protected Request request(Request.Options opts) { } opts.uri = this.uri(); opts.callFactory = this.callFactory; + opts.extraHeaders = this.extraHeaders; Request req = new Request(opts); @@ -67,20 +68,12 @@ public void run() { return req; } - @Override - protected void doWrite(byte[] data, final Runnable fn) { - this.doWrite((Object) data, fn); - } - @Override protected void doWrite(String data, final Runnable fn) { - this.doWrite((Object) data, fn); - } - - private void doWrite(Object data, final Runnable fn) { Request.Options opts = new Request.Options(); opts.method = "POST"; opts.data = data; + opts.extraHeaders = this.extraHeaders; Request req = this.request(opts); final PollingXHR self = this; req.on(Request.EVENT_SUCCESS, new Emitter.Listener() { @@ -121,11 +114,7 @@ public void call(final Object... args) { @Override public void run() { Object arg = args.length > 0 ? args[0] : null; - if (arg instanceof String) { - self.onData((String)arg); - } else if (arg instanceof byte[]) { - self.onData((byte[])arg); - } + self.onData((String)arg); } }); } @@ -153,18 +142,17 @@ public static class Request extends Emitter { public static final String EVENT_REQUEST_HEADERS = "requestHeaders"; public static final String EVENT_RESPONSE_HEADERS = "responseHeaders"; - private static final String BINARY_CONTENT_TYPE = "application/octet-stream"; private static final String TEXT_CONTENT_TYPE = "text/plain;charset=UTF-8"; - private static final MediaType BINARY_MEDIA_TYPE = MediaType.parse(BINARY_CONTENT_TYPE); private static final MediaType TEXT_MEDIA_TYPE = MediaType.parse(TEXT_CONTENT_TYPE); private String method; private String uri; - private Object data; + private String data; private Call.Factory callFactory; + private Map> extraHeaders; private Response response; private Call requestCall; @@ -173,19 +161,18 @@ public Request(Options opts) { this.uri = opts.uri; this.data = opts.data; this.callFactory = opts.callFactory != null ? opts.callFactory : new OkHttpClient(); + this.extraHeaders = opts.extraHeaders; } public void create() { final Request self = this; if (LOGGABLE_FINE) logger.fine(String.format("xhr open %s: %s", this.method, this.uri)); Map> headers = new TreeMap>(String.CASE_INSENSITIVE_ORDER); - + if (this.extraHeaders != null) { + headers.putAll(this.extraHeaders); + } if ("POST".equals(this.method)) { - if (this.data instanceof byte[]) { - headers.put("Content-type", new LinkedList(Collections.singletonList(BINARY_CONTENT_TYPE))); - } else { - headers.put("Content-type", new LinkedList(Collections.singletonList(TEXT_CONTENT_TYPE))); - } + headers.put("Content-type", new LinkedList(Collections.singletonList(TEXT_CONTENT_TYPE))); } headers.put("Accept", new LinkedList(Collections.singletonList("*/*"))); @@ -193,8 +180,7 @@ public void create() { this.onRequestHeaders(headers); if (LOGGABLE_FINE) { - logger.fine(String.format("sending xhr with url %s | data %s", this.uri, - this.data instanceof byte[] ? Arrays.toString((byte[]) this.data) : this.data)); + logger.fine(String.format("sending xhr with url %s | data %s", this.uri, this.data)); } okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder(); @@ -204,10 +190,8 @@ public void create() { } } RequestBody body = null; - if (this.data instanceof byte[]) { - body = RequestBody.create(BINARY_MEDIA_TYPE, (byte[])this.data); - } else if (this.data instanceof String) { - body = RequestBody.create(TEXT_MEDIA_TYPE, (String)this.data); + if (this.data != null) { + body = RequestBody.create(TEXT_MEDIA_TYPE, this.data); } okhttp3.Request request = requestBuilder @@ -249,11 +233,6 @@ private void onData(String data) { this.onSuccess(); } - private void onData(byte[] data) { - this.emit(EVENT_DATA, data); - this.onSuccess(); - } - private void onError(Exception err) { this.emit(EVENT_ERROR, err); } @@ -268,14 +247,9 @@ private void onResponseHeaders(Map> headers) { private void onLoad() { ResponseBody body = response.body(); - String contentType = body.contentType().toString(); try { - if (BINARY_CONTENT_TYPE.equalsIgnoreCase(contentType)) { - this.onData(body.bytes()); - } else { - this.onData(body.string()); - } + this.onData(body.string()); } catch (IOException e) { this.onError(e); } @@ -285,8 +259,9 @@ public static class Options { public String uri; public String method; - public Object data; + public String data; public Call.Factory callFactory; + public Map> extraHeaders; } } } diff --git a/src/main/java/io/socket/engineio/client/transports/WebSocket.java b/src/main/java/io/socket/engineio/client/transports/WebSocket.java index d6e2f1a3..c2153c35 100644 --- a/src/main/java/io/socket/engineio/client/transports/WebSocket.java +++ b/src/main/java/io/socket/engineio/client/transports/WebSocket.java @@ -1,18 +1,11 @@ package io.socket.engineio.client.transports; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.logging.Logger; - import io.socket.engineio.client.Transport; import io.socket.engineio.parser.Packet; import io.socket.engineio.parser.Parser; import io.socket.parseqs.ParseQS; import io.socket.thread.EventThread; -import io.socket.utf8.UTF8Exception; import io.socket.yeast.Yeast; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -20,6 +13,12 @@ import okhttp3.WebSocketListener; import okio.ByteString; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.logging.Logger; + public class WebSocket extends Transport { @@ -36,6 +35,9 @@ public WebSocket(Options opts) { protected void doOpen() { Map> headers = new TreeMap>(String.CASE_INSENSITIVE_ORDER); + if (this.extraHeaders != null) { + headers.putAll(this.extraHeaders); + } this.emit(EVENT_REQUEST_HEADERS, headers); final WebSocket self = this; @@ -111,7 +113,7 @@ public void run() { }); } - protected void write(Packet[] packets) throws UTF8Exception { + protected void write(Packet[] packets) { final WebSocket self = this; this.writable = false; diff --git a/src/main/java/io/socket/engineio/parser/Base64.java b/src/main/java/io/socket/engineio/parser/Base64.java new file mode 100644 index 00000000..d56a7cea --- /dev/null +++ b/src/main/java/io/socket/engineio/parser/Base64.java @@ -0,0 +1,665 @@ +// from https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/util/Base64.java +package io.socket.engineio.parser; + +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.io.UnsupportedEncodingException; + +/** + * Utilities for encoding and decoding the Base64 representation of + * binary data. See RFCs 2045 and 3548. + */ +public class Base64 { + /** + * Default values for encoder/decoder flags. + */ + public static final int DEFAULT = 0; + /** + * Encoder flag bit to omit the padding '=' characters at the end + * of the output (if any). + */ + public static final int NO_PADDING = 1; + /** + * Encoder flag bit to omit all line terminators (i.e., the output + * will be on one long line). + */ + public static final int NO_WRAP = 2; + /** + * Encoder flag bit to indicate lines should be terminated with a + * CRLF pair instead of just an LF. Has no effect if {@code + * NO_WRAP} is specified as well. + */ + public static final int CRLF = 4; + /** + * Encoder/decoder flag bit to indicate using the "URL and + * filename safe" variant of Base64 (see RFC 3548 section 4) where + * {@code -} and {@code _} are used in place of {@code +} and + * {@code /}. + */ + public static final int URL_SAFE = 8; + /** + * Flag to pass to Base64OutputStream to indicate that it + * should not close the output stream it is wrapping when it + * itself is closed. + */ + public static final int NO_CLOSE = 16; + // -------------------------------------------------------- + // shared code + // -------------------------------------------------------- + /* package */ static abstract class Coder { + public byte[] output; + public int op; + /** + * Encode/decode another block of input data. this.output is + * provided by the caller, and must be big enough to hold all + * the coded data. On exit, this.opwill be set to the length + * of the coded data. + * + * @param finish true if this is the final call to process for + * this object. Will finalize the coder state and + * include any final bytes in the output. + * + * @return true if the input so far is good; false if some + * error has been detected in the input stream.. + */ + public abstract boolean process(byte[] input, int offset, int len, boolean finish); + /** + * @return the maximum number of bytes a call to process() + * could produce for the given number of input bytes. This may + * be an overestimate. + */ + public abstract int maxOutputSize(int len); + } + // -------------------------------------------------------- + // decoding + // -------------------------------------------------------- + /** + * Decode the Base64-encoded data in input and return the data in + * a new byte array. + * + *

The padding '=' characters at the end are considered optional, but + * if any are present, there must be the correct number of them. + * + * @param str the input String to decode, which is converted to + * bytes using the default charset + * @param flags controls certain features of the decoded output. + * Pass {@code DEFAULT} to decode standard Base64. + * + * @throws IllegalArgumentException if the input contains + * incorrect padding + */ + public static byte[] decode(String str, int flags) { + return decode(str.getBytes(), flags); + } + /** + * Decode the Base64-encoded data in input and return the data in + * a new byte array. + * + *

The padding '=' characters at the end are considered optional, but + * if any are present, there must be the correct number of them. + * + * @param input the input array to decode + * @param flags controls certain features of the decoded output. + * Pass {@code DEFAULT} to decode standard Base64. + * + * @throws IllegalArgumentException if the input contains + * incorrect padding + */ + public static byte[] decode(byte[] input, int flags) { + return decode(input, 0, input.length, flags); + } + /** + * Decode the Base64-encoded data in input and return the data in + * a new byte array. + * + *

The padding '=' characters at the end are considered optional, but + * if any are present, there must be the correct number of them. + * + * @param input the data to decode + * @param offset the position within the input array at which to start + * @param len the number of bytes of input to decode + * @param flags controls certain features of the decoded output. + * Pass {@code DEFAULT} to decode standard Base64. + * + * @throws IllegalArgumentException if the input contains + * incorrect padding + */ + public static byte[] decode(byte[] input, int offset, int len, int flags) { + // Allocate space for the most data the input could represent. + // (It could contain less if it contains whitespace, etc.) + Decoder decoder = new Decoder(flags, new byte[len*3/4]); + if (!decoder.process(input, offset, len, true)) { + throw new IllegalArgumentException("bad base-64"); + } + // Maybe we got lucky and allocated exactly enough output space. + if (decoder.op == decoder.output.length) { + return decoder.output; + } + // Need to shorten the array, so allocate a new one of the + // right size and copy. + byte[] temp = new byte[decoder.op]; + System.arraycopy(decoder.output, 0, temp, 0, decoder.op); + return temp; + } + /* package */ static class Decoder extends Coder { + /** + * Lookup table for turning bytes into their position in the + * Base64 alphabet. + */ + private static final int DECODE[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -2, -1, -1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + }; + /** + * Decode lookup table for the "web safe" variant (RFC 3548 + * sec. 4) where - and _ replace + and /. + */ + private static final int DECODE_WEBSAFE[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -2, -1, -1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, 63, + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + }; + /** Non-data values in the DECODE arrays. */ + private static final int SKIP = -1; + private static final int EQUALS = -2; + /** + * States 0-3 are reading through the next input tuple. + * State 4 is having read one '=' and expecting exactly + * one more. + * State 5 is expecting no more data or padding characters + * in the input. + * State 6 is the error state; an error has been detected + * in the input and no future input can "fix" it. + */ + private int state; // state number (0 to 6) + private int value; + final private int[] alphabet; + public Decoder(int flags, byte[] output) { + this.output = output; + alphabet = ((flags & URL_SAFE) == 0) ? DECODE : DECODE_WEBSAFE; + state = 0; + value = 0; + } + /** + * @return an overestimate for the number of bytes {@code + * len} bytes could decode to. + */ + public int maxOutputSize(int len) { + return len * 3/4 + 10; + } + /** + * Decode another block of input data. + * + * @return true if the state machine is still healthy. false if + * bad base-64 data has been detected in the input stream. + */ + public boolean process(byte[] input, int offset, int len, boolean finish) { + if (this.state == 6) return false; + int p = offset; + len += offset; + // Using local variables makes the decoder about 12% + // faster than if we manipulate the member variables in + // the loop. (Even alphabet makes a measurable + // difference, which is somewhat surprising to me since + // the member variable is final.) + int state = this.state; + int value = this.value; + int op = 0; + final byte[] output = this.output; + final int[] alphabet = this.alphabet; + while (p < len) { + // Try the fast path: we're starting a new tuple and the + // next four bytes of the input stream are all data + // bytes. This corresponds to going through states + // 0-1-2-3-0. We expect to use this method for most of + // the data. + // + // If any of the next four bytes of input are non-data + // (whitespace, etc.), value will end up negative. (All + // the non-data values in decode are small negative + // numbers, so shifting any of them up and or'ing them + // together will result in a value with its top bit set.) + // + // You can remove this whole block and the output should + // be the same, just slower. + if (state == 0) { + while (p+4 <= len && + (value = ((alphabet[input[p] & 0xff] << 18) | + (alphabet[input[p+1] & 0xff] << 12) | + (alphabet[input[p+2] & 0xff] << 6) | + (alphabet[input[p+3] & 0xff]))) >= 0) { + output[op+2] = (byte) value; + output[op+1] = (byte) (value >> 8); + output[op] = (byte) (value >> 16); + op += 3; + p += 4; + } + if (p >= len) break; + } + // The fast path isn't available -- either we've read a + // partial tuple, or the next four input bytes aren't all + // data, or whatever. Fall back to the slower state + // machine implementation. + int d = alphabet[input[p++] & 0xff]; + switch (state) { + case 0: + if (d >= 0) { + value = d; + ++state; + } else if (d != SKIP) { + this.state = 6; + return false; + } + break; + case 1: + if (d >= 0) { + value = (value << 6) | d; + ++state; + } else if (d != SKIP) { + this.state = 6; + return false; + } + break; + case 2: + if (d >= 0) { + value = (value << 6) | d; + ++state; + } else if (d == EQUALS) { + // Emit the last (partial) output tuple; + // expect exactly one more padding character. + output[op++] = (byte) (value >> 4); + state = 4; + } else if (d != SKIP) { + this.state = 6; + return false; + } + break; + case 3: + if (d >= 0) { + // Emit the output triple and return to state 0. + value = (value << 6) | d; + output[op+2] = (byte) value; + output[op+1] = (byte) (value >> 8); + output[op] = (byte) (value >> 16); + op += 3; + state = 0; + } else if (d == EQUALS) { + // Emit the last (partial) output tuple; + // expect no further data or padding characters. + output[op+1] = (byte) (value >> 2); + output[op] = (byte) (value >> 10); + op += 2; + state = 5; + } else if (d != SKIP) { + this.state = 6; + return false; + } + break; + case 4: + if (d == EQUALS) { + ++state; + } else if (d != SKIP) { + this.state = 6; + return false; + } + break; + case 5: + if (d != SKIP) { + this.state = 6; + return false; + } + break; + } + } + if (!finish) { + // We're out of input, but a future call could provide + // more. + this.state = state; + this.value = value; + this.op = op; + return true; + } + // Done reading input. Now figure out where we are left in + // the state machine and finish up. + switch (state) { + case 0: + // Output length is a multiple of three. Fine. + break; + case 1: + // Read one extra input byte, which isn't enough to + // make another output byte. Illegal. + this.state = 6; + return false; + case 2: + // Read two extra input bytes, enough to emit 1 more + // output byte. Fine. + output[op++] = (byte) (value >> 4); + break; + case 3: + // Read three extra input bytes, enough to emit 2 more + // output bytes. Fine. + output[op++] = (byte) (value >> 10); + output[op++] = (byte) (value >> 2); + break; + case 4: + // Read one padding '=' when we expected 2. Illegal. + this.state = 6; + return false; + case 5: + // Read all the padding '='s we expected and no more. + // Fine. + break; + } + this.state = state; + this.op = op; + return true; + } + } + // -------------------------------------------------------- + // encoding + // -------------------------------------------------------- + /** + * Base64-encode the given data and return a newly allocated + * String with the result. + * + * @param input the data to encode + * @param flags controls certain features of the encoded output. + * Passing {@code DEFAULT} results in output that + * adheres to RFC 2045. + */ + public static String encodeToString(byte[] input, int flags) { + try { + return new String(encode(input, flags), "US-ASCII"); + } catch (UnsupportedEncodingException e) { + // US-ASCII is guaranteed to be available. + throw new AssertionError(e); + } + } + /** + * Base64-encode the given data and return a newly allocated + * String with the result. + * + * @param input the data to encode + * @param offset the position within the input array at which to + * start + * @param len the number of bytes of input to encode + * @param flags controls certain features of the encoded output. + * Passing {@code DEFAULT} results in output that + * adheres to RFC 2045. + */ + public static String encodeToString(byte[] input, int offset, int len, int flags) { + try { + return new String(encode(input, offset, len, flags), "US-ASCII"); + } catch (UnsupportedEncodingException e) { + // US-ASCII is guaranteed to be available. + throw new AssertionError(e); + } + } + /** + * Base64-encode the given data and return a newly allocated + * byte[] with the result. + * + * @param input the data to encode + * @param flags controls certain features of the encoded output. + * Passing {@code DEFAULT} results in output that + * adheres to RFC 2045. + */ + public static byte[] encode(byte[] input, int flags) { + return encode(input, 0, input.length, flags); + } + /** + * Base64-encode the given data and return a newly allocated + * byte[] with the result. + * + * @param input the data to encode + * @param offset the position within the input array at which to + * start + * @param len the number of bytes of input to encode + * @param flags controls certain features of the encoded output. + * Passing {@code DEFAULT} results in output that + * adheres to RFC 2045. + */ + public static byte[] encode(byte[] input, int offset, int len, int flags) { + Encoder encoder = new Encoder(flags, null); + // Compute the exact length of the array we will produce. + int output_len = len / 3 * 4; + // Account for the tail of the data and the padding bytes, if any. + if (encoder.do_padding) { + if (len % 3 > 0) { + output_len += 4; + } + } else { + switch (len % 3) { + case 0: break; + case 1: output_len += 2; break; + case 2: output_len += 3; break; + } + } + // Account for the newlines, if any. + if (encoder.do_newline && len > 0) { + output_len += (((len-1) / (3 * Encoder.LINE_GROUPS)) + 1) * + (encoder.do_cr ? 2 : 1); + } + encoder.output = new byte[output_len]; + encoder.process(input, offset, len, true); + assert encoder.op == output_len; + return encoder.output; + } + /* package */ static class Encoder extends Coder { + /** + * Emit a new line every this many output tuples. Corresponds to + * a 76-character line length (the maximum allowable according to + * RFC 2045). + */ + public static final int LINE_GROUPS = 19; + /** + * Lookup table for turning Base64 alphabet positions (6 bits) + * into output bytes. + */ + private static final byte ENCODE[] = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', + }; + /** + * Lookup table for turning Base64 alphabet positions (6 bits) + * into output bytes. + */ + private static final byte ENCODE_WEBSAFE[] = { + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_', + }; + final private byte[] tail; + /* package */ int tailLen; + private int count; + final public boolean do_padding; + final public boolean do_newline; + final public boolean do_cr; + final private byte[] alphabet; + public Encoder(int flags, byte[] output) { + this.output = output; + do_padding = (flags & NO_PADDING) == 0; + do_newline = (flags & NO_WRAP) == 0; + do_cr = (flags & CRLF) != 0; + alphabet = ((flags & URL_SAFE) == 0) ? ENCODE : ENCODE_WEBSAFE; + tail = new byte[2]; + tailLen = 0; + count = do_newline ? LINE_GROUPS : -1; + } + /** + * @return an overestimate for the number of bytes {@code + * len} bytes could encode to. + */ + public int maxOutputSize(int len) { + return len * 8/5 + 10; + } + public boolean process(byte[] input, int offset, int len, boolean finish) { + // Using local variables makes the encoder about 9% faster. + final byte[] alphabet = this.alphabet; + final byte[] output = this.output; + int op = 0; + int count = this.count; + int p = offset; + len += offset; + int v = -1; + // First we need to concatenate the tail of the previous call + // with any input bytes available now and see if we can empty + // the tail. + switch (tailLen) { + case 0: + // There was no tail. + break; + case 1: + if (p+2 <= len) { + // A 1-byte tail with at least 2 bytes of + // input available now. + v = ((tail[0] & 0xff) << 16) | + ((input[p++] & 0xff) << 8) | + (input[p++] & 0xff); + tailLen = 0; + }; + break; + case 2: + if (p+1 <= len) { + // A 2-byte tail with at least 1 byte of input. + v = ((tail[0] & 0xff) << 16) | + ((tail[1] & 0xff) << 8) | + (input[p++] & 0xff); + tailLen = 0; + } + break; + } + if (v != -1) { + output[op++] = alphabet[(v >> 18) & 0x3f]; + output[op++] = alphabet[(v >> 12) & 0x3f]; + output[op++] = alphabet[(v >> 6) & 0x3f]; + output[op++] = alphabet[v & 0x3f]; + if (--count == 0) { + if (do_cr) output[op++] = '\r'; + output[op++] = '\n'; + count = LINE_GROUPS; + } + } + // At this point either there is no tail, or there are fewer + // than 3 bytes of input available. + // The main loop, turning 3 input bytes into 4 output bytes on + // each iteration. + while (p+3 <= len) { + v = ((input[p] & 0xff) << 16) | + ((input[p+1] & 0xff) << 8) | + (input[p+2] & 0xff); + output[op] = alphabet[(v >> 18) & 0x3f]; + output[op+1] = alphabet[(v >> 12) & 0x3f]; + output[op+2] = alphabet[(v >> 6) & 0x3f]; + output[op+3] = alphabet[v & 0x3f]; + p += 3; + op += 4; + if (--count == 0) { + if (do_cr) output[op++] = '\r'; + output[op++] = '\n'; + count = LINE_GROUPS; + } + } + if (finish) { + // Finish up the tail of the input. Note that we need to + // consume any bytes in tail before any bytes + // remaining in input; there should be at most two bytes + // total. + if (p-tailLen == len-1) { + int t = 0; + v = ((tailLen > 0 ? tail[t++] : input[p++]) & 0xff) << 4; + tailLen -= t; + output[op++] = alphabet[(v >> 6) & 0x3f]; + output[op++] = alphabet[v & 0x3f]; + if (do_padding) { + output[op++] = '='; + output[op++] = '='; + } + if (do_newline) { + if (do_cr) output[op++] = '\r'; + output[op++] = '\n'; + } + } else if (p-tailLen == len-2) { + int t = 0; + v = (((tailLen > 1 ? tail[t++] : input[p++]) & 0xff) << 10) | + (((tailLen > 0 ? tail[t++] : input[p++]) & 0xff) << 2); + tailLen -= t; + output[op++] = alphabet[(v >> 12) & 0x3f]; + output[op++] = alphabet[(v >> 6) & 0x3f]; + output[op++] = alphabet[v & 0x3f]; + if (do_padding) { + output[op++] = '='; + } + if (do_newline) { + if (do_cr) output[op++] = '\r'; + output[op++] = '\n'; + } + } else if (do_newline && op > 0 && count != LINE_GROUPS) { + if (do_cr) output[op++] = '\r'; + output[op++] = '\n'; + } + assert tailLen == 0; + assert p == len; + } else { + // Save the leftovers in tail to be consumed on the next + // call to encodeInternal. + if (p == len-1) { + tail[tailLen++] = input[p]; + } else if (p == len-2) { + tail[tailLen++] = input[p]; + tail[tailLen++] = input[p+1]; + } + } + this.op = op; + this.count = count; + return true; + } + } + + private Base64() { } // don't instantiate +} diff --git a/src/main/java/io/socket/engineio/parser/Parser.java b/src/main/java/io/socket/engineio/parser/Parser.java index fe6c3622..f92e1e08 100644 --- a/src/main/java/io/socket/engineio/parser/Parser.java +++ b/src/main/java/io/socket/engineio/parser/Parser.java @@ -1,20 +1,13 @@ package io.socket.engineio.parser; - -import io.socket.utf8.UTF8; -import io.socket.utf8.UTF8Exception; - -import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; public class Parser { - private static final int MAX_INT_CHAR_LENGTH = String.valueOf(Integer.MAX_VALUE).length(); + public static final int PROTOCOL = 4; - public static final int PROTOCOL = 3; + private static final char SEPARATOR = '\u001e'; private static final Map packets = new HashMap() {{ put(Packet.OPEN, 0); @@ -26,61 +19,38 @@ public class Parser { put(Packet.NOOP, 6); }}; - private static final Map packetslist = new HashMap(); + private static final Map packetslist = new HashMap<>(); static { for (Map.Entry entry : packets.entrySet()) { packetslist.put(entry.getValue(), entry.getKey()); } } - private static Packet err = new Packet(Packet.ERROR, "parser error"); - - private static UTF8.Options utf8Options = new UTF8.Options(); - static { - utf8Options.strict = false; - } - + private static final Packet err = new Packet(Packet.ERROR, "parser error"); private Parser() {} - public static void encodePacket(Packet packet, EncodeCallback callback) throws UTF8Exception { - encodePacket(packet, false, callback); - } - - public static void encodePacket(Packet packet, boolean utf8encode, EncodeCallback callback) throws UTF8Exception { + public static void encodePacket(Packet packet, EncodeCallback callback) { if (packet.data instanceof byte[]) { - @SuppressWarnings("unchecked") - Packet packetToEncode = packet; - @SuppressWarnings("unchecked") - EncodeCallback callbackToEncode = callback; - encodeByteArray(packetToEncode, callbackToEncode); - return; - } - - String encoded = String.valueOf(packets.get(packet.type)); - - if (null != packet.data) { - encoded += utf8encode ? UTF8.encode(String.valueOf(packet.data), utf8Options) : String.valueOf(packet.data); + ((EncodeCallback) callback).call(((Packet) packet).data); + } else { + String type = String.valueOf(packets.get(packet.type)); + String content = packet.data != null ? String.valueOf(packet.data) : ""; + ((EncodeCallback) callback).call(type + content); } - - @SuppressWarnings("unchecked") - EncodeCallback tempCallback = callback; - tempCallback.call(encoded); } - private static void encodeByteArray(Packet packet, EncodeCallback callback) { - byte[] data = packet.data; - byte[] resultArray = new byte[1 + data.length]; - resultArray[0] = packets.get(packet.type).byteValue(); - System.arraycopy(data, 0, resultArray, 1, data.length); - callback.call(resultArray); + private static void encodePacketAsBase64(Packet packet, EncodeCallback callback) { + if (packet.data instanceof byte[]) { + byte[] data = ((Packet) packet).data; + String value = "b" + Base64.encodeToString(data, Base64.DEFAULT); + callback.call(value); + } else { + encodePacket(packet, callback); + } } public static Packet decodePacket(String data) { - return decodePacket(data, false); - } - - public static Packet decodePacket(String data, boolean utf8decode) { if (data == null) { return err; } @@ -92,14 +62,6 @@ public static Packet decodePacket(String data, boolean utf8decode) { type = -1; } - if (utf8decode) { - try { - data = UTF8.decode(data, utf8Options); - } catch (UTF8Exception e) { - return err; - } - } - if (type < 0 || type >= packetslist.size()) { return err; } @@ -111,93 +73,44 @@ public static Packet decodePacket(String data, boolean utf8decode) { } } - public static Packet decodePacket(byte[] data) { - int type = data[0]; - byte[] intArray = new byte[data.length - 1]; - System.arraycopy(data, 1, intArray, 0, intArray.length); - return new Packet(packetslist.get(type), intArray); - } - - public static void encodePayload(Packet[] packets, EncodeCallback callback) throws UTF8Exception { - for (Packet packet : packets) { - if (packet.data instanceof byte[]) { - @SuppressWarnings("unchecked") - EncodeCallback _callback = (EncodeCallback) callback; - encodePayloadAsBinary(packets, _callback); - return; - } - } - - if (packets.length == 0) { - callback.call("0:"); - return; + public static Packet decodeBase64Packet(String data) { + if (data == null) { + return err; } - final StringBuilder result = new StringBuilder(); - - for (Packet packet : packets) { - encodePacket(packet, false, new EncodeCallback() { - @Override - public void call(Object message) { - result.append(setLengthHeader((String)message)); - } - }); + if (data.charAt(0) == 'b') { + return new Packet(Packet.MESSAGE, Base64.decode(data.substring(1), Base64.DEFAULT)); + } else { + return decodePacket(data); } - - callback.call(result.toString()); } - private static String setLengthHeader(String message) { - return message.length() + ":" + message; + public static Packet decodePacket(byte[] data) { + return new Packet<>(Packet.MESSAGE, data); } - private static void encodePayloadAsBinary(Packet[] packets, EncodeCallback callback) throws UTF8Exception { + public static void encodePayload(Packet[] packets, EncodeCallback callback) { if (packets.length == 0) { - callback.call(new byte[0]); + callback.call("0:"); return; } - final ArrayList results = new ArrayList(packets.length); + final StringBuilder result = new StringBuilder(); - for (Packet packet : packets) { - encodeOneBinaryPacket(packet, new EncodeCallback() { + for (int i = 0, l = packets.length; i < l; i++) { + final boolean isLast = i == l - 1; + encodePacketAsBase64(packets[i], new EncodeCallback() { @Override - public void call(byte[] data) { - results.add(data); + public void call(String message) { + result.append(message); + if (!isLast) { + result.append(SEPARATOR); + } } }); } - callback.call(Buffer.concat(results.toArray(new byte[results.size()][]))); - } - - private static void encodeOneBinaryPacket(Packet p, final EncodeCallback doneCallback) throws UTF8Exception { - encodePacket(p, true, new EncodeCallback() { - @Override - public void call(Object packet) { - if (packet instanceof String) { - String encodingLength = String.valueOf(((String) packet).length()); - byte[] sizeBuffer = new byte[encodingLength.length() + 2]; - - sizeBuffer[0] = (byte)0; // is a string - for (int i = 0; i < encodingLength.length(); i ++) { - sizeBuffer[i + 1] = (byte)Character.getNumericValue(encodingLength.charAt(i)); - } - sizeBuffer[sizeBuffer.length - 1] = (byte)255; - doneCallback.call(Buffer.concat(new byte[][] {sizeBuffer, stringToByteArray((String)packet)})); - return; - } - - String encodingLength = String.valueOf(((byte[])packet).length); - byte[] sizeBuffer = new byte[encodingLength.length() + 2]; - sizeBuffer[0] = (byte)1; // is binary - for (int i = 0; i < encodingLength.length(); i ++) { - sizeBuffer[i + 1] = (byte)Character.getNumericValue(encodingLength.charAt(i)); - } - sizeBuffer[sizeBuffer.length - 1] = (byte)255; - doneCallback.call(Buffer.concat(new byte[][] {sizeBuffer, (byte[])packet})); - } - }); + callback.call(result.toString()); } public static void decodePayload(String data, DecodePayloadCallback callback) { @@ -206,159 +119,30 @@ public static void decodePayload(String data, DecodePayloadCallback call return; } - StringBuilder length = new StringBuilder(); - for (int i = 0, l = data.length(); i < l; i++) { - char chr = data.charAt(i); - - if (':' != chr) { - length.append(chr); - continue; - } + String[] messages = data.split(String.valueOf(SEPARATOR)); - int n; - try { - n = Integer.parseInt(length.toString()); - } catch (NumberFormatException e) { + for (int i = 0, l = messages.length; i < l; i++) { + Packet packet = decodeBase64Packet(messages[i]); + if (err.type.equals(packet.type) && err.data.equals(packet.data)) { callback.call(err, 0, 1); return; } - String msg; - try { - msg = data.substring(i + 1, i + 1 + n); - } catch (IndexOutOfBoundsException e) { - callback.call(err, 0, 1); + boolean ret = callback.call(packet, i, l); + if (!ret) { return; } - - if (msg.length() != 0) { - Packet packet = decodePacket(msg, false); - if (err.type.equals(packet.type) && err.data.equals(packet.data)) { - callback.call(err, 0, 1); - return; - } - - boolean ret = callback.call(packet, i + n, l); - if (!ret) { - return; - } - } - - i += n; - length = new StringBuilder(); - } - - if (length.length() > 0) { - callback.call(err, 0, 1); } } - public static void decodePayload(byte[] data, DecodePayloadCallback callback) { - ByteBuffer bufferTail = ByteBuffer.wrap(data); - List buffers = new ArrayList(); - - while (bufferTail.capacity() > 0) { - StringBuilder strLen = new StringBuilder(); - boolean isString = (bufferTail.get(0) & 0xFF) == 0; - for (int i = 1; ; i++) { - int b = bufferTail.get(i) & 0xFF; - if (b == 255) break; - // supports only integer - if (strLen.length() > MAX_INT_CHAR_LENGTH) { - callback.call(err, 0, 1); - return; - } - strLen.append(b); - } - - bufferTail.position(strLen.length() + 1); - bufferTail = bufferTail.slice(); - - int msgLength = Integer.parseInt(strLen.toString()); - - bufferTail.position(1); - bufferTail.limit(msgLength + 1); - byte[] msg = new byte[bufferTail.remaining()]; - bufferTail.get(msg); - if (isString) { - buffers.add(byteArrayToString(msg)); - } else { - buffers.add(msg); - } - bufferTail.clear(); - bufferTail.position(msgLength + 1); - bufferTail = bufferTail.slice(); - } + public interface EncodeCallback { - int total = buffers.size(); - for (int i = 0; i < total; i++) { - Object buffer = buffers.get(i); - if (buffer instanceof String) { - @SuppressWarnings("unchecked") - DecodePayloadCallback tempCallback = callback; - tempCallback.call(decodePacket((String)buffer, true), i, total); - } else if (buffer instanceof byte[]) { - @SuppressWarnings("unchecked") - DecodePayloadCallback tempCallback = callback; - tempCallback.call(decodePacket((byte[])buffer), i, total); - } - } - } - - private static String byteArrayToString(byte[] bytes) { - StringBuilder builder = new StringBuilder(); - for (byte b : bytes) { - builder.appendCodePoint(b & 0xFF); - } - return builder.toString(); - } - - private static byte[] stringToByteArray(String string) { - int len = string.length(); - byte[] bytes = new byte[len]; - for (int i = 0; i < len; i++) { - bytes[i] = (byte)Character.codePointAt(string, i); - } - return bytes; - } - - public static interface EncodeCallback { - - public void call(T data); - } - - - public static interface DecodePayloadCallback { - - public boolean call(Packet packet, int index, int total); - } -} - - -class Buffer { - - private Buffer() {} - - public static byte[] concat(byte[][] list) { - int length = 0; - for (byte[] buf : list) { - length += buf.length; - } - return concat(list, length); + void call(T data); } - public static byte[] concat(byte[][] list, int length) { - if (list.length == 0) { - return new byte[0]; - } else if (list.length == 1) { - return list[0]; - } - ByteBuffer buffer = ByteBuffer.allocate(length); - for (byte[] buf : list) { - buffer.put(buf); - } + public interface DecodePayloadCallback { - return buffer.array(); + boolean call(Packet packet, int index, int total); } } diff --git a/src/main/java/io/socket/utf8/UTF8.java b/src/main/java/io/socket/utf8/UTF8.java deleted file mode 100644 index e7145792..00000000 --- a/src/main/java/io/socket/utf8/UTF8.java +++ /dev/null @@ -1,199 +0,0 @@ -package io.socket.utf8; - -import java.util.ArrayList; -import java.util.List; - -/** - * UTF-8 encoder/decoder ported from utf8.js. - * - * @see https://github.com/mathiasbynens/utf8.js - */ -public final class UTF8 { - - private static final String INVALID_CONTINUATION_BYTE = "Invalid continuation byte"; - private static int[] byteArray; - private static int byteCount; - private static int byteIndex; - - private UTF8 () {} - - public static String encode(String string) throws UTF8Exception { - return encode(string, new Options()); - } - - public static String encode(String string, Options opts) throws UTF8Exception { - boolean strict = opts.strict; - - int[] codePoints = ucs2decode(string); - int length = codePoints.length; - int index = -1; - int codePoint; - StringBuilder byteString = new StringBuilder(); - while (++index < length) { - codePoint = codePoints[index]; - byteString.append(encodeCodePoint(codePoint, strict)); - } - return byteString.toString(); - } - - public static String decode(String byteString) throws UTF8Exception { - return decode(byteString, new Options()); - } - - public static String decode(String byteString, Options opts) throws UTF8Exception { - boolean strict = opts.strict; - - byteArray = ucs2decode(byteString); - byteCount = byteArray.length; - byteIndex = 0; - List codePoints = new ArrayList(); - int tmp; - while ((tmp = decodeSymbol(strict)) != -1) { - codePoints.add(tmp); - } - return ucs2encode(listToArray(codePoints)); - } - - private static int[] ucs2decode(String string) { - int length = string.length(); - int[] output = new int[string.codePointCount(0, length)]; - int counter = 0; - int value; - for (int i = 0; i < length; i += Character.charCount(value)) { - value = string.codePointAt(i); - output[counter++] = value; - } - return output; - } - - private static String encodeCodePoint(int codePoint, boolean strict) throws UTF8Exception { - StringBuilder symbol = new StringBuilder(); - if ((codePoint & 0xFFFFFF80) == 0) { - return symbol.append(Character.toChars(codePoint)).toString(); - } - if ((codePoint & 0xFFFFF800) == 0) { - symbol.append(Character.toChars(((codePoint >> 6) & 0x1F) | 0xC0)); - } else if ((codePoint & 0xFFFF0000) == 0) { - if (!checkScalarValue(codePoint, strict)) { - codePoint = 0xFFFD; - } - symbol.append(Character.toChars(((codePoint >> 12) & 0x0F) | 0xE0)); - symbol.append(createByte(codePoint, 6)); - } else if ((codePoint & 0xFFE00000) == 0) { - symbol.append(Character.toChars(((codePoint >> 18) & 0x07) | 0xF0)); - symbol.append(createByte(codePoint, 12)); - symbol.append(createByte(codePoint, 6)); - } - symbol.append(Character.toChars((codePoint & 0x3F) | 0x80)); - return symbol.toString(); - } - - private static char[] createByte(int codePoint, int shift) { - return Character.toChars(((codePoint >> shift) & 0x3F) | 0x80); - } - - private static int decodeSymbol(boolean strict) throws UTF8Exception { - int byte1; - int byte2; - int byte3; - int byte4; - int codePoint; - - if (byteIndex > byteCount) { - throw new UTF8Exception("Invalid byte index"); - } - - if (byteIndex == byteCount) { - return -1; - } - - byte1 = byteArray[byteIndex] & 0xFF; - byteIndex++; - - if ((byte1 & 0x80) == 0) { - return byte1; - } - - if ((byte1 & 0xE0) == 0xC0) { - byte2 = readContinuationByte(); - codePoint = ((byte1 & 0x1F) << 6) | byte2; - if (codePoint >= 0x80) { - return codePoint; - } else { - throw new UTF8Exception(INVALID_CONTINUATION_BYTE); - } - } - - if ((byte1 & 0xF0) == 0xE0) { - byte2 = readContinuationByte(); - byte3 = readContinuationByte(); - codePoint = ((byte1 & 0x0F) << 12) | (byte2 << 6) | byte3; - if (codePoint >= 0x0800) { - return checkScalarValue(codePoint, strict) ? codePoint : 0xFFFD; - } else { - throw new UTF8Exception(INVALID_CONTINUATION_BYTE); - } - } - - if ((byte1 & 0xF8) == 0xF0) { - byte2 = readContinuationByte(); - byte3 = readContinuationByte(); - byte4 = readContinuationByte(); - codePoint = ((byte1 & 0x0F) << 0x12) | (byte2 << 0x0C) | (byte3 << 0x06) | byte4; - if (codePoint >= 0x010000 && codePoint <= 0x10FFFF) { - return codePoint; - } - } - - throw new UTF8Exception(INVALID_CONTINUATION_BYTE); - } - - private static int readContinuationByte() throws UTF8Exception { - if (byteIndex >= byteCount) { - throw new UTF8Exception("Invalid byte index"); - } - - int continuationByte = byteArray[byteIndex] & 0xFF; - byteIndex++; - - if ((continuationByte & 0xC0) == 0x80) { - return continuationByte & 0x3F; - } - - throw new UTF8Exception(INVALID_CONTINUATION_BYTE); - } - - private static String ucs2encode(int[] array) { - StringBuilder output = new StringBuilder(); - for (int value : array) { - output.appendCodePoint(value); - } - return output.toString(); - } - - private static boolean checkScalarValue(int codePoint, boolean strict) throws UTF8Exception { - if (codePoint >= 0xD800 && codePoint <= 0xDFFF) { - if (strict) { - throw new UTF8Exception( - "Lone surrogate U+" + Integer.toHexString(codePoint).toUpperCase() + - " is not a scalar value" - ); - } - return false; - } - return true; - } - - private static int[] listToArray(List list) { - int size = list.size(); - int[] array = new int[size]; - for (int i = 0; i < size; i++) { - array[i] = list.get(i); - } - return array; - } - - public static class Options { - public boolean strict = true; - } -} diff --git a/src/main/java/io/socket/utf8/UTF8Exception.java b/src/main/java/io/socket/utf8/UTF8Exception.java deleted file mode 100644 index 077da0be..00000000 --- a/src/main/java/io/socket/utf8/UTF8Exception.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.socket.utf8; - -import java.io.IOException; - -public class UTF8Exception extends IOException { - - public UTF8Exception() { - super(); - } - - public UTF8Exception(String message) { - super(message); - } - - public UTF8Exception(String message, Throwable cause) { - super(message, cause); - } - - public UTF8Exception(Throwable cause) { - super(cause); - } -} diff --git a/src/site/markdown/installation.md b/src/site/markdown/installation.md new file mode 100644 index 00000000..8b6f845a --- /dev/null +++ b/src/site/markdown/installation.md @@ -0,0 +1,33 @@ +## Compatibility + +| Client version | Engine.IO server | Socket.IO server | +| -------------- | ---------------- | ---------------- | +| 0.9.x | 1.x | 1.x | +| 1.x | 3.x | 2.x | +| 2.x | 4.x | 3.x | + +## Installation +The latest artifact is available on Maven Central. + +### Maven +Add the following dependency to your `pom.xml`. + +```xml + + + io.socket + engine.io-client + 2.0.0 + + +``` + +### Gradle +Add it as a gradle dependency for Android Studio, in `build.gradle`: + +```groovy +compile ('io.socket:engine.io-client:2.0.0') { + // excluding org.json which is provided by Android + exclude group: 'org.json', module: 'json' +} +``` diff --git a/src/site/markdown/usage.md b/src/site/markdown/usage.md new file mode 100644 index 00000000..4299cac2 --- /dev/null +++ b/src/site/markdown/usage.md @@ -0,0 +1,82 @@ +## Usage +Engine.IO-client Java has the similar api with the JS client. You can use `Socket` to connect: + +```java +socket = new Socket("ws://localhost"); +socket.on(Socket.EVENT_OPEN, new Emitter.Listener() { + @Override + public void call(Object... args) { + socket.send("hi"); + socket.close(); + } +}); +socket.open(); +``` + +You can listen events as follows: + +```java +socket.on(Socket.EVENT_MESSAGE, new Emitter.Listener() { + @Override + public void call(Object... args) { + String data = (String)args[0]; + } +}).on(Socket.EVENT_ERROR, new Emitter.Listener() { + @Override + public void call(Object... args) { + Exception err = (Exception)args[0]; + } +}); +``` + +How to set options: + +```java +opts = new Socket.Options(); +opts.transports = new String[] {WebSocket.NAME}; + +socket = new Socket(opts); +``` + +Sending and receiving binary data: + +```java +socket = new Socket(); +socket.on(Socket.EVENT_OPEN, new Emitter.Listener() { + @Override + public void call(Object... args) { + // send binary data + byte[] data = new byte[42]; + socket.send(data); + } +}).on(Socket.EVENT_MESSAGE, new Emitter.Listener() { + @Override + public void call(Object... args) { + // receive binary data + byte[] data = (byte[])args[0]; + } +}); +``` + +Use custom SSL settings: + +```java +OkHttpClient okHttpClient = new OkHttpClient.Builder() + .hostnameVerifier(myHostnameVerifier) + .sslSocketFactory(mySSLContext.getSocketFactory(), myX509TrustManager) + .build(); + +// default SSLContext for all sockets +Socket.setDefaultOkHttpWebSocketFactory(okHttpClient); +Socket.setDefaultOkHttpCallFactory(okHttpClient); + +// set as an option +opts = new Socket.Options(); +opts.callFactory = okHttpClient; +opts.webSocketFactory = okHttpClient; +socket = new Socket(opts); +``` + +## Features + +This library supports all of the features the JS client does, including events, options and upgrading transport. Android is fully supported. diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 00000000..27b861d4 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,30 @@ + + + + + org.apache.maven.skins + maven-fluido-skin + 1.9 + + + + + + socketio/engine.io-client-java + right + gray + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/io/socket/engineio/client/ConnectionTest.java b/src/test/java/io/socket/engineio/client/ConnectionTest.java index ac0997e4..a9192791 100644 --- a/src/test/java/io/socket/engineio/client/ConnectionTest.java +++ b/src/test/java/io/socket/engineio/client/ConnectionTest.java @@ -242,4 +242,20 @@ public void call(Object... args) { socket.open(); assertThat((Integer) values.take(), is(0)); } + + @Test(timeout = TIMEOUT) + public void receivePing() throws InterruptedException { + final BlockingQueue values = new LinkedBlockingQueue<>(); + + socket = new Socket(createOptions()); + socket.on(Socket.EVENT_PING, new Emitter.Listener() { + @Override + public void call(Object... args) { + values.offer("end"); + socket.close(); + } + }); + socket.open(); + assertThat(values.take(), is("end")); + } } diff --git a/src/test/java/io/socket/engineio/client/SSLConnectionTest.java b/src/test/java/io/socket/engineio/client/SSLConnectionTest.java index 2e6a128f..1405e4df 100644 --- a/src/test/java/io/socket/engineio/client/SSLConnectionTest.java +++ b/src/test/java/io/socket/engineio/client/SSLConnectionTest.java @@ -52,7 +52,7 @@ private static void prepareOkHttpClient() throws GeneralSecurityException, IOExc TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); tmf.init(ks); - SSLContext sslContext = SSLContext.getInstance("TLSv1"); + SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); sOkHttpClient = new OkHttpClient.Builder() diff --git a/src/test/java/io/socket/engineio/client/ServerConnectionTest.java b/src/test/java/io/socket/engineio/client/ServerConnectionTest.java index 2beb744a..e7a9e73d 100644 --- a/src/test/java/io/socket/engineio/client/ServerConnectionTest.java +++ b/src/test/java/io/socket/engineio/client/ServerConnectionTest.java @@ -10,11 +10,14 @@ import java.net.URISyntaxException; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; +import static java.util.Collections.singletonList; +import static java.util.Collections.singletonMap; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.notNullValue; @@ -168,6 +171,38 @@ public void call(Object... args) { socket.close(); } + @Test(timeout = TIMEOUT) + public void pollingHeaders_withExtraHeadersOption() throws URISyntaxException, InterruptedException { + final BlockingQueue messages = new LinkedBlockingQueue(); + + Socket.Options opts = createOptions(); + opts.transports = new String[] {Polling.NAME}; + opts.extraHeaders = singletonMap("X-EngineIO", singletonList("bar")); + + socket = new Socket(opts); + socket.on(Socket.EVENT_TRANSPORT, new Emitter.Listener() { + @Override + public void call(Object... args) { + Transport transport = (Transport)args[0]; + transport.on(Transport.EVENT_RESPONSE_HEADERS, new Emitter.Listener() { + @Override + public void call(Object... args) { + @SuppressWarnings("unchecked") + Map> headers = (Map>)args[0]; + List values = headers.get("X-EngineIO"); + messages.offer(values.get(0)); + messages.offer(values.get(1)); + } + }); + } + }); + socket.open(); + + assertThat(messages.take(), is("hi")); + assertThat(messages.take(), is("bar")); + socket.close(); + } + @Test(timeout = TIMEOUT) public void websocketHandshakeHeaders() throws URISyntaxException, InterruptedException { final BlockingQueue messages = new LinkedBlockingQueue(); @@ -206,6 +241,38 @@ public void call(Object... args) { socket.close(); } + @Test(timeout = TIMEOUT) + public void websocketHandshakeHeaders_withExtraHeadersOption() throws URISyntaxException, InterruptedException { + final BlockingQueue messages = new LinkedBlockingQueue(); + + Socket.Options opts = createOptions(); + opts.transports = new String[] {WebSocket.NAME}; + opts.extraHeaders = singletonMap("X-EngineIO", singletonList("bar")); + + socket = new Socket(opts); + socket.on(Socket.EVENT_TRANSPORT, new Emitter.Listener() { + @Override + public void call(Object... args) { + Transport transport = (Transport)args[0]; + transport.on(Transport.EVENT_RESPONSE_HEADERS, new Emitter.Listener() { + @Override + public void call(Object... args) { + @SuppressWarnings("unchecked") + Map> headers = (Map>)args[0]; + List values = headers.get("X-EngineIO"); + messages.offer(values.get(0)); + messages.offer(values.get(1)); + } + }); + } + }); + socket.open(); + + assertThat(messages.take(), is("hi")); + assertThat(messages.take(), is("bar")); + socket.close(); + } + @Test(timeout = TIMEOUT) public void rememberWebsocket() throws InterruptedException { final BlockingQueue values = new LinkedBlockingQueue(); diff --git a/src/test/java/io/socket/engineio/parser/ParserTest.java b/src/test/java/io/socket/engineio/parser/ParserTest.java index d8e7692b..d5498b91 100644 --- a/src/test/java/io/socket/engineio/parser/ParserTest.java +++ b/src/test/java/io/socket/engineio/parser/ParserTest.java @@ -1,6 +1,5 @@ package io.socket.engineio.parser; -import io.socket.utf8.UTF8Exception; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -15,7 +14,7 @@ public class ParserTest { static final String ERROR_DATA = "parser error"; @Test - public void encodeAsString() throws UTF8Exception { + public void encodeAsString() { encodePacket(new Packet(Packet.MESSAGE, "test"), new EncodeCallback() { @Override public void call(String data) { @@ -25,7 +24,7 @@ public void call(String data) { } @Test - public void decodeAsPacket() throws UTF8Exception { + public void decodeAsPacket() { encodePacket(new Packet(Packet.MESSAGE, "test"), new EncodeCallback() { @Override public void call(String data) { @@ -35,7 +34,7 @@ public void call(String data) { } @Test - public void noData() throws UTF8Exception { + public void noData() { encodePacket(new Packet(Packet.MESSAGE), new EncodeCallback() { @Override public void call(String data) { @@ -47,7 +46,7 @@ public void call(String data) { } @Test - public void encodeOpenPacket() throws UTF8Exception { + public void encodeOpenPacket() { encodePacket(new Packet(Packet.OPEN, "{\"some\":\"json\"}"), new EncodeCallback() { @Override public void call(String data) { @@ -59,7 +58,7 @@ public void call(String data) { } @Test - public void encodeClosePacket() throws UTF8Exception { + public void encodeClosePacket() { encodePacket(new Packet(Packet.CLOSE), new EncodeCallback() { @Override public void call(String data) { @@ -70,7 +69,7 @@ public void call(String data) { } @Test - public void encodePingPacket() throws UTF8Exception { + public void encodePingPacket() { encodePacket(new Packet(Packet.PING, "1"), new EncodeCallback() { @Override public void call(String data) { @@ -82,7 +81,7 @@ public void call(String data) { } @Test - public void encodePongPacket() throws UTF8Exception { + public void encodePongPacket() { encodePacket(new Packet(Packet.PONG, "1"), new EncodeCallback() { @Override public void call(String data) { @@ -94,7 +93,7 @@ public void call(String data) { } @Test - public void encodeMessagePacket() throws UTF8Exception { + public void encodeMessagePacket() { encodePacket(new Packet(Packet.MESSAGE, "aaa"), new EncodeCallback() { @Override public void call(String data) { @@ -106,7 +105,7 @@ public void call(String data) { } @Test - public void encodeUTF8SpecialCharsMessagePacket() throws UTF8Exception { + public void encodeUTF8SpecialCharsMessagePacket() { encodePacket(new Packet(Packet.MESSAGE, "utf8 — string"), new EncodeCallback() { @Override public void call(String data) { @@ -118,7 +117,7 @@ public void call(String data) { } @Test - public void encodeMessagePacketCoercingToString() throws UTF8Exception { + public void encodeMessagePacketCoercingToString() { encodePacket(new Packet(Packet.MESSAGE, 1), new EncodeCallback() { @Override public void call(String data) { @@ -130,7 +129,7 @@ public void call(String data) { } @Test - public void encodeUpgradePacket() throws UTF8Exception { + public void encodeUpgradePacket() { encodePacket(new Packet(Packet.UPGRADE), new EncodeCallback() { @Override public void call(String data) { @@ -141,7 +140,7 @@ public void call(String data) { } @Test - public void encodingFormat() throws UTF8Exception { + public void encodingFormat() { encodePacket(new Packet(Packet.MESSAGE, "test"), new EncodeCallback() { @Override public void call(String data) { @@ -156,19 +155,6 @@ public void call(String data) { }); } - @Test - public void encodingStringMessageWithLoneSurrogatesReplacedByUFFFD() throws UTF8Exception { - String data = "\uDC00\uD834\uDF06\uDC00 \uD800\uD835\uDF07\uD800"; - encodePacket(new Packet(Packet.MESSAGE, data), true, new EncodeCallback() { - @Override - public void call(String encoded) { - Packet p = decodePacket(encoded, true); - assertThat(p.type, is(Packet.MESSAGE)); - assertThat(p.data, is("\uFFFD\uD834\uDF06\uFFFD \uFFFD\uD835\uDF07\uFFFD")); - } - }); - } - @Test public void decodeEmptyPayload() { Packet p = decodePacket((String)null); @@ -191,14 +177,7 @@ public void decodeInexistentTypes() { } @Test - public void decodeInvalidUTF8() { - Packet p = decodePacket("4\uffff", true); - assertThat(p.type, is(Packet.ERROR)); - assertThat(p.data, is(ERROR_DATA)); - } - - @Test - public void encodePayloads() throws UTF8Exception { + public void encodePayloads() { encodePayload(new Packet[]{new Packet(Packet.PING), new Packet(Packet.PONG)}, new EncodeCallback() { @Override public void call(String data) { @@ -208,7 +187,7 @@ public void call(String data) { } @Test - public void encodeAndDecodePayloads() throws UTF8Exception { + public void encodeAndDecodePayloads() { encodePayload(new Packet[] {new Packet(Packet.MESSAGE, "a")}, new EncodeCallback() { @Override public void call(String data) { @@ -242,7 +221,7 @@ public boolean call(Packet packet, int index, int total) { } @Test - public void encodeAndDecodeEmptyPayloads() throws UTF8Exception { + public void encodeAndDecodeEmptyPayloads() { encodePayload(new Packet[] {}, new EncodeCallback() { @Override public void call(String data) { @@ -260,30 +239,20 @@ public boolean call(Packet packet, int index, int total) { } @Test - public void notUTF8EncodeWhenDealingWithStringsOnly() throws UTF8Exception { + public void notUTF8EncodeWhenDealingWithStringsOnly() { encodePayload(new Packet[] { new Packet(Packet.MESSAGE, "€€€"), new Packet(Packet.MESSAGE, "α") }, new EncodeCallback() { @Override public void call(String data) { - assertThat(data, is("4:4€€€2:4α")); + assertThat(data, is("4€€€\u001e4α")); } }); } @Test public void decodePayloadBadFormat() { - decodePayload("1!", new DecodePayloadCallback() { - @Override - public boolean call(Packet packet, int index, int total) { - boolean isLast = index + 1 == total; - assertThat(packet.type, is(Packet.ERROR)); - assertThat(packet.data, is(ERROR_DATA)); - assertThat(isLast, is(true)); - return true; - } - }); decodePayload("", new DecodePayloadCallback() { @Override public boolean call(Packet packet, int index, int total) { @@ -306,33 +275,9 @@ public boolean call(Packet packet, int index, int total) { }); } - @Test - public void decodePayloadBadLength() { - decodePayload("1:", new DecodePayloadCallback() { - @Override - public boolean call(Packet packet, int index, int total) { - boolean isLast = index + 1 == total; - assertThat(packet.type, is(Packet.ERROR)); - assertThat(packet.data, is(ERROR_DATA)); - assertThat(isLast, is(true)); - return true; - } - }); - } - @Test public void decodePayloadBadPacketFormat() { - decodePayload("3:99:", new DecodePayloadCallback() { - @Override - public boolean call(Packet packet, int index, int total) { - boolean isLast = index + 1 == total; - assertThat(packet.type, is(Packet.ERROR)); - assertThat(packet.data, is(ERROR_DATA)); - assertThat(isLast, is(true)); - return true; - } - }); - decodePayload("1:aa", new DecodePayloadCallback() { + decodePayload("99:", new DecodePayloadCallback() { @Override public boolean call(Packet packet, int index, int total) { boolean isLast = index + 1 == total; @@ -342,7 +287,7 @@ public boolean call(Packet packet, int index, int total) { return true; } }); - decodePayload("1:a2:b", new DecodePayloadCallback() { + decodePayload("aa", new DecodePayloadCallback() { @Override public boolean call(Packet packet, int index, int total) { boolean isLast = index + 1 == total; @@ -355,7 +300,7 @@ public boolean call(Packet packet, int index, int total) { } @Test - public void encodeBinaryMessage() throws UTF8Exception { + public void encodeBinaryMessage() { final byte[] data = new byte[5]; for (int i = 0; i < data.length; i++) { data[0] = (byte)i; @@ -371,7 +316,7 @@ public void call(byte[] encoded) { } @Test - public void encodeBinaryContents() throws UTF8Exception { + public void encodeBinaryContents() { final byte[] firstBuffer = new byte[5]; for (int i = 0 ; i < firstBuffer.length; i++) { firstBuffer[0] = (byte)i; @@ -384,9 +329,9 @@ public void encodeBinaryContents() throws UTF8Exception { encodePayload(new Packet[]{ new Packet(Packet.MESSAGE, firstBuffer), new Packet(Packet.MESSAGE, secondBuffer), - }, new EncodeCallback() { + }, new EncodeCallback() { @Override - public void call(byte[] data) { + public void call(String data) { decodePayload(data, new DecodePayloadCallback() { @Override public boolean call(Packet packet, int index, int total) { @@ -405,7 +350,7 @@ public boolean call(Packet packet, int index, int total) { } @Test - public void encodeMixedBinaryAndStringContents() throws UTF8Exception { + public void encodeMixedBinaryAndStringContents() { final byte[] firstBuffer = new byte[123]; for (int i = 0 ; i < firstBuffer.length; i++) { firstBuffer[0] = (byte)i; @@ -414,9 +359,9 @@ public void encodeMixedBinaryAndStringContents() throws UTF8Exception { new Packet(Packet.MESSAGE, firstBuffer), new Packet(Packet.MESSAGE, "hello"), new Packet(Packet.CLOSE), - }, new EncodeCallback() { + }, new EncodeCallback() { @Override - public void call(byte[] encoded) { + public void call(String encoded) { decodePayload(encoded, new DecodePayloadCallback() { @Override public boolean call(Packet packet, int index, int total) { diff --git a/src/test/java/io/socket/utf8/UTF8Test.java b/src/test/java/io/socket/utf8/UTF8Test.java deleted file mode 100644 index 8357d7fe..00000000 --- a/src/test/java/io/socket/utf8/UTF8Test.java +++ /dev/null @@ -1,114 +0,0 @@ -package io.socket.utf8; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; - -@RunWith(JUnit4.class) -public class UTF8Test { - private static final Data[] DATA = new Data[] { - // 1-byte - new Data(0x0000, "\u0000", "\u0000"), - new Data(0x005c, "\u005C\u005C", "\u005C\u005C"), // = backslash - new Data(0x007f, "\u007F", "\u007F"), - // 2-byte - new Data(0x0080, "\u0080", "\u00C2\u0080"), - new Data(0x05CA, "\u05CA", "\u00D7\u008A"), - new Data(0x07FF, "\u07FF", "\u00DF\u00BF"), - // 3-byte - new Data(0x0800, "\u0800", "\u00E0\u00A0\u0080"), - new Data(0x2C3C, "\u2C3C", "\u00E2\u00B0\u00BC"), - new Data(0x07FF, "\uFFFF", "\u00EF\u00BF\u00BF"), - // unmatched surrogate halves - // high surrogates: 0xD800 to 0xDBFF - new Data(0xD800, "\uD800", "\u00ED\u00A0\u0080", true), - new Data("High surrogate followed by another high surrogate", - "\uD800\uD800", "\u00ED\u00A0\u0080\u00ED\u00A0\u0080", true), - new Data("High surrogate followed by a symbol that is not a surrogate", - "\uD800A", "\u00ED\u00A0\u0080A", true), - new Data("Unmatched high surrogate, followed by a surrogate pair, followed by an unmatched high surrogate", - "\uD800\uD834\uDF06\uD800", "\u00ED\u00A0\u0080\u00F0\u009D\u008C\u0086\u00ED\u00A0\u0080", true), - new Data(0xD9AF, "\uD9AF", "\u00ED\u00A6\u00AF", true), - new Data(0xDBFF, "\uDBFF", "\u00ED\u00AF\u00BF", true), - // low surrogates: 0xDC00 to 0xDFFF - new Data(0xDC00, "\uDC00", "\u00ED\u00B0\u0080", true), - new Data("Low surrogate followed by another low surrogate", - "\uDC00\uDC00", "\u00ED\u00B0\u0080\u00ED\u00B0\u0080", true), - new Data("Low surrogate followed by a symbol that is not a surrogate", - "\uDC00A", "\u00ED\u00B0\u0080A", true), - new Data("Unmatched low surrogate, followed by a surrogate pair, followed by an unmatched low surrogate", - "\uDC00\uD834\uDF06\uDC00", "\u00ED\u00B0\u0080\u00F0\u009D\u008C\u0086\u00ED\u00B0\u0080", true), - new Data(0xDEEE, "\uDEEE", "\u00ED\u00BB\u00AE", true), - new Data(0xDFFF, "\uDFFF", "\u00ED\u00BF\u00BF", true), - // 4-byte - new Data(0x010000, "\uD800\uDC00", "\u00F0\u0090\u0080\u0080"), - new Data(0x01D306, "\uD834\uDF06", "\u00F0\u009D\u008C\u0086"), - new Data(0x010FFF, "\uDBFF\uDFFF", "\u00F4\u008F\u00BF\u00BF"), - }; - - @Rule - public ExpectedException exception = ExpectedException.none(); - - @Test - public void encodeAndDecode() throws UTF8Exception { - for (Data data : DATA) { - String reason = data.description != null? data.description : "U+" + Integer.toHexString(data.codePoint).toUpperCase(); - if (data.error) { - exception.expect(UTF8Exception.class); - UTF8.decode(data.encoded); - exception.expect(UTF8Exception.class); - UTF8.encode(data.decoded); - } else { - assertThat("Encoding: " + reason, data.encoded, is(UTF8.encode(data.decoded))); - assertThat("Decoding: " + reason, data.decoded, is(UTF8.decode(data.encoded))); - } - } - - exception.expect(UTF8Exception.class); - UTF8.decode("\uFFFF"); - - exception.expect(UTF8Exception.class); - UTF8.decode("\u00E9\u0000\u0000"); - - exception.expect(UTF8Exception.class); - UTF8.decode("\u00C2\uFFFF"); - - exception.expect(UTF8Exception.class); - UTF8.decode("\u00F0\u009D"); - } - - private static class Data { - public int codePoint = -1; - public String description; - public String decoded; - public String encoded; - public boolean error; - - public Data(int codePoint, String decoded, String encoded) { - this(codePoint, decoded, encoded, false); - } - - public Data(int codePoint, String decoded, String encoded, boolean error) { - this.codePoint = codePoint; - this.decoded = decoded; - this.encoded = encoded; - this.error = error; - } - - public Data(String description, String decoded, String encoded) { - this(description, decoded, encoded, false); - } - - public Data(String description, String decoded, String encoded, boolean error) { - this.description = description; - this.decoded = decoded; - this.encoded = encoded; - this.error = error; - } - } -} diff --git a/src/test/resources/cert.pem b/src/test/resources/cert.pem index bea755ce..00d8bffe 100644 --- a/src/test/resources/cert.pem +++ b/src/test/resources/cert.pem @@ -1,10 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIBfDCCASYCCQDTnGd/oOyF1DANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB -VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0 -cyBQdHkgTHRkMB4XDTE0MDcwNzEzMTUzN1oXDTQxMTEyMTEzMTUzN1owRTELMAkG -A1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0 -IFdpZGdpdHMgUHR5IEx0ZDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC6sdeFPlqk -5Pap9woFx1RO05gLidw4MNcL+ZRSxy/sNeE4PhT/RLFcEvnXiHc92wT8YB5Z+WCM -k/jRQ0q19PNPAgMBAAEwDQYJKoZIhvcNAQEFBQADQQCnmm1N/yZiMBZw2JDfbsx3 -ecc0BGQ2BwWQuGHzP07TMi1AuOyNZSczl907OphYb9iRC8shZ4O+oXjQAuGTQ1Hp +MIIDazCCAlOgAwIBAgIUL0sTZnQmQ4K4o4NqeA1VAsKrn20wDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDEyMDgwOTE3NDlaFw0zMDEy +MDYwOTE3NDlaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQDKCTIWvz8s+SjqjxOSmQSF3hvQVjfuIxAwCqKYKdiO +4ix72gkM2WRtzb6icOpDF9zVmcN2QIUXC+hvmVLVMGISZBA4qnGpRwGfVsJlxkO/ +yIOQ4OVn8tJHT+qv9sE656CV+yMbhcoR4E6n03hXcyRz44f14rz1yHz1cjrsDCqa +HfjQkMjXEi/oiOYvGOr7EqAlf0fHyne/FdRg3sfqjy9GXxD4djEzBt6ug11cIjvw +21lP3jC2Te9gng+9cxGlmBYZ6l2OxDZQYjVfOlhTEGOc/J1fP1cVXt/P1fJ5byR8 +ltN6KCcorPwxa6rtCEVy3PXdnKTj1eX5UocIRYVj3e57AgMBAAGjUzBRMB0GA1Ud +DgQWBBRJPJeTbeYMbtebcMKinxhVgr8x/TAfBgNVHSMEGDAWgBRJPJeTbeYMbteb +cMKinxhVgr8x/TAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQC1 +VLs5pldkzYoXI+3ry6TTTDxG/AJ1g/GKC4AXp9V+v44FA/dzD8dWVAGKLE/C1IYj +tm3VDeKBGTIgk5EFm0SI0bfgvJwOkSg0WJiX5rrvaXDB2J1tZX50XKZq68BYCiq9 +Qm41bSVV7xccRr7XG2bpKzHqbfjCDIDRdG8WnuTtysVGXMmjObPnrR8SoFVmrGcR +nrkGgp//QWNlGVRYL6cHbkt6eLjDTWJxeKUIN0SlSKOP52Olh1GWBxTeQtnP9VUY +yoj8Fj4lHaCAOlS5W9/kAJSTiLNnmi7v3eKYi+5wuHMFKxr/yRyaUloq78uaBJxa +Y2xdMyPo+uzo0rAXGoUT -----END CERTIFICATE----- diff --git a/src/test/resources/key.pem b/src/test/resources/key.pem index 4a78a226..0c2ddfc3 100644 --- a/src/test/resources/key.pem +++ b/src/test/resources/key.pem @@ -1,9 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIIBOwIBAAJBALqx14U+WqTk9qn3CgXHVE7TmAuJ3Dgw1wv5lFLHL+w14Tg+FP9E -sVwS+deIdz3bBPxgHln5YIyT+NFDSrX0808CAwEAAQJAIdwLSIEsk2drTRwe1zl1 -ku5RTxZruE0zU1qqifDSQjab1StAK1tapxBVRlRlyLCfD704UClsU8sjGtq0Nh6n -kQIhAO2YJM1g0w9bWYet3zC2UdEASPzaQ7llpZmc51NRBx2NAiEAyShICAaclEuy -wwuD4hibV+b6I8CLYoyPBo32EaceN0sCIQCUed6NxfM/houlgV+Xtmfcnzv9X3yx -EDdzjpz08Q7sRQIgZFv1fBOYYSBXQppnJRFzx2pUmCvDHtrTrMh84RfIqnsCIQCf -JjNXXxOaHn1PNZpi6EHReiFQmy1Swt+AxpTsKixsfA== ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDKCTIWvz8s+Sjq +jxOSmQSF3hvQVjfuIxAwCqKYKdiO4ix72gkM2WRtzb6icOpDF9zVmcN2QIUXC+hv +mVLVMGISZBA4qnGpRwGfVsJlxkO/yIOQ4OVn8tJHT+qv9sE656CV+yMbhcoR4E6n +03hXcyRz44f14rz1yHz1cjrsDCqaHfjQkMjXEi/oiOYvGOr7EqAlf0fHyne/FdRg +3sfqjy9GXxD4djEzBt6ug11cIjvw21lP3jC2Te9gng+9cxGlmBYZ6l2OxDZQYjVf +OlhTEGOc/J1fP1cVXt/P1fJ5byR8ltN6KCcorPwxa6rtCEVy3PXdnKTj1eX5UocI +RYVj3e57AgMBAAECggEAMuJiBSyhwrf2QC1M5q03YGfyZWRxrb6TAyaKkPxpGIOK +ZJ8jjGLsUmNxUgRSXBeUfQ+/FPdnDcjn/8OEA0GuUad2Fm+HNPU3SWRWjb+DrLfZ +uxGJdcbIg0FzgGILhMR1w5B+5R2rKRlvdgFi29OaKL3zrlAu+1BFeKQOhwkBadMT +9Z7lFi4dUPCpgtm7F0lM5jMQvHslGtPu/VQTyrAvdyJjDtXfqDYFXMFgxyUuy0wh +dtMCxfnzePXDbS1D9wgzw1Dmmx/4gWoE80IHOUs7nzM1hPHQs8Qyr5ZFQ0iHq6DC +qcixIwRxZwunNyZ7M+JEPsSM20d0TF5FLFkw44Y9AQKBgQDvKCFbJTqD8yxTlD3H +sPKQCd4s08hR4E+sXnr3fF4ExyX1VwEPzev9fK4ez8pbQVFeuv0o89QhDQBJEGIu +HG0f2fYYcfil3+b3NYBTTEt+IIvhEE2LLCV1zkFe0uoG+qbZjksaHeXZ77TnKnGd +nTWHhoKZ7xMbKJzROUoMJ7GwuwKBgQDYQ8varcqW6UO4LS87OHA2lEs66OfJxnBk +Oox+Z34HXOsXlEqArx8S5/cX4/EM8UECobaqIQKzkvgRA5krL2Vroh588kJXf3yK +O5wESuE7zimg+m2RYnazXpdyxvgWhp1WSZzrm6ybJVCtUiY0x4SAaIWnU102JNMX +oge093K9QQKBgQCaJTKCrdcubxEV+clsKWfeYQ3btNE7vKl9vxPg6j8rMzULEf30 +MtS1eKQ95c5WzR3mQf2kZKxIdTnG3hF6CQZo7jKJhQQv3cXfdpN0nQtXiyC9eqWQ +W271pHBL7wO6ZdofBXDwr26T7sWZ7ah3X3m+FXuePhMBgUa6MAPDG96SuwKBgQDE +H096hArqKqaQGuHvWbJhvMAwr1Csqnn4WyRX6bDgKoLEgmXCJ44NjjGGB9/tdcgY +A+Fsjb0ubsTqYRIBmNzn7ECr3OMPCH0/uuk091ck7kTQSOseYmX1Kn47x3bqrq92 +thFJlYbFt+RfGdWuHZXrAV7brH0mgeSxVO6aTaFPQQKBgQDfkqfxQRmLEwIJygfk +Y1XwEvZqIf0gCZEHWPsGiYExClHc21RZSTbhc+XZ8DTgxYe375uMV6z5aolwjjrI +9bTMejqAC4l58rxdkE1NbxvQVbPwTdM/H4HyYJk9IPKSF0A11YLbalvGo0liWHKo +jfrYDnesTOn3+RLPe6G0K7jFgQ== +-----END PRIVATE KEY----- diff --git a/src/test/resources/keystore.jks b/src/test/resources/keystore.jks index 24c507ba..3884f8a6 100644 Binary files a/src/test/resources/keystore.jks and b/src/test/resources/keystore.jks differ diff --git a/src/test/resources/package-lock.json b/src/test/resources/package-lock.json index 1cea6912..407af578 100644 --- a/src/test/resources/package-lock.json +++ b/src/test/resources/package-lock.json @@ -3,140 +3,105 @@ "lockfileVersion": 1, "dependencies": { "accepts": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", - "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "requires": { - "mime-types": "2.1.15", - "negotiator": "0.6.1" + "mime-types": "~2.1.24", + "negotiator": "0.6.2" } }, - "after": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", - "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=" - }, - "arraybuffer.slice": { - "version": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", - "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=" - }, "base64-arraybuffer": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", - "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=" + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", + "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=" }, "base64id": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", - "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=" - }, - "blob": { - "version": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", - "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", + "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==" }, "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" + }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } }, "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { - "ms": "2.0.0" + "ms": "2.1.2" } }, "engine.io": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.0.tgz", - "integrity": "sha1-XKQ4486f28kVxKIcjdnhJmcG5X4=", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-4.1.2.tgz", + "integrity": "sha512-t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ==", "requires": { - "accepts": "1.3.3", - "base64id": "1.0.0", - "cookie": "0.3.1", - "debug": "2.6.8", - "engine.io-parser": "2.1.1", - "uws": "0.14.5", - "ws": "2.3.1" + "accepts": "~1.3.4", + "base64id": "2.0.0", + "cookie": "~0.4.1", + "cors": "~2.8.5", + "debug": "~4.3.1", + "engine.io-parser": "~4.0.0", + "ws": "~7.4.2" } }, "engine.io-parser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz", - "integrity": "sha1-4Ps/DgRi9/WLt3waUun1p+JuRmg=", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.3.tgz", + "integrity": "sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==", "requires": { - "after": "0.8.2", - "arraybuffer.slice": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", - "base64-arraybuffer": "0.1.5", - "blob": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", - "has-binary2": "1.0.2" - } - }, - "has-binary2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz", - "integrity": "sha1-6D26SfC5vk0CbSc2U1DZ8D9Uvpg=", - "requires": { - "isarray": "2.0.1" - }, - "dependencies": { - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" - } + "base64-arraybuffer": "0.1.4" } }, "mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=" + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" }, "mime-types": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "requires": { - "mime-db": "1.27.0" + "mime-db": "1.51.0" } }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "negotiator": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, - "safe-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, - "uws": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz", - "integrity": "sha1-Z6rzPEaypYel9mZtAPdpEyjxSdw=", - "optional": true + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, "ws": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz", - "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=", - "requires": { - "safe-buffer": "5.0.1", - "ultron": "1.1.0" - }, - "dependencies": { - "ultron": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz", - "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ=" - } - } + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" } } } diff --git a/src/test/resources/package.json b/src/test/resources/package.json index f7c59176..12fe5afa 100644 --- a/src/test/resources/package.json +++ b/src/test/resources/package.json @@ -1,6 +1,6 @@ { "private": true, "dependencies": { - "engine.io": "3.1.0" + "engine.io": "^4.1.2" } }