Add publish with retry method

bindings/wasm/Cargo.toml

@@ -18,7 +18,7 @@ crate-type = ["cdylib", "rlib"]
 console_error_panic_hook = { version = "0.1" }
 futures = { version = "0.3" }
 js-sys = { version = "0.3" }
-reqwest = { version = "=0.11.4" } # pin version to 0.11.4: https://github.com/iotaledger/identity.rs/issues/438
+reqwest = { version = "0.11.6" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", default-features = false }
 tokio = { version = "*", default-features = false, features = ["rt"] } # enable "rt" feature to fix build: https://github.com/iotaledger/identity.rs/issues/403
@@ -37,6 +37,7 @@ wasm-bindgen-test = { version = "0.3" }
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 chrono = { version = "0.4", features = ["wasmbind"] }
 getrandom = { version = "0.2", features = ["js"] }
+parking_lot = { version = "0.11.2", features = ["wasm-bindgen"] }
 
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = true

bindings/wasm/docs/api-reference.md

@@ -42,10 +42,10 @@
 ## Members
 
 <dl>
-<dt><a href="#Digest">Digest</a></dt>
-<dd></dd>
 <dt><a href="#KeyType">KeyType</a></dt>
 <dd></dd>
+<dt><a href="#Digest">Digest</a></dt>
+<dd></dd>
 </dl>
 
 ## Functions
@@ -68,6 +68,7 @@
         * [.publishDocument(document)](#Client+publishDocument) ⇒ <code>Promise.&lt;any&gt;</code>
         * [.publishDiff(message_id, diff)](#Client+publishDiff) ⇒ <code>Promise.&lt;any&gt;</code>
         * [.publishJSON(index, data)](#Client+publishJSON) ⇒ <code>Promise.&lt;any&gt;</code>
+        * [.publishJsonWithRetry(index, data, interval, max_attempts)](#Client+publishJsonWithRetry) ⇒ <code>Promise.&lt;any&gt;</code>
         * [.resolve(did)](#Client+resolve) ⇒ <code>Promise.&lt;any&gt;</code>
         * [.resolveHistory(did)](#Client+resolveHistory) ⇒ <code>Promise.&lt;any&gt;</code>
         * [.resolveDiffHistory(document)](#Client+resolveDiffHistory) ⇒ <code>Promise.&lt;any&gt;</code>
@@ -123,6 +124,22 @@ Publishes arbitrary JSON data to the specified index on the Tangle.
 | index | <code>string</code> | 
 | data | <code>any</code> | 
 
+<a name="Client+publishJsonWithRetry"></a>
+
+### client.publishJsonWithRetry(index, data, interval, max_attempts) ⇒ <code>Promise.&lt;any&gt;</code>
+Publishes arbitrary JSON data to the specified index on the Tangle.
+Retries (promotes or reattaches) the message until it’s included (referenced by a milestone).
+Default interval is 5 seconds and max attempts is 40.
+
+**Kind**: instance method of [<code>Client</code>](#Client)  
+
+| Param | Type |
+| --- | --- |
+| index | <code>string</code> | 
+| data | <code>any</code> | 
+| interval | <code>number</code> \| <code>undefined</code> | 
+| max_attempts | <code>number</code> \| <code>undefined</code> | 
+
 <a name="Client+resolve"></a>
 
 ### client.resolve(did) ⇒ <code>Promise.&lt;any&gt;</code>
@@ -1687,14 +1704,14 @@ Deserializes a `VerificationMethod` object from a JSON object.
 | --- | --- |
 | value | <code>any</code> | 
 
-<a name="Digest"></a>
-
-## Digest
-**Kind**: global variable  
 <a name="KeyType"></a>
 
 ## KeyType
 **Kind**: global variable  
+<a name="Digest"></a>
+
+## Digest
+**Kind**: global variable  
 <a name="start"></a>
 
 ## start()

bindings/wasm/src/tangle/client.rs

@@ -124,6 +124,37 @@ impl Client {
     Ok(promise)
   }
 
+  /// Publishes arbitrary JSON data to the specified index on the Tangle.
+  /// Retries (promotes or reattaches) the message until it’s included (referenced by a milestone).
+  /// Default interval is 5 seconds and max attempts is 40.
+  #[wasm_bindgen(js_name = publishJsonWithRetry)]
+  pub fn publish_json_with_retry(
+    &self,
+    index: &str,
+    data: &JsValue,
+    interval: Option<u32>,
+    max_attempts: Option<u32>,
+  ) -> Result<Promise> {
+    let client: Rc<IotaClient> = self.client.clone();
+
+    let index = index.to_owned();
+    let value: serde_json::Value = data.into_serde().wasm_result()?;
+    let promise: Promise = future_to_promise(async move {
+      client
+        .publish_json_with_retry(
+          &index,
+          &value,
+          interval.map(|interval| interval as u64),
+          max_attempts.map(|max_attempts| max_attempts as u64),
+        )
+        .await
+        .wasm_result()
+        .and_then(|receipt| JsValue::from_serde(&receipt).wasm_result())
+    });
+
+    Ok(promise)
+  }
+
   #[wasm_bindgen]
   pub fn resolve(&self, did: &str) -> Result<Promise> {
     #[derive(Serialize)]

identity-iota/Cargo.toml

@@ -26,7 +26,7 @@ thiserror = { version = "1.0", default-features = false }
 
 [dependencies.iota-client]
 git = "https://github.com/iotaledger/iota.rs"
-rev = "e8c050a749a2e7c13633e97b3372b38388f48c37"
+rev = "c48db779d2162b9a3037ee63c4d1e267d04633eb"
 default-features = false
 
 [dependencies.iota-crypto]

identity-iota/src/tangle/client.rs

@@ -74,14 +74,22 @@ impl Client {
   }
 
   /// Publishes an [`IotaDocument`] to the Tangle.
+  /// This method calls `publish_json_with_retry` with its default `interval` and `max_attempts` values for increasing
+  /// the probability that the message will be referenced by a milestone.
   pub async fn publish_document(&self, document: &IotaDocument) -> Result<Receipt> {
-    self.publish_json(document.integration_index(), document).await
+    self
+      .publish_json_with_retry(document.integration_index(), document, None, None)
+      .await
   }
 
-  /// Publishes a [`DocumentDiff`] to the Tangle to form part of the diff chain for the integration
+  /// Publishes a [`DocumentDiff`] to the Tangle to form part of the diff chain for the integration.
   /// chain message specified by the given [`MessageId`].
+  /// This method calls `publish_json_with_retry` with its default `interval` and `max_attempts` values for increasing
+  /// the probability that the message will be referenced by a milestone.
   pub async fn publish_diff(&self, message_id: &MessageId, diff: &DocumentDiff) -> Result<Receipt> {
-    self.publish_json(&IotaDocument::diff_index(message_id)?, diff).await
+    self
+      .publish_json_with_retry(&IotaDocument::diff_index(message_id)?, diff, None, None)
+      .await
   }
 
   /// Publishes arbitrary JSON data to the specified index on the Tangle.
@@ -97,6 +105,27 @@ impl Client {
       .map(|message| Receipt::new(self.network.clone(), message))
   }
 
+  /// Publishes arbitrary JSON data to the specified index on the Tangle.
+  /// Retries (promotes or reattaches) the message until it’s included (referenced by a milestone).
+  /// Default interval is 5 seconds and max attempts is 40.
+  pub async fn publish_json_with_retry<T: ToJson>(
+    &self,
+    index: &str,
+    data: &T,
+    interval: Option<u64>,
+    max_attempts: Option<u64>,
+  ) -> Result<Receipt> {
+    let receipt = self.publish_json(index, data).await?;
+    let reattached_messages = self
+      .client
+      .retry_until_included(receipt.message_id(), interval, max_attempts)
+      .await?;
+    match reattached_messages.first() {
+      Some((_, message)) => Ok(Receipt::new(self.network.clone(), message.clone())),
+      None => Ok(receipt),
+    }
+  }
+
   /// Fetch the [`IotaDocument`] specified by the given [`IotaDID`].
   pub async fn read_document(&self, did: &IotaDID) -> Result<IotaDocument> {
     self.read_document_chain(did).await.and_then(DocumentChain::fold)