@serve.zone/dcrouter 11.0.8 → 11.0.9

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.
Files changed (88) hide show
  1. package/dist_serve/bundle.js +1 -1
  2. package/dist_ts/00_commitinfo_data.js +1 -1
  3. package/dist_ts_web/00_commitinfo_data.js +1 -1
  4. package/package.json +2 -2
  5. package/ts/00_commitinfo_data.ts +1 -1
  6. package/ts_web/00_commitinfo_data.ts +1 -1
  7. package/dist_ts/cache/classes.cache.cleaner.d.ts +0 -47
  8. package/dist_ts/cache/classes.cache.cleaner.js +0 -130
  9. package/dist_ts/cache/documents/classes.cached.ip.reputation.d.ts +0 -119
  10. package/dist_ts/cache/documents/classes.cached.ip.reputation.js +0 -323
  11. package/dist_ts/cache/documents/index.d.ts +0 -2
  12. package/dist_ts/cache/documents/index.js +0 -3
  13. package/dist_ts/cache/index.d.ts +0 -4
  14. package/dist_ts/cache/index.js +0 -7
  15. package/dist_ts/config/classes.api-token-manager.d.ts +0 -46
  16. package/dist_ts/config/classes.api-token-manager.js +0 -150
  17. package/dist_ts/config/classes.route-config-manager.d.ts +0 -35
  18. package/dist_ts/config/classes.route-config-manager.js +0 -231
  19. package/dist_ts/config/index.d.ts +0 -3
  20. package/dist_ts/config/index.js +0 -5
  21. package/dist_ts/config/validator.d.ts +0 -104
  22. package/dist_ts/config/validator.js +0 -152
  23. package/dist_ts/errors/base.errors.d.ts +0 -224
  24. package/dist_ts/errors/base.errors.js +0 -320
  25. package/dist_ts/errors/error.codes.d.ts +0 -115
  26. package/dist_ts/errors/error.codes.js +0 -136
  27. package/dist_ts/monitoring/classes.metricscache.d.ts +0 -32
  28. package/dist_ts/monitoring/classes.metricscache.js +0 -63
  29. package/dist_ts/monitoring/classes.metricsmanager.d.ts +0 -178
  30. package/dist_ts/monitoring/classes.metricsmanager.js +0 -642
  31. package/dist_ts/monitoring/index.d.ts +0 -1
  32. package/dist_ts/monitoring/index.js +0 -2
  33. package/dist_ts/opsserver/classes.opsserver.d.ts +0 -37
  34. package/dist_ts/opsserver/classes.opsserver.js +0 -85
  35. package/dist_ts/opsserver/handlers/admin.handler.d.ts +0 -31
  36. package/dist_ts/opsserver/handlers/admin.handler.js +0 -180
  37. package/dist_ts/opsserver/handlers/api-token.handler.d.ts +0 -6
  38. package/dist_ts/opsserver/handlers/api-token.handler.js +0 -62
  39. package/dist_ts/opsserver/handlers/certificate.handler.d.ts +0 -32
  40. package/dist_ts/opsserver/handlers/certificate.handler.js +0 -421
  41. package/dist_ts/opsserver/handlers/config.handler.d.ts +0 -7
  42. package/dist_ts/opsserver/handlers/config.handler.js +0 -192
  43. package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +0 -30
  44. package/dist_ts/opsserver/handlers/email-ops.handler.js +0 -227
  45. package/dist_ts/opsserver/handlers/index.d.ts +0 -11
  46. package/dist_ts/opsserver/handlers/index.js +0 -12
  47. package/dist_ts/opsserver/handlers/logs.handler.d.ts +0 -25
  48. package/dist_ts/opsserver/handlers/logs.handler.js +0 -256
  49. package/dist_ts/opsserver/handlers/radius.handler.d.ts +0 -6
  50. package/dist_ts/opsserver/handlers/radius.handler.js +0 -295
  51. package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +0 -6
  52. package/dist_ts/opsserver/handlers/remoteingress.handler.js +0 -156
  53. package/dist_ts/opsserver/handlers/route-management.handler.d.ts +0 -14
  54. package/dist_ts/opsserver/handlers/route-management.handler.js +0 -117
  55. package/dist_ts/opsserver/handlers/security.handler.d.ts +0 -9
  56. package/dist_ts/opsserver/handlers/security.handler.js +0 -231
  57. package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -11
  58. package/dist_ts/opsserver/handlers/stats.handler.js +0 -399
  59. package/dist_ts/opsserver/helpers/guards.d.ts +0 -27
  60. package/dist_ts/opsserver/helpers/guards.js +0 -43
  61. package/dist_ts/opsserver/index.d.ts +0 -1
  62. package/dist_ts/opsserver/index.js +0 -2
  63. package/dist_ts/radius/classes.accounting.manager.d.ts +0 -218
  64. package/dist_ts/radius/classes.accounting.manager.js +0 -417
  65. package/dist_ts/radius/classes.radius.server.d.ts +0 -171
  66. package/dist_ts/radius/classes.radius.server.js +0 -385
  67. package/dist_ts/radius/classes.vlan.manager.d.ts +0 -128
  68. package/dist_ts/radius/classes.vlan.manager.js +0 -279
  69. package/dist_ts/radius/index.d.ts +0 -13
  70. package/dist_ts/radius/index.js +0 -14
  71. package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +0 -82
  72. package/dist_ts/remoteingress/classes.remoteingress-manager.js +0 -227
  73. package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +0 -59
  74. package/dist_ts/remoteingress/classes.tunnel-manager.js +0 -165
  75. package/dist_ts/remoteingress/index.d.ts +0 -2
  76. package/dist_ts/remoteingress/index.js +0 -3
  77. package/dist_ts/security/classes.contentscanner.d.ts +0 -164
  78. package/dist_ts/security/classes.contentscanner.js +0 -642
  79. package/dist_ts/security/classes.ipreputationchecker.d.ts +0 -160
  80. package/dist_ts/security/classes.ipreputationchecker.js +0 -537
  81. package/dist_ts/security/classes.securitylogger.d.ts +0 -144
  82. package/dist_ts/security/classes.securitylogger.js +0 -233
  83. package/dist_ts/security/index.d.ts +0 -3
  84. package/dist_ts/security/index.js +0 -4
  85. package/dist_ts/storage/classes.storagemanager.d.ts +0 -83
  86. package/dist_ts/storage/classes.storagemanager.js +0 -350
  87. package/dist_ts/storage/index.d.ts +0 -1
  88. package/dist_ts/storage/index.js +0 -3
