diff --git a/CHANGELOG.md b/CHANGELOG.md index dd715195..55f883ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,8 @@ - Added 'tick lag' detection to check for missed watch updates - Added 'DHT Widening', separates consensus width (server side dht operation acceptance) from consensus count (client side), fixes [#435](https://gitlab.com/veilid/veilid/-/issues/435) - Deprecation of WSS protocol, closes [#487](https://gitlab.com/veilid/veilid/-/issues/487) + - Move node id and public key init to routing table + - VeilidConfig is now read-only and no longer requires a lock [#485](https://gitlab.com/veilid/veilid/-/issues/485) - veilid-python: - Migrated to 'uv' from 'poetry' diff --git a/veilid-core/src/network_manager/wasm/mod.rs b/veilid-core/src/network_manager/wasm/mod.rs index 7f591bfb..22a6673c 100644 --- a/veilid-core/src/network_manager/wasm/mod.rs +++ b/veilid-core/src/network_manager/wasm/mod.rs @@ -137,9 +137,7 @@ impl Network { self.record_dial_info_failure(dial_info.clone(), async move { let data_len = data.len(); - let timeout_ms = self - .config() - .with(|c| c.network.connection_initial_timeout_ms); + let timeout_ms = self.config().network.connection_initial_timeout_ms; if self .network_manager() @@ -204,9 +202,7 @@ impl Network { self.record_dial_info_failure(dial_info.clone(), async move { let data_len = data.len(); - let connect_timeout_ms = self - .config() - .with(|c| c.network.connection_initial_timeout_ms); + let connect_timeout_ms = self.config().network.connection_initial_timeout_ms; if self .network_manager() @@ -382,15 +378,14 @@ impl Network { // get protocol config let protocol_config = { let config = self.config(); - let c = config.get(); let inbound = ProtocolTypeSet::new(); let mut outbound = ProtocolTypeSet::new(); - if c.network.protocol.ws.connect { + if config.network.protocol.ws.connect { outbound.insert(ProtocolType::WS); } #[cfg(feature = "enable-protocol-wss")] - if c.network.protocol.wss.connect { + if config.network.protocol.wss.connect { outbound.insert(ProtocolType::WSS); } @@ -406,7 +401,7 @@ impl Network { PUBLIC_INTERNET_CAPABILITIES .iter() .copied() - .filter(|cap| !c.capabilities.disable.contains(cap)) + .filter(|cap| !config.capabilities.disable.contains(cap)) .collect::>() }; diff --git a/veilid-core/src/network_manager/wasm/protocol/ws.rs b/veilid-core/src/network_manager/wasm/protocol/ws.rs index c91471f3..0fd96b37 100644 --- a/veilid-core/src/network_manager/wasm/protocol/ws.rs +++ b/veilid-core/src/network_manager/wasm/protocol/ws.rs @@ -52,10 +52,7 @@ impl WebsocketNetworkConnection { instrument(level = "trace", err, skip(self)) )] pub async fn close(&self) -> io::Result> { - let timeout_ms = self - .registry - .config() - .with(|c| c.network.connection_initial_timeout_ms); + let timeout_ms = self.config().network.connection_initial_timeout_ms; #[allow(unused_variables)] let x = match timeout(timeout_ms, self.inner.ws_meta.close()).await { diff --git a/veilid-core/src/table_store/wasm.rs b/veilid-core/src/table_store/wasm.rs index da2f910c..e8cc8df5 100644 --- a/veilid-core/src/table_store/wasm.rs +++ b/veilid-core/src/table_store/wasm.rs @@ -16,8 +16,7 @@ impl TableStoreDriver { fn get_namespaced_table_name(&self, table: &str) -> String { let config = self.registry().config(); - let c = config.get(); - let namespace = c.namespace.clone(); + let namespace = config.namespace.clone(); if namespace.is_empty() { table.to_owned() } else { diff --git a/veilid-wasm/tests/package-lock.json b/veilid-wasm/tests/package-lock.json index 8863f9b3..e3abc709 100644 --- a/veilid-wasm/tests/package-lock.json +++ b/veilid-wasm/tests/package-lock.json @@ -21,7 +21,7 @@ }, "../pkg": { "name": "veilid-wasm", - "version": "0.4.7", + "version": "0.4.8", "dev": true, "license": "MPL-2.0" },