merge fixes for thread issue

Author: willemolding

Cargo.lock

@@ -20,7 +20,6 @@ path = "examples/simple-sync.rs"
 name = "message-board-sync"
 path = "examples/message-board-sync.rs"
 
-
 [profile.release]
 # Tell `rustc` to optimize for small code size.
 opt-level = 3
@@ -41,8 +40,7 @@ wasm-parallel = ["wasm", "wasm-bindgen-rayon", "multicore"]
 native = ["tonic/channel", "tonic/gzip", "tonic/tls-webpki-roots", "tokio/macros", "tokio/rt", "tokio/rt-multi-thread"]
 sqlite-db = ["dep:zcash_client_sqlite"]
 console_error_panic_hook = ["dep:console_error_panic_hook"]
-no-bundler = ["wasm-bindgen-rayon?/no-bundler"]
-
+no-bundler = ["wasm-bindgen-rayon?/no-bundler", "wasm_thread/no-bundler"]
 sync2 = []
 
 [dependencies]
@@ -95,7 +93,7 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 tracing = "0.1.40"
 rayon = { version = "1.8", features = ["web_spin_lock"] }
 subtle = "2.6.1"
-wasm_thread = { git = "https://github.com/WilsonGramer/wasm_thread.git", rev = "eb41bcc0d98ce0620a313687c0344341391b9d78", default-features = false, features = ["keep_worker_alive"] }
+wasm_thread = { git = "https://github.com/ec2/wasm_thread", rev = "eb41bcc0d98ce0620a313687c0344341391b9d78", default-features = false, features = ["keep_worker_alive", "es_modules"] }
 
 wasm_sync = "0.1.2"
 http = { version = "1.1.0", default-features = false }
@@ -119,7 +117,6 @@ wasm-bindgen-rayon = { git = "https://github.com/9SMTM6/wasm-bindgen-rayon", rev
 shardtree = { git = "https://github.com/ec2/incrementalmerkletree.git", rev = "16eff253ad2575d48feec04f7387e6507a7dd698" }
 incrementalmerkletree = { git = "https://github.com/ec2/incrementalmerkletree.git", rev = "16eff253ad2575d48feec04f7387e6507a7dd698" }
 
-
 #[patch.'https://github.com/chainsafe/librustzcash']
 #zcash_address = { path = "../librustzcash/components/zcash_address" }
 #zcash_client_backend = { path = "../librustzcash/zcash_client_backend" }

Cargo.toml

@@ -1,8 +1,8 @@
 default:
     just --list
 
-build:
-    wasm-pack build --target web --scope webzjs --release --out-dir ./packages/webz-core --no-default-features --features="wasm-parallel,sync2" -Z build-std="panic_abort,std"
+build *features:
+    wasm-pack build --no-opt -t web --scope webzjs --release --out-dir ./packages/webz-core --no-default-features --features="wasm wasm-parallel sync2 {{features}}" -Z build-std="panic_abort,std"
 
 # All Wasm Tests
 test-web *features:

justfile

@@ -1,16 +1,22 @@
 {
   "scripts": {
     "preinstall": "npx only-allow pnpm",
+<<<<<<< HEAD
     "start:dev": "parcel --no-autoinstall packages/demo-wallet",
     "build": "parcel build --no-cache --no-autoinstall packages/demo-wallet"
+=======
+    "start:dev": "pnpm --stream -r run start:dev",
+    "build": "parcel build --no-autoinstall --no-cache packages/demo-wallet"
+>>>>>>> fa1d590219078a46ae59c0e85e0207362217b311
   },
   "dependencies": {
-		"@webzjs/webz-core": "workspace:^",
-		"@webzjs/demo-wallet": "workspace:^"
-	},
+    "@webzjs/webz-core": "workspace:^",
+    "@webzjs/demo-wallet": "workspace:^"
+  },
   "devDependencies": {
     "@parcel/core": "^2.12.0",
     "parcel": "^2.12.0",
     "process": "^0.11.10"
-  }
+  },
+  "packageManager": "pnpm@9.11.0+sha512.0a203ffaed5a3f63242cd064c8fb5892366c103e328079318f78062f24ea8c9d50bc6a47aa3567cabefd824d170e78fa2745ed1f16b132e16436146b7688f19b"
 }

package.json

@@ -136,28 +136,26 @@ impl WebWallet {
 
     /// Synchronize the wallet with the blockchain up to the tip using zcash_client_backend's algo
     pub async fn sync2(&self) -> Result<(), Error> {
-        tracing::info!("Sync2 called");
-        let db = self.inner.clone();
-
-        let shim_url = thread::get_wasm_bindgen_shim_script_path();
+        assert!(!thread::is_web_worker_thread());
 
-        tracing::info!("shim script path: {}", shim_url);
-        tracing::info!(
-            "worker script: {}",
-            thread::get_worker_script(Some(shim_url.clone()))
-        );
+        let db = self.inner.clone();
 
-        let main_handler = thread::Builder::new()
+        let sync_handler = thread::Builder::new()
+            .name("sync2".to_string())
             .spawn_async(|| async {
-                tracing::info!("Sync2 thread spawned");
+                assert!(thread::is_web_worker_thread());
+                tracing::debug!(
+                    "Current num threads (wasm_thread) {}",
+                    rayon::current_num_threads()
+                );
+
                 let db = db;
-                db.sync2().await;
+                db.sync2().await.unwrap_throw();
             })
-            .unwrap()
+            .unwrap_throw()
             .join_async();
-        main_handler
-            .await
-            .map_err(|_| Error::SyncError("awaiting on main handler failed".to_string()))
+        sync_handler.await.unwrap();
+        Ok(())
     }
 
     pub async fn get_wallet_summary(&self) -> Result<Option<WalletSummary>, Error> {

src/bindgen/wallet.rs

@@ -24,7 +24,7 @@ pub fn initialize() {
 async fn test_get_and_scan_range() {
     initialize();
     #[cfg(feature = "wasm-parallel")]
-    let _ = JsFuture::from(wasm_bindgen_rayon::init_thread_pool(10)).await;
+    let _ = JsFuture::from(wasm_bindgen_rayon::init_thread_pool(3)).await;
     assert!(!thread::is_web_worker_thread());
     let w = WebWallet::new("test", "http://localhost:1234/testnet", 1).unwrap();