Merge pull request #1898 from ably/liveobjects/fixes

Minor LiveObjects fixes/refactoring
ably · Nov 8, 2024 · e1e6cc7 · e1e6cc7
2 parents 81237f3 + b73a15c
commit e1e6cc7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/src/common/lib/util/utils.ts b/src/common/lib/util/utils.ts
@@ -165,15 +165,6 @@ export function arrIntersectOb<K extends string>(arr: Array<K>, ob: Partial<Reco
   return result;
 }
 
-export function arrSubtract<T>(arr1: Array<T>, arr2: Array<T>): Array<T> {
-  const result = [];
-  for (let i = 0; i < arr1.length; i++) {
-    const element = arr1[i];
-    if (arr2.indexOf(element) == -1) result.push(element);
-  }
-  return result;
-}
-
 export function arrDeleteValue<T>(arr: Array<T>, val: T): boolean {
   const idx = arr.indexOf(val);
   const res = idx != -1;

diff --git a/src/plugins/liveobjects/liveobjectspool.ts b/src/plugins/liveobjects/liveobjectspool.ts
@@ -27,7 +27,7 @@ export class LiveObjectsPool {
    */
   deleteExtraObjectIds(objectIds: string[]): void {
     const poolObjectIds = [...this._pool.keys()];
-    const extraObjectIds = this._client.Utils.arrSubtract(poolObjectIds, objectIds);
+    const extraObjectIds = poolObjectIds.filter((x) => !objectIds.includes(x));
 
     extraObjectIds.forEach((x) => this._pool.delete(x));
   }

diff --git a/src/plugins/liveobjects/statemessage.ts b/src/plugins/liveobjects/statemessage.ts
@@ -155,13 +155,13 @@ export class StateMessage {
 
     if (message.object?.map?.entries) {
       for (const entry of Object.values(message.object.map.entries)) {
-        decodeMapEntry(entry, inputContext, decodeDataFn);
+        await decodeMapEntry(entry, inputContext, decodeDataFn);
       }
     }
 
     if (message.operation?.map) {
       for (const entry of Object.values(message.operation.map)) {
-        decodeMapEntry(entry, inputContext, decodeDataFn);
+        await decodeMapEntry(entry, inputContext, decodeDataFn);
       }
     }
 

diff --git a/src/plugins/liveobjects/syncliveobjectsdatapool.ts b/src/plugins/liveobjects/syncliveobjectsdatapool.ts
@@ -47,11 +47,11 @@ export class SyncLiveObjectsDataPool {
   }
 
   isEmpty(): boolean {
-    return this.size() === 0;
+    return this._pool.size === 0;
   }
 
   reset(): void {
-    this._pool = new Map<string, AnyDataEntry>();
+    this._pool.clear();
   }
 
   applyStateMessages(stateMessages: StateMessage[]): void {