@serve.zone/dcrouter 8.0.0 → 8.1.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.
Files changed (99) hide show
  1. package/dist_serve/bundle.js +1659 -891
  2. package/dist_ts/00_commitinfo_data.js +1 -1
  3. package/dist_ts/classes.dcrouter.d.ts +9 -0
  4. package/dist_ts/classes.dcrouter.js +27 -1
  5. package/dist_ts/config/classes.api-token-manager.d.ts +38 -0
  6. package/dist_ts/config/classes.api-token-manager.js +134 -0
  7. package/dist_ts/config/classes.route-config-manager.d.ts +35 -0
  8. package/dist_ts/config/classes.route-config-manager.js +231 -0
  9. package/dist_ts/config/index.d.ts +2 -0
  10. package/dist_ts/config/index.js +3 -1
  11. package/dist_ts/opsserver/classes.opsserver.d.ts +2 -0
  12. package/dist_ts/opsserver/classes.opsserver.js +5 -1
  13. package/dist_ts/opsserver/handlers/{remoteingress.handler.d.ts → api-token.handler.d.ts} +5 -1
  14. package/dist_ts/opsserver/handlers/api-token.handler.js +66 -0
  15. package/dist_ts/opsserver/handlers/index.d.ts +2 -0
  16. package/dist_ts/opsserver/handlers/index.js +3 -1
  17. package/dist_ts/opsserver/handlers/{radius.handler.d.ts → route-management.handler.d.ts} +6 -1
  18. package/dist_ts/opsserver/handlers/route-management.handler.js +117 -0
  19. package/dist_ts_interfaces/data/index.d.ts +1 -0
  20. package/dist_ts_interfaces/data/index.js +2 -1
  21. package/dist_ts_interfaces/data/route-management.d.ts +68 -0
  22. package/dist_ts_interfaces/data/route-management.js +2 -0
  23. package/dist_ts_interfaces/requests/api-tokens.d.ts +63 -0
  24. package/dist_ts_interfaces/requests/api-tokens.js +2 -0
  25. package/dist_ts_interfaces/requests/index.d.ts +2 -0
  26. package/dist_ts_interfaces/requests/index.js +3 -1
  27. package/dist_ts_interfaces/requests/route-management.d.ts +114 -0
  28. package/dist_ts_interfaces/requests/route-management.js +2 -0
  29. package/dist_ts_web/00_commitinfo_data.js +1 -1
  30. package/dist_ts_web/appstate.d.ts +36 -0
  31. package/dist_ts_web/appstate.js +220 -2
  32. package/dist_ts_web/elements/index.d.ts +2 -0
  33. package/dist_ts_web/elements/index.js +3 -1
  34. package/dist_ts_web/elements/ops-dashboard.js +11 -1
  35. package/dist_ts_web/elements/ops-view-apitokens.d.ts +12 -0
  36. package/dist_ts_web/elements/ops-view-apitokens.js +306 -0
  37. package/dist_ts_web/elements/ops-view-routes.d.ts +12 -0
  38. package/dist_ts_web/elements/ops-view-routes.js +404 -0
  39. package/dist_ts_web/router.d.ts +1 -1
  40. package/dist_ts_web/router.js +2 -2
  41. package/package.json +2 -2
  42. package/ts/00_commitinfo_data.ts +1 -1
  43. package/ts/classes.dcrouter.ts +37 -1
  44. package/ts/config/classes.api-token-manager.ts +155 -0
  45. package/ts/config/classes.route-config-manager.ts +271 -0
  46. package/ts/config/index.ts +3 -1
  47. package/ts/opsserver/classes.opsserver.ts +4 -0
  48. package/ts/opsserver/handlers/api-token.handler.ts +96 -0
  49. package/ts/opsserver/handlers/index.ts +3 -1
  50. package/ts/opsserver/handlers/route-management.handler.ts +163 -0
  51. package/ts_web/00_commitinfo_data.ts +1 -1
  52. package/ts_web/appstate.ts +308 -1
  53. package/ts_web/elements/index.ts +2 -0
  54. package/ts_web/elements/ops-dashboard.ts +10 -0
  55. package/ts_web/elements/ops-view-apitokens.ts +281 -0
  56. package/ts_web/elements/ops-view-routes.ts +389 -0
  57. package/ts_web/router.ts +1 -1
  58. package/dist_ts/cache/classes.cache.cleaner.d.ts +0 -47
  59. package/dist_ts/cache/classes.cache.cleaner.js +0 -130
  60. package/dist_ts/cache/classes.cached.document.d.ts +0 -76
  61. package/dist_ts/cache/classes.cached.document.js +0 -100
  62. package/dist_ts/cache/classes.cachedb.d.ts +0 -60
  63. package/dist_ts/cache/classes.cachedb.js +0 -126
  64. package/dist_ts/cache/documents/classes.cached.email.d.ts +0 -125
  65. package/dist_ts/cache/documents/classes.cached.email.js +0 -337
  66. package/dist_ts/cache/documents/classes.cached.ip.reputation.d.ts +0 -119
  67. package/dist_ts/cache/documents/classes.cached.ip.reputation.js +0 -323
  68. package/dist_ts/cache/documents/index.d.ts +0 -2
  69. package/dist_ts/cache/documents/index.js +0 -3
  70. package/dist_ts/cache/index.d.ts +0 -4
  71. package/dist_ts/cache/index.js +0 -7
  72. package/dist_ts/monitoring/classes.metricscache.d.ts +0 -32
  73. package/dist_ts/monitoring/classes.metricscache.js +0 -63
  74. package/dist_ts/monitoring/classes.metricsmanager.d.ts +0 -169
  75. package/dist_ts/monitoring/classes.metricsmanager.js +0 -591
  76. package/dist_ts/monitoring/index.d.ts +0 -1
  77. package/dist_ts/monitoring/index.js +0 -2
  78. package/dist_ts/opsserver/handlers/admin.handler.d.ts +0 -31
  79. package/dist_ts/opsserver/handlers/admin.handler.js +0 -180
  80. package/dist_ts/opsserver/handlers/certificate.handler.d.ts +0 -34
  81. package/dist_ts/opsserver/handlers/certificate.handler.js +0 -419
  82. package/dist_ts/opsserver/handlers/config.handler.d.ts +0 -9
  83. package/dist_ts/opsserver/handlers/config.handler.js +0 -67
  84. package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +0 -32
  85. package/dist_ts/opsserver/handlers/email-ops.handler.js +0 -226
  86. package/dist_ts/opsserver/handlers/logs.handler.d.ts +0 -17
  87. package/dist_ts/opsserver/handlers/logs.handler.js +0 -215
  88. package/dist_ts/opsserver/handlers/radius.handler.js +0 -296
  89. package/dist_ts/opsserver/handlers/remoteingress.handler.js +0 -154
  90. package/dist_ts/opsserver/handlers/security.handler.d.ts +0 -11
  91. package/dist_ts/opsserver/handlers/security.handler.js +0 -232
  92. package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -13
  93. package/dist_ts/opsserver/handlers/stats.handler.js +0 -400
  94. package/dist_ts/security/classes.securitylogger.d.ts +0 -140
  95. package/dist_ts/security/classes.securitylogger.js +0 -235
  96. package/dist_ts/storage/classes.storagemanager.d.ts +0 -82
  97. package/dist_ts/storage/classes.storagemanager.js +0 -344
  98. package/dist_ts/storage/index.d.ts +0 -1
  99. package/dist_ts/storage/index.js +0 -3
