OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

move WatchManager over to an ES6 Map

pull/21833/head
Michael Telatynski 2021-05-19 09:24:46 +01:00
parent cf501371fa
commit 73b24ae225
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/settings/WatchManager.ts
View File

@ -18,11 +18,7 @@ import { SettingLevel } from "./SettingLevel";
export type CallbackFn = (changedInRoomId: string, atLevel: SettingLevel, newValAtLevel: any) => void; export type CallbackFn = (changedInRoomId: string, atLevel: SettingLevel, newValAtLevel: any) => void;
const IRRELEVANT_ROOM: string = null; const IRRELEVANT_ROOM = Symbol("irrelevant-room");
interface RoomWatcherMap {
[roomId: string]: CallbackFn[];
}
/** /**
* Generalized management class for dealing with watchers on a per-handler (per-level) * Generalized management class for dealing with watchers on a per-handler (per-level)
@ -30,25 +26,25 @@ interface RoomWatcherMap {
* class, which are then proxied outwards to any applicable watchers. * class, which are then proxied outwards to any applicable watchers.
*/ */
export class WatchManager { export class WatchManager {
private watchers: {[settingName: string]: RoomWatcherMap} = {}; private watchers = new Map<string, Map<string | symbol, CallbackFn[]>>(); // settingName -> roomId -> CallbackFn[]
// Proxy for handlers to delegate changes to this manager // Proxy for handlers to delegate changes to this manager
public watchSetting(settingName: string, roomId: string | null, cb: CallbackFn) { public watchSetting(settingName: string, roomId: string | null, cb: CallbackFn) {
if (!this.watchers[settingName]) this.watchers[settingName] = {}; if (!this.watchers.has(settingName)) this.watchers.set(settingName, new Map());
if (!this.watchers[settingName][roomId]) this.watchers[settingName][roomId] = []; if (!this.watchers.get(settingName).has(roomId)) this.watchers.get(settingName).set(roomId, []);
this.watchers[settingName][roomId].push(cb); this.watchers.get(settingName).get(roomId).push(cb);
} }
// Proxy for handlers to delegate changes to this manager // Proxy for handlers to delegate changes to this manager
public unwatchSetting(cb: CallbackFn) { public unwatchSetting(cb: CallbackFn) {
for (const settingName of Object.keys(this.watchers)) { this.watchers.forEach((map) => {
for (const roomId of Object.keys(this.watchers[settingName])) { map.forEach((callbacks) => {
let idx; let idx;
while ((idx = this.watchers[settingName][roomId].indexOf(cb)) !== -1) { while ((idx = callbacks.indexOf(cb)) !== -1) {
this.watchers[settingName][roomId].splice(idx, 1); callbacks.splice(idx, 1);
} }
} });
} });
} }
public notifyUpdate(settingName: string, inRoomId: string | null, atLevel: SettingLevel, newValueAtLevel: any) { public notifyUpdate(settingName: string, inRoomId: string | null, atLevel: SettingLevel, newValueAtLevel: any) {
@ -56,21 +52,21 @@ export class WatchManager {
// we also don't have a reliable way to get the old value of a setting. Instead, we'll just // we also don't have a reliable way to get the old value of a setting. Instead, we'll just
// let it fall through regardless and let the receiver dedupe if they want to. // let it fall through regardless and let the receiver dedupe if they want to.
if (!this.watchers[settingName]) return; if (!this.watchers.has(settingName)) return;
const roomWatchers = this.watchers[settingName]; const roomWatchers = this.watchers.get(settingName);
const callbacks = []; const callbacks = [];
if (inRoomId !== null && roomWatchers[inRoomId]) { if (inRoomId !== null && roomWatchers.has(inRoomId)) {
callbacks.push(...roomWatchers[inRoomId]); callbacks.push(...roomWatchers.get(inRoomId));
} }
if (!inRoomId) { if (!inRoomId) {
// Fire updates to all the individual room watchers too, as they probably // Fire updates to all the individual room watchers too, as they probably care about the change higher up.
// care about the change higher up. const callbacks = Array.from(roomWatchers.values()).flat(1);
callbacks.push(...Object.values(roomWatchers).flat(1)); callbacks.push(...callbacks);
} else if (roomWatchers[IRRELEVANT_ROOM]) { } else if (roomWatchers.has(IRRELEVANT_ROOM)) {
callbacks.push(...roomWatchers[IRRELEVANT_ROOM]); callbacks.push(...roomWatchers.get(IRRELEVANT_ROOM));
} }
for (const callback of callbacks) { for (const callback of callbacks) {