mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 11:35:04 +01:00
Code Issues Projects Releases Wiki Activity

move memberlist load code out of Room

Browse Source
This commit is contained in:
Bruno Windels 2020-08-19 16:44:09 +02:00
parent f7314990e4
commit 4144b0b281
2 changed files with 88 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/matrix/room/Room.js
View File

@ -22,7 +22,7 @@ import {Timeline} from "./timeline/Timeline.js";
import {FragmentIdComparer} from "./timeline/FragmentIdComparer.js"; import {FragmentIdComparer} from "./timeline/FragmentIdComparer.js";
import {SendQueue} from "./sending/SendQueue.js"; import {SendQueue} from "./sending/SendQueue.js";
import {WrappedError} from "../error.js" import {WrappedError} from "../error.js"
import {RoomMember} from "./members/RoomMember.js"; import {fetchOrloadMembers} from "./members/load.js";
import {MemberList} from "./members/MemberList.js"; import {MemberList} from "./members/MemberList.js";
export class Room extends EventEmitter { export class Room extends EventEmitter {
@ -98,57 +98,14 @@ export class Room extends EventEmitter {
this._memberList.retain(); this._memberList.retain();
return this._memberList; return this._memberList;
} else { } else {
let members; const members = await fetchOrloadMembers({
if (!this._summary.hasFetchedMembers) { summary: this._summary,
const paginationToken = this._summary.lastPaginationToken; roomId: this._roomId,
// TODO: move all of this out of Room hsApi: this._hsApi,
storage: this._storage,
// if any members are changed by sync while we're fetching members, // to handle race between /members and /sync
// they will end up here, so we check not to override them setChangedMembersMap: map => this._changedMembersDuringSync = map,
this._changedMembersDuringSync = new Map(); });
const memberResponse = await this._hsApi.members(this._roomId, {at: paginationToken}).response;
const txn = await this._storage.readWriteTxn([
this._storage.storeNames.roomSummary,
this._storage.storeNames.roomMembers,
]);
const summaryChanges = this._summary.writeHasFetchedMembers(true, txn);
const {roomMembers} = txn;
const memberEvents = memberResponse.chunk;
if (!Array.isArray(memberEvents)) {
throw new Error("malformed");
}
members = await Promise.all(memberEvents.map(async memberEvent => {
const userId = memberEvent?.state_key;
if (!userId) {
throw new Error("malformed");
}
// this member was changed during a sync that happened while calling /members
// and thus is more recent. Fetch it instead of overwriting.
if (this._changedMembersDuringSync.has(userId)) {
const memberData = await roomMembers.get(this._roomId, userId);
if (memberData) {
return new RoomMember(memberData);
}
} else {
const member = RoomMember.fromMemberEvent(this._roomId, memberEvent);
if (member) {
roomMembers.set(member.serialize());
}
return member;
}
}));
this._changedMembersDuringSync = null;
await txn.complete();
this._summary.applyChanges(summaryChanges);
} else {
const txn = await this._storage.readTxn([
this._storage.storeNames.roomMembers,
]);
const memberDatas = await txn.roomMembers.getAll(this._roomId);
members = memberDatas.map(d => new RoomMember(d));
}
this._memberList = new MemberList({ this._memberList = new MemberList({
members, members,
closeCallback: () => { this._memberList = null; } closeCallback: () => { this._memberList = null; }

79
src/matrix/room/members/load.js Normal file
View File

@ -0,0 +1,79 @@
/*
Copyright 2020 Bruno Windels <bruno@windels.cloud>
Copyright 2020 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 {RoomMember} from "./RoomMember.js";
async function loadMembers({roomId, storage}) {
const txn = await storage.readTxn([
storage.storeNames.roomMembers,
]);
const memberDatas = await txn.roomMembers.getAll(roomId);
return memberDatas.map(d => new RoomMember(d));
}
async function fetchMembers({summary, roomId, hsApi, storage, setChangedMembersMap}) {
// if any members are changed by sync while we're fetching members,
// they will end up here, so we check not to override them
const changedMembersDuringSync = new Map();
setChangedMembersMap(changedMembersDuringSync);
const memberResponse = await hsApi.members(roomId, {at: summary.lastPaginationToken}).response;
const txn = await storage.readWriteTxn([
storage.storeNames.roomSummary,
storage.storeNames.roomMembers,
]);
const summaryChanges = summary.writeHasFetchedMembers(true, txn);
const {roomMembers} = txn;
const memberEvents = memberResponse.chunk;
if (!Array.isArray(memberEvents)) {
throw new Error("malformed");
}
const members = await Promise.all(memberEvents.map(async memberEvent => {
const userId = memberEvent?.state_key;
if (!userId) {
throw new Error("malformed");
}
// this member was changed during a sync that happened while calling /members
// and thus is more recent, so don't overwrite
if (changedMembersDuringSync.has(userId)) {
const memberData = await roomMembers.get(roomId, userId);
if (memberData) {
return new RoomMember(memberData);
}
} else {
const member = RoomMember.fromMemberEvent(roomId, memberEvent);
if (member) {
roomMembers.set(member.serialize());
}
return member;
}
}));
setChangedMembersMap(null);
await txn.complete();
summary.applyChanges(summaryChanges);
return members;
}
export async function fetchOrLoadMembers(options) {
const {summary} = options;
if (!summary.hasFetchedMembers) {
return fetchMembers(options);
} else {
return loadMembers(options);
}
}