@@ -1,399 +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
- };
253
- })());
254
- }
255
- await Promise.all(promises);
256
- return {
257
- metrics,
258
- timestamp: Date.now(),
259
- };
260
- }));
261
- }
262
- async collectServerStats() {
263
- // Get metrics from MetricsManager if available
264
- if (this.opsServerRef.dcRouterRef.metricsManager) {
265
- const serverStats = await this.opsServerRef.dcRouterRef.metricsManager.getServerStats();
266
- return {
267
- uptime: serverStats.uptime,
268
- cpuUsage: serverStats.cpuUsage,
269
- memoryUsage: serverStats.memoryUsage,
270
- requestsPerSecond: serverStats.requestsPerSecond,
271
- activeConnections: serverStats.activeConnections,
272
- totalConnections: serverStats.totalConnections,
273
- throughput: serverStats.throughput,
274
- history: [], // TODO: Implement history tracking
275
- };
276
- }
277
- // Fallback to basic stats if MetricsManager not available
278
- const uptime = process.uptime();
279
- const memUsage = process.memoryUsage();
280
- const cpuUsage = plugins.os.loadavg()[0] * 100 / plugins.os.cpus().length;
281
- return {
282
- uptime,
283
- cpuUsage: {
284
- user: cpuUsage * 0.7,
285
- system: cpuUsage * 0.3,
286
- },
287
- memoryUsage: {
288
- heapUsed: memUsage.heapUsed,
289
- heapTotal: memUsage.heapTotal,
290
- external: memUsage.external,
291
- rss: memUsage.rss,
292
- },
293
- requestsPerSecond: 0,
294
- activeConnections: 0,
295
- totalConnections: 0,
296
- throughput: { bytesIn: 0, bytesOut: 0, bytesInPerSecond: 0, bytesOutPerSecond: 0 },
297
- history: [],
298
- };
299
- }
300
- async collectEmailStats() {
301
- // Get metrics from MetricsManager if available
302
- if (this.opsServerRef.dcRouterRef.metricsManager) {
303
- const emailStats = await this.opsServerRef.dcRouterRef.metricsManager.getEmailStats();
304
- return {
305
- sentToday: emailStats.sentToday,
306
- receivedToday: emailStats.receivedToday,
307
- bounceRate: emailStats.bounceRate,
308
- deliveryRate: emailStats.deliveryRate,
309
- queueSize: emailStats.queueSize,
310
- };
311
- }
312
- // Fallback if MetricsManager not available
313
- return {
314
- sentToday: 0,
315
- receivedToday: 0,
316
- bounceRate: 0,
317
- deliveryRate: 100,
318
- queueSize: 0,
319
- };
320
- }
321
- async collectDnsStats() {
322
- // Get metrics from MetricsManager if available
323
- if (this.opsServerRef.dcRouterRef.metricsManager) {
324
- const dnsStats = await this.opsServerRef.dcRouterRef.metricsManager.getDnsStats();
325
- return {
326
- queriesPerSecond: dnsStats.queriesPerSecond,
327
- totalQueries: dnsStats.totalQueries,
328
- cacheHits: dnsStats.cacheHits,
329
- cacheMisses: dnsStats.cacheMisses,
330
- cacheHitRate: dnsStats.cacheHitRate,
331
- topDomains: dnsStats.topDomains,
332
- queryTypes: dnsStats.queryTypes,
333
- recentQueries: dnsStats.recentQueries,
334
- };
335
- }
336
- // Fallback if MetricsManager not available
337
- return {
338
- queriesPerSecond: 0,
339
- totalQueries: 0,
340
- cacheHits: 0,
341
- cacheMisses: 0,
342
- cacheHitRate: 0,
343
- topDomains: [],
344
- queryTypes: {},
345
- };
346
- }
347
- async getQueueStatus() {
348
- // TODO: Implement actual queue status collection
349
- return {
350
- pending: 0,
351
- active: 0,
352
- failed: 0,
353
- retrying: 0,
354
- items: [],
355
- };
356
- }
357
- async checkHealthStatus() {
358
- const services = [];
359
- // Check HTTP Proxy
360
- if (this.opsServerRef.dcRouterRef.smartProxy) {
361
- services.push({
362
- name: 'HTTP/HTTPS Proxy',
363
- status: 'healthy',
364
- });
365
- }
366
- // Check Email Server
367
- if (this.opsServerRef.dcRouterRef.emailServer) {
368
- services.push({
369
- name: 'Email Server',
370
- status: 'healthy',
371
- });
372
- }
373
- // Check DNS Server
374
- if (this.opsServerRef.dcRouterRef.dnsServer) {
375
- services.push({
376
- name: 'DNS Server',
377
- status: 'healthy',
378
- });
379
- }
380
- // Check OpsServer
381
- services.push({
382
- name: 'OpsServer',
383
- status: 'healthy',
384
- });
385
- const healthy = services.every(s => s.status === 'healthy');
386
- return {
387
- healthy,
388
- services,
389
- checks: [
390
- {
391
- name: 'Memory Usage',
392
- passed: process.memoryUsage().heapUsed < (plugins.os.totalmem() * 0.9),
393
- message: 'Memory usage within limits',
394
- },
395
- ],
396
- };
397
- }
398
- }
399
- //# 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';
@@ -1,2 +0,0 @@
1
- export * from './classes.opsserver.js';
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9vcHNzZXJ2ZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx3QkFBd0IsQ0FBQyJ9