@serve.zone/dcrouter 7.2.0 → 7.4.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 (32) hide show
  1. package/dist_serve/bundle.js +592 -592
  2. package/dist_ts/00_commitinfo_data.js +1 -1
  3. package/dist_ts/classes.dcrouter.js +9 -1
  4. package/dist_ts/logger.d.ts +2 -0
  5. package/dist_ts/logger.js +3 -3
  6. package/dist_ts/monitoring/classes.metricsmanager.d.ts +8 -1
  7. package/dist_ts/monitoring/classes.metricsmanager.js +16 -2
  8. package/dist_ts/opsserver/handlers/logs.handler.d.ts +5 -0
  9. package/dist_ts/opsserver/handlers/logs.handler.js +43 -2
  10. package/dist_ts/opsserver/handlers/stats.handler.js +3 -1
  11. package/dist_ts_interfaces/data/stats.d.ts +7 -0
  12. package/dist_ts_interfaces/requests/logs.d.ts +7 -0
  13. package/dist_ts_web/00_commitinfo_data.js +1 -1
  14. package/dist_ts_web/appstate.js +51 -1
  15. package/dist_ts_web/elements/ops-view-logs.d.ts +1 -0
  16. package/dist_ts_web/elements/ops-view-logs.js +18 -7
  17. package/dist_ts_web/elements/ops-view-overview.d.ts +1 -0
  18. package/dist_ts_web/elements/ops-view-overview.js +12 -3
  19. package/dist_ts_web/plugins.d.ts +2 -1
  20. package/dist_ts_web/plugins.js +4 -2
  21. package/package.json +3 -3
  22. package/ts/00_commitinfo_data.ts +1 -1
  23. package/ts/classes.dcrouter.ts +15 -0
  24. package/ts/logger.ts +2 -2
  25. package/ts/monitoring/classes.metricsmanager.ts +16 -1
  26. package/ts/opsserver/handlers/logs.handler.ts +47 -2
  27. package/ts/opsserver/handlers/stats.handler.ts +4 -1
  28. package/ts_web/00_commitinfo_data.ts +1 -1
  29. package/ts_web/appstate.ts +61 -0
  30. package/ts_web/elements/ops-view-logs.ts +17 -5
  31. package/ts_web/elements/ops-view-overview.ts +12 -2
  32. package/ts_web/plugins.ts +5 -1
