fix: queuedRetries could overlap if the same key was used in differen…

…t observables
LegendApp · Nov 4, 2024 · 339f7e8 · 339f7e8
1 parent c3e5706
commit 339f7e8
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/sync-plugins/crud.ts b/src/sync-plugins/crud.ts
@@ -131,18 +131,18 @@ function computeLastSync(data: any[], fieldUpdatedAt: string | undefined, fieldC
     return newLastSync;
 }
 
-const queuedRetries = {
-    create: new Map<string, any>(),
-    update: new Map<string, any>(),
-    delete: new Map<string, any>(),
-};
 function retrySet(
     params: SyncedSetParams<any>,
     retry: RetryOptions | undefined,
     action: 'create' | 'update' | 'delete',
     itemKey: string,
     itemValue: any,
     change: Change,
+    queuedRetries: {
+        create: Map<string, any>;
+        update: Map<string, any>;
+        delete: Map<string, any>;
+    },
     actionFn: (value: any, params: SyncedSetParams<any>) => Promise<any>,
     saveResult: (itemKey: string, itemValue: any, result: any, isCreate: boolean, change: Change) => void,
 ) {
@@ -219,6 +219,11 @@ export function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption e
 
     const fieldId = fieldIdProp || 'id';
     const pendingCreates = new Set<string>();
+    const queuedRetries = {
+        create: new Map<string, any>(),
+        update: new Map<string, any>(),
+        delete: new Map<string, any>(),
+    };
 
     let asType = props.as as TAsOption;
 
@@ -578,6 +583,7 @@ export function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption e
                               itemKey,
                               createObj,
                               changesById.get(itemKey)!,
+                              queuedRetries,
                               createFn!,
                               saveResult,
                           ).then(() => {
@@ -599,6 +605,7 @@ export function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption e
                                   itemKey,
                                   changed,
                                   changesById.get(itemKey)!,
+                                  queuedRetries,
                                   updateFn!,
                                   saveResult,
                               );
@@ -627,6 +634,7 @@ export function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption e
                                       itemKey,
                                       valuePrevious,
                                       changesById.get(itemKey)!,
+                                      queuedRetries,
                                       deleteFn!,
                                       saveResult,
                                   );
@@ -640,6 +648,7 @@ export function syncedCrud<TRemote extends object, TLocal = TRemote, TAsOption e
                                       itemKey,
                                       { [fieldId]: itemKey, [fieldDeleted]: true } as any,
                                       changesById.get(itemKey)!,
+                                      queuedRetries,
                                       updateFn!,
                                       saveResult,
                                   );