Change 'whitelist' to 'allowlist' globally.

This commit is contained in:
Kyle H 2023-11-23 14:49:45 +00:00 committed by Christien Rioux
parent 7d1b789d38
commit af27b5aa85
21 changed files with 1546 additions and 1462 deletions

View File

@ -46,7 +46,7 @@ core:
max_connections_per_ip6_prefix: 32
max_connections_per_ip6_prefix_size: 56
max_connection_frequency_per_min: 128
client_whitelist_timeout_ms: 300000
client_allowlist_timeout_ms: 300000
reverse_connection_receipt_time_ms: 5000
hole_punch_receipt_time_ms: 5000
network_key_password: null

View File

@ -185,7 +185,7 @@ network:
max_connections_per_ip6_prefix: 32
max_connections_per_ip6_prefix_size: 56
max_connection_frequency_per_min: 128
client_whitelist_timeout_ms: 300000
client_allowlist_timeout_ms: 300000
reverse_connection_receipt_time_ms: 5000
hole_punch_receipt_time_ms: 5000
network_key_password: null

View File

@ -85,7 +85,7 @@ struct NetworkComponents {
}
#[derive(Debug)]
struct ClientWhitelistEntry {
struct ClientAllowlistEntry {
last_seen_ts: Timestamp,
}
@ -136,7 +136,7 @@ enum SendDataToExistingFlowResult {
// The mutable state of the network manager
struct NetworkManagerInner {
stats: NetworkManagerStats,
client_whitelist: LruCache<TypedKey, ClientWhitelistEntry>,
client_allowlist: LruCache<TypedKey, ClientAllowlistEntry>,
node_contact_method_cache: LruCache<NodeContactMethodCacheKey, NodeContactMethod>,
public_address_check_cache:
BTreeMap<PublicAddressCheckCacheKey, LruCache<IpAddr, SocketAddress>>,
@ -175,7 +175,7 @@ impl NetworkManager {
fn new_inner() -> NetworkManagerInner {
NetworkManagerInner {
stats: NetworkManagerStats::default(),
client_whitelist: LruCache::new_unbounded(),
client_allowlist: LruCache::new_unbounded(),
node_contact_method_cache: LruCache::new(NODE_CONTACT_METHOD_CACHE_SIZE),
public_address_check_cache: BTreeMap::new(),
public_address_inconsistencies_table: BTreeMap::new(),
@ -453,14 +453,14 @@ impl NetworkManager {
debug!("finished network manager shutdown");
}
pub fn update_client_whitelist(&self, client: TypedKey) {
pub fn update_client_allowlist(&self, client: TypedKey) {
let mut inner = self.inner.lock();
match inner.client_whitelist.entry(client) {
match inner.client_allowlist.entry(client) {
hashlink::lru_cache::Entry::Occupied(mut entry) => {
entry.get_mut().last_seen_ts = get_aligned_timestamp()
}
hashlink::lru_cache::Entry::Vacant(entry) => {
entry.insert(ClientWhitelistEntry {
entry.insert(ClientAllowlistEntry {
last_seen_ts: get_aligned_timestamp(),
});
}
@ -468,10 +468,10 @@ impl NetworkManager {
}
#[instrument(level = "trace", skip(self), ret)]
pub fn check_client_whitelist(&self, client: TypedKey) -> bool {
pub fn check_client_allowlist(&self, client: TypedKey) -> bool {
let mut inner = self.inner.lock();
match inner.client_whitelist.entry(client) {
match inner.client_allowlist.entry(client) {
hashlink::lru_cache::Entry::Occupied(mut entry) => {
entry.get_mut().last_seen_ts = get_aligned_timestamp();
true
@ -480,20 +480,20 @@ impl NetworkManager {
}
}
pub fn purge_client_whitelist(&self) {
let timeout_ms = self.with_config(|c| c.network.client_whitelist_timeout_ms);
pub fn purge_client_allowlist(&self) {
let timeout_ms = self.with_config(|c| c.network.client_allowlist_timeout_ms);
let mut inner = self.inner.lock();
let cutoff_timestamp =
get_aligned_timestamp() - TimestampDuration::new((timeout_ms as u64) * 1000u64);
// Remove clients from the whitelist that haven't been since since our whitelist timeout
// Remove clients from the allowlist that haven't been since since our allowlist timeout
while inner
.client_whitelist
.client_allowlist
.peek_lru()
.map(|v| v.1.last_seen_ts < cutoff_timestamp)
.unwrap_or_default()
{
let (k, v) = inner.client_whitelist.remove_lru().unwrap();
trace!(key=?k, value=?v, "purge_client_whitelist: remove_lru")
let (k, v) = inner.client_allowlist.remove_lru().unwrap();
trace!(key=?k, value=?v, "purge_client_allowlist: remove_lru")
}
}
@ -998,7 +998,7 @@ impl NetworkManager {
// This is a costly operation, so only outbound-relay permitted
// nodes are allowed to do this, for example PWA users
let some_relay_nr = if self.check_client_whitelist(sender_id) {
let some_relay_nr = if self.check_client_allowlist(sender_id) {
// Full relay allowed, do a full resolve_node
match rpc
.resolve_node(recipient_id, SafetySelection::Unsafe(Sequencing::default()))
@ -1011,7 +1011,7 @@ impl NetworkManager {
}
}
} else {
// If this is not a node in the client whitelist, only allow inbound relay
// If this is not a node in the client allowlist, only allow inbound relay
// which only performs a lightweight lookup before passing the packet back out
// See if we have the node in our routing table

View File

@ -551,9 +551,12 @@ impl Network {
.wrap_err("connect failure")?
}
ProtocolType::WS | ProtocolType::WSS => {
WebsocketProtocolHandler::connect(None, &dial_info, connect_timeout_ms)
.await
.wrap_err("connect failure")?
WebsocketProtocolHandler::connect(
None,
&dial_info,
connect_timeout_ms)
.await
.wrap_err("connect failure")?
}
});

View File

@ -78,8 +78,8 @@ impl NetworkManager {
// Run the receipt manager tick
receipt_manager.tick().await?;
// Purge the client whitelist
self.purge_client_whitelist();
// Purge the client allowlist
self.purge_client_allowlist();
Ok(())
}

View File

@ -185,7 +185,7 @@ pub fn config_callback(key: String) -> ConfigCallbackReturn {
"network.max_connections_per_ip6_prefix" => Ok(Box::new(32u32)),
"network.max_connections_per_ip6_prefix_size" => Ok(Box::new(56u32)),
"network.max_connection_frequency_per_min" => Ok(Box::new(128u32)),
"network.client_whitelist_timeout_ms" => Ok(Box::new(300_000u32)),
"network.client_allowlist_timeout_ms" => Ok(Box::new(300_000u32)),
"network.reverse_connection_receipt_time_ms" => Ok(Box::new(5_000u32)),
"network.hole_punch_receipt_time_ms" => Ok(Box::new(5_000u32)),
"network.network_key_password" => Ok(Box::new(Option::<String>::None)),
@ -320,7 +320,7 @@ pub async fn test_config() {
assert_eq!(inner.network.max_connections_per_ip6_prefix, 32u32);
assert_eq!(inner.network.max_connections_per_ip6_prefix_size, 56u32);
assert_eq!(inner.network.max_connection_frequency_per_min, 128u32);
assert_eq!(inner.network.client_whitelist_timeout_ms, 300_000u32);
assert_eq!(inner.network.client_allowlist_timeout_ms, 300_000u32);
assert_eq!(inner.network.reverse_connection_receipt_time_ms, 5_000u32);
assert_eq!(inner.network.hole_punch_receipt_time_ms, 5_000u32);
assert_eq!(inner.network.network_key_password, Option::<String>::None);

View File

@ -101,7 +101,7 @@ pub fn fix_veilidconfiginner() -> VeilidConfigInner {
max_connections_per_ip6_prefix: 4000,
max_connections_per_ip6_prefix_size: 5000,
max_connection_frequency_per_min: 6000,
client_whitelist_timeout_ms: 7000,
client_allowlist_timeout_ms: 7000,
reverse_connection_receipt_time_ms: 8000,
hole_punch_receipt_time_ms: 9000,
network_key_password: None,

View File

@ -249,7 +249,7 @@ pub struct VeilidConfigNetwork {
pub max_connections_per_ip6_prefix: u32,
pub max_connections_per_ip6_prefix_size: u32,
pub max_connection_frequency_per_min: u32,
pub client_whitelist_timeout_ms: u32,
pub client_allowlist_timeout_ms: u32,
pub reverse_connection_receipt_time_ms: u32,
pub hole_punch_receipt_time_ms: u32,
#[cfg_attr(target_arch = "wasm32", tsify(optional))]
@ -486,7 +486,7 @@ impl VeilidConfig {
get_config!(inner.network.max_connections_per_ip6_prefix);
get_config!(inner.network.max_connections_per_ip6_prefix_size);
get_config!(inner.network.max_connection_frequency_per_min);
get_config!(inner.network.client_whitelist_timeout_ms);
get_config!(inner.network.client_allowlist_timeout_ms);
get_config!(inner.network.reverse_connection_receipt_time_ms);
get_config!(inner.network.hole_punch_receipt_time_ms);
get_config!(inner.network.network_key_password);

View File

@ -61,10 +61,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.17.2"
version: "1.18.0"
convert:
dependency: transitive
description:
@ -220,10 +220,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
path:
dependency: "direct main"
description:
@ -329,18 +329,18 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
@ -377,10 +377,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
url: "https://pub.dev"
source: hosted
version: "0.6.0"
version: "0.6.1"
typed_data:
dependency: transitive
description:
@ -403,15 +403,15 @@ packages:
path: ".."
relative: true
source: path
version: "0.2.4"
version: "0.2.5"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
version: "0.3.0"
win32:
dependency: transitive
description:
@ -437,5 +437,5 @@ packages:
source: hosted
version: "3.5.0"
sdks:
dart: ">=3.1.0-185.0.dev <4.0.0"
dart: ">=3.2.0-194.0.dev <4.0.0"
flutter: ">=3.10.6"

View File

@ -93,7 +93,7 @@ Future<VeilidConfig> getDefaultVeilidConfig(String programName) async {
maxConnectionsPerIp6Prefix: 32,
maxConnectionsPerIp6PrefixSize: 56,
maxConnectionFrequencyPerMin: 128,
clientWhitelistTimeoutMs: 300000,
clientAllowlistTimeoutMs: 300000,
reverseConnectionReceiptTimeMs: 5000,
holePunchReceiptTimeMs: 5000,
routingTable: VeilidConfigRoutingTable(

View File

@ -107,22 +107,22 @@ class _$DHTSchemaCopyWithImpl<$Res, $Val extends DHTSchema>
}
/// @nodoc
abstract class _$$DHTSchemaDFLTCopyWith<$Res>
abstract class _$$DHTSchemaDFLTImplCopyWith<$Res>
implements $DHTSchemaCopyWith<$Res> {
factory _$$DHTSchemaDFLTCopyWith(
_$DHTSchemaDFLT value, $Res Function(_$DHTSchemaDFLT) then) =
__$$DHTSchemaDFLTCopyWithImpl<$Res>;
factory _$$DHTSchemaDFLTImplCopyWith(
_$DHTSchemaDFLTImpl value, $Res Function(_$DHTSchemaDFLTImpl) then) =
__$$DHTSchemaDFLTImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({int oCnt});
}
/// @nodoc
class __$$DHTSchemaDFLTCopyWithImpl<$Res>
extends _$DHTSchemaCopyWithImpl<$Res, _$DHTSchemaDFLT>
implements _$$DHTSchemaDFLTCopyWith<$Res> {
__$$DHTSchemaDFLTCopyWithImpl(
_$DHTSchemaDFLT _value, $Res Function(_$DHTSchemaDFLT) _then)
class __$$DHTSchemaDFLTImplCopyWithImpl<$Res>
extends _$DHTSchemaCopyWithImpl<$Res, _$DHTSchemaDFLTImpl>
implements _$$DHTSchemaDFLTImplCopyWith<$Res> {
__$$DHTSchemaDFLTImplCopyWithImpl(
_$DHTSchemaDFLTImpl _value, $Res Function(_$DHTSchemaDFLTImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@ -130,7 +130,7 @@ class __$$DHTSchemaDFLTCopyWithImpl<$Res>
$Res call({
Object? oCnt = null,
}) {
return _then(_$DHTSchemaDFLT(
return _then(_$DHTSchemaDFLTImpl(
oCnt: null == oCnt
? _value.oCnt
: oCnt // ignore: cast_nullable_to_non_nullable
@ -141,12 +141,12 @@ class __$$DHTSchemaDFLTCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$DHTSchemaDFLT implements DHTSchemaDFLT {
const _$DHTSchemaDFLT({required this.oCnt, final String? $type})
class _$DHTSchemaDFLTImpl implements DHTSchemaDFLT {
const _$DHTSchemaDFLTImpl({required this.oCnt, final String? $type})
: $type = $type ?? 'DFLT';
factory _$DHTSchemaDFLT.fromJson(Map<String, dynamic> json) =>
_$$DHTSchemaDFLTFromJson(json);
factory _$DHTSchemaDFLTImpl.fromJson(Map<String, dynamic> json) =>
_$$DHTSchemaDFLTImplFromJson(json);
@override
final int oCnt;
@ -163,7 +163,7 @@ class _$DHTSchemaDFLT implements DHTSchemaDFLT {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$DHTSchemaDFLT &&
other is _$DHTSchemaDFLTImpl &&
(identical(other.oCnt, oCnt) || other.oCnt == oCnt));
}
@ -174,8 +174,8 @@ class _$DHTSchemaDFLT implements DHTSchemaDFLT {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$DHTSchemaDFLTCopyWith<_$DHTSchemaDFLT> get copyWith =>
__$$DHTSchemaDFLTCopyWithImpl<_$DHTSchemaDFLT>(this, _$identity);
_$$DHTSchemaDFLTImplCopyWith<_$DHTSchemaDFLTImpl> get copyWith =>
__$$DHTSchemaDFLTImplCopyWithImpl<_$DHTSchemaDFLTImpl>(this, _$identity);
@override
@optionalTypeArgs
@ -241,43 +241,43 @@ class _$DHTSchemaDFLT implements DHTSchemaDFLT {
@override
Map<String, dynamic> toJson() {
return _$$DHTSchemaDFLTToJson(
return _$$DHTSchemaDFLTImplToJson(
this,
);
}
}
abstract class DHTSchemaDFLT implements DHTSchema {
const factory DHTSchemaDFLT({required final int oCnt}) = _$DHTSchemaDFLT;
const factory DHTSchemaDFLT({required final int oCnt}) = _$DHTSchemaDFLTImpl;
factory DHTSchemaDFLT.fromJson(Map<String, dynamic> json) =
_$DHTSchemaDFLT.fromJson;
_$DHTSchemaDFLTImpl.fromJson;
@override
int get oCnt;
@override
@JsonKey(ignore: true)
_$$DHTSchemaDFLTCopyWith<_$DHTSchemaDFLT> get copyWith =>
_$$DHTSchemaDFLTImplCopyWith<_$DHTSchemaDFLTImpl> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
abstract class _$$DHTSchemaSMPLCopyWith<$Res>
abstract class _$$DHTSchemaSMPLImplCopyWith<$Res>
implements $DHTSchemaCopyWith<$Res> {
factory _$$DHTSchemaSMPLCopyWith(
_$DHTSchemaSMPL value, $Res Function(_$DHTSchemaSMPL) then) =
__$$DHTSchemaSMPLCopyWithImpl<$Res>;
factory _$$DHTSchemaSMPLImplCopyWith(
_$DHTSchemaSMPLImpl value, $Res Function(_$DHTSchemaSMPLImpl) then) =
__$$DHTSchemaSMPLImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({int oCnt, List<DHTSchemaMember> members});
}
/// @nodoc
class __$$DHTSchemaSMPLCopyWithImpl<$Res>
extends _$DHTSchemaCopyWithImpl<$Res, _$DHTSchemaSMPL>
implements _$$DHTSchemaSMPLCopyWith<$Res> {
__$$DHTSchemaSMPLCopyWithImpl(
_$DHTSchemaSMPL _value, $Res Function(_$DHTSchemaSMPL) _then)
class __$$DHTSchemaSMPLImplCopyWithImpl<$Res>
extends _$DHTSchemaCopyWithImpl<$Res, _$DHTSchemaSMPLImpl>
implements _$$DHTSchemaSMPLImplCopyWith<$Res> {
__$$DHTSchemaSMPLImplCopyWithImpl(
_$DHTSchemaSMPLImpl _value, $Res Function(_$DHTSchemaSMPLImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@ -286,7 +286,7 @@ class __$$DHTSchemaSMPLCopyWithImpl<$Res>
Object? oCnt = null,
Object? members = null,
}) {
return _then(_$DHTSchemaSMPL(
return _then(_$DHTSchemaSMPLImpl(
oCnt: null == oCnt
? _value.oCnt
: oCnt // ignore: cast_nullable_to_non_nullable
@ -301,16 +301,16 @@ class __$$DHTSchemaSMPLCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$DHTSchemaSMPL implements DHTSchemaSMPL {
const _$DHTSchemaSMPL(
class _$DHTSchemaSMPLImpl implements DHTSchemaSMPL {
const _$DHTSchemaSMPLImpl(
{required this.oCnt,
required final List<DHTSchemaMember> members,
final String? $type})
: _members = members,
$type = $type ?? 'SMPL';
factory _$DHTSchemaSMPL.fromJson(Map<String, dynamic> json) =>
_$$DHTSchemaSMPLFromJson(json);
factory _$DHTSchemaSMPLImpl.fromJson(Map<String, dynamic> json) =>
_$$DHTSchemaSMPLImplFromJson(json);
@override
final int oCnt;
@ -334,7 +334,7 @@ class _$DHTSchemaSMPL implements DHTSchemaSMPL {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$DHTSchemaSMPL &&
other is _$DHTSchemaSMPLImpl &&
(identical(other.oCnt, oCnt) || other.oCnt == oCnt) &&
const DeepCollectionEquality().equals(other._members, _members));
}
@ -347,8 +347,8 @@ class _$DHTSchemaSMPL implements DHTSchemaSMPL {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$DHTSchemaSMPLCopyWith<_$DHTSchemaSMPL> get copyWith =>
__$$DHTSchemaSMPLCopyWithImpl<_$DHTSchemaSMPL>(this, _$identity);
_$$DHTSchemaSMPLImplCopyWith<_$DHTSchemaSMPLImpl> get copyWith =>
__$$DHTSchemaSMPLImplCopyWithImpl<_$DHTSchemaSMPLImpl>(this, _$identity);
@override
@optionalTypeArgs
@ -414,7 +414,7 @@ class _$DHTSchemaSMPL implements DHTSchemaSMPL {
@override
Map<String, dynamic> toJson() {
return _$$DHTSchemaSMPLToJson(
return _$$DHTSchemaSMPLImplToJson(
this,
);
}
@ -423,17 +423,17 @@ class _$DHTSchemaSMPL implements DHTSchemaSMPL {
abstract class DHTSchemaSMPL implements DHTSchema {
const factory DHTSchemaSMPL(
{required final int oCnt,
required final List<DHTSchemaMember> members}) = _$DHTSchemaSMPL;
required final List<DHTSchemaMember> members}) = _$DHTSchemaSMPLImpl;
factory DHTSchemaSMPL.fromJson(Map<String, dynamic> json) =
_$DHTSchemaSMPL.fromJson;
_$DHTSchemaSMPLImpl.fromJson;
@override
int get oCnt;
List<DHTSchemaMember> get members;
@override
@JsonKey(ignore: true)
_$$DHTSchemaSMPLCopyWith<_$DHTSchemaSMPL> get copyWith =>
_$$DHTSchemaSMPLImplCopyWith<_$DHTSchemaSMPLImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@ -491,22 +491,22 @@ class _$DHTSchemaMemberCopyWithImpl<$Res, $Val extends DHTSchemaMember>
}
/// @nodoc
abstract class _$$_DHTSchemaMemberCopyWith<$Res>
abstract class _$$DHTSchemaMemberImplCopyWith<$Res>
implements $DHTSchemaMemberCopyWith<$Res> {
factory _$$_DHTSchemaMemberCopyWith(
_$_DHTSchemaMember value, $Res Function(_$_DHTSchemaMember) then) =
__$$_DHTSchemaMemberCopyWithImpl<$Res>;
factory _$$DHTSchemaMemberImplCopyWith(_$DHTSchemaMemberImpl value,
$Res Function(_$DHTSchemaMemberImpl) then) =
__$$DHTSchemaMemberImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({FixedEncodedString43 mKey, int mCnt});
}
/// @nodoc
class __$$_DHTSchemaMemberCopyWithImpl<$Res>
extends _$DHTSchemaMemberCopyWithImpl<$Res, _$_DHTSchemaMember>
implements _$$_DHTSchemaMemberCopyWith<$Res> {
__$$_DHTSchemaMemberCopyWithImpl(
_$_DHTSchemaMember _value, $Res Function(_$_DHTSchemaMember) _then)
class __$$DHTSchemaMemberImplCopyWithImpl<$Res>
extends _$DHTSchemaMemberCopyWithImpl<$Res, _$DHTSchemaMemberImpl>
implements _$$DHTSchemaMemberImplCopyWith<$Res> {
__$$DHTSchemaMemberImplCopyWithImpl(
_$DHTSchemaMemberImpl _value, $Res Function(_$DHTSchemaMemberImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@ -515,7 +515,7 @@ class __$$_DHTSchemaMemberCopyWithImpl<$Res>
Object? mKey = null,
Object? mCnt = null,
}) {
return _then(_$_DHTSchemaMember(
return _then(_$DHTSchemaMemberImpl(
mKey: null == mKey
? _value.mKey
: mKey // ignore: cast_nullable_to_non_nullable
@ -530,12 +530,12 @@ class __$$_DHTSchemaMemberCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$_DHTSchemaMember implements _DHTSchemaMember {
const _$_DHTSchemaMember({required this.mKey, required this.mCnt})
class _$DHTSchemaMemberImpl implements _DHTSchemaMember {
const _$DHTSchemaMemberImpl({required this.mKey, required this.mCnt})
: assert(mCnt > 0 && mCnt <= 65535, 'value out of range');
factory _$_DHTSchemaMember.fromJson(Map<String, dynamic> json) =>
_$$_DHTSchemaMemberFromJson(json);
factory _$DHTSchemaMemberImpl.fromJson(Map<String, dynamic> json) =>
_$$DHTSchemaMemberImplFromJson(json);
@override
final FixedEncodedString43 mKey;
@ -551,7 +551,7 @@ class _$_DHTSchemaMember implements _DHTSchemaMember {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_DHTSchemaMember &&
other is _$DHTSchemaMemberImpl &&
(identical(other.mKey, mKey) || other.mKey == mKey) &&
(identical(other.mCnt, mCnt) || other.mCnt == mCnt));
}
@ -563,12 +563,13 @@ class _$_DHTSchemaMember implements _DHTSchemaMember {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$_DHTSchemaMemberCopyWith<_$_DHTSchemaMember> get copyWith =>
__$$_DHTSchemaMemberCopyWithImpl<_$_DHTSchemaMember>(this, _$identity);
_$$DHTSchemaMemberImplCopyWith<_$DHTSchemaMemberImpl> get copyWith =>
__$$DHTSchemaMemberImplCopyWithImpl<_$DHTSchemaMemberImpl>(
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$_DHTSchemaMemberToJson(
return _$$DHTSchemaMemberImplToJson(
this,
);
}
@ -577,10 +578,10 @@ class _$_DHTSchemaMember implements _DHTSchemaMember {
abstract class _DHTSchemaMember implements DHTSchemaMember {
const factory _DHTSchemaMember(
{required final FixedEncodedString43 mKey,
required final int mCnt}) = _$_DHTSchemaMember;
required final int mCnt}) = _$DHTSchemaMemberImpl;
factory _DHTSchemaMember.fromJson(Map<String, dynamic> json) =
_$_DHTSchemaMember.fromJson;
_$DHTSchemaMemberImpl.fromJson;
@override
FixedEncodedString43 get mKey;
@ -588,7 +589,7 @@ abstract class _DHTSchemaMember implements DHTSchemaMember {
int get mCnt;
@override
@JsonKey(ignore: true)
_$$_DHTSchemaMemberCopyWith<_$_DHTSchemaMember> get copyWith =>
_$$DHTSchemaMemberImplCopyWith<_$DHTSchemaMemberImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@ -672,11 +673,11 @@ class _$DHTRecordDescriptorCopyWithImpl<$Res, $Val extends DHTRecordDescriptor>
}
/// @nodoc
abstract class _$$_DHTRecordDescriptorCopyWith<$Res>
abstract class _$$DHTRecordDescriptorImplCopyWith<$Res>
implements $DHTRecordDescriptorCopyWith<$Res> {
factory _$$_DHTRecordDescriptorCopyWith(_$_DHTRecordDescriptor value,
$Res Function(_$_DHTRecordDescriptor) then) =
__$$_DHTRecordDescriptorCopyWithImpl<$Res>;
factory _$$DHTRecordDescriptorImplCopyWith(_$DHTRecordDescriptorImpl value,
$Res Function(_$DHTRecordDescriptorImpl) then) =
__$$DHTRecordDescriptorImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
@ -690,11 +691,11 @@ abstract class _$$_DHTRecordDescriptorCopyWith<$Res>
}
/// @nodoc
class __$$_DHTRecordDescriptorCopyWithImpl<$Res>
extends _$DHTRecordDescriptorCopyWithImpl<$Res, _$_DHTRecordDescriptor>
implements _$$_DHTRecordDescriptorCopyWith<$Res> {
__$$_DHTRecordDescriptorCopyWithImpl(_$_DHTRecordDescriptor _value,
$Res Function(_$_DHTRecordDescriptor) _then)
class __$$DHTRecordDescriptorImplCopyWithImpl<$Res>
extends _$DHTRecordDescriptorCopyWithImpl<$Res, _$DHTRecordDescriptorImpl>
implements _$$DHTRecordDescriptorImplCopyWith<$Res> {
__$$DHTRecordDescriptorImplCopyWithImpl(_$DHTRecordDescriptorImpl _value,
$Res Function(_$DHTRecordDescriptorImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@ -705,7 +706,7 @@ class __$$_DHTRecordDescriptorCopyWithImpl<$Res>
Object? schema = null,
Object? ownerSecret = freezed,
}) {
return _then(_$_DHTRecordDescriptor(
return _then(_$DHTRecordDescriptorImpl(
key: null == key
? _value.key
: key // ignore: cast_nullable_to_non_nullable
@ -728,15 +729,15 @@ class __$$_DHTRecordDescriptorCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$_DHTRecordDescriptor implements _DHTRecordDescriptor {
const _$_DHTRecordDescriptor(
class _$DHTRecordDescriptorImpl implements _DHTRecordDescriptor {
const _$DHTRecordDescriptorImpl(
{required this.key,
required this.owner,
required this.schema,
this.ownerSecret});
factory _$_DHTRecordDescriptor.fromJson(Map<String, dynamic> json) =>
_$$_DHTRecordDescriptorFromJson(json);
factory _$DHTRecordDescriptorImpl.fromJson(Map<String, dynamic> json) =>
_$$DHTRecordDescriptorImplFromJson(json);
@override
final Typed<FixedEncodedString43> key;
@ -756,7 +757,7 @@ class _$_DHTRecordDescriptor implements _DHTRecordDescriptor {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_DHTRecordDescriptor &&
other is _$DHTRecordDescriptorImpl &&
(identical(other.key, key) || other.key == key) &&
(identical(other.owner, owner) || other.owner == owner) &&
(identical(other.schema, schema) || other.schema == schema) &&
@ -771,13 +772,13 @@ class _$_DHTRecordDescriptor implements _DHTRecordDescriptor {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$_DHTRecordDescriptorCopyWith<_$_DHTRecordDescriptor> get copyWith =>
__$$_DHTRecordDescriptorCopyWithImpl<_$_DHTRecordDescriptor>(
_$$DHTRecordDescriptorImplCopyWith<_$DHTRecordDescriptorImpl> get copyWith =>
__$$DHTRecordDescriptorImplCopyWithImpl<_$DHTRecordDescriptorImpl>(
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$_DHTRecordDescriptorToJson(
return _$$DHTRecordDescriptorImplToJson(
this,
);
}
@ -788,10 +789,10 @@ abstract class _DHTRecordDescriptor implements DHTRecordDescriptor {
{required final Typed<FixedEncodedString43> key,
required final FixedEncodedString43 owner,
required final DHTSchema schema,
final FixedEncodedString43? ownerSecret}) = _$_DHTRecordDescriptor;
final FixedEncodedString43? ownerSecret}) = _$DHTRecordDescriptorImpl;
factory _DHTRecordDescriptor.fromJson(Map<String, dynamic> json) =
_$_DHTRecordDescriptor.fromJson;
_$DHTRecordDescriptorImpl.fromJson;
@override
Typed<FixedEncodedString43> get key;
@ -803,7 +804,7 @@ abstract class _DHTRecordDescriptor implements DHTRecordDescriptor {
FixedEncodedString43? get ownerSecret;
@override
@JsonKey(ignore: true)
_$$_DHTRecordDescriptorCopyWith<_$_DHTRecordDescriptor> get copyWith =>
_$$DHTRecordDescriptorImplCopyWith<_$DHTRecordDescriptorImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@ -861,22 +862,22 @@ class _$ValueSubkeyRangeCopyWithImpl<$Res, $Val extends ValueSubkeyRange>
}
/// @nodoc
abstract class _$$_ValueSubkeyRangeCopyWith<$Res>
abstract class _$$ValueSubkeyRangeImplCopyWith<$Res>
implements $ValueSubkeyRangeCopyWith<$Res> {
factory _$$_ValueSubkeyRangeCopyWith(
_$_ValueSubkeyRange value, $Res Function(_$_ValueSubkeyRange) then) =
__$$_ValueSubkeyRangeCopyWithImpl<$Res>;
factory _$$ValueSubkeyRangeImplCopyWith(_$ValueSubkeyRangeImpl value,
$Res Function(_$ValueSubkeyRangeImpl) then) =
__$$ValueSubkeyRangeImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({int low, int high});
}
/// @nodoc
class __$$_ValueSubkeyRangeCopyWithImpl<$Res>
extends _$ValueSubkeyRangeCopyWithImpl<$Res, _$_ValueSubkeyRange>
implements _$$_ValueSubkeyRangeCopyWith<$Res> {
__$$_ValueSubkeyRangeCopyWithImpl(
_$_ValueSubkeyRange _value, $Res Function(_$_ValueSubkeyRange) _then)
class __$$ValueSubkeyRangeImplCopyWithImpl<$Res>
extends _$ValueSubkeyRangeCopyWithImpl<$Res, _$ValueSubkeyRangeImpl>
implements _$$ValueSubkeyRangeImplCopyWith<$Res> {
__$$ValueSubkeyRangeImplCopyWithImpl(_$ValueSubkeyRangeImpl _value,
$Res Function(_$ValueSubkeyRangeImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@ -885,7 +886,7 @@ class __$$_ValueSubkeyRangeCopyWithImpl<$Res>
Object? low = null,
Object? high = null,
}) {
return _then(_$_ValueSubkeyRange(
return _then(_$ValueSubkeyRangeImpl(
low: null == low
? _value.low
: low // ignore: cast_nullable_to_non_nullable
@ -900,13 +901,13 @@ class __$$_ValueSubkeyRangeCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$_ValueSubkeyRange implements _ValueSubkeyRange {
const _$_ValueSubkeyRange({required this.low, required this.high})
class _$ValueSubkeyRangeImpl implements _ValueSubkeyRange {
const _$ValueSubkeyRangeImpl({required this.low, required this.high})
: assert(low < 0 || low > high, 'low out of range'),
assert(high < 0, 'high out of range');
factory _$_ValueSubkeyRange.fromJson(Map<String, dynamic> json) =>
_$$_ValueSubkeyRangeFromJson(json);
factory _$ValueSubkeyRangeImpl.fromJson(Map<String, dynamic> json) =>
_$$ValueSubkeyRangeImplFromJson(json);
@override
final int low;
@ -922,7 +923,7 @@ class _$_ValueSubkeyRange implements _ValueSubkeyRange {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_ValueSubkeyRange &&
other is _$ValueSubkeyRangeImpl &&
(identical(other.low, low) || other.low == low) &&
(identical(other.high, high) || other.high == high));
}
@ -934,12 +935,13 @@ class _$_ValueSubkeyRange implements _ValueSubkeyRange {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$_ValueSubkeyRangeCopyWith<_$_ValueSubkeyRange> get copyWith =>
__$$_ValueSubkeyRangeCopyWithImpl<_$_ValueSubkeyRange>(this, _$identity);
_$$ValueSubkeyRangeImplCopyWith<_$ValueSubkeyRangeImpl> get copyWith =>
__$$ValueSubkeyRangeImplCopyWithImpl<_$ValueSubkeyRangeImpl>(
this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$_ValueSubkeyRangeToJson(
return _$$ValueSubkeyRangeImplToJson(
this,
);
}
@ -947,10 +949,11 @@ class _$_ValueSubkeyRange implements _ValueSubkeyRange {
abstract class _ValueSubkeyRange implements ValueSubkeyRange {
const factory _ValueSubkeyRange(
{required final int low, required final int high}) = _$_ValueSubkeyRange;
{required final int low,
required final int high}) = _$ValueSubkeyRangeImpl;
factory _ValueSubkeyRange.fromJson(Map<String, dynamic> json) =
_$_ValueSubkeyRange.fromJson;
_$ValueSubkeyRangeImpl.fromJson;
@override
int get low;
@ -958,7 +961,7 @@ abstract class _ValueSubkeyRange implements ValueSubkeyRange {
int get high;
@override
@JsonKey(ignore: true)
_$$_ValueSubkeyRangeCopyWith<_$_ValueSubkeyRange> get copyWith =>
_$$ValueSubkeyRangeImplCopyWith<_$ValueSubkeyRangeImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@ -1025,10 +1028,11 @@ class _$ValueDataCopyWithImpl<$Res, $Val extends ValueData>
}
/// @nodoc
abstract class _$$_ValueDataCopyWith<$Res> implements $ValueDataCopyWith<$Res> {
factory _$$_ValueDataCopyWith(
_$_ValueData value, $Res Function(_$_ValueData) then) =
__$$_ValueDataCopyWithImpl<$Res>;
abstract class _$$ValueDataImplCopyWith<$Res>
implements $ValueDataCopyWith<$Res> {
factory _$$ValueDataImplCopyWith(
_$ValueDataImpl value, $Res Function(_$ValueDataImpl) then) =
__$$ValueDataImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
@ -1038,11 +1042,11 @@ abstract class _$$_ValueDataCopyWith<$Res> implements $ValueDataCopyWith<$Res> {
}
/// @nodoc
class __$$_ValueDataCopyWithImpl<$Res>
extends _$ValueDataCopyWithImpl<$Res, _$_ValueData>
implements _$$_ValueDataCopyWith<$Res> {
__$$_ValueDataCopyWithImpl(
_$_ValueData _value, $Res Function(_$_ValueData) _then)
class __$$ValueDataImplCopyWithImpl<$Res>
extends _$ValueDataCopyWithImpl<$Res, _$ValueDataImpl>
implements _$$ValueDataImplCopyWith<$Res> {
__$$ValueDataImplCopyWithImpl(
_$ValueDataImpl _value, $Res Function(_$ValueDataImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@ -1052,7 +1056,7 @@ class __$$_ValueDataCopyWithImpl<$Res>
Object? data = null,
Object? writer = null,
}) {
return _then(_$_ValueData(
return _then(_$ValueDataImpl(
seq: null == seq
? _value.seq
: seq // ignore: cast_nullable_to_non_nullable
@ -1071,15 +1075,15 @@ class __$$_ValueDataCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$_ValueData implements _ValueData {
const _$_ValueData(
class _$ValueDataImpl implements _ValueData {
const _$ValueDataImpl(
{required this.seq,
@Uint8ListJsonConverter.jsIsArray() required this.data,
required this.writer})
: assert(seq >= 0, 'seq out of range');
factory _$_ValueData.fromJson(Map<String, dynamic> json) =>
_$$_ValueDataFromJson(json);
factory _$ValueDataImpl.fromJson(Map<String, dynamic> json) =>
_$$ValueDataImplFromJson(json);
@override
final int seq;
@ -1098,7 +1102,7 @@ class _$_ValueData implements _ValueData {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_ValueData &&
other is _$ValueDataImpl &&
(identical(other.seq, seq) || other.seq == seq) &&
const DeepCollectionEquality().equals(other.data, data) &&
(identical(other.writer, writer) || other.writer == writer));
@ -1112,12 +1116,12 @@ class _$_ValueData implements _ValueData {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$_ValueDataCopyWith<_$_ValueData> get copyWith =>
__$$_ValueDataCopyWithImpl<_$_ValueData>(this, _$identity);
_$$ValueDataImplCopyWith<_$ValueDataImpl> get copyWith =>
__$$ValueDataImplCopyWithImpl<_$ValueDataImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$_ValueDataToJson(
return _$$ValueDataImplToJson(
this,
);
}
@ -1127,10 +1131,10 @@ abstract class _ValueData implements ValueData {
const factory _ValueData(
{required final int seq,
@Uint8ListJsonConverter.jsIsArray() required final Uint8List data,
required final FixedEncodedString43 writer}) = _$_ValueData;
required final FixedEncodedString43 writer}) = _$ValueDataImpl;
factory _ValueData.fromJson(Map<String, dynamic> json) =
_$_ValueData.fromJson;
_$ValueDataImpl.fromJson;
@override
int get seq;
@ -1141,7 +1145,7 @@ abstract class _ValueData implements ValueData {
FixedEncodedString43 get writer;
@override
@JsonKey(ignore: true)
_$$_ValueDataCopyWith<_$_ValueData> get copyWith =>
_$$ValueDataImplCopyWith<_$ValueDataImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@ -1215,11 +1219,11 @@ class _$SafetySpecCopyWithImpl<$Res, $Val extends SafetySpec>
}
/// @nodoc
abstract class _$$_SafetySpecCopyWith<$Res>
abstract class _$$SafetySpecImplCopyWith<$Res>
implements $SafetySpecCopyWith<$Res> {
factory _$$_SafetySpecCopyWith(
_$_SafetySpec value, $Res Function(_$_SafetySpec) then) =
__$$_SafetySpecCopyWithImpl<$Res>;
factory _$$SafetySpecImplCopyWith(
_$SafetySpecImpl value, $Res Function(_$SafetySpecImpl) then) =
__$$SafetySpecImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
@ -1230,11 +1234,11 @@ abstract class _$$_SafetySpecCopyWith<$Res>
}
/// @nodoc
class __$$_SafetySpecCopyWithImpl<$Res>
extends _$SafetySpecCopyWithImpl<$Res, _$_SafetySpec>
implements _$$_SafetySpecCopyWith<$Res> {
__$$_SafetySpecCopyWithImpl(
_$_SafetySpec _value, $Res Function(_$_SafetySpec) _then)
class __$$SafetySpecImplCopyWithImpl<$Res>
extends _$SafetySpecCopyWithImpl<$Res, _$SafetySpecImpl>
implements _$$SafetySpecImplCopyWith<$Res> {
__$$SafetySpecImplCopyWithImpl(
_$SafetySpecImpl _value, $Res Function(_$SafetySpecImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@ -1245,7 +1249,7 @@ class __$$_SafetySpecCopyWithImpl<$Res>
Object? sequencing = null,
Object? preferredRoute = freezed,
}) {
return _then(_$_SafetySpec(
return _then(_$SafetySpecImpl(
hopCount: null == hopCount
? _value.hopCount
: hopCount // ignore: cast_nullable_to_non_nullable
@ -1268,15 +1272,15 @@ class __$$_SafetySpecCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$_SafetySpec implements _SafetySpec {
const _$_SafetySpec(
class _$SafetySpecImpl implements _SafetySpec {
const _$SafetySpecImpl(
{required this.hopCount,
required this.stability,
required this.sequencing,
this.preferredRoute});
factory _$_SafetySpec.fromJson(Map<String, dynamic> json) =>
_$$_SafetySpecFromJson(json);
factory _$SafetySpecImpl.fromJson(Map<String, dynamic> json) =>
_$$SafetySpecImplFromJson(json);
@override
final int hopCount;
@ -1296,7 +1300,7 @@ class _$_SafetySpec implements _SafetySpec {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_SafetySpec &&
other is _$SafetySpecImpl &&
(identical(other.hopCount, hopCount) ||
other.hopCount == hopCount) &&
(identical(other.stability, stability) ||
@ -1315,12 +1319,12 @@ class _$_SafetySpec implements _SafetySpec {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$_SafetySpecCopyWith<_$_SafetySpec> get copyWith =>
__$$_SafetySpecCopyWithImpl<_$_SafetySpec>(this, _$identity);
_$$SafetySpecImplCopyWith<_$SafetySpecImpl> get copyWith =>
__$$SafetySpecImplCopyWithImpl<_$SafetySpecImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$_SafetySpecToJson(
return _$$SafetySpecImplToJson(
this,
);
}
@ -1331,10 +1335,10 @@ abstract class _SafetySpec implements SafetySpec {
{required final int hopCount,
required final Stability stability,
required final Sequencing sequencing,
final String? preferredRoute}) = _$_SafetySpec;
final String? preferredRoute}) = _$SafetySpecImpl;
factory _SafetySpec.fromJson(Map<String, dynamic> json) =
_$_SafetySpec.fromJson;
_$SafetySpecImpl.fromJson;
@override
int get hopCount;
@ -1346,7 +1350,7 @@ abstract class _SafetySpec implements SafetySpec {
String? get preferredRoute;
@override
@JsonKey(ignore: true)
_$$_SafetySpecCopyWith<_$_SafetySpec> get copyWith =>
_$$SafetySpecImplCopyWith<_$SafetySpecImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@ -1404,21 +1408,22 @@ class _$RouteBlobCopyWithImpl<$Res, $Val extends RouteBlob>
}
/// @nodoc
abstract class _$$_RouteBlobCopyWith<$Res> implements $RouteBlobCopyWith<$Res> {
factory _$$_RouteBlobCopyWith(
_$_RouteBlob value, $Res Function(_$_RouteBlob) then) =
__$$_RouteBlobCopyWithImpl<$Res>;
abstract class _$$RouteBlobImplCopyWith<$Res>
implements $RouteBlobCopyWith<$Res> {
factory _$$RouteBlobImplCopyWith(
_$RouteBlobImpl value, $Res Function(_$RouteBlobImpl) then) =
__$$RouteBlobImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String routeId, @Uint8ListJsonConverter() Uint8List blob});
}
/// @nodoc
class __$$_RouteBlobCopyWithImpl<$Res>
extends _$RouteBlobCopyWithImpl<$Res, _$_RouteBlob>
implements _$$_RouteBlobCopyWith<$Res> {
__$$_RouteBlobCopyWithImpl(
_$_RouteBlob _value, $Res Function(_$_RouteBlob) _then)
class __$$RouteBlobImplCopyWithImpl<$Res>
extends _$RouteBlobCopyWithImpl<$Res, _$RouteBlobImpl>
implements _$$RouteBlobImplCopyWith<$Res> {
__$$RouteBlobImplCopyWithImpl(
_$RouteBlobImpl _value, $Res Function(_$RouteBlobImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@ -1427,7 +1432,7 @@ class __$$_RouteBlobCopyWithImpl<$Res>
Object? routeId = null,
Object? blob = null,
}) {
return _then(_$_RouteBlob(
return _then(_$RouteBlobImpl(
routeId: null == routeId
? _value.routeId
: routeId // ignore: cast_nullable_to_non_nullable
@ -1442,12 +1447,12 @@ class __$$_RouteBlobCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$_RouteBlob implements _RouteBlob {
const _$_RouteBlob(
class _$RouteBlobImpl implements _RouteBlob {
const _$RouteBlobImpl(
{required this.routeId, @Uint8ListJsonConverter() required this.blob});
factory _$_RouteBlob.fromJson(Map<String, dynamic> json) =>
_$$_RouteBlobFromJson(json);
factory _$RouteBlobImpl.fromJson(Map<String, dynamic> json) =>
_$$RouteBlobImplFromJson(json);
@override
final String routeId;
@ -1464,7 +1469,7 @@ class _$_RouteBlob implements _RouteBlob {
bool operator ==(dynamic other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_RouteBlob &&
other is _$RouteBlobImpl &&
(identical(other.routeId, routeId) || other.routeId == routeId) &&
const DeepCollectionEquality().equals(other.blob, blob));
}
@ -1477,12 +1482,12 @@ class _$_RouteBlob implements _RouteBlob {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
_$$_RouteBlobCopyWith<_$_RouteBlob> get copyWith =>
__$$_RouteBlobCopyWithImpl<_$_RouteBlob>(this, _$identity);
_$$RouteBlobImplCopyWith<_$RouteBlobImpl> get copyWith =>
__$$RouteBlobImplCopyWithImpl<_$RouteBlobImpl>(this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$_RouteBlobToJson(
return _$$RouteBlobImplToJson(
this,
);
}
@ -1490,11 +1495,12 @@ class _$_RouteBlob implements _RouteBlob {
abstract class _RouteBlob implements RouteBlob {
const factory _RouteBlob(
{required final String routeId,
@Uint8ListJsonConverter() required final Uint8List blob}) = _$_RouteBlob;
{required final String routeId,
@Uint8ListJsonConverter() required final Uint8List blob}) =
_$RouteBlobImpl;
factory _RouteBlob.fromJson(Map<String, dynamic> json) =
_$_RouteBlob.fromJson;
_$RouteBlobImpl.fromJson;
@override
String get routeId;
@ -1503,6 +1509,6 @@ abstract class _RouteBlob implements RouteBlob {
Uint8List get blob;
@override
@JsonKey(ignore: true)
_$$_RouteBlobCopyWith<_$_RouteBlob> get copyWith =>
_$$RouteBlobImplCopyWith<_$RouteBlobImpl> get copyWith =>
throw _privateConstructorUsedError;
}

View File

@ -6,20 +6,20 @@ part of 'routing_context.dart';
// JsonSerializableGenerator
// **************************************************************************
_$DHTSchemaDFLT _$$DHTSchemaDFLTFromJson(Map<String, dynamic> json) =>
_$DHTSchemaDFLT(
_$DHTSchemaDFLTImpl _$$DHTSchemaDFLTImplFromJson(Map<String, dynamic> json) =>
_$DHTSchemaDFLTImpl(
oCnt: json['o_cnt'] as int,
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$DHTSchemaDFLTToJson(_$DHTSchemaDFLT instance) =>
Map<String, dynamic> _$$DHTSchemaDFLTImplToJson(_$DHTSchemaDFLTImpl instance) =>
<String, dynamic>{
'o_cnt': instance.oCnt,
'kind': instance.$type,
};
_$DHTSchemaSMPL _$$DHTSchemaSMPLFromJson(Map<String, dynamic> json) =>
_$DHTSchemaSMPL(
_$DHTSchemaSMPLImpl _$$DHTSchemaSMPLImplFromJson(Map<String, dynamic> json) =>
_$DHTSchemaSMPLImpl(
oCnt: json['o_cnt'] as int,
members: (json['members'] as List<dynamic>)
.map(DHTSchemaMember.fromJson)
@ -27,28 +27,30 @@ _$DHTSchemaSMPL _$$DHTSchemaSMPLFromJson(Map<String, dynamic> json) =>
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$DHTSchemaSMPLToJson(_$DHTSchemaSMPL instance) =>
Map<String, dynamic> _$$DHTSchemaSMPLImplToJson(_$DHTSchemaSMPLImpl instance) =>
<String, dynamic>{
'o_cnt': instance.oCnt,
'members': instance.members.map((e) => e.toJson()).toList(),
'kind': instance.$type,
};
_$_DHTSchemaMember _$$_DHTSchemaMemberFromJson(Map<String, dynamic> json) =>
_$_DHTSchemaMember(
_$DHTSchemaMemberImpl _$$DHTSchemaMemberImplFromJson(
Map<String, dynamic> json) =>
_$DHTSchemaMemberImpl(
mKey: FixedEncodedString43.fromJson(json['m_key']),
mCnt: json['m_cnt'] as int,
);
Map<String, dynamic> _$$_DHTSchemaMemberToJson(_$_DHTSchemaMember instance) =>
Map<String, dynamic> _$$DHTSchemaMemberImplToJson(
_$DHTSchemaMemberImpl instance) =>
<String, dynamic>{
'm_key': instance.mKey.toJson(),
'm_cnt': instance.mCnt,
};
_$_DHTRecordDescriptor _$$_DHTRecordDescriptorFromJson(
_$DHTRecordDescriptorImpl _$$DHTRecordDescriptorImplFromJson(
Map<String, dynamic> json) =>
_$_DHTRecordDescriptor(
_$DHTRecordDescriptorImpl(
key: Typed<FixedEncodedString43>.fromJson(json['key']),
owner: FixedEncodedString43.fromJson(json['owner']),
schema: DHTSchema.fromJson(json['schema']),
@ -57,8 +59,8 @@ _$_DHTRecordDescriptor _$$_DHTRecordDescriptorFromJson(
: FixedEncodedString43.fromJson(json['owner_secret']),
);
Map<String, dynamic> _$$_DHTRecordDescriptorToJson(
_$_DHTRecordDescriptor instance) =>
Map<String, dynamic> _$$DHTRecordDescriptorImplToJson(
_$DHTRecordDescriptorImpl instance) =>
<String, dynamic>{
'key': instance.key.toJson(),
'owner': instance.owner.toJson(),
@ -66,40 +68,43 @@ Map<String, dynamic> _$$_DHTRecordDescriptorToJson(
'owner_secret': instance.ownerSecret?.toJson(),
};
_$_ValueSubkeyRange _$$_ValueSubkeyRangeFromJson(Map<String, dynamic> json) =>
_$_ValueSubkeyRange(
_$ValueSubkeyRangeImpl _$$ValueSubkeyRangeImplFromJson(
Map<String, dynamic> json) =>
_$ValueSubkeyRangeImpl(
low: json['low'] as int,
high: json['high'] as int,
);
Map<String, dynamic> _$$_ValueSubkeyRangeToJson(_$_ValueSubkeyRange instance) =>
Map<String, dynamic> _$$ValueSubkeyRangeImplToJson(
_$ValueSubkeyRangeImpl instance) =>
<String, dynamic>{
'low': instance.low,
'high': instance.high,
};
_$_ValueData _$$_ValueDataFromJson(Map<String, dynamic> json) => _$_ValueData(
_$ValueDataImpl _$$ValueDataImplFromJson(Map<String, dynamic> json) =>
_$ValueDataImpl(
seq: json['seq'] as int,
data: const Uint8ListJsonConverter.jsIsArray().fromJson(json['data']),
writer: FixedEncodedString43.fromJson(json['writer']),
);
Map<String, dynamic> _$$_ValueDataToJson(_$_ValueData instance) =>
Map<String, dynamic> _$$ValueDataImplToJson(_$ValueDataImpl instance) =>
<String, dynamic>{
'seq': instance.seq,
'data': const Uint8ListJsonConverter.jsIsArray().toJson(instance.data),
'writer': instance.writer.toJson(),
};
_$_SafetySpec _$$_SafetySpecFromJson(Map<String, dynamic> json) =>
_$_SafetySpec(
_$SafetySpecImpl _$$SafetySpecImplFromJson(Map<String, dynamic> json) =>
_$SafetySpecImpl(
hopCount: json['hop_count'] as int,
stability: Stability.fromJson(json['stability']),
sequencing: Sequencing.fromJson(json['sequencing']),
preferredRoute: json['preferred_route'] as String?,
);
Map<String, dynamic> _$$_SafetySpecToJson(_$_SafetySpec instance) =>
Map<String, dynamic> _$$SafetySpecImplToJson(_$SafetySpecImpl instance) =>
<String, dynamic>{
'hop_count': instance.hopCount,
'stability': instance.stability.toJson(),
@ -107,12 +112,13 @@ Map<String, dynamic> _$$_SafetySpecToJson(_$_SafetySpec instance) =>
'preferred_route': instance.preferredRoute,
};
_$_RouteBlob _$$_RouteBlobFromJson(Map<String, dynamic> json) => _$_RouteBlob(
_$RouteBlobImpl _$$RouteBlobImplFromJson(Map<String, dynamic> json) =>
_$RouteBlobImpl(
routeId: json['route_id'] as String,
blob: const Uint8ListJsonConverter().fromJson(json['blob']),
);
Map<String, dynamic> _$$_RouteBlobToJson(_$_RouteBlob instance) =>
Map<String, dynamic> _$$RouteBlobImplToJson(_$RouteBlobImpl instance) =>
<String, dynamic>{
'route_id': instance.routeId,
'blob': const Uint8ListJsonConverter().toJson(instance.blob),

View File

@ -335,7 +335,7 @@ class VeilidConfigNetwork with _$VeilidConfigNetwork {
required int maxConnectionsPerIp6Prefix,
required int maxConnectionsPerIp6PrefixSize,
required int maxConnectionFrequencyPerMin,
required int clientWhitelistTimeoutMs,
required int clientAllowlistTimeoutMs,
required int reverseConnectionReceiptTimeMs,
required int holePunchReceiptTimeMs,
required VeilidConfigRoutingTable routingTable,

File diff suppressed because it is too large Load Diff

View File

@ -6,31 +6,31 @@ part of 'veilid_config.dart';
// JsonSerializableGenerator
// **************************************************************************
_$_VeilidFFIConfigLoggingTerminal _$$_VeilidFFIConfigLoggingTerminalFromJson(
Map<String, dynamic> json) =>
_$_VeilidFFIConfigLoggingTerminal(
enabled: json['enabled'] as bool,
level: VeilidConfigLogLevel.fromJson(json['level']),
);
_$VeilidFFIConfigLoggingTerminalImpl
_$$VeilidFFIConfigLoggingTerminalImplFromJson(Map<String, dynamic> json) =>
_$VeilidFFIConfigLoggingTerminalImpl(
enabled: json['enabled'] as bool,
level: VeilidConfigLogLevel.fromJson(json['level']),
);
Map<String, dynamic> _$$_VeilidFFIConfigLoggingTerminalToJson(
_$_VeilidFFIConfigLoggingTerminal instance) =>
Map<String, dynamic> _$$VeilidFFIConfigLoggingTerminalImplToJson(
_$VeilidFFIConfigLoggingTerminalImpl instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'level': instance.level.toJson(),
};
_$_VeilidFFIConfigLoggingOtlp _$$_VeilidFFIConfigLoggingOtlpFromJson(
_$VeilidFFIConfigLoggingOtlpImpl _$$VeilidFFIConfigLoggingOtlpImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidFFIConfigLoggingOtlp(
_$VeilidFFIConfigLoggingOtlpImpl(
enabled: json['enabled'] as bool,
level: VeilidConfigLogLevel.fromJson(json['level']),
grpcEndpoint: json['grpc_endpoint'] as String,
serviceName: json['service_name'] as String,
);
Map<String, dynamic> _$$_VeilidFFIConfigLoggingOtlpToJson(
_$_VeilidFFIConfigLoggingOtlp instance) =>
Map<String, dynamic> _$$VeilidFFIConfigLoggingOtlpImplToJson(
_$VeilidFFIConfigLoggingOtlpImpl instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'level': instance.level.toJson(),
@ -38,57 +38,60 @@ Map<String, dynamic> _$$_VeilidFFIConfigLoggingOtlpToJson(
'service_name': instance.serviceName,
};
_$_VeilidFFIConfigLoggingApi _$$_VeilidFFIConfigLoggingApiFromJson(
_$VeilidFFIConfigLoggingApiImpl _$$VeilidFFIConfigLoggingApiImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidFFIConfigLoggingApi(
_$VeilidFFIConfigLoggingApiImpl(
enabled: json['enabled'] as bool,
level: VeilidConfigLogLevel.fromJson(json['level']),
);
Map<String, dynamic> _$$_VeilidFFIConfigLoggingApiToJson(
_$_VeilidFFIConfigLoggingApi instance) =>
Map<String, dynamic> _$$VeilidFFIConfigLoggingApiImplToJson(
_$VeilidFFIConfigLoggingApiImpl instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'level': instance.level.toJson(),
};
_$_VeilidFFIConfigLogging _$$_VeilidFFIConfigLoggingFromJson(
_$VeilidFFIConfigLoggingImpl _$$VeilidFFIConfigLoggingImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidFFIConfigLogging(
_$VeilidFFIConfigLoggingImpl(
terminal: VeilidFFIConfigLoggingTerminal.fromJson(json['terminal']),
otlp: VeilidFFIConfigLoggingOtlp.fromJson(json['otlp']),
api: VeilidFFIConfigLoggingApi.fromJson(json['api']),
);
Map<String, dynamic> _$$_VeilidFFIConfigLoggingToJson(
_$_VeilidFFIConfigLogging instance) =>
Map<String, dynamic> _$$VeilidFFIConfigLoggingImplToJson(
_$VeilidFFIConfigLoggingImpl instance) =>
<String, dynamic>{
'terminal': instance.terminal.toJson(),
'otlp': instance.otlp.toJson(),
'api': instance.api.toJson(),
};
_$_VeilidFFIConfig _$$_VeilidFFIConfigFromJson(Map<String, dynamic> json) =>
_$_VeilidFFIConfig(
_$VeilidFFIConfigImpl _$$VeilidFFIConfigImplFromJson(
Map<String, dynamic> json) =>
_$VeilidFFIConfigImpl(
logging: VeilidFFIConfigLogging.fromJson(json['logging']),
);
Map<String, dynamic> _$$_VeilidFFIConfigToJson(_$_VeilidFFIConfig instance) =>
Map<String, dynamic> _$$VeilidFFIConfigImplToJson(
_$VeilidFFIConfigImpl instance) =>
<String, dynamic>{
'logging': instance.logging.toJson(),
};
_$_VeilidWASMConfigLoggingPerformance
_$$_VeilidWASMConfigLoggingPerformanceFromJson(Map<String, dynamic> json) =>
_$_VeilidWASMConfigLoggingPerformance(
_$VeilidWASMConfigLoggingPerformanceImpl
_$$VeilidWASMConfigLoggingPerformanceImplFromJson(
Map<String, dynamic> json) =>
_$VeilidWASMConfigLoggingPerformanceImpl(
enabled: json['enabled'] as bool,
level: VeilidConfigLogLevel.fromJson(json['level']),
logsInTimings: json['logs_in_timings'] as bool,
logsInConsole: json['logs_in_console'] as bool,
);
Map<String, dynamic> _$$_VeilidWASMConfigLoggingPerformanceToJson(
_$_VeilidWASMConfigLoggingPerformance instance) =>
Map<String, dynamic> _$$VeilidWASMConfigLoggingPerformanceImplToJson(
_$VeilidWASMConfigLoggingPerformanceImpl instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'level': instance.level.toJson(),
@ -96,101 +99,108 @@ Map<String, dynamic> _$$_VeilidWASMConfigLoggingPerformanceToJson(
'logs_in_console': instance.logsInConsole,
};
_$_VeilidWASMConfigLoggingApi _$$_VeilidWASMConfigLoggingApiFromJson(
_$VeilidWASMConfigLoggingApiImpl _$$VeilidWASMConfigLoggingApiImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidWASMConfigLoggingApi(
_$VeilidWASMConfigLoggingApiImpl(
enabled: json['enabled'] as bool,
level: VeilidConfigLogLevel.fromJson(json['level']),
);
Map<String, dynamic> _$$_VeilidWASMConfigLoggingApiToJson(
_$_VeilidWASMConfigLoggingApi instance) =>
Map<String, dynamic> _$$VeilidWASMConfigLoggingApiImplToJson(
_$VeilidWASMConfigLoggingApiImpl instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'level': instance.level.toJson(),
};
_$_VeilidWASMConfigLogging _$$_VeilidWASMConfigLoggingFromJson(
_$VeilidWASMConfigLoggingImpl _$$VeilidWASMConfigLoggingImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidWASMConfigLogging(
_$VeilidWASMConfigLoggingImpl(
performance:
VeilidWASMConfigLoggingPerformance.fromJson(json['performance']),
api: VeilidWASMConfigLoggingApi.fromJson(json['api']),
);
Map<String, dynamic> _$$_VeilidWASMConfigLoggingToJson(
_$_VeilidWASMConfigLogging instance) =>
Map<String, dynamic> _$$VeilidWASMConfigLoggingImplToJson(
_$VeilidWASMConfigLoggingImpl instance) =>
<String, dynamic>{
'performance': instance.performance.toJson(),
'api': instance.api.toJson(),
};
_$_VeilidWASMConfig _$$_VeilidWASMConfigFromJson(Map<String, dynamic> json) =>
_$_VeilidWASMConfig(
_$VeilidWASMConfigImpl _$$VeilidWASMConfigImplFromJson(
Map<String, dynamic> json) =>
_$VeilidWASMConfigImpl(
logging: VeilidWASMConfigLogging.fromJson(json['logging']),
);
Map<String, dynamic> _$$_VeilidWASMConfigToJson(_$_VeilidWASMConfig instance) =>
Map<String, dynamic> _$$VeilidWASMConfigImplToJson(
_$VeilidWASMConfigImpl instance) =>
<String, dynamic>{
'logging': instance.logging.toJson(),
};
_$_VeilidConfigHTTPS _$$_VeilidConfigHTTPSFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigHTTPS(
enabled: json['enabled'] as bool,
listenAddress: json['listen_address'] as String,
path: json['path'] as String,
url: json['url'] as String?,
);
Map<String, dynamic> _$$_VeilidConfigHTTPSToJson(
_$_VeilidConfigHTTPS instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'listen_address': instance.listenAddress,
'path': instance.path,
'url': instance.url,
};
_$_VeilidConfigHTTP _$$_VeilidConfigHTTPFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigHTTP(
enabled: json['enabled'] as bool,
listenAddress: json['listen_address'] as String,
path: json['path'] as String,
url: json['url'] as String?,
);
Map<String, dynamic> _$$_VeilidConfigHTTPToJson(_$_VeilidConfigHTTP instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'listen_address': instance.listenAddress,
'path': instance.path,
'url': instance.url,
};
_$_VeilidConfigApplication _$$_VeilidConfigApplicationFromJson(
_$VeilidConfigHTTPSImpl _$$VeilidConfigHTTPSImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidConfigApplication(
_$VeilidConfigHTTPSImpl(
enabled: json['enabled'] as bool,
listenAddress: json['listen_address'] as String,
path: json['path'] as String,
url: json['url'] as String?,
);
Map<String, dynamic> _$$VeilidConfigHTTPSImplToJson(
_$VeilidConfigHTTPSImpl instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'listen_address': instance.listenAddress,
'path': instance.path,
'url': instance.url,
};
_$VeilidConfigHTTPImpl _$$VeilidConfigHTTPImplFromJson(
Map<String, dynamic> json) =>
_$VeilidConfigHTTPImpl(
enabled: json['enabled'] as bool,
listenAddress: json['listen_address'] as String,
path: json['path'] as String,
url: json['url'] as String?,
);
Map<String, dynamic> _$$VeilidConfigHTTPImplToJson(
_$VeilidConfigHTTPImpl instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'listen_address': instance.listenAddress,
'path': instance.path,
'url': instance.url,
};
_$VeilidConfigApplicationImpl _$$VeilidConfigApplicationImplFromJson(
Map<String, dynamic> json) =>
_$VeilidConfigApplicationImpl(
https: VeilidConfigHTTPS.fromJson(json['https']),
http: VeilidConfigHTTP.fromJson(json['http']),
);
Map<String, dynamic> _$$_VeilidConfigApplicationToJson(
_$_VeilidConfigApplication instance) =>
Map<String, dynamic> _$$VeilidConfigApplicationImplToJson(
_$VeilidConfigApplicationImpl instance) =>
<String, dynamic>{
'https': instance.https.toJson(),
'http': instance.http.toJson(),
};
_$_VeilidConfigUDP _$$_VeilidConfigUDPFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigUDP(
_$VeilidConfigUDPImpl _$$VeilidConfigUDPImplFromJson(
Map<String, dynamic> json) =>
_$VeilidConfigUDPImpl(
enabled: json['enabled'] as bool,
socketPoolSize: json['socket_pool_size'] as int,
listenAddress: json['listen_address'] as String,
publicAddress: json['public_address'] as String?,
);
Map<String, dynamic> _$$_VeilidConfigUDPToJson(_$_VeilidConfigUDP instance) =>
Map<String, dynamic> _$$VeilidConfigUDPImplToJson(
_$VeilidConfigUDPImpl instance) =>
<String, dynamic>{
'enabled': instance.enabled,
'socket_pool_size': instance.socketPoolSize,
@ -198,8 +208,9 @@ Map<String, dynamic> _$$_VeilidConfigUDPToJson(_$_VeilidConfigUDP instance) =>
'public_address': instance.publicAddress,
};
_$_VeilidConfigTCP _$$_VeilidConfigTCPFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigTCP(
_$VeilidConfigTCPImpl _$$VeilidConfigTCPImplFromJson(
Map<String, dynamic> json) =>
_$VeilidConfigTCPImpl(
connect: json['connect'] as bool,
listen: json['listen'] as bool,
maxConnections: json['max_connections'] as int,
@ -207,7 +218,8 @@ _$_VeilidConfigTCP _$$_VeilidConfigTCPFromJson(Map<String, dynamic> json) =>
publicAddress: json['public_address'] as String?,
);
Map<String, dynamic> _$$_VeilidConfigTCPToJson(_$_VeilidConfigTCP instance) =>
Map<String, dynamic> _$$VeilidConfigTCPImplToJson(
_$VeilidConfigTCPImpl instance) =>
<String, dynamic>{
'connect': instance.connect,
'listen': instance.listen,
@ -216,8 +228,8 @@ Map<String, dynamic> _$$_VeilidConfigTCPToJson(_$_VeilidConfigTCP instance) =>
'public_address': instance.publicAddress,
};
_$_VeilidConfigWS _$$_VeilidConfigWSFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigWS(
_$VeilidConfigWSImpl _$$VeilidConfigWSImplFromJson(Map<String, dynamic> json) =>
_$VeilidConfigWSImpl(
connect: json['connect'] as bool,
listen: json['listen'] as bool,
maxConnections: json['max_connections'] as int,
@ -226,7 +238,8 @@ _$_VeilidConfigWS _$$_VeilidConfigWSFromJson(Map<String, dynamic> json) =>
url: json['url'] as String?,
);
Map<String, dynamic> _$$_VeilidConfigWSToJson(_$_VeilidConfigWS instance) =>
Map<String, dynamic> _$$VeilidConfigWSImplToJson(
_$VeilidConfigWSImpl instance) =>
<String, dynamic>{
'connect': instance.connect,
'listen': instance.listen,
@ -236,37 +249,39 @@ Map<String, dynamic> _$$_VeilidConfigWSToJson(_$_VeilidConfigWS instance) =>
'url': instance.url,
};
_$_VeilidConfigWSS _$$_VeilidConfigWSSFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigWSS(
connect: json['connect'] as bool,
listen: json['listen'] as bool,
maxConnections: json['max_connections'] as int,
listenAddress: json['listen_address'] as String,
path: json['path'] as String,
url: json['url'] as String?,
);
Map<String, dynamic> _$$_VeilidConfigWSSToJson(_$_VeilidConfigWSS instance) =>
<String, dynamic>{
'connect': instance.connect,
'listen': instance.listen,
'max_connections': instance.maxConnections,
'listen_address': instance.listenAddress,
'path': instance.path,
'url': instance.url,
};
_$_VeilidConfigProtocol _$$_VeilidConfigProtocolFromJson(
_$VeilidConfigWSSImpl _$$VeilidConfigWSSImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidConfigProtocol(
_$VeilidConfigWSSImpl(
connect: json['connect'] as bool,
listen: json['listen'] as bool,
maxConnections: json['max_connections'] as int,
listenAddress: json['listen_address'] as String,
path: json['path'] as String,
url: json['url'] as String?,
);
Map<String, dynamic> _$$VeilidConfigWSSImplToJson(
_$VeilidConfigWSSImpl instance) =>
<String, dynamic>{
'connect': instance.connect,
'listen': instance.listen,
'max_connections': instance.maxConnections,
'listen_address': instance.listenAddress,
'path': instance.path,
'url': instance.url,
};
_$VeilidConfigProtocolImpl _$$VeilidConfigProtocolImplFromJson(
Map<String, dynamic> json) =>
_$VeilidConfigProtocolImpl(
udp: VeilidConfigUDP.fromJson(json['udp']),
tcp: VeilidConfigTCP.fromJson(json['tcp']),
ws: VeilidConfigWS.fromJson(json['ws']),
wss: VeilidConfigWSS.fromJson(json['wss']),
);
Map<String, dynamic> _$$_VeilidConfigProtocolToJson(
_$_VeilidConfigProtocol instance) =>
Map<String, dynamic> _$$VeilidConfigProtocolImplToJson(
_$VeilidConfigProtocolImpl instance) =>
<String, dynamic>{
'udp': instance.udp.toJson(),
'tcp': instance.tcp.toJson(),
@ -274,22 +289,25 @@ Map<String, dynamic> _$$_VeilidConfigProtocolToJson(
'wss': instance.wss.toJson(),
};
_$_VeilidConfigTLS _$$_VeilidConfigTLSFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigTLS(
_$VeilidConfigTLSImpl _$$VeilidConfigTLSImplFromJson(
Map<String, dynamic> json) =>
_$VeilidConfigTLSImpl(
certificatePath: json['certificate_path'] as String,
privateKeyPath: json['private_key_path'] as String,
connectionInitialTimeoutMs: json['connection_initial_timeout_ms'] as int,
);
Map<String, dynamic> _$$_VeilidConfigTLSToJson(_$_VeilidConfigTLS instance) =>
Map<String, dynamic> _$$VeilidConfigTLSImplToJson(
_$VeilidConfigTLSImpl instance) =>
<String, dynamic>{
'certificate_path': instance.certificatePath,
'private_key_path': instance.privateKeyPath,
'connection_initial_timeout_ms': instance.connectionInitialTimeoutMs,
};
_$_VeilidConfigDHT _$$_VeilidConfigDHTFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigDHT(
_$VeilidConfigDHTImpl _$$VeilidConfigDHTImplFromJson(
Map<String, dynamic> json) =>
_$VeilidConfigDHTImpl(
resolveNodeTimeoutMs: json['resolve_node_timeout_ms'] as int,
resolveNodeCount: json['resolve_node_count'] as int,
resolveNodeFanout: json['resolve_node_fanout'] as int,
@ -314,7 +332,8 @@ _$_VeilidConfigDHT _$$_VeilidConfigDHTFromJson(Map<String, dynamic> json) =>
remoteMaxStorageSpaceMb: json['remote_max_storage_space_mb'] as int,
);
Map<String, dynamic> _$$_VeilidConfigDHTToJson(_$_VeilidConfigDHT instance) =>
Map<String, dynamic> _$$VeilidConfigDHTImplToJson(
_$VeilidConfigDHTImpl instance) =>
<String, dynamic>{
'resolve_node_timeout_ms': instance.resolveNodeTimeoutMs,
'resolve_node_count': instance.resolveNodeCount,
@ -339,8 +358,9 @@ Map<String, dynamic> _$$_VeilidConfigDHTToJson(_$_VeilidConfigDHT instance) =>
'remote_max_storage_space_mb': instance.remoteMaxStorageSpaceMb,
};
_$_VeilidConfigRPC _$$_VeilidConfigRPCFromJson(Map<String, dynamic> json) =>
_$_VeilidConfigRPC(
_$VeilidConfigRPCImpl _$$VeilidConfigRPCImplFromJson(
Map<String, dynamic> json) =>
_$VeilidConfigRPCImpl(
concurrency: json['concurrency'] as int,
queueSize: json['queue_size'] as int,
timeoutMs: json['timeout_ms'] as int,
@ -350,7 +370,8 @@ _$_VeilidConfigRPC _$$_VeilidConfigRPCFromJson(Map<String, dynamic> json) =>
maxTimestampAheadMs: json['max_timestamp_ahead_ms'] as int?,
);
Map<String, dynamic> _$$_VeilidConfigRPCToJson(_$_VeilidConfigRPC instance) =>
Map<String, dynamic> _$$VeilidConfigRPCImplToJson(
_$VeilidConfigRPCImpl instance) =>
<String, dynamic>{
'concurrency': instance.concurrency,
'queue_size': instance.queueSize,
@ -361,9 +382,9 @@ Map<String, dynamic> _$$_VeilidConfigRPCToJson(_$_VeilidConfigRPC instance) =>
'max_timestamp_ahead_ms': instance.maxTimestampAheadMs,
};
_$_VeilidConfigRoutingTable _$$_VeilidConfigRoutingTableFromJson(
_$VeilidConfigRoutingTableImpl _$$VeilidConfigRoutingTableImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidConfigRoutingTable(
_$VeilidConfigRoutingTableImpl(
nodeId: (json['node_id'] as List<dynamic>)
.map(Typed<FixedEncodedString43>.fromJson)
.toList(),
@ -379,8 +400,8 @@ _$_VeilidConfigRoutingTable _$$_VeilidConfigRoutingTableFromJson(
limitAttachedWeak: json['limit_attached_weak'] as int,
);
Map<String, dynamic> _$$_VeilidConfigRoutingTableToJson(
_$_VeilidConfigRoutingTable instance) =>
Map<String, dynamic> _$$VeilidConfigRoutingTableImplToJson(
_$VeilidConfigRoutingTableImpl instance) =>
<String, dynamic>{
'node_id': instance.nodeId.map((e) => e.toJson()).toList(),
'node_id_secret': instance.nodeIdSecret.map((e) => e.toJson()).toList(),
@ -392,9 +413,9 @@ Map<String, dynamic> _$$_VeilidConfigRoutingTableToJson(
'limit_attached_weak': instance.limitAttachedWeak,
};
_$_VeilidConfigNetwork _$$_VeilidConfigNetworkFromJson(
_$VeilidConfigNetworkImpl _$$VeilidConfigNetworkImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidConfigNetwork(
_$VeilidConfigNetworkImpl(
connectionInitialTimeoutMs: json['connection_initial_timeout_ms'] as int,
connectionInactivityTimeoutMs:
json['connection_inactivity_timeout_ms'] as int,
@ -404,7 +425,7 @@ _$_VeilidConfigNetwork _$$_VeilidConfigNetworkFromJson(
json['max_connections_per_ip6_prefix_size'] as int,
maxConnectionFrequencyPerMin:
json['max_connection_frequency_per_min'] as int,
clientWhitelistTimeoutMs: json['client_whitelist_timeout_ms'] as int,
clientAllowlistTimeoutMs: json['client_allowlist_timeout_ms'] as int,
reverseConnectionReceiptTimeMs:
json['reverse_connection_receipt_time_ms'] as int,
holePunchReceiptTimeMs: json['hole_punch_receipt_time_ms'] as int,
@ -420,8 +441,8 @@ _$_VeilidConfigNetwork _$$_VeilidConfigNetworkFromJson(
networkKeyPassword: json['network_key_password'] as String?,
);
Map<String, dynamic> _$$_VeilidConfigNetworkToJson(
_$_VeilidConfigNetwork instance) =>
Map<String, dynamic> _$$VeilidConfigNetworkImplToJson(
_$VeilidConfigNetworkImpl instance) =>
<String, dynamic>{
'connection_initial_timeout_ms': instance.connectionInitialTimeoutMs,
'connection_inactivity_timeout_ms':
@ -431,7 +452,7 @@ Map<String, dynamic> _$$_VeilidConfigNetworkToJson(
'max_connections_per_ip6_prefix_size':
instance.maxConnectionsPerIp6PrefixSize,
'max_connection_frequency_per_min': instance.maxConnectionFrequencyPerMin,
'client_whitelist_timeout_ms': instance.clientWhitelistTimeoutMs,
'client_allowlist_timeout_ms': instance.clientAllowlistTimeoutMs,
'reverse_connection_receipt_time_ms':
instance.reverseConnectionReceiptTimeMs,
'hole_punch_receipt_time_ms': instance.holePunchReceiptTimeMs,
@ -447,37 +468,37 @@ Map<String, dynamic> _$$_VeilidConfigNetworkToJson(
'network_key_password': instance.networkKeyPassword,
};
_$_VeilidConfigTableStore _$$_VeilidConfigTableStoreFromJson(
_$VeilidConfigTableStoreImpl _$$VeilidConfigTableStoreImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidConfigTableStore(
_$VeilidConfigTableStoreImpl(
directory: json['directory'] as String,
delete: json['delete'] as bool,
);
Map<String, dynamic> _$$_VeilidConfigTableStoreToJson(
_$_VeilidConfigTableStore instance) =>
Map<String, dynamic> _$$VeilidConfigTableStoreImplToJson(
_$VeilidConfigTableStoreImpl instance) =>
<String, dynamic>{
'directory': instance.directory,
'delete': instance.delete,
};
_$_VeilidConfigBlockStore _$$_VeilidConfigBlockStoreFromJson(
_$VeilidConfigBlockStoreImpl _$$VeilidConfigBlockStoreImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidConfigBlockStore(
_$VeilidConfigBlockStoreImpl(
directory: json['directory'] as String,
delete: json['delete'] as bool,
);
Map<String, dynamic> _$$_VeilidConfigBlockStoreToJson(
_$_VeilidConfigBlockStore instance) =>
Map<String, dynamic> _$$VeilidConfigBlockStoreImplToJson(
_$VeilidConfigBlockStoreImpl instance) =>
<String, dynamic>{
'directory': instance.directory,
'delete': instance.delete,
};
_$_VeilidConfigProtectedStore _$$_VeilidConfigProtectedStoreFromJson(
_$VeilidConfigProtectedStoreImpl _$$VeilidConfigProtectedStoreImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidConfigProtectedStore(
_$VeilidConfigProtectedStoreImpl(
allowInsecureFallback: json['allow_insecure_fallback'] as bool,
alwaysUseInsecureStorage: json['always_use_insecure_storage'] as bool,
directory: json['directory'] as String,
@ -488,8 +509,8 @@ _$_VeilidConfigProtectedStore _$$_VeilidConfigProtectedStoreFromJson(
json['new_device_encryption_key_password'] as String?,
);
Map<String, dynamic> _$$_VeilidConfigProtectedStoreToJson(
_$_VeilidConfigProtectedStore instance) =>
Map<String, dynamic> _$$VeilidConfigProtectedStoreImplToJson(
_$VeilidConfigProtectedStoreImpl instance) =>
<String, dynamic>{
'allow_insecure_fallback': instance.allowInsecureFallback,
'always_use_insecure_storage': instance.alwaysUseInsecureStorage,
@ -500,21 +521,21 @@ Map<String, dynamic> _$$_VeilidConfigProtectedStoreToJson(
instance.newDeviceEncryptionKeyPassword,
};
_$_VeilidConfigCapabilities _$$_VeilidConfigCapabilitiesFromJson(
_$VeilidConfigCapabilitiesImpl _$$VeilidConfigCapabilitiesImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidConfigCapabilities(
_$VeilidConfigCapabilitiesImpl(
disable:
(json['disable'] as List<dynamic>).map((e) => e as String).toList(),
);
Map<String, dynamic> _$$_VeilidConfigCapabilitiesToJson(
_$_VeilidConfigCapabilities instance) =>
Map<String, dynamic> _$$VeilidConfigCapabilitiesImplToJson(
_$VeilidConfigCapabilitiesImpl instance) =>
<String, dynamic>{
'disable': instance.disable,
};
_$_VeilidConfig _$$_VeilidConfigFromJson(Map<String, dynamic> json) =>
_$_VeilidConfig(
_$VeilidConfigImpl _$$VeilidConfigImplFromJson(Map<String, dynamic> json) =>
_$VeilidConfigImpl(
programName: json['program_name'] as String,
namespace: json['namespace'] as String,
capabilities: VeilidConfigCapabilities.fromJson(json['capabilities']),
@ -525,7 +546,7 @@ _$_VeilidConfig _$$_VeilidConfigFromJson(Map<String, dynamic> json) =>
network: VeilidConfigNetwork.fromJson(json['network']),
);
Map<String, dynamic> _$$_VeilidConfigToJson(_$_VeilidConfig instance) =>
Map<String, dynamic> _$$VeilidConfigImplToJson(_$VeilidConfigImpl instance) =>
<String, dynamic>{
'program_name': instance.programName,
'namespace': instance.namespace,

File diff suppressed because it is too large Load Diff

View File

@ -6,29 +6,29 @@ part of 'veilid_state.dart';
// JsonSerializableGenerator
// **************************************************************************
_$_LatencyStats _$$_LatencyStatsFromJson(Map<String, dynamic> json) =>
_$_LatencyStats(
_$LatencyStatsImpl _$$LatencyStatsImplFromJson(Map<String, dynamic> json) =>
_$LatencyStatsImpl(
fastest: TimestampDuration.fromJson(json['fastest']),
average: TimestampDuration.fromJson(json['average']),
slowest: TimestampDuration.fromJson(json['slowest']),
);
Map<String, dynamic> _$$_LatencyStatsToJson(_$_LatencyStats instance) =>
Map<String, dynamic> _$$LatencyStatsImplToJson(_$LatencyStatsImpl instance) =>
<String, dynamic>{
'fastest': instance.fastest.toJson(),
'average': instance.average.toJson(),
'slowest': instance.slowest.toJson(),
};
_$_TransferStats _$$_TransferStatsFromJson(Map<String, dynamic> json) =>
_$_TransferStats(
_$TransferStatsImpl _$$TransferStatsImplFromJson(Map<String, dynamic> json) =>
_$TransferStatsImpl(
total: BigInt.parse(json['total'] as String),
maximum: BigInt.parse(json['maximum'] as String),
average: BigInt.parse(json['average'] as String),
minimum: BigInt.parse(json['minimum'] as String),
);
Map<String, dynamic> _$$_TransferStatsToJson(_$_TransferStats instance) =>
Map<String, dynamic> _$$TransferStatsImplToJson(_$TransferStatsImpl instance) =>
<String, dynamic>{
'total': instance.total.toString(),
'maximum': instance.maximum.toString(),
@ -36,21 +36,22 @@ Map<String, dynamic> _$$_TransferStatsToJson(_$_TransferStats instance) =>
'minimum': instance.minimum.toString(),
};
_$_TransferStatsDownUp _$$_TransferStatsDownUpFromJson(
_$TransferStatsDownUpImpl _$$TransferStatsDownUpImplFromJson(
Map<String, dynamic> json) =>
_$_TransferStatsDownUp(
_$TransferStatsDownUpImpl(
down: TransferStats.fromJson(json['down']),
up: TransferStats.fromJson(json['up']),
);
Map<String, dynamic> _$$_TransferStatsDownUpToJson(
_$_TransferStatsDownUp instance) =>
Map<String, dynamic> _$$TransferStatsDownUpImplToJson(
_$TransferStatsDownUpImpl instance) =>
<String, dynamic>{
'down': instance.down.toJson(),
'up': instance.up.toJson(),
};
_$_RPCStats _$$_RPCStatsFromJson(Map<String, dynamic> json) => _$_RPCStats(
_$RPCStatsImpl _$$RPCStatsImplFromJson(Map<String, dynamic> json) =>
_$RPCStatsImpl(
messagesSent: json['messages_sent'] as int,
messagesRcvd: json['messages_rcvd'] as int,
questionsInFlight: json['questions_in_flight'] as int,
@ -67,7 +68,7 @@ _$_RPCStats _$$_RPCStatsFromJson(Map<String, dynamic> json) => _$_RPCStats(
failedToSend: json['failed_to_send'] as int,
);
Map<String, dynamic> _$$_RPCStatsToJson(_$_RPCStats instance) =>
Map<String, dynamic> _$$RPCStatsImplToJson(_$RPCStatsImpl instance) =>
<String, dynamic>{
'messages_sent': instance.messagesSent,
'messages_rcvd': instance.messagesRcvd,
@ -79,7 +80,8 @@ Map<String, dynamic> _$$_RPCStatsToJson(_$_RPCStats instance) =>
'failed_to_send': instance.failedToSend,
};
_$_PeerStats _$$_PeerStatsFromJson(Map<String, dynamic> json) => _$_PeerStats(
_$PeerStatsImpl _$$PeerStatsImplFromJson(Map<String, dynamic> json) =>
_$PeerStatsImpl(
timeAdded: Timestamp.fromJson(json['time_added']),
rpcStats: RPCStats.fromJson(json['rpc_stats']),
transfer: TransferStatsDownUp.fromJson(json['transfer']),
@ -88,7 +90,7 @@ _$_PeerStats _$$_PeerStatsFromJson(Map<String, dynamic> json) => _$_PeerStats(
: LatencyStats.fromJson(json['latency']),
);
Map<String, dynamic> _$$_PeerStatsToJson(_$_PeerStats instance) =>
Map<String, dynamic> _$$PeerStatsImplToJson(_$PeerStatsImpl instance) =>
<String, dynamic>{
'time_added': instance.timeAdded.toJson(),
'rpc_stats': instance.rpcStats.toJson(),
@ -96,8 +98,8 @@ Map<String, dynamic> _$$_PeerStatsToJson(_$_PeerStats instance) =>
'latency': instance.latency?.toJson(),
};
_$_PeerTableData _$$_PeerTableDataFromJson(Map<String, dynamic> json) =>
_$_PeerTableData(
_$PeerTableDataImpl _$$PeerTableDataImplFromJson(Map<String, dynamic> json) =>
_$PeerTableDataImpl(
nodeIds: (json['node_ids'] as List<dynamic>)
.map(Typed<FixedEncodedString43>.fromJson)
.toList(),
@ -105,21 +107,22 @@ _$_PeerTableData _$$_PeerTableDataFromJson(Map<String, dynamic> json) =>
peerStats: PeerStats.fromJson(json['peer_stats']),
);
Map<String, dynamic> _$$_PeerTableDataToJson(_$_PeerTableData instance) =>
Map<String, dynamic> _$$PeerTableDataImplToJson(_$PeerTableDataImpl instance) =>
<String, dynamic>{
'node_ids': instance.nodeIds.map((e) => e.toJson()).toList(),
'peer_address': instance.peerAddress,
'peer_stats': instance.peerStats.toJson(),
};
_$VeilidLog _$$VeilidLogFromJson(Map<String, dynamic> json) => _$VeilidLog(
_$VeilidLogImpl _$$VeilidLogImplFromJson(Map<String, dynamic> json) =>
_$VeilidLogImpl(
logLevel: VeilidLogLevel.fromJson(json['log_level']),
message: json['message'] as String,
backtrace: json['backtrace'] as String?,
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$VeilidLogToJson(_$VeilidLog instance) =>
Map<String, dynamic> _$$VeilidLogImplToJson(_$VeilidLogImpl instance) =>
<String, dynamic>{
'log_level': instance.logLevel.toJson(),
'message': instance.message,
@ -127,8 +130,9 @@ Map<String, dynamic> _$$VeilidLogToJson(_$VeilidLog instance) =>
'kind': instance.$type,
};
_$VeilidAppMessage _$$VeilidAppMessageFromJson(Map<String, dynamic> json) =>
_$VeilidAppMessage(
_$VeilidAppMessageImpl _$$VeilidAppMessageImplFromJson(
Map<String, dynamic> json) =>
_$VeilidAppMessageImpl(
message: const Uint8ListJsonConverter().fromJson(json['message']),
sender: json['sender'] == null
? null
@ -136,15 +140,16 @@ _$VeilidAppMessage _$$VeilidAppMessageFromJson(Map<String, dynamic> json) =>
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$VeilidAppMessageToJson(_$VeilidAppMessage instance) =>
Map<String, dynamic> _$$VeilidAppMessageImplToJson(
_$VeilidAppMessageImpl instance) =>
<String, dynamic>{
'message': const Uint8ListJsonConverter().toJson(instance.message),
'sender': instance.sender?.toJson(),
'kind': instance.$type,
};
_$VeilidAppCall _$$VeilidAppCallFromJson(Map<String, dynamic> json) =>
_$VeilidAppCall(
_$VeilidAppCallImpl _$$VeilidAppCallImplFromJson(Map<String, dynamic> json) =>
_$VeilidAppCallImpl(
message: const Uint8ListJsonConverter().fromJson(json['message']),
callId: json['call_id'] as String,
sender: json['sender'] == null
@ -153,7 +158,7 @@ _$VeilidAppCall _$$VeilidAppCallFromJson(Map<String, dynamic> json) =>
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$VeilidAppCallToJson(_$VeilidAppCall instance) =>
Map<String, dynamic> _$$VeilidAppCallImplToJson(_$VeilidAppCallImpl instance) =>
<String, dynamic>{
'message': const Uint8ListJsonConverter().toJson(instance.message),
'call_id': instance.callId,
@ -161,17 +166,17 @@ Map<String, dynamic> _$$VeilidAppCallToJson(_$VeilidAppCall instance) =>
'kind': instance.$type,
};
_$VeilidUpdateAttachment _$$VeilidUpdateAttachmentFromJson(
_$VeilidUpdateAttachmentImpl _$$VeilidUpdateAttachmentImplFromJson(
Map<String, dynamic> json) =>
_$VeilidUpdateAttachment(
_$VeilidUpdateAttachmentImpl(
state: AttachmentState.fromJson(json['state']),
publicInternetReady: json['public_internet_ready'] as bool,
localNetworkReady: json['local_network_ready'] as bool,
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$VeilidUpdateAttachmentToJson(
_$VeilidUpdateAttachment instance) =>
Map<String, dynamic> _$$VeilidUpdateAttachmentImplToJson(
_$VeilidUpdateAttachmentImpl instance) =>
<String, dynamic>{
'state': instance.state.toJson(),
'public_internet_ready': instance.publicInternetReady,
@ -179,9 +184,9 @@ Map<String, dynamic> _$$VeilidUpdateAttachmentToJson(
'kind': instance.$type,
};
_$VeilidUpdateNetwork _$$VeilidUpdateNetworkFromJson(
_$VeilidUpdateNetworkImpl _$$VeilidUpdateNetworkImplFromJson(
Map<String, dynamic> json) =>
_$VeilidUpdateNetwork(
_$VeilidUpdateNetworkImpl(
started: json['started'] as bool,
bpsDown: BigInt.parse(json['bps_down'] as String),
bpsUp: BigInt.parse(json['bps_up'] as String),
@ -190,8 +195,8 @@ _$VeilidUpdateNetwork _$$VeilidUpdateNetworkFromJson(
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$VeilidUpdateNetworkToJson(
_$VeilidUpdateNetwork instance) =>
Map<String, dynamic> _$$VeilidUpdateNetworkImplToJson(
_$VeilidUpdateNetworkImpl instance) =>
<String, dynamic>{
'started': instance.started,
'bps_down': instance.bpsDown.toString(),
@ -200,22 +205,23 @@ Map<String, dynamic> _$$VeilidUpdateNetworkToJson(
'kind': instance.$type,
};
_$VeilidUpdateConfig _$$VeilidUpdateConfigFromJson(Map<String, dynamic> json) =>
_$VeilidUpdateConfig(
_$VeilidUpdateConfigImpl _$$VeilidUpdateConfigImplFromJson(
Map<String, dynamic> json) =>
_$VeilidUpdateConfigImpl(
config: VeilidConfig.fromJson(json['config']),
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$VeilidUpdateConfigToJson(
_$VeilidUpdateConfig instance) =>
Map<String, dynamic> _$$VeilidUpdateConfigImplToJson(
_$VeilidUpdateConfigImpl instance) =>
<String, dynamic>{
'config': instance.config.toJson(),
'kind': instance.$type,
};
_$VeilidUpdateRouteChange _$$VeilidUpdateRouteChangeFromJson(
_$VeilidUpdateRouteChangeImpl _$$VeilidUpdateRouteChangeImplFromJson(
Map<String, dynamic> json) =>
_$VeilidUpdateRouteChange(
_$VeilidUpdateRouteChangeImpl(
deadRoutes: (json['dead_routes'] as List<dynamic>)
.map((e) => e as String)
.toList(),
@ -225,17 +231,17 @@ _$VeilidUpdateRouteChange _$$VeilidUpdateRouteChangeFromJson(
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$VeilidUpdateRouteChangeToJson(
_$VeilidUpdateRouteChange instance) =>
Map<String, dynamic> _$$VeilidUpdateRouteChangeImplToJson(
_$VeilidUpdateRouteChangeImpl instance) =>
<String, dynamic>{
'dead_routes': instance.deadRoutes,
'dead_remote_routes': instance.deadRemoteRoutes,
'kind': instance.$type,
};
_$VeilidUpdateValueChange _$$VeilidUpdateValueChangeFromJson(
_$VeilidUpdateValueChangeImpl _$$VeilidUpdateValueChangeImplFromJson(
Map<String, dynamic> json) =>
_$VeilidUpdateValueChange(
_$VeilidUpdateValueChangeImpl(
key: Typed<FixedEncodedString43>.fromJson(json['key']),
subkeys: (json['subkeys'] as List<dynamic>)
.map(ValueSubkeyRange.fromJson)
@ -245,8 +251,8 @@ _$VeilidUpdateValueChange _$$VeilidUpdateValueChangeFromJson(
$type: json['kind'] as String?,
);
Map<String, dynamic> _$$VeilidUpdateValueChangeToJson(
_$VeilidUpdateValueChange instance) =>
Map<String, dynamic> _$$VeilidUpdateValueChangeImplToJson(
_$VeilidUpdateValueChangeImpl instance) =>
<String, dynamic>{
'key': instance.key.toJson(),
'subkeys': instance.subkeys.map((e) => e.toJson()).toList(),
@ -255,25 +261,25 @@ Map<String, dynamic> _$$VeilidUpdateValueChangeToJson(
'kind': instance.$type,
};
_$_VeilidStateAttachment _$$_VeilidStateAttachmentFromJson(
_$VeilidStateAttachmentImpl _$$VeilidStateAttachmentImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidStateAttachment(
_$VeilidStateAttachmentImpl(
state: AttachmentState.fromJson(json['state']),
publicInternetReady: json['public_internet_ready'] as bool,
localNetworkReady: json['local_network_ready'] as bool,
);
Map<String, dynamic> _$$_VeilidStateAttachmentToJson(
_$_VeilidStateAttachment instance) =>
Map<String, dynamic> _$$VeilidStateAttachmentImplToJson(
_$VeilidStateAttachmentImpl instance) =>
<String, dynamic>{
'state': instance.state.toJson(),
'public_internet_ready': instance.publicInternetReady,
'local_network_ready': instance.localNetworkReady,
};
_$_VeilidStateNetwork _$$_VeilidStateNetworkFromJson(
_$VeilidStateNetworkImpl _$$VeilidStateNetworkImplFromJson(
Map<String, dynamic> json) =>
_$_VeilidStateNetwork(
_$VeilidStateNetworkImpl(
started: json['started'] as bool,
bpsDown: BigInt.parse(json['bps_down'] as String),
bpsUp: BigInt.parse(json['bps_up'] as String),
@ -281,8 +287,8 @@ _$_VeilidStateNetwork _$$_VeilidStateNetworkFromJson(
(json['peers'] as List<dynamic>).map(PeerTableData.fromJson).toList(),
);
Map<String, dynamic> _$$_VeilidStateNetworkToJson(
_$_VeilidStateNetwork instance) =>
Map<String, dynamic> _$$VeilidStateNetworkImplToJson(
_$VeilidStateNetworkImpl instance) =>
<String, dynamic>{
'started': instance.started,
'bps_down': instance.bpsDown.toString(),
@ -290,25 +296,26 @@ Map<String, dynamic> _$$_VeilidStateNetworkToJson(
'peers': instance.peers.map((e) => e.toJson()).toList(),
};
_$_VeilidStateConfig _$$_VeilidStateConfigFromJson(Map<String, dynamic> json) =>
_$_VeilidStateConfig(
_$VeilidStateConfigImpl _$$VeilidStateConfigImplFromJson(
Map<String, dynamic> json) =>
_$VeilidStateConfigImpl(
config: VeilidConfig.fromJson(json['config']),
);
Map<String, dynamic> _$$_VeilidStateConfigToJson(
_$_VeilidStateConfig instance) =>
Map<String, dynamic> _$$VeilidStateConfigImplToJson(
_$VeilidStateConfigImpl instance) =>
<String, dynamic>{
'config': instance.config.toJson(),
};
_$_VeilidState _$$_VeilidStateFromJson(Map<String, dynamic> json) =>
_$_VeilidState(
_$VeilidStateImpl _$$VeilidStateImplFromJson(Map<String, dynamic> json) =>
_$VeilidStateImpl(
attachment: VeilidStateAttachment.fromJson(json['attachment']),
network: VeilidStateNetwork.fromJson(json['network']),
config: VeilidStateConfig.fromJson(json['config']),
);
Map<String, dynamic> _$$_VeilidStateToJson(_$_VeilidState instance) =>
Map<String, dynamic> _$$VeilidStateImplToJson(_$VeilidStateImpl instance) =>
<String, dynamic>{
'attachment': instance.attachment.toJson(),
'network': instance.network.toJson(),

View File

@ -194,7 +194,7 @@ class VeilidConfigNetwork(ConfigBase):
max_connections_per_ip6_prefix: int
max_connections_per_ip6_prefix_size: int
max_connection_frequency_per_min: int
client_whitelist_timeout_ms: int
client_allowlist_timeout_ms: int
reverse_connection_receipt_time_ms: int
hole_punch_receipt_time_ms: int
network_key_password: Optional[str]

View File

@ -3565,7 +3565,7 @@
"type": "object",
"required": [
"application",
"client_whitelist_timeout_ms",
"client_allowlist_timeout_ms",
"connection_inactivity_timeout_ms",
"connection_initial_timeout_ms",
"detect_address_changes",
@ -3587,7 +3587,7 @@
"application": {
"$ref": "#/definitions/VeilidConfigApplication"
},
"client_whitelist_timeout_ms": {
"client_allowlist_timeout_ms": {
"type": "integer",
"format": "uint32",
"minimum": 0.0

View File

@ -67,7 +67,7 @@ core:
max_connections_per_ip6_prefix: 32
max_connections_per_ip6_prefix_size: 56
max_connection_frequency_per_min: 128
client_whitelist_timeout_ms: 300000
client_allowlist_timeout_ms: 300000
reverse_connection_receipt_time_ms: 5000
hole_punch_receipt_time_ms: 5000
network_key_password: null
@ -588,7 +588,7 @@ pub struct Network {
pub max_connections_per_ip6_prefix: u32,
pub max_connections_per_ip6_prefix_size: u32,
pub max_connection_frequency_per_min: u32,
pub client_whitelist_timeout_ms: u32,
pub client_allowlist_timeout_ms: u32,
pub reverse_connection_receipt_time_ms: u32,
pub hole_punch_receipt_time_ms: u32,
pub network_key_password: Option<String>,
@ -1008,7 +1008,7 @@ impl Settings {
value
);
set_config_value!(inner.core.network.max_connection_frequency_per_min, value);
set_config_value!(inner.core.network.client_whitelist_timeout_ms, value);
set_config_value!(inner.core.network.client_allowlist_timeout_ms, value);
set_config_value!(inner.core.network.reverse_connection_receipt_time_ms, value);
set_config_value!(inner.core.network.hole_punch_receipt_time_ms, value);
set_config_value!(inner.core.network.network_key_password, value);
@ -1184,8 +1184,8 @@ impl Settings {
"network.max_connection_frequency_per_min" => Ok(Box::new(
inner.core.network.max_connection_frequency_per_min,
)),
"network.client_whitelist_timeout_ms" => {
Ok(Box::new(inner.core.network.client_whitelist_timeout_ms))
"network.client_allowlist_timeout_ms" => {
Ok(Box::new(inner.core.network.client_allowlist_timeout_ms))
}
"network.reverse_connection_receipt_time_ms" => Ok(Box::new(
inner.core.network.reverse_connection_receipt_time_ms,
@ -1594,7 +1594,7 @@ mod tests {
assert_eq!(s.core.network.max_connections_per_ip6_prefix, 32u32);
assert_eq!(s.core.network.max_connections_per_ip6_prefix_size, 56u32);
assert_eq!(s.core.network.max_connection_frequency_per_min, 128u32);
assert_eq!(s.core.network.client_whitelist_timeout_ms, 300_000u32);
assert_eq!(s.core.network.client_allowlist_timeout_ms, 300_000u32);
assert_eq!(s.core.network.reverse_connection_receipt_time_ms, 5_000u32);
assert_eq!(s.core.network.hole_punch_receipt_time_ms, 5_000u32);
assert_eq!(s.core.network.network_key_password, None);

View File

@ -44,7 +44,7 @@ export const veilidCoreStartupConfig = {
max_connections_per_ip6_prefix: 32,
max_connections_per_ip6_prefix_size: 56,
max_connection_frequency_per_min: 128,
client_whitelist_timeout_ms: 300000,
client_allowlist_timeout_ms: 300000,
reverse_connection_receipt_time_ms: 5000,
hole_punch_receipt_time_ms: 5000,
network_key_password: '',