@serve.zone/dcrouter 11.0.38 → 11.0.39
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 +1 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
- 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/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 -53
- package/dist_ts/classes.cert-provision-scheduler.js +0 -110
- package/dist_ts/classes.storage-cert-manager.d.ts +0 -18
- package/dist_ts/classes.storage-cert-manager.js +0 -43
- package/dist_ts/errors/base.errors.js +0 -320
- package/dist_ts/errors/error.codes.d.ts +0 -115
- package/dist_ts/errors/error.codes.js +0 -136
- 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 -178
- package/dist_ts/monitoring/classes.metricsmanager.js +0 -642
- 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 -231
- package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -11
- package/dist_ts/opsserver/handlers/stats.handler.js +0 -399
- 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/radius/classes.accounting.manager.d.ts +0 -218
- package/dist_ts/radius/classes.accounting.manager.js +0 -417
- package/dist_ts/radius/classes.radius.server.d.ts +0 -171
- package/dist_ts/radius/classes.radius.server.js +0 -385
- 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 -82
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +0 -227
- 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.securitylogger.d.ts +0 -144
- package/dist_ts/security/classes.securitylogger.js +0 -233
- package/dist_ts/storage/classes.storagemanager.d.ts +0 -83
- package/dist_ts/storage/classes.storagemanager.js +0 -350
- package/dist_ts/storage/index.d.ts +0 -1
- package/dist_ts/storage/index.js +0 -3
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import type { OpsServer } from '../classes.opsserver.js';
|
|
2
|
-
export declare class EmailOpsHandler {
|
|
3
|
-
private opsServerRef;
|
|
4
|
-
constructor(opsServerRef: OpsServer);
|
|
5
|
-
private registerHandlers;
|
|
6
|
-
/**
|
|
7
|
-
* Get all queue items mapped to catalog IEmail format
|
|
8
|
-
*/
|
|
9
|
-
private getAllQueueEmails;
|
|
10
|
-
/**
|
|
11
|
-
* Get a single email detail by ID
|
|
12
|
-
*/
|
|
13
|
-
private getEmailDetail;
|
|
14
|
-
/**
|
|
15
|
-
* Map a queue item to catalog IEmail format
|
|
16
|
-
*/
|
|
17
|
-
private mapQueueItemToEmail;
|
|
18
|
-
/**
|
|
19
|
-
* Map a queue item to catalog IEmailDetail format
|
|
20
|
-
*/
|
|
21
|
-
private mapQueueItemToEmailDetail;
|
|
22
|
-
/**
|
|
23
|
-
* Map queue status to catalog TEmailStatus
|
|
24
|
-
*/
|
|
25
|
-
private mapStatus;
|
|
26
|
-
/**
|
|
27
|
-
* Format byte size to human-readable string
|
|
28
|
-
*/
|
|
29
|
-
private formatSize;
|
|
30
|
-
}
|
|
@@ -1,227 +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
|
-
constructor(opsServerRef) {
|
|
6
|
-
this.opsServerRef = opsServerRef;
|
|
7
|
-
this.registerHandlers();
|
|
8
|
-
}
|
|
9
|
-
registerHandlers() {
|
|
10
|
-
const viewRouter = this.opsServerRef.viewRouter;
|
|
11
|
-
const adminRouter = this.opsServerRef.adminRouter;
|
|
12
|
-
// ---- Read endpoints (viewRouter — valid identity required via middleware) ----
|
|
13
|
-
// Get All Emails Handler
|
|
14
|
-
viewRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getAllEmails', async (dataArg) => {
|
|
15
|
-
const emails = this.getAllQueueEmails();
|
|
16
|
-
return { emails };
|
|
17
|
-
}));
|
|
18
|
-
// Get Email Detail Handler
|
|
19
|
-
viewRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getEmailDetail', async (dataArg) => {
|
|
20
|
-
const email = this.getEmailDetail(dataArg.emailId);
|
|
21
|
-
return { email };
|
|
22
|
-
}));
|
|
23
|
-
// ---- Write endpoints (adminRouter) ----
|
|
24
|
-
// Resend Failed Email Handler
|
|
25
|
-
adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('resendEmail', async (dataArg) => {
|
|
26
|
-
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
27
|
-
if (!emailServer?.deliveryQueue) {
|
|
28
|
-
return { success: false, error: 'Email server not available' };
|
|
29
|
-
}
|
|
30
|
-
const queue = emailServer.deliveryQueue;
|
|
31
|
-
const item = queue.getItem(dataArg.emailId);
|
|
32
|
-
if (!item) {
|
|
33
|
-
return { success: false, error: 'Email not found in queue' };
|
|
34
|
-
}
|
|
35
|
-
if (item.status !== 'failed') {
|
|
36
|
-
return { success: false, error: `Email is not in failed state (current: ${item.status})` };
|
|
37
|
-
}
|
|
38
|
-
try {
|
|
39
|
-
const newQueueId = await queue.enqueue(item.processingResult, item.processingMode, item.route);
|
|
40
|
-
await queue.removeItem(dataArg.emailId);
|
|
41
|
-
return { success: true, newQueueId };
|
|
42
|
-
}
|
|
43
|
-
catch (error) {
|
|
44
|
-
return {
|
|
45
|
-
success: false,
|
|
46
|
-
error: error instanceof Error ? error.message : 'Failed to resend email'
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
}));
|
|
50
|
-
}
|
|
51
|
-
/**
|
|
52
|
-
* Get all queue items mapped to catalog IEmail format
|
|
53
|
-
*/
|
|
54
|
-
getAllQueueEmails() {
|
|
55
|
-
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
56
|
-
if (!emailServer?.deliveryQueue) {
|
|
57
|
-
return [];
|
|
58
|
-
}
|
|
59
|
-
const queue = emailServer.deliveryQueue;
|
|
60
|
-
const queueMap = queue.queue;
|
|
61
|
-
if (!queueMap) {
|
|
62
|
-
return [];
|
|
63
|
-
}
|
|
64
|
-
const emails = [];
|
|
65
|
-
for (const [id, item] of queueMap.entries()) {
|
|
66
|
-
emails.push(this.mapQueueItemToEmail(item));
|
|
67
|
-
}
|
|
68
|
-
// Sort by createdAt descending (newest first)
|
|
69
|
-
emails.sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
|
|
70
|
-
return emails;
|
|
71
|
-
}
|
|
72
|
-
/**
|
|
73
|
-
* Get a single email detail by ID
|
|
74
|
-
*/
|
|
75
|
-
getEmailDetail(emailId) {
|
|
76
|
-
const emailServer = this.opsServerRef.dcRouterRef.emailServer;
|
|
77
|
-
if (!emailServer?.deliveryQueue) {
|
|
78
|
-
return null;
|
|
79
|
-
}
|
|
80
|
-
const queue = emailServer.deliveryQueue;
|
|
81
|
-
const item = queue.getItem(emailId);
|
|
82
|
-
if (!item) {
|
|
83
|
-
return null;
|
|
84
|
-
}
|
|
85
|
-
return this.mapQueueItemToEmailDetail(item);
|
|
86
|
-
}
|
|
87
|
-
/**
|
|
88
|
-
* Map a queue item to catalog IEmail format
|
|
89
|
-
*/
|
|
90
|
-
mapQueueItemToEmail(item) {
|
|
91
|
-
const processingResult = item.processingResult;
|
|
92
|
-
let from = '';
|
|
93
|
-
let to = '';
|
|
94
|
-
let subject = '';
|
|
95
|
-
let messageId = '';
|
|
96
|
-
let size = '0 B';
|
|
97
|
-
if (processingResult) {
|
|
98
|
-
if (processingResult.email) {
|
|
99
|
-
from = processingResult.email.from || '';
|
|
100
|
-
to = (processingResult.email.to || [])[0] || '';
|
|
101
|
-
subject = processingResult.email.subject || '';
|
|
102
|
-
}
|
|
103
|
-
else if (processingResult.from) {
|
|
104
|
-
from = processingResult.from;
|
|
105
|
-
to = (processingResult.to || [])[0] || '';
|
|
106
|
-
subject = processingResult.subject || '';
|
|
107
|
-
}
|
|
108
|
-
// Try to get messageId
|
|
109
|
-
if (typeof processingResult.getMessageId === 'function') {
|
|
110
|
-
try {
|
|
111
|
-
messageId = processingResult.getMessageId() || '';
|
|
112
|
-
}
|
|
113
|
-
catch {
|
|
114
|
-
messageId = '';
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
// Compute approximate size
|
|
118
|
-
const textLen = processingResult.text?.length || 0;
|
|
119
|
-
const htmlLen = processingResult.html?.length || 0;
|
|
120
|
-
let attachSize = 0;
|
|
121
|
-
if (typeof processingResult.getAttachmentsSize === 'function') {
|
|
122
|
-
try {
|
|
123
|
-
attachSize = processingResult.getAttachmentsSize() || 0;
|
|
124
|
-
}
|
|
125
|
-
catch {
|
|
126
|
-
attachSize = 0;
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
size = this.formatSize(textLen + htmlLen + attachSize);
|
|
130
|
-
}
|
|
131
|
-
// Map queue status to catalog TEmailStatus
|
|
132
|
-
const status = this.mapStatus(item.status);
|
|
133
|
-
const createdAt = item.createdAt instanceof Date ? item.createdAt.getTime() : item.createdAt;
|
|
134
|
-
return {
|
|
135
|
-
id: item.id,
|
|
136
|
-
direction: 'outbound',
|
|
137
|
-
status,
|
|
138
|
-
from,
|
|
139
|
-
to,
|
|
140
|
-
subject,
|
|
141
|
-
timestamp: new Date(createdAt).toISOString(),
|
|
142
|
-
messageId,
|
|
143
|
-
size,
|
|
144
|
-
};
|
|
145
|
-
}
|
|
146
|
-
/**
|
|
147
|
-
* Map a queue item to catalog IEmailDetail format
|
|
148
|
-
*/
|
|
149
|
-
mapQueueItemToEmailDetail(item) {
|
|
150
|
-
const base = this.mapQueueItemToEmail(item);
|
|
151
|
-
const processingResult = item.processingResult;
|
|
152
|
-
let toList = [];
|
|
153
|
-
let cc = [];
|
|
154
|
-
let headers = {};
|
|
155
|
-
let body = '';
|
|
156
|
-
if (processingResult) {
|
|
157
|
-
if (processingResult.email) {
|
|
158
|
-
toList = processingResult.email.to || [];
|
|
159
|
-
cc = processingResult.email.cc || [];
|
|
160
|
-
}
|
|
161
|
-
else {
|
|
162
|
-
toList = processingResult.to || [];
|
|
163
|
-
cc = processingResult.cc || [];
|
|
164
|
-
}
|
|
165
|
-
headers = processingResult.headers || {};
|
|
166
|
-
body = processingResult.html || processingResult.text || '';
|
|
167
|
-
}
|
|
168
|
-
return {
|
|
169
|
-
...base,
|
|
170
|
-
toList,
|
|
171
|
-
cc,
|
|
172
|
-
smtpLog: [],
|
|
173
|
-
connectionInfo: {
|
|
174
|
-
sourceIp: '',
|
|
175
|
-
sourceHostname: '',
|
|
176
|
-
destinationIp: '',
|
|
177
|
-
destinationPort: 0,
|
|
178
|
-
tlsVersion: '',
|
|
179
|
-
tlsCipher: '',
|
|
180
|
-
authenticated: false,
|
|
181
|
-
authMethod: '',
|
|
182
|
-
authUser: '',
|
|
183
|
-
},
|
|
184
|
-
authenticationResults: {
|
|
185
|
-
spf: 'none',
|
|
186
|
-
spfDomain: '',
|
|
187
|
-
dkim: 'none',
|
|
188
|
-
dkimDomain: '',
|
|
189
|
-
dmarc: 'none',
|
|
190
|
-
dmarcPolicy: '',
|
|
191
|
-
},
|
|
192
|
-
rejectionReason: item.status === 'failed' ? item.lastError : undefined,
|
|
193
|
-
bounceMessage: item.status === 'failed' ? item.lastError : undefined,
|
|
194
|
-
headers,
|
|
195
|
-
body,
|
|
196
|
-
};
|
|
197
|
-
}
|
|
198
|
-
/**
|
|
199
|
-
* Map queue status to catalog TEmailStatus
|
|
200
|
-
*/
|
|
201
|
-
mapStatus(queueStatus) {
|
|
202
|
-
switch (queueStatus) {
|
|
203
|
-
case 'pending':
|
|
204
|
-
case 'processing':
|
|
205
|
-
return 'pending';
|
|
206
|
-
case 'delivered':
|
|
207
|
-
return 'delivered';
|
|
208
|
-
case 'failed':
|
|
209
|
-
return 'bounced';
|
|
210
|
-
case 'deferred':
|
|
211
|
-
return 'deferred';
|
|
212
|
-
default:
|
|
213
|
-
return 'pending';
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
|
-
/**
|
|
217
|
-
* Format byte size to human-readable string
|
|
218
|
-
*/
|
|
219
|
-
formatSize(bytes) {
|
|
220
|
-
if (bytes < 1024)
|
|
221
|
-
return `${bytes} B`;
|
|
222
|
-
if (bytes < 1024 * 1024)
|
|
223
|
-
return `${(bytes / 1024).toFixed(1)} KB`;
|
|
224
|
-
return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
|
|
225
|
-
}
|
|
226
|
-
}
|
|
227
|
-
//# 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,11 +0,0 @@
|
|
|
1
|
-
export * from './admin.handler.js';
|
|
2
|
-
export * from './config.handler.js';
|
|
3
|
-
export * from './logs.handler.js';
|
|
4
|
-
export * from './security.handler.js';
|
|
5
|
-
export * from './stats.handler.js';
|
|
6
|
-
export * from './radius.handler.js';
|
|
7
|
-
export * from './email-ops.handler.js';
|
|
8
|
-
export * from './certificate.handler.js';
|
|
9
|
-
export * from './remoteingress.handler.js';
|
|
10
|
-
export * from './route-management.handler.js';
|
|
11
|
-
export * from './api-token.handler.js';
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
export * from './admin.handler.js';
|
|
2
|
-
export * from './config.handler.js';
|
|
3
|
-
export * from './logs.handler.js';
|
|
4
|
-
export * from './security.handler.js';
|
|
5
|
-
export * from './stats.handler.js';
|
|
6
|
-
export * from './radius.handler.js';
|
|
7
|
-
export * from './email-ops.handler.js';
|
|
8
|
-
export * from './certificate.handler.js';
|
|
9
|
-
export * from './remoteingress.handler.js';
|
|
10
|
-
export * from './route-management.handler.js';
|
|
11
|
-
export * from './api-token.handler.js';
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9vcHNzZXJ2ZXIvaGFuZGxlcnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsNEJBQTRCLENBQUM7QUFDM0MsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLHdCQUF3QixDQUFDIn0=
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import type { OpsServer } from '../classes.opsserver.js';
|
|
2
|
-
export declare class LogsHandler {
|
|
3
|
-
private opsServerRef;
|
|
4
|
-
private activeStreamStops;
|
|
5
|
-
constructor(opsServerRef: OpsServer);
|
|
6
|
-
/**
|
|
7
|
-
* Clean up all active log streams and deactivate the push destination.
|
|
8
|
-
* Called when OpsServer stops.
|
|
9
|
-
*/
|
|
10
|
-
cleanup(): void;
|
|
11
|
-
private registerHandlers;
|
|
12
|
-
private static mapLogLevel;
|
|
13
|
-
private static deriveCategory;
|
|
14
|
-
private getRecentLogs;
|
|
15
|
-
/**
|
|
16
|
-
* Add a log destination to the base logger that pushes entries
|
|
17
|
-
* to all connected ops_dashboard TypedSocket clients.
|
|
18
|
-
*
|
|
19
|
-
* Uses a module-level singleton so the destination is added only once,
|
|
20
|
-
* even across OpsServer restart cycles. The destination reads
|
|
21
|
-
* `currentOpsServerRef` dynamically so it always uses the active server.
|
|
22
|
-
*/
|
|
23
|
-
private setupLogPushDestination;
|
|
24
|
-
private setupLogStream;
|
|
25
|
-
}
|
|
@@ -1,256 +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
|
-
// Module-level singleton: the log push destination is added once and reuses
|
|
5
|
-
// the current OpsServer reference so it survives OpsServer restarts without
|
|
6
|
-
// accumulating duplicate destinations.
|
|
7
|
-
let logPushDestinationInstalled = false;
|
|
8
|
-
let currentOpsServerRef = null;
|
|
9
|
-
export class LogsHandler {
|
|
10
|
-
opsServerRef;
|
|
11
|
-
activeStreamStops = new Set();
|
|
12
|
-
constructor(opsServerRef) {
|
|
13
|
-
this.opsServerRef = opsServerRef;
|
|
14
|
-
this.registerHandlers();
|
|
15
|
-
this.setupLogPushDestination();
|
|
16
|
-
}
|
|
17
|
-
/**
|
|
18
|
-
* Clean up all active log streams and deactivate the push destination.
|
|
19
|
-
* Called when OpsServer stops.
|
|
20
|
-
*/
|
|
21
|
-
cleanup() {
|
|
22
|
-
// Stop all active follow-mode log streams
|
|
23
|
-
for (const stop of this.activeStreamStops) {
|
|
24
|
-
stop();
|
|
25
|
-
}
|
|
26
|
-
this.activeStreamStops.clear();
|
|
27
|
-
// Deactivate the push destination (it stays registered but becomes a no-op)
|
|
28
|
-
currentOpsServerRef = null;
|
|
29
|
-
}
|
|
30
|
-
registerHandlers() {
|
|
31
|
-
// All log endpoints register directly on viewRouter (valid identity required via middleware)
|
|
32
|
-
const router = this.opsServerRef.viewRouter;
|
|
33
|
-
// Get Recent Logs Handler
|
|
34
|
-
router.addTypedHandler(new plugins.typedrequest.TypedHandler('getRecentLogs', async (dataArg, toolsArg) => {
|
|
35
|
-
const logs = await this.getRecentLogs(dataArg.level, dataArg.category, dataArg.limit || 100, dataArg.offset || 0, dataArg.search, dataArg.timeRange);
|
|
36
|
-
return {
|
|
37
|
-
logs,
|
|
38
|
-
total: logs.length,
|
|
39
|
-
hasMore: false,
|
|
40
|
-
};
|
|
41
|
-
}));
|
|
42
|
-
// Get Log Stream Handler
|
|
43
|
-
router.addTypedHandler(new plugins.typedrequest.TypedHandler('getLogStream', async (dataArg, toolsArg) => {
|
|
44
|
-
// Create a virtual stream for log streaming
|
|
45
|
-
const virtualStream = new plugins.typedrequest.VirtualStream();
|
|
46
|
-
// Set up log streaming
|
|
47
|
-
const streamLogs = this.setupLogStream(virtualStream, dataArg.filters?.level, dataArg.filters?.category, dataArg.follow);
|
|
48
|
-
// Start streaming
|
|
49
|
-
streamLogs.start();
|
|
50
|
-
// Track the stop function so we can clean up on shutdown
|
|
51
|
-
this.activeStreamStops.add(streamLogs.stop);
|
|
52
|
-
return {
|
|
53
|
-
logStream: virtualStream,
|
|
54
|
-
};
|
|
55
|
-
}));
|
|
56
|
-
}
|
|
57
|
-
static mapLogLevel(smartlogLevel) {
|
|
58
|
-
switch (smartlogLevel) {
|
|
59
|
-
case 'silly':
|
|
60
|
-
case 'debug':
|
|
61
|
-
return 'debug';
|
|
62
|
-
case 'warn':
|
|
63
|
-
return 'warn';
|
|
64
|
-
case 'error':
|
|
65
|
-
return 'error';
|
|
66
|
-
default:
|
|
67
|
-
return 'info';
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
static deriveCategory(zone, message) {
|
|
71
|
-
const msg = (message || '').toLowerCase();
|
|
72
|
-
if (msg.includes('[security:') || msg.includes('security'))
|
|
73
|
-
return 'security';
|
|
74
|
-
if (zone === 'email' || msg.includes('email') || msg.includes('smtp') || msg.includes('mta'))
|
|
75
|
-
return 'email';
|
|
76
|
-
if (zone === 'dns' || msg.includes('dns'))
|
|
77
|
-
return 'dns';
|
|
78
|
-
if (msg.includes('smtp'))
|
|
79
|
-
return 'smtp';
|
|
80
|
-
return 'system';
|
|
81
|
-
}
|
|
82
|
-
async getRecentLogs(level, category, limit = 100, offset = 0, search, timeRange) {
|
|
83
|
-
// Compute a timestamp cutoff from timeRange
|
|
84
|
-
let since;
|
|
85
|
-
if (timeRange) {
|
|
86
|
-
const rangeMs = {
|
|
87
|
-
'1h': 3600000,
|
|
88
|
-
'6h': 21600000,
|
|
89
|
-
'24h': 86400000,
|
|
90
|
-
'7d': 604800000,
|
|
91
|
-
'30d': 2592000000,
|
|
92
|
-
};
|
|
93
|
-
since = Date.now() - (rangeMs[timeRange] || 86400000);
|
|
94
|
-
}
|
|
95
|
-
// Map the UI level to smartlog levels for filtering
|
|
96
|
-
const smartlogLevels = level
|
|
97
|
-
? level === 'debug'
|
|
98
|
-
? ['debug', 'silly']
|
|
99
|
-
: level === 'info'
|
|
100
|
-
? ['info', 'ok', 'success', 'note', 'lifecycle']
|
|
101
|
-
: [level]
|
|
102
|
-
: undefined;
|
|
103
|
-
// Fetch a larger batch from buffer, then apply category filter client-side
|
|
104
|
-
const rawEntries = logBuffer.getEntries({
|
|
105
|
-
level: smartlogLevels,
|
|
106
|
-
search,
|
|
107
|
-
since,
|
|
108
|
-
limit: limit * 3, // over-fetch to compensate for category filtering
|
|
109
|
-
offset: 0,
|
|
110
|
-
});
|
|
111
|
-
// Map ILogPackage → UI log format and apply category filter
|
|
112
|
-
const mapped = [];
|
|
113
|
-
for (const pkg of rawEntries) {
|
|
114
|
-
const uiLevel = LogsHandler.mapLogLevel(pkg.level);
|
|
115
|
-
const uiCategory = LogsHandler.deriveCategory(pkg.context?.zone, pkg.message);
|
|
116
|
-
if (category && uiCategory !== category)
|
|
117
|
-
continue;
|
|
118
|
-
mapped.push({
|
|
119
|
-
timestamp: pkg.timestamp,
|
|
120
|
-
level: uiLevel,
|
|
121
|
-
category: uiCategory,
|
|
122
|
-
message: pkg.message,
|
|
123
|
-
metadata: pkg.data,
|
|
124
|
-
});
|
|
125
|
-
if (mapped.length >= limit)
|
|
126
|
-
break;
|
|
127
|
-
}
|
|
128
|
-
return mapped;
|
|
129
|
-
}
|
|
130
|
-
/**
|
|
131
|
-
* Add a log destination to the base logger that pushes entries
|
|
132
|
-
* to all connected ops_dashboard TypedSocket clients.
|
|
133
|
-
*
|
|
134
|
-
* Uses a module-level singleton so the destination is added only once,
|
|
135
|
-
* even across OpsServer restart cycles. The destination reads
|
|
136
|
-
* `currentOpsServerRef` dynamically so it always uses the active server.
|
|
137
|
-
*/
|
|
138
|
-
setupLogPushDestination() {
|
|
139
|
-
// Update the module-level reference so the existing destination uses the new server
|
|
140
|
-
currentOpsServerRef = this.opsServerRef;
|
|
141
|
-
if (logPushDestinationInstalled) {
|
|
142
|
-
return; // destination already registered — just updated the ref
|
|
143
|
-
}
|
|
144
|
-
logPushDestinationInstalled = true;
|
|
145
|
-
baseLogger.addLogDestination({
|
|
146
|
-
async handleLog(logPackage) {
|
|
147
|
-
const opsServer = currentOpsServerRef;
|
|
148
|
-
if (!opsServer)
|
|
149
|
-
return;
|
|
150
|
-
const typedsocket = opsServer.server?.typedserver?.typedsocket;
|
|
151
|
-
if (!typedsocket)
|
|
152
|
-
return;
|
|
153
|
-
let connections;
|
|
154
|
-
try {
|
|
155
|
-
connections = await typedsocket.findAllTargetConnectionsByTag('role', 'ops_dashboard');
|
|
156
|
-
}
|
|
157
|
-
catch {
|
|
158
|
-
return;
|
|
159
|
-
}
|
|
160
|
-
if (connections.length === 0)
|
|
161
|
-
return;
|
|
162
|
-
const entry = {
|
|
163
|
-
timestamp: logPackage.timestamp || Date.now(),
|
|
164
|
-
level: LogsHandler.mapLogLevel(logPackage.level),
|
|
165
|
-
category: LogsHandler.deriveCategory(logPackage.context?.zone, logPackage.message),
|
|
166
|
-
message: logPackage.message,
|
|
167
|
-
metadata: logPackage.data,
|
|
168
|
-
};
|
|
169
|
-
for (const conn of connections) {
|
|
170
|
-
try {
|
|
171
|
-
const push = typedsocket.createTypedRequest('pushLogEntry', conn);
|
|
172
|
-
push.fire({ entry }).catch(() => { }); // fire-and-forget
|
|
173
|
-
}
|
|
174
|
-
catch {
|
|
175
|
-
// connection may have closed
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
},
|
|
179
|
-
});
|
|
180
|
-
}
|
|
181
|
-
setupLogStream(virtualStream, levelFilter, categoryFilter, follow = true) {
|
|
182
|
-
let intervalId = null;
|
|
183
|
-
let stopped = false;
|
|
184
|
-
let logIndex = 0;
|
|
185
|
-
const stop = () => {
|
|
186
|
-
stopped = true;
|
|
187
|
-
if (intervalId) {
|
|
188
|
-
clearInterval(intervalId);
|
|
189
|
-
intervalId = null;
|
|
190
|
-
}
|
|
191
|
-
this.activeStreamStops.delete(stop);
|
|
192
|
-
};
|
|
193
|
-
const start = () => {
|
|
194
|
-
if (!follow) {
|
|
195
|
-
// Send existing logs and close
|
|
196
|
-
this.getRecentLogs(levelFilter?.[0], categoryFilter?.[0], 100, 0).then(logs => {
|
|
197
|
-
logs.forEach(log => {
|
|
198
|
-
const logData = JSON.stringify(log);
|
|
199
|
-
const encoder = new TextEncoder();
|
|
200
|
-
virtualStream.sendData(encoder.encode(logData));
|
|
201
|
-
});
|
|
202
|
-
});
|
|
203
|
-
return;
|
|
204
|
-
}
|
|
205
|
-
// For follow mode, simulate real-time log streaming
|
|
206
|
-
intervalId = setInterval(async () => {
|
|
207
|
-
if (stopped) {
|
|
208
|
-
// Guard: clear interval if stop() was called between ticks
|
|
209
|
-
clearInterval(intervalId);
|
|
210
|
-
intervalId = null;
|
|
211
|
-
return;
|
|
212
|
-
}
|
|
213
|
-
const categories = ['smtp', 'dns', 'security', 'system', 'email'];
|
|
214
|
-
const levels = ['info', 'warn', 'error', 'debug'];
|
|
215
|
-
const mockCategory = categories[Math.floor(Math.random() * categories.length)];
|
|
216
|
-
const mockLevel = levels[Math.floor(Math.random() * levels.length)];
|
|
217
|
-
// Filter by requested criteria
|
|
218
|
-
if (levelFilter && !levelFilter.includes(mockLevel))
|
|
219
|
-
return;
|
|
220
|
-
if (categoryFilter && !categoryFilter.includes(mockCategory))
|
|
221
|
-
return;
|
|
222
|
-
const logEntry = {
|
|
223
|
-
timestamp: Date.now(),
|
|
224
|
-
level: mockLevel,
|
|
225
|
-
category: mockCategory,
|
|
226
|
-
message: `Real-time log ${logIndex++} from ${mockCategory}`,
|
|
227
|
-
metadata: {
|
|
228
|
-
requestId: plugins.uuid.v4(),
|
|
229
|
-
},
|
|
230
|
-
};
|
|
231
|
-
const logData = JSON.stringify(logEntry);
|
|
232
|
-
const encoder = new TextEncoder();
|
|
233
|
-
try {
|
|
234
|
-
// Use a timeout to detect hung streams (sendData can hang if the
|
|
235
|
-
// VirtualStream's keepAlive loop has ended)
|
|
236
|
-
let timeoutHandle;
|
|
237
|
-
await Promise.race([
|
|
238
|
-
virtualStream.sendData(encoder.encode(logData)).then((result) => {
|
|
239
|
-
clearTimeout(timeoutHandle);
|
|
240
|
-
return result;
|
|
241
|
-
}),
|
|
242
|
-
new Promise((_, reject) => {
|
|
243
|
-
timeoutHandle = setTimeout(() => reject(new Error('stream send timeout')), 10_000);
|
|
244
|
-
}),
|
|
245
|
-
]);
|
|
246
|
-
}
|
|
247
|
-
catch {
|
|
248
|
-
// Stream closed, errored, or timed out — clean up
|
|
249
|
-
stop();
|
|
250
|
-
}
|
|
251
|
-
}, 2000);
|
|
252
|
-
};
|
|
253
|
-
return { start, stop };
|
|
254
|
-
}
|
|
255
|
-
}
|
|
256
|
-
//# 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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"}
|