@peerbit/native-backbone 0.1.1 → 0.1.3

package/src/append_tx/committed_no_next.rs

@@ -16,6 +16,7 @@ use crate::documents::{
     document_index_plain_put_payload_append_commit, DocumentIndexAppendCommit,
     DocumentIndexValuePrefix,
 };
+use crate::error::BackboneError;
 use crate::js_interop::{
     ensure_same_len, optional_usize_from_js, required_bytes_from_array, strings_from_array,
     strings_to_array,
@@ -40,7 +41,7 @@ impl NativePeerbitBackbone {
         self_replicating: bool,
         resolve_trimmed_entries: bool,
     ) -> Result<Array, JsValue> {
-        self.prepare_plain_storage_append_transaction_inner(
+        Ok(self.prepare_plain_storage_append_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -57,7 +58,7 @@ impl NativePeerbitBackbone {
             None,
             true,
             None,
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -77,7 +78,7 @@ impl NativePeerbitBackbone {
         resolve_trimmed_entries: bool,
         trim_length_to: usize,
     ) -> Result<Array, JsValue> {
-        self.prepare_plain_storage_append_transaction_inner(
+        Ok(self.prepare_plain_storage_append_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -94,7 +95,7 @@ impl NativePeerbitBackbone {
             Some(trim_length_to),
             true,
             None,
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -111,26 +112,26 @@ impl NativePeerbitBackbone {
     ) -> Result<Array, JsValue> {
         let trim_length_to = optional_usize_from_js(trim_length_to, "trimLengthTo")?;
         let profile_enabled = self.append_profile_enabled;
-        let input_copy_started = profile_enabled.then(js_sys::Date::now);
+        let input_copy_started = profile_enabled.then(crate::time::now_ms);
         let payload_template = payload_data.to_vec();
         if let Some(started) = input_copy_started {
-            self.append_profile.input_copy_ms += js_sys::Date::now() - started;
+            self.append_profile.input_copy_ms += crate::time::now_ms() - started;
         }
         let payload_size = payload_template.len() as u32;
         let now = wall_time_start.to_string();
-        let started = js_sys::Date::now();
+        let started = crate::time::now_ms();
         for i in 0..iterations {
             let wall_time = wall_time_start + i as u64;
             let logical = i;
             let gid = format!("native-backbone-loop-{wall_time_start}-{i}");
-            let storage_append_started = profile_enabled.then(js_sys::Date::now);
-            let payload_copy_started = profile_enabled.then(js_sys::Date::now);
+            let storage_append_started = profile_enabled.then(crate::time::now_ms);
+            let payload_copy_started = profile_enabled.then(crate::time::now_ms);
             let payload_data = payload_template.clone();
             if let Some(started) = payload_copy_started {
-                self.append_profile.input_copy_ms += js_sys::Date::now() - started;
+                self.append_profile.input_copy_ms += crate::time::now_ms() - started;
             }
 
-            let log_started = profile_enabled.then(js_sys::Date::now);
+            let log_started = profile_enabled.then(crate::time::now_ms);
             let mut log_profile = NativeLogAppendProfile::default();
             let (entry_facts, trim_hashes) = self
                 .log
@@ -148,13 +149,13 @@ impl NativePeerbitBackbone {
                     profile_enabled.then_some(&mut log_profile),
                 )?;
             if let Some(started) = log_started {
-                self.append_profile.log_total_ms += js_sys::Date::now() - started;
+                self.append_profile.log_total_ms += crate::time::now_ms() - started;
                 self.append_profile.add_log_profile(&log_profile);
             }
 
             let hash_number = self.hash_number_profiled(&entry_facts.hash_digest_bytes)?;
 
-            let coordinate_plan_started = profile_enabled.then(js_sys::Date::now);
+            let coordinate_plan_started = profile_enabled.then(crate::time::now_ms);
             let coordinate_facts = commit_local_append_for_gid_compact_core(
                 &mut self.shared_log,
                 entry_facts.hash.clone(),
@@ -171,10 +172,10 @@ impl NativePeerbitBackbone {
                 true,
             )?;
             if let Some(started) = coordinate_plan_started {
-                self.append_profile.coordinate_plan_ms += js_sys::Date::now() - started;
+                self.append_profile.coordinate_plan_ms += crate::time::now_ms() - started;
             }
 
-            let coordinate_core_started = profile_enabled.then(js_sys::Date::now);
+            let coordinate_core_started = profile_enabled.then(crate::time::now_ms);
             self.commit_coordinate_core_from_compact_facts(
                 &coordinate_facts,
                 &[],
@@ -183,10 +184,10 @@ impl NativePeerbitBackbone {
                 entry_facts.meta_bytes.clone(),
             );
             if let Some(started) = coordinate_core_started {
-                self.append_profile.coordinate_core_ms += js_sys::Date::now() - started;
+                self.append_profile.coordinate_core_ms += crate::time::now_ms() - started;
             }
 
-            let document_index_started = profile_enabled.then(js_sys::Date::now);
+            let document_index_started = profile_enabled.then(crate::time::now_ms);
             let document_index_commit = use_document_index.then(|| DocumentIndexAppendCommit {
                 key: format!("native-backbone-loop-doc-{wall_time_start}-{i}"),
                 value_prefix: DocumentIndexValuePrefix::Bytes(Vec::new()),
@@ -205,15 +206,15 @@ impl NativePeerbitBackbone {
                 payload_size,
             )?;
             if let Some(started) = document_index_started {
-                self.append_profile.document_index_commit_ms += js_sys::Date::now() - started;
+                self.append_profile.document_index_commit_ms += crate::time::now_ms() - started;
             }
 
             if let Some(started) = storage_append_started {
-                self.append_profile.storage_append_inner_ms += js_sys::Date::now() - started;
+                self.append_profile.storage_append_inner_ms += crate::time::now_ms() - started;
             }
         }
         let row = Array::new();
-        row.push(&JsValue::from_f64(js_sys::Date::now() - started));
+        row.push(&JsValue::from_f64(crate::time::now_ms() - started));
         row.push(&JsValue::from_f64(self.log.len() as f64));
         row.push(&JsValue::from_f64(self.blocks.len() as f64));
         row.push(&JsValue::from_f64(self.coordinate_index.len() as f64));
@@ -245,7 +246,7 @@ impl NativePeerbitBackbone {
         document_projection_encoded_document: JsValue,
         document_projection_signer: JsValue,
     ) -> Result<Array, JsValue> {
-        self.prepare_plain_storage_append_transaction_inner(
+        Ok(self.prepare_plain_storage_append_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -271,7 +272,7 @@ impl NativePeerbitBackbone {
                 document_projection_encoded_document,
                 document_projection_signer,
             )?),
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -299,7 +300,7 @@ impl NativePeerbitBackbone {
         document_projection_signer: JsValue,
         trim_length_to: usize,
     ) -> Result<Array, JsValue> {
-        self.prepare_plain_storage_append_transaction_inner(
+        Ok(self.prepare_plain_storage_append_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -325,7 +326,7 @@ impl NativePeerbitBackbone {
                 document_projection_encoded_document,
                 document_projection_signer,
             )?),
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -351,7 +352,7 @@ impl NativePeerbitBackbone {
         document_projection_encoded_document: JsValue,
         document_projection_signer: JsValue,
     ) -> Result<Array, JsValue> {
-        self.prepare_plain_storage_append_transaction_inner(
+        Ok(self.prepare_plain_storage_append_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -376,7 +377,7 @@ impl NativePeerbitBackbone {
                 document_projection_encoded_document,
                 document_projection_signer,
             )?),
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -403,7 +404,7 @@ impl NativePeerbitBackbone {
         document_projection_signer: JsValue,
         trim_length_to: usize,
     ) -> Result<Array, JsValue> {
-        self.prepare_plain_storage_append_transaction_inner(
+        Ok(self.prepare_plain_storage_append_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -428,7 +429,7 @@ impl NativePeerbitBackbone {
                 document_projection_encoded_document,
                 document_projection_signer,
             )?),
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -463,7 +464,7 @@ impl NativePeerbitBackbone {
             JsValue::UNDEFINED,
             JsValue::UNDEFINED,
         )?;
-        self.prepare_plain_committed_no_next_storage_append_document_index_compact_transaction_inner(
+        Ok(self.prepare_plain_committed_no_next_storage_append_document_index_compact_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -477,7 +478,7 @@ impl NativePeerbitBackbone {
             self_replicating,
             document_index_commit,
             trim_length_to,
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -507,7 +508,7 @@ impl NativePeerbitBackbone {
             document_byte_element_index_limit,
             document_delete_trimmed_heads,
         )?;
-        self.prepare_plain_committed_no_next_storage_append_document_index_compact_transaction_inner(
+        Ok(self.prepare_plain_committed_no_next_storage_append_document_index_compact_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -521,7 +522,7 @@ impl NativePeerbitBackbone {
             self_replicating,
             document_index_commit,
             trim_length_to,
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -587,7 +588,7 @@ impl NativePeerbitBackbone {
                 JsValue::UNDEFINED,
             )?);
         }
-        self.prepare_plain_committed_no_next_storage_append_document_index_compact_batch_transaction_inner(
+        Ok(self.prepare_plain_committed_no_next_storage_append_document_index_compact_batch_transaction_inner(
             wall_times,
             logicals,
             gids,
@@ -601,7 +602,7 @@ impl NativePeerbitBackbone {
             self_replicating,
             trim_length_to,
             document_index_commits,
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -651,7 +652,7 @@ impl NativePeerbitBackbone {
                 document_delete_trimmed_heads,
             )?);
         }
-        self.prepare_plain_committed_no_next_storage_append_document_index_compact_batch_transaction_inner(
+        Ok(self.prepare_plain_committed_no_next_storage_append_document_index_compact_batch_transaction_inner(
             wall_times,
             logicals,
             gids,
@@ -665,7 +666,7 @@ impl NativePeerbitBackbone {
             self_replicating,
             trim_length_to,
             document_index_commits,
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -732,7 +733,7 @@ impl NativePeerbitBackbone {
                 document_projection_signers.get(index_u32),
             )?);
         }
-        self.prepare_plain_committed_no_next_storage_append_document_index_compact_batch_transaction_inner(
+        Ok(self.prepare_plain_committed_no_next_storage_append_document_index_compact_batch_transaction_inner(
             wall_times,
             logicals,
             gids,
@@ -746,7 +747,7 @@ impl NativePeerbitBackbone {
             self_replicating,
             trim_length_to,
             document_index_commits,
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -809,7 +810,7 @@ impl NativePeerbitBackbone {
                 )?,
             );
         }
-        self.prepare_plain_committed_no_next_storage_append_document_index_compact_batch_transaction_inner(
+        Ok(self.prepare_plain_committed_no_next_storage_append_document_index_compact_batch_transaction_inner(
             wall_times,
             logicals,
             gids,
@@ -823,7 +824,7 @@ impl NativePeerbitBackbone {
             self_replicating,
             trim_length_to,
             document_index_commits,
-        )
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -859,7 +860,7 @@ impl NativePeerbitBackbone {
             document_projection_encoded_document,
             document_projection_signer,
         )?;
-        self.prepare_plain_committed_no_next_storage_append_document_index_compact_transaction_inner(
+        Ok(self.prepare_plain_committed_no_next_storage_append_document_index_compact_transaction_inner(
             wall_time,
             logical,
             gid,
@@ -872,8 +873,8 @@ impl NativePeerbitBackbone {
             self_hash,
             self_replicating,
             document_index_commit,
-			trim_length_to,
-		)
+            trim_length_to,
+        )?)
     }
 
     #[allow(clippy::too_many_arguments)]
@@ -908,7 +909,7 @@ impl NativePeerbitBackbone {
                 document_projection_plan_id,
                 document_projection_signer,
             )?;
-        self.prepare_plain_committed_no_next_storage_append_document_index_compact_transaction_inner(
+        Ok(self.prepare_plain_committed_no_next_storage_append_document_index_compact_transaction_inner(
 			wall_time,
 			logical,
 			gid,
@@ -922,7 +923,7 @@ impl NativePeerbitBackbone {
 			self_replicating,
 			document_index_commit,
 			trim_length_to,
-        )
+        )?)
     }
 }
 
@@ -943,9 +944,9 @@ impl NativePeerbitBackbone {
         self_replicating: bool,
         trim_length_to: Option<usize>,
         document_index_commits: Vec<DocumentIndexAppendCommit>,
-    ) -> Result<Array, JsValue> {
+    ) -> Result<Array, BackboneError> {
         let profile_enabled = self.append_profile_enabled;
-        let storage_append_started = profile_enabled.then(js_sys::Date::now);
+        let storage_append_started = profile_enabled.then(crate::time::now_ms);
         let batch_len = document_index_commits.len();
         self.reserve_document_batch(batch_len);
         let mut pending_appends = Vec::with_capacity(batch_len);
@@ -956,13 +957,13 @@ impl NativePeerbitBackbone {
             let gid = gids
                 .get(index_u32)
                 .as_string()
-                .ok_or_else(|| JsValue::from_str("Expected batch gid string"))?;
+                .ok_or(BackboneError::ExpectedString("batch gid"))?;
             let payload_bytes = required_bytes_from_array(&payload_datas, index_u32, "payload")?;
             let payload_size = payload_bytes.length();
             let delete_trimmed_document_heads = document_index_commit.delete_trimmed_heads;
 
             let (meta_data, payload_data) =
-                self.copy_append_inputs_profiled(meta_datas.get(index_u32), &payload_bytes);
+                self.copy_append_inputs_profiled(meta_datas.get(index_u32), &payload_bytes)?;
 
             let (entry_facts, trim_hashes) = self.prepare_no_next_log_append_profiled(
                 wall_times.get_index(index_u32),
@@ -1020,7 +1021,7 @@ impl NativePeerbitBackbone {
 
         let out = Array::new();
         for (pending, coordinate_facts) in pending_appends.into_iter().zip(coordinate_facts) {
-            let coordinate_core_started = profile_enabled.then(js_sys::Date::now);
+            let coordinate_core_started = profile_enabled.then(crate::time::now_ms);
             self.commit_coordinate_core_from_compact_facts(
                 &coordinate_facts,
                 &[],
@@ -1029,7 +1030,7 @@ impl NativePeerbitBackbone {
                 pending.entry_facts.meta_bytes.clone(),
             );
             if let Some(started) = coordinate_core_started {
-                self.append_profile.coordinate_core_ms += js_sys::Date::now() - started;
+                self.append_profile.coordinate_core_ms += crate::time::now_ms() - started;
             }
 
             let document_trimmed_heads_processed = self.commit_append_document_index_profiled(
@@ -1043,7 +1044,7 @@ impl NativePeerbitBackbone {
                 &pending.trim_hashes,
             )?;
 
-            let result_row_started = profile_enabled.then(js_sys::Date::now);
+            let result_row_started = profile_enabled.then(crate::time::now_ms);
             let row = no_next_compact_entry_row(
                 &self.resolution,
                 &pending.entry_facts,
@@ -1062,12 +1063,12 @@ impl NativePeerbitBackbone {
             }
             out.push(&row);
             if let Some(started) = result_row_started {
-                self.append_profile.result_row_ms += js_sys::Date::now() - started;
+                self.append_profile.result_row_ms += crate::time::now_ms() - started;
             }
         }
 
         if let Some(started) = storage_append_started {
-            self.append_profile.storage_append_inner_ms += js_sys::Date::now() - started;
+            self.append_profile.storage_append_inner_ms += crate::time::now_ms() - started;
         }
         Ok(out)
     }
@@ -1088,13 +1089,14 @@ impl NativePeerbitBackbone {
         self_replicating: bool,
         document_index_commit: DocumentIndexAppendCommit,
         trim_length_to: Option<usize>,
-    ) -> Result<Array, JsValue> {
+    ) -> Result<Array, BackboneError> {
         let profile_enabled = self.append_profile_enabled;
-        let storage_append_started = profile_enabled.then(js_sys::Date::now);
+        let storage_append_started = profile_enabled.then(crate::time::now_ms);
         let payload_size = payload_data.length();
         let delete_trimmed_document_heads = document_index_commit.delete_trimmed_heads;
 
-        let (meta_data, payload_data) = self.copy_append_inputs_profiled(meta_data, &payload_data);
+        let (meta_data, payload_data) =
+            self.copy_append_inputs_profiled(meta_data, &payload_data)?;
 
         let (entry_facts, trim_hashes) = self.prepare_no_next_log_append_profiled(
             wall_time,
@@ -1108,7 +1110,7 @@ impl NativePeerbitBackbone {
 
         let hash_number = self.hash_number_profiled(&entry_facts.hash_digest_bytes)?;
 
-        let coordinate_plan_started = profile_enabled.then(js_sys::Date::now);
+        let coordinate_plan_started = profile_enabled.then(crate::time::now_ms);
         let coordinate_facts = commit_local_append_for_gid_compact_core(
             &mut self.shared_log,
             entry_facts.hash.clone(),
@@ -1125,10 +1127,10 @@ impl NativePeerbitBackbone {
             true,
         )?;
         if let Some(started) = coordinate_plan_started {
-            self.append_profile.coordinate_plan_ms += js_sys::Date::now() - started;
+            self.append_profile.coordinate_plan_ms += crate::time::now_ms() - started;
         }
 
-        let coordinate_core_started = profile_enabled.then(js_sys::Date::now);
+        let coordinate_core_started = profile_enabled.then(crate::time::now_ms);
         self.commit_coordinate_core_from_compact_facts(
             &coordinate_facts,
             &[],
@@ -1137,7 +1139,7 @@ impl NativePeerbitBackbone {
             entry_facts.meta_bytes.clone(),
         );
         if let Some(started) = coordinate_core_started {
-            self.append_profile.coordinate_core_ms += js_sys::Date::now() - started;
+            self.append_profile.coordinate_core_ms += crate::time::now_ms() - started;
         }
 
         let document_trimmed_heads_processed = self.commit_append_document_index_profiled(
@@ -1151,14 +1153,14 @@ impl NativePeerbitBackbone {
             &trim_hashes,
         )?;
 
-        let result_row_started = profile_enabled.then(js_sys::Date::now);
+        let result_row_started = profile_enabled.then(crate::time::now_ms);
         let out = no_next_compact_entry_row(&self.resolution, &entry_facts, &coordinate_facts);
         push_optional_trim_result(&out, trim_hashes, document_trimmed_heads_processed);
         if let Some(started) = result_row_started {
-            self.append_profile.result_row_ms += js_sys::Date::now() - started;
+            self.append_profile.result_row_ms += crate::time::now_ms() - started;
         }
         if let Some(started) = storage_append_started {
-            self.append_profile.storage_append_inner_ms += js_sys::Date::now() - started;
+            self.append_profile.storage_append_inner_ms += crate::time::now_ms() - started;
         }
         Ok(out)
     }