fix: indexeddb query continue issue

Author: shenjinti

crates/restsend-wasm/test/conversations.spec.js

@@ -123,8 +123,8 @@ describe('Conversations', async function () {
         expect(syncDone).toBe(true)
         expect(newItems[0].content.type).toEqual('recall')
         expect(newItems[0].content.text).toEqual(recallId)
-        expect(newItems[1].recall).toBe(false)
-        expect(newItems[1].content.type).toEqual('text')
+        expect(newItems[1].recall).toBe(true)
+        expect(newItems[1].content.type).toEqual('recalled')
     })
 
     it('#sync sync last logs without cache', async () => {

crates/restsend/src/storage/indexeddb.rs

@@ -322,6 +322,7 @@ impl<T: StoreModel + 'static> IndexeddbTable<T> {
             .ok()?;
 
         let limit = option.limit;
+        let option_start_sort_value = option.start_sort_value;
         let items_clone = items.clone();
         let cursor_req_ref = cursor_req.clone();
         let on_success_callback = Rc::new(RefCell::new(None));
@@ -349,14 +350,22 @@ impl<T: StoreModel + 'static> IndexeddbTable<T> {
                 let r = match cursor.value() {
                     Ok(v) => match serde_wasm_bindgen::from_value::<StoreValue>(v) {
                         Ok(v) => {
-                            let mut items_count = 0;
                             if let Ok(item) = T::from_str(&v.value) {
+                                if v.sortkey as f64 == start_sort_value {
+                                    cursor.continue_().ok();
+                                    return;
+                                }
+
                                 if let Some(items) = items_ref.borrow_mut().as_mut() {
                                     items.push(item);
-                                    items_count = items.len();
+                                    let items_count = items.len();
+
+                                    if items_count < (limit + 1) as usize {
+                                        cursor.continue_().ok();
+                                        return;
+                                    }
                                 }
-                            }
-                            if items_count < (limit + 1) as usize {
+                            } else {
                                 cursor.continue_().ok();
                                 return;
                             }

js/restsend_wasm.js

@@ -2556,27 +2556,27 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1371 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper1372 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 654, __wbg_adapter_54);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1372 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper1373 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 654, __wbg_adapter_54);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1373 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper1374 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 654, __wbg_adapter_59);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1376 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper1377 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 654, __wbg_adapter_54);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper1378 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper1379 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 654, __wbg_adapter_54);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper2284 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbindgen_closure_wrapper2285 = function(arg0, arg1, arg2) {
         const ret = makeMutClosure(arg0, arg1, 848, __wbg_adapter_66);
         return ret;
     };