ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

http service: improve update detection logic

Browse Source 
Check the next revision is "outdated" in the event multiple revisions are valid.
This commit is contained in:
Adam
2018-08-23 16:11:58 -04:00
parent 48be128122
commit 2602e70f51
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
http-service/src/main/java/net/runelite/http/service/updatecheck/UpdateCheckService.java
View File

@@ -81,6 +81,26 @@ public class UpdateCheckService
updateAvailable = checkUpdate(); updateAvailable = checkUpdate();
} }
private int checkResponse(InetAddress address, int revision) throws IOException
{
try (Socket socket = new Socket())
{
socket.setSoTimeout((int) TIMEOUT.toMillis());
socket.connect(new InetSocketAddress(address, PORT), (int) TIMEOUT.toMillis());
ByteBuffer buffer = ByteBuffer.allocate(5);
buffer.put(HANDSHAKE_TYPE);
buffer.putInt(revision);
InputStream is = socket.getInputStream();
OutputStream os = socket.getOutputStream();
os.write(buffer.array());
int reply = is.read();
return reply;
}
}
private boolean checkUpdate() private boolean checkUpdate()
{ {
World nextWorld = randomWorld(); World nextWorld = randomWorld();
@@ -101,37 +121,29 @@ public class UpdateCheckService
return false; return false;
} }
try (Socket socket = new Socket()) // Since mobile, the handshake server will handshake multiple revisions successfully,
// so we can't assume that just because it says our revision is okay doesn't mean that
// the client revision hasn't changed.
int thisRevision = RuneLiteAPI.getRsVersion();
int nextRevision = thisRevision + 1;
try
{ {
socket.setSoTimeout((int) TIMEOUT.toMillis()); int thisCode = checkResponse(address, thisRevision);
socket.connect(new InetSocketAddress(address, PORT), (int) TIMEOUT.toMillis()); int nextCode = checkResponse(address, nextRevision);
ByteBuffer buffer = ByteBuffer.allocate(5); if (thisCode == RESPONSE_OK && nextCode == RESPONSE_OUTDATED)
buffer.put(HANDSHAKE_TYPE);
buffer.putInt(RuneLiteAPI.getRsVersion());
InputStream is = socket.getInputStream();
OutputStream os = socket.getOutputStream();
os.write(buffer.array());
int reply = is.read();
if (reply == RESPONSE_OUTDATED)
{ {
return true; return false; // This is most up-to-date
} }
if (reply != RESPONSE_OK) return true; // Needs to be updated
{
logger.debug("Non-ok response for handshake: {}", reply);
}
} }
catch (IOException ex) catch (IOException ex)
{ {
logger.warn(null, ex); logger.warn(null, ex);
return false; // assume not updated
} }
return false; // no update
} }
private World randomWorld() private World randomWorld()