@serve.zone/dcrouter 11.12.4 → 11.14.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 +705 -548
- package/dist_ts_interfaces/data/index.d.ts +1 -0
- package/dist_ts_interfaces/data/index.js +2 -1
- package/dist_ts_interfaces/data/remoteingress.d.ts +10 -1
- package/dist_ts_interfaces/data/vpn.d.ts +43 -0
- package/dist_ts_interfaces/data/vpn.js +2 -0
- package/dist_ts_interfaces/requests/index.d.ts +1 -0
- package/dist_ts_interfaces/requests/index.js +2 -1
- package/dist_ts_interfaces/requests/vpn.d.ts +135 -0
- package/dist_ts_interfaces/requests/vpn.js +3 -0
- package/package.json +2 -1
- package/readme.md +107 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +126 -0
- package/ts/config/classes.route-config-manager.ts +20 -3
- package/ts/opsserver/classes.opsserver.ts +2 -0
- package/ts/opsserver/handlers/index.ts +2 -1
- package/ts/opsserver/handlers/vpn.handler.ts +257 -0
- package/ts/plugins.ts +2 -1
- package/ts/vpn/classes.vpn-manager.ts +378 -0
- package/ts/vpn/index.ts +1 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +164 -0
- package/ts_web/elements/index.ts +1 -0
- package/ts_web/elements/ops-dashboard.ts +6 -0
- package/ts_web/elements/ops-view-vpn.ts +330 -0
- package/ts_web/readme.md +17 -0
- package/ts_web/router.ts +1 -1
- package/dist_ts/00_commitinfo_data.d.ts +0 -8
- package/dist_ts/00_commitinfo_data.js +0 -9
- package/dist_ts/cache/classes.cache.cleaner.d.ts +0 -47
- package/dist_ts/cache/classes.cache.cleaner.js +0 -130
- package/dist_ts/cache/classes.cached.document.d.ts +0 -76
- package/dist_ts/cache/classes.cached.document.js +0 -100
- package/dist_ts/cache/classes.cachedb.d.ts +0 -60
- package/dist_ts/cache/classes.cachedb.js +0 -126
- package/dist_ts/cache/documents/classes.cached.email.d.ts +0 -125
- package/dist_ts/cache/documents/classes.cached.email.js +0 -337
- package/dist_ts/cache/documents/classes.cached.ip.reputation.d.ts +0 -119
- package/dist_ts/cache/documents/classes.cached.ip.reputation.js +0 -323
- package/dist_ts/cache/documents/index.d.ts +0 -2
- package/dist_ts/cache/documents/index.js +0 -3
- package/dist_ts/cache/index.d.ts +0 -4
- package/dist_ts/cache/index.js +0 -7
- package/dist_ts/classes.cert-provision-scheduler.d.ts +0 -54
- package/dist_ts/classes.cert-provision-scheduler.js +0 -118
- package/dist_ts/classes.dcrouter.d.ts +0 -356
- package/dist_ts/classes.dcrouter.js +0 -1592
- package/dist_ts/classes.storage-cert-manager.d.ts +0 -18
- package/dist_ts/classes.storage-cert-manager.js +0 -43
- package/dist_ts/config/classes.api-token-manager.d.ts +0 -46
- package/dist_ts/config/classes.api-token-manager.js +0 -150
- package/dist_ts/config/classes.route-config-manager.d.ts +0 -37
- package/dist_ts/config/classes.route-config-manager.js +0 -240
- package/dist_ts/config/index.d.ts +0 -3
- package/dist_ts/config/index.js +0 -5
- package/dist_ts/config/validator.d.ts +0 -104
- package/dist_ts/config/validator.js +0 -152
- package/dist_ts/errors/base.errors.d.ts +0 -224
- package/dist_ts/errors/base.errors.js +0 -320
- package/dist_ts/errors/error-handler.d.ts +0 -98
- package/dist_ts/errors/error-handler.js +0 -282
- package/dist_ts/errors/error.codes.d.ts +0 -115
- package/dist_ts/errors/error.codes.js +0 -136
- package/dist_ts/errors/index.d.ts +0 -54
- package/dist_ts/errors/index.js +0 -136
- package/dist_ts/errors/reputation.errors.d.ts +0 -183
- package/dist_ts/errors/reputation.errors.js +0 -292
- package/dist_ts/http3/http3-route-augmentation.d.ts +0 -50
- package/dist_ts/http3/http3-route-augmentation.js +0 -98
- package/dist_ts/http3/index.d.ts +0 -1
- package/dist_ts/http3/index.js +0 -2
- package/dist_ts/index.d.ts +0 -8
- package/dist_ts/index.js +0 -29
- package/dist_ts/logger.d.ts +0 -21
- package/dist_ts/logger.js +0 -81
- package/dist_ts/monitoring/classes.metricscache.d.ts +0 -32
- package/dist_ts/monitoring/classes.metricscache.js +0 -63
- package/dist_ts/monitoring/classes.metricsmanager.d.ts +0 -184
- package/dist_ts/monitoring/classes.metricsmanager.js +0 -744
- package/dist_ts/monitoring/index.d.ts +0 -1
- package/dist_ts/monitoring/index.js +0 -2
- package/dist_ts/opsserver/classes.opsserver.d.ts +0 -37
- package/dist_ts/opsserver/classes.opsserver.js +0 -85
- package/dist_ts/opsserver/handlers/admin.handler.d.ts +0 -31
- package/dist_ts/opsserver/handlers/admin.handler.js +0 -180
- package/dist_ts/opsserver/handlers/api-token.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/api-token.handler.js +0 -62
- package/dist_ts/opsserver/handlers/certificate.handler.d.ts +0 -32
- package/dist_ts/opsserver/handlers/certificate.handler.js +0 -421
- package/dist_ts/opsserver/handlers/config.handler.d.ts +0 -7
- package/dist_ts/opsserver/handlers/config.handler.js +0 -192
- package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +0 -30
- package/dist_ts/opsserver/handlers/email-ops.handler.js +0 -227
- package/dist_ts/opsserver/handlers/index.d.ts +0 -11
- package/dist_ts/opsserver/handlers/index.js +0 -12
- package/dist_ts/opsserver/handlers/logs.handler.d.ts +0 -25
- package/dist_ts/opsserver/handlers/logs.handler.js +0 -256
- package/dist_ts/opsserver/handlers/radius.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/radius.handler.js +0 -295
- package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +0 -6
- package/dist_ts/opsserver/handlers/remoteingress.handler.js +0 -156
- package/dist_ts/opsserver/handlers/route-management.handler.d.ts +0 -14
- package/dist_ts/opsserver/handlers/route-management.handler.js +0 -117
- package/dist_ts/opsserver/handlers/security.handler.d.ts +0 -9
- package/dist_ts/opsserver/handlers/security.handler.js +0 -233
- package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -11
- package/dist_ts/opsserver/handlers/stats.handler.js +0 -403
- package/dist_ts/opsserver/helpers/guards.d.ts +0 -27
- package/dist_ts/opsserver/helpers/guards.js +0 -43
- package/dist_ts/opsserver/index.d.ts +0 -1
- package/dist_ts/opsserver/index.js +0 -2
- package/dist_ts/paths.d.ts +0 -26
- package/dist_ts/paths.js +0 -45
- package/dist_ts/plugins.d.ts +0 -80
- package/dist_ts/plugins.js +0 -114
- package/dist_ts/radius/classes.accounting.manager.d.ts +0 -231
- package/dist_ts/radius/classes.accounting.manager.js +0 -462
- package/dist_ts/radius/classes.radius.server.d.ts +0 -171
- package/dist_ts/radius/classes.radius.server.js +0 -386
- package/dist_ts/radius/classes.vlan.manager.d.ts +0 -128
- package/dist_ts/radius/classes.vlan.manager.js +0 -279
- package/dist_ts/radius/index.d.ts +0 -13
- package/dist_ts/radius/index.js +0 -14
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +0 -94
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +0 -271
- package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +0 -59
- package/dist_ts/remoteingress/classes.tunnel-manager.js +0 -165
- package/dist_ts/remoteingress/index.d.ts +0 -2
- package/dist_ts/remoteingress/index.js +0 -3
- package/dist_ts/security/classes.contentscanner.d.ts +0 -164
- package/dist_ts/security/classes.contentscanner.js +0 -642
- package/dist_ts/security/classes.ipreputationchecker.d.ts +0 -160
- package/dist_ts/security/classes.ipreputationchecker.js +0 -537
- package/dist_ts/security/classes.securitylogger.d.ts +0 -144
- package/dist_ts/security/classes.securitylogger.js +0 -235
- package/dist_ts/security/index.d.ts +0 -3
- package/dist_ts/security/index.js +0 -4
- package/dist_ts/sms/classes.smsservice.d.ts +0 -15
- package/dist_ts/sms/classes.smsservice.js +0 -72
- package/dist_ts/sms/config/sms.config.d.ts +0 -93
- package/dist_ts/sms/config/sms.config.js +0 -2
- package/dist_ts/sms/config/sms.schema.d.ts +0 -5
- package/dist_ts/sms/config/sms.schema.js +0 -121
- package/dist_ts/sms/index.d.ts +0 -1
- package/dist_ts/sms/index.js +0 -2
- package/dist_ts/storage/classes.storagemanager.d.ts +0 -83
- package/dist_ts/storage/classes.storagemanager.js +0 -348
- package/dist_ts/storage/index.d.ts +0 -1
- package/dist_ts/storage/index.js +0 -3
- package/dist_ts_apiclient/classes.apitoken.d.ts +0 -41
- package/dist_ts_apiclient/classes.apitoken.js +0 -115
- package/dist_ts_apiclient/classes.certificate.d.ts +0 -57
- package/dist_ts_apiclient/classes.certificate.js +0 -69
- package/dist_ts_apiclient/classes.config.d.ts +0 -7
- package/dist_ts_apiclient/classes.config.js +0 -11
- package/dist_ts_apiclient/classes.dcrouterapiclient.d.ts +0 -41
- package/dist_ts_apiclient/classes.dcrouterapiclient.js +0 -81
- package/dist_ts_apiclient/classes.email.d.ts +0 -30
- package/dist_ts_apiclient/classes.email.js +0 -52
- package/dist_ts_apiclient/classes.logs.d.ts +0 -21
- package/dist_ts_apiclient/classes.logs.js +0 -14
- package/dist_ts_apiclient/classes.radius.d.ts +0 -59
- package/dist_ts_apiclient/classes.radius.js +0 -95
- package/dist_ts_apiclient/classes.remoteingress.d.ts +0 -54
- package/dist_ts_apiclient/classes.remoteingress.js +0 -136
- package/dist_ts_apiclient/classes.route.d.ts +0 -42
- package/dist_ts_apiclient/classes.route.js +0 -154
- package/dist_ts_apiclient/classes.stats.d.ts +0 -47
- package/dist_ts_apiclient/classes.stats.js +0 -38
- package/dist_ts_apiclient/index.d.ts +0 -10
- package/dist_ts_apiclient/index.js +0 -14
- package/dist_ts_apiclient/plugins.d.ts +0 -3
- package/dist_ts_apiclient/plugins.js +0 -5
- package/dist_ts_web/00_commitinfo_data.d.ts +0 -8
- package/dist_ts_web/00_commitinfo_data.js +0 -9
- package/dist_ts_web/appstate.d.ts +0 -216
- package/dist_ts_web/appstate.js +0 -1064
- package/dist_ts_web/elements/index.d.ts +0 -12
- package/dist_ts_web/elements/index.js +0 -13
- package/dist_ts_web/elements/ops-dashboard.d.ts +0 -23
- package/dist_ts_web/elements/ops-dashboard.js +0 -317
- package/dist_ts_web/elements/ops-view-apitokens.d.ts +0 -13
- package/dist_ts_web/elements/ops-view-apitokens.js +0 -371
- package/dist_ts_web/elements/ops-view-certificates.d.ts +0 -22
- package/dist_ts_web/elements/ops-view-certificates.js +0 -528
- package/dist_ts_web/elements/ops-view-config.d.ts +0 -19
- package/dist_ts_web/elements/ops-view-config.js +0 -339
- package/dist_ts_web/elements/ops-view-emails.d.ts +0 -21
- package/dist_ts_web/elements/ops-view-emails.js +0 -165
- package/dist_ts_web/elements/ops-view-logs.d.ts +0 -13
- package/dist_ts_web/elements/ops-view-logs.js +0 -159
- package/dist_ts_web/elements/ops-view-network.d.ts +0 -71
- package/dist_ts_web/elements/ops-view-network.js +0 -764
- package/dist_ts_web/elements/ops-view-overview.d.ts +0 -22
- package/dist_ts_web/elements/ops-view-overview.js +0 -456
- package/dist_ts_web/elements/ops-view-remoteingress.d.ts +0 -20
- package/dist_ts_web/elements/ops-view-remoteingress.js +0 -494
- package/dist_ts_web/elements/ops-view-routes.d.ts +0 -12
- package/dist_ts_web/elements/ops-view-routes.js +0 -404
- package/dist_ts_web/elements/ops-view-security.d.ts +0 -21
- package/dist_ts_web/elements/ops-view-security.js +0 -574
- package/dist_ts_web/elements/shared/css.d.ts +0 -1
- package/dist_ts_web/elements/shared/css.js +0 -10
- package/dist_ts_web/elements/shared/index.d.ts +0 -2
- package/dist_ts_web/elements/shared/index.js +0 -3
- package/dist_ts_web/elements/shared/ops-sectionheading.d.ts +0 -5
- package/dist_ts_web/elements/shared/ops-sectionheading.js +0 -82
- package/dist_ts_web/index.d.ts +0 -1
- package/dist_ts_web/index.js +0 -10
- package/dist_ts_web/plugins.d.ts +0 -6
- package/dist_ts_web/plugins.js +0 -11
- package/dist_ts_web/router.d.ts +0 -19
- package/dist_ts_web/router.js +0 -91
|
@@ -1,403 +0,0 @@
|
|
|
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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"}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
import * as plugins from '../../plugins.js';
|
|
2
|
-
import type { AdminHandler } from '../handlers/admin.handler.js';
|
|
3
|
-
import * as interfaces from '../../../dist_ts_interfaces/index.js';
|
|
4
|
-
/**
|
|
5
|
-
* Helper function to use identity guards in handlers
|
|
6
|
-
*
|
|
7
|
-
* @example
|
|
8
|
-
* // In a handler:
|
|
9
|
-
* await passGuards(toolsArg, this.opsServerRef.adminHandler.validIdentityGuard, dataArg);
|
|
10
|
-
*/
|
|
11
|
-
export declare function passGuards<T extends {
|
|
12
|
-
identity?: any;
|
|
13
|
-
}>(toolsArg: any, guard: plugins.smartguard.Guard<T>, dataArg: T): Promise<void>;
|
|
14
|
-
/**
|
|
15
|
-
* Helper to check admin identity in handlers and middleware.
|
|
16
|
-
* Accepts both optional and required identity for flexibility.
|
|
17
|
-
*/
|
|
18
|
-
export declare function requireAdminIdentity(adminHandler: AdminHandler, dataArg: {
|
|
19
|
-
identity?: interfaces.data.IIdentity;
|
|
20
|
-
}): Promise<void>;
|
|
21
|
-
/**
|
|
22
|
-
* Helper to check valid identity in handlers and middleware.
|
|
23
|
-
* Accepts both optional and required identity for flexibility.
|
|
24
|
-
*/
|
|
25
|
-
export declare function requireValidIdentity(adminHandler: AdminHandler, dataArg: {
|
|
26
|
-
identity?: interfaces.data.IIdentity;
|
|
27
|
-
}): Promise<void>;
|
|
@@ -1,43 +0,0 @@
|
|
|
1
|
-
import * as plugins from '../../plugins.js';
|
|
2
|
-
import * as interfaces from '../../../dist_ts_interfaces/index.js';
|
|
3
|
-
/**
|
|
4
|
-
* Helper function to use identity guards in handlers
|
|
5
|
-
*
|
|
6
|
-
* @example
|
|
7
|
-
* // In a handler:
|
|
8
|
-
* await passGuards(toolsArg, this.opsServerRef.adminHandler.validIdentityGuard, dataArg);
|
|
9
|
-
*/
|
|
10
|
-
export async function passGuards(toolsArg, guard, dataArg) {
|
|
11
|
-
const result = await guard.exec(dataArg);
|
|
12
|
-
if (!result) {
|
|
13
|
-
const failedHint = await guard.getFailedHint(dataArg);
|
|
14
|
-
throw new plugins.typedrequest.TypedResponseError(failedHint || 'Guard check failed');
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
/**
|
|
18
|
-
* Helper to check admin identity in handlers and middleware.
|
|
19
|
-
* Accepts both optional and required identity for flexibility.
|
|
20
|
-
*/
|
|
21
|
-
export async function requireAdminIdentity(adminHandler, dataArg) {
|
|
22
|
-
if (!dataArg.identity) {
|
|
23
|
-
throw new plugins.typedrequest.TypedResponseError('No identity provided');
|
|
24
|
-
}
|
|
25
|
-
const passed = await adminHandler.adminIdentityGuard.exec({ identity: dataArg.identity });
|
|
26
|
-
if (!passed) {
|
|
27
|
-
throw new plugins.typedrequest.TypedResponseError('Admin access required');
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
/**
|
|
31
|
-
* Helper to check valid identity in handlers and middleware.
|
|
32
|
-
* Accepts both optional and required identity for flexibility.
|
|
33
|
-
*/
|
|
34
|
-
export async function requireValidIdentity(adminHandler, dataArg) {
|
|
35
|
-
if (!dataArg.identity) {
|
|
36
|
-
throw new plugins.typedrequest.TypedResponseError('No identity provided');
|
|
37
|
-
}
|
|
38
|
-
const passed = await adminHandler.validIdentityGuard.exec({ identity: dataArg.identity });
|
|
39
|
-
if (!passed) {
|
|
40
|
-
throw new plugins.typedrequest.TypedResponseError('Valid identity required');
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3VhcmRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvb3Bzc2VydmVyL2hlbHBlcnMvZ3VhcmRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFFNUMsT0FBTyxLQUFLLFVBQVUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLFVBQVUsQ0FDOUIsUUFBYSxFQUNiLEtBQWtDLEVBQ2xDLE9BQVU7SUFFVixNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDekMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ1osTUFBTSxVQUFVLEdBQUcsTUFBTSxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3RELE1BQU0sSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLGtCQUFrQixDQUFDLFVBQVUsSUFBSSxvQkFBb0IsQ0FBQyxDQUFDO0lBQ3hGLENBQUM7QUFDSCxDQUFDO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxvQkFBb0IsQ0FDeEMsWUFBMEIsRUFDMUIsT0FBaUQ7SUFFakQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN0QixNQUFNLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO0lBQzVFLENBQUM7SUFFRCxNQUFNLE1BQU0sR0FBRyxNQUFNLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsRUFBRSxRQUFRLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDMUYsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ1osTUFBTSxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsa0JBQWtCLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUM3RSxDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLFlBQTBCLEVBQzFCLE9BQWlEO0lBRWpELElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDdEIsTUFBTSxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsa0JBQWtCLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUM1RSxDQUFDO0lBRUQsTUFBTSxNQUFNLEdBQUcsTUFBTSxZQUFZLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQzFGLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNaLE1BQU0sSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDLGtCQUFrQixDQUFDLHlCQUF5QixDQUFDLENBQUM7SUFDL0UsQ0FBQztBQUNILENBQUMifQ==
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * from './classes.opsserver.js';
|
package/dist_ts/paths.d.ts
DELETED
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
export declare const packageDir: string;
|
|
2
|
-
export declare const distServe: string;
|
|
3
|
-
export declare const dcrouterHomeDir: string;
|
|
4
|
-
export declare const dataDir: string;
|
|
5
|
-
export declare const defaultTsmDbPath: string;
|
|
6
|
-
export declare const dnsRecordsDir: string;
|
|
7
|
-
/**
|
|
8
|
-
* Resolve all data paths from a given baseDir.
|
|
9
|
-
* When no baseDir is provided, falls back to ~/.serve.zone/dcrouter.
|
|
10
|
-
* Specific overrides (e.g. DATA_DIR env) take precedence.
|
|
11
|
-
*/
|
|
12
|
-
export declare function resolvePaths(baseDir?: string): {
|
|
13
|
-
dcrouterHomeDir: string;
|
|
14
|
-
dataDir: string;
|
|
15
|
-
defaultTsmDbPath: string;
|
|
16
|
-
defaultStoragePath: string;
|
|
17
|
-
dnsRecordsDir: string;
|
|
18
|
-
};
|
|
19
|
-
/**
|
|
20
|
-
* Ensure only the data directories that are actually used exist.
|
|
21
|
-
*/
|
|
22
|
-
export declare function ensureDataDirectories(resolvedPaths: ReturnType<typeof resolvePaths>): void;
|
|
23
|
-
/**
|
|
24
|
-
* Legacy wrapper — delegates to ensureDataDirectories with module-level defaults.
|
|
25
|
-
*/
|
|
26
|
-
export declare function ensureDirectories(): void;
|
package/dist_ts/paths.js
DELETED
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
import * as plugins from './plugins.js';
|
|
2
|
-
// Code/asset paths (not affected by baseDir)
|
|
3
|
-
export const packageDir = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');
|
|
4
|
-
export const distServe = plugins.path.join(packageDir, './dist_serve');
|
|
5
|
-
// Default base for all dcrouter data (always user-writable)
|
|
6
|
-
export const dcrouterHomeDir = plugins.path.join(plugins.os.homedir(), '.serve.zone', 'dcrouter');
|
|
7
|
-
// Configure data directory with environment variable or default to ~/.serve.zone/dcrouter/data
|
|
8
|
-
const DEFAULT_DATA_PATH = plugins.path.join(dcrouterHomeDir, 'data');
|
|
9
|
-
export const dataDir = process.env.DATA_DIR
|
|
10
|
-
? process.env.DATA_DIR
|
|
11
|
-
: DEFAULT_DATA_PATH;
|
|
12
|
-
// Default TsmDB path for CacheDb
|
|
13
|
-
export const defaultTsmDbPath = plugins.path.join(dcrouterHomeDir, 'tsmdb');
|
|
14
|
-
// DNS records directory (only surviving MTA directory reference)
|
|
15
|
-
export const dnsRecordsDir = plugins.path.join(dataDir, 'dns');
|
|
16
|
-
/**
|
|
17
|
-
* Resolve all data paths from a given baseDir.
|
|
18
|
-
* When no baseDir is provided, falls back to ~/.serve.zone/dcrouter.
|
|
19
|
-
* Specific overrides (e.g. DATA_DIR env) take precedence.
|
|
20
|
-
*/
|
|
21
|
-
export function resolvePaths(baseDir) {
|
|
22
|
-
const root = baseDir ?? plugins.path.join(plugins.os.homedir(), '.serve.zone', 'dcrouter');
|
|
23
|
-
const resolvedDataDir = process.env.DATA_DIR ?? plugins.path.join(root, 'data');
|
|
24
|
-
return {
|
|
25
|
-
dcrouterHomeDir: root,
|
|
26
|
-
dataDir: resolvedDataDir,
|
|
27
|
-
defaultTsmDbPath: plugins.path.join(root, 'tsmdb'),
|
|
28
|
-
defaultStoragePath: plugins.path.join(root, 'storage'),
|
|
29
|
-
dnsRecordsDir: plugins.path.join(resolvedDataDir, 'dns'),
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
/**
|
|
33
|
-
* Ensure only the data directories that are actually used exist.
|
|
34
|
-
*/
|
|
35
|
-
export function ensureDataDirectories(resolvedPaths) {
|
|
36
|
-
plugins.fsUtils.ensureDirSync(resolvedPaths.dataDir);
|
|
37
|
-
plugins.fsUtils.ensureDirSync(resolvedPaths.dnsRecordsDir);
|
|
38
|
-
}
|
|
39
|
-
/**
|
|
40
|
-
* Legacy wrapper — delegates to ensureDataDirectories with module-level defaults.
|
|
41
|
-
*/
|
|
42
|
-
export function ensureDirectories() {
|
|
43
|
-
ensureDataDirectories(resolvePaths());
|
|
44
|
-
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4Qyw2Q0FBNkM7QUFDN0MsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUN6QyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUMvRCxLQUFLLENBQ04sQ0FBQztBQUNGLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFFdkUsNERBQTREO0FBQzVELE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLGFBQWEsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUVsRywrRkFBK0Y7QUFDL0YsTUFBTSxpQkFBaUIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFDckUsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtJQUN6QyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRO0lBQ3RCLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQztBQUV0QixpQ0FBaUM7QUFDakMsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBRTVFLGlFQUFpRTtBQUNqRSxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBRS9EOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQUFDLE9BQWdCO0lBQzNDLE1BQU0sSUFBSSxHQUFHLE9BQU8sSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLGFBQWEsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUMzRixNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDaEYsT0FBTztRQUNMLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLE9BQU8sRUFBRSxlQUFlO1FBQ3hCLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUM7UUFDbEQsa0JBQWtCLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUN0RCxhQUFhLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLEtBQUssQ0FBQztLQUN6RCxDQUFDO0FBQ0osQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLGFBQThDO0lBQ2xGLE9BQU8sQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNyRCxPQUFPLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxhQUFhLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDN0QsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGlCQUFpQjtJQUMvQixxQkFBcUIsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO0FBQ3hDLENBQUMifQ==
|