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

project: Add xtea base, Fix session base

Browse Source
This commit is contained in:
TheRealNull
2020-01-17 01:20:58 -05:00
parent 89bbf84ab1
commit cd43ef62fe
4 changed files with 38 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,8 @@ public class RuneLiteAPI
private static final String STATICBASE = "https://static.runelite.net";
private static final String OPENOSRS_BASE = /*"https://api.openosrs.com*/ "https://api.runelitepl.us";
private static final String OPENOSRS_SESSION = "http://www.openosrs.dev/session";
private static final String OPENOSRS_SESSION = "http://session.openosrs.dev";
private static final String OPENOSRS_XTEA = "http://xtea.openosrs.dev";
private static final String MAVEN_METADATA = "http://repo.runelite.net/net/runelite/runelite-parent/maven-metadata.xml";
private static final Properties properties = new Properties();
@@ -121,6 +122,11 @@ public class RuneLiteAPI
return HttpUrl.parse(OPENOSRS_SESSION);
}
public static HttpUrl getXteaBase()
{
return HttpUrl.parse(OPENOSRS_XTEA);
}
public static HttpUrl getApiBase()
{
final String prop = System.getProperty("runelite.http-service.url");

50
http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java
View File

@@ -29,14 +29,12 @@ import com.google.gson.reflect.TypeToken;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.List;
import java.util.HashMap;
import net.runelite.http.api.RuneLiteAPI;
import static net.runelite.http.api.RuneLiteAPI.JSON;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.HttpUrl;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,19 +43,19 @@ public class XteaClient
{
private static final Logger logger = LoggerFactory.getLogger(XteaClient.class);
public void submit(XteaRequest xteaRequest)
public void submit(int region, int[] keys)
{
String json = RuneLiteAPI.GSON.toJson(xteaRequest);
HttpUrl url = RuneLiteAPI.getOpenOSRSApiBase().newBuilder()
.addPathSegment("xtea")
HttpUrl url = RuneLiteAPI.getXteaBase().newBuilder()
.addPathSegment("submit")
.addQueryParameter("region", String.valueOf(region))
.addQueryParameter("key1", String.valueOf(keys[0]))
.addQueryParameter("key2", String.valueOf(keys[1]))
.addQueryParameter("key3", String.valueOf(keys[2]))
.addQueryParameter("key4", String.valueOf(keys[3]))
.build();
logger.debug("Built URI: {}", url);
RequestBody body = RequestBody.Companion.create(json, JSON);
Request request = new Request.Builder()
.post(body)
.url(url)
.build();
@@ -87,10 +85,10 @@ public class XteaClient
});
}
public List<XteaKey> get() throws IOException
public HashMap<Integer, int[]> get() throws IOException
{
HttpUrl url = RuneLiteAPI.getOpenOSRSApiBase().newBuilder()
.addPathSegment("xtea")
HttpUrl url = RuneLiteAPI.getXteaBase().newBuilder()
.addPathSegment("get")
.build();
Request request = new Request.Builder()
@@ -101,7 +99,7 @@ public class XteaClient
{
InputStream in = response.body().byteStream();
// CHECKSTYLE:OFF
return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken<List<XteaKey>>() {}.getType());
return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), new TypeToken<HashMap<Integer, Integer[]>>() {}.getType());
// CHECKSTYLE:ON
}
catch (JsonParseException ex)
@@ -109,26 +107,4 @@ public class XteaClient
throw new IOException(ex);
}
}
public XteaKey get(int region) throws IOException
{
HttpUrl url = RuneLiteAPI.getOpenOSRSApiBase().newBuilder()
.addPathSegment("xtea")
.addPathSegment(Integer.toString(region))
.build();
Request request = new Request.Builder()
.url(url)
.build();
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
{
InputStream in = response.body().byteStream();
return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), XteaKey.class);
}
catch (JsonParseException ex)
{
throw new IOException(ex);
}
}
}