@serve.zone/dcrouter 7.4.1 → 7.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_serve/bundle.js +310 -310
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.d.ts +3 -0
- package/dist_ts/classes.dcrouter.js +43 -3
- package/dist_ts/monitoring/classes.metricsmanager.js +7 -1
- package/dist_ts/remoteingress/classes.tunnel-manager.js +2 -6
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/elements/ops-view-network.d.ts +0 -3
- package/dist_ts_web/elements/ops-view-network.js +13 -19
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +46 -2
- package/ts/monitoring/classes.metricsmanager.ts +9 -0
- package/ts/remoteingress/classes.tunnel-manager.ts +1 -5
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/elements/ops-view-network.ts +13 -18
|
@@ -93,9 +93,6 @@ let OpsViewNetwork = (() => {
|
|
|
93
93
|
// Track if we need to update the chart to avoid unnecessary re-renders
|
|
94
94
|
lastChartUpdate = (__runInitializers(this, _trafficDataOut_extraInitializers), 0);
|
|
95
95
|
chartUpdateThreshold = 1000; // Minimum ms between chart updates
|
|
96
|
-
lastTrafficUpdateTime = 0;
|
|
97
|
-
trafficUpdateInterval = 1000; // Update every 1 second
|
|
98
|
-
requestCountHistory = new Map(); // Track requests per time bucket
|
|
99
96
|
trafficUpdateTimer = null;
|
|
100
97
|
requestsPerSecHistory = []; // Track requests/sec over time for trend
|
|
101
98
|
historyLoaded = false; // Whether server-side throughput history has been loaded
|
|
@@ -143,7 +140,6 @@ let OpsViewNetwork = (() => {
|
|
|
143
140
|
});
|
|
144
141
|
this.trafficDataIn = [...emptyData];
|
|
145
142
|
this.trafficDataOut = emptyData.map(point => ({ ...point }));
|
|
146
|
-
this.lastTrafficUpdateTime = now;
|
|
147
143
|
}
|
|
148
144
|
/**
|
|
149
145
|
* Load server-side throughput history into the chart.
|
|
@@ -425,11 +421,7 @@ let OpsViewNetwork = (() => {
|
|
|
425
421
|
const reqPerSec = this.networkState.requestsPerSecond || 0;
|
|
426
422
|
const throughput = this.calculateThroughput();
|
|
427
423
|
const activeConnections = this.statsState.serverStats?.activeConnections || 0;
|
|
428
|
-
//
|
|
429
|
-
this.requestsPerSecHistory.push(reqPerSec);
|
|
430
|
-
if (this.requestsPerSecHistory.length > 20) {
|
|
431
|
-
this.requestsPerSecHistory.shift();
|
|
432
|
-
}
|
|
424
|
+
// Build trend data from pre-computed history (mutated in updateNetworkData, not here)
|
|
433
425
|
const trendData = [...this.requestsPerSecHistory];
|
|
434
426
|
while (trendData.length < 20) {
|
|
435
427
|
trendData.unshift(0);
|
|
@@ -533,6 +525,12 @@ let OpsViewNetwork = (() => {
|
|
|
533
525
|
`;
|
|
534
526
|
}
|
|
535
527
|
async updateNetworkData() {
|
|
528
|
+
// Track requests/sec history for the trend sparkline (moved out of render)
|
|
529
|
+
const reqPerSec = this.networkState.requestsPerSecond || 0;
|
|
530
|
+
this.requestsPerSecHistory.push(reqPerSec);
|
|
531
|
+
if (this.requestsPerSecHistory.length > 20) {
|
|
532
|
+
this.requestsPerSecHistory.shift();
|
|
533
|
+
}
|
|
536
534
|
// Only update if connections changed significantly
|
|
537
535
|
const newConnectionCount = this.networkState.connections.length;
|
|
538
536
|
const oldConnectionCount = this.networkRequests.length;
|
|
@@ -595,17 +593,13 @@ let OpsViewNetwork = (() => {
|
|
|
595
593
|
x: timestamp,
|
|
596
594
|
y: Math.round(throughputOutMbps * 10) / 10
|
|
597
595
|
};
|
|
598
|
-
//
|
|
596
|
+
// In-place mutation then reassign for Lit reactivity (avoids 4 intermediate arrays)
|
|
599
597
|
if (this.trafficDataIn.length >= 60) {
|
|
600
|
-
|
|
601
|
-
this.
|
|
602
|
-
this.trafficDataOut = [...this.trafficDataOut.slice(1), newDataPointOut];
|
|
603
|
-
}
|
|
604
|
-
else {
|
|
605
|
-
// Still filling up the initial data
|
|
606
|
-
this.trafficDataIn = [...this.trafficDataIn, newDataPointIn];
|
|
607
|
-
this.trafficDataOut = [...this.trafficDataOut, newDataPointOut];
|
|
598
|
+
this.trafficDataIn.shift();
|
|
599
|
+
this.trafficDataOut.shift();
|
|
608
600
|
}
|
|
601
|
+
this.trafficDataIn = [...this.trafficDataIn, newDataPointIn];
|
|
602
|
+
this.trafficDataOut = [...this.trafficDataOut, newDataPointOut];
|
|
609
603
|
this.lastChartUpdate = now;
|
|
610
604
|
}
|
|
611
605
|
stopTrafficUpdateTimer() {
|
|
@@ -621,4 +615,4 @@ let OpsViewNetwork = (() => {
|
|
|
621
615
|
return OpsViewNetwork = _classThis;
|
|
622
616
|
})();
|
|
623
617
|
export { OpsViewNetwork };
|
|
624
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-network.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-network.ts"],"names":[],"mappings":"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"}
|
|
618
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-network.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-network.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/dcrouter",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "7.4.
|
|
4
|
+
"version": "7.4.3",
|
|
5
5
|
"description": "A multifaceted routing service handling mail and SMS delivery functions.",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"exports": {
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@api.global/typedserver": "^8.3.0",
|
|
33
33
|
"@api.global/typedsocket": "^4.1.0",
|
|
34
34
|
"@apiclient.xyz/cloudflare": "^7.1.0",
|
|
35
|
-
"@design.estate/dees-catalog": "^3.43.
|
|
35
|
+
"@design.estate/dees-catalog": "^3.43.2",
|
|
36
36
|
"@design.estate/dees-element": "^2.1.6",
|
|
37
37
|
"@push.rocks/projectinfo": "^5.0.2",
|
|
38
38
|
"@push.rocks/qenv": "^6.1.3",
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/classes.dcrouter.ts
CHANGED
|
@@ -212,6 +212,11 @@ export class DcRouter {
|
|
|
212
212
|
public remoteIngressManager?: RemoteIngressManager;
|
|
213
213
|
public tunnelManager?: TunnelManager;
|
|
214
214
|
|
|
215
|
+
// DNS query logging rate limiter state
|
|
216
|
+
private dnsLogWindow: number[] = [];
|
|
217
|
+
private dnsBatchCount: number = 0;
|
|
218
|
+
private dnsBatchTimer: ReturnType<typeof setTimeout> | null = null;
|
|
219
|
+
|
|
215
220
|
// Certificate status tracking from SmartProxy events (keyed by domain)
|
|
216
221
|
public certificateStatusMap = new Map<string, {
|
|
217
222
|
status: 'valid' | 'failed';
|
|
@@ -855,6 +860,17 @@ export class DcRouter {
|
|
|
855
860
|
public async stop() {
|
|
856
861
|
logger.log('info', 'Stopping DcRouter services...');
|
|
857
862
|
|
|
863
|
+
// Flush pending DNS batch log
|
|
864
|
+
if (this.dnsBatchTimer) {
|
|
865
|
+
clearTimeout(this.dnsBatchTimer);
|
|
866
|
+
if (this.dnsBatchCount > 0) {
|
|
867
|
+
logger.log('info', `DNS: ${this.dnsBatchCount} queries processed (rate limited, final flush)`, { zone: 'dns' });
|
|
868
|
+
}
|
|
869
|
+
this.dnsBatchTimer = null;
|
|
870
|
+
this.dnsBatchCount = 0;
|
|
871
|
+
this.dnsLogWindow = [];
|
|
872
|
+
}
|
|
873
|
+
|
|
858
874
|
await this.opsServer.stop();
|
|
859
875
|
|
|
860
876
|
try {
|
|
@@ -1002,21 +1018,25 @@ export class DcRouter {
|
|
|
1002
1018
|
// Start the server
|
|
1003
1019
|
await this.emailServer.start();
|
|
1004
1020
|
|
|
1005
|
-
// Wire delivery events to MetricsManager
|
|
1021
|
+
// Wire delivery events to MetricsManager and logger
|
|
1006
1022
|
if (this.metricsManager && this.emailServer.deliverySystem) {
|
|
1007
1023
|
this.emailServer.deliverySystem.on('deliveryStart', (item: any) => {
|
|
1008
1024
|
this.metricsManager.trackEmailReceived(item?.from);
|
|
1025
|
+
logger.log('info', `Email delivery started: ${item?.from} → ${item?.to}`, { zone: 'email' });
|
|
1009
1026
|
});
|
|
1010
1027
|
this.emailServer.deliverySystem.on('deliverySuccess', (item: any) => {
|
|
1011
1028
|
this.metricsManager.trackEmailSent(item?.to);
|
|
1029
|
+
logger.log('info', `Email delivered to ${item?.to}`, { zone: 'email' });
|
|
1012
1030
|
});
|
|
1013
1031
|
this.emailServer.deliverySystem.on('deliveryFailed', (item: any, error: any) => {
|
|
1014
1032
|
this.metricsManager.trackEmailFailed(item?.to, error?.message);
|
|
1033
|
+
logger.log('warn', `Email delivery failed to ${item?.to}: ${error?.message}`, { zone: 'email' });
|
|
1015
1034
|
});
|
|
1016
1035
|
}
|
|
1017
1036
|
if (this.metricsManager && this.emailServer) {
|
|
1018
1037
|
this.emailServer.on('bounceProcessed', () => {
|
|
1019
1038
|
this.metricsManager.trackEmailBounced();
|
|
1039
|
+
logger.log('warn', 'Email bounce processed', { zone: 'email' });
|
|
1020
1040
|
});
|
|
1021
1041
|
}
|
|
1022
1042
|
|
|
@@ -1203,9 +1223,18 @@ export class DcRouter {
|
|
|
1203
1223
|
await this.dnsServer.start();
|
|
1204
1224
|
logger.log('info', `DNS server started on UDP ${vmIpAddress}:53`);
|
|
1205
1225
|
|
|
1206
|
-
// Wire DNS query events to MetricsManager
|
|
1226
|
+
// Wire DNS query events to MetricsManager and logger with adaptive rate limiting
|
|
1207
1227
|
if (this.metricsManager && this.dnsServer) {
|
|
1228
|
+
const flushDnsBatch = () => {
|
|
1229
|
+
if (this.dnsBatchCount > 0) {
|
|
1230
|
+
logger.log('info', `DNS: ${this.dnsBatchCount} queries processed (rate limited)`, { zone: 'dns' });
|
|
1231
|
+
this.dnsBatchCount = 0;
|
|
1232
|
+
}
|
|
1233
|
+
this.dnsBatchTimer = null;
|
|
1234
|
+
};
|
|
1235
|
+
|
|
1208
1236
|
this.dnsServer.on('query', (event: plugins.smartdns.dnsServerMod.IDnsQueryCompletedEvent) => {
|
|
1237
|
+
// Metrics tracking
|
|
1209
1238
|
for (const question of event.questions) {
|
|
1210
1239
|
this.metricsManager.trackDnsQuery(
|
|
1211
1240
|
question.type,
|
|
@@ -1215,6 +1244,21 @@ export class DcRouter {
|
|
|
1215
1244
|
event.answered,
|
|
1216
1245
|
);
|
|
1217
1246
|
}
|
|
1247
|
+
|
|
1248
|
+
// Adaptive logging: individual logs up to 2/sec, then batch
|
|
1249
|
+
const now = Date.now();
|
|
1250
|
+
this.dnsLogWindow = this.dnsLogWindow.filter(t => now - t < 1000);
|
|
1251
|
+
|
|
1252
|
+
if (this.dnsLogWindow.length < 2) {
|
|
1253
|
+
this.dnsLogWindow.push(now);
|
|
1254
|
+
const summary = event.questions.map(q => `${q.type} ${q.name}`).join(', ');
|
|
1255
|
+
logger.log('info', `DNS query: ${summary} (${event.responseTimeMs}ms, ${event.answered ? 'answered' : 'unanswered'})`, { zone: 'dns' });
|
|
1256
|
+
} else {
|
|
1257
|
+
this.dnsBatchCount++;
|
|
1258
|
+
if (!this.dnsBatchTimer) {
|
|
1259
|
+
this.dnsBatchTimer = setTimeout(flushDnsBatch, 5000);
|
|
1260
|
+
}
|
|
1261
|
+
}
|
|
1218
1262
|
});
|
|
1219
1263
|
}
|
|
1220
1264
|
|
|
@@ -110,6 +110,9 @@ export class MetricsManager {
|
|
|
110
110
|
this.securityMetrics.incidents = [];
|
|
111
111
|
this.securityMetrics.lastResetDate = currentDate;
|
|
112
112
|
}
|
|
113
|
+
|
|
114
|
+
// Prune old time-series buckets every minute (don't wait for lazy query)
|
|
115
|
+
this.pruneOldBuckets();
|
|
113
116
|
}, 60000); // Check every minute
|
|
114
117
|
|
|
115
118
|
logger.log('info', 'MetricsManager started');
|
|
@@ -123,6 +126,12 @@ export class MetricsManager {
|
|
|
123
126
|
}
|
|
124
127
|
|
|
125
128
|
this.smartMetrics.stop();
|
|
129
|
+
|
|
130
|
+
// Clear caches and time-series buckets on shutdown
|
|
131
|
+
this.metricsCache.clear();
|
|
132
|
+
this.emailMinuteBuckets.clear();
|
|
133
|
+
this.dnsMinuteBuckets.clear();
|
|
134
|
+
|
|
126
135
|
logger.log('info', 'MetricsManager stopped');
|
|
127
136
|
}
|
|
128
137
|
|
|
@@ -35,11 +35,7 @@ export class TunnelManager {
|
|
|
35
35
|
});
|
|
36
36
|
|
|
37
37
|
this.hub.on('edgeDisconnected', (data: { edgeId: string }) => {
|
|
38
|
-
|
|
39
|
-
if (existing) {
|
|
40
|
-
existing.connected = false;
|
|
41
|
-
existing.activeTunnels = 0;
|
|
42
|
-
}
|
|
38
|
+
this.edgeStatuses.delete(data.edgeId);
|
|
43
39
|
});
|
|
44
40
|
|
|
45
41
|
this.hub.on('streamOpened', (data: { edgeId: string; streamId: number }) => {
|
|
@@ -47,9 +47,6 @@ export class OpsViewNetwork extends DeesElement {
|
|
|
47
47
|
private lastChartUpdate = 0;
|
|
48
48
|
private chartUpdateThreshold = 1000; // Minimum ms between chart updates
|
|
49
49
|
|
|
50
|
-
private lastTrafficUpdateTime = 0;
|
|
51
|
-
private trafficUpdateInterval = 1000; // Update every 1 second
|
|
52
|
-
private requestCountHistory = new Map<number, number>(); // Track requests per time bucket
|
|
53
50
|
private trafficUpdateTimer: any = null;
|
|
54
51
|
private requestsPerSecHistory: number[] = []; // Track requests/sec over time for trend
|
|
55
52
|
private historyLoaded = false; // Whether server-side throughput history has been loaded
|
|
@@ -106,8 +103,6 @@ export class OpsViewNetwork extends DeesElement {
|
|
|
106
103
|
|
|
107
104
|
this.trafficDataIn = [...emptyData];
|
|
108
105
|
this.trafficDataOut = emptyData.map(point => ({ ...point }));
|
|
109
|
-
|
|
110
|
-
this.lastTrafficUpdateTime = now;
|
|
111
106
|
}
|
|
112
107
|
|
|
113
108
|
/**
|
|
@@ -413,11 +408,7 @@ export class OpsViewNetwork extends DeesElement {
|
|
|
413
408
|
const throughput = this.calculateThroughput();
|
|
414
409
|
const activeConnections = this.statsState.serverStats?.activeConnections || 0;
|
|
415
410
|
|
|
416
|
-
//
|
|
417
|
-
this.requestsPerSecHistory.push(reqPerSec);
|
|
418
|
-
if (this.requestsPerSecHistory.length > 20) {
|
|
419
|
-
this.requestsPerSecHistory.shift();
|
|
420
|
-
}
|
|
411
|
+
// Build trend data from pre-computed history (mutated in updateNetworkData, not here)
|
|
421
412
|
const trendData = [...this.requestsPerSecHistory];
|
|
422
413
|
while (trendData.length < 20) {
|
|
423
414
|
trendData.unshift(0);
|
|
@@ -529,6 +520,13 @@ export class OpsViewNetwork extends DeesElement {
|
|
|
529
520
|
}
|
|
530
521
|
|
|
531
522
|
private async updateNetworkData() {
|
|
523
|
+
// Track requests/sec history for the trend sparkline (moved out of render)
|
|
524
|
+
const reqPerSec = this.networkState.requestsPerSecond || 0;
|
|
525
|
+
this.requestsPerSecHistory.push(reqPerSec);
|
|
526
|
+
if (this.requestsPerSecHistory.length > 20) {
|
|
527
|
+
this.requestsPerSecHistory.shift();
|
|
528
|
+
}
|
|
529
|
+
|
|
532
530
|
// Only update if connections changed significantly
|
|
533
531
|
const newConnectionCount = this.networkState.connections.length;
|
|
534
532
|
const oldConnectionCount = this.networkRequests.length;
|
|
@@ -602,16 +600,13 @@ export class OpsViewNetwork extends DeesElement {
|
|
|
602
600
|
y: Math.round(throughputOutMbps * 10) / 10
|
|
603
601
|
};
|
|
604
602
|
|
|
605
|
-
//
|
|
603
|
+
// In-place mutation then reassign for Lit reactivity (avoids 4 intermediate arrays)
|
|
606
604
|
if (this.trafficDataIn.length >= 60) {
|
|
607
|
-
|
|
608
|
-
this.
|
|
609
|
-
this.trafficDataOut = [...this.trafficDataOut.slice(1), newDataPointOut];
|
|
610
|
-
} else {
|
|
611
|
-
// Still filling up the initial data
|
|
612
|
-
this.trafficDataIn = [...this.trafficDataIn, newDataPointIn];
|
|
613
|
-
this.trafficDataOut = [...this.trafficDataOut, newDataPointOut];
|
|
605
|
+
this.trafficDataIn.shift();
|
|
606
|
+
this.trafficDataOut.shift();
|
|
614
607
|
}
|
|
608
|
+
this.trafficDataIn = [...this.trafficDataIn, newDataPointIn];
|
|
609
|
+
this.trafficDataOut = [...this.trafficDataOut, newDataPointOut];
|
|
615
610
|
|
|
616
611
|
this.lastChartUpdate = now;
|
|
617
612
|
}
|