From 585edaf3b7b72e9dd69b72a70b4c027efb52a672 Mon Sep 17 00:00:00 2001 From: SparkZhang Date: Tue, 1 Feb 2022 13:09:57 +0800 Subject: [PATCH] =?UTF-8?q?Update:=E4=BF=AE=E5=A4=8D=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E4=B8=BAString=E6=97=B6=E5=8C=85=E5=90=AB=E5=8F=8C?= =?UTF-8?q?=E5=BC=95=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/websocket/Aria2WebSocketProxy.java | 8 +++++-- src/test/java/Aria2WebSocketClientTest.java | 23 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/montaro/aria2/client/websocket/Aria2WebSocketProxy.java b/src/main/java/cn/montaro/aria2/client/websocket/Aria2WebSocketProxy.java index b90b662..76b705e 100644 --- a/src/main/java/cn/montaro/aria2/client/websocket/Aria2WebSocketProxy.java +++ b/src/main/java/cn/montaro/aria2/client/websocket/Aria2WebSocketProxy.java @@ -109,7 +109,7 @@ public class Aria2WebSocketProxy implements InvocationHandler { } JsonElement result = returnResult.get("result"); if (resultType.equals(String.class)) { - return (T) result.toString(); + return (T) result.getAsString(); } return gson.fromJson(result, resultType); } @@ -152,7 +152,11 @@ public class Aria2WebSocketProxy implements InvocationHandler { public void onMessage(String message) { log.debug("receive message:{}", message); JsonObject jsonObject = JsonParser.parseString(message).getAsJsonObject(); - String id = jsonObject.get("id").getAsString(); + JsonElement idObj = jsonObject.get("id"); + if (idObj == null) { + return; + } + String id = idObj.getAsString(); if (id == null) { return; } diff --git a/src/test/java/Aria2WebSocketClientTest.java b/src/test/java/Aria2WebSocketClientTest.java index ee717e2..944821a 100644 --- a/src/test/java/Aria2WebSocketClientTest.java +++ b/src/test/java/Aria2WebSocketClientTest.java @@ -19,12 +19,14 @@ import java.util.Map; */ public class Aria2WebSocketClientTest { - Aria2WebSocketConfig config = new Aria2WebSocketConfig().setSecret("123456"); + Aria2WebSocketConfig config = new Aria2WebSocketConfig() + .setHost("192.168.99.120") + .setSecret("montaro"); Aria2Client client = Aria2ClientFactory.webSocketClient(config); @Test public void tellActive() { - String s = client.tellActive(); + String s = client.tellActive("gid"); System.out.println(s); } @@ -35,7 +37,7 @@ public class Aria2WebSocketClientTest { } @Test - public void getGlobalStat(){ + public void getGlobalStat() { String globalStat = client.getGlobalStat(); System.out.println(globalStat); } @@ -47,4 +49,19 @@ public class Aria2WebSocketClientTest { String result = client.changeUri("97d4d126a7263df8", 1, new ArrayList(), addUris); System.out.println(result); } + + @Test + public void tellStatus() { + String s = client.tellStatus("1bfe98b1bc6c47aa"); + System.out.println("s = " + s); + } + + @Test + public void addDownload() { + String magnet = "magnet:?xt=urn:btih:5e1464caced74be780397896d5a255a88b872542&tr=https%3A%2F%2Ftr.bangumi.moe%3A9696%2Fannounce&tr=http%3A%2F%2Ftr.bangumi.moe%3A6969%2Fannounce&tr=udp%3A%2F%2Ftr.bangumi.moe%3A6969%2Fannounce&tr=http%3A%2F%2Fopen.acgtracker.com%3A1096%2Fannounce&tr=http%3A%2F%2F208.67.16.113%3A8000%2Fannounce&tr=udp%3A%2F%2F208.67.16.113%3A8000%2Fannounce&tr=http%3A%2F%2Ftracker.ktxp.com%3A6868%2Fannounce&tr=http%3A%2F%2Ftracker.ktxp.com%3A7070%2Fannounce&tr=http%3A%2F%2Ft2.popgo.org%3A7456%2Fannonce&tr=http%3A%2F%2Fbt.sc-ol.com%3A2710%2Fannounce&tr=http%3A%2F%2Fshare.camoe.cn%3A8080%2Fannounce&tr=http%3A%2F%2F61.154.116.205%3A8000%2Fannounce&tr=http%3A%2F%2Fbt.rghost.net%3A80%2Fannounce&tr=http%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=http%3A%2F%2Ftracker.publicbt.com%3A80%2Fannounce&tr=http%3A%2F%2Ftracker.prq.to%2Fannounce&tr=http%3A%2F%2Fopen.nyaatorrents.info%3A6544%2Fannounce"; + List uris = new ArrayList<>(); + uris.add(magnet); + String s = client.addUri(uris, null, null); + System.out.println(s); + } }