ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronization improvements

Browse Source
This commit is contained in:
Ali 2023-02-10 13:58:55 +04:00
parent 0755bab06c
commit 00e72e99a8
5 changed files with 78 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
submodules/TelegramCore/Sources/Account/Account.swift
View File

@ -898,7 +898,10 @@ public class Account {
public private(set) var stateManager: AccountStateManager!
private(set) var contactSyncManager: ContactSyncManager!
public private(set) var callSessionManager: CallSessionManager!
public private(set) var viewTracker: AccountViewTracker!
private var resetPeerHoleManagement: ((PeerId) -> Void)?
public private(set) var pendingMessageManager: PendingMessageManager!
public private(set) var pendingUpdateMessageManager: PendingUpdateMessageManager!
private(set) var messageMediaPreuploadManager: MessageMediaPreuploadManager!
@ -911,6 +914,7 @@ public class Account {
fileprivate let managedStickerPacksDisposable = MetaDisposable()
private let becomeMasterDisposable = MetaDisposable()
private let managedServiceViewsDisposable = MetaDisposable()
private let managedServiceViewsActionDisposable = MetaDisposable()
private let managedOperationsDisposable = DisposableSet()
private var storageSettingsDisposable: Disposable?
private var automaticCacheEvictionContext: AutomaticCacheEvictionContext?
@ -982,6 +986,9 @@ public class Account {
}, shouldKeepOnlinePresence: self.shouldKeepOnlinePresence.get(), peerInputActivityManager: self.peerInputActivityManager, auxiliaryMethods: auxiliaryMethods)
self.viewTracker = AccountViewTracker(account: self)
self.viewTracker.resetPeerHoleManagement = { [weak self] peerId in
self?.resetPeerHoleManagement?(peerId)
}
self.taskManager = AccountTaskManager(
stateManager: self.stateManager,
@ -1085,18 +1092,25 @@ public class Account {
self.network.shouldExplicitelyKeepWorkerConnections.set(self.shouldExplicitelyKeepWorkerConnections.get())
self.network.shouldKeepBackgroundDownloadConnections.set(self.shouldKeepBackgroundDownloadConnections.get())
let serviceTasksMaster = shouldBeMaster
|> deliverOn(self.serviceQueue)
|> mapToSignal { [weak self] value -> Signal<Void, NoError> in
if let strongSelf = self, value {
self.managedServiceViewsDisposable.set(shouldBeMaster.start(next: { [weak self] value in
guard let strongSelf = self else {
return
}
if value {
Logger.shared.log("Account", "Became master")
return managedServiceViews(accountPeerId: peerId, network: strongSelf.network, postbox: strongSelf.postbox, stateManager: strongSelf.stateManager, pendingMessageManager: strongSelf.pendingMessageManager)
let data = managedServiceViews(accountPeerId: peerId, network: network, postbox: postbox, stateManager: strongSelf.stateManager, pendingMessageManager: strongSelf.pendingMessageManager)
let resetPeerHoles = data.resetPeerHoles
strongSelf.resetPeerHoleManagement = { peerId in
resetPeerHoles(peerId)
}
strongSelf.managedServiceViewsActionDisposable.set(data.disposable)
} else {
Logger.shared.log("Account", "Resigned master")
return .never()
strongSelf.managedServiceViewsActionDisposable.set(nil)
}
}
self.managedServiceViewsDisposable.set(serviceTasksMaster.start())
}))
let pendingMessageManager = self.pendingMessageManager
Logger.shared.log("Account", "Begin watching unsent message ids")
@ -1198,6 +1212,7 @@ public class Account {
self.managedContactsDisposable.dispose()
self.managedStickerPacksDisposable.dispose()
self.managedServiceViewsDisposable.dispose()
self.managedServiceViewsActionDisposable.dispose()
self.managedOperationsDisposable.dispose()
self.storageSettingsDisposable?.dispose()
self.smallLogPostDisposable.dispose()

4
submodules/TelegramCore/Sources/State/AccountViewTracker.swift
View File

@ -333,6 +333,8 @@ public final class AccountViewTracker {
public let chatListPreloadItems = Promise<Set<ChatHistoryPreloadItem>>([])
var resetPeerHoleManagement: ((PeerId) -> Void)?
init(account: Account) {
self.account = account
@ -1615,9 +1617,11 @@ public final class AccountViewTracker {
addHole = true
pollingCompleted = .single(true)
}
let resetPeerHoleManagement = self.resetPeerHoleManagement
let isAutomaticallyTracked = self.account!.postbox.transaction { transaction -> Bool in
if transaction.getPeerChatListIndex(peerId) == nil {
if addHole {
resetPeerHoleManagement?(peerId)
transaction.addHole(peerId: peerId, threadId: nil, namespace: Namespaces.Message.Cloud, space: .everywhere, range: 1 ... (Int32.max - 1))
}
return false

64
submodules/TelegramCore/Sources/State/ManagedMessageHistoryHoles.swift
View File

@ -86,6 +86,17 @@ private final class ManagedMessageHistoryHolesContext {
self.currentEntriesDisposable?.dispose()
}
func resetPeer(peerId: PeerId) {
for entry in Array(self.completedEntries.keys) {
switch entry.hole {
case let .peer(peer):
if peer.peerId == peerId {
self.completedEntries.removeValue(forKey: entry)
}
}
}
}
func clearDisposables() -> [Disposable] {
var disposables = Array(self.pendingEntries.map(\.disposable))
disposables.append(contentsOf: self.discardedEntries.map(\.entry.disposable))
@ -196,10 +207,9 @@ private final class ManagedMessageHistoryHolesContext {
}
}
func managedMessageHistoryHoles(accountPeerId: PeerId, network: Network, postbox: Postbox) -> Signal<Void, NoError> {
func managedMessageHistoryHoles(accountPeerId: PeerId, network: Network, postbox: Postbox) -> ((PeerId) -> Void, Disposable) {
let sharedQueue = Queue()
return Signal { _ in
var context: QueueLocalObject<ManagedMessageHistoryHolesContext>? = QueueLocalObject<ManagedMessageHistoryHolesContext>(queue: sharedQueue, generate: {
return ManagedMessageHistoryHolesContext(
queue: sharedQueue,
@ -212,53 +222,13 @@ func managedMessageHistoryHoles(accountPeerId: PeerId, network: Network, postbox
)
})
/*var performWorkImpl: ((@escaping (ManagedMessageHistoryHolesState) -> Void) -> Void)?
let state = Atomic(value: ManagedMessageHistoryHolesState(performWork: { f in
performWorkImpl?(f)
}))
performWorkImpl = { [weak state] f in
state?.with { state in
f(state)
return ({ [weak context] peerId in
context?.with { context in
context.resetPeer(peerId: peerId)
}
}
let disposable = (postbox.messageHistoryHolesView()
|> deliverOn(sharedQueue)).start(next: { view in
let (removed, added, _) = state.with { state in
return state.update(entries: view.entries)
}
for disposable in removed {
disposable.dispose()
}
for (entry, disposable) in added {
switch entry.hole {
case let .peer(hole):
disposable.set((fetchMessageHistoryHole(accountPeerId: accountPeerId, source: .network(network), postbox: postbox, peerInput: .direct(peerId: hole.peerId, threadId: hole.threadId), namespace: hole.namespace, direction: entry.direction, space: entry.space, count: entry.count)
|> afterDisposed {
sharedQueue.async {
state.with { state in
let _ = state
//state.removeCompletedEntry(entry: entry)
}
}
}).start())
}
}
})*/
return ActionDisposable {
}, ActionDisposable {
if context != nil {
context = nil
}
/*disposable.dispose()
for disposable in state.with({ state -> [Disposable] in
state.clearDisposables()
}) {
disposable.dispose()
}*/
}
}
|> runOn(sharedQueue)
})
}

11
submodules/TelegramCore/Sources/State/ManagedServiceViews.swift
View File

@ -2,13 +2,14 @@ import Foundation
import Postbox
import SwiftSignalKit
func managedServiceViews(accountPeerId: PeerId, network: Network, postbox: Postbox, stateManager: AccountStateManager, pendingMessageManager: PendingMessageManager) -> Signal<Void, NoError> {
return Signal { _ in
func managedServiceViews(accountPeerId: PeerId, network: Network, postbox: Postbox, stateManager: AccountStateManager, pendingMessageManager: PendingMessageManager) -> (resetPeerHoles: (PeerId) -> Void, disposable: Disposable) {
let disposable = DisposableSet()
disposable.add(managedMessageHistoryHoles(accountPeerId: accountPeerId, network: network, postbox: postbox).start())
let managedHoles = managedMessageHistoryHoles(accountPeerId: accountPeerId, network: network, postbox: postbox)
disposable.add(managedHoles.1)
disposable.add(managedChatListHoles(network: network, postbox: postbox, accountPeerId: accountPeerId).start())
disposable.add(managedForumTopicListHoles(network: network, postbox: postbox, accountPeerId: accountPeerId).start())
return disposable
}
return (managedHoles.0, disposable)
}

11
submodules/TelegramCore/Sources/State/ResetState.swift
View File

@ -15,9 +15,6 @@ func _internal_resetAccountState(postbox: Postbox, network: Network, accountPeer
return .never()
}
return withResolvedAssociatedMessages(postbox: postbox, source: .network(network), peers: Dictionary(fetchedChats.peers.map({ ($0.id, $0) }), uniquingKeysWith: { lhs, _ in lhs }), storeMessages: fetchedChats.storeMessages, { transaction, additionalPeers, additionalMessages -> Void in
transaction.removeAllChatListEntries(groupId: .root, exceptPeerNamespace: Namespaces.Peer.SecretChat)
transaction.removeAllChatListEntries(groupId: .group(1), exceptPeerNamespace: Namespaces.Peer.SecretChat)
for peerId in transaction.chatListGetAllPeerIds() {
if peerId.namespace != Namespaces.Peer.SecretChat {
transaction.updatePeerChatListInclusion(peerId, inclusion: .notIncluded)
@ -27,14 +24,20 @@ func _internal_resetAccountState(postbox: Postbox, network: Network, accountPeer
transaction.addHole(peerId: peerId, threadId: nil, namespace: Namespaces.Message.Cloud, space: .everywhere, range: 1 ... (Int32.max - 1))
}
if peerId.namespace == Namespaces.Peer.CloudChannel, let channel = transaction.getPeer(peerId) as? TelegramChannel, channel.flags.contains(.isForum) {
if peerId.namespace == Namespaces.Peer.CloudChannel {
if let channel = transaction.getPeer(peerId) as? TelegramChannel, channel.flags.contains(.isForum) {
transaction.setPeerPinnedThreads(peerId: peerId, threadIds: [])
for threadId in transaction.setMessageHistoryThreads(peerId: peerId) {
transaction.setMessageHistoryThreadInfo(peerId: peerId, threadId: threadId, info: nil)
transaction.addHole(peerId: peerId, threadId: threadId, namespace: Namespaces.Message.Cloud, space: .everywhere, range: 1 ... (Int32.max - 1))
}
}
transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, _ in nil })
}
}
transaction.removeAllChatListEntries(groupId: .root, exceptPeerNamespace: Namespaces.Peer.SecretChat)
transaction.removeAllChatListEntries(groupId: .group(1), exceptPeerNamespace: Namespaces.Peer.SecretChat)
updatePeers(transaction: transaction, peers: fetchedChats.peers + additionalPeers, update: { _, updated -> Peer in
return updated