fix: Search properly handles id increments to avoid race conditions. May be snappier too.

Author: colin969

src/renderer/store/search/middleware.ts

@@ -22,6 +22,7 @@ import {
   setFilter,
   setOrderBy,
   setOrderReverse,
+  setSearchId,
   setSearchText
 } from './slice';
 
@@ -34,8 +35,22 @@ export function addSearchMiddleware() {
       const view = state.search.views[action.payload.view];
 
       if (view) {
-        // Debounce building search text
-        debounceBuildQuery(view);
+        // Immediately update search id
+        const newSearchId = view.data.searchId + 1;
+        store.dispatch(setSearchId({ view: view.id, searchId: newSearchId }));
+
+        // Get processed query
+        const filter = await window.Shared.back.request(BackIn.PARSE_QUERY_DATA, {
+          viewId: view.id,
+          searchId: newSearchId,
+          text: view.text,
+          advancedFilter: view.advancedFilter,
+          orderBy: view.orderBy,
+          orderDirection: view.orderReverse,
+          playlist: view.selectedPlaylist
+        });
+
+        store.dispatch(setFilter({ filter }));
       }
     }
   });
@@ -162,45 +177,26 @@ export function addSearchMiddleware() {
       const view = state.search.views[action.payload.filter.viewId];
 
       if (view) {
-        // Debounce building search text
-        debounceSearch(view.id, view.searchFilter);
+        log.info('Launcher', 'Performing search...');
+        // Request first page
+        window.Shared.back.request(BackIn.BROWSE_VIEW_FIRST_PAGE, view.searchFilter)
+        .then((data) => {
+          store.dispatch(addData({
+            view: view.id,
+            data: {
+              searchId: view.searchFilter.searchId,
+              page: 0,
+              games: data.games,
+            }
+          }));
+      
+          // Request keyset
+          store.dispatch(requestKeyset({
+            view: view.id,
+            searchId: view.searchFilter.searchId,
+          }));
+        });
       }
     }
   });
 }
-
-const debounceBuildQuery = debounce(async (view: ResultsView) => {
-  const filter = await window.Shared.back.request(BackIn.PARSE_QUERY_DATA, {
-    viewId: view.id,
-    searchId: view.data.searchId + 1,
-    text: view.text,
-    advancedFilter: view.advancedFilter,
-    orderBy: view.orderBy,
-    orderDirection: view.orderReverse,
-    playlist: view.selectedPlaylist
-  });
-
-  store.dispatch(setFilter({ filter }));
-}, 125);
-
-const debounceSearch = debounce((viewName: string, searchFilter: SearchQuery) => {
-  log.info('Launcher', 'Performing search...');
-  // Request first page
-  window.Shared.back.request(BackIn.BROWSE_VIEW_FIRST_PAGE, searchFilter)
-  .then((data) => {
-    store.dispatch(addData({
-      view: viewName,
-      data: {
-        searchId: searchFilter.searchId,
-        page: 0,
-        games: data.games,
-      }
-    }));
-
-    // Request keyset
-    store.dispatch(requestKeyset({
-      view: viewName,
-      searchId: searchFilter.searchId,
-    }));
-  });
-}, 50);

src/renderer/store/search/slice.ts

@@ -8,6 +8,7 @@ import { BackIn, PageKeyset, SearchQuery } from '@shared/back/types';
 import { VIEW_PAGE_SIZE } from '@shared/constants';
 import { getDefaultAdvancedFilter, getDefaultGameSearch } from '@shared/search/util';
 import { updatePreferencesData } from '@shared/preferences/util';
+import { number } from 'zod';
 
 export const GENERAL_VIEW_ID = '!general!';
 
@@ -138,6 +139,11 @@ export type SearchDeleteViewAction = {
   view: string;
 }
 
+export type SearchSetIdAction = {
+  view: string;
+  searchId: number;
+}
+
 export type SearchRenameViewAction = {
   old: string;
   new: string;
@@ -403,6 +409,21 @@ const searchSlice = createSlice({
         }
       }
     },
+    setSearchId(state: SearchState, { payload }: PayloadAction<SearchSetIdAction>) {
+      const view = state.views[payload.view];
+      if (view) {
+        if (view.data.searchId < payload.searchId) {
+          view.data = {
+            searchId: payload.searchId,
+            pages: {},
+            keyset: [],
+            games: {},
+            total: undefined,
+            metaState: RequestState.REQUESTED,
+          };
+        }
+      }
+    },
     setOrderBy(state: SearchState, { payload }: PayloadAction<SearchOrderByAction>) {
       const view = state.views[payload.view];
       if (view) {
@@ -608,6 +629,7 @@ export const {
   selectPlaylist,
   selectGame,
   setFilter,
+  setSearchId,
   setOrderBy,
   setOrderReverse,
   setAdvancedFilter,