Skip to content

A modern and elegant dashboard for network traffic visualization and analysis.

fix(collector): prevent geoIP array truncation caused by filter(Boolean)

zml16669c6899e7
diff --git a/apps/collector/src/database/repositories/device.repository.ts b/apps/collector/src/database/repositories/device.repository.ts
index ac88520..ae88739 100644
--- a/apps/collector/src/database/repositories/device.repository.ts
+++ b/apps/collector/src/database/repositories/device.repository.ts
@@ -100,7 +100,7 @@ export class DeviceRepository extends BaseRepository {
const chains = row.chains ? row.chains.split(',').filter(Boolean) : [];
return {
...row, domains: row.domains ? row.domains.split(',').filter(Boolean) : [],
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined, asn: row.asn || undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined, asn: row.asn || undefined,
chains: this.expandShortChainsForRules(backendId, chains, rules),
};
}) as IPStats[];
@@ -121,7 +121,7 @@ export class DeviceRepository extends BaseRepository {
const result = stmt.all(backendId, sourceIP, limit) as any[];
return result.map(r => ({
...r, domains: r.domains ? r.domains.split(',') : [],
- geoIP: r.geoIP ? JSON.parse(r.geoIP).filter(Boolean) : undefined, asn: r.asn || undefined,
+ geoIP: r.geoIP ? JSON.parse(r.geoIP) : undefined, asn: r.asn || undefined,
}));
}
}
diff --git a/apps/collector/src/database/repositories/domain.repository.ts b/apps/collector/src/database/repositories/domain.repository.ts
index e257f38..6148b84 100644
--- a/apps/collector/src/database/repositories/domain.repository.ts
+++ b/apps/collector/src/database/repositories/domain.repository.ts
@@ -411,7 +411,7 @@ export class DomainRepository extends BaseRepository {
return {
...row,
domains: row.domains ? row.domains.split(',').filter(Boolean) : [],
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined,
chains: this.expandShortChainsForRules(backendId, chains, rules),
};
@@ -717,7 +717,7 @@ export class DomainRepository extends BaseRepository {
return rows.map(row => ({
...row,
domains: row.domains ? row.domains.split(',') : [],
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined,
chains: row.chains ? row.chains.split(',') : [],
})) as IPStats[];
diff --git a/apps/collector/src/database/repositories/ip.repository.ts b/apps/collector/src/database/repositories/ip.repository.ts
index 991cbbb..70b2c4d 100644
--- a/apps/collector/src/database/repositories/ip.repository.ts
+++ b/apps/collector/src/database/repositories/ip.repository.ts
@@ -59,7 +59,7 @@ export class IPRepository extends BaseRepository {
const chains = row.chains ? row.chains.split(',').filter(Boolean) : [];
return {
...row, domains: row.domains ? row.domains.split(',').filter(Boolean) : [],
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined,
chains: this.expandShortChainsForRules(backendId, chains, rules),
};
@@ -84,7 +84,7 @@ export class IPRepository extends BaseRepository {
return rows.map(row => ({
...row, domains: row.domains ? row.domains.split(',') : [],
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined, chains: row.chains ? row.chains.split(',') : [],
})) as IPStats[];
}
@@ -154,7 +154,7 @@ export class IPRepository extends BaseRepository {
return rows.map(row => ({
...row, domains: row.domains ? row.domains.split(',') : [],
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined, chains: row.chains ? row.chains.split(',') : [],
})) as IPStats[];
}
@@ -232,7 +232,7 @@ export class IPRepository extends BaseRepository {
ip: row.ip, domains: row.domains ? row.domains.split(',').filter(Boolean) : [],
totalUpload: row.totalUpload, totalDownload: row.totalDownload,
totalConnections: row.totalConnections, lastSeen: row.lastSeen,
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined,
chains: this.expandShortChainsForRules(backendId, chains, rules),
};
@@ -272,7 +272,7 @@ export class IPRepository extends BaseRepository {
ip: row.ip, domains: row.domains ? row.domains.split(',') : [],
totalUpload: row.totalUpload, totalDownload: row.totalDownload,
totalConnections: row.totalConnections, lastSeen: row.lastSeen,
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined,
chains: this.expandShortChainsForRules(backendId, chains, rules),
};
@@ -330,7 +330,7 @@ export class IPRepository extends BaseRepository {
const chains = row.chains ? row.chains.split(',').filter(Boolean) : [];
return {
...row, domains: row.domains ? row.domains.split(',').filter(Boolean) : [],
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined,
chains: this.expandShortChainsForRules(backendId, chains, rules),
};
diff --git a/apps/collector/src/database/repositories/proxy.repository.ts b/apps/collector/src/database/repositories/proxy.repository.ts
index c55b6f0..9fbac6f 100644
--- a/apps/collector/src/database/repositories/proxy.repository.ts
+++ b/apps/collector/src/database/repositories/proxy.repository.ts
@@ -87,7 +87,7 @@ export class ProxyRepository extends BaseRepository {
}>;
return rows.map(row => ({
...row, domains: row.domains ? row.domains.split(',').filter(Boolean) : [], chains: [chain],
- asn: row.asn || undefined, geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ asn: row.asn || undefined, geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
})) as IPStats[];
}
diff --git a/apps/collector/src/database/repositories/rule.repository.ts b/apps/collector/src/database/repositories/rule.repository.ts
index 7254c36..6bb921a 100644
--- a/apps/collector/src/database/repositories/rule.repository.ts
+++ b/apps/collector/src/database/repositories/rule.repository.ts
@@ -248,7 +248,7 @@ export class RuleRepository extends BaseRepository {
const chains = row.chains ? row.chains.split(',').filter(Boolean) : [];
return {
...row, domains: row.domains ? row.domains.split(',').filter(Boolean) : [],
- geoIP: row.geoIP ? JSON.parse(row.geoIP).filter(Boolean) : undefined,
+ geoIP: row.geoIP ? JSON.parse(row.geoIP) : undefined,
asn: row.asn || undefined,
chains: this.expandShortChainsForRules(backendId, chains, [rule]),
};