I'm a tab person but now it should look better
This commit is contained in:
John Rallis 2023-03-30 15:10:04 +03:00
parent f3d93c882f
commit 1fcb9124b6

View File

@ -1704,36 +1704,36 @@ function serverConnect() {
break; break;
} }
case 'report': { case 'report': {
var reporttype = 1; var reporttype = 1;
switch(args.type) { switch(args.type) {
case 'traffic': case 'traffic':
reporttype = 2; reporttype = 2;
break; break;
case 'logins': case 'logins':
reporttype = 3; reporttype = 3;
break; break;
case 'db': case 'db':
reporttype = 4; reporttype = 4;
break; break;
} }
var reportgroupby = 1; var reportgroupby = 1;
if(args.groupby){ if(args.groupby){
reportgroupby = args.groupby === 'device' ? 2 : args.groupby === 'day' ? 3: 1; reportgroupby = args.groupby === 'device' ? 2 : args.groupby === 'day' ? 3: 1;
} }
var start = null, end = null; var start = null, end = null;
if (args.start) { if (args.start) {
start = Math.floor(Date.parse(args.start) / 1000); start = Math.floor(Date.parse(args.start) / 1000);
} else { } else {
start = reportgroupby === 3 ? Math.round(new Date().getTime() / 1000) - (168 * 3600) : Math.round(new Date().getTime() / 1000) - (24 * 3600); start = reportgroupby === 3 ? Math.round(new Date().getTime() / 1000) - (168 * 3600) : Math.round(new Date().getTime() / 1000) - (24 * 3600);
} }
if (args.end) { if (args.end) {
end = Math.floor(Date.parse(args.end) / 1000); end = Math.floor(Date.parse(args.end) / 1000);
} else { } else {
end = Math.round(new Date().getTime() / 1000); end = Math.round(new Date().getTime() / 1000);
} }
if (end <= start) { console.log("End time must be ahead of start time."); process.exit(1); return; } if (end <= start) { console.log("End time must be ahead of start time."); process.exit(1); return; }
ws.send(JSON.stringify({ action: 'report', type: reporttype, groupBy: reportgroupby, devGroup: args.devicegroup || null, start, end, tz: Intl.DateTimeFormat().resolvedOptions().timeZone, tf: new Date().getTimezoneOffset(), showTraffic: args.hasOwnProperty('showtraffic'), l: 'en', responseid: 'meshctrl' })); ws.send(JSON.stringify({ action: 'report', type: reporttype, groupBy: reportgroupby, devGroup: args.devicegroup || null, start, end, tz: Intl.DateTimeFormat().resolvedOptions().timeZone, tf: new Date().getTimezoneOffset(), showTraffic: args.hasOwnProperty('showtraffic'), l: 'en', responseid: 'meshctrl' }));
break; break;
@ -2304,15 +2304,15 @@ function serverConnect() {
console.log(data.data); console.log(data.data);
process.exit(); process.exit();
} }
case 'report': { case 'report': {
console.log('group,' + data.data.columns.flatMap(c => c.id).join(',')); console.log('group,' + data.data.columns.flatMap(c => c.id).join(','));
Object.keys(data.data.groups).forEach(gk => { Object.keys(data.data.groups).forEach(gk => {
data.data.groups[gk].entries.forEach(e => { data.data.groups[gk].entries.forEach(e => {
console.log(gk + ',' + Object.values(e).join(',')); console.log(gk + ',' + Object.values(e).join(','));
}); });
}); });
process.exit(); process.exit();
} }
default: { break; } default: { break; }
} }
//console.log('Data', data); //console.log('Data', data);