fix(server): commit import not finishing correctly (#2153)

* fix(server): commit import not finishing correctly * awaiting last batch added * minor fix
specklesystems · Mar 22, 2024 · 663eaac · 663eaac
1 parent a489a7b
commit 663eaac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts b/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts
@@ -102,7 +102,7 @@ function useViewerObjectAutoLoading() {
       viewer.loadObjectAsync(
         objectUrl,
         authToken.value || undefined,
-        disableViewerCache ? false : undefined, // TODO: Undo
+        disableViewerCache ? false : undefined,
         options?.zoomToObject
       )
     }

diff --git a/packages/server/modules/cross-server-sync/services/commit.ts b/packages/server/modules/cross-server-sync/services/commit.ts
@@ -564,6 +564,9 @@ const loadAllObjectsFromParent = async (
       batchPromises = []
     }
   }
+
+  // If any remaining promises - await them
+  await Promise.all(batchPromises)
 }
 
 /**

diff --git a/packages/shared/src/core/helpers/utility.ts b/packages/shared/src/core/helpers/utility.ts
@@ -32,7 +32,8 @@ export const retry = async <V = unknown>(fn: () => MaybeAsync<V>, n: number) =>
   let lastError: Error | undefined
   for (let i = 0; i < n; i++) {
     try {
-      return await Promise.resolve(fn())
+      const res = await Promise.resolve(fn())
+      return res
     } catch (error) {
       lastError = ensureError(error)
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -564,6 +564,9 @@ const loadAllObjectsFromParent = async ( @@
           batchPromises = []
         }
       }
+      // If any remaining promises - await them
+      await Promise.all(batchPromises)
     }
     /**
@@ Expand Down @@