@serve.zone/dcrouter 13.21.1 → 13.22.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.
@@ -160,6 +160,18 @@ let OpsViewRemoteIngress = (() => {
160
160
  color: ${cssManager.bdTheme('#047857', '#34d399')};
161
161
  border: 1px dashed ${cssManager.bdTheme('#6ee7b7', '#065f46')};
162
162
  }
163
+
164
+ .metricStack {
165
+ display: flex;
166
+ flex-direction: column;
167
+ gap: 2px;
168
+ font-size: 12px;
169
+ line-height: 1.35;
170
+ }
171
+
172
+ .metricMuted {
173
+ color: var(--text-muted, #6b7280);
174
+ }
163
175
  `,
164
176
  ];
165
177
  render() {
@@ -261,9 +273,13 @@ let OpsViewRemoteIngress = (() => {
261
273
  .displayFunction=${(edge) => ({
262
274
  name: edge.name,
263
275
  status: this.getEdgeStatusHtml(edge),
276
+ transport: this.getTransportHtml(edge.id),
264
277
  publicIp: this.getEdgePublicIp(edge.id),
265
278
  ports: this.getPortsHtml(edge),
266
279
  tunnels: this.getEdgeTunnelCount(edge.id),
280
+ window: this.getWindowHtml(edge.id),
281
+ queues: this.getQueuesHtml(edge.id),
282
+ traffic: this.getTrafficHtml(edge.id),
267
283
  lastHeartbeat: this.getLastHeartbeat(edge.id),
268
284
  })}
269
285
  .dataActions=${[
@@ -476,6 +492,46 @@ let OpsViewRemoteIngress = (() => {
476
492
  const status = this.getEdgeStatus(edgeId);
477
493
  return status?.activeTunnels || 0;
478
494
  }
495
+ getTransportHtml(edgeId) {
496
+ const status = this.getEdgeStatus(edgeId);
497
+ if (!status?.connected)
498
+ return '-';
499
+ const mode = status.transportMode || 'unknown';
500
+ const label = mode === 'quic' ? 'QUIC' : mode === 'tcpTls' ? 'TCP/TLS' : mode;
501
+ return html `<div class="metricStack"><strong>${label}</strong><span class="metricMuted">${status.fallbackUsed ? 'fallback' : status.performance?.profile || 'default'}</span></div>`;
502
+ }
503
+ getWindowHtml(edgeId) {
504
+ const status = this.getEdgeStatus(edgeId);
505
+ if (!status?.connected || !status.flowControl)
506
+ return '-';
507
+ if (!status.flowControl.applies) {
508
+ return html `<div class="metricStack"><span>native QUIC</span><span class="metricMuted">max ${status.performance?.maxStreamsPerEdge || '-'} streams</span></div>`;
509
+ }
510
+ return html `
511
+ <div class="metricStack">
512
+ <span>${this.formatBytes(status.flowControl.currentWindowBytes)} window</span>
513
+ <span class="metricMuted">${this.formatBytes(status.flowControl.estimatedInFlightBytes)} est. in-flight</span>
514
+ </div>
515
+ `;
516
+ }
517
+ getQueuesHtml(edgeId) {
518
+ const status = this.getEdgeStatus(edgeId);
519
+ if (!status?.connected || !status.queues)
520
+ return '-';
521
+ return html `<div class="metricStack"><span>C ${status.queues.ctrlQueueDepth} / D ${status.queues.dataQueueDepth}</span><span class="metricMuted">S ${status.queues.sustainedQueueDepth}</span></div>`;
522
+ }
523
+ getTrafficHtml(edgeId) {
524
+ const status = this.getEdgeStatus(edgeId);
525
+ if (!status?.connected || !status.traffic)
526
+ return '-';
527
+ const drops = (status.traffic.rejectedStreams || 0) + (status.udp?.droppedDatagrams || 0);
528
+ return html `
529
+ <div class="metricStack">
530
+ <span>${this.formatBytes(status.traffic.bytesIn)} in / ${this.formatBytes(status.traffic.bytesOut)} out</span>
531
+ <span class="metricMuted">${drops} rejected/dropped</span>
532
+ </div>
533
+ `;
534
+ }
479
535
  getLastHeartbeat(edgeId) {
480
536
  const status = this.getEdgeStatus(edgeId);
481
537
  if (!status?.lastHeartbeat)
@@ -487,6 +543,18 @@ let OpsViewRemoteIngress = (() => {
487
543
  return `${Math.floor(ago / 60000)}m ago`;
488
544
  return `${Math.floor(ago / 3600000)}h ago`;
489
545
  }
546
+ formatBytes(bytes) {
547
+ if (!Number.isFinite(bytes) || bytes <= 0)
548
+ return '0 B';
549
+ const units = ['B', 'KB', 'MB', 'GB', 'TB'];
550
+ let value = bytes;
551
+ let unitIndex = 0;
552
+ while (value >= 1024 && unitIndex < units.length - 1) {
553
+ value = value / 1024;
554
+ unitIndex++;
555
+ }
556
+ return `${value >= 10 || unitIndex === 0 ? value.toFixed(0) : value.toFixed(1)} ${units[unitIndex]}`;
557
+ }
490
558
  static {
491
559
  __runInitializers(_classThis, _classExtraInitializers);
492
560
  }
@@ -494,4 +562,4 @@ let OpsViewRemoteIngress = (() => {
494
562
  return OpsViewRemoteIngress = _classThis;
495
563
  })();
496
564
  export { OpsViewRemoteIngress };
497
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-remoteingress.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-remoteingress.ts"],"names":[],"mappings":"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"}
565
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-remoteingress.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-remoteingress.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@serve.zone/dcrouter",
3
3
  "private": false,
4
- "version": "13.21.1",
4
+ "version": "13.22.0",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -54,7 +54,7 @@
54
54
  "@push.rocks/smartnetwork": "^4.6.0",
55
55
  "@push.rocks/smartpath": "^6.0.0",
56
56
  "@push.rocks/smartpromise": "^4.2.3",
57
- "@push.rocks/smartproxy": "^27.8.1",
57
+ "@push.rocks/smartproxy": "^27.8.2",
58
58
  "@push.rocks/smartradius": "^1.1.1",
59
59
  "@push.rocks/smartrequest": "^5.0.1",
60
60
  "@push.rocks/smartrx": "^3.0.10",
@@ -64,7 +64,7 @@
64
64
  "@push.rocks/taskbuffer": "^8.0.2",
65
65
  "@serve.zone/catalog": "^2.12.4",
66
66
  "@serve.zone/interfaces": "^5.4.3",
67
- "@serve.zone/remoteingress": "^4.15.3",
67
+ "@serve.zone/remoteingress": "^4.17.0",
68
68
  "@tsclass/tsclass": "^9.5.0",
69
69
  "@types/qrcode": "^1.5.6",
70
70
  "lru-cache": "^11.3.5",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.21.1',
6
+ version: '13.22.0',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -178,6 +178,8 @@ export interface IDcRouterOptions {
178
178
  certPath?: string;
179
179
  keyPath?: string;
180
180
  };
181
+ /** Performance profile and limits for remote ingress hub/edge tunnels. */
182
+ performance?: import('../ts_interfaces/data/remoteingress.js').IRemoteIngressPerformanceConfig;
181
183
  };
182
184
 
183
185
  /**
@@ -570,12 +572,16 @@ export class DcRouter {
570
572
  this.referenceResolver,
571
573
  // Sync routes to RemoteIngressManager whenever routes change,
572
574
  // then push updated derived ports to the Rust hub binary
573
- (routes) => {
575
+ async (routes) => {
574
576
  if (this.remoteIngressManager) {
575
577
  this.remoteIngressManager.setRoutes(routes as any[]);
576
578
  }
577
579
  if (this.tunnelManager) {
578
- this.tunnelManager.syncAllowedEdges();
580
+ try {
581
+ await this.tunnelManager.syncAllowedEdges();
582
+ } catch (err: unknown) {
583
+ logger.log('error', `Failed to sync Remote Ingress allowed edges: ${(err as Error).message}`);
584
+ }
579
585
  }
580
586
  },
581
587
  undefined,
@@ -1120,7 +1126,12 @@ export class DcRouter {
1120
1126
  // to SmartProxy with PROXY protocol v1 headers to preserve client IPs.
1121
1127
  if (this.options.remoteIngressConfig?.enabled) {
1122
1128
  smartProxyConfig.acceptProxyProtocol = true;
1123
- smartProxyConfig.proxyIPs = ['127.0.0.1'];
1129
+ if (!smartProxyConfig.proxyIPs) {
1130
+ smartProxyConfig.proxyIPs = [];
1131
+ }
1132
+ if (!smartProxyConfig.proxyIPs.includes('127.0.0.1')) {
1133
+ smartProxyConfig.proxyIPs.push('127.0.0.1');
1134
+ }
1124
1135
  }
1125
1136
 
1126
1137
  // VPN uses socket mode with PP v2 — SmartProxy must accept proxy protocol from localhost
@@ -2270,6 +2281,7 @@ export class DcRouter {
2270
2281
  tunnelPort: riCfg.tunnelPort ?? 8443,
2271
2282
  targetHost: '127.0.0.1',
2272
2283
  tls: tlsConfig,
2284
+ performance: riCfg.performance,
2273
2285
  });
2274
2286
  await this.tunnelManager.start();
2275
2287
 
@@ -59,7 +59,7 @@ export class RouteConfigManager {
59
59
  private getHttp3Config?: () => IHttp3Config | undefined,
60
60
  private getVpnClientIpsForRoute?: (route: IDcRouterRouteConfig, routeId?: string) => TIpAllowEntry[],
61
61
  private referenceResolver?: ReferenceResolver,
62
- private onRoutesApplied?: (routes: plugins.smartproxy.IRouteConfig[]) => void,
62
+ private onRoutesApplied?: (routes: plugins.smartproxy.IRouteConfig[]) => void | Promise<void>,
63
63
  private getRuntimeRoutes?: () => plugins.smartproxy.IRouteConfig[],
64
64
  private hydrateStoredRoute?: (storedRoute: IRoute) => plugins.smartproxy.IRouteConfig | undefined,
65
65
  ) {}
@@ -540,7 +540,7 @@ export class RouteConfigManager {
540
540
 
541
541
  // Notify listeners (e.g. RemoteIngressManager) of the route set
542
542
  if (this.onRoutesApplied) {
543
- this.onRoutesApplied(enabledRoutes);
543
+ await this.onRoutesApplied(enabledRoutes);
544
544
  }
545
545
 
546
546
  logger.log('info', `Applied ${enabledRoutes.length} routes to SmartProxy (${this.routes.size} total)`);
@@ -206,6 +206,7 @@ export class ConfigHandler {
206
206
  hubDomain: riCfg?.hubDomain || null,
207
207
  tlsMode,
208
208
  connectedEdgeIps,
209
+ performance: riCfg?.performance,
209
210
  };
210
211
 
211
212
  return {
@@ -29,6 +29,7 @@ export class RemoteIngressHandler {
29
29
  ...e,
30
30
  secret: '********', // Never expose secrets via API
31
31
  effectiveListenPorts: manager.getEffectiveListenPorts(e),
32
+ effectiveListenPortsUdp: manager.getEffectiveListenPortsUdp(e),
32
33
  manualPorts: breakdown.manual,
33
34
  derivedPorts: breakdown.derived,
34
35
  };
@@ -133,6 +134,7 @@ export class RemoteIngressHandler {
133
134
  ...edge,
134
135
  secret: '********',
135
136
  effectiveListenPorts: manager.getEffectiveListenPorts(edge),
137
+ effectiveListenPortsUdp: manager.getEffectiveListenPortsUdp(edge),
136
138
  manualPorts: breakdown.manual,
137
139
  derivedPorts: breakdown.derived,
138
140
  },
@@ -9,6 +9,7 @@ export interface ITunnelManagerConfig {
9
9
  certPem?: string;
10
10
  keyPem?: string;
11
11
  };
12
+ performance?: import('../../ts_interfaces/data/remoteingress.js').IRemoteIngressPerformanceConfig;
12
13
  }
13
14
 
14
15
  /**
@@ -20,6 +21,7 @@ export class TunnelManager {
20
21
  private config: ITunnelManagerConfig;
21
22
  private edgeStatuses: Map<string, IRemoteIngressStatus> = new Map();
22
23
  private reconcileInterval: ReturnType<typeof setInterval> | null = null;
24
+ private syncChain: Promise<void> = Promise.resolve();
23
25
 
24
26
  constructor(manager: RemoteIngressManager, config: ITunnelManagerConfig = {}) {
25
27
  this.manager = manager;
@@ -66,7 +68,8 @@ export class TunnelManager {
66
68
  tunnelPort: this.config.tunnelPort ?? 8443,
67
69
  targetHost: this.config.targetHost ?? '127.0.0.1',
68
70
  tls: this.config.tls,
69
- });
71
+ ...(this.config.performance ? { performance: this.config.performance } : {}),
72
+ } as any);
70
73
 
71
74
  // Send allowed edges to the hub
72
75
  await this.syncAllowedEdges();
@@ -107,20 +110,23 @@ export class TunnelManager {
107
110
  if (existing) {
108
111
  existing.activeTunnels = rustEdge.activeStreams;
109
112
  existing.lastHeartbeat = Date.now();
113
+ this.applyRustStatus(existing, rustEdge);
110
114
  // Update peer address if available from Rust hub
111
115
  if (rustEdge.peerAddr) {
112
116
  existing.publicIp = rustEdge.peerAddr;
113
117
  }
114
118
  } else {
115
119
  // Missed edgeConnected event — add entry
116
- this.edgeStatuses.set(rustEdge.edgeId, {
120
+ const status: IRemoteIngressStatus = {
117
121
  edgeId: rustEdge.edgeId,
118
122
  connected: true,
119
123
  publicIp: rustEdge.peerAddr || null,
120
124
  activeTunnels: rustEdge.activeStreams,
121
125
  lastHeartbeat: Date.now(),
122
126
  connectedAt: rustEdge.connectedAt * 1000,
123
- });
127
+ };
128
+ this.applyRustStatus(status, rustEdge);
129
+ this.edgeStatuses.set(rustEdge.edgeId, status);
124
130
  }
125
131
  }
126
132
 
@@ -137,8 +143,22 @@ export class TunnelManager {
137
143
  * Call this after creating/deleting/updating edges.
138
144
  */
139
145
  public async syncAllowedEdges(): Promise<void> {
140
- const edges = this.manager.getAllowedEdges();
141
- await this.hub.updateAllowedEdges(edges);
146
+ const run = this.syncChain.catch(() => {}).then(async () => {
147
+ const edges = this.manager.getAllowedEdges();
148
+ await this.hub.updateAllowedEdges(edges as any);
149
+ });
150
+ this.syncChain = run;
151
+ await run;
152
+ }
153
+
154
+ private applyRustStatus(status: IRemoteIngressStatus, rustEdge: any): void {
155
+ status.transportMode = rustEdge.transportMode;
156
+ status.fallbackUsed = rustEdge.fallbackUsed;
157
+ status.performance = rustEdge.performance;
158
+ status.flowControl = rustEdge.flowControl;
159
+ status.queues = rustEdge.queues;
160
+ status.traffic = rustEdge.traffic;
161
+ status.udp = rustEdge.udp;
142
162
  }
143
163
 
144
164
  /**
@@ -9,12 +9,14 @@ export class RemoteIngress {
9
9
  public name: string;
10
10
  public secret: string;
11
11
  public listenPorts: number[];
12
+ public listenPortsUdp?: number[];
12
13
  public enabled: boolean;
13
14
  public autoDerivePorts: boolean;
14
15
  public tags?: string[];
15
16
  public createdAt: number;
16
17
  public updatedAt: number;
17
18
  public effectiveListenPorts?: number[];
19
+ public effectiveListenPortsUdp?: number[];
18
20
  public manualPorts?: number[];
19
21
  public derivedPorts?: number[];
20
22
 
@@ -24,12 +26,14 @@ export class RemoteIngress {
24
26
  this.name = data.name;
25
27
  this.secret = data.secret;
26
28
  this.listenPorts = data.listenPorts;
29
+ this.listenPortsUdp = data.listenPortsUdp;
27
30
  this.enabled = data.enabled;
28
31
  this.autoDerivePorts = data.autoDerivePorts;
29
32
  this.tags = data.tags;
30
33
  this.createdAt = data.createdAt;
31
34
  this.updatedAt = data.updatedAt;
32
35
  this.effectiveListenPorts = data.effectiveListenPorts;
36
+ this.effectiveListenPortsUdp = data.effectiveListenPortsUdp;
33
37
  this.manualPorts = data.manualPorts;
34
38
  this.derivedPorts = data.derivedPorts;
35
39
  }
@@ -52,11 +56,13 @@ export class RemoteIngress {
52
56
  const edge = response.edge;
53
57
  this.name = edge.name;
54
58
  this.listenPorts = edge.listenPorts;
59
+ this.listenPortsUdp = edge.listenPortsUdp;
55
60
  this.enabled = edge.enabled;
56
61
  this.autoDerivePorts = edge.autoDerivePorts;
57
62
  this.tags = edge.tags;
58
63
  this.updatedAt = edge.updatedAt;
59
64
  this.effectiveListenPorts = edge.effectiveListenPorts;
65
+ this.effectiveListenPortsUdp = edge.effectiveListenPortsUdp;
60
66
  this.manualPorts = edge.manualPorts;
61
67
  this.derivedPorts = edge.derivedPorts;
62
68
  }
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.21.1',
6
+ version: '13.22.0',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -125,6 +125,18 @@ export class OpsViewRemoteIngress extends DeesElement {
125
125
  color: ${cssManager.bdTheme('#047857', '#34d399')};
126
126
  border: 1px dashed ${cssManager.bdTheme('#6ee7b7', '#065f46')};
127
127
  }
128
+
129
+ .metricStack {
130
+ display: flex;
131
+ flex-direction: column;
132
+ gap: 2px;
133
+ font-size: 12px;
134
+ line-height: 1.35;
135
+ }
136
+
137
+ .metricMuted {
138
+ color: var(--text-muted, #6b7280);
139
+ }
128
140
  `,
129
141
  ];
130
142
 
@@ -226,9 +238,13 @@ export class OpsViewRemoteIngress extends DeesElement {
226
238
  .displayFunction=${(edge: interfaces.data.IRemoteIngress) => ({
227
239
  name: edge.name,
228
240
  status: this.getEdgeStatusHtml(edge),
241
+ transport: this.getTransportHtml(edge.id),
229
242
  publicIp: this.getEdgePublicIp(edge.id),
230
243
  ports: this.getPortsHtml(edge),
231
244
  tunnels: this.getEdgeTunnelCount(edge.id),
245
+ window: this.getWindowHtml(edge.id),
246
+ queues: this.getQueuesHtml(edge.id),
247
+ traffic: this.getTrafficHtml(edge.id),
232
248
  lastHeartbeat: this.getLastHeartbeat(edge.id),
233
249
  })}
234
250
  .dataActions=${[
@@ -459,6 +475,46 @@ export class OpsViewRemoteIngress extends DeesElement {
459
475
  return status?.activeTunnels || 0;
460
476
  }
461
477
 
478
+ private getTransportHtml(edgeId: string): TemplateResult | string {
479
+ const status = this.getEdgeStatus(edgeId);
480
+ if (!status?.connected) return '-';
481
+ const mode = status.transportMode || 'unknown';
482
+ const label = mode === 'quic' ? 'QUIC' : mode === 'tcpTls' ? 'TCP/TLS' : mode;
483
+ return html`<div class="metricStack"><strong>${label}</strong><span class="metricMuted">${status.fallbackUsed ? 'fallback' : status.performance?.profile || 'default'}</span></div>`;
484
+ }
485
+
486
+ private getWindowHtml(edgeId: string): TemplateResult | string {
487
+ const status = this.getEdgeStatus(edgeId);
488
+ if (!status?.connected || !status.flowControl) return '-';
489
+ if (!status.flowControl.applies) {
490
+ return html`<div class="metricStack"><span>native QUIC</span><span class="metricMuted">max ${status.performance?.maxStreamsPerEdge || '-'} streams</span></div>`;
491
+ }
492
+ return html`
493
+ <div class="metricStack">
494
+ <span>${this.formatBytes(status.flowControl.currentWindowBytes)} window</span>
495
+ <span class="metricMuted">${this.formatBytes(status.flowControl.estimatedInFlightBytes)} est. in-flight</span>
496
+ </div>
497
+ `;
498
+ }
499
+
500
+ private getQueuesHtml(edgeId: string): TemplateResult | string {
501
+ const status = this.getEdgeStatus(edgeId);
502
+ if (!status?.connected || !status.queues) return '-';
503
+ return html`<div class="metricStack"><span>C ${status.queues.ctrlQueueDepth} / D ${status.queues.dataQueueDepth}</span><span class="metricMuted">S ${status.queues.sustainedQueueDepth}</span></div>`;
504
+ }
505
+
506
+ private getTrafficHtml(edgeId: string): TemplateResult | string {
507
+ const status = this.getEdgeStatus(edgeId);
508
+ if (!status?.connected || !status.traffic) return '-';
509
+ const drops = (status.traffic.rejectedStreams || 0) + (status.udp?.droppedDatagrams || 0);
510
+ return html`
511
+ <div class="metricStack">
512
+ <span>${this.formatBytes(status.traffic.bytesIn)} in / ${this.formatBytes(status.traffic.bytesOut)} out</span>
513
+ <span class="metricMuted">${drops} rejected/dropped</span>
514
+ </div>
515
+ `;
516
+ }
517
+
462
518
  private getLastHeartbeat(edgeId: string): string {
463
519
  const status = this.getEdgeStatus(edgeId);
464
520
  if (!status?.lastHeartbeat) return '-';
@@ -467,4 +523,16 @@ export class OpsViewRemoteIngress extends DeesElement {
467
523
  if (ago < 3600000) return `${Math.floor(ago / 60000)}m ago`;
468
524
  return `${Math.floor(ago / 3600000)}h ago`;
469
525
  }
526
+
527
+ private formatBytes(bytes: number): string {
528
+ if (!Number.isFinite(bytes) || bytes <= 0) return '0 B';
529
+ const units = ['B', 'KB', 'MB', 'GB', 'TB'];
530
+ let value = bytes;
531
+ let unitIndex = 0;
532
+ while (value >= 1024 && unitIndex < units.length - 1) {
533
+ value = value / 1024;
534
+ unitIndex++;
535
+ }
536
+ return `${value >= 10 || unitIndex === 0 ? value.toFixed(0) : value.toFixed(1)} ${units[unitIndex]}`;
537
+ }
470
538
  }