Update getRoot() to use Promise version of EventEmitter.once

Co-authored-by: Owen Pearson <[email protected]>
ably · Oct 22, 2024 · d637bd7 · d637bd7
1 parent 0e2c3a0
commit d637bd7
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/plugins/liveobjects/liveobjects.ts b/src/plugins/liveobjects/liveobjects.ts
@@ -35,17 +35,12 @@ export class LiveObjects {
   }
 
   async getRoot(): Promise<LiveMap> {
-    if (!this._syncInProgress) {
-      // SYNC is finished, can return immediately root object from pool
-      return this._liveObjectsPool.get(ROOT_OBJECT_ID) as LiveMap;
+    // SYNC is currently in progress, wait for SYNC sequence to finish
+    if (this._syncInProgress) {
+      await this._eventEmitter.once(LiveObjectsEvents.SyncCompleted);
     }
 
-    // otherwise wait for SYNC sequence to finish
-    return new Promise((res) => {
-      this._eventEmitter.once(LiveObjectsEvents.SyncCompleted, () => {
-        res(this._liveObjectsPool.get(ROOT_OBJECT_ID) as LiveMap);
-      });
-    });
+    return this._liveObjectsPool.get(ROOT_OBJECT_ID) as LiveMap;
   }
 
   /**