From ce72d53d1a30940443de01a64542ed19685185a3 Mon Sep 17 00:00:00 2001
From: somebodywashere <68244480+somebodywashere@users.noreply.github.com>
Date: Wed, 6 Aug 2025 16:42:32 +0300
Subject: [PATCH] fix: inbounds slow loading (#3228) (#3322)
especially encountered on big amount of clients
---
web/html/inbounds.html | 49 ++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 28 deletions(-)
diff --git a/web/html/inbounds.html b/web/html/inbounds.html
index e1267190..e2b98d49 100644
--- a/web/html/inbounds.html
+++ b/web/html/inbounds.html
@@ -405,9 +405,9 @@
[[ clientEmail ]]
- [[ getClientWithComment(clientEmail, dbInbound.id).comment ]]
+ [[ clientCount[dbInbound.id].comments.get(clientEmail) ]]
-
+
@@ -419,9 +419,9 @@
[[ clientEmail ]]
- [[ getClientWithComment(clientEmail, dbInbound.id).comment ]]
+ [[ clientCount[dbInbound.id].comments.get(clientEmail) ]]
-
+
@@ -433,9 +433,9 @@
[[ clientEmail ]]
- [[ getClientWithComment(clientEmail, dbInbound.id).comment ]]
+ [[ clientCount[dbInbound.id].comments.get(clientEmail) ]]
-
+
@@ -447,9 +447,9 @@
[[ clientEmail ]]
- [[ getClientWithComment(clientEmail, dbInbound.id).comment ]]
+ [[ clientCount[dbInbound.id].comments.get(clientEmail) ]]
-
+
@@ -534,9 +534,9 @@
[[ clientEmail ]]
- [[ getClientWithComment(clientEmail, dbInbound.id).comment ]]
+ [[ clientCount[dbInbound.id].comments.get(clientEmail) ]]
-
+
@@ -548,9 +548,9 @@
[[ clientEmail ]]
- [[ getClientWithComment(clientEmail, dbInbound.id).comment ]]
+ [[ clientCount[dbInbound.id].comments.get(clientEmail) ]]
-
+
@@ -562,9 +562,9 @@
[[ clientEmail ]]
- [[ getClientWithComment(clientEmail, dbInbound.id).comment ]]
+ [[ clientCount[dbInbound.id].comments.get(clientEmail) ]]
-
+
@@ -576,9 +576,9 @@
[[ clientEmail ]]
- [[ getClientWithComment(clientEmail, dbInbound.id).comment ]]
+ [[ clientCount[dbInbound.id].comments.get(clientEmail) ]]
-
+
@@ -811,17 +811,6 @@
loading(spinning = true) {
this.loadingStates.spinning = spinning;
},
- getClientWithComment(email, inboundId) {
- const dbInbound = this.dbInbounds.find(inbound => inbound.id === inboundId);
- if (!dbInbound) return { email, comment: '' };
-
- const inboundSettings = JSON.parse(dbInbound.settings);
- if (inboundSettings.clients) {
- const client = inboundSettings.clients.find(c => c.email === email);
- return client ? { email: client.email, comment: client.comment || '' } : { email, comment: '' };
- }
- return { email, comment: '' };
- },
async getDBInbounds() {
this.refreshing = true;
const msg = await HttpUtil.post('/panel/inbound/list');
@@ -893,7 +882,7 @@
}
},
getClientCounts(dbInbound, inbound) {
- let clientCount = 0, active = [], deactive = [], depleted = [], expiring = [], online = [];
+ let clientCount = 0, active = [], deactive = [], depleted = [], expiring = [], online = [], comments = new Map();
clients = inbound.clients;
clientStats = dbInbound.clientStats
now = new Date().getTime()
@@ -901,6 +890,9 @@
clientCount = clients.length;
if (dbInbound.enable) {
clients.forEach(client => {
+ if (client.comment) {
+ comments.set(client.email, client.comment)
+ }
if (client.enable) {
active.push(client.email);
if (this.isClientOnline(client.email)) online.push(client.email);
@@ -929,6 +921,7 @@
depleted: depleted,
expiring: expiring,
online: online,
+ comments: comments,
};
},