From 7fc7eb97c5c9de09e03acfab384de0761154e16d Mon Sep 17 00:00:00 2001 From: jhengazuji Date: Tue, 25 Nov 2025 13:43:47 +0800 Subject: [PATCH] Rename proxyLocal to proxy --- .../com/fongmi/android/tv/api/loader/BaseLoader.java | 10 +++++----- .../com/fongmi/android/tv/api/loader/JarLoader.java | 2 +- .../com/fongmi/android/tv/api/loader/JsLoader.java | 4 ++-- .../com/fongmi/android/tv/api/loader/PyLoader.java | 4 ++-- .../com/fongmi/android/tv/server/process/Proxy.java | 2 +- .../main/java/com/github/catvod/crawler/Spider.java | 2 +- chaquo/src/main/java/com/fongmi/chaquo/Spider.java | 2 +- .../main/java/com/fongmi/quickjs/crawler/Spider.java | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/BaseLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/BaseLoader.java index 978da6353..2ece55b40 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/BaseLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/BaseLoader.java @@ -74,11 +74,11 @@ public class BaseLoader { else if (csp) jarLoader.setRecent(Util.md5(jar)); } - public Object[] proxyLocal(Map params) throws Exception { - if (params.containsKey("siteKey")) return getSpider(params.get("siteKey")).proxyLocal(params); - if ("js".equals(params.get("do"))) return jsLoader.proxyInvoke(params); - if ("py".equals(params.get("do"))) return pyLoader.proxyInvoke(params); - return jarLoader.proxyInvoke(params); + public Object[] proxy(Map params) throws Exception { + if (params.containsKey("siteKey")) return getSpider(params.get("siteKey")).proxy(params); + if ("js".equals(params.get("do"))) return jsLoader.proxy(params); + if ("py".equals(params.get("do"))) return pyLoader.proxy(params); + return jarLoader.proxy(params); } public void parseJar(String jar, boolean recent) { diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java index 1dc92d38f..e0c1f8891 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java @@ -136,7 +136,7 @@ public class JarLoader { return (JSONObject) method.invoke(null, jxs, name, flag, url); } - public Object[] proxyInvoke(Map params) { + public Object[] proxy(Map params) throws Exception { if (recent == null) return tryOthers(params); Object[] result = proxyInvoke(methods.get(recent), params); return result != null ? result : tryOthers(params); diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java index 2ebb88dc6..368d9fd82 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java @@ -42,7 +42,7 @@ public class JsLoader { } } - public Object[] proxyInvoke(Map params) throws Exception { - return spiders.get(recent).proxyLocal(params); + public Object[] proxy(Map params) throws Exception { + return spiders.get(recent).proxy(params); } } diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java index 3774bb06d..dc766adb4 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java @@ -42,7 +42,7 @@ public class PyLoader { } } - public Object[] proxyInvoke(Map params) throws Exception { - return spiders.get(recent).proxyLocal(params); + public Object[] proxy(Map params) throws Exception { + return spiders.get(recent).proxy(params); } } diff --git a/app/src/main/java/com/fongmi/android/tv/server/process/Proxy.java b/app/src/main/java/com/fongmi/android/tv/server/process/Proxy.java index b3203dbca..03866d096 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/process/Proxy.java +++ b/app/src/main/java/com/fongmi/android/tv/server/process/Proxy.java @@ -25,7 +25,7 @@ public class Proxy implements Process { Map params = session.getParms(); params.putAll(session.getHeaders()); params.putAll(files); - Object[] rs = BaseLoader.get().proxyLocal(params); + Object[] rs = BaseLoader.get().proxy(params); if (rs[0] instanceof Response) return (Response) rs[0]; Response response = NanoHTTPD.newChunkedResponse(Status.lookup((Integer) rs[0]), (String) rs[1], (InputStream) rs[2]); if (rs.length > 3 && rs[3] != null) for (Map.Entry entry : ((Map) rs[3]).entrySet()) response.addHeader(entry.getKey(), entry.getValue()); diff --git a/catvod/src/main/java/com/github/catvod/crawler/Spider.java b/catvod/src/main/java/com/github/catvod/crawler/Spider.java index dfccc62d9..c07b9f819 100644 --- a/catvod/src/main/java/com/github/catvod/crawler/Spider.java +++ b/catvod/src/main/java/com/github/catvod/crawler/Spider.java @@ -62,7 +62,7 @@ public abstract class Spider { return false; } - public Object[] proxyLocal(Map params) throws Exception { + public Object[] proxy(Map params) throws Exception { return null; } diff --git a/chaquo/src/main/java/com/fongmi/chaquo/Spider.java b/chaquo/src/main/java/com/fongmi/chaquo/Spider.java index 5e04f7e05..58b7beb18 100644 --- a/chaquo/src/main/java/com/fongmi/chaquo/Spider.java +++ b/chaquo/src/main/java/com/fongmi/chaquo/Spider.java @@ -86,7 +86,7 @@ public class Spider extends com.github.catvod.crawler.Spider { } @Override - public Object[] proxyLocal(Map params) { + public Object[] proxy(Map params) throws Exception { List list = app.callAttr("localProxy", obj, gson.toJson(params)).asList(); boolean base64 = list.size() > 4 && list.get(4).toInt() == 1; boolean header = list.size() > 3 && list.get(3) != null; diff --git a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java index 4e089f395..a63df6f31 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java @@ -115,7 +115,7 @@ public class Spider extends com.github.catvod.crawler.Spider { } @Override - public Object[] proxyLocal(Map params) throws Exception { + public Object[] proxy(Map params) throws Exception { if ("catvod".equals(params.get("from"))) return proxy2(params); else return submit(() -> proxy1(params)).get(); }