fix: unread count

Author: shenjinti

crates/restsend-wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "restsend-wasm"
-version = "1.2.1"
+version = "1.2.2"
 edition = "2021"
 description = "Restsend  Instant Messaging Javascript/Wasm SDK"
 authors = ["Restsend Team <[email protected]>"]

crates/restsend-wasm/src/account.rs

@@ -1,3 +1,4 @@
+use restsend_sdk::models::conversation::Extra;
 use serde::Serialize;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsValue;
@@ -59,6 +60,23 @@ pub async fn signup(
         .map_err(|e| e.into())
 }
 
+/// Signup with userId and password
+#[allow(non_snake_case)]
+#[wasm_bindgen]
+pub async fn guestLogin(
+    endpoint: String,
+    userId: String,
+    extra: JsValue,
+) -> Result<JsValue, JsValue> {
+    let endpoint = get_endpoint(endpoint);
+    let serializer = &serde_wasm_bindgen::Serializer::new().serialize_maps_as_objects(true);
+    let extra = serde_wasm_bindgen::from_value::<Extra>(extra).ok();
+    restsend_sdk::services::auth::guest_login(endpoint, userId, extra)
+        .await
+        .map(|v| v.serialize(serializer).unwrap_or(JsValue::UNDEFINED))
+        .map_err(|e| e.into())
+}
+
 /// Logout with token
 #[allow(non_snake_case)]
 #[wasm_bindgen]

crates/restsend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "restsend-sdk"
-version = "1.1.7"
+version = "1.1.8"
 edition = "2021"
 
 [lib]

crates/restsend/src/client/store/conversations.rs

@@ -208,7 +208,6 @@ impl ClientStore {
 
                 conversation.last_read_at = old_conversation.last_read_at;
                 conversation.last_read_seq = old_conversation.last_read_seq;
-                conversation.unread = old_conversation.unread;
             }
 
             if let Some(log) = get_conversation_last_readable_message(
@@ -226,15 +225,12 @@ impl ClientStore {
             conversation.is_partial = false;
             conversation.cached_at = now;
 
-            if conversation.unread == 0 {
-                let start_seq = conversation.start_seq.max(conversation.last_read_seq);
-                let diff = conversation
-                    .last_message_seq
-                    .unwrap_or(conversation.last_seq)
-                    - start_seq;
-                conversation.unread = diff.max(0);
-            }
-
+            let start_seq = conversation.start_seq.max(conversation.last_read_seq);
+            let diff = conversation
+                .last_message_seq
+                .unwrap_or(conversation.last_seq)
+                - start_seq;
+            conversation.unread = diff.max(0);
             results.push(ValueItem {
                 partition: "".to_string(),
                 sort_key: conversation.sort_key(),

crates/restsend/src/client/store/requests.rs

@@ -3,11 +3,11 @@ use crate::client::store::conversations::merge_conversation_from_chat;
 use crate::client::store::is_cache_expired;
 use crate::models::ChatLogStatus;
 use crate::utils::now_millis;
-use crate::REMOVED_CONVERSATION_CACHE_EXPIRE_SECS;
 use crate::{
     callback::MessageCallback,
     request::{ChatRequest, ChatRequestType},
 };
+use crate::{PING_TIMEOUT_SECS, REMOVED_CONVERSATION_CACHE_EXPIRE_SECS};
 use http::StatusCode;
 use log::{info, warn};
 use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
@@ -61,6 +61,7 @@ impl ClientStore {
                 } else {
                     ChatLogStatus::SendFailed
                 };
+
                 if let Some(pending) = self.peek_pending_request(&req.chat_id).await {
                     match status {
                         ChatLogStatus::Sent => {
@@ -75,6 +76,28 @@ impl ClientStore {
                         }
                         _ => {}
                     }
+                } else {
+                    if content_type == "ping" && req.seq == 0 {
+                        match req.content.as_ref() {
+                            Some(content) => {
+                                let data = match serde_json::from_str::<serde_json::Value>(
+                                    &content.text,
+                                ) {
+                                    Ok(data) => data,
+                                    Err(_) => return vec![],
+                                };
+                                let timestamp = match data["timestamp"].as_i64() {
+                                    Some(timestamp) => timestamp,
+                                    None => return vec![],
+                                };
+                                let diff = now_millis() - timestamp;
+                                if diff >= PING_TIMEOUT_SECS * 1000 {
+                                    warn!("ping timeout:{}", diff);
+                                }
+                            }
+                            _ => {}
+                        }
+                    }
                 }
 
                 self.update_outoing_chat_log_state(&topic_id, &chat_id, status, Some(ack_seq))

crates/restsend/src/lib.rs

@@ -40,6 +40,7 @@ const MEDIA_PROGRESS_INTERVAL: u128 = 300; // 300ms to update progress
 const CONVERSATION_CACHE_EXPIRE_SECS: i64 = 60; // 60 seconds
 const USER_CACHE_EXPIRE_SECS: i64 = 60; // 60 seconds
 const REMOVED_CONVERSATION_CACHE_EXPIRE_SECS: i64 = 10; // 10 seconds
+const PING_TIMEOUT_SECS: i64 = 5; // 5 seconds
 
 #[cfg(not(target_family = "wasm"))]
 const WORKER_THREADS: usize = 4;

crates/restsend/src/services/conversation.rs

@@ -1,5 +1,3 @@
-use serde::Serialize;
-
 use super::{api_call, response::APISendResponse};
 use crate::Result;
 use crate::{
@@ -8,6 +6,7 @@ use crate::{
     services::LOGS_LIMIT,
     utils::now_millis,
 };
+use serde::Serialize;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -39,7 +38,7 @@ pub async fn get_conversations(
     if !updated_at.is_empty() {
         data["updatedAt"] = serde_json::json!(updated_at);
     }
-    if let Some(last_updated_at) = last_updated_at.filter(|s| !s.is_empty())  {
+    if let Some(last_updated_at) = last_updated_at.filter(|s| !s.is_empty()) {
         data["lastUpdatedAt"] = serde_json::json!(last_updated_at);
     }
     if let Some(last_removed_at) = last_removed_at.filter(|s| !s.is_empty()) {

js/package.json

@@ -5,7 +5,7 @@
     "Restsend Team <[email protected]>"
   ],
   "description": "Restsend  Instant Messaging Javascript/Wasm SDK",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "files": [
     "restsend_wasm_bg.wasm",
     "restsend_wasm.js",