gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Use baseclass.extend() for nDPId API module

Browse Source 
LuCI JavaScript modules must use baseclass.extend() pattern instead
of returning plain objects. This fixes the "factory yields invalid
constructor" error.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
CyberMind-FR 2026-01-09 09:40:37 +01:00
parent 8b952523d9
commit c9af2b9980
1 changed files with 69 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
package/secubox/luci-app-ndpid/htdocs/luci-static/resources/ndpid/api.js
View File

@ -1,6 +1,13 @@
'use strict'; 'use strict';
'require baseclass';
'require rpc'; 'require rpc';
/**
* nDPId API
* Package: luci-app-ndpid
* RPCD object: luci.ndpid
*/
var callServiceStatus = rpc.declare({ var callServiceStatus = rpc.declare({
object: 'luci.ndpid', object: 'luci.ndpid',
method: 'get_service_status', method: 'get_service_status',
@ -92,40 +99,67 @@ var callClearCache = rpc.declare({
expect: { success: false } expect: { success: false }
}); });
return { function formatBytes(bytes) {
if (bytes === 0 || bytes === null || bytes === undefined) return '0 B';
var k = 1024;
var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
var i = Math.floor(Math.log(bytes) / Math.log(k));
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
}
function formatNumber(num) {
if (num === null || num === undefined) return '0';
return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
}
function formatUptime(seconds) {
if (!seconds || seconds === 0) return 'Not running';
var days = Math.floor(seconds / 86400);
var hours = Math.floor((seconds % 86400) / 3600);
var minutes = Math.floor((seconds % 3600) / 60);
var parts = [];
if (days > 0) parts.push(days + 'd');
if (hours > 0) parts.push(hours + 'h');
if (minutes > 0) parts.push(minutes + 'm');
return parts.length > 0 ? parts.join(' ') : '< 1m';
}
function getStatusClass(running) {
return running ? 'active' : 'inactive';
}
function getStatusText(running) {
return running ? 'Running' : 'Stopped';
}
return baseclass.extend({
// Read methods // Read methods
getServiceStatus: function() { getServiceStatus: callServiceStatus,
return callServiceStatus(); getRealtimeFlows: callRealtimeFlows,
}, getInterfaceStats: callInterfaceStats,
getTopApplications: callTopApplications,
getTopProtocols: callTopProtocols,
getConfig: callConfig,
getDashboard: callDashboard,
getInterfaces: callInterfaces,
getRealtimeFlows: function() { // Write methods
return callRealtimeFlows(); serviceStart: callServiceStart,
}, serviceStop: callServiceStop,
serviceRestart: callServiceRestart,
serviceEnable: callServiceEnable,
serviceDisable: callServiceDisable,
updateConfig: callUpdateConfig,
clearCache: callClearCache,
getInterfaceStats: function() { // Utility functions
return callInterfaceStats(); formatBytes: formatBytes,
}, formatNumber: formatNumber,
formatUptime: formatUptime,
getTopApplications: function() { getStatusClass: getStatusClass,
return callTopApplications(); getStatusText: getStatusText,
},
getTopProtocols: function() {
return callTopProtocols();
},
getConfig: function() {
return callConfig();
},
getDashboard: function() {
return callDashboard();
},
getInterfaces: function() {
return callInterfaces();
},
// Aggregate function for dashboard
getAllData: function() { getAllData: function() {
return Promise.all([ return Promise.all([
callDashboard(), callDashboard(),
@ -134,74 +168,11 @@ return {
callTopProtocols() callTopProtocols()
]).then(function(results) { ]).then(function(results) {
return { return {
dashboard: results[0], dashboard: results[0] || {},
interfaces: results[1], interfaces: results[1] || { interfaces: [] },
applications: results[2], applications: results[2] || { applications: [] },
protocols: results[3] protocols: results[3] || { protocols: [] }
}; };
}); });
},
// Write methods
serviceStart: function() {
return callServiceStart();
},
serviceStop: function() {
return callServiceStop();
},
serviceRestart: function() {
return callServiceRestart();
},
serviceEnable: function() {
return callServiceEnable();
},
serviceDisable: function() {
return callServiceDisable();
},
updateConfig: function(data) {
return callUpdateConfig(data);
},
clearCache: function() {
return callClearCache();
},
// Utility functions
formatBytes: function(bytes) {
if (bytes === 0 || bytes === null || bytes === undefined) return '0 B';
var k = 1024;
var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
var i = Math.floor(Math.log(bytes) / Math.log(k));
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
},
formatNumber: function(num) {
if (num === null || num === undefined) return '0';
return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
},
formatUptime: function(seconds) {
if (!seconds || seconds === 0) return 'Not running';
var days = Math.floor(seconds / 86400);
var hours = Math.floor((seconds % 86400) / 3600);
var minutes = Math.floor((seconds % 3600) / 60);
var parts = [];
if (days > 0) parts.push(days + 'd');
if (hours > 0) parts.push(hours + 'h');
if (minutes > 0) parts.push(minutes + 'm');
return parts.length > 0 ? parts.join(' ') : '< 1m';
},
getStatusClass: function(running) {
return running ? 'active' : 'inactive';
},
getStatusText: function(running) {
return running ? 'Running' : 'Stopped';
} }
}; });