Skip to content

Commit

Permalink
使用更稳定的网络请求库优化稳定性, 支持添加网络代理
Browse files Browse the repository at this point in the history
  • Loading branch information
@ApliNi
ApliNi committed Feb 22, 2024
1 parent 20c0bae commit 3fdc8ad
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 87 deletions.
10 changes: 9 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.github.aplini</groupId>
<artifactId>AutoUpdatePlugins</artifactId>
<version>2.4.3</version>
<version>2.5.0</version>
<packaging>jar</packaging>

<name>AutoUpdatePlugins</name>
Expand Down Expand Up @@ -76,5 +76,13 @@
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>5.0.0-alpha.12</version>
</dependency>

</dependencies>
</project>
155 changes: 75 additions & 80 deletions src/main/java/io/github/aplini/autoupdateplugins/AutoUpdatePlugins.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

import com.google.common.io.ByteStreams;
import com.google.gson.Gson;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
Expand All @@ -22,7 +25,8 @@
import javax.net.ssl.X509TrustManager;
import java.io.*;
import java.math.BigInteger;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Files;
Expand Down Expand Up @@ -65,9 +69,8 @@ public void onEnable() {
Objects.requireNonNull(getCommand("aup")).setExecutor(this);

// bStats
if(getConfig().getBoolean("bStats", true)){
new Metrics(this, 20629);
}
Metrics metrics = new Metrics(this, 20629);
metrics.addCustomChart(new Metrics.SingleLineChart("Plugins", () -> ((List<?>) Objects.requireNonNull(getConfig().get("list"))).size()));

// 禁用证书验证
if(getConfig().getBoolean("disableCertificateVerification", false)) {
Expand Down Expand Up @@ -232,7 +235,7 @@ else if(args[0].equals("log")){
return true;
}

// 立即停止当前更新
// 停止当前更新
else if(args[0].equals("stop")){
if(lock){
future.cancel(true);
Expand Down Expand Up @@ -300,8 +303,6 @@ public void run() {
}
}

_fileName = "[???] ";
_nowParser = "[???] ";
lock = false;
});
}
Expand Down Expand Up @@ -439,6 +440,7 @@ else if(li.get("path") != null){
temp.set(pPath + ".time", nowDate());
temp.set(pPath + ".dUrl", dUrl);
temp.set(pPath + ".feature", feature);
saveDate();
}

// 在这里实现运行系统命令的功能
Expand Down Expand Up @@ -467,11 +469,14 @@ else if(li.get("path") != null){

// 更新完成, 并显示文件大小变化
log(logLevel.DEBUG, m.piece(m.updateFulSizeDifference, String.format("%.2f", oldFileSize / 1048576), String.format("%.2f", fileSize / 1048576)));
_success ++;

_success ++;
_fail --;

// 这一部分可以删除, 但为了防止未知的错误影响日志内容
_fileName = "[???] ";
_nowParser = "[???] ";
}
saveDate();
}


Expand Down Expand Up @@ -668,94 +673,84 @@ public Object SEL(Object in1, Object in2) {
return in1;
}

// 获取 OkHttp Client
public OkHttpClient getOkHttpClient(){
_allRequests ++;
OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder();
// 启用网络代理
if(!getConfig().getString("proxy.type", "DIRECT").equals("DIRECT")){
okHttpClient.proxy(new Proxy(
Proxy.Type.valueOf(getConfig().getString("proxy.type")),
new InetSocketAddress(
getConfig().getString("proxy.host", "127.0.0.1"),
getConfig().getInt("proxy.port", 7890))));
}
return okHttpClient.build();
}

