From 2301ccbfb50545b5be2ee3103368e954a2289f9a Mon Sep 17 00:00:00 2001 From: xream Date: Mon, 22 Apr 2024 02:51:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=B9=E4=B8=8D?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=9A=84=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/package.json | 2 +- backend/src/core/proxy-utils/index.js | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/backend/package.json b/backend/package.json index 9e0377e..2699420 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.14.294", + "version": "2.14.295", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.", "main": "src/main.js", "scripts": { diff --git a/backend/src/core/proxy-utils/index.js b/backend/src/core/proxy-utils/index.js index a5bf181..044be79 100644 --- a/backend/src/core/proxy-utils/index.js +++ b/backend/src/core/proxy-utils/index.js @@ -404,15 +404,19 @@ function lastParse(proxy) { } } if (typeof proxy.name !== 'string') { - try { - if (proxy.name?.data) { - proxy.name = Buffer.from(proxy.name.data).toString('utf8'); - } else { - proxy.name = utf8ArrayToStr(proxy.name); + if (/^\d+$/.test(proxy.name)) { + proxy.name = `${proxy.name}`; + } else { + try { + if (proxy.name?.data) { + proxy.name = Buffer.from(proxy.name.data).toString('utf8'); + } else { + proxy.name = utf8ArrayToStr(proxy.name); + } + } catch (e) { + $.error(`proxy.name decode failed\nReason: ${e}`); + proxy.name = `${proxy.type} ${proxy.server}:${proxy.port}`; } - } catch (e) { - $.error(`proxy.name decode failed\nReason: ${e}`); - proxy.name = `${proxy.type} ${proxy.server}:${proxy.port}`; } } if (['', 'off'].includes(proxy.sni)) {