lee/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-12-12 02:57:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ab: sync all recent peers if option enabled

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-08-16 08:59:50 +08:00
parent 29c661d919
commit 553a3798a1
42 changed files with 183 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
flutter/lib/models/ab_model.dart
View File

@@ -344,33 +344,28 @@ class AbModel {
}
Future<void> _syncFromRecentWithoutLock({bool push = true}) async {
bool shouldSync(Peer a, Peer b) {
return a.hash != b.hash ||
a.username != b.username ||
a.platform != b.platform ||
a.hostname != b.hostname ||
a.alias != b.alias;
bool shouldSync(Peer r, Peer p) {
return r.hash != p.hash ||
r.username != p.username ||
r.platform != p.platform ||
r.hostname != p.hostname ||
(p.alias.isEmpty && r.alias.isNotEmpty);
}
Future<List<Peer>> getRecentPeers() async {
try {
if (peers.isEmpty) [];
List<String> filteredPeerIDs;
if (_syncAllFromRecent) {
_syncAllFromRecent = false;
filteredPeerIDs = peers.map((e) => e.id).toList();
filteredPeerIDs = [];
} else {
final new_stored_str = await bind.mainGetNewStoredPeers();
if (new_stored_str.isEmpty) return [];
List<String> new_stores =
(jsonDecode(new_stored_str) as List<dynamic>)
.map((e) => e.toString())
.toList();
final abPeerIds = peers.map((e) => e.id).toList();
filteredPeerIDs =
new_stores.where((e) => abPeerIds.contains(e)).toList();
filteredPeerIDs = (jsonDecode(new_stored_str) as List<dynamic>)
.map((e) => e.toString())
.toList();
if (filteredPeerIDs.isEmpty) return [];
}
if (filteredPeerIDs.isEmpty) return [];
final loadStr = await bind.mainLoadRecentPeersForAb(
filter: jsonEncode(filteredPeerIDs));
if (loadStr.isEmpty) {
@@ -392,28 +387,32 @@ class AbModel {
try {
if (!shouldSyncAb()) return;
final oldPeers = peers.toList();
final recents = await getRecentPeers();
if (recents.isEmpty) return;
for (var i = 0; i < peers.length; i++) {
var p = peers[i];
var r = recents.firstWhereOrNull((r) => p.id == r.id);
if (r != null) {
peers[i] = merge(r, p);
}
}
bool changed = false;
for (var i = 0; i < peers.length; i++) {
final o = oldPeers[i];
final p = peers[i];
if (shouldSync(o, p)) {
changed = true;
break;
bool syncChanged = false;
bool uiChanged = false;
for (var i = 0; i < recents.length; i++) {
var r = recents[i];
var index = peers.indexWhere((e) => e.id == r.id);
if (index < 0) {
peers.add(r);
syncChanged = true;
uiChanged = true;
} else {
if (!r.equal(peers[index])) {
uiChanged = true;
}
if (shouldSync(r, peers[index])) {
syncChanged = true;
}
peers[index] = merge(r, peers[index]);
}
}
// Be careful with loop calls
if (changed && push) {
if (syncChanged && push) {
pushAb();
} else if (uiChanged) {
peers.refresh();
}
} catch (e) {
debugPrint('syncFromRecent:$e');

14
flutter/lib/models/peer_model.dart
View File

@@ -1,6 +1,8 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'platform_model.dart';
// ignore: depend_on_referenced_packages
import 'package:collection/collection.dart';
class Peer {
final String id;
@@ -87,6 +89,18 @@ class Peer {
rdpPort: '',
rdpUsername: '',
);
bool equal(Peer other) {
return id == other.id &&
hash == other.hash &&
username == other.username &&
hostname == other.hostname &&
platform == other.platform &&
alias == other.alias &&
tags.equals(other.tags) &&
forceAlwaysRelay == other.forceAlwaysRelay &&
rdpPort == other.rdpPort &&
rdpUsername == other.rdpUsername;
}
}
enum UpdateEvent { online, load }