fix(network): stabilize subscription handling and gateway routing

Cargo.toml

@@ -34,7 +34,7 @@ wasmer = "6.1.0"
 wasmer-compiler-singlepass = "6.1.0"
 
 # freenet-stdlib = { git = "https://github.com/freenet/freenet-stdlib.git", branch = "main", package = "freenet-stdlib" }
-freenet-stdlib = { version = "0.1.23" }
+freenet-stdlib = { version = "0.1.24" }
 
 # [patch.crates-io]
 # freenet-stdlib = { git = "https://github.com/freenet/freenet-stdlib.git", branch = "main" }

crates/core/Cargo.toml

@@ -44,6 +44,7 @@ pav_regression = "0.6.1"
 parking_lot = "0.12"
 pin-project = "1"
 rand = { features = ["small_rng"], workspace = true }
+once_cell = "1"
 redb = { optional = true, version = "3" }
 serde = { features = ["derive", "rc"], workspace = true }
 serde_json = { workspace = true }

crates/core/src/client_events/mod.rs

@@ -1158,31 +1158,34 @@ async fn process_open_request(
                                 "Starting direct SUBSCRIBE operation (legacy mode)",
                             );
 
-                            // Legacy mode: direct operation without deduplication
-                            let op_id =
-                                crate::node::subscribe(op_manager.clone(), key, Some(client_id))
-                                    .await
-                                    .inspect_err(|err| {
-                                        tracing::error!("Subscribe error: {}", err);
-                                    })?;
-
-                            tracing::debug!(
-                                request_id = %request_id,
-                                transaction_id = %op_id,
-                                operation = "subscribe",
-                                "Request-Transaction correlation"
-                            );
+                            // Legacy mode: generate transaction, register first, then run op
+                            let tx = crate::message::Transaction::new::<
+                                crate::operations::subscribe::SubscribeMsg,
+                            >();
 
                             op_manager
                                 .ch_outbound
-                                .waiting_for_transaction_result(op_id, client_id, request_id)
+                                .waiting_for_transaction_result(tx, client_id, request_id)
                                 .await
                                 .inspect_err(|err| {
                                     tracing::error!(
                                         "Error waiting for transaction result: {}",
                                         err
                                     );
                                 })?;
+
+                            crate::node::subscribe_with_id(op_manager.clone(), key, None, Some(tx))
+                                .await
+                                .inspect_err(|err| {
+                                    tracing::error!("Subscribe error: {}", err);
+                                })?;
+
+                            tracing::debug!(
+                                request_id = %request_id,
+                                transaction_id = %tx,
+                                operation = "subscribe",
+                                "Request-Transaction correlation"
+                            );
                         }
                     }
                     _ => {