feat: on_conversaion_updated with total(optional)

Author: shenjinti

crates/restsend-wasm/Cargo.toml

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

crates/restsend-wasm/src/callback.rs

@@ -304,13 +304,17 @@ impl restsend_sdk::callback::RsCallback for CallbackWasmWrap {
                 .map(|e| web_sys::console::error_1(&e));
         }
     }
-    fn on_conversations_updated(&self, conversations: Vec<Conversation>) {
+    fn on_conversations_updated(&self, conversations: Vec<Conversation>, total: Option<i64>) {
         if let Some(cb) = self.cb_on_conversations_updated.borrow().as_ref() {
             let serializer = &serde_wasm_bindgen::Serializer::new().serialize_maps_as_objects(true);
             let conversations = conversations
                 .serialize(serializer)
                 .unwrap_or(JsValue::UNDEFINED);
-            cb.call1(&JsValue::NULL, &conversations)
+            let total = match total {
+                Some(t) => JsValue::from_f64(t as f64),
+                None => JsValue::UNDEFINED,
+            };
+            cb.call2(&JsValue::NULL, &conversations, &total)
                 .err()
                 .map(|e| web_sys::console::error_1(&e));
         }

crates/restsend/src/callback.rs

@@ -47,7 +47,7 @@ pub trait RsCallback: Send + Sync {
         return ChatRequestStatus::default();
     }
     fn on_topic_read(&self, topic_id: String, message: ChatRequest) {}
-    fn on_conversations_updated(&self, conversations: Vec<Conversation>) {}
+    fn on_conversations_updated(&self, conversations: Vec<Conversation>, total: Option<i64>) {}
     fn on_conversation_removed(&self, conversation_id: String) {}
 }
 #[allow(unused_variables)]

crates/restsend/src/client/conversation.rs

@@ -216,7 +216,7 @@ impl Client {
                         .unwrap_or_default();
 
                     if let Some(cb) = store_ref.callback.read().unwrap().as_ref() {
-                        cb.on_conversations_updated(r.items);
+                        cb.on_conversations_updated(r.items, None);
                     }
                     if !r.has_more {
                         break;
@@ -278,7 +278,7 @@ impl Client {
 
                     let new_conversations_count = new_conversations.len() as u32;
                     if let Some(cb) = store_ref.callback.read().unwrap().as_ref() {
-                        cb.on_conversations_updated(new_conversations);
+                        cb.on_conversations_updated(new_conversations, Some(lr.total));
                     }
 
                     log::info!(
@@ -472,7 +472,7 @@ impl Client {
         }
         // callback
         if let Some(cb) = self.store.callback.read().unwrap().as_ref() {
-            cb.on_conversations_updated(updated_conversations.clone());
+            cb.on_conversations_updated(updated_conversations.clone(), None);
         }
         // sync to store
         let t = self.store.message_storage.table::<Conversation>().await;

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

@@ -238,7 +238,7 @@ impl ClientStore {
 
     pub fn emit_conversation_update(&self, conversation: Conversation) -> Result<Conversation> {
         if let Some(cb) = self.callback.read().unwrap().as_ref() {
-            cb.on_conversations_updated(vec![conversation.clone()]);
+            cb.on_conversations_updated(vec![conversation.clone()], None);
         }
         Ok(conversation)
     }
@@ -497,7 +497,7 @@ impl ClientStore {
                         }
                     };
                     if let Some(cb) = callback.read().unwrap().as_ref() {
-                        cb.on_conversations_updated(vec![c]);
+                        cb.on_conversations_updated(vec![c], None);
                     };
                 }
                 Err(e) => {

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

@@ -180,7 +180,7 @@ impl ClientStore {
                         if !conversation.is_partial {
                             if let Some(cb) = callback.read().unwrap().as_ref() {
                                 conversation.last_seq = req.seq; // don't use conversation.last_seq, it's may be newer
-                                cb.on_conversations_updated(vec![conversation]);
+                                cb.on_conversations_updated(vec![conversation], None);
                             }
                         } else {
                             self.fetch_conversation(&topic_id, false).await;

crates/restsend/src/client/tests/test_client.rs

@@ -40,7 +40,7 @@ impl callback::RsCallback for TestCallbackImpl {
     fn on_topic_read(&self, topic_id: String, message: ChatRequest) {
         warn!("on_topic_read: topic_id:{} message:{:?}", topic_id, message);
     }
-    fn on_conversations_updated(&self, conversations: Vec<Conversation>) {
+    fn on_conversations_updated(&self, conversations: Vec<Conversation>, _total: Option<i64>) {
         debug!("on_conversation_updated: {:?}", conversations);
         *self.last_topic_id.lock().unwrap() = conversations[0].topic_id.clone();
         self.is_update_conversation.store(true, Ordering::Relaxed);

js/package.json

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

js/restsend_wasm.d.ts

@@ -1,5 +1,6 @@
 /* tslint:disable */
 /* eslint-disable */
+export function setLogging(level?: string | null): void;
 /**
  * Signin with userId and password or token
  */
@@ -16,22 +17,8 @@ export function guestLogin(endpoint: string, userId: string, extra: any): Promis
  * Logout with token
  */
 export function logout(endpoint: string, token: string): Promise<void>;
-export function setLogging(level?: string | null): void;
 export class Client {
   free(): void;
-  /**
-   * Create a new client
-   * # Arguments
-   * * `info` - AuthInfo
-   * * `db_name` - database name (optional), create an indexeddb when set it    
-   */
-  constructor(info: any, db_name?: string | null);
-  /**
-   * connect immediately if the connection is broken    
-   */
-  app_active(): void;
-  shutdown(): Promise<void>;
-  connect(): Promise<void>;
   /**
    * Create a new topic
    * #Arguments
@@ -188,49 +175,18 @@ export class Client {
    */
   removeTopicMember(topicId: string, userId: string): Promise<void>;
   /**
-   * Get user info
-   * #Arguments
-   * * `userId` - user id
-   * * `blocking` - blocking fetch from server
-   * #Return
-   * User info
-   */
-  getUser(userId: string, blocking?: boolean | null): Promise<any>;
-  /**
-   * Get multiple users info
-   * #Arguments
-   * * `userIds` - Array of user id
-   * #Return
-   * Array of user info
-   */
-  getUsers(userIds: string[]): Promise<any>;
-  /**
-   * Set user remark name
-   * #Arguments
-   * * `userId` - user id
-   * * `remark` - remark name
-   */
-  setUserRemark(userId: string, remark: string): Promise<void>;
-  /**
-   * Set user star
-   * #Arguments
-   * * `userId` - user id
-   * * `star` - star
-   */
-  setUserStar(userId: string, star: boolean): Promise<void>;
-  /**
-   * Set user block
-   * #Arguments
-   * * `userId` - user id
-   * * `block` - block
+   * Create a new client
+   * # Arguments
+   * * `info` - AuthInfo
+   * * `db_name` - database name (optional), create an indexeddb when set it    
    */
-  setUserBlock(userId: string, block: boolean): Promise<void>;
+  constructor(info: any, db_name?: string | null);
   /**
-   * Set allow guest chat
-   * #Arguments
-   * * `allow` - allow
+   * connect immediately if the connection is broken    
    */
-  setAllowGuestChat(allow: boolean): Promise<void>;
+  app_active(): void;
+  shutdown(): Promise<void>;
+  connect(): Promise<void>;
   /**
    *
    * Send message with content
@@ -557,24 +513,49 @@ export class Client {
    */
   filterConversation(predicate: any, lastUpdatedAt: any, limit: any): Promise<any>;
   /**
-   * get the current connection status
-   * return: connecting, connected, broken, shutdown
+   * Get user info
+   * #Arguments
+   * * `userId` - user id
+   * * `blocking` - blocking fetch from server
+   * #Return
+   * User info
    */
-  readonly connectionStatus: string;
+  getUser(userId: string, blocking?: boolean | null): Promise<any>;
   /**
-   * get the last alive at
+   * Get multiple users info
+   * #Arguments
+   * * `userIds` - Array of user id
+   * #Return
+   * Array of user info
    */
-  readonly lastAliveAt: bigint;
-  readonly unreadCount: Promise<number>;
+  getUsers(userIds: string[]): Promise<any>;
   /**
-   * set the keepalive interval with seconds
+   * Set user remark name
+   * #Arguments
+   * * `userId` - user id
+   * * `remark` - remark name
    */
-  set keepalive(value: number);
+  setUserRemark(userId: string, remark: string): Promise<void>;
   /**
-   * set the ping interval with seconds (for health check with error logs)
-   * default is 30 seconds
+   * Set user star
+   * #Arguments
+   * * `userId` - user id
+   * * `star` - star
    */
-  set ping_interval(value: number);
+  setUserStar(userId: string, star: boolean): Promise<void>;
+  /**
+   * Set user block
+   * #Arguments
+   * * `userId` - user id
+   * * `block` - block
+   */
+  setUserBlock(userId: string, block: boolean): Promise<void>;
+  /**
+   * Set allow guest chat
+   * #Arguments
+   * * `allow` - allow
+   */
+  setAllowGuestChat(allow: boolean): Promise<void>;
   /**
    * Set the callback when connection connected
    */
@@ -725,6 +706,25 @@ export class Client {
    * ```
    */
   set onconversationsremoved(value: any);
+  /**
+   * get the current connection status
+   * return: connecting, connected, broken, shutdown
+   */
+  readonly connectionStatus: string;
+  /**
+   * get the last alive at
+   */
+  readonly lastAliveAt: bigint;
+  readonly unreadCount: Promise<number>;
+  /**
+   * set the keepalive interval with seconds
+   */
+  set keepalive(value: number);
+  /**
+   * set the ping interval with seconds (for health check with error logs)
+   * default is 30 seconds
+   */
+  set ping_interval(value: number);
 }
 export class IntoUnderlyingByteSource {
   private constructor();
@@ -753,16 +753,19 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly __wbg_client_free: (a: number, b: number) => void;
-  readonly client_new: (a: any, b: number, c: number) => number;
-  readonly client_connectionStatus: (a: number) => [number, number];
-  readonly client_lastAliveAt: (a: number) => bigint;
-  readonly client_unreadCount: (a: number) => any;
-  readonly client_app_active: (a: number) => void;
-  readonly client_set_keepalive: (a: number, b: number) => void;
-  readonly client_shutdown: (a: number) => any;
-  readonly client_connect: (a: number) => any;
-  readonly client_set_ping_interval: (a: number, b: number) => void;
+  readonly client_set_onconnected: (a: number, b: any) => void;
+  readonly client_set_onconnecting: (a: number, b: any) => void;
+  readonly client_set_ontokenexpired: (a: number, b: any) => void;
+  readonly client_set_onbroken: (a: number, b: any) => void;
+  readonly client_set_onkickoff: (a: number, b: any) => void;
+  readonly client_set_onsystemrequest: (a: number, b: any) => void;
+  readonly client_set_onunknownrequest: (a: number, b: any) => void;
+  readonly client_set_ontopictyping: (a: number, b: any) => void;
+  readonly client_set_ontopicmessage: (a: number, b: any) => void;
+  readonly client_set_ontopicread: (a: number, b: any) => void;
+  readonly client_set_onconversationsupdated: (a: number, b: any) => void;
+  readonly client_set_onconversationsremoved: (a: number, b: any) => void;
+  readonly setLogging: (a: number, b: number) => void;
   readonly client_createTopic: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
   readonly client_joinTopic: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
   readonly client_addMember: (a: number, b: number, c: number, d: number, e: number) => any;
@@ -783,16 +786,16 @@ export interface InitOutput {
   readonly client_acceptTopicJoin: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
   readonly client_declineTopicJoin: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => any;
   readonly client_removeTopicMember: (a: number, b: number, c: number, d: number, e: number) => any;
-  readonly client_getUser: (a: number, b: number, c: number, d: number) => any;
-  readonly client_getUsers: (a: number, b: number, c: number) => any;
-  readonly client_setUserRemark: (a: number, b: number, c: number, d: number, e: number) => any;
-  readonly client_setUserStar: (a: number, b: number, c: number, d: number) => any;
-  readonly client_setUserBlock: (a: number, b: number, c: number, d: number) => any;
-  readonly client_setAllowGuestChat: (a: number, b: number) => any;
-  readonly signin: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => any;
-  readonly signup: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
-  readonly guestLogin: (a: number, b: number, c: number, d: number, e: any) => any;
-  readonly logout: (a: number, b: number, c: number, d: number) => any;
+  readonly __wbg_client_free: (a: number, b: number) => void;
+  readonly client_new: (a: any, b: number, c: number) => number;
+  readonly client_connectionStatus: (a: number) => [number, number];
+  readonly client_lastAliveAt: (a: number) => bigint;
+  readonly client_unreadCount: (a: number) => any;
+  readonly client_app_active: (a: number) => void;
+  readonly client_set_keepalive: (a: number, b: number) => void;
+  readonly client_shutdown: (a: number) => any;
+  readonly client_connect: (a: number) => any;
+  readonly client_set_ping_interval: (a: number, b: number) => void;
   readonly client_doSend: (a: number, b: number, c: number, d: any, e: any) => any;
   readonly client_doTyping: (a: number, b: number, c: number) => any;
   readonly client_doRecall: (a: number, b: number, c: number, d: number, e: number, f: any) => any;
@@ -805,19 +808,6 @@ export interface InitOutput {
   readonly client_doSendText: (a: number, b: number, c: number, d: number, e: number, f: any) => any;
   readonly client_doSendImage: (a: number, b: number, c: number, d: any, e: any) => any;
   readonly client_doUpdateExtra: (a: number, b: number, c: number, d: number, e: number, f: any, g: any) => any;
-  readonly client_set_onconnected: (a: number, b: any) => void;
-  readonly client_set_onconnecting: (a: number, b: any) => void;
-  readonly client_set_ontokenexpired: (a: number, b: any) => void;
-  readonly client_set_onbroken: (a: number, b: any) => void;
-  readonly client_set_onkickoff: (a: number, b: any) => void;
-  readonly client_set_onsystemrequest: (a: number, b: any) => void;
-  readonly client_set_onunknownrequest: (a: number, b: any) => void;
-  readonly client_set_ontopictyping: (a: number, b: any) => void;
-  readonly client_set_ontopicmessage: (a: number, b: any) => void;
-  readonly client_set_ontopicread: (a: number, b: any) => void;
-  readonly client_set_onconversationsupdated: (a: number, b: any) => void;
-  readonly client_set_onconversationsremoved: (a: number, b: any) => void;
-  readonly setLogging: (a: number, b: number) => void;
   readonly client_createChat: (a: number, b: number, c: number) => any;
   readonly client_cleanMessages: (a: number, b: number, c: number) => any;
   readonly client_removeMessages: (a: number, b: number, c: number, d: number, e: number) => any;
@@ -836,6 +826,16 @@ export interface InitOutput {
   readonly client_clearConversation: (a: number, b: number, c: number) => any;
   readonly client_setConversationExtra: (a: number, b: number, c: number, d: any) => any;
   readonly client_filterConversation: (a: number, b: any, c: any, d: any) => any;
+  readonly signin: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => any;
+  readonly signup: (a: number, b: number, c: number, d: number, e: number, f: number) => any;
+  readonly guestLogin: (a: number, b: number, c: number, d: number, e: any) => any;
+  readonly logout: (a: number, b: number, c: number, d: number) => any;
+  readonly client_getUser: (a: number, b: number, c: number, d: number) => any;
+  readonly client_getUsers: (a: number, b: number, c: number) => any;
+  readonly client_setUserRemark: (a: number, b: number, c: number, d: number, e: number) => any;
+  readonly client_setUserStar: (a: number, b: number, c: number, d: number) => any;
+  readonly client_setUserBlock: (a: number, b: number, c: number, d: number) => any;
+  readonly client_setAllowGuestChat: (a: number, b: number) => any;
   readonly __wbg_intounderlyingbytesource_free: (a: number, b: number) => void;
   readonly intounderlyingbytesource_type: (a: number) => [number, number];
   readonly intounderlyingbytesource_autoAllocateChunkSize: (a: number) => number;
@@ -856,10 +856,10 @@ export interface InitOutput {
   readonly __wbindgen_export_4: WebAssembly.Table;
   readonly __wbindgen_export_5: WebAssembly.Table;
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
-  readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hafc7650d064a213f: (a: number, b: number) => void;
-  readonly closure587_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure847_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure888_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure603_externref_shim: (a: number, b: number, c: any) => void;
+  readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1a9e3aace0878b63: (a: number, b: number) => void;
+  readonly closure846_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure887_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }