vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-03-30 23:03:03 -07:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

FE: refactor apiBase

Browse Source 
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
jokob-sk
2026-01-10 08:46:16 +11:00
parent 49a075ca9d
commit 07277985b1
10 changed files with 76 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/DEBUG_INVALID_JSON.md
View File

@@ -9,7 +9,6 @@ Check the the HTTP response of the failing backend call by following these steps
- Copy the URL causing the error and enter it in the address bar of your browser directly and hit enter. The copied URLs could look something like this (notice the query strings at the end): - Copy the URL causing the error and enter it in the address bar of your browser directly and hit enter. The copied URLs could look something like this (notice the query strings at the end):
- `http://<server>:20211/api/table_devices.json?nocache=1704141103121` - `http://<server>:20211/api/table_devices.json?nocache=1704141103121`
- `http://<server>:20211/php/server/devices.php?action=getDevicesTotals`
- Post the error response in the existing issue thread on GitHub or create a new issue and include the redacted response of the failing query. - Post the error response in the existing issue thread on GitHub or create a new issue and include the redacted response of the failing query.

4
front/deviceDetails.php
View File

@@ -418,8 +418,8 @@ async function renderSmallBoxes() {
// Get data from the server // Get data from the server
const apiToken = getSetting("API_TOKEN"); const apiToken = getSetting("API_TOKEN");
const apiBase = getApiBase(); const apiBaseUrl = getApiBase();
const url = `${apiBase}/device/${getMac()}?period=${encodeURIComponent(period)}`; const url = `${apiBaseUrl}/device/${getMac()}?period=${encodeURIComponent(period)}`;
const response = await fetch(url, { const response = await fetch(url, {
method: "GET", method: "GET",

10
front/deviceDetailsEdit.php
View File

@@ -46,8 +46,8 @@ function getDeviceData() {
const apiToken = getSetting("API_TOKEN"); const apiToken = getSetting("API_TOKEN");
let period = $("#period").val() let period = $("#period").val()
const apiBase = getApiBase(); const apiBaseUrl = getApiBase();
const url = `${apiBase}/device/${mac}?period=${encodeURIComponent(period)}`; const url = `${apiBaseUrl}/device/${mac}?period=${encodeURIComponent(period)}`;
// get data from server // get data from server
$.ajax({ $.ajax({
@@ -89,7 +89,7 @@ function getDeviceData() {
] ]
}; };
const graphQlUrl = `${apiBase}/graphql`; const graphQlUrl = `${apiBaseUrl}/graphql`;
$.ajax({ $.ajax({
url: graphQlUrl, url: graphQlUrl,
@@ -354,7 +354,7 @@ function setDeviceData(direction = '', refreshCallback = '') {
showSpinner(); showSpinner();
const apiToken = getSetting("API_TOKEN"); // dynamic token const apiToken = getSetting("API_TOKEN"); // dynamic token
const apiBase = getApiBase(); const apiBaseUrl = getApiBase();
mac = $('#NEWDEV_devMac').val(); mac = $('#NEWDEV_devMac').val();
@@ -402,7 +402,7 @@ function setDeviceData(direction = '', refreshCallback = '') {
$.ajax({ $.ajax({
url: `${apiBase}/device/${encodeURIComponent(mac)}`, url: `${apiBaseUrl}/device/${encodeURIComponent(mac)}`,
type: "POST", type: "POST",
headers: { headers: {
"Authorization": "Bearer " + apiToken, "Authorization": "Bearer " + apiToken,

4
front/deviceDetailsEvents.php
View File

@@ -50,8 +50,8 @@ function loadEventsData() {
const apiToken = getSetting("API_TOKEN"); const apiToken = getSetting("API_TOKEN");
const apiBase = getApiBase(); const apiBaseUrl = getApiBase();
const url = `${apiBase}/dbquery/read`; const url = `${apiBaseUrl}/dbquery/read`;
$.ajax({ $.ajax({
url: url, url: url,

4
front/deviceDetailsPresence.php
View File

@@ -38,8 +38,8 @@
function loadPresenceData() { function loadPresenceData() {
const apiToken = getSetting("API_TOKEN"); const apiToken = getSetting("API_TOKEN");
const apiBase = getApiBase(); const apiBaseUrl = getApiBase();
const url = `${apiBase}/sessions/calendar`; const url = `${apiBaseUrl}/sessions/calendar`;
$('#calendar').fullCalendar('removeEventSources'); $('#calendar').fullCalendar('removeEventSources');

4
front/deviceDetailsSessions.php
View File

@@ -105,8 +105,8 @@ function loadSessionsData() {
// Build API base // Build API base
const apiToken = getSetting("API_TOKEN"); const apiToken = getSetting("API_TOKEN");
const apiBase = getApiBase(); const apiBaseUrl = getApiBase();
const url = `${apiBase}/sessions/${getMac()}?period=${encodeURIComponent(period)}`; const url = `${apiBaseUrl}/sessions/${getMac()}?period=${encodeURIComponent(period)}`;
// Call API with Authorization header // Call API with Authorization header
$.ajax({ $.ajax({

38
front/deviceDetailsTools.php
View File

@@ -211,22 +211,16 @@
<script> <script>
const protocol = window.location.protocol; const apiToken = getSetting("API_TOKEN");
const host = window.location.hostname; const apiBaseUrl = getApiBase();
const port = getSetting("GRAPHQL_PORT");
const apiToken = getSetting("API_TOKEN");
// ---------------------------------------------------------------- // ----------------------------------------------------------------
function manualnmapscan(targetip, mode) { function manualnmapscan(targetip, mode) {
$("#scanoutput").empty(); $("#scanoutput").empty();
const baseUrl = getApiBase();
$.ajax({ $.ajax({
method: "POST", method: "POST",
url: `${baseUrl}/nettools/nmap`, url: `${apiBaseUrl}/nettools/nmap`,
contentType: "application/json", contentType: "application/json",
dataType: "json", dataType: "json",
data: JSON.stringify({ data: JSON.stringify({
@@ -265,7 +259,7 @@
$.ajax({ $.ajax({
method: "GET", method: "GET",
url: `${protocol}//${host}:${port}/nettools/speedtest`, url: `${apiBaseUrl}/nettools/speedtest`,
headers: { headers: {
"Authorization": "Bearer " + apiToken, "Authorization": "Bearer " + apiToken,
"Content-Type": "application/json" "Content-Type": "application/json"
@@ -316,7 +310,7 @@
$.ajax({ $.ajax({
method: "POST", method: "POST",
url: `${protocol}//${host}:${port}/nettools/traceroute`, url: `${apiBaseUrl}/nettools/traceroute`,
headers: { headers: {
"Authorization": "Bearer " + apiToken, "Authorization": "Bearer " + apiToken,
"Content-Type": "application/json" "Content-Type": "application/json"
@@ -362,11 +356,9 @@
$("#nslookupoutput").empty(); $("#nslookupoutput").empty();
$.ajax({ $.ajax({
method: "POST", method: "POST",
url: `${protocol}//${host}:${port}/nettools/nslookup`, url: `${apiBaseUrl}/nettools/nslookup`,
headers: { headers: {
"Authorization": "Bearer " + apiToken, "Authorization": "Bearer " + apiToken,
"Content-Type": "application/json" "Content-Type": "application/json"
@@ -450,7 +442,7 @@
$.ajax({ $.ajax({
method: "POST", method: "POST",
url: `${protocol}//${host}:${port}/nettools/wakeonlan`, url: `${apiBaseUrl}/nettools/wakeonlan`,
headers: { headers: {
"Authorization": "Bearer " + apiToken, "Authorization": "Bearer " + apiToken,
"Content-Type": "application/json" "Content-Type": "application/json"
@@ -492,7 +484,7 @@
$.ajax({ $.ajax({
method: "POST", method: "POST",
url: `${protocol}//${host}:${port}/device/copy`, url: `${apiBaseUrl}/device/copy`,
headers: { headers: {
"Authorization": "Bearer " + apiToken, "Authorization": "Bearer " + apiToken,
"Content-Type": "application/json" "Content-Type": "application/json"
@@ -585,18 +577,14 @@
return; return;
} }
const protocol = window.location.protocol; // "http:" or "https:"
const host = window.location.hostname; // current hostname
const port = getSetting("GRAPHQL_PORT"); // your dynamic port
const apiToken = getSetting("API_TOKEN"); // optional token if needed const apiToken = getSetting("API_TOKEN"); // optional token if needed
// Build base URL dynamically
const baseUrl = getApiBase();
// Delete device events // Delete device events
$.ajax({ $.ajax({
method: "DELETE", method: "DELETE",
url: `${baseUrl}/device/${encodeURIComponent(mac)}/events/delete`, url: `${apiBaseUrl}/device/${encodeURIComponent(mac)}/events/delete`,
headers: { headers: {
"Authorization": "Bearer " + apiToken "Authorization": "Bearer " + apiToken
}, },
@@ -641,11 +629,9 @@
return; return;
} }
const baseUrl = getApiBase();
$.ajax({ $.ajax({
method: "POST", method: "POST",
url: `${baseUrl}/device/${encodeURIComponent(mac)}/reset-props`, url: `${apiBaseUrl}/device/${encodeURIComponent(mac)}/reset-props`,
dataType: "json", dataType: "json",
headers: { headers: {
"Authorization": "Bearer " + apiToken "Authorization": "Bearer " + apiToken
@@ -675,7 +661,7 @@
$.ajax({ $.ajax({
method: "GET", method: "GET",
url: `${protocol}//${host}:${port}/nettools/internetinfo`, url: `${apiBaseUrl}/nettools/internetinfo`,
headers: { headers: {
"Authorization": "Bearer " + apiToken, "Authorization": "Bearer " + apiToken,
"Content-Type": "application/json" "Content-Type": "application/json"

36
front/php/server/devices.php
View File

@@ -44,7 +44,6 @@
case 'ExportCSV': ExportCSV(); break; // equivalent: export_devices case 'ExportCSV': ExportCSV(); break; // equivalent: export_devices
case 'ImportCSV': ImportCSV(); break; // equivalent: import_csv case 'ImportCSV': ImportCSV(); break; // equivalent: import_csv
case 'getDevicesTotals': getDevicesTotals(); break; // equivalent: devices_totals
case 'getDevicesListCalendar': getDevicesListCalendar(); break; // equivalent: devices_by_status case 'getDevicesListCalendar': getDevicesListCalendar(); break; // equivalent: devices_by_status
case 'updateNetworkLeaf': updateNetworkLeaf(); break; // equivalent: update_device_column(mac, column_name, column_value) case 'updateNetworkLeaf': updateNetworkLeaf(); break; // equivalent: update_device_column(mac, column_name, column_value)
@@ -338,41 +337,6 @@ function ImportCSV() {
} }
//------------------------------------------------------------------------------
// Query total numbers of Devices by status
//------------------------------------------------------------------------------
function getDevicesTotals() {
$resultJSON = "";
if(getCache("getDevicesTotals") != "")
{
$resultJSON = getCache("getDevicesTotals");
} else
{
global $db;
// combined query
$result = $db->query(
'SELECT
(SELECT COUNT(*) FROM Devices '. getDeviceCondition ('my').') as devices,
(SELECT COUNT(*) FROM Devices '. getDeviceCondition ('connected').') as connected,
(SELECT COUNT(*) FROM Devices '. getDeviceCondition ('favorites').') as favorites,
(SELECT COUNT(*) FROM Devices '. getDeviceCondition ('new').') as new,
(SELECT COUNT(*) FROM Devices '. getDeviceCondition ('down').') as down,
(SELECT COUNT(*) FROM Devices '. getDeviceCondition ('archived').') as archived
');
$row = $result -> fetchArray (SQLITE3_NUM);
$resultJSON = json_encode (array ($row[0], $row[1], $row[2], $row[3], $row[4], $row[5]));
// save to cache
setCache("getDevicesTotals", $resultJSON );
}
echo ($resultJSON);
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Determine if Random MAC // Determine if Random MAC
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
front/plugins/_publisher_mqtt/mqtt.py
View File

@@ -567,7 +567,7 @@ def publish_notifications(db, mqtt_client):
try: try:
payload = json.loads(payload_str) # Deserialize JSON string payload = json.loads(payload_str) # Deserialize JSON string
except Exception as e: except Exception as e:
mylog('minimal', [f"[{pluginName}] ⚠ ERROR decoding JSON for notification GUID {notification["GUID"]}: {e}"]) mylog('minimal', [f"[{pluginName}] ⚠ ERROR decoding JSON for notification GUID {notification['GUID']}: {e}"])
continue # skip this notification continue # skip this notification
else: else:
# fallback generic payload (like webhook does) # fallback generic payload (like webhook does)

65
front/presence.php
View File

@@ -352,27 +352,62 @@ function initializeCalendar () {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
/**
* Fetch device totals from the API and update dashboard counters.
*
* This function:
* - Stops the automatic refresh timer
* - Calls the `/devices/totals` API endpoint using Bearer token authentication
* - Updates the device summary boxes (all, connected, favorites, new, down, archived)
* - Restarts the refresh timer after completion
*
* Expected API response format:
* [
* devices, // Total devices
* connected, // Currently connected devices
* favorites, // Favorite devices
* new, // Newly discovered devices
* down, // Devices marked as down
* archived // Archived / hidden devices
* ]
*/
function getDevicesTotals () { function getDevicesTotals () {
// stop timer // stop timer
stopTimerRefreshData(); stopTimerRefreshData();
// get totals and put in boxes const apiToken = getSetting("API_TOKEN");
$.get('php/server/devices.php?action=getDevicesTotals', function(data) { const apiBaseUrl = getApiBase();
var totalsDevices = JSON.parse(data); const totalsUrl = `${apiBaseUrl}/devices/totals`;
$('#devicesAll').html (totalsDevices[0].toLocaleString()); $.ajax({
$('#devicesConnected').html (totalsDevices[1].toLocaleString()); url: totalsUrl,
$('#devicesFavorites').html (totalsDevices[2].toLocaleString()); method: "GET",
$('#devicesNew').html (totalsDevices[3].toLocaleString()); headers: {
$('#devicesDown').html (totalsDevices[4].toLocaleString()); "Authorization": `Bearer ${apiToken}`
$('#devicesHidden').html (totalsDevices[5].toLocaleString()); },
success: function (totalsDevices) {
// Timer for refresh data $('#devicesAll').html (totalsDevices[0].toLocaleString());
newTimerRefreshData (getDevicesTotals); $('#devicesConnected').html (totalsDevices[1].toLocaleString());
} ); $('#devicesFavorites').html (totalsDevices[2].toLocaleString());
$('#devicesNew').html (totalsDevices[3].toLocaleString());
$('#devicesDown').html (totalsDevices[4].toLocaleString());
$('#devicesHidden').html (totalsDevices[5].toLocaleString());
// Timer for refresh data
newTimerRefreshData(getDevicesTotals);
},
error: function (xhr) {
console.error("Failed to load device totals:", xhr.responseText);
// Ensure refresh loop continues even on failure
newTimerRefreshData(getDevicesTotals);
}
});
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
function getDevicesPresence (status) { function getDevicesPresence (status) {
// Save status selected // Save status selected
@@ -423,12 +458,12 @@ function getDevicesPresence (status) {
const apiToken = getSetting("API_TOKEN"); const apiToken = getSetting("API_TOKEN");
const apiBase = getApiBase(); const apiBaseUrl = getApiBase();
// ----------------------------- // -----------------------------
// Load Devices as Resources // Load Devices as Resources
// ----------------------------- // -----------------------------
const devicesUrl = `${apiBase}/devices/by-status?status=${deviceStatus}`; const devicesUrl = `${apiBaseUrl}/devices/by-status?status=${deviceStatus}`;
$.ajax({ $.ajax({
url: devicesUrl, url: devicesUrl,
@@ -451,7 +486,7 @@ function getDevicesPresence (status) {
// ----------------------------- // -----------------------------
// Load Events // Load Events
// ----------------------------- // -----------------------------
const eventsUrl = `${apiBase}/sessions/calendar?start=${startDate}&end=${endDate}`; const eventsUrl = `${apiBaseUrl}/sessions/calendar?start=${startDate}&end=${endDate}`;
$('#calendar').fullCalendar('removeEventSources'); $('#calendar').fullCalendar('removeEventSources');
$('#calendar').fullCalendar('addEventSource', { $('#calendar').fullCalendar('addEventSource', {