@serve.zone/dcrouter 13.38.4 → 13.40.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 (37) hide show
  1. package/deno.json +1 -1
  2. package/dist_serve/bundle.js +350 -343
  3. package/dist_ts/00_commitinfo_data.js +1 -1
  4. package/dist_ts/db/documents/classes.remote-ingress-edge.doc.d.ts +2 -0
  5. package/dist_ts/db/documents/classes.remote-ingress-edge.doc.js +8 -2
  6. package/dist_ts/http3/http3-route-augmentation.d.ts +1 -1
  7. package/dist_ts/http3/http3-route-augmentation.js +3 -17
  8. package/dist_ts/monitoring/classes.metricsmanager.d.ts +2 -0
  9. package/dist_ts/monitoring/classes.metricsmanager.js +53 -19
  10. package/dist_ts/opsserver/handlers/remoteingress.handler.js +3 -2
  11. package/dist_ts/opsserver/handlers/security.handler.d.ts +2 -0
  12. package/dist_ts/opsserver/handlers/security.handler.js +50 -73
  13. package/dist_ts/radius/classes.radius.server.d.ts +0 -5
  14. package/dist_ts/radius/classes.radius.server.js +46 -78
  15. package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +4 -2
  16. package/dist_ts/remoteingress/classes.remoteingress-manager.js +9 -21
  17. package/dist_ts_interfaces/data/remoteingress.d.ts +10 -0
  18. package/dist_ts_interfaces/requests/remoteingress.d.ts +3 -1
  19. package/dist_ts_web/00_commitinfo_data.js +1 -1
  20. package/dist_ts_web/appstate.d.ts +2 -0
  21. package/dist_ts_web/appstate.js +3 -1
  22. package/dist_ts_web/elements/network/ops-view-remoteingress.d.ts +2 -0
  23. package/dist_ts_web/elements/network/ops-view-remoteingress.js +55 -2
  24. package/dist_ts_web/elements/overview/ops-view-config.js +4 -1
  25. package/package.json +3 -3
  26. package/ts/00_commitinfo_data.ts +1 -1
  27. package/ts/db/documents/classes.remote-ingress-edge.doc.ts +4 -0
  28. package/ts/http3/http3-route-augmentation.ts +2 -18
  29. package/ts/monitoring/classes.metricsmanager.ts +59 -21
  30. package/ts/opsserver/handlers/remoteingress.handler.ts +2 -0
  31. package/ts/opsserver/handlers/security.handler.ts +57 -109
  32. package/ts/radius/classes.radius.server.ts +54 -80
  33. package/ts/remoteingress/classes.remoteingress-manager.ts +12 -21
  34. package/ts_web/00_commitinfo_data.ts +1 -1
  35. package/ts_web/appstate.ts +4 -0
  36. package/ts_web/elements/network/ops-view-remoteingress.ts +57 -1
  37. package/ts_web/elements/overview/ops-view-config.ts +10 -0
@@ -1,6 +1,5 @@
1
1
  import * as plugins from '../../plugins.js';
2
2
  import * as interfaces from '../../../dist_ts_interfaces/index.js';
3
- import { MetricsManager } from '../../monitoring/index.js';
4
3
  import { requireOpsAuth } from '../helpers/auth.js';
