feat: client webtransport-websys feat #1224

joshuef · 2024-01-24T14:35:54Z

Description

Summary generated by Reviewpad on 24 Jan 24 15:33 UTC

This pull request includes multiple file diffs. Here is a summarized overview of the changes:

The cmd.rs file in the sn_networking module has several modifications, including new imports, changes in enum variants and struct methods, variable updates, and code formatting changes.
The replication_fetcher.rs file has changes related to imports, removing and adding features, and updating comments and code related to parallel fetches.
The Cargo.toml file removes the "quic" feature and includes only the "metrics" feature.
The wallet.rs file has changes in imports related to time and duration, along with a comment explaining the usage of a wallet client for token transfers.
The lib.rs file has modifications in the genesis_multi_addr variable and related assertions in tests.
The README.md file has updates regarding transport protocols, architectures, and building for wasm32.
The diff adds a new target_arch.rs file with conditionally imported modules based on the target architecture. Changes also include importing spawn_local for handling asynchronous tasks.
The lib.rs file includes changes in importing the Duration struct from the tokio::time module, replacing the previous import from the std::time module.
The diff for the file download.rs includes import changes related to time, removing and replacing import statements.
The Cargo.toml file has changes in dependency versions, feature modifications, and wasm compilation options.
The file client.rs in tests/common has changes in imports related to time.
The upload.rs file has modifications related to logging and changing the method of reading chunk bytes.
The diff includes changes in importing the sleep function and related replacements for time-related functions.
The Cargo.toml file includes changes in features, dependencies, and versions.
The driver.rs file within the sn_networking module has various changes, including conditional compilation, transport updates, logging, and configurations based on build and target architectures.
The node_registry.rs file has changes in constructing the addr variable based on feature flags for different build configurations.
The diff introduces modifications related to imports, including the addition and removal of import statements for various modules, types, and libraries.
The Cargo.toml file includes changes in dependencies, removing and adding features.
The diff includes changes in importing modules, types, and constants in the file.
The Cargo.toml file has changes in dependencies, including the removal of the "default" and "quic" features.

Please let me know if you need more details or specific information for any of the file diffs.

sn_testnet/src/lib.rs