@@ -176,8 +176,8 @@ let OpsViewOverview = (() => {
176
176
  .logEntries=${this.getRecentEventEntries()}
177
177
  ></dees-chart-log>
178
178
  <dees-chart-log
179
- .label=${'Security Alerts'}
180
- .logEntries=${this.getSecurityAlertEntries()}
179
+ .label=${'DNS Queries'}
180
+ .logEntries=${this.getDnsQueryEntries()}
181
181
  ></dees-chart-log>
182
182
  </div>
183
183
  `}
@@ -420,6 +420,15 @@ let OpsViewOverview = (() => {
420
420
  source: evt.type,
421
421
  }));
422
422
  }
423
+ getDnsQueryEntries() {
424
+ const queries = this.statsState.dnsStats?.recentQueries || [];
425
+ return queries.map((q) => ({
426
+ timestamp: new Date(q.timestamp).toISOString(),
427
+ level: q.answered ? 'info' : 'warn',
428
+ message: `${q.type} ${q.domain} (${q.responseTimeMs}ms)`,
429
+ source: 'dns',
430
+ }));
431
+ }
423
432
  getEmailTrafficSeries() {
424
433
  const ts = this.statsState.emailStats?.timeSeries;
425
434
  if (!ts)
@@ -444,4 +453,4 @@ let OpsViewOverview = (() => {
444
453
  return OpsViewOverview = _classThis;
445
454
  })();
446
455
  export { OpsViewOverview };
447
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-overview.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-overview.ts"],"names":[],"mappings":"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"}
456
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-overview.js","sourceRoot":"","sources":["../../ts_web/elements/ops-view-overview.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import * as deesElement from '@design.estate/dees-element';
2
2
  import * as deesCatalog from '@design.estate/dees-catalog';
3
- export { deesElement, deesCatalog };
3
+ import * as typedsocket from '@api.global/typedsocket';
4
+ export { deesElement, deesCatalog, typedsocket, };
4
5
  export declare const domtools: typeof deesElement.domtools;
@@ -1,7 +1,9 @@
1
1
  // @design.estate scope
2
2
  import * as deesElement from '@design.estate/dees-element';
3
3
  import * as deesCatalog from '@design.estate/dees-catalog';
4
- export { deesElement, deesCatalog };
4
+ // TypedSocket for real-time push communication
5
+ import * as typedsocket from '@api.global/typedsocket';
6
+ export { deesElement, deesCatalog, typedsocket, };
5
7
  // domtools gives us TypedRequest and other utilities
6
8
  export const domtools = deesElement.domtools;
7
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX3dlYi9wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVCQUF1QjtBQUN2QixPQUFPLEtBQUssV0FBVyxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxXQUFXLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxFQUNMLFdBQVcsRUFDWCxXQUFXLEVBQ1osQ0FBQTtBQUVELHFEQUFxRDtBQUNyRCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsV0FBVyxDQUFDLFFBQVEsQ0FBQyJ9
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX3dlYi9wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVCQUF1QjtBQUN2QixPQUFPLEtBQUssV0FBVyxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxXQUFXLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsK0NBQStDO0FBQy9DLE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxFQUNMLFdBQVcsRUFDWCxXQUFXLEVBQ1gsV0FBVyxHQUNaLENBQUE7QUFFRCxxREFBcUQ7QUFDckQsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLFdBQVcsQ0FBQyxRQUFRLENBQUMifQ==
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@serve.zone/dcrouter",
3
3
  "private": false,
4
- "version": "7.2.0",
4
+ "version": "7.4.0",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -38,7 +38,7 @@
38
38
  "@push.rocks/qenv": "^6.1.3",
39
39
  "@push.rocks/smartacme": "^9.1.3",
40
40
  "@push.rocks/smartdata": "^7.0.15",
41
- "@push.rocks/smartdns": "^7.8.1",
41
+ "@push.rocks/smartdns": "^7.9.0",
42
42
  "@push.rocks/smartfile": "^13.1.2",
43
43
  "@push.rocks/smartguard": "^3.1.0",
44
44
  "@push.rocks/smartjwt": "^2.2.1",
@@ -49,7 +49,7 @@
49
49
  "@push.rocks/smartnetwork": "^4.4.0",
50
50
  "@push.rocks/smartpath": "^6.0.0",
51
51
  "@push.rocks/smartpromise": "^4.2.3",
52
- "@push.rocks/smartproxy": "^25.7.8",
52
+ "@push.rocks/smartproxy": "^25.7.9",
53
53
  "@push.rocks/smartradius": "^1.1.1",
54
54
  "@push.rocks/smartrequest": "^5.0.1",
55
55
  "@push.rocks/smartrx": "^3.0.10",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '7.2.0',
6
+ version: '7.4.0',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -1256,6 +1256,21 @@ export class DcRouter {
1256
1256
  // Start the DNS server (UDP only)
1257
1257
  await this.dnsServer.start();
1258
1258
  logger.log('info', `DNS server started on UDP ${vmIpAddress}:53`);
1259
+
1260
+ // Wire DNS query events to MetricsManager for time-series tracking
1261
+ if (this.metricsManager && this.dnsServer) {
1262
+ this.dnsServer.on('query', (event: plugins.smartdns.dnsServerMod.IDnsQueryCompletedEvent) => {
1263
+ for (const question of event.questions) {
1264
+ this.metricsManager.trackDnsQuery(
1265
+ question.type,
1266
+ question.name,
1267
+ false,
1268
+ event.responseTimeMs,
1269
+ event.answered,
1270
+ );
1271
+ }
1272
+ });
1273
+ }
1259
1274
 
1260
1275
  // Validate DNS configuration
1261
1276
  await this.validateDnsConfiguration();
package/ts/logger.ts CHANGED
@@ -14,8 +14,8 @@ const envMap: Record<string, 'local' | 'test' | 'staging' | 'production'> = {
14
14
  // In-memory log buffer for the OpsServer UI
15
15
  export const logBuffer = new SmartlogDestinationBuffer({ maxEntries: 2000 });
16
16
 
17
- // Default Smartlog instance
18
- const baseLogger = new plugins.smartlog.Smartlog({
17
+ // Default Smartlog instance (exported so OpsServer can add push destinations)
18
+ export const baseLogger = new plugins.smartlog.Smartlog({
19
19
  logContext: {
20
20
  environment: envMap[nodeEnv] || 'production',
21
21
  runtime: 'node',
@@ -36,6 +36,7 @@ export class MetricsManager {
36
36
  lastResetDate: new Date().toDateString(),
37
37
  queryTimestamps: [] as number[], // Track query timestamps for rate calculation
38
38
  responseTimes: [] as number[], // Track response times in ms
39
+ recentQueries: [] as Array<{ timestamp: number; domain: string; type: string; answered: boolean; responseTimeMs: number }>,
39
40
  };
40
41
 
41
42
  // Per-minute time-series buckets for charts
@@ -95,6 +96,7 @@ export class MetricsManager {
95
96
  this.dnsMetrics.topDomains.clear();
96
97
  this.dnsMetrics.queryTimestamps = [];
97
98
  this.dnsMetrics.responseTimes = [];
99
+ this.dnsMetrics.recentQueries = [];
98
100
  this.dnsMetrics.lastResetDate = currentDate;
99
101
  }
100
102
 
@@ -228,6 +230,7 @@ export class MetricsManager {
228
230
  queryTypes: this.dnsMetrics.queryTypes,
229
231
  averageResponseTime: Math.round(avgResponseTime),
230
232
  activeDomains: this.dnsMetrics.topDomains.size,
233
+ recentQueries: this.dnsMetrics.recentQueries.slice(),
231
234
  };
232
235
  });
233
236
  }
@@ -392,9 +395,21 @@ export class MetricsManager {
392
395
  }
393
396
 
394
397
  // DNS event tracking methods
395
- public trackDnsQuery(queryType: string, domain: string, cacheHit: boolean, responseTimeMs?: number): void {
398
+ public trackDnsQuery(queryType: string, domain: string, cacheHit: boolean, responseTimeMs?: number, answered?: boolean): void {
396
399
  this.dnsMetrics.totalQueries++;
397
400
  this.incrementDnsBucket();
401
+
402
+ // Store recent query entry
403
+ this.dnsMetrics.recentQueries.push({
404
+ timestamp: Date.now(),
405
+ domain,
406
+ type: queryType,
407
+ answered: answered ?? true,
408
+ responseTimeMs: responseTimeMs ?? 0,
409
+ });
410
+ if (this.dnsMetrics.recentQueries.length > 100) {
411
+ this.dnsMetrics.recentQueries.shift();
412
+ }
398
413
 
399
414
  if (cacheHit) {
400
415
  this.dnsMetrics.cacheHits++;
@@ -1,15 +1,16 @@
1
1
  import * as plugins from '../../plugins.js';
2
2
  import type { OpsServer } from '../classes.opsserver.js';
3
3
  import * as interfaces from '../../../ts_interfaces/index.js';
4
- import { logBuffer } from '../../logger.js';
4
+ import { logBuffer, baseLogger } from '../../logger.js';
5
5
 
6
6
  export class LogsHandler {
7
7
  public typedrouter = new plugins.typedrequest.TypedRouter();
8
-
8
+
9
9
  constructor(private opsServerRef: OpsServer) {
10
10
  // Add this handler's router to the parent
11
11
  this.opsServerRef.typedrouter.addTypedRouter(this.typedrouter);
12
12
  this.registerHandlers();
13
+ this.setupLogPushDestination();
13
14
  }
14
15
 
15
16
  private registerHandlers(): void {
@@ -165,6 +166,50 @@ export class LogsHandler {
165
166
  return mapped;
166
167
  }
167
168
 
169
+ /**
170
+ * Add a log destination to the base logger that pushes entries
171
+ * to all connected ops_dashboard TypedSocket clients.
172
+ */
173
+ private setupLogPushDestination(): void {
174
+ const opsServerRef = this.opsServerRef;
175
+
176
+ baseLogger.addLogDestination({
177
+ async handleLog(logPackage: any) {
178
+ // Access the TypedSocket server instance from OpsServer
179
+ const typedsocket = opsServerRef.server?.typedserver?.typedsocket;
180
+ if (!typedsocket) return;
181
+
182
+ let connections: any[];
183
+ try {
184
+ connections = await typedsocket.findAllTargetConnectionsByTag('role', 'ops_dashboard');
185
+ } catch {
186
+ return;
187
+ }
188
+ if (connections.length === 0) return;
189
+
190
+ const entry: interfaces.data.ILogEntry = {
191
+ timestamp: logPackage.timestamp || Date.now(),
192
+ level: LogsHandler.mapLogLevel(logPackage.level),
193
+ category: LogsHandler.deriveCategory(logPackage.context?.zone, logPackage.message),
194
+ message: logPackage.message,
195
+ metadata: logPackage.data,
196
+ };
197
+
198
+ for (const conn of connections) {
199
+ try {
200
+ const push = typedsocket.createTypedRequest<interfaces.requests.IReq_PushLogEntry>(
201
+ 'pushLogEntry',
202
+ conn,
203
+ );
204
+ push.fire({ entry }).catch(() => {}); // fire-and-forget
205
+ } catch {
206
+ // connection may have closed
207
+ }
208
+ }
209
+ },
210
+ });
211
+ }
212
+
168
213
  private setupLogStream(
169
214
  virtualStream: plugins.typedrequest.VirtualStream<Uint8Array>,
170
215
  levelFilter?: string[],
@@ -241,6 +241,7 @@ export class StatsHandler {
241
241
  averageResponseTime: 0,
242
242
  queryTypes: stats.queryTypes,
243
243
  timeSeries,
244
+ recentQueries: stats.recentQueries,
244
245
  };
245
246
  })
246
247
  );
@@ -422,6 +423,7 @@ export class StatsHandler {
422
423
  count: number;
423
424
  }>;
424
425
  queryTypes: { [key: string]: number };
426
+ recentQueries?: Array<{ timestamp: number; domain: string; type: string; answered: boolean; responseTimeMs: number }>;
425
427
  domainBreakdown?: { [domain: string]: interfaces.data.IDnsStats };
426
428
  }> {
427
429
  // Get metrics from MetricsManager if available
@@ -435,9 +437,10 @@ export class StatsHandler {
435
437
  cacheHitRate: dnsStats.cacheHitRate,
436
438
  topDomains: dnsStats.topDomains,
437
439
  queryTypes: dnsStats.queryTypes,
440
+ recentQueries: dnsStats.recentQueries,
438
441
  };
439
442
  }
440
-
443
+
441
444
  // Fallback if MetricsManager not available
442
445
  return {
443
446
  queriesPerSecond: 0,
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '7.2.0',
6
+ version: '7.4.0',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -1075,6 +1075,55 @@ export const toggleRemoteIngressAction = remoteIngressStatePart.createAction<{
1075
1075
  }
1076
1076
  });
1077
1077
 
1078
+ // ============================================================================
1079
+ // TypedSocket Client for Real-time Log Streaming
1080
+ // ============================================================================
1081
+
1082
+ let socketClient: plugins.typedsocket.TypedSocket | null = null;
1083
+ const socketRouter = new plugins.domtools.plugins.typedrequest.TypedRouter();
1084
+
1085
+ // Register handler for pushed log entries from the server
1086
+ socketRouter.addTypedHandler(
1087
+ new plugins.domtools.plugins.typedrequest.TypedHandler<interfaces.requests.IReq_PushLogEntry>(
1088
+ 'pushLogEntry',
1089
+ async (dataArg) => {
1090
+ const current = logStatePart.getState();
1091
+ const updated = [...current.recentLogs, dataArg.entry];
1092
+ // Cap at 2000 entries
1093
+ if (updated.length > 2000) {
1094
+ updated.splice(0, updated.length - 2000);
1095
+ }
1096
+ logStatePart.setState({ ...current, recentLogs: updated });
1097
+ return {};
1098
+ }
1099
+ )
1100
+ );
1101
+
1102
+ async function connectSocket() {
1103
+ if (socketClient) return;
1104
+ try {
1105
+ socketClient = await plugins.typedsocket.TypedSocket.createClient(
1106
+ socketRouter,
1107
+ plugins.typedsocket.TypedSocket.useWindowLocationOriginUrl(),
1108
+ );
1109
+ await socketClient.setTag('role', 'ops_dashboard');
1110
+ } catch (err) {
1111
+ console.error('TypedSocket connection failed:', err);
1112
+ socketClient = null;
1113
+ }
1114
+ }
1115
+
1116
+ async function disconnectSocket() {
1117
+ if (socketClient) {
1118
+ try {
1119
+ await socketClient.stop();
1120
+ } catch {
1121
+ // ignore disconnect errors
1122
+ }
1123
+ socketClient = null;
1124
+ }
1125
+ }
1126
+
1078
1127
  // Combined refresh action for efficient polling
1079
1128
  async function dispatchCombinedRefreshAction() {
1080
1129
  const context = getActionContext();
@@ -1237,9 +1286,21 @@ let currentRefreshRate = 1000; // Track current refresh rate to avoid unnecessar
1237
1286
  if (state.isLoggedIn !== previousIsLoggedIn) {
1238
1287
  previousIsLoggedIn = state.isLoggedIn;
1239
1288
  startAutoRefresh();
1289
+
1290
+ // Connect/disconnect TypedSocket based on login state
1291
+ if (state.isLoggedIn) {
1292
+ connectSocket();
1293
+ } else {
1294
+ disconnectSocket();
1295
+ }
1240
1296
  }
1241
1297
  });
1242
1298
 
1243
1299
  // Initial start
1244
1300
  startAutoRefresh();
1301
+
1302
+ // Connect TypedSocket if already logged in (e.g., persistent session)
1303
+ if (loginStatePart.getState().isLoggedIn) {
1304
+ connectSocket();
1305
+ }
1245
1306
  })();
@@ -29,6 +29,8 @@ export class OpsViewLogs extends DeesElement {
29
29
  @state()
30
30
  accessor filterLimit: number = 100;
31
31
 
32
+ private lastPushedCount = 0;
33
+
32
34
  constructor() {
33
35
  super();
34
36
  const subscription = appstate.logStatePart
@@ -110,7 +112,11 @@ export class OpsViewLogs extends DeesElement {
110
112
 
111
113
  async connectedCallback() {
112
114
  super.connectedCallback();
113
- this.fetchLogs();
115
+ this.lastPushedCount = 0;
116
+ // Only fetch if state is empty (streaming will handle new entries)
117
+ if (this.logState.recentLogs.length === 0) {
118
+ this.fetchLogs();
119
+ }
114
120
  }
115
121
 
116
122
  async updated(changedProperties: Map<string, any>) {
@@ -127,10 +133,16 @@ export class OpsViewLogs extends DeesElement {
127
133
  // Ensure the chart element has finished its own initialization
128
134
  await chartLog.updateComplete;
129
135
 
130
- chartLog.clearLogs();
131
- const entries = this.getMappedLogEntries();
132
- if (entries.length > 0) {
133
- chartLog.updateLog(entries);
136
+ const allEntries = this.getMappedLogEntries();
137
+ if (this.lastPushedCount === 0 && allEntries.length > 0) {
138
+ // Initial load: push all entries
139
+ chartLog.updateLog(allEntries);
140
+ this.lastPushedCount = allEntries.length;
141
+ } else if (allEntries.length > this.lastPushedCount) {
142
+ // Incremental: only push new entries
143
+ const newEntries = allEntries.slice(this.lastPushedCount);
144
+ chartLog.updateLog(newEntries);
145
+ this.lastPushedCount = allEntries.length;
134
146
  }
135
147
  }
136
148
 
@@ -133,8 +133,8 @@ export class OpsViewOverview extends DeesElement {
133
133
  .logEntries=${this.getRecentEventEntries()}
134
134
  ></dees-chart-log>
135
135
  <dees-chart-log
136
- .label=${'Security Alerts'}
137
- .logEntries=${this.getSecurityAlertEntries()}
136
+ .label=${'DNS Queries'}
137
+ .logEntries=${this.getDnsQueryEntries()}
138
138
  ></dees-chart-log>
139
139
  </div>
140
140
  `}
@@ -395,6 +395,16 @@ export class OpsViewOverview extends DeesElement {
395
395
  }));
