h4ckx0r/engine.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace timestamp with yeast

Browse Source
This commit is contained in:
nkzawa
2016-01-31 01:13:03 +09:00
parent 109fcef0e1
commit d876b6c1bd
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/socket/engineio/client/Transport.java
View File

@@ -30,8 +30,6 @@ public abstract class Transport extends Emitter {
public static final String EVENT_REQUEST_HEADERS = "requestHeaders"; public static final String EVENT_REQUEST_HEADERS = "requestHeaders";
public static final String EVENT_RESPONSE_HEADERS = "responseHeaders"; public static final String EVENT_RESPONSE_HEADERS = "responseHeaders";
protected static int timestamps = 0;
public boolean writable; public boolean writable;
public String name; public String name;
public Map<String, String> query; public Map<String, String> query;

6
src/main/java/io/socket/engineio/client/transports/Polling.java
View File

@@ -1,15 +1,15 @@
package io.socket.engineio.client.transports; package io.socket.engineio.client.transports;
import io.socket.emitter.Emitter;
import io.socket.engineio.client.Transport; import io.socket.engineio.client.Transport;
import io.socket.engineio.parser.Packet; import io.socket.engineio.parser.Packet;
import io.socket.engineio.parser.Parser; import io.socket.engineio.parser.Parser;
import io.socket.parseqs.ParseQS; import io.socket.parseqs.ParseQS;
import io.socket.thread.EventThread; import io.socket.thread.EventThread;
import io.socket.emitter.Emitter;
import io.socket.utf8.UTF8Exception; import io.socket.utf8.UTF8Exception;
import io.socket.yeast.Yeast;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -200,7 +200,7 @@ abstract public class Polling extends Transport {
String port = ""; String port = "";
if (this.timestampRequests) { if (this.timestampRequests) {
query.put(this.timestampParam, String.valueOf(new Date().getTime()) + "-" + Transport.timestamps++); query.put(this.timestampParam, Yeast.yeast());
} }
String _query = ParseQS.encode(query); String _query = ParseQS.encode(query);

4
src/main/java/io/socket/engineio/client/transports/WebSocket.java
View File

@@ -7,6 +7,7 @@ import io.socket.engineio.parser.Parser;
import io.socket.parseqs.ParseQS; import io.socket.parseqs.ParseQS;
import io.socket.thread.EventThread; import io.socket.thread.EventThread;
import io.socket.utf8.UTF8Exception; import io.socket.utf8.UTF8Exception;
import io.socket.yeast.Yeast;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.RequestBody; import okhttp3.RequestBody;
@@ -18,7 +19,6 @@ import okio.Buffer;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
import java.io.IOException; import java.io.IOException;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -211,7 +211,7 @@ public class WebSocket extends Transport {
} }
if (this.timestampRequests) { if (this.timestampRequests) {
query.put(this.timestampParam, String.valueOf(new Date().getTime())); query.put(this.timestampParam, Yeast.yeast());
} }
String _query = ParseQS.encode(query); String _query = ParseQS.encode(query);

4
src/test/java/io/socket/engineio/client/TransportTest.java
View File

@@ -84,7 +84,7 @@ public class TransportTest {
opt.timestampParam = "t"; opt.timestampParam = "t";
opt.timestampRequests = true; opt.timestampRequests = true;
Polling polling = new Polling(opt); Polling polling = new Polling(opt);
assertThat(polling.uri().matches("http://localhost/engine.io\\?(j=[0-9]+&)?t=[0-9]+-[0-9]+"), is(true)); assertThat(polling.uri().matches("http://localhost/engine.io\\?(j=[0-9]+&)?t=[0-9A-Za-z-_.]+"), is(true));
} }
@Test @Test
@@ -144,7 +144,7 @@ public class TransportTest {
opt.timestampParam = "woot"; opt.timestampParam = "woot";
opt.timestampRequests = true; opt.timestampRequests = true;
WS ws = new WS(opt); WS ws = new WS(opt);
assertThat(ws.uri().matches("ws://localhost/engine.io\\?woot=[0-9]+"), is(true)); assertThat(ws.uri().matches("ws://localhost/engine.io\\?woot=[0-9A-Za-z-_.]+"), is(true));
} }
@Test @Test