GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Feat: sukka_local_dns_mapping.sgmodule now uses new rule-set syntax

Browse Source
This commit is contained in:
SukkaW
2025-01-17 14:43:35 +08:00
parent 8d5da9776a
commit 6858cd63b4
6 changed files with 119 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Build/lib/rules/base.ts
View File

@@ -34,7 +34,7 @@ export abstract class RuleOutput<TPreprocessed = unknown> {
protected destPort = new Set<string>();
protected otherRules: string[] = [];
protected abstract type: 'domainset' | 'non_ip' | 'ip';
protected abstract type: 'domainset' | 'non_ip' | 'ip' | (string & {});
private pendingPromise: Promise<any> | null = null;
@@ -295,13 +295,29 @@ export abstract class RuleOutput<TPreprocessed = unknown> {
);
}
write(): Promise<void> {
write({
surge = true,
clash = true,
singbox = true,
surgeDir = OUTPUT_SURGE_DIR,
clashDir = OUTPUT_CLASH_DIR,
singboxDir = OUTPUT_SINGBOX_DIR
}: {
surge?: boolean,
clash?: boolean,
singbox?: boolean,
surgeDir?: string,
clashDir?: string,
singboxDir?: string
} = {}): Promise<void> {
return this.done().then(() => this.span.traceChildAsync('write all', async () => {
invariant(this.title, 'Missing title');
invariant(this.description, 'Missing description');
const promises = [
compareAndWriteFile(
const promises: Array<Promise<void>> = [];
if (surge) {
promises.push(compareAndWriteFile(
this.span,
withBannerArray(
this.title,
@@ -309,9 +325,11 @@ export abstract class RuleOutput<TPreprocessed = unknown> {
this.date,
this.surge()
),
path.join(OUTPUT_SURGE_DIR, this.type, this.id + '.conf')
),
compareAndWriteFile(
path.join(surgeDir, this.type, this.id + '.conf')
));
}
if (clash) {
promises.push(compareAndWriteFile(
this.span,
withBannerArray(
this.title,
@@ -319,14 +337,16 @@ export abstract class RuleOutput<TPreprocessed = unknown> {
this.date,
this.clash()
),
path.join(OUTPUT_CLASH_DIR, this.type, this.id + '.txt')
),
compareAndWriteFile(
path.join(clashDir, this.type, this.id + '.txt')
));
}
if (singbox) {
promises.push(compareAndWriteFile(
this.span,
this.singbox(),
path.join(OUTPUT_SINGBOX_DIR, this.type, this.id + '.json')
)
];
path.join(singboxDir, this.type, this.id + '.json')
));
}
if (this.mitmSgmodule) {
const sgmodule = this.mitmSgmodule();

2
Build/lib/rules/ruleset.ts
View File

@@ -12,7 +12,7 @@ import { isProbablyIpv4, isProbablyIpv6 } from 'foxts/is-probably-ip';
type Preprocessed = [domain: string[], domainSuffix: string[], sortedDomainRules: string[]];
export class RulesetOutput extends RuleOutput<Preprocessed> {
constructor(span: Span, id: string, protected type: 'non_ip' | 'ip') {
constructor(span: Span, id: string, protected type: 'non_ip' | 'ip' | (string & {})) {
super(span, id);
}