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

Merge pull request #339 from runelite-extended/switchtooursession

Browse Source 
Switch to our session endpoint
This commit is contained in:
Tyler Bochard
2019-05-21 00:35:47 -04:00
committed by GitHub
parent 37708ef84f 7a2bd95f3b
commit f2c104f7ba
2 changed files with 101 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
View File

@@ -48,6 +48,7 @@ public class RuneLiteAPI
public static String userAgent; public static String userAgent;
private static final String BASE = "https://api.runelite.net"; private static final String BASE = "https://api.runelite.net";
private static final String RLPLUS = "https://session.runelitepl.us";
private static final String WSBASE = "https://api.runelite.net/ws"; private static final String WSBASE = "https://api.runelite.net/ws";
private static final String STATICBASE = "https://static.runelite.net"; private static final String STATICBASE = "https://static.runelite.net";
private static final Properties properties = new Properties(); private static final Properties properties = new Properties();
@@ -100,6 +101,11 @@ public class RuneLiteAPI
return HttpUrl.parse(BASE); return HttpUrl.parse(BASE);
} }
public static HttpUrl getSessionBase()
{
return HttpUrl.parse(RLPLUS);
}
public static HttpUrl getApiBase() public static HttpUrl getApiBase()
{ {
return HttpUrl.parse(BASE + "/runelite-" + getVersion()); return HttpUrl.parse(BASE + "/runelite-" + getVersion());

193
runelite-client/src/main/java/net/runelite/client/SessionClient.java
View File

@@ -1,98 +1,95 @@
/* /*
* Copyright (c) 2018, Adam <Adam@sigterm.info> * Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this * 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer. * list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client; package net.runelite.client;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.UUID; import java.util.UUID;
import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.RuneLiteAPI;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import okhttp3.ResponseBody; import okhttp3.ResponseBody;
class SessionClient class SessionClient
{ {
UUID open() throws IOException UUID open() throws IOException
{ {
HttpUrl url = RuneLiteAPI.getApiRoot().newBuilder() HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder()
.addPathSegment("session") .build();
.build();
Request request = new Request.Builder()
Request request = new Request.Builder() .url(url)
.url(url) .build();
.build();
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) {
{ ResponseBody body = response.body();
ResponseBody body = response.body();
InputStream in = body.byteStream();
InputStream in = body.byteStream(); return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), UUID.class);
return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), UUID.class); }
} catch (JsonParseException | IllegalArgumentException ex) // UUID.fromString can throw IllegalArgumentException
catch (JsonParseException | IllegalArgumentException ex) // UUID.fromString can throw IllegalArgumentException {
{ throw new IOException(ex);
throw new IOException(ex); }
} }
}
void ping(UUID uuid) throws IOException
void ping(UUID uuid) throws IOException {
{ HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder()
HttpUrl url = RuneLiteAPI.getApiRoot().newBuilder() .addPathSegment("ping")
.addPathSegment("session") .addQueryParameter("session", uuid.toString())
.addPathSegment("ping") .build();
.addQueryParameter("session", uuid.toString())
.build(); Request request = new Request.Builder()
.url(url)
Request request = new Request.Builder() .build();
.url(url)
.build(); try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
{
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute()) if (!response.isSuccessful())
{ {
if (!response.isSuccessful()) throw new IOException("Unsuccessful ping");
{ }
throw new IOException("Unsuccessful ping"); }
} }
}
} void delete(UUID uuid) throws IOException
{
void delete(UUID uuid) throws IOException HttpUrl url = RuneLiteAPI.getSessionBase().newBuilder()
{ .addQueryParameter("session", uuid.toString())
HttpUrl url = RuneLiteAPI.getApiRoot().newBuilder() .build();
.addPathSegment("session")
.addQueryParameter("session", uuid.toString()) Request request = new Request.Builder()
.build(); .delete()
.url(url)
Request request = new Request.Builder() .build();
.delete()
.url(url) RuneLiteAPI.CLIENT.newCall(request).execute().close();
.build(); }
}
RuneLiteAPI.CLIENT.newCall(request).execute().close();
}
}