From 56b350a6490f54ee8e72b6d6bc0982b4c123c7e3 Mon Sep 17 00:00:00 2001
From: Peng-YM <1048217874pengym@gmail.com>
Date: Tue, 1 Sep 2020 12:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E7=94=A8=E8=AE=A2=E9=98=85=E7=BC=93?=
=?UTF-8?q?=E5=AD=98=EF=BC=8C=E5=A4=A7=E5=B9=85=E5=87=8F=E5=B0=91=E6=B5=8F?=
=?UTF-8?q?=E8=A7=88=E5=99=A8=E5=93=8D=E5=BA=94=E5=BB=B6=E8=BF=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/.idea/workspace.xml | 81 ++++++++++++++------------------
backend/sub-store.js | 44 ++++++++---------
web/src/components/ProxyList.vue | 25 +++++++++-
web/src/views/Subscription.vue | 24 +++++-----
4 files changed, 94 insertions(+), 80 deletions(-)
diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 18dc05c..1ffbea4 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -20,20 +20,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -100,7 +90,8 @@
-
+
+
@@ -120,7 +111,7 @@
-
+
@@ -130,8 +121,8 @@
-
-
+
+
@@ -141,8 +132,8 @@
-
-
+
+
@@ -152,8 +143,8 @@
-
-
+
+
@@ -163,8 +154,8 @@
-
-
+
+
@@ -174,8 +165,8 @@
-
-
+
+
@@ -185,8 +176,8 @@
-
-
+
+
@@ -196,8 +187,8 @@
-
-
+
+
@@ -207,8 +198,8 @@
-
-
+
+
@@ -218,8 +209,8 @@
-
-
+
+
@@ -229,8 +220,8 @@
-
-
+
+
@@ -240,8 +231,8 @@
-
-
+
+
@@ -251,8 +242,8 @@
-
-
+
+
@@ -262,8 +253,8 @@
-
-
+
+
@@ -273,8 +264,8 @@
-
-
+
+
@@ -284,8 +275,8 @@
-
-
+
+
@@ -295,7 +286,7 @@
-
+
diff --git a/backend/sub-store.js b/backend/sub-store.js
index e14252c..fdef294 100644
--- a/backend/sub-store.js
+++ b/backend/sub-store.js
@@ -17,7 +17,6 @@ $.http = HTTP("", {
// Constants
const SUBS_KEY = "subs";
const COLLECTIONS_KEY = "collections";
-const RESOURCE_CACHE_KEY = "resources";
// SOME INITIALIZATIONS
if (!$.read(SUBS_KEY)) $.write({}, SUBS_KEY);
@@ -97,14 +96,13 @@ const AVAILABLE_OPERATORS = {
// refresh resource
async function refreshResource(req, res) {
const {url} = req.body;
- const cachedResources = $.read(RESOURCE_CACHE_KEY);
- cachedResources[url] = await $.http.get(url).then(resp => resp.body).catch(err => {
+ const raw = await $.http.get(url).then(resp => resp.body).catch(err => {
res.status(500).json({
status: "failed",
message: `Cannot refresh remote resource: ${url}\n Reason: ${err}`
});
});
- $.write(cachedResources, RESOURCE_CACHE_KEY);
+ $.write(raw, `#${url}`);
res.json({
status: "success"
});
@@ -119,9 +117,7 @@ async function downloadSub(req, res) {
const sub = allSubs[name];
try {
const output = await parseSub(sub, platform);
- const {key, value} = getFlowHeaders(output.headers, []);
- res.set(key, value)
- res.send(output.proxies);
+ res.send(output);
} catch (err) {
res.status(500).json({
status: "failed",
@@ -137,15 +133,24 @@ async function downloadSub(req, res) {
}
async function parseSub(sub, platform) {
- // always download from url
- const {raw, headers} = await $.http.get(sub.url).then(resp => {
- return {
- raw: resp.body,
- headers: resp.headers
+ let raw;
+ if (platform === 'Raw') {
+ const cache = $.read(`#${sub.url}`);
+ if (!cache) {
+ raw = await $.http.get(sub.url).then(resp => resp.body).catch(err => {
+ throw new Error(err);
+ });
+ $.write(raw, `#${sub.url}`);
+ } else {
+ raw = cache;
}
- }).catch(err => {
- throw new Error(err);
- });
+ } else {
+ // always download from url
+ raw = await $.http.get(sub.url).then(resp => resp.body).catch(err => {
+ throw new Error(err);
+ });
+ $.write(raw, `#${sub.url}`);
+ }
$.log("=======================================================================");
$.log(`Processing subscription: ${sub.name}, target platform ==> ${platform}.`);
@@ -203,10 +208,7 @@ async function parseSub(sub, platform) {
$parser.addProducers([
QX_Producer, Loon_Producer, Surge_Producer, Raw_Producer
]);
- return {
- proxies: $parser.produce(proxies),
- headers
- };
+ return $parser.produce(proxies);
}
function getFlowHeaders(headers, proxies) {
@@ -363,7 +365,7 @@ async function downloadCollection(req, res) {
const output = await Promise.all(subs.map(async id => {
const sub = $.read(SUBS_KEY)[id];
try {
- return parseSub(sub, platform).then(res => res.proxies);
+ return parseSub(sub, platform);
} catch (err) {
console.log(`ERROR when process subscription: ${id}`);
return "";
@@ -827,7 +829,7 @@ function URI_VMess() {
cipher: "auto", // V2rayN has no default cipher! use aes-128-gcm as default.
uuid: params.id,
alterId: params.aid || 0,
- tls: JSON.parse(params.tls || "false"),
+ tls: params.tls === 'tls' || params.tls === true,
supported
}
// handle obfs
diff --git a/web/src/components/ProxyList.vue b/web/src/components/ProxyList.vue
index d99af2f..da2fcac 100644
--- a/web/src/components/ProxyList.vue
+++ b/web/src/components/ProxyList.vue
@@ -32,11 +32,34 @@
diff --git a/web/src/views/Subscription.vue b/web/src/views/Subscription.vue
index 898c16a..4982a14 100644
--- a/web/src/views/Subscription.vue
+++ b/web/src/views/Subscription.vue
@@ -138,6 +138,9 @@
节点列表
+
+ refresh
+
mdi-close
@@ -145,7 +148,7 @@
-
+
@@ -155,7 +158,6 @@