Revert "Try putting room list handling behind a lock"

src/stores/room-list/algorithms/Algorithm.ts

@@ -34,7 +34,6 @@ import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
 import { getListAlgorithmInstance } from "./list-ordering";
 import SettingsStore from "../../../settings/SettingsStore";
 import { VisibilityProvider } from "../filters/VisibilityProvider";
-import { MultiLock } from "../../../utils/MultiLock";
 
 /**
  * Fired when the Algorithm has determined a list has been updated.
@@ -78,7 +77,6 @@ export class Algorithm extends EventEmitter {
     } = {};
     private allowedByFilter: Map<IFilterCondition, Room[]> = new Map<IFilterCondition, Room[]>();
     private allowedRoomsByFilters: Set<Room> = new Set<Room>();
-    private handlerLock = new MultiLock();
 
     /**
      * Set to true to suspend emissions of algorithm updates.
@@ -679,12 +677,6 @@ export class Algorithm extends EventEmitter {
      * processing.
      */
     public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
-        if (SettingsStore.getValue("advancedRoomListLogging")) {
-            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-            console.log(`Acquiring lock for ${room.roomId} with cause ${cause}`);
-        }
-        const release = await this.handlerLock.acquire(room.roomId);
-        try {
         if (SettingsStore.getValue("advancedRoomListLogging")) {
             // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
             console.log(`Handle room update for ${room.roomId} called with cause ${cause}`);
@@ -720,7 +712,7 @@ export class Algorithm extends EventEmitter {
             // If we have tags for a room and don't have the room referenced, something went horribly
             // wrong - the reference should have been updated above.
             if (hasTags && !knownRoomRef && !isSticky) {
-                    throw new Error(`${room.roomId} is missing from room array but is known`);
+                throw new Error(`${room.roomId} is missing from room array but is known - trying to find duplicate`);
             }
 
             // Like above, update the reference to the sticky room if we need to
@@ -808,9 +800,7 @@ export class Algorithm extends EventEmitter {
             if (this.stickyRoom === room) {
                 if (SettingsStore.getValue("advancedRoomListLogging")) {
                     // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                        console.warn(
+                    console.warn(`[RoomListDebug] Received ${cause} update for sticky room ${room.roomId} - ignoring`);
-                            `[RoomListDebug] Received ${cause} update for sticky room ${room.roomId} - ignoring`,
-                        );
                 }
                 return false;
             }
@@ -872,13 +862,8 @@ export class Algorithm extends EventEmitter {
 
         if (SettingsStore.getValue("advancedRoomListLogging")) {
             // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
-                console.log(
+            console.log(`[RoomListDebug] Finished handling ${room.roomId} with cause ${cause} (changed=${changed})`);
-                    `[RoomListDebug] Finished handling ${room.roomId} with cause ${cause} (changed=${changed})`,
-                );
         }
         return changed;
-        } finally {
-            release();
-        }
     }
 }

src/utils/MultiLock.ts

@@ -1,30 +0,0 @@
-/*
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { EnhancedMap } from "./maps";
-import AwaitLock from "await-lock";
-
-export type DoneFn = () => void;
-
-export class MultiLock {
-    private locks = new EnhancedMap<string, AwaitLock>();
-
-    public async acquire(key: string): Promise<DoneFn> {
-        const lock = this.locks.getOrCreate(key, new AwaitLock());
-        await lock.acquireAsync();
-        return () => lock.release();
-    }
-}