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

http-api: change useragent, remove unused methods, reordering

Browse Source
This commit is contained in:
ThatGamerBlue
2019-08-20 21:05:06 +01:00
parent 2d80de239d
commit a27b355fdd
1 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,9 +68,8 @@ public class RuneLiteAPI
private static final String STATICBASE = "https://static.runelite.net"; private static final String STATICBASE = "https://static.runelite.net";
private static final String MAVEN_METADATA = private static final String MAVEN_METADATA =
"http://repo.runelite.net/net/runelite/runelite-parent/maven-metadata.xml"; "http://repo.runelite.net/net/runelite/runelite-parent/maven-metadata.xml";
private static final String ALPHA_NUMERIC_STRING = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz";
private static final Properties properties = new Properties(); private static final Properties properties = new Properties();
private static String userAgent; private static String rlUserAgent;
private static String rlpUserAgent; private static String rlpUserAgent;
static static
@@ -80,15 +79,15 @@ public class RuneLiteAPI
InputStream in = RuneLiteAPI.class.getResourceAsStream("/runelite.properties"); InputStream in = RuneLiteAPI.class.getResourceAsStream("/runelite.properties");
properties.load(in); properties.load(in);
parseMavenVersion(); version = properties.getProperty("runelite.version");
rsVersion = Integer.parseInt(properties.getProperty("rs.version"));
String commit = randomAlphaNumeric(7);
String rlpCommit = properties.getProperty("runelite.commit"); String rlpCommit = properties.getProperty("runelite.commit");
boolean dirty = Boolean.parseBoolean(properties.getProperty("runelite.dirty")); boolean dirty = Boolean.parseBoolean(properties.getProperty("runelite.dirty"));
version = properties.getProperty("runelite.version");
userAgent = "RuneLite/" + upstreamVersion + "-" + commit + (dirty ? "+" : "");
rlpUserAgent = "RuneLitePlus/" + version + "-" + rlpCommit + (dirty ? "+" : ""); rlpUserAgent = "RuneLitePlus/" + version + "-" + rlpCommit + (dirty ? "+" : "");
rlUserAgent = "RuneLitePlus/" + version;
rsVersion = Integer.parseInt(properties.getProperty("rs.version"));
parseMavenVersion();
} }
catch (NumberFormatException e) catch (NumberFormatException e)
{ {
@@ -111,7 +110,7 @@ public class RuneLiteAPI
{ {
Request userAgentRequest = chain.request() Request userAgentRequest = chain.request()
.newBuilder() .newBuilder()
.header("User-Agent", userAgent) .header("User-Agent", rlUserAgent)
.build(); .build();
return chain.proceed(userAgentRequest); return chain.proceed(userAgentRequest);
} }
@@ -137,18 +136,6 @@ public class RuneLiteAPI
.build(); .build();
} }
public static HttpUrl getSessionBase()
{
final String prop = System.getProperty("runelite.session.url");
if (prop != null && !prop.isEmpty())
{
return HttpUrl.parse(prop);
}
return HttpUrl.parse(BASE + "/session");
}
public static HttpUrl getRuneLitePlusSessionBase() public static HttpUrl getRuneLitePlusSessionBase()
{ {
return HttpUrl.parse(RLPLUS_SESSION); return HttpUrl.parse(RLPLUS_SESSION);
@@ -219,7 +206,7 @@ public class RuneLiteAPI
byte[] chunk = new byte[4096]; byte[] chunk = new byte[4096];
int bytesRead; int bytesRead;
URLConnection conn = toDownload.openConnection(); URLConnection conn = toDownload.openConnection();
conn.setRequestProperty("User-Agent", toDownload.getHost().contains("runelite") ? randomAlphaNumeric(8) : "runelite-extended"); conn.setRequestProperty("User-Agent", rlpUserAgent);
stream = conn.getInputStream(); stream = conn.getInputStream();
while ((bytesRead = stream.read(chunk)) > 0) while ((bytesRead = stream.read(chunk)) > 0)
@@ -261,15 +248,4 @@ public class RuneLiteAPI
logger.error(null, ex); logger.error(null, ex);
} }
} }
private static String randomAlphaNumeric(int count)
{
StringBuilder builder = new StringBuilder();
while (count-- != 0)
{
int character = (int) (Math.random() * ALPHA_NUMERIC_STRING.length());
builder.append(ALPHA_NUMERIC_STRING.charAt(character));
}
return builder.toString();
}
} }