feat(plugins): Optimize badge fetching by using lightweight JSON instead of GraphQL

This commit is contained in:
Jokob @NetAlertX
2026-03-27 07:30:13 +00:00
parent 7305fd78e3
commit 48454f6f2f
3 changed files with 38 additions and 44 deletions

View File

@@ -348,51 +348,38 @@ function postPluginGraphQL(gqlField, prefix, foreignKey, dtRequest, callback) {
});
}
// Fire a single batched GraphQL request to fetch the Objects dbCount for
// every plugin and populate the sidebar badges immediately on page load.
function prefetchPluginBadges() {
const apiToken = getSetting("API_TOKEN");
const apiBase = getApiBase();
const mac = $("#txtMacFilter").val();
const foreignKey = (mac && mac !== "--") ? mac : null;
// Build one aliased sub-query per visible plugin
const prefixes = pluginDefinitions
.filter(p => p.show_ui)
.map(p => p.unique_prefix);
if (prefixes.length === 0) return;
// GraphQL aliases must be valid identifiers — prefixes already are (A-Z0-9_)
const fkOpt = foreignKey ? `, foreignKey: "${foreignKey}"` : '';
const fragments = prefixes.map(p => [
`${p}_obj: pluginsObjects(options: {plugin: "${p}", page: 1, limit: 1${fkOpt}}) { dbCount }`,
`${p}_evt: pluginsEvents(options: {plugin: "${p}", page: 1, limit: 1${fkOpt}}) { dbCount }`,
`${p}_hist: pluginsHistory(options: {plugin: "${p}", page: 1, limit: 1${fkOpt}}) { dbCount }`,
].join('\n ')).join('\n ');
const query = `query BadgeCounts {\n ${fragments}\n }`;
$.ajax({
method: "POST",
url: `${apiBase}/graphql`,
headers: { "Authorization": `Bearer ${apiToken}`, "Content-Type": "application/json" },
data: JSON.stringify({ query }),
success: function(response) {
if (response.errors) {
console.error("[plugins] badge prefetch errors:", response.errors);
return;
}
prefixes.forEach(p => {
const obj = response.data[`${p}_obj`];
const evt = response.data[`${p}_evt`];
const hist = response.data[`${p}_hist`];
if (obj) { $(`#badge_${p}`).text(obj.dbCount); $(`#objCount_${p}`).text(obj.dbCount); }
if (evt) { $(`#evtCount_${p}`).text(evt.dbCount); }
if (hist) { $(`#histCount_${p}`).text(hist.dbCount); }
});
// Fetch the lightweight plugins_stats.json (~1KB) and populate all badge
// and sub-tab counts instantly — no GraphQL, no 250MB file loads.
async function prefetchPluginBadges() {
try {
const stats = await fetchJson('table_plugins_stats.json');
// Build lookup: { ARPSCAN: { objects: 42, events: 3, history: 100 }, ... }
const counts = {};
for (const row of stats.data) {
const p = row.tableName; // 'objects' | 'events' | 'history'
const plugin = row.plugin;
if (!counts[plugin]) counts[plugin] = { objects: 0, events: 0, history: 0 };
counts[plugin][p] = row.cnt;
}
});
for (const [prefix, c] of Object.entries(counts)) {
$(`#badge_${prefix}`).text(c.objects);
$(`#objCount_${prefix}`).text(c.objects);
$(`#evtCount_${prefix}`).text(c.events);
$(`#histCount_${prefix}`).text(c.history);
}
// Set 0 for plugins with no rows in any table
pluginDefinitions.filter(p => p.show_ui).forEach(p => {
const prefix = p.unique_prefix;
if (!counts[prefix]) {
$(`#badge_${prefix}`).text(0);
$(`#objCount_${prefix}`).text(0);
$(`#evtCount_${prefix}`).text(0);
$(`#histCount_${prefix}`).text(0);
}
});
} catch (err) {
console.error('[plugins] badge prefetch failed:', err);
}
}
function generateTabs() {

View File

@@ -16,6 +16,7 @@ from const import (
sql_plugins_events,
sql_plugins_history,
sql_plugins_objects,
sql_plugins_stats,
sql_language_strings,
sql_notifications_all,
sql_online_history,
@@ -66,6 +67,7 @@ def update_api(
["plugins_events", sql_plugins_events],
["plugins_history", sql_plugins_history],
["plugins_objects", sql_plugins_objects],
["plugins_stats", sql_plugins_stats],
["plugins_language_strings", sql_language_strings],
["notifications", sql_notifications_all],
["online_history", sql_online_history],

View File

@@ -120,6 +120,11 @@ sql_events_pending_alert = "SELECT * FROM Events where evePendingAlertEmail is
sql_events_all = "SELECT rowid, * FROM Events ORDER BY eveDateTime DESC"
sql_settings = "SELECT * FROM Settings"
sql_plugins_objects = "SELECT * FROM Plugins_Objects"
sql_plugins_stats = """SELECT 'objects' AS tableName, plugin, COUNT(*) AS cnt FROM Plugins_Objects GROUP BY plugin
UNION ALL
SELECT 'events', plugin, COUNT(*) FROM Plugins_Events GROUP BY plugin
UNION ALL
SELECT 'history', plugin, COUNT(*) FROM Plugins_History GROUP BY plugin"""
sql_language_strings = "SELECT * FROM Plugins_Language_Strings"
sql_notifications_all = "SELECT * FROM Notifications"
sql_online_history = "SELECT * FROM Online_History"