5
4
  export class SecurityHandler {
6
5
  opsServerRef;
@@ -35,18 +34,7 @@ export class SecurityHandler {
35
34
  // Active Connections Handler
36
35
  router.addTypedHandler(new plugins.typedrequest.TypedHandler('getActiveConnections', async (dataArg, toolsArg) => {
37
36
  await requireOpsAuth(this.opsServerRef, dataArg, { scope: 'stats:read' });
38
- const connections = await this.getActiveConnections(dataArg.protocol, dataArg.state);
39
- const connectionInfos = connections.map(conn => ({
40
- id: conn.id,
41
- remoteAddress: conn.source.ip,
42
- localAddress: conn.destination.ip,
43
- startTime: conn.startTime,
44
- protocol: conn.type === 'http' ? 'https' : conn.type,
45
- state: conn.status === 'active' ? 'connected' : conn.status,
46
- bytesReceived: conn._throughputIn || 0,
47
- bytesSent: conn._throughputOut || 0,
48
- connectionCount: conn.bytesTransferred || 1,
49
- }));
37
+ const connectionInfos = await this.getActiveConnections(dataArg.protocol, dataArg.state);
50
38
  const totalConnections = connectionInfos.reduce((sum, conn) => sum + (conn.connectionCount || 1), 0);
51
39
  const summary = {
52
40
  total: totalConnections,
@@ -265,69 +253,58 @@ export class SecurityHandler {
265
253
  };
266
254
  }
267
255
  async getActiveConnections(protocol, state) {
268
- const connections = [];
269
- // Get connection info and network stats from MetricsManager if available
270
- if (this.opsServerRef.dcRouterRef.metricsManager) {
271
- const connectionInfo = await this.opsServerRef.dcRouterRef.metricsManager.getConnectionInfo();
272
- const networkStats = await this.opsServerRef.dcRouterRef.metricsManager.getNetworkStats();
273
- // One aggregate row per IP with real throughput data
274
- if (networkStats.connectionsByIP && networkStats.connectionsByIP.size > 0) {
275
- let connIndex = 0;
276
- const publicIp = this.opsServerRef.dcRouterRef.options.publicIp || 'server';
277
- for (const [ip, count] of networkStats.connectionsByIP) {
278
- const tp = networkStats.throughputByIP?.get(ip);
279
- connections.push({
280
- id: `ip-${connIndex++}`,
281
- type: 'http',
282
- source: {
283
- ip: ip,
284
- port: 0,
285
- },
286
- destination: {
287
- ip: publicIp,
288
- port: 443,
289
- service: 'proxy',
290
- },
291
- startTime: 0,
292
- bytesTransferred: count, // Store connection count here
293
- status: 'active',
294
- // Attach real throughput for the handler mapping
295
- ...(tp ? { _throughputIn: tp.in, _throughputOut: tp.out } : {}),
296
- });
297
- }
256
+ const metricsManager = this.opsServerRef.dcRouterRef.metricsManager;
257
+ if (!metricsManager) {
258
+ return [];
259
+ }
260
+ const snapshots = await metricsManager.getActiveConnectionSnapshots({ limit: 10000 });
261
+ const connections = snapshots.map((snapshot) => ({
262
+ id: String(snapshot.id),
263
+ remoteAddress: snapshot.sourcePort === null
264
+ ? snapshot.sourceIp
265
+ : `${snapshot.sourceIp}:${snapshot.sourcePort}`,
266
+ localAddress: snapshot.targetHost
267
+ ? `${snapshot.targetHost}:${snapshot.targetPort ?? snapshot.localPort}`
268
+ : `${this.opsServerRef.dcRouterRef.options.publicIp || 'server'}:${snapshot.localPort}`,
269
+ startTime: snapshot.startedAtMs,
270
+ protocol: this.mapSnapshotProtocol(snapshot),
271
+ state: this.mapSnapshotState(snapshot.state),
272
+ bytesReceived: snapshot.bytesIn,
273
+ bytesSent: snapshot.bytesOut,
274
+ }));
275
+ return connections.filter((connection) => {
276
+ if (protocol && connection.protocol !== protocol) {
277
+ return false;
298
278
  }
299
- else if (connectionInfo.length > 0) {
300
- // Fallback to route-based connection info if no IP data available
301
- connectionInfo.forEach((info, index) => {
302
- connections.push({
303
- id: `conn-${index}`,
304
- type: 'http',
305
- source: {
306
- ip: 'unknown',
307
- port: 0,
308
- },
309
- destination: {
310
- ip: this.opsServerRef.dcRouterRef.options.publicIp || 'server',
311
- port: 443,
312
- service: info.source,
313
- },
314
- startTime: info.lastActivity.getTime(),
315
- bytesTransferred: 0,
316
- status: 'active',
317
- });
318
- });
279
+ if (state && connection.state !== state) {
280
+ return false;
319
281
  }
282
+ return true;
283
+ });
284
+ }
285
+ mapSnapshotProtocol(snapshot) {
286
+ if (snapshot.localPort === 465) {
287
+ return 'smtps';
320
288
  }
321
- // Filter by protocol if specified
322
- if (protocol) {
323
- return connections.filter(conn => {
324
- if (protocol === 'https' || protocol === 'http') {
325
- return conn.type === 'http';
326
- }
327
- return conn.type === protocol.replace('s', ''); // smtp/smtps -> smtp
328
- });
289
+ if ([25, 587, 2525].includes(snapshot.localPort)) {
290
+ return 'smtp';
329
291
  }
330
- return connections;
292
+ switch (snapshot.protocol) {
293
+ case 'http':
294
+ return 'http';
295
+ case 'https':
296
+ case 'tls':
297
+ case 'tls-passthrough':
298
+ case 'tls-reencrypt':
299
+ case 'tls-socket-handler':
300
+ case 'quic':
301
+ return 'https';
302
+ default:
303
+ return snapshot.localPort === 80 ? 'http' : 'https';
304
+ }
305
+ }
306
+ mapSnapshotState(state) {
307
+ return state === 'closing' ? 'closing' : 'connected';
331
308
  }
332
309
  async getRateLimitStatus(domain, ip) {
333
310
  // TODO: Implement actual rate limit status collection
@@ -336,4 +313,4 @@ export class SecurityHandler {
336
313
  };
337
314
  }
338
315
  }
339
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"security.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/security.handler.ts"],"names":[],"mappings":"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"}
316
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"security.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/security.handler.ts"],"names":[],"mappings":"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"}
@@ -84,7 +84,6 @@ export declare class RadiusServer {
84
84
  private vlanManager;
85
85
  private accountingManager;
86
86
  private config;
87
- private clientSecrets;
88
87
  private running;
89
88
  private stats;
90
89
  constructor(config: IRadiusServerConfig);
@@ -124,10 +123,6 @@ export declare class RadiusServer {
124
123
  * Build client secrets map from configuration
125
124
  */
126
125
  private buildClientSecretsMap;
127
- /**
128
- * Get default secret for unknown clients
129
- */
130
- private getDefaultSecret;
131
126
  /**
132
127
  * Add a RADIUS client
133
128
  */
@@ -14,7 +14,6 @@ export class RadiusServer {
14
14
  vlanManager;
15
15
  accountingManager;
16
16
  config;
17
- clientSecrets = new Map();
18
17
  running = false;
19
18
  // Statistics
20
19
  stats = {
@@ -52,21 +51,16 @@ export class RadiusServer {
52
51
  if (this.config.vlanAssignment?.mappings) {
53
52
  await this.vlanManager.importMappings(this.config.vlanAssignment.mappings);
54
53
  }
55
- // Build client secrets map
56
- this.buildClientSecretsMap();
54
+ const cidrSecrets = this.buildClientSecretsMap();
57
55
  // Create the RADIUS server
58
56
  this.radiusServer = new plugins.smartradius.RadiusServer({
59
57
  authPort: this.config.authPort,
60
58
  acctPort: this.config.acctPort,
61
59
  bindAddress: this.config.bindAddress,
62
- defaultSecret: this.getDefaultSecret(),
60
+ cidrSecrets,
63
61
  authenticationHandler: this.handleAuthentication.bind(this),
64
62
  accountingHandler: this.handleAccounting.bind(this),
65
63
  });
66
- // Configure per-client secrets
67
- for (const [ip, secret] of this.clientSecrets) {
68
- this.radiusServer.setClientSecret(ip, secret);
69
- }
70
64
  // Start the server
71
65
  await this.radiusServer.start();
72
66
  this.running = true;
@@ -95,15 +89,16 @@ export class RadiusServer {
95
89
  async handleAuthentication(request) {
96
90
  this.stats.authRequests++;
97
91
  const authData = {
98
- username: request.attributes?.UserName || '',
99
- password: request.attributes?.UserPassword,
100
- nasIpAddress: request.attributes?.NasIpAddress || request.source?.address || '',
101
- nasPort: request.attributes?.NasPort,
102
- nasPortType: request.attributes?.NasPortType,
103
- nasIdentifier: request.attributes?.NasIdentifier,
104
- calledStationId: request.attributes?.CalledStationId,
105
- callingStationId: request.attributes?.CallingStationId,
106
- serviceType: request.attributes?.ServiceType,
92
+ username: request.username || '',
93
+ password: request.password,
94
+ nasIpAddress: request.nasIpAddress || request.clientAddress || '',
95
+ nasPort: request.nasPort,
96
+ nasPortType: request.nasPortType !== undefined ? String(request.nasPortType) : undefined,
97
+ nasIdentifier: request.nasIdentifier,
98
+ calledStationId: request.calledStationId,
99
+ callingStationId: request.callingStationId,
100
+ serviceType: request.serviceType !== undefined ? String(request.serviceType) : undefined,
101
+ framedMtu: request.framedMtu,
107
102
  };
108
103
  logger.log('debug', `RADIUS Auth Request: user=${authData.username}, NAS=${authData.nasIpAddress}`);
109
104
  // Perform MAC Authentication Bypass (MAB)
@@ -119,8 +114,8 @@ export class RadiusServer {
119
114
  };
120
115
  // Add VLAN attributes if assigned
121
116
  if (result.vlanId !== undefined) {
122
- response.tunnelType = 13; // VLAN
123
- response.tunnelMediumType = 6; // IEEE 802
117
+ response.tunnelType = plugins.smartradius.ETunnelType.Vlan;
118
+ response.tunnelMediumType = plugins.smartradius.ETunnelMediumType.Ieee802;
124
119
  response.tunnelPrivateGroupId = String(result.vlanId);
125
120
  }
126
121
  // Add session timeout if specified
@@ -153,27 +148,28 @@ export class RadiusServer {
153
148
  this.stats.accountingRequests++;
154
149
  if (!this.config.accounting?.enabled) {
155
150
  // Still respond even if not tracking
156
- return { code: plugins.smartradius.ERadiusCode.AccountingResponse };
151
+ return { success: true };
157
152
  }
158
- const statusType = request.attributes?.AcctStatusType;
159
- const sessionId = request.attributes?.AcctSessionId || '';
153
+ const statusType = request.statusType;
154
+ const sessionId = request.sessionId || '';
160
155
  const accountingData = {
161
156
  sessionId,
162
- username: request.attributes?.UserName || '',
163
- macAddress: request.attributes?.CallingStationId,
164
- nasIpAddress: request.attributes?.NasIpAddress || request.source?.address || '',
165
- nasPort: request.attributes?.NasPort,
166
- nasPortType: request.attributes?.NasPortType,
167
- nasIdentifier: request.attributes?.NasIdentifier,
168
- calledStationId: request.attributes?.CalledStationId,
169
- callingStationId: request.attributes?.CallingStationId,
170
- inputOctets: request.attributes?.AcctInputOctets,
171
- outputOctets: request.attributes?.AcctOutputOctets,
172
- inputPackets: request.attributes?.AcctInputPackets,
173
- outputPackets: request.attributes?.AcctOutputPackets,
174
- sessionTime: request.attributes?.AcctSessionTime,
175
- terminateCause: request.attributes?.AcctTerminateCause,
176
- serviceType: request.attributes?.ServiceType,
157
+ username: request.username || '',
158
+ macAddress: request.callingStationId,
159
+ nasIpAddress: request.nasIpAddress || request.clientAddress || '',
160
+ nasPort: request.nasPort,
161
+ nasPortType: request.nasPortType !== undefined ? String(request.nasPortType) : undefined,
162
+ nasIdentifier: request.nasIdentifier,
163
+ calledStationId: request.calledStationId,
164
+ callingStationId: request.callingStationId,
165
+ inputOctets: request.inputOctets,
166
+ outputOctets: request.outputOctets,
167
+ inputPackets: request.inputPackets,
168
+ outputPackets: request.outputPackets,
169
+ sessionTime: request.sessionTime,
170
+ terminateCause: request.terminateCause !== undefined ? String(request.terminateCause) : undefined,
171
+ framedIpAddress: request.framedIpAddress,
172
+ serviceType: request.serviceType !== undefined ? String(request.serviceType) : undefined,
177
173
  };
178
174
  try {
179
175
  switch (statusType) {
@@ -196,7 +192,7 @@ export class RadiusServer {
196
192
  catch (error) {
197
193
  logger.log('error', `RADIUS accounting error: ${error.message}`);
198
194
  }
199
- return { code: plugins.smartradius.ERadiusCode.AccountingResponse };
195
+ return { success: true };
200
196
  }
201
197
  /**
202
198
  * Perform MAC Authentication Bypass
@@ -264,34 +260,14 @@ export class RadiusServer {
264
260
  * Build client secrets map from configuration
265
261
  */
266
262
  buildClientSecretsMap() {
267
- this.clientSecrets.clear();
263
+ const cidrSecrets = {};
268
264
  for (const client of this.config.clients) {
269
265
  if (!client.enabled) {
270
266
  continue;
271
267
  }
272
- // Handle CIDR ranges
273
- if (client.ipRange.includes('/')) {
274
- // For CIDR ranges, we'll use the network address as key
275
- // In practice, smartradius may handle this differently
276
- const [network] = client.ipRange.split('/');
277
- this.clientSecrets.set(network, client.secret);
278
- }
279
- else {
280
- this.clientSecrets.set(client.ipRange, client.secret);
281
- }
282
- }
283
- }
284
- /**
285
- * Get default secret for unknown clients
286
- */
287
- getDefaultSecret() {
288
- // Use first enabled client's secret as default, or a random one
289
- for (const client of this.config.clients) {
290
- if (client.enabled) {
291
- return client.secret;
292
- }
268
+ cidrSecrets[client.ipRange] = client.secret;
293
269
  }
294
- return plugins.crypto.randomBytes(16).toString('hex');
270
+ return cidrSecrets;
295
271
  }
296
272
  /**
297
273
  * Add a RADIUS client
@@ -299,22 +275,19 @@ export class RadiusServer {
299
275
  async addClient(client) {
300
276
  // Check if client already exists
301
277
  const existingIndex = this.config.clients.findIndex(c => c.name === client.name);
278
+ const previousClient = existingIndex >= 0 ? this.config.clients[existingIndex] : undefined;
302
279
  if (existingIndex >= 0) {
303
280
  this.config.clients[existingIndex] = client;
304
281
  }
305
282
  else {
306
283
  this.config.clients.push(client);
307
284
  }
308
- // Update client secrets if running
309
- if (this.running && this.radiusServer && client.enabled) {
310
- if (client.ipRange.includes('/')) {
311
- const [network] = client.ipRange.split('/');
312
- this.radiusServer.setClientSecret(network, client.secret);
313
- this.clientSecrets.set(network, client.secret);
285
+ if (this.running && this.radiusServer) {
286
+ if (previousClient) {
287
+ this.radiusServer.removeNetworkSecret(previousClient.ipRange);
314
288
  }
315
- else {
316
- this.radiusServer.setClientSecret(client.ipRange, client.secret);
317
- this.clientSecrets.set(client.ipRange, client.secret);
289
+ if (client.enabled) {
290
+ this.radiusServer.setNetworkSecret(client.ipRange, client.secret);
318
291
  }
319
292
  }
320
293
  logger.log('info', `RADIUS client ${client.enabled ? 'added' : 'disabled'}: ${client.name} (${client.ipRange})`);
@@ -327,13 +300,8 @@ export class RadiusServer {
327
300
  if (index >= 0) {
328
301
  const client = this.config.clients[index];
329
302
  this.config.clients.splice(index, 1);
330
- // Remove from secrets map
331
- if (client.ipRange.includes('/')) {
332
- const [network] = client.ipRange.split('/');
333
- this.clientSecrets.delete(network);
334
- }
335
- else {
336
- this.clientSecrets.delete(client.ipRange);
303
+ if (this.radiusServer) {
304
+ this.radiusServer.removeNetworkSecret(client.ipRange);
337
305
  }
338
306
  logger.log('info', `RADIUS client removed: ${name}`);
339
307
  return true;
@@ -381,4 +349,4 @@ export class RadiusServer {
381
349
  return this.running;
382
350
  }
383
351
  }
384
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.radius.server.js","sourceRoot":"","sources":["../../../ts/radius/classes.radius.server.ts"],"names":[],"mappings":"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"}
352
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.radius.server.js","sourceRoot":"","sources":["../../../ts/radius/classes.radius.server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,WAAW,EAAiD,MAAM,2BAA2B,CAAC;AACvG,OAAO,EAAE,iBAAiB,EAA0D,MAAM,iCAAiC,CAAC;AA8E5H;;;;;;GAMG;AACH,MAAM,OAAO,YAAY;IACf,YAAY,CAAoC;IAChD,WAAW,CAAc;IACzB,iBAAiB,CAAoB;IACrC,MAAM,CAAsB;IAC5B,OAAO,GAAY,KAAK,CAAC;IAEjC,aAAa;IACL,KAAK,GAAG;QACd,YAAY,EAAE,CAAC;QACf,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;QACd,kBAAkB,EAAE,CAAC;QACrB,SAAS,EAAE,CAAC;KACb,CAAC;IAEF,YAAY,MAA2B;QACrC,IAAI,CAAC,MAAM,GAAG;YACZ,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI;YACjC,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,SAAS;YAC5C,GAAG,MAAM;SACV,CAAC;QAEF,0BAA0B;QAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAE1D,gCAAgC;QAChC,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,eAAe,IAAI,CAAC,MAAM,CAAC,QAAQ,SAAS,CAAC,CAAC;QAE7I,sBAAsB;QACtB,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;QAE1C,0CAA0C;QAC1C,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,EAAE,CAAC;YACzC,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAEjD,2BAA2B;QAC3B,IAAI,CAAC,YAAY,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC;YACvD,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,WAAW;YACX,qBAAqB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;YAC3D,iBAAiB,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;SACpD,CAAC,CAAC;QAEH,mBAAmB;QACnB,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAEhC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAElC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,qBAAqB,CAAC,CAAC;IACpG,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;QAEhD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YAC/B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAChC,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,oBAAoB,CAChC,OAAmD;QAEnD,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QAE1B,MAAM,QAAQ,GAAqB;YACjC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,aAAa,IAAI,EAAE;YACjE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;YACxF,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,WAAW,EAAE,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;YACxF,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC;QAEF,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,6BAA6B,QAAQ,CAAC,QAAQ,SAAS,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;QAEpG,0CAA0C;QAC1C,oDAAoD;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QAE7D,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,QAAQ,CAAC,QAAQ,UAAU,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAE3F,sCAAsC;YACtC,MAAM,QAAQ,GAAgD;gBAC5D,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,YAAY;gBAClD,YAAY,EAAE,MAAM,CAAC,YAAY;aAClC,CAAC;YAEF,kCAAkC;YAClC,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAChC,QAAQ,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC3D,QAAQ,CAAC,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC;gBAC1E,QAAQ,CAAC,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACxD,CAAC;YAED,mCAAmC;YACnC,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;gBAC1B,QAAQ,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;YAClD,CAAC;YAED,gCAAgC;YAChC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACvB,QAAQ,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;YAC5C,CAAC;YAED,6BAA6B;YAC7B,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC3B,QAAQ,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;YACpD,CAAC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,QAAQ,CAAC,QAAQ,YAAY,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;YAEnG,OAAO;gBACL,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,YAAY;gBAClD,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,eAAe;aACrD,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,gBAAgB,CAC5B,OAA+C;QAE/C,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAEhC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC;YACrC,qCAAqC;YACrC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;QAE1C,MAAM,cAAc,GAAG;YACrB,SAAS;YACT,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;YAChC,UAAU,EAAE,OAAO,CAAC,gBAAgB;YACpC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,aAAa,IAAI,EAAE;YACjE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;YACxF,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;YACjG,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,WAAW,EAAE,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;SACzF,CAAC;QAEF,IAAI,CAAC;YACH,QAAQ,UAAU,EAAE,CAAC;gBACnB,KAAK,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK;oBAC5C,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,8BAA8B,SAAS,UAAU,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAChG,MAAM,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;oBACnE,MAAM;gBAER,KAAK,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI;oBAC3C,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,6BAA6B,SAAS,EAAE,CAAC,CAAC;oBAC9D,MAAM,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;oBAClE,MAAM;gBAER,KAAK,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa;oBACpD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,gCAAgC,SAAS,EAAE,CAAC,CAAC;oBACjE,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;oBACpE,MAAM;gBAER;oBACE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oCAAoC,UAAU,EAAE,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4BAA6B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9E,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,wBAAwB,CAAC,IAAsB;QAC3D,wDAAwD;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,sBAAsB;aACrC,CAAC;QACJ,CAAC;QAED,0BAA0B;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAE3D,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACzB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,qBAAqB;aACpC,CAAC;QACJ,CAAC;QAED,0BAA0B;QAC1B,MAAM,MAAM,GAAsB;YAChC,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,UAAU,CAAC,IAAI;YACvB,YAAY,EAAE,UAAU,CAAC,SAAS;gBAChC,CAAC,CAAC,4BAA4B,UAAU,CAAC,IAAI,EAAE;gBAC/C,CAAC,CAAC,oBAAoB,UAAU,CAAC,IAAI,EAAE;SAC1C,CAAC;QAEF,sDAAsD;QACtD,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;YAC3B,4DAA4D;QAC9D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,IAAsB;QAC9C,mDAAmD;QACnD,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAClD,CAAC;QAED,0CAA0C;QAC1C,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtD,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACK,YAAY,CAAC,KAAa;QAChC,4CAA4C;QAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC7C,OAAO,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACK,YAAY,CAAC,GAAW;QAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED;;OAEG;IACK,qBAAqB;QAC3B,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,SAAS;YACX,CAAC;YAED,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QAC9C,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS,CAAC,MAAqB;QACnC,iCAAiC;QACjC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;QACjF,MAAM,cAAc,GAAG,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3F,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,IAAI,cAAc,EAAE,CAAC;gBACnB,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAChE,CAAC;YACD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,KAAK,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC;IACnH,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,IAAY;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAClE,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAErC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACxD,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,IAAI,EAAE,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,oBAAoB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,QAAQ;QAWN,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC5D,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;YACrC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;YACnC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;YACnC,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB;YACjD,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,cAAc;YAChE,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,aAAa;YACvD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM;SAC3D,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF"}
@@ -1,4 +1,4 @@
1
- import type { IRemoteIngress, IDcRouterRouteConfig } from '../../dist_ts_interfaces/data/remoteingress.js';
1
+ import type { IRemoteIngress, IRemoteIngressPerformanceConfig, IDcRouterRouteConfig } from '../../dist_ts_interfaces/data/remoteingress.js';
2
2
  interface IRemoteIngressFirewallConfig {
3
3
  blockedIps?: string[];
4
4
  }
@@ -56,7 +56,7 @@ export declare class RemoteIngressManager {
56
56
  /**
57
57
  * Create a new edge registration.
58
58
  */
59
- createEdge(name: string, listenPorts?: number[], tags?: string[], autoDerivePorts?: boolean): Promise<IRemoteIngress>;
59
+ createEdge(name: string, listenPorts?: number[], tags?: string[], autoDerivePorts?: boolean, performance?: IRemoteIngressPerformanceConfig): Promise<IRemoteIngress>;
60
60
  /**
61
61
  * Get an edge by ID.
62
62
  */
@@ -73,6 +73,7 @@ export declare class RemoteIngressManager {
73
73
  listenPorts?: number[];
74
74
  autoDerivePorts?: boolean;
75
75
  enabled?: boolean;
76
+ performance?: IRemoteIngressPerformanceConfig;
76
77
  tags?: string[];
77
78
  }): Promise<IRemoteIngress | null>;
78
79
  /**
@@ -97,6 +98,7 @@ export declare class RemoteIngressManager {
97
98
  listenPorts: number[];
98
99
  listenPortsUdp?: number[];
99
100
  firewallConfig?: IRemoteIngressFirewallConfig;
101
+ performance?: IRemoteIngressPerformanceConfig;
100
102
  }>;
101
103
  }
102
104
  export {};