freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make site and domain optional and get rid of "<unknown>" values.

Browse source
This commit is contained in:
baldo 2022-07-28 12:24:07 +02:00
parent 72543b95ee
commit 2d83326b78
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
server/services/monitoringService.ts
View file

@ -19,8 +19,10 @@ import {
Domain,
DurationSeconds,
Hostname,
isDomain,
isMonitoringSortField,
isOnlineState,
isSite,
MAC,
MailType,
MonitoringSortField,
@ -71,8 +73,8 @@ export type ParsedNode = {
importTimestamp: UnixTimestampSeconds,
state: OnlineState,
lastSeen: UnixTimestampSeconds,
site: Site,
domain: Domain,
site?: Site,
domain?: Domain,
};
export type NodesParsingResult = {
@ -224,14 +226,14 @@ export function parseNode(importTimestamp: UnixTimestampSeconds, nodeData: any):
);
}
let site = "<unknown-site>" as Site; // FIXME: Handle this
if (_.isPlainObject(nodeData.nodeinfo.system) && _.isString(nodeData.nodeinfo.system.site_code)) {
site = nodeData.nodeinfo.system.site_code as Site;
let site: Site | undefined;
if (_.isPlainObject(nodeData.nodeinfo.system) && isSite(nodeData.nodeinfo.system.site_code)) {
site = nodeData.nodeinfo.system.site_code;
}
let domain = "<unknown-domain>" as Domain; // FIXME: Handle this
if (_.isPlainObject(nodeData.nodeinfo.system) && _.isString(nodeData.nodeinfo.system.domain_code)) {
domain = nodeData.nodeinfo.system.domain_code as Domain;
let domain: Domain | undefined;
if (_.isPlainObject(nodeData.nodeinfo.system) && isDomain(nodeData.nodeinfo.system.domain_code)) {
domain = nodeData.nodeinfo.system.domain_code;
}
return {
@ -611,8 +613,8 @@ export async function getByMacs(macs: MAC[]): Promise<Record<MAC, NodeStateData>
}
nodeStateByMac[row.mac] = {
site: row.site || "<unknown-site>" as Site, // FIXME: Handle this
domain: row.domain || "<unknown-domain>" as Domain, // FIXME: Handle this
site: row.site || undefined,
domain: row.domain || undefined,
state: onlineState,
};
}

4
server/types/index.ts
View file

@ -23,8 +23,8 @@ export * from "./logger";
export * from "./shared";
export type NodeStateData = {
site: Site,
domain: Domain,
site?: Site,
domain?: Domain,
state: OnlineState,
}