diff --git a/backend/package.json b/backend/package.json index d8e59bd..540d0cc 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.14.348", + "version": "2.14.349", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.", "main": "src/main.js", "scripts": { @@ -26,6 +26,7 @@ "dns-packet": "^5.6.1", "express": "^4.17.1", "http-proxy-middleware": "^2.0.6", + "ip-address": "^9.0.5", "js-base64": "^3.7.2", "jsrsasign": "^11.1.0", "lodash": "^4.17.21", diff --git a/backend/pnpm-lock.yaml b/backend/pnpm-lock.yaml index 05ffd66..5f53c0d 100644 --- a/backend/pnpm-lock.yaml +++ b/backend/pnpm-lock.yaml @@ -32,6 +32,9 @@ dependencies: http-proxy-middleware: specifier: ^2.0.6 version: registry.npmmirror.com/http-proxy-middleware@2.0.6 + ip-address: + specifier: ^9.0.5 + version: registry.npmmirror.com/ip-address@9.0.5 js-base64: specifier: ^3.7.2 version: registry.npmmirror.com/js-base64@3.7.2 @@ -6031,6 +6034,16 @@ packages: engines: {node: '>=0.10.0'} dev: true + registry.npmmirror.com/ip-address@9.0.5: + resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ip-address/-/ip-address-9.0.5.tgz} + name: ip-address + version: 9.0.5 + engines: {node: '>= 12'} + dependencies: + jsbn: registry.npmmirror.com/jsbn@1.1.0 + sprintf-js: registry.npmmirror.com/sprintf-js@1.1.3 + dev: false + registry.npmmirror.com/ip6addr@0.2.5: resolution: {integrity: sha512-9RGGSB6Zc9Ox5DpDGFnJdIeF0AsqXzdH+FspCfPPaU/L/4tI6P+5lIoFUFm9JXs9IrJv1boqAaNCQmoDADTSKQ==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ip6addr/-/ip6addr-0.2.5.tgz} name: ip6addr @@ -6576,6 +6589,12 @@ packages: version: 0.1.1 dev: false + registry.npmmirror.com/jsbn@1.1.0: + resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz} + name: jsbn + version: 1.1.0 + dev: false + registry.npmmirror.com/jsesc@0.5.0: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/jsesc/-/jsesc-0.5.0.tgz} name: jsesc @@ -9095,6 +9114,12 @@ packages: version: 1.0.3 dev: false + registry.npmmirror.com/sprintf-js@1.1.3: + resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.1.3.tgz} + name: sprintf-js + version: 1.1.3 + dev: false + registry.npmmirror.com/sshpk@1.16.1: resolution: {integrity: sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sshpk/-/sshpk-1.16.1.tgz} name: sshpk diff --git a/backend/src/core/proxy-utils/index.js b/backend/src/core/proxy-utils/index.js index 00874d5..e583e39 100644 --- a/backend/src/core/proxy-utils/index.js +++ b/backend/src/core/proxy-utils/index.js @@ -2,7 +2,13 @@ import { Buffer } from 'buffer'; import rs from '@/utils/rs'; import YAML from '@/utils/yaml'; import download from '@/utils/download'; -import { isIPv4, isIPv6, isValidPortNumber, isNotBlank } from '@/utils'; +import { + isIPv4, + isIPv6, + isValidPortNumber, + isNotBlank, + ipAddress, +} from '@/utils'; import PROXY_PROCESSORS, { ApplyProcessor } from './processors'; import PROXY_PREPROCESSORS from './preprocessors'; import PROXY_PRODUCERS from './producers'; @@ -267,6 +273,7 @@ export const ProxyUtils = { parse, process: processFn, produce, + ipAddress, isIPv4, isIPv6, isIP, diff --git a/backend/src/core/proxy-utils/processors/index.js b/backend/src/core/proxy-utils/processors/index.js index 6acff75..a49944b 100644 --- a/backend/src/core/proxy-utils/processors/index.js +++ b/backend/src/core/proxy-utils/processors/index.js @@ -1,6 +1,6 @@ import resourceCache from '@/utils/resource-cache'; import scriptResourceCache from '@/utils/script-resource-cache'; -import { isIPv4, isIPv6 } from '@/utils'; +import { isIPv4, isIPv6, ipAddress } from '@/utils'; import { FULL } from '@/utils/logical'; import { getFlag, removeFlag } from '@/utils/geo'; import { doh } from '@/utils/dns'; @@ -360,10 +360,11 @@ function ScriptOperator(script, targetPlatform, $arguments, source) { }; } -function parseIP4P(IP4P) { +function parseIP4P(ip) { let server; let port; try { + const IP4P = new ipAddress.Address6(ip).correctForm(); if (!/^2001::[^:]+:[^:]+:[^:]+$/.test(IP4P)) { throw new Error(`Invalid IP4P: ${IP4P}`); } @@ -629,7 +630,7 @@ function ResolveDomainOperator({ ) ] : results[p.server]; - if (_type === 'IP4P') { + if (type === 'IPv6' && isIPv6(ip)) { const { server, port } = parseIP4P(ip); if (server && port) { p._domain = p.server; diff --git a/backend/src/utils/index.js b/backend/src/utils/index.js index bd70c8a..4df152f 100644 --- a/backend/src/utils/index.js +++ b/backend/src/utils/index.js @@ -1,3 +1,4 @@ +import * as ipAddress from 'ip-address'; // source: https://stackoverflow.com/a/36760050 const IPV4_REGEX = /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)(\.(?!$)|$)){4}$/; @@ -94,6 +95,7 @@ function getPolicyDescriptor(str) { // })(); export { + ipAddress, isIPv4, isIPv6, isValidPortNumber, diff --git a/scripts/demo.js b/scripts/demo.js index 86a4dd3..fbfd7c3 100644 --- a/scripts/demo.js +++ b/scripts/demo.js @@ -1,8 +1,7 @@ function operator(proxies = [], targetPlatform, context) { // 支持快捷操作 不一定要写一个 function // 可参考 https://t.me/zhetengsha/970 - // https://t.me/zhetengsha/1009 - + // https://t.me/zhetengsha/1009 // proxies 为传入的内部节点数组 // 可在预览界面点击节点查看 JSON 结构 或查看 `target=JSON` 的通用订阅 @@ -19,7 +18,7 @@ function operator(proxies = [], targetPlatform, context) { // 10. `sni` 在某些协议里会自动与 `servername` 转换 // 11. 读取节点的 ca-str 和 _ca (后端文件路径) 字段, 自动计算 fingerprint (参考 https://t.me/zhetengsha/1512) // 12. 以 Surge 为例, 最新的参数一般我都会跟进, 以 Surge 文档为例, 一些常用的: TUIC/Hysteria 2 的 `ecn`, Snell 的 `reuse` 连接复用, QUIC 策略 block-quic`, Hysteria 2 下载带宽 `down` - // + // // 如果只是为了快速修改或者筛选 可以参考 脚本操作支持节点快捷脚本 https://t.me/zhetengsha/970 和 脚本筛选支持节点快捷脚本 https://t.me/zhetengsha/1009 // $arguments 为传入的脚本参数 @@ -30,7 +29,7 @@ function operator(proxies = [], targetPlatform, context) { // $substore 为 OpenAPI // 参考 https://github.com/Peng-YM/QuanX/blob/master/Tools/OpenAPI/README.md - + // scriptResourceCache 缓存 // 可参考 https://t.me/zhetengsha/1003 // const cache = scriptResourceCache @@ -43,6 +42,7 @@ function operator(proxies = [], targetPlatform, context) { // parse, // 订阅解析 // process, // 节点操作/文件操作 // produce, // 输出订阅 + // ipAddress, // https://github.com/beaugunderson/ip-address // isIPv4, // isIPv6, // isIP, @@ -76,7 +76,7 @@ function operator(proxies = [], targetPlatform, context) { // } // }) // $content = proxies - + // 2. sing-box // 但是一般不需要这样用, 可参考 @@ -110,7 +110,7 @@ function operator(proxies = [], targetPlatform, context) { // 4. 一个比较折腾的方案: 在脚本操作中, 把内容同步到另一个 gist // 见 https://t.me/zhetengsha/1428 - // + // // const content = ProxyUtils.produce([...proxies], platform) // // YAML @@ -130,12 +130,11 @@ function operator(proxies = [], targetPlatform, context) { // yaml.proxies.unshift(...clashMetaProxies) // $content = ProxyUtils.yaml.dump(yaml) - - // { $content, $files } will be passed to the next operator + // { $content, $files } will be passed to the next operator // $content is the final content of the file // flowUtils 为机场订阅流量信息处理工具 - // 可参考: + // 可参考: // 1. https://t.me/zhetengsha/948 // context 为传入的上下文 @@ -224,7 +223,7 @@ function operator(proxies = [], targetPlatform, context) { // 参数说明 // 可参考 https://github.com/sub-store-org/Sub-Store/wiki/%E9%93%BE%E6%8E%A5%E5%8F%82%E6%95%B0%E8%AF%B4%E6%98%8E - console.log(JSON.stringify(context, null, 2)) + console.log(JSON.stringify(context, null, 2)); - return proxies + return proxies; }