// http 请求获取字符串
public String httpGet(String url) {
HttpURLConnection cxn = getHttpCxn(url);
if(cxn == null){return null;}
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(cxn.getInputStream()));
StringBuilder stringBuilder = new StringBuilder();
String line;
while((line = reader.readLine()) != null){
stringBuilder.append(line);
Request request = new Request.Builder()
.url(url)
.build();
try (Response response = getOkHttpClient().newCall(request).execute()) {
if (!response.isSuccessful()) {
return null;
}
reader.close();
cxn.disconnect();
return String.valueOf(stringBuilder);
} catch (Exception e) {
log(logLevel.NET_WARN, "[HTTP] "+ e.getMessage());
return response.body().string();
} catch (IOException e) {
log(logLevel.NET_WARN, "[HTTP] " + e.getMessage());
}
cxn.disconnect();
return null;
}

// 下载文件到指定位置, 并使用指定文件名
public boolean downloadFile(String url, String path){
delFile(path); // 删除可能存在的旧文件
HttpURLConnection cxn = getHttpCxn(url);
if(cxn == null){return false;}
try {
BufferedInputStream in = new BufferedInputStream(cxn.getInputStream());
Path savePath = Path.of(path);
Files.copy(in, savePath, StandardCopyOption.REPLACE_EXISTING);
cxn.disconnect();
// 下载文件到指定目录
public boolean downloadFile(String url, String path) {
Request request = new Request.Builder()
.url(url)
.build();
try (Response response = getOkHttpClient().newCall(request).execute()) {
if(!response.isSuccessful()){
return false;
}
try (InputStream inputStream = response.body().byteStream();
OutputStream outputStream = new FileOutputStream(path)) {

byte[] buffer = new byte[1024];
int bytesRead;
while ((bytesRead = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, bytesRead);
}
}
return true;
} catch (Exception e) {
} catch (IOException e) {
log(logLevel.NET_WARN, "[HTTP] "+ e.getMessage());
}
cxn.disconnect();
return false;
}

// 通过 HEAD 请求获取一些特征信息
public String getFeature(String url){
String out = "_"+ nowDate().hashCode();
try {
HttpURLConnection cxn = (HttpURLConnection) new URI(url).toURL().openConnection();
cxn.setRequestMethod("HEAD");
_allRequests ++;

int cl = cxn.getContentLength();
String lh = cxn.getHeaderField("Location");

if(cl != -1) {
out = "cl_"+ cl;
Request request = new Request.Builder()
.head()
.url(url)
.build();
try (Response response = getOkHttpClient().newCall(request).execute()) {
if(!response.isSuccessful()){
return "??_"+ nowDate().hashCode();
}
else if(lh != null){
out = "lh_"+ lh.hashCode();
String contentLength = SEL(response.headers().get("Content-Length"), -1).toString();
if(!contentLength.equals("-1")){
return "CL_"+ contentLength;
}
cxn.disconnect();
} catch (Exception e) {
log(logLevel.NET_WARN, "[HTTP.HEAD] "+ e.getMessage());
}
return out;
}

// 获取 HTTP 连接
public HttpURLConnection getHttpCxn(String url){
HttpURLConnection cxn = null;
try {
cxn = (HttpURLConnection) new URI(url).toURL().openConnection();
cxn.setRequestMethod("GET");
_allRequests ++;
// 填充请求头数据
List<?> list = (List<?>) getConfig().get("setRequestProperty");
if(list != null){
for(Object _li : list) {
Map<?, ?> li = (Map<?, ?>) _li;
cxn.setRequestProperty((String) li.get("name"), (String) li.get("value"));
}
}
if(cxn.getResponseCode() == 200){
return cxn;
String location = SEL(response.headers().get("Location"), "Invalid").toString();
if(!location.equals("Invalid")){
return "LH_"+ location.hashCode();
}
cxn.disconnect();
log(logLevel.NET_WARN, "[HTTP]"+ m.piece(m.httpRequestFailed, cxn.getResponseCode(), url));
} catch (Exception e) {
log(logLevel.NET_WARN, "[HTTP] "+ e.getMessage());
} catch (IOException e) {
log(logLevel.NET_WARN, "[[HTTP.HEAD] "+ e.getMessage());
}
if(cxn != null){cxn.disconnect();}
return null;
return "??_"+ nowDate().hashCode();
}

// 在插件更新过程中输出尽可能详细的日志
Expand Down Expand Up @@ -787,7 +782,7 @@ public void log(logLevel level, String text){

// 根据日志等级添加样式代码, 并记录到 logList
// 非 INFO 日志添加 _nowFile 文本
logList.add(level.color + (level.name.equals("INFO") ? "" : _fileName) + text);
logList.add(level.color + (level.name.equals("INFO") ? "" : _fileName) + text);
}
enum logLevel {
// 允许被忽略的 INFO
Expand Down Expand Up @@ -923,7 +918,7 @@ public void loadMessage(){
m.updateFulTime = gm("updateFulTime", "耗时: %1 秒");
m.updateFulFail = gm("updateFulFail", "失败: %1, ");
m.updateFulUpdate = gm("updateFulUpdate", "更新: %1, ");
m.updateFulOK = gm("updateFulOK", "完成: %1");
m.updateFulOK = gm("updateFulOK", "成功: %1");
m.updateFulNetRequest = gm("updateFulNetRequest", "网络请求: %1, ");
m.updateFulDownloadFile = gm("updateFulDownloadFile", "下载文件: %1MB");
m.logReloadOK = gm("logReloadOK", "已完成重载");
Expand Down
9 changes: 6 additions & 3 deletions src/main/resources/Locales/config_en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ zipFileCheckList: '\.(?:jar|zip)$'
# Do not move to the update directory if the hash of the downloaded file matches the hash of the file to be updated in the update directory (or the file running on the server) (MD5)
ignoreDuplicates: true

# Disable certificate validation globally, need to reboot after modification.
disableCertificateVerification: false
# Setting up a web proxy
proxy:
type: DIRECT # DIRECT | HTTP | SOCKS
host: '127.0.0.1'
port: 7890

# Edit request headers in HTTP requests
setRequestProperty:
Expand Down Expand Up @@ -134,7 +137,7 @@ message:
updateFulTime: 'Time taken: %1 seconds'
updateFulFail: 'Failed: %1,'
updateFulUpdate: 'Update: %1,'
updateFulOK: 'Completed: %1'
updateFulOK: 'Success: %1'
updateFulNetRequest: 'Network Request: %1, '
updateFulDownloadFile: 'Downloading file: %1MB'
logReloadOK: 'Reload completed'
Expand Down
9 changes: 6 additions & 3 deletions src/main/resources/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ zipFileCheckList: '\.(?:jar|zip)$'
# 如果下载后的文件哈希与更新目录中待更新的文件 (或者服务器正在运行的文件) 哈希值一致则不移动到更新目录 (MD5
ignoreDuplicates: true

# 全局禁用证书验证, 修改后需要重启
disableCertificateVerification: false
# 设置网络代理
proxy:
type: DIRECT # DIRECT | HTTP | SOCKS
host: '127.0.0.1'
port: 7890

# HTTP 请求中编辑请求头
setRequestProperty:
Expand Down Expand Up @@ -134,7 +137,7 @@ message:
updateFulTime: '耗时: %1 秒'
updateFulFail: '失败: %1, '
updateFulUpdate: '更新: %1, '
updateFulOK: '完成: %1'
updateFulOK: '成功: %1'
updateFulNetRequest: '网络请求: %1, '
updateFulDownloadFile: '下载文件: %1MB'
logReloadOK: '已完成重载'
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/plugin.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: AutoUpdatePlugins
version: '${project.version}'
main: io.github.aplini.autoupdateplugins.AutoUpdatePlugins
api-version: '1.20'
folia-supported: true
prefix: AUP
author: ApliNi

Expand Down

0 comments on commit 3fdc8ad

Please sign in to comment.