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

Use our own http-service / http-api

Browse Source 
Also starts scraping xtea keys :)
This commit is contained in:
zeruth
2019-06-23 05:51:52 -04:00
parent f8ba2de7a1
commit 3c02f5b9c8
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@
package net.runelite.http.api; package net.runelite.http.api;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties; import java.util.Properties;
@@ -44,12 +45,12 @@ public class RuneLiteAPI
public static final String RUNELITE_AUTH = "RUNELITE-AUTH"; public static final String RUNELITE_AUTH = "RUNELITE-AUTH";
public static final OkHttpClient CLIENT; public static final OkHttpClient CLIENT;
public static final Gson GSON = new Gson(); public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
public static String userAgent; public static String userAgent;
private static final String BASE = "https://api.runelite.net"; private static final String BASE = "https://api.runelitepl.us";
private static final String RLPLUS = "https://session.runelitepl.us"; 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.runelitepl.us/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();
private static String version; private static String version;

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

@@ -62,6 +62,17 @@ public class XteaClient
.url(url) .url(url)
.build(); .build();
try
{
try (Response response = RuneLiteAPI.CLIENT.newCall(request).execute())
{
logger.debug("xtea response "+response.code());
}
}
catch (IOException e)
{
e.printStackTrace();
}
RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback() RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback()
{ {
@Override @Override

8
runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
View File

@@ -31,6 +31,7 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
@@ -48,17 +49,20 @@ public class XteaPlugin extends Plugin
private final XteaClient xteaClient = new XteaClient(); private final XteaClient xteaClient = new XteaClient();
private final Set<Integer> sentRegions = new HashSet<>(); private final Set<Integer> sentRegions = new HashSet<>();
private int[][] xteaKeys;
@Inject @Inject
private Client client; private Client client;
@Subscribe @Subscribe
public void onGameStateChanged(GameStateChanged gameStateChanged) public void onGameTick(GameTick gameTick)
{ {
if (gameStateChanged.getGameState() != GameState.LOGGED_IN) // Only send when keys are updated
if (xteaKeys == client.getXteaKeys())
{ {
return; return;
} }
xteaKeys = client.getXteaKeys();
int revision = client.getRevision(); int revision = client.getRevision();
int[] regions = client.getMapRegions(); int[] regions = client.getMapRegions();