GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2025-12-15 10:40:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix: sing-box port should be number

Browse Source
This commit is contained in:
SukkaW 2024-08-15 17:19:51 +08:00
parent d0154e1bc8
commit 1333f361c8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Build/lib/singbox.ts
View File

@ -4,8 +4,13 @@ import { isProbablyIpv4, isProbablyIpv6 } from './is-fast-ip';
const unsupported = Symbol('unsupported'); const unsupported = Symbol('unsupported');
const toNumberTuple = <T extends string>(key: T, value: string): [T, number] | null => {
const tmp = Number(value);
return Number.isNaN(tmp) ? null : [key, tmp];
};
// https://sing-box.sagernet.org/configuration/rule-set/source-format/ // https://sing-box.sagernet.org/configuration/rule-set/source-format/
const PROCESSOR: Record<string, ((raw: string, type: string, value: string) => [key: keyof SingboxHeadlessRule, value: string] | null) | typeof unsupported> = { const PROCESSOR: Record<string, ((raw: string, type: string, value: string) => [key: keyof SingboxHeadlessRule, value: Required<SingboxHeadlessRule>[keyof SingboxHeadlessRule][number]] | null) | typeof unsupported> = {
DOMAIN: (_1, _2, value) => ['domain', value], DOMAIN: (_1, _2, value) => ['domain', value],
'DOMAIN-SUFFIX': (_1, _2, value) => ['domain_suffix', value], 'DOMAIN-SUFFIX': (_1, _2, value) => ['domain_suffix', value],
'DOMAIN-KEYWORD': (_1, _2, value) => ['domain_keyword', value], 'DOMAIN-KEYWORD': (_1, _2, value) => ['domain_keyword', value],
@ -27,12 +32,12 @@ const PROCESSOR: Record<string, ((raw: string, type: string, value: string) => [
return null; return null;
}, },
'SRC-IP-CIDR': (_1, _2, value) => ['source_ip_cidr', value.endsWith(',no-resolve') ? value.slice(0, -11) : value], 'SRC-IP-CIDR': (_1, _2, value) => ['source_ip_cidr', value.endsWith(',no-resolve') ? value.slice(0, -11) : value],
'SRC-PORT': (_1, _2, value) => ['source_port', value], 'SRC-PORT': (_1, _2, value) => toNumberTuple('source_port', value),
'DST-PORT': (_1, _2, value) => ['port', value], 'DST-PORT': (_1, _2, value) => toNumberTuple('port', value),
'PROCESS-NAME': (_1, _2, value) => ['process_name', value], 'PROCESS-NAME': (_1, _2, value) => ['process_name', value],
'PROCESS-PATH': (_1, _2, value) => ['process_path', value], 'PROCESS-PATH': (_1, _2, value) => ['process_path', value],
'DEST-PORT': (_1, _2, value) => ['port', value], 'DEST-PORT': (_1, _2, value) => toNumberTuple('port', value),
'IN-PORT': (_1, _2, value) => ['source_port', value], 'IN-PORT': (_1, _2, value) => toNumberTuple('source_port', value),
'URL-REGEX': unsupported, 'URL-REGEX': unsupported,
'USER-AGENT': unsupported 'USER-AGENT': unsupported
}; };
@ -44,9 +49,9 @@ interface SingboxHeadlessRule {
domain_regex?: string[], domain_regex?: string[],
source_ip_cidr?: string[], source_ip_cidr?: string[],
ip_cidr?: string[], ip_cidr?: string[],
source_port?: string[], source_port?: number[],
source_port_range?: string[], source_port_range?: string[],
port?: string[], port?: number[],
port_range?: string[], port_range?: string[],
process_name?: string[], process_name?: string[],
process_path?: string[] process_path?: string[]
@ -80,7 +85,7 @@ export const surgeRulesetToSingbox = (rules: string[] | Set<string>): SingboxSou
if (r) { if (r) {
const [k, v] = r; const [k, v] = r;
acc[k] ||= []; acc[k] ||= [];
acc[k].push(v); (acc[k] as any).push(v);
} }
} }
} else { } else {