wasm

Author: TimeToogo

Cargo.lock

@@ -46,15 +46,15 @@ openssl = { version = "0.10.30", features=["vendored"] }
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 tokio = { version = "0.2.21", features=["blocking", "time", "io-util", "sync", "macros"] }
 wee_alloc = "0.4.5"
-wasm-bindgen = "0.2.65"
+wasm-bindgen = "0.2.108"
 wasm-bindgen-futures = "0.4.15"
 console_error_panic_hook = "0.1.6"
 console_log = "0.2.0"
-js-sys = "0.3.44"
+js-sys = "0.3.85"
 getrandom = { version = "0.2.6", features=["js"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
-version = "0.3.42"
+version = "0.3.85"
 features = [
     "console",
     "Crypto",

tunshell-client/Cargo.toml

@@ -1,21 +1,29 @@
 #!/bin/bash
 
-set -e
+set -euo pipefail
 
-SCRIPT_DIR=$(dirname "$0")
-SCRIPT_DIR=`cd $SCRIPT_DIR;pwd`
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
-cd $SCRIPT_DIR/../
+cd "$SCRIPT_DIR/../"
 
 
 # Ignore conflicting dependencies which require different
-# feature flags based on target. Can be removed once 
+# feature flags based on target. Can be removed once
 # https://github.com/rust-lang/cargo/issues/1197 is resolved
-cp Cargo.toml Cargo.toml.orig
-trap "mv $PWD/Cargo.toml.orig $PWD/Cargo.toml" EXIT
-cat Cargo.toml | sed 's/.*\#no-wasm/\#/g' > Cargo.toml.new
+BACKUP_FILE="$(mktemp "$PWD/Cargo.toml.orig.XXXXXX")"
+
+cleanup() {
+    rm -f Cargo.toml.new
+    if [ -f "$BACKUP_FILE" ]; then
+        mv "$BACKUP_FILE" Cargo.toml
+    fi
+}
+
+cp Cargo.toml "$BACKUP_FILE"
+trap cleanup EXIT
+sed 's/.*\#no-wasm/\#/g' Cargo.toml > Cargo.toml.new
 mv Cargo.toml.new Cargo.toml
 
 wasm-pack build
 mkdir -p ../website/services/wasm/
-cp -aR pkg/* ../website/services/wasm/
+cp -aR pkg/* ../website/services/wasm/

tunshell-client/build/compile-wasm.sh

@@ -258,7 +258,10 @@ fn parse_network_binding(value: &str) -> Result<NetworkPeerBinding, Error> {
         )));
     };
 
-    if local.contains("->") || local.contains("<-") || remote.contains("->") || remote.contains("<-")
+    if local.contains("->")
+        || local.contains("<-")
+        || remote.contains("->")
+        || remote.contains("<-")
     {
         return Err(Error::msg(format!(
             "network binding contains multiple direction arrows: {}",

tunshell-client/src/config.rs

@@ -33,7 +33,7 @@ cfg_if::cfg_if! {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{ClientMode, Config, network::NetworkPeerConfig};
+    use crate::{network::NetworkPeerConfig, ClientMode, Config};
     use tokio::runtime::Runtime;
 
     #[test]

tunshell-client/src/server/mod.rs

@@ -260,9 +260,11 @@ pub(super) async fn start_remote_pty_master(
 ) -> Result<u8> {
     let _ignore_signals = IgnoreSignals::start();
     let (mut demuxer, listener) = ChannelDemuxer::new();
-    let (network_peer, mut network_peer_rx, mut network_peer_tx) =
-        NetworkPeer::new(network_peer_config, crate::shell::network::NetworkPeerRole::Client)
-            .await;
+    let (network_peer, mut network_peer_rx, mut network_peer_tx) = NetworkPeer::new(
+        network_peer_config,
+        crate::shell::network::NetworkPeerRole::Client,
+    )
+    .await;
 
     let mut server = tokio::task::spawn_blocking(move || {
         let ctx = context::Context::from_pair(STDIN_FD, STDIN_FD);