@serve.zone/dcrouter 11.14.0 → 11.16.0
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 +5 -9
- package/dist_ts/00_commitinfo_data.d.ts +8 -0
- package/dist_ts/00_commitinfo_data.js +9 -0
- package/dist_ts/cache/classes.cache.cleaner.d.ts +47 -0
- package/dist_ts/cache/classes.cache.cleaner.js +130 -0
- package/dist_ts/cache/classes.cached.document.d.ts +76 -0
- package/dist_ts/cache/classes.cached.document.js +100 -0
- package/dist_ts/cache/classes.cachedb.d.ts +60 -0
- package/dist_ts/cache/classes.cachedb.js +126 -0
- package/dist_ts/cache/documents/classes.cached.email.d.ts +125 -0
- package/dist_ts/cache/documents/classes.cached.email.js +337 -0
- package/dist_ts/cache/documents/classes.cached.ip.reputation.d.ts +119 -0
- package/dist_ts/cache/documents/classes.cached.ip.reputation.js +323 -0
- package/dist_ts/cache/documents/index.d.ts +2 -0
- package/dist_ts/cache/documents/index.js +3 -0
- package/dist_ts/cache/index.d.ts +4 -0
- package/dist_ts/cache/index.js +7 -0
- package/dist_ts/classes.cert-provision-scheduler.d.ts +54 -0
- package/dist_ts/classes.cert-provision-scheduler.js +118 -0
- package/dist_ts/classes.dcrouter.d.ts +399 -0
- package/dist_ts/classes.dcrouter.js +1697 -0
- package/dist_ts/classes.storage-cert-manager.d.ts +18 -0
- package/dist_ts/classes.storage-cert-manager.js +43 -0
- package/dist_ts/config/classes.api-token-manager.d.ts +46 -0
- package/dist_ts/config/classes.api-token-manager.js +150 -0
- package/dist_ts/config/classes.route-config-manager.d.ts +38 -0
- package/dist_ts/config/classes.route-config-manager.js +257 -0
- package/dist_ts/config/index.d.ts +3 -0
- package/dist_ts/config/index.js +5 -0
- package/dist_ts/config/validator.d.ts +104 -0
- package/dist_ts/config/validator.js +152 -0
- package/dist_ts/errors/base.errors.d.ts +224 -0
- package/dist_ts/errors/base.errors.js +320 -0
- package/dist_ts/errors/error-handler.d.ts +98 -0
- package/dist_ts/errors/error-handler.js +282 -0
- package/dist_ts/errors/error.codes.d.ts +115 -0
- package/dist_ts/errors/error.codes.js +136 -0
- package/dist_ts/errors/index.d.ts +54 -0
- package/dist_ts/errors/index.js +136 -0
- package/dist_ts/errors/reputation.errors.d.ts +183 -0
- package/dist_ts/errors/reputation.errors.js +292 -0
- package/dist_ts/http3/http3-route-augmentation.d.ts +50 -0
- package/dist_ts/http3/http3-route-augmentation.js +98 -0
- package/dist_ts/http3/index.d.ts +1 -0
- package/dist_ts/http3/index.js +2 -0
- package/dist_ts/index.d.ts +8 -0
- package/dist_ts/index.js +29 -0
- package/dist_ts/logger.d.ts +21 -0
- package/dist_ts/logger.js +81 -0
- package/dist_ts/monitoring/classes.metricscache.d.ts +32 -0
- package/dist_ts/monitoring/classes.metricscache.js +63 -0
- package/dist_ts/monitoring/classes.metricsmanager.d.ts +184 -0
- package/dist_ts/monitoring/classes.metricsmanager.js +744 -0
- package/dist_ts/monitoring/index.d.ts +1 -0
- package/dist_ts/monitoring/index.js +2 -0
- package/dist_ts/opsserver/classes.opsserver.d.ts +38 -0
- package/dist_ts/opsserver/classes.opsserver.js +87 -0
- package/dist_ts/opsserver/handlers/admin.handler.d.ts +31 -0
- package/dist_ts/opsserver/handlers/admin.handler.js +180 -0
- package/dist_ts/opsserver/handlers/api-token.handler.d.ts +6 -0
- package/dist_ts/opsserver/handlers/api-token.handler.js +62 -0
- package/dist_ts/opsserver/handlers/certificate.handler.d.ts +32 -0
- package/dist_ts/opsserver/handlers/certificate.handler.js +421 -0
- package/dist_ts/opsserver/handlers/config.handler.d.ts +7 -0
- package/dist_ts/opsserver/handlers/config.handler.js +192 -0
- package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +30 -0
- package/dist_ts/opsserver/handlers/email-ops.handler.js +227 -0
- package/dist_ts/opsserver/handlers/index.d.ts +12 -0
- package/dist_ts/opsserver/handlers/index.js +13 -0
- package/dist_ts/opsserver/handlers/logs.handler.d.ts +25 -0
- package/dist_ts/opsserver/handlers/logs.handler.js +256 -0
- package/dist_ts/opsserver/handlers/radius.handler.d.ts +6 -0
- package/dist_ts/opsserver/handlers/radius.handler.js +295 -0
- package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +6 -0
- package/dist_ts/opsserver/handlers/remoteingress.handler.js +156 -0
- package/dist_ts/opsserver/handlers/route-management.handler.d.ts +14 -0
- package/dist_ts/opsserver/handlers/route-management.handler.js +117 -0
- package/dist_ts/opsserver/handlers/security.handler.d.ts +9 -0
- package/dist_ts/opsserver/handlers/security.handler.js +233 -0
- package/dist_ts/opsserver/handlers/stats.handler.d.ts +11 -0
- package/dist_ts/opsserver/handlers/stats.handler.js +403 -0
- package/dist_ts/opsserver/handlers/vpn.handler.d.ts +6 -0
- package/dist_ts/opsserver/handlers/vpn.handler.js +197 -0
- package/dist_ts/opsserver/helpers/guards.d.ts +27 -0
- package/dist_ts/opsserver/helpers/guards.js +43 -0
- package/dist_ts/opsserver/index.d.ts +1 -0
- package/dist_ts/opsserver/index.js +2 -0
- package/dist_ts/paths.d.ts +26 -0
- package/dist_ts/paths.js +45 -0
- package/dist_ts/plugins.d.ts +81 -0
- package/dist_ts/plugins.js +115 -0
- package/dist_ts/radius/classes.accounting.manager.d.ts +231 -0
- package/dist_ts/radius/classes.accounting.manager.js +462 -0
- package/dist_ts/radius/classes.radius.server.d.ts +171 -0
- package/dist_ts/radius/classes.radius.server.js +386 -0
- package/dist_ts/radius/classes.vlan.manager.d.ts +128 -0
- package/dist_ts/radius/classes.vlan.manager.js +279 -0
- package/dist_ts/radius/index.d.ts +13 -0
- package/dist_ts/radius/index.js +14 -0
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +94 -0
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +271 -0
- package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +59 -0
- package/dist_ts/remoteingress/classes.tunnel-manager.js +165 -0
- package/dist_ts/remoteingress/index.d.ts +2 -0
- package/dist_ts/remoteingress/index.js +3 -0
- package/dist_ts/security/classes.contentscanner.d.ts +164 -0
- package/dist_ts/security/classes.contentscanner.js +642 -0
- package/dist_ts/security/classes.ipreputationchecker.d.ts +160 -0
- package/dist_ts/security/classes.ipreputationchecker.js +537 -0
- package/dist_ts/security/classes.securitylogger.d.ts +144 -0
- package/dist_ts/security/classes.securitylogger.js +235 -0
- package/dist_ts/security/index.d.ts +3 -0
- package/dist_ts/security/index.js +4 -0
- package/dist_ts/sms/classes.smsservice.d.ts +15 -0
- package/dist_ts/sms/classes.smsservice.js +72 -0
- package/dist_ts/sms/config/sms.config.d.ts +93 -0
- package/dist_ts/sms/config/sms.config.js +2 -0
- package/dist_ts/sms/config/sms.schema.d.ts +5 -0
- package/dist_ts/sms/config/sms.schema.js +121 -0
- package/dist_ts/sms/index.d.ts +1 -0
- package/dist_ts/sms/index.js +2 -0
- package/dist_ts/storage/classes.storagemanager.d.ts +83 -0
- package/dist_ts/storage/classes.storagemanager.js +348 -0
- package/dist_ts/storage/index.d.ts +1 -0
- package/dist_ts/storage/index.js +3 -0
- package/dist_ts/vpn/classes.vpn-manager.d.ts +129 -0
- package/dist_ts/vpn/classes.vpn-manager.js +329 -0
- package/dist_ts/vpn/index.d.ts +1 -0
- package/dist_ts/vpn/index.js +2 -0
- package/dist_ts_apiclient/classes.apitoken.d.ts +41 -0
- package/dist_ts_apiclient/classes.apitoken.js +115 -0
- package/dist_ts_apiclient/classes.certificate.d.ts +57 -0
- package/dist_ts_apiclient/classes.certificate.js +69 -0
- package/dist_ts_apiclient/classes.config.d.ts +7 -0
- package/dist_ts_apiclient/classes.config.js +11 -0
- package/dist_ts_apiclient/classes.dcrouterapiclient.d.ts +41 -0
- package/dist_ts_apiclient/classes.dcrouterapiclient.js +81 -0
- package/dist_ts_apiclient/classes.email.d.ts +30 -0
- package/dist_ts_apiclient/classes.email.js +52 -0
- package/dist_ts_apiclient/classes.logs.d.ts +21 -0
- package/dist_ts_apiclient/classes.logs.js +14 -0
- package/dist_ts_apiclient/classes.radius.d.ts +59 -0
- package/dist_ts_apiclient/classes.radius.js +95 -0
- package/dist_ts_apiclient/classes.remoteingress.d.ts +54 -0
- package/dist_ts_apiclient/classes.remoteingress.js +136 -0
- package/dist_ts_apiclient/classes.route.d.ts +42 -0
- package/dist_ts_apiclient/classes.route.js +154 -0
- package/dist_ts_apiclient/classes.stats.d.ts +47 -0
- package/dist_ts_apiclient/classes.stats.js +38 -0
- package/dist_ts_apiclient/index.d.ts +10 -0
- package/dist_ts_apiclient/index.js +14 -0
- package/dist_ts_apiclient/plugins.d.ts +3 -0
- package/dist_ts_apiclient/plugins.js +5 -0
- package/dist_ts_interfaces/data/remoteingress.d.ts +2 -0
- package/dist_ts_interfaces/data/vpn.d.ts +1 -2
- package/dist_ts_interfaces/requests/vpn.d.ts +1 -1
- package/dist_ts_web/00_commitinfo_data.d.ts +8 -0
- package/dist_ts_web/00_commitinfo_data.js +9 -0
- package/dist_ts_web/appstate.d.ts +238 -0
- package/dist_ts_web/appstate.js +1174 -0
- package/dist_ts_web/elements/index.d.ts +13 -0
- package/dist_ts_web/elements/index.js +14 -0
- package/dist_ts_web/elements/ops-dashboard.d.ts +23 -0
- package/dist_ts_web/elements/ops-dashboard.js +323 -0
- package/dist_ts_web/elements/ops-view-apitokens.d.ts +13 -0
- package/dist_ts_web/elements/ops-view-apitokens.js +371 -0
- package/dist_ts_web/elements/ops-view-certificates.d.ts +22 -0
- package/dist_ts_web/elements/ops-view-certificates.js +528 -0
- package/dist_ts_web/elements/ops-view-config.d.ts +19 -0
- package/dist_ts_web/elements/ops-view-config.js +339 -0
- package/dist_ts_web/elements/ops-view-emails.d.ts +21 -0
- package/dist_ts_web/elements/ops-view-emails.js +165 -0
- package/dist_ts_web/elements/ops-view-logs.d.ts +13 -0
- package/dist_ts_web/elements/ops-view-logs.js +159 -0
- package/dist_ts_web/elements/ops-view-network.d.ts +71 -0
- package/dist_ts_web/elements/ops-view-network.js +764 -0
- package/dist_ts_web/elements/ops-view-overview.d.ts +22 -0
- package/dist_ts_web/elements/ops-view-overview.js +456 -0
- package/dist_ts_web/elements/ops-view-remoteingress.d.ts +20 -0
- package/dist_ts_web/elements/ops-view-remoteingress.js +494 -0
- package/dist_ts_web/elements/ops-view-routes.d.ts +12 -0
- package/dist_ts_web/elements/ops-view-routes.js +404 -0
- package/dist_ts_web/elements/ops-view-security.d.ts +21 -0
- package/dist_ts_web/elements/ops-view-security.js +574 -0
- package/dist_ts_web/elements/ops-view-vpn.d.ts +14 -0
- package/dist_ts_web/elements/ops-view-vpn.js +365 -0
- package/dist_ts_web/elements/shared/css.d.ts +1 -0
- package/dist_ts_web/elements/shared/css.js +10 -0
- package/dist_ts_web/elements/shared/index.d.ts +2 -0
- package/dist_ts_web/elements/shared/index.js +3 -0
- package/dist_ts_web/elements/shared/ops-sectionheading.d.ts +5 -0
- package/dist_ts_web/elements/shared/ops-sectionheading.js +82 -0
- package/dist_ts_web/index.d.ts +1 -0
- package/dist_ts_web/index.js +10 -0
- package/dist_ts_web/plugins.d.ts +6 -0
- package/dist_ts_web/plugins.js +11 -0
- package/dist_ts_web/router.d.ts +19 -0
- package/dist_ts_web/router.js +91 -0
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +51 -20
- package/ts/config/classes.route-config-manager.ts +7 -6
- package/ts/opsserver/handlers/vpn.handler.ts +3 -5
- package/ts/vpn/classes.vpn-manager.ts +68 -19
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +2 -2
- package/ts_web/elements/ops-view-vpn.ts +5 -9
|
@@ -0,0 +1,403 @@
|
|
|
1
|
+
import * as plugins from '../../plugins.js';
|
|
2
|
+
import * as interfaces from '../../../dist_ts_interfaces/index.js';
|
|
3
|
+
import { MetricsManager } from '../../monitoring/index.js';
|
|
4
|
+
import { SecurityLogger } from '../../security/classes.securitylogger.js';
|
|
5
|
+
export class StatsHandler {
|
|
6
|
+
opsServerRef;
|
|
7
|
+
constructor(opsServerRef) {
|
|
8
|
+
this.opsServerRef = opsServerRef;
|
|
9
|
+
this.registerHandlers();
|
|
10
|
+
}
|
|
11
|
+
registerHandlers() {
|
|
12
|
+
// All stats endpoints register directly on viewRouter (valid identity required via middleware)
|
|
13
|
+
const router = this.opsServerRef.viewRouter;
|
|
14
|
+
// Server Statistics Handler
|
|
15
|
+
router.addTypedHandler(new plugins.typedrequest.TypedHandler('getServerStatistics', async (dataArg, toolsArg) => {
|
|
16
|
+
const stats = await this.collectServerStats();
|
|
17
|
+
return {
|
|
18
|
+
stats: {
|
|
19
|
+
uptime: stats.uptime,
|
|
20
|
+
startTime: Date.now() - (stats.uptime * 1000),
|
|
21
|
+
memoryUsage: stats.memoryUsage,
|
|
22
|
+
cpuUsage: stats.cpuUsage,
|
|
23
|
+
activeConnections: stats.activeConnections,
|
|
24
|
+
totalConnections: stats.totalConnections,
|
|
25
|
+
requestsPerSecond: stats.requestsPerSecond,
|
|
26
|
+
throughput: stats.throughput,
|
|
27
|
+
},
|
|
28
|
+
history: dataArg.includeHistory ? stats.history : undefined,
|
|
29
|
+
};
|
|
30
|
+
}));
|
|
31
|
+
// Email Statistics Handler
|
|
32
|
+
router.addTypedHandler(new plugins.typedrequest.TypedHandler('getEmailStatistics', async (dataArg, toolsArg) => {
|
|
33
|
+
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
34
|
+
if (!emailServer) {
|
|
35
|
+
return {
|
|
36
|
+
stats: {
|
|
37
|
+
sent: 0,
|
|
38
|
+
received: 0,
|
|
39
|
+
bounced: 0,
|
|
40
|
+
queued: 0,
|
|
41
|
+
failed: 0,
|
|
42
|
+
averageDeliveryTime: 0,
|
|
43
|
+
deliveryRate: 0,
|
|
44
|
+
bounceRate: 0,
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
const stats = await this.collectEmailStats();
|
|
49
|
+
return {
|
|
50
|
+
stats: {
|
|
51
|
+
sent: stats.sentToday,
|
|
52
|
+
received: stats.receivedToday,
|
|
53
|
+
bounced: Math.floor(stats.sentToday * stats.bounceRate / 100),
|
|
54
|
+
queued: stats.queueSize,
|
|
55
|
+
failed: 0,
|
|
56
|
+
averageDeliveryTime: 0,
|
|
57
|
+
deliveryRate: stats.deliveryRate,
|
|
58
|
+
bounceRate: stats.bounceRate,
|
|
59
|
+
},
|
|
60
|
+
domainBreakdown: dataArg.includeDetails ? stats.domainBreakdown : undefined,
|
|
61
|
+
};
|
|
62
|
+
}));
|
|
63
|
+
// DNS Statistics Handler
|
|
64
|
+
router.addTypedHandler(new plugins.typedrequest.TypedHandler('getDnsStatistics', async (dataArg, toolsArg) => {
|
|
65
|
+
const dnsServer = this.opsServerRef.dcRouterRef.dnsServer;
|
|
66
|
+
if (!dnsServer) {
|
|
67
|
+
return {
|
|
68
|
+
stats: {
|
|
69
|
+
totalQueries: 0,
|
|
70
|
+
cacheHits: 0,
|
|
71
|
+
cacheMisses: 0,
|
|
72
|
+
cacheHitRate: 0,
|
|
73
|
+
activeDomains: 0,
|
|
74
|
+
averageResponseTime: 0,
|
|
75
|
+
queryTypes: {},
|
|
76
|
+
},
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
const stats = await this.collectDnsStats();
|
|
80
|
+
return {
|
|
81
|
+
stats: {
|
|
82
|
+
totalQueries: stats.totalQueries,
|
|
83
|
+
cacheHits: stats.cacheHits,
|
|
84
|
+
cacheMisses: stats.cacheMisses,
|
|
85
|
+
cacheHitRate: stats.cacheHitRate,
|
|
86
|
+
activeDomains: stats.topDomains.length,
|
|
87
|
+
averageResponseTime: 0,
|
|
88
|
+
queryTypes: stats.queryTypes,
|
|
89
|
+
},
|
|
90
|
+
domainBreakdown: dataArg.includeQueryTypes ? stats.domainBreakdown : undefined,
|
|
91
|
+
};
|
|
92
|
+
}));
|
|
93
|
+
// Queue Status Handler
|
|
94
|
+
router.addTypedHandler(new plugins.typedrequest.TypedHandler('getQueueStatus', async (dataArg, toolsArg) => {
|
|
95
|
+
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
96
|
+
const queues = [];
|
|
97
|
+
if (emailServer) {
|
|
98
|
+
const status = await this.getQueueStatus();
|
|
99
|
+
queues.push({
|
|
100
|
+
name: dataArg.queueName || 'default',
|
|
101
|
+
size: status.pending,
|
|
102
|
+
processing: status.active,
|
|
103
|
+
failed: status.failed,
|
|
104
|
+
retrying: status.retrying,
|
|
105
|
+
averageProcessingTime: 0,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
return {
|
|
109
|
+
queues,
|
|
110
|
+
totalItems: queues.reduce((sum, q) => sum + q.size + q.processing + q.failed + q.retrying, 0),
|
|
111
|
+
};
|
|
112
|
+
}));
|
|
113
|
+
// Health Status Handler
|
|
114
|
+
router.addTypedHandler(new plugins.typedrequest.TypedHandler('getHealthStatus', async (dataArg, toolsArg) => {
|
|
115
|
+
const health = await this.checkHealthStatus();
|
|
116
|
+
return {
|
|
117
|
+
health: {
|
|
118
|
+
healthy: health.healthy,
|
|
119
|
+
uptime: process.uptime(),
|
|
120
|
+
services: health.services.reduce((acc, service) => {
|
|
121
|
+
acc[service.name] = {
|
|
122
|
+
status: service.status,
|
|
123
|
+
message: service.message,
|
|
124
|
+
lastCheck: Date.now(),
|
|
125
|
+
};
|
|
126
|
+
return acc;
|
|
127
|
+
}, {}),
|
|
128
|
+
version: '2.12.0', // TODO: Get from package.json
|
|
129
|
+
},
|
|
130
|
+
};
|
|
131
|
+
}));
|
|
132
|
+
// Combined Metrics Handler - More efficient for frontend polling
|
|
133
|
+
router.addTypedHandler(new plugins.typedrequest.TypedHandler('getCombinedMetrics', async (dataArg, toolsArg) => {
|
|
134
|
+
const sections = dataArg.sections || {
|
|
135
|
+
server: true,
|
|
136
|
+
email: true,
|
|
137
|
+
dns: true,
|
|
138
|
+
security: true,
|
|
139
|
+
network: true,
|
|
140
|
+
};
|
|
141
|
+
const metrics = {};
|
|
142
|
+
// Run all metrics collection in parallel
|
|
143
|
+
const promises = [];
|
|
144
|
+
if (sections.server) {
|
|
145
|
+
promises.push(this.collectServerStats().then(stats => {
|
|
146
|
+
metrics.server = {
|
|
147
|
+
uptime: stats.uptime,
|
|
148
|
+
startTime: Date.now() - (stats.uptime * 1000),
|
|
149
|
+
memoryUsage: stats.memoryUsage,
|
|
150
|
+
cpuUsage: stats.cpuUsage,
|
|
151
|
+
activeConnections: stats.activeConnections,
|
|
152
|
+
totalConnections: stats.totalConnections,
|
|
153
|
+
requestsPerSecond: stats.requestsPerSecond,
|
|
154
|
+
throughput: stats.throughput,
|
|
155
|
+
};
|
|
156
|
+
}));
|
|
157
|
+
}
|
|
158
|
+
if (sections.email) {
|
|
159
|
+
promises.push(this.collectEmailStats().then(stats => {
|
|
160
|
+
// Get time-series data from MetricsManager
|
|
161
|
+
const timeSeries = this.opsServerRef.dcRouterRef.metricsManager
|
|
162
|
+
? this.opsServerRef.dcRouterRef.metricsManager.getEmailTimeSeries(24)
|
|
163
|
+
: undefined;
|
|
164
|
+
metrics.email = {
|
|
165
|
+
sent: stats.sentToday,
|
|
166
|
+
received: stats.receivedToday,
|
|
167
|
+
bounced: Math.floor(stats.sentToday * stats.bounceRate / 100),
|
|
168
|
+
queued: stats.queueSize,
|
|
169
|
+
failed: 0,
|
|
170
|
+
averageDeliveryTime: 0,
|
|
171
|
+
deliveryRate: stats.deliveryRate,
|
|
172
|
+
bounceRate: stats.bounceRate,
|
|
173
|
+
timeSeries,
|
|
174
|
+
};
|
|
175
|
+
}));
|
|
176
|
+
}
|
|
177
|
+
if (sections.dns) {
|
|
178
|
+
promises.push(this.collectDnsStats().then(stats => {
|
|
179
|
+
// Get time-series data from MetricsManager
|
|
180
|
+
const timeSeries = this.opsServerRef.dcRouterRef.metricsManager
|
|
181
|
+
? this.opsServerRef.dcRouterRef.metricsManager.getDnsTimeSeries(24)
|
|
182
|
+
: undefined;
|
|
183
|
+
metrics.dns = {
|
|
184
|
+
totalQueries: stats.totalQueries,
|
|
185
|
+
cacheHits: stats.cacheHits,
|
|
186
|
+
cacheMisses: stats.cacheMisses,
|
|
187
|
+
cacheHitRate: stats.cacheHitRate,
|
|
188
|
+
activeDomains: stats.topDomains.length,
|
|
189
|
+
averageResponseTime: 0,
|
|
190
|
+
queryTypes: stats.queryTypes,
|
|
191
|
+
timeSeries,
|
|
192
|
+
recentQueries: stats.recentQueries,
|
|
193
|
+
};
|
|
194
|
+
}));
|
|
195
|
+
}
|
|
196
|
+
if (sections.security && this.opsServerRef.dcRouterRef.metricsManager) {
|
|
197
|
+
promises.push(this.opsServerRef.dcRouterRef.metricsManager.getSecurityStats().then(stats => {
|
|
198
|
+
// Get recent events from the SecurityLogger singleton
|
|
199
|
+
const securityLogger = SecurityLogger.getInstance();
|
|
200
|
+
const recentEvents = securityLogger.getRecentEvents(50).map((evt) => ({
|
|
201
|
+
timestamp: evt.timestamp,
|
|
202
|
+
level: evt.level,
|
|
203
|
+
type: evt.type,
|
|
204
|
+
message: evt.message,
|
|
205
|
+
details: evt.details,
|
|
206
|
+
ipAddress: evt.ipAddress,
|
|
207
|
+
domain: evt.domain,
|
|
208
|
+
success: evt.success,
|
|
209
|
+
}));
|
|
210
|
+
metrics.security = {
|
|
211
|
+
blockedIPs: stats.blockedIPs,
|
|
212
|
+
reputationScores: {},
|
|
213
|
+
spamDetected: stats.spamDetected,
|
|
214
|
+
malwareDetected: stats.malwareDetected,
|
|
215
|
+
phishingDetected: stats.phishingDetected,
|
|
216
|
+
authenticationFailures: stats.authFailures,
|
|
217
|
+
suspiciousActivities: stats.totalThreatsBlocked,
|
|
218
|
+
recentEvents,
|
|
219
|
+
};
|
|
220
|
+
}));
|
|
221
|
+
}
|
|
222
|
+
if (sections.network && this.opsServerRef.dcRouterRef.metricsManager) {
|
|
223
|
+
promises.push((async () => {
|
|
224
|
+
const stats = await this.opsServerRef.dcRouterRef.metricsManager.getNetworkStats();
|
|
225
|
+
const serverStats = await this.collectServerStats();
|
|
226
|
+
// Build per-IP bandwidth lookup from throughputByIP
|
|
227
|
+
const ipBandwidth = new Map();
|
|
228
|
+
if (stats.throughputByIP) {
|
|
229
|
+
for (const [ip, tp] of stats.throughputByIP) {
|
|
230
|
+
ipBandwidth.set(ip, { in: tp.in, out: tp.out });
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
metrics.network = {
|
|
234
|
+
totalBandwidth: {
|
|
235
|
+
in: stats.throughputRate.bytesInPerSecond,
|
|
236
|
+
out: stats.throughputRate.bytesOutPerSecond,
|
|
237
|
+
},
|
|
238
|
+
totalBytes: {
|
|
239
|
+
in: stats.totalDataTransferred.bytesIn,
|
|
240
|
+
out: stats.totalDataTransferred.bytesOut,
|
|
241
|
+
},
|
|
242
|
+
activeConnections: serverStats.activeConnections,
|
|
243
|
+
connectionDetails: [],
|
|
244
|
+
topEndpoints: stats.topIPs.map(ip => ({
|
|
245
|
+
endpoint: ip.ip,
|
|
246
|
+
requests: ip.count,
|
|
247
|
+
bandwidth: ipBandwidth.get(ip.ip) || { in: 0, out: 0 },
|
|
248
|
+
})),
|
|
249
|
+
throughputHistory: stats.throughputHistory || [],
|
|
250
|
+
requestsPerSecond: stats.requestsPerSecond || 0,
|
|
251
|
+
requestsTotal: stats.requestsTotal || 0,
|
|
252
|
+
backends: stats.backends || [],
|
|
253
|
+
};
|
|
254
|
+
})());
|
|
255
|
+
}
|
|
256
|
+
await Promise.all(promises);
|
|
257
|
+
return {
|
|
258
|
+
metrics,
|
|
259
|
+
timestamp: Date.now(),
|
|
260
|
+
};
|
|
261
|
+
}));
|
|
262
|
+
}
|
|
263
|
+
async collectServerStats() {
|
|
264
|
+
// Get metrics from MetricsManager if available
|
|
265
|
+
if (this.opsServerRef.dcRouterRef.metricsManager) {
|
|
266
|
+
const serverStats = await this.opsServerRef.dcRouterRef.metricsManager.getServerStats();
|
|
267
|
+
return {
|
|
268
|
+
uptime: serverStats.uptime,
|
|
269
|
+
cpuUsage: serverStats.cpuUsage,
|
|
270
|
+
memoryUsage: serverStats.memoryUsage,
|
|
271
|
+
requestsPerSecond: serverStats.requestsPerSecond,
|
|
272
|
+
activeConnections: serverStats.activeConnections,
|
|
273
|
+
totalConnections: serverStats.totalConnections,
|
|
274
|
+
throughput: serverStats.throughput,
|
|
275
|
+
history: [], // TODO: Implement history tracking
|
|
276
|
+
};
|
|
277
|
+
}
|
|
278
|
+
// Fallback to basic stats if MetricsManager not available
|
|
279
|
+
const uptime = process.uptime();
|
|
280
|
+
const memUsage = process.memoryUsage();
|
|
281
|
+
const cpuUsage = plugins.os.loadavg()[0] * 100 / plugins.os.cpus().length;
|
|
282
|
+
return {
|
|
283
|
+
uptime,
|
|
284
|
+
cpuUsage: {
|
|
285
|
+
user: cpuUsage * 0.7,
|
|
286
|
+
system: cpuUsage * 0.3,
|
|
287
|
+
},
|
|
288
|
+
memoryUsage: {
|
|
289
|
+
heapUsed: memUsage.heapUsed,
|
|
290
|
+
heapTotal: memUsage.heapTotal,
|
|
291
|
+
external: memUsage.external,
|
|
292
|
+
rss: memUsage.rss,
|
|
293
|
+
},
|
|
294
|
+
requestsPerSecond: 0,
|
|
295
|
+
activeConnections: 0,
|
|
296
|
+
totalConnections: 0,
|
|
297
|
+
throughput: { bytesIn: 0, bytesOut: 0, bytesInPerSecond: 0, bytesOutPerSecond: 0 },
|
|
298
|
+
history: [],
|
|
299
|
+
};
|
|
300
|
+
}
|
|
301
|
+
async collectEmailStats() {
|
|
302
|
+
// Get metrics from MetricsManager if available
|
|
303
|
+
if (this.opsServerRef.dcRouterRef.metricsManager) {
|
|
304
|
+
const emailStats = await this.opsServerRef.dcRouterRef.metricsManager.getEmailStats();
|
|
305
|
+
return {
|
|
306
|
+
sentToday: emailStats.sentToday,
|
|
307
|
+
receivedToday: emailStats.receivedToday,
|
|
308
|
+
bounceRate: emailStats.bounceRate,
|
|
309
|
+
deliveryRate: emailStats.deliveryRate,
|
|
310
|
+
queueSize: emailStats.queueSize,
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
// Fallback if MetricsManager not available
|
|
314
|
+
return {
|
|
315
|
+
sentToday: 0,
|
|
316
|
+
receivedToday: 0,
|
|
317
|
+
bounceRate: 0,
|
|
318
|
+
deliveryRate: 100,
|
|
319
|
+
queueSize: 0,
|
|
320
|
+
};
|
|
321
|
+
}
|
|
322
|
+
async collectDnsStats() {
|
|
323
|
+
// Get metrics from MetricsManager if available
|
|
324
|
+
if (this.opsServerRef.dcRouterRef.metricsManager) {
|
|
325
|
+
const dnsStats = await this.opsServerRef.dcRouterRef.metricsManager.getDnsStats();
|
|
326
|
+
return {
|
|
327
|
+
queriesPerSecond: dnsStats.queriesPerSecond,
|
|
328
|
+
totalQueries: dnsStats.totalQueries,
|
|
329
|
+
cacheHits: dnsStats.cacheHits,
|
|
330
|
+
cacheMisses: dnsStats.cacheMisses,
|
|
331
|
+
cacheHitRate: dnsStats.cacheHitRate,
|
|
332
|
+
topDomains: dnsStats.topDomains,
|
|
333
|
+
queryTypes: dnsStats.queryTypes,
|
|
334
|
+
recentQueries: dnsStats.recentQueries,
|
|
335
|
+
};
|
|
336
|
+
}
|
|
337
|
+
// Fallback if MetricsManager not available
|
|
338
|
+
return {
|
|
339
|
+
queriesPerSecond: 0,
|
|
340
|
+
totalQueries: 0,
|
|
341
|
+
cacheHits: 0,
|
|
342
|
+
cacheMisses: 0,
|
|
343
|
+
cacheHitRate: 0,
|
|
344
|
+
topDomains: [],
|
|
345
|
+
queryTypes: {},
|
|
346
|
+
};
|
|
347
|
+
}
|
|
348
|
+
async getQueueStatus() {
|
|
349
|
+
// TODO: Implement actual queue status collection
|
|
350
|
+
return {
|
|
351
|
+
pending: 0,
|
|
352
|
+
active: 0,
|
|
353
|
+
failed: 0,
|
|
354
|
+
retrying: 0,
|
|
355
|
+
items: [],
|
|
356
|
+
};
|
|
357
|
+
}
|
|
358
|
+
async checkHealthStatus() {
|
|
359
|
+
const dcRouter = this.opsServerRef.dcRouterRef;
|
|
360
|
+
const health = dcRouter.serviceManager.getHealth();
|
|
361
|
+
const services = health.services.map((svc) => {
|
|
362
|
+
let status;
|
|
363
|
+
switch (svc.state) {
|
|
364
|
+
case 'running':
|
|
365
|
+
status = 'healthy';
|
|
366
|
+
break;
|
|
367
|
+
case 'starting':
|
|
368
|
+
case 'degraded':
|
|
369
|
+
status = 'degraded';
|
|
370
|
+
break;
|
|
371
|
+
case 'failed':
|
|
372
|
+
status = svc.criticality === 'critical' ? 'unhealthy' : 'degraded';
|
|
373
|
+
break;
|
|
374
|
+
case 'stopped':
|
|
375
|
+
case 'stopping':
|
|
376
|
+
default:
|
|
377
|
+
status = 'degraded';
|
|
378
|
+
break;
|
|
379
|
+
}
|
|
380
|
+
let message;
|
|
381
|
+
if (svc.state === 'failed' && svc.lastError) {
|
|
382
|
+
message = svc.lastError;
|
|
383
|
+
}
|
|
384
|
+
else if (svc.retryCount > 0 && svc.state !== 'running') {
|
|
385
|
+
message = `Retry attempt ${svc.retryCount}`;
|
|
386
|
+
}
|
|
387
|
+
return { name: svc.name, status, message };
|
|
388
|
+
});
|
|
389
|
+
const healthy = health.overall === 'healthy';
|
|
390
|
+
return {
|
|
391
|
+
healthy,
|
|
392
|
+
services,
|
|
393
|
+
checks: [
|
|
394
|
+
{
|
|
395
|
+
name: 'Memory Usage',
|
|
396
|
+
passed: process.memoryUsage().heapUsed < (plugins.os.totalmem() * 0.9),
|
|
397
|
+
message: 'Memory usage within limits',
|
|
398
|
+
},
|
|
399
|
+
],
|
|
400
|
+
};
|
|
401
|
+
}
|
|
402
|
+
}
|
|
403
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"stats.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/stats.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
import * as plugins from '../../plugins.js';
|
|
2
|
+
import * as interfaces from '../../../dist_ts_interfaces/index.js';
|
|
3
|
+
export class VpnHandler {
|
|
4
|
+
opsServerRef;
|
|
5
|
+
constructor(opsServerRef) {
|
|
6
|
+
this.opsServerRef = opsServerRef;
|
|
7
|
+
this.registerHandlers();
|
|
8
|
+
}
|
|
9
|
+
registerHandlers() {
|
|
10
|
+
const viewRouter = this.opsServerRef.viewRouter;
|
|
11
|
+
const adminRouter = this.opsServerRef.adminRouter;
|
|
12
|
+
// ---- Read endpoints (viewRouter — valid identity required via middleware) ----
|
|
13
|
+
// Get all registered VPN clients
|
|
14
|
+
viewRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getVpnClients', async (dataArg, toolsArg) => {
|
|
15
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
16
|
+
if (!manager) {
|
|
17
|
+
return { clients: [] };
|
|
18
|
+
}
|
|
19
|
+
const clients = manager.listClients().map((c) => ({
|
|
20
|
+
clientId: c.clientId,
|
|
21
|
+
enabled: c.enabled,
|
|
22
|
+
serverDefinedClientTags: c.serverDefinedClientTags,
|
|
23
|
+
description: c.description,
|
|
24
|
+
assignedIp: c.assignedIp,
|
|
25
|
+
createdAt: c.createdAt,
|
|
26
|
+
updatedAt: c.updatedAt,
|
|
27
|
+
expiresAt: c.expiresAt,
|
|
28
|
+
}));
|
|
29
|
+
return { clients };
|
|
30
|
+
}));
|
|
31
|
+
// Get VPN server status
|
|
32
|
+
viewRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getVpnStatus', async (dataArg, toolsArg) => {
|
|
33
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
34
|
+
const vpnConfig = this.opsServerRef.dcRouterRef.options.vpnConfig;
|
|
35
|
+
if (!manager) {
|
|
36
|
+
return {
|
|
37
|
+
status: {
|
|
38
|
+
running: false,
|
|
39
|
+
subnet: vpnConfig?.subnet || '10.8.0.0/24',
|
|
40
|
+
wgListenPort: vpnConfig?.wgListenPort ?? 51820,
|
|
41
|
+
serverPublicKeys: null,
|
|
42
|
+
registeredClients: 0,
|
|
43
|
+
connectedClients: 0,
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
const connected = await manager.getConnectedClients();
|
|
48
|
+
return {
|
|
49
|
+
status: {
|
|
50
|
+
running: manager.running,
|
|
51
|
+
subnet: manager.getSubnet(),
|
|
52
|
+
wgListenPort: vpnConfig?.wgListenPort ?? 51820,
|
|
53
|
+
serverPublicKeys: manager.getServerPublicKeys(),
|
|
54
|
+
registeredClients: manager.listClients().length,
|
|
55
|
+
connectedClients: connected.length,
|
|
56
|
+
},
|
|
57
|
+
};
|
|
58
|
+
}));
|
|
59
|
+
// ---- Write endpoints (adminRouter — admin identity required via middleware) ----
|
|
60
|
+
// Create a new VPN client
|
|
61
|
+
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('createVpnClient', async (dataArg, toolsArg) => {
|
|
62
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
63
|
+
if (!manager) {
|
|
64
|
+
return { success: false, message: 'VPN not configured' };
|
|
65
|
+
}
|
|
66
|
+
try {
|
|
67
|
+
const bundle = await manager.createClient({
|
|
68
|
+
clientId: dataArg.clientId,
|
|
69
|
+
serverDefinedClientTags: dataArg.serverDefinedClientTags,
|
|
70
|
+
description: dataArg.description,
|
|
71
|
+
});
|
|
72
|
+
return {
|
|
73
|
+
success: true,
|
|
74
|
+
client: {
|
|
75
|
+
clientId: bundle.entry.clientId,
|
|
76
|
+
enabled: bundle.entry.enabled ?? true,
|
|
77
|
+
serverDefinedClientTags: bundle.entry.serverDefinedClientTags,
|
|
78
|
+
description: bundle.entry.description,
|
|
79
|
+
assignedIp: bundle.entry.assignedIp,
|
|
80
|
+
createdAt: Date.now(),
|
|
81
|
+
updatedAt: Date.now(),
|
|
82
|
+
expiresAt: bundle.entry.expiresAt,
|
|
83
|
+
},
|
|
84
|
+
wireguardConfig: bundle.wireguardConfig,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
catch (err) {
|
|
88
|
+
return { success: false, message: err.message };
|
|
89
|
+
}
|
|
90
|
+
}));
|
|
91
|
+
// Delete a VPN client
|
|
92
|
+
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('deleteVpnClient', async (dataArg, toolsArg) => {
|
|
93
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
94
|
+
if (!manager) {
|
|
95
|
+
return { success: false, message: 'VPN not configured' };
|
|
96
|
+
}
|
|
97
|
+
try {
|
|
98
|
+
await manager.removeClient(dataArg.clientId);
|
|
99
|
+
return { success: true };
|
|
100
|
+
}
|
|
101
|
+
catch (err) {
|
|
102
|
+
return { success: false, message: err.message };
|
|
103
|
+
}
|
|
104
|
+
}));
|
|
105
|
+
// Enable a VPN client
|
|
106
|
+
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('enableVpnClient', async (dataArg, toolsArg) => {
|
|
107
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
108
|
+
if (!manager) {
|
|
109
|
+
return { success: false, message: 'VPN not configured' };
|
|
110
|
+
}
|
|
111
|
+
try {
|
|
112
|
+
await manager.enableClient(dataArg.clientId);
|
|
113
|
+
return { success: true };
|
|
114
|
+
}
|
|
115
|
+
catch (err) {
|
|
116
|
+
return { success: false, message: err.message };
|
|
117
|
+
}
|
|
118
|
+
}));
|
|
119
|
+
// Disable a VPN client
|
|
120
|
+
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('disableVpnClient', async (dataArg, toolsArg) => {
|
|
121
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
122
|
+
if (!manager) {
|
|
123
|
+
return { success: false, message: 'VPN not configured' };
|
|
124
|
+
}
|
|
125
|
+
try {
|
|
126
|
+
await manager.disableClient(dataArg.clientId);
|
|
127
|
+
return { success: true };
|
|
128
|
+
}
|
|
129
|
+
catch (err) {
|
|
130
|
+
return { success: false, message: err.message };
|
|
131
|
+
}
|
|
132
|
+
}));
|
|
133
|
+
// Rotate a VPN client's keys
|
|
134
|
+
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('rotateVpnClientKey', async (dataArg, toolsArg) => {
|
|
135
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
136
|
+
if (!manager) {
|
|
137
|
+
return { success: false, message: 'VPN not configured' };
|
|
138
|
+
}
|
|
139
|
+
try {
|
|
140
|
+
const bundle = await manager.rotateClientKey(dataArg.clientId);
|
|
141
|
+
return {
|
|
142
|
+
success: true,
|
|
143
|
+
wireguardConfig: bundle.wireguardConfig,
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
catch (err) {
|
|
147
|
+
return { success: false, message: err.message };
|
|
148
|
+
}
|
|
149
|
+
}));
|
|
150
|
+
// Export a VPN client config
|
|
151
|
+
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('exportVpnClientConfig', async (dataArg, toolsArg) => {
|
|
152
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
153
|
+
if (!manager) {
|
|
154
|
+
return { success: false, message: 'VPN not configured' };
|
|
155
|
+
}
|
|
156
|
+
try {
|
|
157
|
+
const config = await manager.exportClientConfig(dataArg.clientId, dataArg.format);
|
|
158
|
+
return { success: true, config };
|
|
159
|
+
}
|
|
160
|
+
catch (err) {
|
|
161
|
+
return { success: false, message: err.message };
|
|
162
|
+
}
|
|
163
|
+
}));
|
|
164
|
+
// Get telemetry for a specific VPN client
|
|
165
|
+
viewRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getVpnClientTelemetry', async (dataArg, toolsArg) => {
|
|
166
|
+
const manager = this.opsServerRef.dcRouterRef.vpnManager;
|
|
167
|
+
if (!manager) {
|
|
168
|
+
return { success: false, message: 'VPN not configured' };
|
|
169
|
+
}
|
|
170
|
+
try {
|
|
171
|
+
const telemetry = await manager.getClientTelemetry(dataArg.clientId);
|
|
172
|
+
if (!telemetry) {
|
|
173
|
+
return { success: false, message: 'Client not found or not connected' };
|
|
174
|
+
}
|
|
175
|
+
return {
|
|
176
|
+
success: true,
|
|
177
|
+
telemetry: {
|
|
178
|
+
clientId: telemetry.clientId,
|
|
179
|
+
assignedIp: telemetry.assignedIp,
|
|
180
|
+
bytesSent: telemetry.bytesSent,
|
|
181
|
+
bytesReceived: telemetry.bytesReceived,
|
|
182
|
+
packetsDropped: telemetry.packetsDropped,
|
|
183
|
+
bytesDropped: telemetry.bytesDropped,
|
|
184
|
+
lastKeepaliveAt: telemetry.lastKeepaliveAt,
|
|
185
|
+
keepalivesReceived: telemetry.keepalivesReceived,
|
|
186
|
+
rateLimitBytesPerSec: telemetry.rateLimitBytesPerSec,
|
|
187
|
+
burstBytes: telemetry.burstBytes,
|
|
188
|
+
},
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
catch (err) {
|
|
192
|
+
return { success: false, message: err.message };
|
|
193
|
+
}
|
|
194
|
+
}));
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"vpn.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/vpn.handler.ts"],"names":[],"mappings":"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"}
|