();
+ }
+ String schema = this.secure ? "wss" : "ws";
+ String port = "";
+
+ if (this.port > 0 && (("wss".equals(schema) && this.port != 443)
+ || ("ws".equals(schema) && this.port != 80))) {
+ port = ":" + this.port;
+ }
+
+ if (this.timestampRequests) {
+ query.put(this.timestampParam, Yeast.yeast());
+ }
+
+ String derivedQuery = ParseQS.encode(query);
+ if (derivedQuery.length() > 0) {
+ derivedQuery = "?" + derivedQuery;
+ }
+
+ boolean ipv6 = this.hostname.contains(":");
+ return schema + "://" + (ipv6 ? "[" + this.hostname + "]" : this.hostname) + port + this.path + derivedQuery;
+ }
+}
\ No newline at end of file
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/com/github/nkzawa/engineio/parser/Packet.java b/src/main/java/io/socket/engineio/parser/Packet.java
similarity index 93%
rename from src/main/java/com/github/nkzawa/engineio/parser/Packet.java
rename to src/main/java/io/socket/engineio/parser/Packet.java
index 29d5b747..32e2e4d4 100644
--- a/src/main/java/com/github/nkzawa/engineio/parser/Packet.java
+++ b/src/main/java/io/socket/engineio/parser/Packet.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.parser;
+package io.socket.engineio.parser;
public class Packet {
diff --git a/src/main/java/io/socket/engineio/parser/Parser.java b/src/main/java/io/socket/engineio/parser/Parser.java
new file mode 100644
index 00000000..f92e1e08
--- /dev/null
+++ b/src/main/java/io/socket/engineio/parser/Parser.java
@@ -0,0 +1,148 @@
+package io.socket.engineio.parser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Parser {
+
+ public static final int PROTOCOL = 4;
+
+ private static final char SEPARATOR = '\u001e';
+
+ private static final Map packets = new HashMap() {{
+ put(Packet.OPEN, 0);
+ put(Packet.CLOSE, 1);
+ put(Packet.PING, 2);
+ put(Packet.PONG, 3);
+ put(Packet.MESSAGE, 4);
+ put(Packet.UPGRADE, 5);
+ put(Packet.NOOP, 6);
+ }};
+
+ private static final Map packetslist = new HashMap<>();
+ static {
+ for (Map.Entry entry : packets.entrySet()) {
+ packetslist.put(entry.getValue(), entry.getKey());
+ }
+ }
+
+ private static final Packet err = new Packet(Packet.ERROR, "parser error");
+
+ private Parser() {}
+
+ public static void encodePacket(Packet packet, EncodeCallback callback) {
+ if (packet.data instanceof byte[]) {
+ ((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);
+ }
+ }
+
+ 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) {
+ if (data == null) {
+ return err;
+ }
+
+ int type;
+ try {
+ type = Character.getNumericValue(data.charAt(0));
+ } catch (IndexOutOfBoundsException e) {
+ type = -1;
+ }
+
+ if (type < 0 || type >= packetslist.size()) {
+ return err;
+ }
+
+ if (data.length() > 1) {
+ return new Packet(packetslist.get(type), data.substring(1));
+ } else {
+ return new Packet(packetslist.get(type));
+ }
+ }
+
+ public static Packet decodeBase64Packet(String data) {
+ if (data == null) {
+ return err;
+ }
+
+ if (data.charAt(0) == 'b') {
+ return new Packet(Packet.MESSAGE, Base64.decode(data.substring(1), Base64.DEFAULT));
+ } else {
+ return decodePacket(data);
+ }
+ }
+
+ public static Packet decodePacket(byte[] data) {
+ return new Packet<>(Packet.MESSAGE, data);
+ }
+
+ public static void encodePayload(Packet[] packets, EncodeCallback callback) {
+ if (packets.length == 0) {
+ callback.call("0:");
+ return;
+ }
+
+ final StringBuilder result = new StringBuilder();
+
+ 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(String message) {
+ result.append(message);
+ if (!isLast) {
+ result.append(SEPARATOR);
+ }
+ }
+ });
+ }
+
+ callback.call(result.toString());
+ }
+
+ public static void decodePayload(String data, DecodePayloadCallback callback) {
+ if (data == null || data.length() == 0) {
+ callback.call(err, 0, 1);
+ return;
+ }
+
+ String[] messages = data.split(String.valueOf(SEPARATOR));
+
+ 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;
+ }
+
+ boolean ret = callback.call(packet, i, l);
+ if (!ret) {
+ return;
+ }
+ }
+ }
+
+ public interface EncodeCallback {
+
+ void call(T data);
+ }
+
+
+ public interface DecodePayloadCallback {
+
+ boolean call(Packet packet, int index, int total);
+ }
+}
diff --git a/src/main/java/com/github/nkzawa/global/Global.java b/src/main/java/io/socket/global/Global.java
similarity index 96%
rename from src/main/java/com/github/nkzawa/global/Global.java
rename to src/main/java/io/socket/global/Global.java
index 62396ce2..3275187d 100644
--- a/src/main/java/com/github/nkzawa/global/Global.java
+++ b/src/main/java/io/socket/global/Global.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.global;
+package io.socket.global;
import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/com/github/nkzawa/parseqs/ParseQS.java b/src/main/java/io/socket/parseqs/ParseQS.java
similarity index 86%
rename from src/main/java/com/github/nkzawa/parseqs/ParseQS.java
rename to src/main/java/io/socket/parseqs/ParseQS.java
index eec7cf35..fe597baf 100644
--- a/src/main/java/com/github/nkzawa/parseqs/ParseQS.java
+++ b/src/main/java/io/socket/parseqs/ParseQS.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.parseqs;
+package io.socket.parseqs;
-import com.github.nkzawa.global.Global;
+import io.socket.global.Global;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +26,7 @@ public static Map decode(String qs) {
for (String _pair : pairs) {
String[] pair = _pair.split("=");
qry.put(Global.decodeURIComponent(pair[0]),
- pair.length > 0 ? Global.decodeURIComponent(pair[1]) : "");
+ pair.length > 1 ? Global.decodeURIComponent(pair[1]) : "");
}
return qry;
}
diff --git a/src/main/java/com/github/nkzawa/thread/EventThread.java b/src/main/java/io/socket/thread/EventThread.java
similarity index 84%
rename from src/main/java/com/github/nkzawa/thread/EventThread.java
rename to src/main/java/io/socket/thread/EventThread.java
index 5ae896bf..90f7aec7 100644
--- a/src/main/java/com/github/nkzawa/thread/EventThread.java
+++ b/src/main/java/io/socket/thread/EventThread.java
@@ -1,9 +1,11 @@
-package com.github.nkzawa.thread;
+package io.socket.thread;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
@@ -11,11 +13,14 @@
*/
public class EventThread extends Thread {
+ private static final Logger logger = Logger.getLogger(EventThread.class.getName());
+
private static final ThreadFactory THREAD_FACTORY = new ThreadFactory() {
@Override
public Thread newThread(Runnable runnable) {
thread = new EventThread(runnable);
thread.setName("EventThread");
+ thread.setDaemon(Thread.currentThread().isDaemon());
return thread;
}
};
@@ -73,6 +78,9 @@ public static void nextTick(final Runnable task) {
public void run() {
try {
task.run();
+ } catch (Throwable t) {
+ logger.log(Level.SEVERE, "Task threw exception", t);
+ throw t;
} finally {
synchronized (EventThread.class) {
counter--;
diff --git a/src/main/java/io/socket/yeast/Yeast.java b/src/main/java/io/socket/yeast/Yeast.java
new file mode 100644
index 00000000..0f60808a
--- /dev/null
+++ b/src/main/java/io/socket/yeast/Yeast.java
@@ -0,0 +1,57 @@
+package io.socket.yeast;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A Java implementation of yeast. https://github.com/unshiftio/yeast
+ */
+public final class Yeast {
+ private static char[] alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_".toCharArray();
+
+ private static int length = alphabet.length;
+ private static int seed = 0;
+ private static String prev;
+ private static Map map = new HashMap(length);
+ static {
+ for (int i = 0; i < length; i++) {
+ map.put(alphabet[i], i);
+ }
+ }
+
+ private Yeast () {}
+
+ public static String encode(long num) {
+ final StringBuilder encoded = new StringBuilder();
+ long dividedNum = num;
+ do {
+ encoded.insert(0, alphabet[(int)(dividedNum % length)]);
+ dividedNum = dividedNum / length;
+ } while (dividedNum > 0);
+
+ return encoded.toString();
+ }
+
+ public static long decode(String str) {
+ long decoded = 0;
+
+ for (char c : str.toCharArray()) {
+ decoded = decoded * length + map.get(c);
+ }
+
+ return decoded;
+ }
+
+ public static String yeast() {
+ String now = encode(new Date().getTime());
+
+ if (!now.equals(prev)) {
+ seed = 0;
+ prev = now;
+ return now;
+ }
+
+ return now + "." + encode(seed++);
+ }
+}
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/com/github/nkzawa/engineio/client/SocketTest.java b/src/test/java/com/github/nkzawa/engineio/client/SocketTest.java
deleted file mode 100644
index 0080b08b..00000000
--- a/src/test/java/com/github/nkzawa/engineio/client/SocketTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.github.nkzawa.engineio.client;
-
-import com.github.nkzawa.engineio.client.transports.Polling;
-import com.github.nkzawa.engineio.client.transports.WebSocket;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-@RunWith(JUnit4.class)
-public class SocketTest {
-
- @Test
- public void filterUpgrades() {
- Socket.Options opts = new Socket.Options();
- opts.transports = new String[] {Polling.NAME};
- Socket socket = new Socket(opts);
- List upgrades = new ArrayList() {{
- add(Polling.NAME);
- add(WebSocket.NAME);
- }};
- List expected = new ArrayList() {{add(Polling.NAME);}};
- assertThat(socket.filterUpgrades(upgrades), is(expected));
- }
-
- public void properlyParseHttpUriWithoutPort() throws URISyntaxException {
- Socket client = new Socket("http://localhost");
- assertThat(client.port, is(80));
- }
-
- public void properlyParseHttpsUriWithoutPort() throws URISyntaxException {
- Socket client = new Socket("http://localhost");
- assertThat(client.port, is(443));
- }
-
- public void properlyParseWssUriWithoutPort() throws URISyntaxException {
- Socket client = new Socket("http://localhost");
- assertThat(client.port, is(443));
- }
-
- public void properlyParseWssUriWithPort() throws URISyntaxException {
- Socket client = new Socket("http://localhost:2020");
- assertThat(client.port, is(2020));
- }
-}
diff --git a/src/test/java/com/github/nkzawa/engineio/client/executions/Connection.java b/src/test/java/com/github/nkzawa/engineio/client/executions/Connection.java
deleted file mode 100644
index 4e48f98e..00000000
--- a/src/test/java/com/github/nkzawa/engineio/client/executions/Connection.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.nkzawa.engineio.client.executions;
-
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.Socket;
-
-import java.net.URISyntaxException;
-
-public class Connection {
-
- public static void main(String[] args) throws URISyntaxException {
- final Socket socket = new Socket("http://localhost:" + System.getenv("PORT"));
- socket.on(Socket.EVENT_OPEN, new Emitter.Listener() {
- @Override
- public void call(Object... args) {
- System.out.println("open");
- socket.close();
- }
- });
- socket.open();
- }
-}
diff --git a/src/test/java/com/github/nkzawa/utf8/UTF8Test.java b/src/test/java/com/github/nkzawa/utf8/UTF8Test.java
deleted file mode 100644
index 3aa91e12..00000000
--- a/src/test/java/com/github/nkzawa/utf8/UTF8Test.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.github.nkzawa.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"),
- new Data("High surrogate followed by another high surrogate",
- "\uD800\uD800", "\u00ED\u00A0\u0080\u00ED\u00A0\u0080"),
- new Data("High surrogate followed by a symbol that is not a surrogate",
- "\uD800A", "\u00ED\u00A0\u0080A"),
- 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"),
- new Data(0xD9AF, "\uD9AF", "\u00ED\u00A6\u00AF"),
- new Data(0xDBFF, "\uDBFF", "\u00ED\u00AF\u00BF"),
- // low surrogates: 0xDC00 to 0xDFFF
- new Data(0xDC00, "\uDC00", "\u00ED\u00B0\u0080"),
- new Data("Low surrogate followed by another low surrogate",
- "\uDC00\uDC00", "\u00ED\u00B0\u0080\u00ED\u00B0\u0080"),
- new Data("Low surrogate followed by a symbol that is not a surrogate",
- "\uDC00A", "\u00ED\u00B0\u0080A"),
- 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"),
- new Data(0xDEEE, "\uDEEE", "\u00ED\u00BB\u00AE"),
- new Data(0xDFFF, "\uDFFF", "\u00ED\u00BF\u00BF"),
- // 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();
- 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 Data(int codePoint, String decoded, String encoded) {
- this.codePoint = codePoint;
- this.decoded = decoded;
- this.encoded = encoded;
- }
-
- public Data(String description, String decoded, String encoded) {
- this.description = description;
- this.decoded = decoded;
- this.encoded = encoded;
- }
- }
-}
diff --git a/src/test/java/com/github/nkzawa/emitter/EmitterTest.java b/src/test/java/io/socket/emitter/EmitterTest.java
similarity index 99%
rename from src/test/java/com/github/nkzawa/emitter/EmitterTest.java
rename to src/test/java/io/socket/emitter/EmitterTest.java
index 8a83358f..d574cf15 100644
--- a/src/test/java/com/github/nkzawa/emitter/EmitterTest.java
+++ b/src/test/java/io/socket/emitter/EmitterTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.emitter;
+package io.socket.emitter;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/BinaryPollingTest.java b/src/test/java/io/socket/engineio/client/BinaryPollingTest.java
similarity index 95%
rename from src/test/java/com/github/nkzawa/engineio/client/BinaryPollingTest.java
rename to src/test/java/io/socket/engineio/client/BinaryPollingTest.java
index 96e8f6c9..be0445e4 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/BinaryPollingTest.java
+++ b/src/test/java/io/socket/engineio/client/BinaryPollingTest.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.transports.Polling;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.transports.Polling;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/BinaryWSTest.java b/src/test/java/io/socket/engineio/client/BinaryWSTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/engineio/client/BinaryWSTest.java
rename to src/test/java/io/socket/engineio/client/BinaryWSTest.java
index ca36d335..0d670ddc 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/BinaryWSTest.java
+++ b/src/test/java/io/socket/engineio/client/BinaryWSTest.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/engineio/client/Connection.java b/src/test/java/io/socket/engineio/client/Connection.java
similarity index 85%
rename from src/test/java/com/github/nkzawa/engineio/client/Connection.java
rename to src/test/java/io/socket/engineio/client/Connection.java
index 48693ca5..5fa5a36b 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/Connection.java
+++ b/src/test/java/io/socket/engineio/client/Connection.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
import org.junit.After;
import org.junit.Before;
@@ -9,9 +9,12 @@
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.*;
+import java.util.logging.Logger;
public abstract class Connection {
+ private static final Logger logger = Logger.getLogger(Socket.class.getName());
+
final static int TIMEOUT = 10000;
final static int PORT = 3000;
@@ -22,7 +25,7 @@ public abstract class Connection {
@Before
public void startServer() throws IOException, InterruptedException {
- System.out.println("Starting server ...");
+ logger.fine("Starting server ...");
final CountDownLatch latch = new CountDownLatch(1);
serverProcess = Runtime.getRuntime().exec(
@@ -38,10 +41,10 @@ public void run() {
line = reader.readLine();
latch.countDown();
do {
- System.out.println("SERVER OUT: " + line);
+ logger.fine("SERVER OUT: " + line);
} while ((line = reader.readLine()) != null);
} catch (IOException e) {
- e.printStackTrace();
+ logger.warning(e.getMessage());
}
}
});
@@ -53,10 +56,10 @@ public void run() {
String line;
try {
while ((line = reader.readLine()) != null) {
- System.err.println("SERVER ERR: " + line);
+ logger.fine("SERVER ERR: " + line);
}
} catch (IOException e) {
- e.printStackTrace();
+ logger.warning(e.getMessage());
}
}
});
@@ -65,7 +68,7 @@ public void run() {
@After
public void stopServer() throws InterruptedException {
- System.out.println("Stopping server ...");
+ logger.fine("Stopping server ...");
serverProcess.destroy();
serverOutout.cancel(false);
serverError.cancel(false);
diff --git a/src/test/java/com/github/nkzawa/engineio/client/ConnectionTest.java b/src/test/java/io/socket/engineio/client/ConnectionTest.java
similarity index 91%
rename from src/test/java/com/github/nkzawa/engineio/client/ConnectionTest.java
rename to src/test/java/io/socket/engineio/client/ConnectionTest.java
index a1f5c6aa..a9192791 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/ConnectionTest.java
+++ b/src/test/java/io/socket/engineio/client/ConnectionTest.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -72,7 +72,7 @@ public void receiveEmoji() throws InterruptedException {
socket.on(Socket.EVENT_OPEN, new Emitter.Listener() {
@Override
public void call(Object... args) {
- socket.send("\uD800-\uDB7F\uDB80-\uDBFF\uDC00-\uDFFF\uE000-\uF8FF");
+ socket.send("\uD800\uDC00-\uDB7F\uDFFF\uDB80\uDC00-\uDBFF\uDFFF\uE000-\uF8FF");
socket.on(Socket.EVENT_MESSAGE, new Emitter.Listener() {
@Override
public void call(Object... args) {
@@ -85,7 +85,7 @@ public void call(Object... args) {
});
socket.open();
- assertThat((String)values.take(), is("\uD800-\uDB7F\uDB80-\uDBFF\uDC00-\uDFFF\uE000-\uF8FF"));
+ assertThat((String)values.take(), is("\uD800\uDC00-\uDB7F\uDFFF\uDB80\uDC00-\uDBFF\uDFFF\uE000-\uF8FF"));
}
@Test(timeout = TIMEOUT)
@@ -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/com/github/nkzawa/engineio/client/ExecutionTest.java b/src/test/java/io/socket/engineio/client/ExecutionTest.java
similarity index 76%
rename from src/test/java/com/github/nkzawa/engineio/client/ExecutionTest.java
rename to src/test/java/io/socket/engineio/client/ExecutionTest.java
index 244b3838..a24a6f87 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/ExecutionTest.java
+++ b/src/test/java/io/socket/engineio/client/ExecutionTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -7,6 +7,7 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.logging.Logger;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -14,21 +15,23 @@
@RunWith(JUnit4.class)
public class ExecutionTest extends Connection {
+ private static final Logger logger = Logger.getLogger(Socket.class.getName());
+
final static int TIMEOUT = 30 * 1000;
@Test(timeout = TIMEOUT)
public void execConnection() throws InterruptedException, IOException {
- exec("com.github.nkzawa.engineio.client.executions.Connection");
+ exec("io.socket.engineio.client.executions.Connection");
}
@Test(timeout = TIMEOUT)
public void execConnectionFailure() throws InterruptedException, IOException {
- exec("com.github.nkzawa.engineio.client.executions.ConnectionFailure");
+ exec("io.socket.engineio.client.executions.ConnectionFailure");
}
@Test(timeout = TIMEOUT)
public void execImmediateClose() throws InterruptedException, IOException {
- exec("com.github.nkzawa.engineio.client.executions.ImmediateClose");
+ exec("io.socket.engineio.client.executions.ImmediateClose");
}
private void exec(String mainClass) throws InterruptedException, IOException {
@@ -38,7 +41,7 @@ private void exec(String mainClass) throws InterruptedException, IOException {
new InputStreamReader(process.getInputStream()));
String line;
while ((line = input.readLine()) != null) {
- System.out.println("EXEC OUT: " + line);
+ logger.fine("EXEC OUT: " + line);
}
process.waitFor();
assertThat(process.exitValue(), is(0));
diff --git a/src/test/java/com/github/nkzawa/engineio/client/SSLConnectionTest.java b/src/test/java/io/socket/engineio/client/SSLConnectionTest.java
similarity index 78%
rename from src/test/java/com/github/nkzawa/engineio/client/SSLConnectionTest.java
rename to src/test/java/io/socket/engineio/client/SSLConnectionTest.java
index c4c0e5c9..1405e4df 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/SSLConnectionTest.java
+++ b/src/test/java/io/socket/engineio/client/SSLConnectionTest.java
@@ -1,14 +1,10 @@
-package com.github.nkzawa.engineio.client;
+package io.socket.engineio.client;
-import com.github.nkzawa.emitter.Emitter;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -17,27 +13,63 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+import io.socket.emitter.Emitter;
+import okhttp3.OkHttpClient;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@RunWith(JUnit4.class)
public class SSLConnectionTest extends Connection {
+ private static OkHttpClient sOkHttpClient;
+
+ private Socket socket;
+
static {
- // for test on localhost
- javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier(
- new javax.net.ssl.HostnameVerifier(){
+ try {
+ prepareOkHttpClient();
+ } catch (GeneralSecurityException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static void prepareOkHttpClient() throws GeneralSecurityException, IOException {
+ KeyStore ks = KeyStore.getInstance("JKS");
+ File file = new File("src/test/resources/keystore.jks");
+ ks.load(new FileInputStream(file), "password".toCharArray());
+
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+ kmf.init(ks, "password".toCharArray());
+
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+ tmf.init(ks);
+
+ SSLContext sslContext = SSLContext.getInstance("TLS");
+ sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+ sOkHttpClient = new OkHttpClient.Builder()
+ .hostnameVerifier(new javax.net.ssl.HostnameVerifier(){
public boolean verify(String hostname, javax.net.ssl.SSLSession sslSession) {
return hostname.equals("localhost");
}
- });
+ })
+ .sslSocketFactory(sslContext.getSocketFactory(),
+ (X509TrustManager) tmf.getTrustManagers()[0])
+ .build();
}
- private Socket socket;
-
@After
public void tearDown() {
- Socket.setDefaultSSLContext(null);
+ Socket.setDefaultOkHttpCallFactory(null);
+ Socket.setDefaultOkHttpWebSocketFactory(null);
}
@Override
@@ -52,28 +84,13 @@ String[] createEnv() {
return new String[] {"DEBUG=engine*", "PORT=" + PORT, "SSL=1"};
}
- SSLContext createSSLContext() throws GeneralSecurityException, IOException {
- KeyStore ks = KeyStore.getInstance("JKS");
- File file = new File("src/test/resources/keystore.jks");
- ks.load(new FileInputStream(file), "password".toCharArray());
-
- KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
- kmf.init(ks, "password".toCharArray());
-
- TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
- tmf.init(ks);
-
- SSLContext sslContext = SSLContext.getInstance("TLS");
- sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
- return sslContext;
- }
-
@Test(timeout = TIMEOUT)
public void connect() throws Exception {
final BlockingQueue