This commit is contained in:
problematicconsumer
2024-01-19 22:26:23 +03:30
parent b088c24624
commit 1517d45ef4
6 changed files with 27 additions and 1 deletions

View File

@@ -113,6 +113,10 @@ class ConfigOptionRepositoryImpl
enableTlsMixedSniCase: persisted.enableTlsMixedSniCase,
enableTlsPadding: persisted.enableTlsPadding,
tlsPaddingSize: persisted.tlsPaddingSize,
enableMux: persisted.enableMux,
muxPadding: persisted.muxPadding,
muxMaxStreams: persisted.muxMaxStreams,
muxProtocol: persisted.muxProtocol,
geoipPath: geoAssetPathResolver.relativePath(
geoAssets.geoip.providerName,
geoAssets.geoip.fileName,

View File

@@ -53,6 +53,10 @@ class ConfigOptionEntity with _$ConfigOptionEntity {
@RangeWithOptionalCeilJsonConverter()
@Default(RangeWithOptionalCeil(min: 100, max: 200))
RangeWithOptionalCeil tlsPaddingSize,
@Default(false) bool enableMux,
@Default(false) bool muxPadding,
@Default(8) int muxMaxStreams,
@Default(MuxProtocol.h2mux) MuxProtocol muxProtocol,
}) = _ConfigOptionEntity;
static ConfigOptionEntity initial = ConfigOptionEntity(
@@ -109,6 +113,10 @@ class ConfigOptionEntity with _$ConfigOptionEntity {
patch.enableTlsMixedSniCase ?? enableTlsMixedSniCase,
enableTlsPadding: patch.enableTlsPadding ?? enableTlsPadding,
tlsPaddingSize: patch.tlsPaddingSize ?? tlsPaddingSize,
enableMux: patch.enableMux ?? enableMux,
muxPadding: patch.muxPadding ?? muxPadding,
muxMaxStreams: patch.muxMaxStreams ?? muxMaxStreams,
muxProtocol: patch.muxProtocol ?? muxProtocol,
);
}

View File

@@ -43,6 +43,10 @@ class ConfigOptionPatch with _$ConfigOptionPatch {
bool? enableTlsMixedSniCase,
bool? enableTlsPadding,
@RangeWithOptionalCeilJsonConverter() RangeWithOptionalCeil? tlsPaddingSize,
bool? enableMux,
bool? muxPadding,
int? muxMaxStreams,
MuxProtocol? muxProtocol,
}) = _ConfigOptionPatch;
factory ConfigOptionPatch.fromJson(Map<String, dynamic> json) =>

View File

@@ -72,3 +72,9 @@ enum TunImplementation {
system,
gVisor;
}
enum MuxProtocol {
h2mux,
smux,
yamux;
}

View File

@@ -48,6 +48,10 @@ class SingboxConfigOption with _$SingboxConfigOption {
required bool enableTlsPadding,
@RangeWithOptionalCeilJsonConverter()
required RangeWithOptionalCeil tlsPaddingSize,
required bool enableMux,
required bool muxPadding,
required int muxMaxStreams,
required MuxProtocol muxProtocol,
required String geoipPath,
required String geositePath,
required List<SingboxRule> rules,

Submodule libcore updated: 7a3b130ec6...eb2d364fcf