396
396
  }
397
397
 
398
+ private getDnsQueryEntries(): Array<{ timestamp: string; level: 'debug' | 'info' | 'warn' | 'error' | 'success'; message: string; source?: string }> {
399
+ const queries: any[] = (this.statsState.dnsStats as any)?.recentQueries || [];
400
+ return queries.map((q: any) => ({
401
+ timestamp: new Date(q.timestamp).toISOString(),
402
+ level: q.answered ? 'info' as const : 'warn' as const,
403
+ message: `${q.type} ${q.domain} (${q.responseTimeMs}ms)`,
404
+ source: 'dns',
405
+ }));
406
+ }
407
+
398
408
  private getEmailTrafficSeries(): Array<{ name: string; color: string; data: Array<{ x: number; y: number }> }> {
399
409
  const ts = this.statsState.emailStats?.timeSeries;
400
410
  if (!ts) return [];
package/ts_web/plugins.ts CHANGED
@@ -2,9 +2,13 @@
2
2
  import * as deesElement from '@design.estate/dees-element';
3
3
  import * as deesCatalog from '@design.estate/dees-catalog';
4
4
 
5
+ // TypedSocket for real-time push communication
6
+ import * as typedsocket from '@api.global/typedsocket';
7
+
5
8
  export {
6
9
  deesElement,
7
- deesCatalog
10
+ deesCatalog,
11
+ typedsocket,
8
12
  }
9
13
 
10
14
  // domtools gives us TypedRequest and other utilities