fix: broken deseriealization

getgems-io · Nov 29, 2023 · 86139be · 86139be
1 parent 1261d26
commit 86139be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/tonlibjson-client/build.rs b/tonlibjson-client/build.rs
@@ -337,6 +337,7 @@ impl Generator {
                     if deserialize_number_from_string && deserialize_with.is_empty() {
                         quote! {
                             #serialize_with
+                            #[serde(default)]
                             #[serde(deserialize_with = "deserialize_number_from_string")]
                             pub #field_name: #field_type
                         }

diff --git a/tonlibjson-client/src/client.rs b/tonlibjson-client/src/client.rs
@@ -119,7 +119,9 @@ impl<R : Requestable> Service<R> for Client {
 
                 bail!(error)
             } else {
-                let response = serde_json::from_value::<R::Response>(response.data)?;
+                let data = response.data.clone();
+                let response = serde_json::from_value::<R::Response>(response.data)
+                    .map_err(|e| anyhow!("deserialization error: {:?}, data: {:?}", e, data))?;
 
                 Ok(response)
             }

diff --git a/tonlibjson-client/src/cursor_client.rs b/tonlibjson-client/src/cursor_client.rs
@@ -289,6 +289,7 @@ impl CursorClient {
         let id = Cow::from(id);
         let client = ConcurrencyMetric::new(client, id.clone());
         let (mtx, mrx) = tokio::sync::watch::channel(None);
+        let mut mc_watcher = mtx.subscribe();
 
         let _self = Self {
             id,
@@ -299,7 +300,12 @@ impl CursorClient {
         };
 
         tokio::spawn(_self.last_block_loop(mtx));
-        tokio::spawn(_self.first_block_loop());
+        let inner = _self.first_block_loop();
+        tokio::spawn(async move {
+            mc_watcher.changed().await.unwrap();
+
+            inner.await;
+        });
 
         _self
     }