-            assert_eq!(format!("/ip4/127.0.0.1/tcp/11101/p2p/{peer_id}"), multiaddr);
+        if !cfg!(feature = "websockets") {
+            assert_eq!(
+                format!("/ip4/127.0.0.1/tcp/11101/ws/p2p/{peer_id}"),


sn_testnet/src/lib.rs

-            assert_eq!(format!("/ip4/127.0.0.1/tcp/11101/p2p/{peer_id}"), multiaddr);
+        if cfg!(feature = "websockets") {
+            assert_eq!(
+                format!("/ip4/127.0.0.1/tcp/11101/ws/p2p/{peer_id}"),


sn_testnet/src/lib.rs

+        let genesis_multi_addr = if cfg!(any(feature = "websockets", target_arch = "wasm32")) {
+            format!("/ip4/127.0.0.1/tcp/{genesis_port:?}/ws/p2p/{peer_id}")
+        } else {
+            format!("/ip4/127.0.0.1/udp/{genesis_port:?}/quic-v1/p2p/{peer_id}")


sn_testnet/src/lib.rs

-            format!("/ip4/127.0.0.1/udp/{genesis_port:?}/quic-v1/p2p/{peer_id}");
+
+        let genesis_multi_addr = if cfg!(any(feature = "websockets", target_arch = "wasm32")) {
+            format!("/ip4/127.0.0.1/tcp/{genesis_port:?}/ws/p2p/{peer_id}")


sn_client/src/lib.rs

+    )));
+
+
+    // TODO: We need to tidy this up, the client loops forever in the browser, and eventually crashes


sn_client/src/lib.rs

+    console::log_1(&JsValue::from_str("Hello safe world!"));
+
+    // Tracing
+    // TODO: dont log _everything_


.github/workflows/merge.yml

sn_client/src/api.rs

sn_client/src/lib.rs

maqi · 2024-01-24T15:18:09Z

sn_networking/src/driver.rs

-        #[cfg(feature = "tcp")]
-        let main_transport = TokioTransport::new(TransportConfig::default())
+        #[cfg(target_arch = "wasm32")]
+        let main_transport = WebSocketTransport::default()


same idea as before, move to separate file and create a create_main_transport function

I did look at this, but things got unwieldy fast.

I'm not against it, but I don't think it's a blocker for this PR.

maqi · 2024-01-24T15:20:27Z

sn_networking/src/lib.rs

@@ -87,6 +95,8 @@ pub const fn close_group_majority() -> usize {

 /// Max duration for all GET attempts
 const MAX_GET_RETRY_DURATION_MS: u64 = 6800;
+
+#[cfg(not(target_arch = "wasm32"))]


wasm doesn't need MAX_GET_RETRY_DURATION ?
I thought this is a non-transport-dependent retry config ?

we cannot (at the moment) easily have backoff with wasm32. backoff uses tokio right now.

We can probably rejig this, but i'd say that's an optimisation atm. The main aim here (i think) is to get the wasm code building and checked?

reviewpad bot added the Large Large sized PR label Jan 24, 2024

joshuef force-pushed the WebTransport4 branch from 69794b5 to 2d93509 Compare January 24, 2024 14:37

github-advanced-security bot found potential problems Jan 24, 2024

View reviewed changes

joshuef force-pushed the WebTransport4 branch from 2d93509 to 63bae00 Compare January 24, 2024 14:38

github-advanced-security bot found potential problems Jan 24, 2024

View reviewed changes

joshuef force-pushed the WebTransport4 branch 4 times, most recently from 0896de4 to 2ca735f Compare January 24, 2024 15:04

maqi reviewed Jan 24, 2024

View reviewed changes

.github/workflows/merge.yml Outdated Show resolved Hide resolved

sn_client/src/api.rs Outdated Show resolved Hide resolved

sn_client/src/api.rs Outdated Show resolved Hide resolved

maqi reviewed Jan 24, 2024

View reviewed changes

joshuef force-pushed the WebTransport4 branch 2 times, most recently from e7cdd2a to 9d8c040 Compare January 24, 2024 15:33

joshuef added 2 commits January 25, 2024 08:58

feat: client webtransport-websys feat

b88a7d5

chore: use a single target_arch.rs to simplify imports for wasm32 or no

22cc892

joshuef force-pushed the WebTransport4 branch from 9d8c040 to 22cc892 Compare January 25, 2024 07:58

joshuef marked this pull request as ready for review January 25, 2024 07:58

reviewpad bot added the waiting-for-review label Jan 25, 2024

ci: move websockets and wasm to cross platform workflow file

aacb678

joshuef force-pushed the WebTransport4 branch from 3776108 to aacb678 Compare January 25, 2024 08:02

maqi approved these changes Jan 25, 2024

View reviewed changes

joshuef merged commit 8d7cc12 into maidsafe:main Jan 25, 2024
31 of 32 checks passed

joshuef deleted the WebTransport4 branch January 25, 2024 10:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: client webtransport-websys feat #1224

feat: client webtransport-websys feat #1224

joshuef commented Jan 24, 2024 •

edited by reviewpad bot

Loading

maqi Jan 24, 2024

joshuef Jan 24, 2024

maqi Jan 24, 2024

joshuef Jan 24, 2024

		)));


		// TODO: We need to tidy this up, the client loops forever in the browser, and eventually crashes

feat: client webtransport-websys feat #1224

feat: client webtransport-websys feat #1224

Conversation

joshuef commented Jan 24, 2024 • edited by reviewpad bot Loading

Description

Summary generated by Reviewpad on 24 Jan 24 15:33 UTC

maqi Jan 24, 2024

Choose a reason for hiding this comment

joshuef Jan 24, 2024

Choose a reason for hiding this comment

maqi Jan 24, 2024

Choose a reason for hiding this comment

joshuef Jan 24, 2024

Choose a reason for hiding this comment

joshuef commented Jan 24, 2024 •

edited by reviewpad bot

Loading