ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Caching the room proxies and their messages. Improved performance throughout.

Browse Source
This commit is contained in:
Stefan Ceriu
2022-03-31 15:37:52 +03:00
parent b50bf724a3
commit 49f7678ce8
22 changed files with 191 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Authentication/UserSession.swift
+29 -18
View File
@@ -32,7 +32,9 @@ private class WeakUserSessionWrapper: ClientDelegate {
class UserSession: ClientDelegate {
private let client: Client
private var rooms: [RoomProxy] = [] {
private let processingQueue: DispatchQueue
private(set) var rooms: [RoomProxy] = [] {
didSet {
self.callbacks.send(.updatedRoomsList)
}
@@ -48,10 +50,13 @@ class UserSession: ClientDelegate {
init(client: Client) {
self.client = client
self.processingQueue = DispatchQueue(label: "UserSessionProcessingQueue")
self.mediaProvider = MediaProvider(client: client, imageCache: ImageCache.default)
client.setDelegate(delegate: WeakUserSessionWrapper(userSession: self))
client.startSync()
updateRooms()
}
var userIdentifier: String {
@@ -81,33 +86,39 @@ class UserSession: ClientDelegate {
}
}
func getRoomList(_ completion: @escaping ([RoomProxyProtocol]) -> Void) {
fetchRoomList(completion)
}
// MARK: ClientDelegate
func didReceiveSyncUpdate() {
fetchRoomList { [weak self] rooms in
guard let self = self else { return }
if self.rooms != rooms {
self.rooms = rooms
}
}
client.setDelegate(delegate: nil)
updateRooms()
}
// MARK: Private
func fetchRoomList(_ completion: @escaping ([RoomProxy]) -> Void) {
DispatchQueue.global(qos: .background).async {
let rooms = self.client.rooms().map {
return RoomProxy(room: $0, messageFactory: RoomMessageFactory())
func updateRooms() {
var currentRooms = self.rooms
self.processingQueue.async { [weak self] in
guard let self = self else {
return
}
let sdkRooms = self.client.rooms()
let diff = sdkRooms.map({ $0.id()}).difference(from: currentRooms.map({ $0.id }))
for change in diff {
switch change {
case .insert(_, let id, _):
guard let sdkRoom = sdkRooms.first(where: { $0.id() == id }) else {
MXLog.error("Failed retrieving sdk room with id: \(id)")
break
}
currentRooms.append(RoomProxy(room: sdkRoom, messageFactory: RoomMessageFactory()))
case .remove(_, let id, _):
currentRooms.removeAll { $0.id == id }
}
}
DispatchQueue.main.async {
completion(rooms)
self.rooms = currentRooms
}
}
}
ElementX/Sources/Services/Media/MediaProvider.swift
+1 -1
View File
@@ -18,7 +18,7 @@ struct MediaProvider: MediaProviderProtocol {
init(client: Client, imageCache: Kingfisher.ImageCache) {
self.client = client
self.imageCache = imageCache
self.processingQueue = DispatchQueue(label: "MediaProviderProcessingQueue")
self.processingQueue = DispatchQueue(label: "MediaProviderProcessingQueue", attributes: .concurrent)
}
func imageForURL(_ url: String?) -> UIImage? {
ElementX/Sources/Services/Room/Members/MemberDetailsProvider.swift
+26 -39
View File
@@ -10,7 +10,6 @@ import Foundation
class MemberDetailsProvider: MemberDetailsProviderProtocol {
private let roomProxy: RoomProxyProtocol?
private let processingQueue = DispatchQueue(label: "MemberDetailsProviderProcessingQueue")
private var memberAvatars = [String: String]()
private var memberDisplayNames = [String: String]()
@@ -31,25 +30,19 @@ class MemberDetailsProvider: MemberDetailsProviderProtocol {
completion(.success(avatarURL))
}
processingQueue.async {
roomProxy.avatarURLForUserId(userId, completion: { [weak self] result in
guard let self = self else {
return
}
switch result {
case .success(let avatarURL):
DispatchQueue.main.async {
self.memberAvatars[userId] = avatarURL
completion(.success(avatarURL))
}
case .failure:
DispatchQueue.main.async {
completion(.failure(.failedRetrievingUserAvatarURL))
}
}
})
}
roomProxy.avatarURLForUserId(userId, completion: { [weak self] result in
guard let self = self else {
return
}
switch result {
case .success(let avatarURL):
self.memberAvatars[userId] = avatarURL
completion(.success(avatarURL))
case .failure:
completion(.failure(.failedRetrievingUserAvatarURL))
}
})
}
func displayNameForUserId(_ userId: String) -> String? {
@@ -65,24 +58,18 @@ class MemberDetailsProvider: MemberDetailsProviderProtocol {
completion(.success(avatarURL))
}
processingQueue.async {
roomProxy.displayNameForUserId(userId, completion: { [weak self] result in
guard let self = self else {
return
}
switch result {
case .success(let displayName):
DispatchQueue.main.async {
self.memberDisplayNames[userId] = displayName
completion(.success(displayName))
}
case .failure:
DispatchQueue.main.async {
completion(.failure(.failedRetrievingUserDisplayName))
}
}
})
}
roomProxy.displayNameForUserId(userId, completion: { [weak self] result in
guard let self = self else {
return
}
switch result {
case .success(let displayName):
self.memberDisplayNames[userId] = displayName
completion(.success(displayName))
case .failure:
completion(.failure(.failedRetrievingUserDisplayName))
}
})
}
}
ElementX/Sources/Services/Room/MockRoomProxy.swift
+2 -2
View File
@@ -15,7 +15,7 @@ struct MockRoomProxy: RoomProxyProtocol {
let displayName: String
let topic: String? = nil
let lastMessage: String? = "Last message"
let messages: [RoomMessageProtocol] = []
let avatarURL: String? = nil
@@ -35,7 +35,7 @@ struct MockRoomProxy: RoomProxyProtocol {
}
func paginateBackwards(count: UInt, callback: ((Result<[RoomMessageProtocol], RoomProxyError>) -> Void)?) {
func paginateBackwards(count: UInt, callback: ((Result<Void, RoomProxyError>) -> Void)?) {
}
ElementX/Sources/Services/Room/RoomProxy.swift
+26 -36
View File
@@ -27,22 +27,31 @@ private class WeakRoomProxyWrapper: RoomDelegate {
}
}
class RoomProxy: RoomProxyProtocol, Equatable {
class RoomProxy: RoomProxyProtocol {
private let room: Room
private let messageFactory: RoomMessageFactory
private let processingQueue: DispatchQueue
private let generalProcessingQueue: DispatchQueue
private let messageProcessingQueue: DispatchQueue
private var backwardStream: BackwardsStreamProtocol?
let callbacks = PassthroughSubject<RoomProxyCallback, Never>()
private(set) var messages: [RoomMessageProtocol]
init(room: Room, messageFactory: RoomMessageFactory) {
self.room = room
self.messageFactory = messageFactory
processingQueue = DispatchQueue(label: "RoomProxyProcessingQueue")
generalProcessingQueue = DispatchQueue(label: "RoomProxyGeneralProcessingQueue")
messageProcessingQueue = DispatchQueue(label: "RoomProxyMessageProcessingQueue")
messages = []
processingQueue.async {
self.backwardStream = room.startLiveEventListener()
messageProcessingQueue.async {
let backwardStream = room.startLiveEventListener()
DispatchQueue.main.async {
self.backwardStream = backwardStream
}
}
room.setDelegate(delegate: WeakRoomProxyWrapper(roomProxy: self))
@@ -80,22 +89,12 @@ class RoomProxy: RoomProxyProtocol, Equatable {
room.isTombstoned()
}
var lastMessage: String? {
didSet {
if lastMessage == oldValue {
return
}
callbacks.send(.updatedLastMessage)
}
}
var avatarURL: String? {
room.avatarUrl()
}
func avatarURLForUserId(_ userId: String, completion: @escaping (Result<String?, RoomProxyError>) -> Void) {
processingQueue.async {
generalProcessingQueue.async {
do {
let avatarURL = try self.room.memberAvatarUrl(userId: userId)
@@ -111,10 +110,10 @@ class RoomProxy: RoomProxyProtocol, Equatable {
}
func displayNameForUserId(_ userId: String, completion: @escaping (Result<String?, RoomProxyError>) -> Void) {
processingQueue.async {
generalProcessingQueue.async {
do {
let displayName = try self.room.memberDisplayName(userId: userId)
DispatchQueue.main.async {
completion(.success(displayName))
}
@@ -127,10 +126,10 @@ class RoomProxy: RoomProxyProtocol, Equatable {
}
func displayName(_ completion: @escaping (Result<String, RoomProxyError>) -> Void) {
processingQueue.async {
generalProcessingQueue.async {
do {
let displayName = try self.room.displayName()
DispatchQueue.main.async {
completion(.success(displayName))
}
@@ -142,8 +141,8 @@ class RoomProxy: RoomProxyProtocol, Equatable {
}
}
func paginateBackwards(count: UInt, callback: ((Result<[RoomMessageProtocol], RoomProxyError>) -> Void)?) {
processingQueue.async {
func paginateBackwards(count: UInt, callback: ((Result<Void, RoomProxyError>) -> Void)?) {
messageProcessingQueue.async {
guard let backwardStream = self.backwardStream else {
DispatchQueue.main.async {
callback?(.failure(.backwardStreamNotAvailable))
@@ -153,29 +152,20 @@ class RoomProxy: RoomProxyProtocol, Equatable {
let messages = backwardStream.paginateBackwards(count: UInt64(count)).map { message in
self.messageFactory.buildRoomMessageFrom(message)
}
}.reversed()
DispatchQueue.main.async {
callback?(.success(messages))
if self.lastMessage == nil {
self.lastMessage = messages.last?.body ?? ""
}
self.messages.insert(contentsOf: messages, at: 0)
callback?(.success(()))
}
}
}
// MARK: - Equatable
static func == (lhs: RoomProxy, rhs: RoomProxy) -> Bool {
lhs.id == rhs.id
}
// MARK: - Private
fileprivate func appendMessage(_ message: AnyMessage) {
let message = self.messageFactory.buildRoomMessageFrom(message)
lastMessage = message.body
callbacks.send(.addedMessage(message))
messages.append(message)
callbacks.send(.updatedMessages)
}
}
ElementX/Sources/Services/Room/RoomProxyProtocol.swift
+3 -4
View File
@@ -17,8 +17,7 @@ enum RoomProxyError: Error {
}
enum RoomProxyCallback {
case addedMessage(RoomMessageProtocol)
case updatedLastMessage
case updatedMessages
}
protocol RoomProxyProtocol {
@@ -32,7 +31,7 @@ protocol RoomProxyProtocol {
var name: String? { get }
var topic: String? { get }
var lastMessage: String? { get }
var messages: [RoomMessageProtocol] { get }
var avatarURL: String? { get }
@@ -42,7 +41,7 @@ protocol RoomProxyProtocol {
func displayNameForUserId(_ userId: String, completion: @escaping (Result<String?, RoomProxyError>) -> Void)
func paginateBackwards(count: UInt, callback: ((Result<[RoomMessageProtocol], RoomProxyError>) -> Void)?)
func paginateBackwards(count: UInt, callback: ((Result<Void, RoomProxyError>) -> Void)?)
var callbacks: PassthroughSubject<RoomProxyCallback, Never> { get }
}
ElementX/Sources/Services/Timeline/RoomTimelineController.swift
+3 -1
View File
@@ -35,11 +35,13 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
guard let self = self else { return }
switch callback {
case .addedMessage:
case .updatedMessages:
self.updateTimelineItems()
}
}.store(in: &cancellables)
updateTimelineItems()
NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil)
}
ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift
+9 -10
View File
@@ -14,7 +14,6 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
private var cancellables = Set<AnyCancellable>()
let callbacks = PassthroughSubject<RoomTimelineCallback, Never>()
private(set) var messages = [RoomMessageProtocol]()
init(roomProxy: RoomProxyProtocol) {
self.roomProxy = roomProxy
@@ -23,24 +22,24 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
guard let self = self else { return }
switch callback {
case .addedMessage(let message):
self.messages.append(message)
self.callbacks.send(.addedMessage)
case .updatedLastMessage:
break
case .updatedMessages:
self.callbacks.send(.updatedMessages)
}
}.store(in: &cancellables)
}
func paginateBackwards(_ count: UInt, callback: ((Result<([RoomMessageProtocol]), RoomTimelineError>) -> Void)?) {
func paginateBackwards(_ count: UInt, callback: ((Result<Void, RoomTimelineError>) -> Void)?) {
self.roomProxy.paginateBackwards(count: count) { result in
switch result {
case .success(let messages):
self.messages.insert(contentsOf: messages.reversed(), at: 0)
callback?(.success((self.messages)))
case .success:
callback?(.success(()))
case .failure:
callback?(.failure(.generic))
}
}
}
var messages: [RoomMessageProtocol] {
roomProxy.messages
}
}
ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift
+2 -2
View File
@@ -10,7 +10,7 @@ import Foundation
import Combine
enum RoomTimelineCallback {
case addedMessage
case updatedMessages
}
enum RoomTimelineError: Error {
@@ -22,5 +22,5 @@ protocol RoomTimelineProviderProtocol {
var messages: [RoomMessageProtocol] { get }
func paginateBackwards(_ count: UInt, callback: ((Result<([RoomMessageProtocol]), RoomTimelineError>) -> Void)?)
func paginateBackwards(_ count: UInt, callback: ((Result<Void, RoomTimelineError>) -> Void)?)
}