@serve.zone/dcrouter 7.4.3 → 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.
- package/dist_serve/bundle.js +11567 -3516
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.d.ts +9 -0
- package/dist_ts/classes.dcrouter.js +27 -1
- package/dist_ts/config/classes.api-token-manager.d.ts +38 -0
- package/dist_ts/config/classes.api-token-manager.js +134 -0
- package/dist_ts/config/classes.route-config-manager.d.ts +35 -0
- package/dist_ts/config/classes.route-config-manager.js +231 -0
- package/dist_ts/config/index.d.ts +2 -0
- package/dist_ts/config/index.js +3 -1
- package/dist_ts/opsserver/classes.opsserver.d.ts +2 -0
- package/dist_ts/opsserver/classes.opsserver.js +5 -1
- package/dist_ts/opsserver/handlers/{email-ops.handler.d.ts → api-token.handler.d.ts} +4 -4
- package/dist_ts/opsserver/handlers/api-token.handler.js +66 -0
- package/dist_ts/opsserver/handlers/index.d.ts +2 -0
- package/dist_ts/opsserver/handlers/index.js +3 -1
- package/dist_ts/opsserver/handlers/{radius.handler.d.ts → route-management.handler.d.ts} +6 -1
- package/dist_ts/opsserver/handlers/route-management.handler.js +117 -0
- package/dist_ts_interfaces/data/index.d.ts +1 -0
- package/dist_ts_interfaces/data/index.js +2 -1
- package/dist_ts_interfaces/data/route-management.d.ts +68 -0
- package/dist_ts_interfaces/data/route-management.js +2 -0
- package/dist_ts_interfaces/requests/api-tokens.d.ts +63 -0
- package/dist_ts_interfaces/requests/api-tokens.js +2 -0
- package/dist_ts_interfaces/requests/email-ops.d.ts +51 -108
- package/dist_ts_interfaces/requests/index.d.ts +2 -0
- package/dist_ts_interfaces/requests/index.js +3 -1
- package/dist_ts_interfaces/requests/route-management.d.ts +114 -0
- package/dist_ts_interfaces/requests/route-management.js +2 -0
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.d.ts +38 -16
- package/dist_ts_web/appstate.js +226 -177
- package/dist_ts_web/elements/index.d.ts +2 -0
- package/dist_ts_web/elements/index.js +3 -1
- package/dist_ts_web/elements/ops-dashboard.js +11 -1
- package/dist_ts_web/elements/ops-view-apitokens.d.ts +12 -0
- package/dist_ts_web/elements/ops-view-apitokens.js +306 -0
- package/dist_ts_web/elements/ops-view-emails.d.ts +8 -31
- package/dist_ts_web/elements/ops-view-emails.js +54 -769
- package/dist_ts_web/elements/ops-view-logs.d.ts +2 -8
- package/dist_ts_web/elements/ops-view-logs.js +4 -101
- 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/plugins.d.ts +2 -1
- package/dist_ts_web/plugins.js +4 -2
- package/dist_ts_web/router.d.ts +1 -7
- package/dist_ts_web/router.js +8 -82
- package/package.json +2 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +37 -1
- package/ts/config/classes.api-token-manager.ts +155 -0
- package/ts/config/classes.route-config-manager.ts +271 -0
- package/ts/config/index.ts +3 -1
- package/ts/opsserver/classes.opsserver.ts +4 -0
- package/ts/opsserver/handlers/api-token.handler.ts +96 -0
- package/ts/opsserver/handlers/email-ops.handler.ts +177 -225
- package/ts/opsserver/handlers/index.ts +3 -1
- package/ts/opsserver/handlers/route-management.handler.ts +163 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +316 -222
- package/ts_web/elements/index.ts +2 -0
- package/ts_web/elements/ops-dashboard.ts +10 -0
- package/ts_web/elements/ops-view-apitokens.ts +281 -0
- package/ts_web/elements/ops-view-emails.ts +40 -749
- package/ts_web/elements/ops-view-logs.ts +2 -87
- package/ts_web/elements/ops-view-routes.ts +389 -0
- package/ts_web/plugins.ts +4 -0
- package/ts_web/router.ts +7 -82
- 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/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 -169
- package/dist_ts/monitoring/classes.metricsmanager.js +0 -591
- package/dist_ts/monitoring/index.d.ts +0 -1
- package/dist_ts/monitoring/index.js +0 -2
- 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/certificate.handler.d.ts +0 -34
- package/dist_ts/opsserver/handlers/certificate.handler.js +0 -419
- package/dist_ts/opsserver/handlers/config.handler.d.ts +0 -9
- package/dist_ts/opsserver/handlers/config.handler.js +0 -67
- package/dist_ts/opsserver/handlers/email-ops.handler.js +0 -219
- package/dist_ts/opsserver/handlers/logs.handler.d.ts +0 -17
- package/dist_ts/opsserver/handlers/logs.handler.js +0 -215
- package/dist_ts/opsserver/handlers/radius.handler.js +0 -296
- package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +0 -8
- package/dist_ts/opsserver/handlers/remoteingress.handler.js +0 -154
- package/dist_ts/opsserver/handlers/security.handler.d.ts +0 -11
- package/dist_ts/opsserver/handlers/security.handler.js +0 -232
- package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -13
- package/dist_ts/opsserver/handlers/stats.handler.js +0 -400
- package/dist_ts/security/classes.securitylogger.d.ts +0 -140
- package/dist_ts/security/classes.securitylogger.js +0 -235
- package/dist_ts/storage/classes.storagemanager.d.ts +0 -82
- package/dist_ts/storage/classes.storagemanager.js +0 -344
- package/dist_ts/storage/index.d.ts +0 -1
- package/dist_ts/storage/index.js +0 -3
|
@@ -1,219 +0,0 @@
|
|
|
1
|
-
import * as plugins from '../../plugins.js';
|
|
2
|
-
import * as interfaces from '../../../dist_ts_interfaces/index.js';
|
|
3
|
-
import { SecurityLogger } from '../../security/index.js';
|
|
4
|
-
export class EmailOpsHandler {
|
|
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
|
-
}
|
|
13
|
-
registerHandlers() {
|
|
14
|
-
// Get Queued Emails Handler
|
|
15
|
-
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getQueuedEmails', async (dataArg) => {
|
|
16
|
-
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
17
|
-
if (!emailServer?.deliveryQueue) {
|
|
18
|
-
return { items: [], total: 0 };
|
|
19
|
-
}
|
|
20
|
-
const queue = emailServer.deliveryQueue;
|
|
21
|
-
const stats = queue.getStats();
|
|
22
|
-
// Get all queue items and filter by status if provided
|
|
23
|
-
const items = this.getQueueItems(dataArg.status, dataArg.limit || 50, dataArg.offset || 0);
|
|
24
|
-
return {
|
|
25
|
-
items,
|
|
26
|
-
total: stats.queueSize,
|
|
27
|
-
};
|
|
28
|
-
}));
|
|
29
|
-
// Get Sent Emails Handler
|
|
30
|
-
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getSentEmails', async (dataArg) => {
|
|
31
|
-
const items = this.getQueueItems('delivered', dataArg.limit || 50, dataArg.offset || 0);
|
|
32
|
-
return {
|
|
33
|
-
items,
|
|
34
|
-
total: items.length, // Note: total would ideally come from a counter
|
|
35
|
-
};
|
|
36
|
-
}));
|
|
37
|
-
// Get Failed Emails Handler
|
|
38
|
-
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getFailedEmails', async (dataArg) => {
|
|
39
|
-
const items = this.getQueueItems('failed', dataArg.limit || 50, dataArg.offset || 0);
|
|
40
|
-
return {
|
|
41
|
-
items,
|
|
42
|
-
total: items.length,
|
|
43
|
-
};
|
|
44
|
-
}));
|
|
45
|
-
// Resend Failed Email Handler
|
|
46
|
-
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('resendEmail', async (dataArg) => {
|
|
47
|
-
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
48
|
-
if (!emailServer?.deliveryQueue) {
|
|
49
|
-
return { success: false, error: 'Email server not available' };
|
|
50
|
-
}
|
|
51
|
-
const queue = emailServer.deliveryQueue;
|
|
52
|
-
const item = queue.getItem(dataArg.emailId);
|
|
53
|
-
if (!item) {
|
|
54
|
-
return { success: false, error: 'Email not found in queue' };
|
|
55
|
-
}
|
|
56
|
-
if (item.status !== 'failed') {
|
|
57
|
-
return { success: false, error: `Email is not in failed state (current: ${item.status})` };
|
|
58
|
-
}
|
|
59
|
-
try {
|
|
60
|
-
// Re-enqueue the failed email by creating a new queue entry
|
|
61
|
-
// with the same data but reset attempt count
|
|
62
|
-
const newQueueId = await queue.enqueue(item.processingResult, item.processingMode, item.route);
|
|
63
|
-
// Optionally remove the old failed entry
|
|
64
|
-
await queue.removeItem(dataArg.emailId);
|
|
65
|
-
return { success: true, newQueueId };
|
|
66
|
-
}
|
|
67
|
-
catch (error) {
|
|
68
|
-
return {
|
|
69
|
-
success: false,
|
|
70
|
-
error: error instanceof Error ? error.message : 'Failed to resend email'
|
|
71
|
-
};
|
|
72
|
-
}
|
|
73
|
-
}));
|
|
74
|
-
// Get Security Incidents Handler
|
|
75
|
-
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getSecurityIncidents', async (dataArg) => {
|
|
76
|
-
const securityLogger = SecurityLogger.getInstance();
|
|
77
|
-
const filter = {};
|
|
78
|
-
if (dataArg.level) {
|
|
79
|
-
filter.level = dataArg.level;
|
|
80
|
-
}
|
|
81
|
-
if (dataArg.type) {
|
|
82
|
-
filter.type = dataArg.type;
|
|
83
|
-
}
|
|
84
|
-
const incidents = securityLogger.getRecentEvents(dataArg.limit || 100, Object.keys(filter).length > 0 ? filter : undefined);
|
|
85
|
-
return {
|
|
86
|
-
incidents: incidents.map(event => ({
|
|
87
|
-
timestamp: event.timestamp,
|
|
88
|
-
level: event.level,
|
|
89
|
-
type: event.type,
|
|
90
|
-
message: event.message,
|
|
91
|
-
details: event.details,
|
|
92
|
-
ipAddress: event.ipAddress,
|
|
93
|
-
userId: event.userId,
|
|
94
|
-
sessionId: event.sessionId,
|
|
95
|
-
emailId: event.emailId,
|
|
96
|
-
domain: event.domain,
|
|
97
|
-
action: event.action,
|
|
98
|
-
result: event.result,
|
|
99
|
-
success: event.success,
|
|
100
|
-
})),
|
|
101
|
-
total: incidents.length,
|
|
102
|
-
};
|
|
103
|
-
}));
|
|
104
|
-
// Get Bounce Records Handler
|
|
105
|
-
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getBounceRecords', async (dataArg) => {
|
|
106
|
-
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
107
|
-
if (!emailServer) {
|
|
108
|
-
return { records: [], suppressionList: [], total: 0 };
|
|
109
|
-
}
|
|
110
|
-
// Use smartmta's public API for bounce/suppression data
|
|
111
|
-
const suppressionList = emailServer.getSuppressionList();
|
|
112
|
-
const hardBouncedAddresses = emailServer.getHardBouncedAddresses();
|
|
113
|
-
// Create bounce records from the available data
|
|
114
|
-
const records = [];
|
|
115
|
-
for (const email of hardBouncedAddresses) {
|
|
116
|
-
const bounceInfo = emailServer.getBounceHistory(email);
|
|
117
|
-
if (bounceInfo) {
|
|
118
|
-
records.push({
|
|
119
|
-
id: `bounce-${email}`,
|
|
120
|
-
recipient: email,
|
|
121
|
-
sender: '',
|
|
122
|
-
domain: email.split('@')[1] || '',
|
|
123
|
-
bounceType: bounceInfo.type,
|
|
124
|
-
bounceCategory: bounceInfo.category,
|
|
125
|
-
timestamp: bounceInfo.lastBounce,
|
|
126
|
-
processed: true,
|
|
127
|
-
});
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
// Apply limit and offset
|
|
131
|
-
const limit = dataArg.limit || 50;
|
|
132
|
-
const offset = dataArg.offset || 0;
|
|
133
|
-
const paginatedRecords = records.slice(offset, offset + limit);
|
|
134
|
-
return {
|
|
135
|
-
records: paginatedRecords,
|
|
136
|
-
suppressionList,
|
|
137
|
-
total: records.length,
|
|
138
|
-
};
|
|
139
|
-
}));
|
|
140
|
-
// Remove from Suppression List Handler
|
|
141
|
-
this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler('removeFromSuppressionList', async (dataArg) => {
|
|
142
|
-
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
143
|
-
if (!emailServer) {
|
|
144
|
-
return { success: false, error: 'Email server not available' };
|
|
145
|
-
}
|
|
146
|
-
try {
|
|
147
|
-
emailServer.removeFromSuppressionList(dataArg.email);
|
|
148
|
-
return { success: true };
|
|
149
|
-
}
|
|
150
|
-
catch (error) {
|
|
151
|
-
return {
|
|
152
|
-
success: false,
|
|
153
|
-
error: error instanceof Error ? error.message : 'Failed to remove from suppression list'
|
|
154
|
-
};
|
|
155
|
-
}
|
|
156
|
-
}));
|
|
157
|
-
}
|
|
158
|
-
/**
|
|
159
|
-
* Helper method to get queue items with filtering and pagination
|
|
160
|
-
*/
|
|
161
|
-
getQueueItems(status, limit = 50, offset = 0) {
|
|
162
|
-
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
163
|
-
if (!emailServer?.deliveryQueue) {
|
|
164
|
-
return [];
|
|
165
|
-
}
|
|
166
|
-
const queue = emailServer.deliveryQueue;
|
|
167
|
-
const items = [];
|
|
168
|
-
// Access the internal queue map via reflection
|
|
169
|
-
// This is necessary because the queue doesn't expose iteration methods
|
|
170
|
-
const queueMap = queue.queue;
|
|
171
|
-
if (!queueMap) {
|
|
172
|
-
return [];
|
|
173
|
-
}
|
|
174
|
-
// Filter and convert items
|
|
175
|
-
for (const [id, item] of queueMap.entries()) {
|
|
176
|
-
// Apply status filter if provided
|
|
177
|
-
if (status && item.status !== status) {
|
|
178
|
-
continue;
|
|
179
|
-
}
|
|
180
|
-
// Extract email details from processingResult if available
|
|
181
|
-
const processingResult = item.processingResult;
|
|
182
|
-
let from = '';
|
|
183
|
-
let to = [];
|
|
184
|
-
let subject = '';
|
|
185
|
-
if (processingResult) {
|
|
186
|
-
// Check if it's an Email object or raw email data
|
|
187
|
-
if (processingResult.email) {
|
|
188
|
-
from = processingResult.email.from || '';
|
|
189
|
-
to = processingResult.email.to || [];
|
|
190
|
-
subject = processingResult.email.subject || '';
|
|
191
|
-
}
|
|
192
|
-
else if (processingResult.from) {
|
|
193
|
-
from = processingResult.from;
|
|
194
|
-
to = processingResult.to || [];
|
|
195
|
-
subject = processingResult.subject || '';
|
|
196
|
-
}
|
|
197
|
-
}
|
|
198
|
-
items.push({
|
|
199
|
-
id: item.id,
|
|
200
|
-
processingMode: item.processingMode,
|
|
201
|
-
status: item.status,
|
|
202
|
-
attempts: item.attempts,
|
|
203
|
-
nextAttempt: item.nextAttempt instanceof Date ? item.nextAttempt.getTime() : item.nextAttempt,
|
|
204
|
-
lastError: item.lastError,
|
|
205
|
-
createdAt: item.createdAt instanceof Date ? item.createdAt.getTime() : item.createdAt,
|
|
206
|
-
updatedAt: item.updatedAt instanceof Date ? item.updatedAt.getTime() : item.updatedAt,
|
|
207
|
-
deliveredAt: item.deliveredAt instanceof Date ? item.deliveredAt.getTime() : item.deliveredAt,
|
|
208
|
-
from,
|
|
209
|
-
to,
|
|
210
|
-
subject,
|
|
211
|
-
});
|
|
212
|
-
}
|
|
213
|
-
// Sort by createdAt descending (newest first)
|
|
214
|
-
items.sort((a, b) => b.createdAt - a.createdAt);
|
|
215
|
-
// Apply pagination
|
|
216
|
-
return items.slice(offset, offset + limit);
|
|
217
|
-
}
|
|
218
|
-
}
|
|
219
|
-
//# 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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"}
|