@@ -1,226 +0,0 @@
1
- import * as plugins from '../../plugins.js';
2
- import * as interfaces from '../../../dist_ts_interfaces/index.js';
3
- export class EmailOpsHandler {
4
- opsServerRef;
5
- typedrouter = new plugins.typedrequest.TypedRouter();
6
- constructor(opsServerRef) {
7
- this.opsServerRef = opsServerRef;
8
- // Add this handler's router to the parent
9
- this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
10
- this.registerHandlers();
11
- }
12
- registerHandlers() {
13
- // Get All Emails Handler
14
- this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getAllEmails', async (dataArg) => {
15
- const emails = this.getAllQueueEmails();
16
- return { emails };
17
- }));
18
- // Get Email Detail Handler
19
- this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getEmailDetail', async (dataArg) => {
20
- const email = this.getEmailDetail(dataArg.emailId);
21
- return { email };
22
- }));
23
- // Resend Failed Email Handler
24
- this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('resendEmail', async (dataArg) => {
25
- const emailServer = this.opsServerRef.dcRouterRef.emailServer;
26
- if (!emailServer?.deliveryQueue) {
27
- return { success: false, error: 'Email server not available' };
28
- }
29
- const queue = emailServer.deliveryQueue;
30
- const item = queue.getItem(dataArg.emailId);
31
- if (!item) {
32
- return { success: false, error: 'Email not found in queue' };
33
- }
34
- if (item.status !== 'failed') {
35
- return { success: false, error: `Email is not in failed state (current: ${item.status})` };
36
- }
37
- try {
38
- const newQueueId = await queue.enqueue(item.processingResult, item.processingMode, item.route);
39
- await queue.removeItem(dataArg.emailId);
40
- return { success: true, newQueueId };
41
- }
42
- catch (error) {
43
- return {
44
- success: false,
45
- error: error instanceof Error ? error.message : 'Failed to resend email'
46
- };
47
- }
48
- }));
49
- }
50
- /**
51
- * Get all queue items mapped to catalog IEmail format
52
- */
53
- getAllQueueEmails() {
54
- const emailServer = this.opsServerRef.dcRouterRef.emailServer;
55
- if (!emailServer?.deliveryQueue) {
56
- return [];
57
- }
58
- const queue = emailServer.deliveryQueue;
59
- const queueMap = queue.queue;
60
- if (!queueMap) {
61
- return [];
62
- }
63
- const emails = [];
64
- for (const [id, item] of queueMap.entries()) {
65
- emails.push(this.mapQueueItemToEmail(item));
66
- }
67
- // Sort by createdAt descending (newest first)
68
- emails.sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
69
- return emails;
70
- }
71
- /**
72
- * Get a single email detail by ID
73
- */
74
- getEmailDetail(emailId) {
75
- const emailServer = this.opsServerRef.dcRouterRef.emailServer;
76
- if (!emailServer?.deliveryQueue) {
77
- return null;
78
- }
79
- const queue = emailServer.deliveryQueue;
80
- const item = queue.getItem(emailId);
81
- if (!item) {
82
- return null;
83
- }
84
- return this.mapQueueItemToEmailDetail(item);
85
- }
86
- /**
87
- * Map a queue item to catalog IEmail format
88
- */
89
- mapQueueItemToEmail(item) {
90
- const processingResult = item.processingResult;
91
- let from = '';
92
- let to = '';
93
- let subject = '';
94
- let messageId = '';
95
- let size = '0 B';
96
- if (processingResult) {
97
- if (processingResult.email) {
98
- from = processingResult.email.from || '';
99
- to = (processingResult.email.to || [])[0] || '';
100
- subject = processingResult.email.subject || '';
101
- }
102
- else if (processingResult.from) {
103
- from = processingResult.from;
104
- to = (processingResult.to || [])[0] || '';
105
- subject = processingResult.subject || '';
106
- }
107
- // Try to get messageId
108
- if (typeof processingResult.getMessageId === 'function') {
109
- try {
110
- messageId = processingResult.getMessageId() || '';
111
- }
112
- catch {
113
- messageId = '';
114
- }
115
- }
116
- // Compute approximate size
117
- const textLen = processingResult.text?.length || 0;
118
- const htmlLen = processingResult.html?.length || 0;
119
- let attachSize = 0;
120
- if (typeof processingResult.getAttachmentsSize === 'function') {
121
- try {
122
- attachSize = processingResult.getAttachmentsSize() || 0;
123
- }
124
- catch {
125
- attachSize = 0;
126
- }
127
- }
128
- size = this.formatSize(textLen + htmlLen + attachSize);
129
- }
130
- // Map queue status to catalog TEmailStatus
131
- const status = this.mapStatus(item.status);
132
- const createdAt = item.createdAt instanceof Date ? item.createdAt.getTime() : item.createdAt;
133
- return {
134
- id: item.id,
135
- direction: 'outbound',
136
- status,
137
- from,
138
- to,
139
- subject,
140
- timestamp: new Date(createdAt).toISOString(),
141
- messageId,
142
- size,
143
- };
144
- }
145
- /**
146
- * Map a queue item to catalog IEmailDetail format
147
- */
148
- mapQueueItemToEmailDetail(item) {
149
- const base = this.mapQueueItemToEmail(item);
150
- const processingResult = item.processingResult;
151
- let toList = [];
152
- let cc = [];
153
- let headers = {};
154
- let body = '';
155
- if (processingResult) {
156
- if (processingResult.email) {
157
- toList = processingResult.email.to || [];
158
- cc = processingResult.email.cc || [];
159
- }
160
- else {
161
- toList = processingResult.to || [];
162
- cc = processingResult.cc || [];
163
- }
164
- headers = processingResult.headers || {};
165
- body = processingResult.html || processingResult.text || '';
166
- }
167
- return {
168
- ...base,
169
- toList,
170
- cc,
171
- smtpLog: [],
172
- connectionInfo: {
173
- sourceIp: '',
174
- sourceHostname: '',
175
- destinationIp: '',
176
- destinationPort: 0,
177
- tlsVersion: '',
178
- tlsCipher: '',
179
- authenticated: false,
180
- authMethod: '',
181
- authUser: '',
182
- },
183
- authenticationResults: {
184
- spf: 'none',
185
- spfDomain: '',
186
- dkim: 'none',
187
- dkimDomain: '',
188
- dmarc: 'none',
189
- dmarcPolicy: '',
190
- },
191
- rejectionReason: item.status === 'failed' ? item.lastError : undefined,
192
- bounceMessage: item.status === 'failed' ? item.lastError : undefined,
193
- headers,
194
- body,
195
- };
196
- }
197
- /**
198
- * Map queue status to catalog TEmailStatus
199
- */
200
- mapStatus(queueStatus) {
201
- switch (queueStatus) {
202
- case 'pending':
203
- case 'processing':
204
- return 'pending';
205
- case 'delivered':
206
- return 'delivered';
207
- case 'failed':
208
- return 'bounced';
209
- case 'deferred':
210
- return 'deferred';
211
- default:
212
- return 'pending';
213
- }
214
- }
215
- /**
216
- * Format byte size to human-readable string
217
- */
218
- formatSize(bytes) {
219
- if (bytes < 1024)
220
- return `${bytes} B`;
221
- if (bytes < 1024 * 1024)
222
- return `${(bytes / 1024).toFixed(1)} KB`;
223
- return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
224
- }
225
- }
226
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"email-ops.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/email-ops.handler.ts"],"names":[],"mappings":"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"}
@@ -1,17 +0,0 @@
1
- import * as plugins from '../../plugins.js';
2
- import type { OpsServer } from '../classes.opsserver.js';
3
- export declare class LogsHandler {
4
- private opsServerRef;
5
- typedrouter: plugins.typedrequest.TypedRouter;
6
- constructor(opsServerRef: OpsServer);
7
- private registerHandlers;
8
- private static mapLogLevel;
9
- private static deriveCategory;
10
- private getRecentLogs;
11
- /**
12
- * Add a log destination to the base logger that pushes entries
13
- * to all connected ops_dashboard TypedSocket clients.
14
- */
15
- private setupLogPushDestination;
16
- private setupLogStream;
17
- }
@@ -1,215 +0,0 @@
1
- import * as plugins from '../../plugins.js';
2
- import * as interfaces from '../../../dist_ts_interfaces/index.js';
3
- import { logBuffer, baseLogger } from '../../logger.js';
4
- export class LogsHandler {
5
- opsServerRef;
6
- typedrouter = new plugins.typedrequest.TypedRouter();
7
- constructor(opsServerRef) {
8
- this.opsServerRef = opsServerRef;
9
- // Add this handler's router to the parent
10
- this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
11
- this.registerHandlers();
12
- this.setupLogPushDestination();
13
- }
14
- registerHandlers() {
15
- // Get Recent Logs Handler
16
- this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getRecentLogs', async (dataArg, toolsArg) => {
17
- const logs = await this.getRecentLogs(dataArg.level, dataArg.category, dataArg.limit || 100, dataArg.offset || 0, dataArg.search, dataArg.timeRange);
18
- return {
19
- logs,
20
- total: logs.length, // TODO: Implement proper total count
21
- hasMore: false, // TODO: Implement proper pagination
22
- };
23
- }));
24
- // Get Log Stream Handler
25
- this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getLogStream', async (dataArg, toolsArg) => {
26
- // Create a virtual stream for log streaming
27
- const virtualStream = new plugins.typedrequest.VirtualStream();
28
- // Set up log streaming
29
- const streamLogs = this.setupLogStream(virtualStream, dataArg.filters?.level, dataArg.filters?.category, dataArg.follow);
30
- // Start streaming
31
- streamLogs.start();
32
- // VirtualStream handles cleanup automatically
33
- return {
34
- logStream: virtualStream, // Cast to IVirtualStream interface
35
- };
36
- }));
37
- }
38
- static mapLogLevel(smartlogLevel) {
39
- switch (smartlogLevel) {
40
- case 'silly':
41
- case 'debug':
42
- return 'debug';
43
- case 'warn':
44
- return 'warn';
45
- case 'error':
46
- return 'error';
47
- default:
48
- return 'info';
49
- }
50
- }
51
- static deriveCategory(zone, message) {
52
- const msg = (message || '').toLowerCase();
53
- if (msg.includes('[security:') || msg.includes('security'))
54
- return 'security';
55
- if (zone === 'email' || msg.includes('email') || msg.includes('smtp') || msg.includes('mta'))
56
- return 'email';
57
- if (zone === 'dns' || msg.includes('dns'))
58
- return 'dns';
59
- if (msg.includes('smtp'))
60
- return 'smtp';
61
- return 'system';
62
- }
63
- async getRecentLogs(level, category, limit = 100, offset = 0, search, timeRange) {
64
- // Compute a timestamp cutoff from timeRange
65
- let since;
66
- if (timeRange) {
67
- const rangeMs = {
68
- '1h': 3600000,
69
- '6h': 21600000,
70
- '24h': 86400000,
71
- '7d': 604800000,
72
- '30d': 2592000000,
73
- };
74
- since = Date.now() - (rangeMs[timeRange] || 86400000);
75
- }
76
- // Map the UI level to smartlog levels for filtering
77
- const smartlogLevels = level
78
- ? level === 'debug'
79
- ? ['debug', 'silly']
80
- : level === 'info'
81
- ? ['info', 'ok', 'success', 'note', 'lifecycle']
82
- : [level]
83
- : undefined;
84
- // Fetch a larger batch from buffer, then apply category filter client-side
85
- const rawEntries = logBuffer.getEntries({
86
- level: smartlogLevels,
87
- search,
88
- since,
89
- limit: limit * 3, // over-fetch to compensate for category filtering
90
- offset: 0,
91
- });
92
- // Map ILogPackage → UI log format and apply category filter
93
- const mapped = [];
94
- for (const pkg of rawEntries) {
95
- const uiLevel = LogsHandler.mapLogLevel(pkg.level);
96
- const uiCategory = LogsHandler.deriveCategory(pkg.context?.zone, pkg.message);
97
- if (category && uiCategory !== category)
98
- continue;
99
- mapped.push({
100
- timestamp: pkg.timestamp,
101
- level: uiLevel,
102
- category: uiCategory,
103
- message: pkg.message,
104
- metadata: pkg.data,
105
- });
106
- if (mapped.length >= limit)
107
- break;
108
- }
109
- return mapped;
110
- }
111
- /**
112
- * Add a log destination to the base logger that pushes entries
113
- * to all connected ops_dashboard TypedSocket clients.
114
- */
115
- setupLogPushDestination() {
116
- const opsServerRef = this.opsServerRef;
117
- baseLogger.addLogDestination({
118
- async handleLog(logPackage) {
119
- // Access the TypedSocket server instance from OpsServer
120
- const typedsocket = opsServerRef.server?.typedserver?.typedsocket;
121
- if (!typedsocket)
122
- return;
123
- let connections;
124
- try {
125
- connections = await typedsocket.findAllTargetConnectionsByTag('role', 'ops_dashboard');
126
- }
127
- catch {
128
- return;
129
- }
130
- if (connections.length === 0)
131
- return;
132
- const entry = {
133
- timestamp: logPackage.timestamp || Date.now(),
134
- level: LogsHandler.mapLogLevel(logPackage.level),
135
- category: LogsHandler.deriveCategory(logPackage.context?.zone, logPackage.message),
136
- message: logPackage.message,
137
- metadata: logPackage.data,
138
- };
139
- for (const conn of connections) {
140
- try {
141
- const push = typedsocket.createTypedRequest('pushLogEntry', conn);
142
- push.fire({ entry }).catch(() => { }); // fire-and-forget
143
- }
144
- catch {
145
- // connection may have closed
146
- }
147
- }
148
- },
149
- });
150
- }
151
- setupLogStream(virtualStream, levelFilter, categoryFilter, follow = true) {
152
- let intervalId = null;
153
- let logIndex = 0;
154
- const start = () => {
155
- if (!follow) {
156
- // Send existing logs and close
157
- this.getRecentLogs(levelFilter?.[0], categoryFilter?.[0], 100, 0).then(logs => {
158
- logs.forEach(log => {
159
- const logData = JSON.stringify(log);
160
- const encoder = new TextEncoder();
161
- virtualStream.sendData(encoder.encode(logData));
162
- });
163
- // VirtualStream doesn't have end() method - it closes automatically
164
- });
165
- return;
166
- }
167
- // For follow mode, simulate real-time log streaming
168
- intervalId = setInterval(async () => {
169
- const categories = ['smtp', 'dns', 'security', 'system', 'email'];
170
- const levels = ['info', 'warn', 'error', 'debug'];
171
- const mockCategory = categories[Math.floor(Math.random() * categories.length)];
172
- const mockLevel = levels[Math.floor(Math.random() * levels.length)];
173
- // Filter by requested criteria
174
- if (levelFilter && !levelFilter.includes(mockLevel))
175
- return;
176
- if (categoryFilter && !categoryFilter.includes(mockCategory))
177
- return;
178
- const logEntry = {
179
- timestamp: Date.now(),
180
- level: mockLevel,
181
- category: mockCategory,
182
- message: `Real-time log ${logIndex++} from ${mockCategory}`,
183
- metadata: {
184
- requestId: plugins.uuid.v4(),
185
- },
186
- };
187
- const logData = JSON.stringify(logEntry);
188
- const encoder = new TextEncoder();
189
- try {
190
- await virtualStream.sendData(encoder.encode(logData));
191
- }
192
- catch {
193
- // Stream closed or errored — clean up to prevent interval leak
194
- clearInterval(intervalId);
195
- intervalId = null;
196
- }
197
- }, 2000); // Send a log every 2 seconds
198
- // TODO: Hook into actual logger events
199
- // logger.on('log', (logEntry) => {
200
- // if (matchesCriteria(logEntry, level, service)) {
201
- // virtualStream.sendData(formatLogEntry(logEntry));
202
- // }
203
- // });
204
- };
205
- const stop = () => {
206
- if (intervalId) {
207
- clearInterval(intervalId);
208
- intervalId = null;
209
- }
210
- // TODO: Unhook from logger events
211
- };
212
- return { start, stop };
213
- }
214
- }
215
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"logs.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/logs.handler.ts"],"names":[],"mappings":"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"}