surgio 3.11.0 → 3.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -5
- package/build/utils/error-helper.js +5 -5
- package/build/utils/error-helper.js.map +1 -1
- package/build/utils/ss.js +36 -1
- package/build/utils/ss.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -28,14 +28,10 @@
|
|
|
28
28
|
|
|
29
29
|
## 交流
|
|
30
30
|
|
|
31
|
-
[<img width="200px" src="docs/.vuepress/public/join-telegram.png" />](https://
|
|
31
|
+
[<img width="200px" src="docs/.vuepress/public/join-telegram.png" />](https://url.royli.dev/surgiotg)
|
|
32
32
|
|
|
33
33
|
## Sponsors
|
|
34
34
|
|
|
35
|
-
[](https://zeabur.com?referralCode=geekdada&utm_source=geekdada&utm_campaign=oss)
|
|
36
|
-
|
|
37
|
-
---
|
|
38
|
-
|
|
39
35
|
### [MorseGPT][morse-link]
|
|
40
36
|
|
|
41
37
|
[无需海外信用卡和手机号码使用 `gpt-4o` 模型，支持微信、支付宝付款。][morse-link]
|
|
@@ -15,10 +15,10 @@ const errorHandler = async function (err) {
|
|
|
15
15
|
if ((0, errors_1.isSurgioError)(err)) {
|
|
16
16
|
console.error(chalk_1.default.red(err.message));
|
|
17
17
|
if (err.providerName) {
|
|
18
|
-
console.error(chalk_1.default.red(`Provider
|
|
18
|
+
console.error(chalk_1.default.red(`Provider 名称：${err.providerName}`));
|
|
19
19
|
}
|
|
20
20
|
if (err.providerPath) {
|
|
21
|
-
console.error(chalk_1.default.red(
|
|
21
|
+
console.error(chalk_1.default.red(`文件地址：${err.providerPath}`));
|
|
22
22
|
}
|
|
23
23
|
if (typeof err.nodeIndex === 'number') {
|
|
24
24
|
console.error(chalk_1.default.red(`错误发生在第 ${err.nodeIndex + 1} 个节点`));
|
|
@@ -49,9 +49,9 @@ const errorHandler = async function (err) {
|
|
|
49
49
|
}
|
|
50
50
|
console.error();
|
|
51
51
|
console.error(chalk_1.default.bgRed(' 诊断信息 '));
|
|
52
|
-
console.error('
|
|
53
|
-
console.error('
|
|
54
|
-
console.error('加入交流群汇报问题 ', chalk_1.default.cyan('https://
|
|
52
|
+
console.error('版本号：', require('../../package.json').version);
|
|
53
|
+
console.error('常见问题：', chalk_1.default.cyan('https://url.royli.dev/7EMxu'));
|
|
54
|
+
console.error('加入交流群汇报问题 ', chalk_1.default.cyan('https://url.royli.dev/surgiotg'));
|
|
55
55
|
console.error();
|
|
56
56
|
doctorInfo.forEach((item) => {
|
|
57
57
|
console.error(chalk_1.default.cyan(item));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-helper.js","sourceRoot":"","sources":["../../src/utils/error-helper.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,+DAAmD;AAInD,qCAA6C;AAC7C,qCAA6D;AAEtD,MAAM,YAAY,GAAG,KAAK,WAE/B,GAAU;IAEV,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAkB,EACzC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAClB,CAAA;IAED,OAAO,CAAC,KAAK,EAAE,CAAA;IACf,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEpC,IAAI,IAAA,sBAAa,EAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;QAErC,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"error-helper.js","sourceRoot":"","sources":["../../src/utils/error-helper.ts"],"names":[],"mappings":"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"}
|
package/build/utils/ss.js
CHANGED
|
@@ -10,10 +10,45 @@ const parseSSUri = (str) => {
|
|
|
10
10
|
logger.debug('Shadowsocks URI', str);
|
|
11
11
|
const scheme = new url_1.URL(str);
|
|
12
12
|
const pluginString = scheme.searchParams.get('plugin');
|
|
13
|
-
|
|
13
|
+
// SIP002 兼容：若 URL 已经拆分出 username/password，则说明 userinfo 为明文形式
|
|
14
|
+
let userInfo;
|
|
15
|
+
if (scheme.password) {
|
|
16
|
+
userInfo = [
|
|
17
|
+
decodeURIComponent(scheme.username),
|
|
18
|
+
decodeURIComponent(scheme.password),
|
|
19
|
+
];
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
userInfo = (0, index_1.fromUrlSafeBase64)(decodeURIComponent(scheme.username)).split(':');
|
|
23
|
+
}
|
|
14
24
|
const pluginInfo = typeof pluginString === 'string'
|
|
15
25
|
? (0, index_1.decodeStringList)(pluginString.split(';'))
|
|
16
26
|
: {};
|
|
27
|
+
// SIP001 兼容：如果未能正确取得 method 或 password，且未出现 '@'，尝试解析整段 Base64 主机名
|
|
28
|
+
if (!userInfo[0] || userInfo.length < 2) {
|
|
29
|
+
try {
|
|
30
|
+
const legacyStr = (0, index_1.fromUrlSafeBase64)(scheme.hostname);
|
|
31
|
+
// legacyStr 形如 method:password@host:port
|
|
32
|
+
const atIndex = legacyStr.indexOf('@');
|
|
33
|
+
if (atIndex > 0) {
|
|
34
|
+
const [cred, hostPort] = [
|
|
35
|
+
legacyStr.slice(0, atIndex),
|
|
36
|
+
legacyStr.slice(atIndex + 1),
|
|
37
|
+
];
|
|
38
|
+
const [legacyMethod, legacyPassword] = cred.split(':');
|
|
39
|
+
const [legacyHost, legacyPort] = hostPort.split(':');
|
|
40
|
+
if (legacyMethod && legacyPassword && legacyHost && legacyPort) {
|
|
41
|
+
userInfo = [legacyMethod, legacyPassword];
|
|
42
|
+
// 覆盖 hostname、port
|
|
43
|
+
scheme.hostname = legacyHost;
|
|
44
|
+
scheme.port = legacyPort;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
catch (_) {
|
|
49
|
+
// ignore
|
|
50
|
+
}
|
|
51
|
+
}
|
|
17
52
|
return {
|
|
18
53
|
type: types_1.NodeTypeEnum.Shadowsocks,
|
|
19
54
|
nodeName: decodeURIComponent(scheme.hash.replace('#', '')),
|
package/build/utils/ss.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ss.js","sourceRoot":"","sources":["../../src/utils/ss.ts"],"names":[],"mappings":";;;AAAA,6BAAyB;AACzB,2CAA6C;AAE7C,oCAA8D;AAE9D,mCAA6D;AAE7D,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;AAEpD,MAAM,UAAU,GAAG,CAAC,GAAW,EAAyB,EAAE;IAC/D,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAA;IAEpC,MAAM,MAAM,GAAG,IAAI,SAAG,CAAC,GAAG,CAAC,CAAA;IAC3B,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"ss.js","sourceRoot":"","sources":["../../src/utils/ss.ts"],"names":[],"mappings":"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"}
|