@serve.zone/remoteingress 4.15.3 → 4.17.1

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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/remoteingress',
6
- version: '4.15.3',
6
+ version: '4.17.1',
7
7
  description: 'Edge ingress tunnel for DcRouter - tunnels TCP and UDP traffic from the network edge to SmartProxy over TLS or QUIC, preserving client IP via PROXY protocol.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSwyQkFBMkI7SUFDakMsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLCtKQUErSjtDQUM3SyxDQUFBIn0=
@@ -16,6 +16,7 @@ export declare class RemoteIngressEdge extends EventEmitter {
16
16
  private restartAttempts;
17
17
  private statusInterval;
18
18
  private nft;
19
+ private pendingFirewallConfig;
19
20
  constructor();
20
21
  /**
21
22
  * Initialize the nftables manager. Fails gracefully if not running as root.
@@ -12,6 +12,7 @@ export class RemoteIngressEdge extends EventEmitter {
12
12
  this.restartBackoffMs = 1000;
13
13
  this.restartAttempts = 0;
14
14
  this.nft = null;
15
+ this.pendingFirewallConfig = null;
15
16
  /**
16
17
  * Handle unexpected Rust binary crash — auto-restart with backoff.
17
18
  */
@@ -40,6 +41,9 @@ export class RemoteIngressEdge extends EventEmitter {
40
41
  this.restartBackoffMs = Math.min(this.restartBackoffMs * 2, MAX_RESTART_BACKOFF_MS);
41
42
  this.restartAttempts++;
42
43
  try {
44
+ // Drop stale kernel rules before reconnecting. The hub will send the
45
+ // current full firewall snapshot during handshake/config refresh.
46
+ await this.initNft({ reset: true });
43
47
  const spawned = await this.bridge.spawn();
44
48
  if (!spawned) {
45
49
  console.error('[RemoteIngressEdge] Failed to respawn binary');
@@ -58,8 +62,6 @@ export class RemoteIngressEdge extends EventEmitter {
58
62
  this.started = true;
59
63
  this.restartAttempts = 0;
60
64
  this.restartBackoffMs = 1000;
61
- // Re-initialize nftables (hub will re-push config via handshake)
62
- await this.initNft();
63
65
  // Restart periodic status logging
64
66
  this.statusInterval = setInterval(async () => {
65
67
  try {
@@ -128,21 +130,31 @@ export class RemoteIngressEdge extends EventEmitter {
128
130
  });
129
131
  this.bridge.on('management:firewallConfigUpdated', (data) => {
130
132
  console.log(`[RemoteIngressEdge] Firewall config updated from hub`);
131
- this.applyFirewallConfig(data.firewallConfig);
133
+ void this.applyFirewallConfig(data.firewallConfig).catch((err) => {
134
+ console.error(`[RemoteIngressEdge] Failed to apply firewall config: ${err}`);
135
+ });
132
136
  this.emit('firewallConfigUpdated', data);
133
137
  });
134
138
  }
135
139
  /**
136
140
  * Initialize the nftables manager. Fails gracefully if not running as root.
137
141
  */
138
- async initNft() {
142
+ async initNft(options = {}) {
139
143
  try {
140
144
  this.nft = new plugins.smartnftables.SmartNftables({
141
145
  tableName: 'remoteingress',
142
146
  dryRun: false,
143
147
  });
148
+ if (options.reset) {
149
+ await this.nft.cleanup({ force: true });
150
+ }
144
151
  await this.nft.initialize();
145
152
  console.log('[RemoteIngressEdge] SmartNftables initialized');
153
+ if (this.pendingFirewallConfig) {
154
+ const pending = this.pendingFirewallConfig;
155
+ this.pendingFirewallConfig = null;
156
+ await this.applyFirewallConfig(pending);
157
+ }
146
158
  }
147
159
  catch (err) {
148
160
  console.warn(`[RemoteIngressEdge] Failed to initialize nftables (not root?): ${err}`);
@@ -155,17 +167,20 @@ export class RemoteIngressEdge extends EventEmitter {
155
167
  */
156
168
  async applyFirewallConfig(config) {
157
169
  if (!this.nft) {
170
+ this.pendingFirewallConfig = config;
158
171
  return;
159
172
  }
160
173
  try {
161
174
  // Full cleanup and reinitialize to replace all rules atomically
162
- await this.nft.cleanup();
175
+ await this.nft.cleanup({ force: true });
163
176
  await this.nft.initialize();
164
177
  // Apply blocked IPs
165
178
  if (config.blockedIps && config.blockedIps.length > 0) {
166
- for (const ip of config.blockedIps) {
167
- await this.nft.firewall.blockIP(ip);
168
- }
179
+ await this.nft.firewall.blockIPSet('hub-blocklist', {
180
+ setName: 'blocked_ipv4',
181
+ ips: config.blockedIps,
182
+ comment: 'RemoteIngress hub blocklist',
183
+ });
169
184
  console.log(`[RemoteIngressEdge] Blocked ${config.blockedIps.length} IPs`);
170
185
  }
171
186
  // Apply rate limits
@@ -220,6 +235,9 @@ export class RemoteIngressEdge extends EventEmitter {
220
235
  }
221
236
  this.savedConfig = edgeConfig;
222
237
  this.stopping = false;
238
+ // Clear any stale nftables state left by a prior process before the edge
239
+ // can accept hub config or bind public listener ports.
240
+ await this.initNft({ reset: true });
223
241
  const spawned = await this.bridge.spawn();
224
242
  if (!spawned) {
225
243
  throw new Error('Failed to spawn remoteingress-bin');
@@ -246,8 +264,6 @@ export class RemoteIngressEdge extends EventEmitter {
246
264
  this.started = true;
247
265
  this.restartAttempts = 0;
248
266
  this.restartBackoffMs = 1000;
249
- // Initialize nftables (graceful degradation if not root)
250
- await this.initNft();
251
267
  // Start periodic status logging
252
268
  this.statusInterval = setInterval(async () => {
253
269
  try {
@@ -273,7 +289,7 @@ export class RemoteIngressEdge extends EventEmitter {
273
289
  // Clean up nftables rules before stopping
274
290
  if (this.nft) {
275
291
  try {
276
- await this.nft.cleanup();
292
+ await this.nft.cleanup({ force: true });
277
293
  }
278
294
  catch (err) {
279
295
  console.warn(`[RemoteIngressEdge] nftables cleanup error: ${err}`);
@@ -292,6 +308,7 @@ export class RemoteIngressEdge extends EventEmitter {
292
308
  this.started = false;
293
309
  }
294
310
  this.savedConfig = null;
311
+ this.pendingFirewallConfig = null;
295
312
  // Remove all listeners to prevent memory buildup
296
313
  this.bridge.removeAllListeners();
297
314
  this.removeAllListeners();
@@ -309,4 +326,4 @@ export class RemoteIngressEdge extends EventEmitter {
309
326
  return this.bridge.running;
310
327
  }
311
328
  }
312
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingressedge.js","sourceRoot":"","sources":["../ts/classes.remoteingressedge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AA6C3D,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAChC,MAAM,sBAAsB,GAAG,MAAM,CAAC;AAEtC,MAAM,OAAO,iBAAkB,SAAQ,YAAY;IAUjD;QACE,KAAK,EAAE,CAAC;QATF,YAAO,GAAG,KAAK,CAAC;QAChB,aAAQ,GAAG,KAAK,CAAC;QACjB,gBAAW,GAAuB,IAAI,CAAC;QACvC,qBAAgB,GAAG,IAAI,CAAC;QACxB,oBAAe,GAAG,CAAC,CAAC;QAEpB,QAAG,GAAoE,IAAI,CAAC;QA4PpF;;WAEG;QACK,wBAAmB,GAAG,KAAK,EAAE,IAAmB,EAAE,MAAqB,EAAE,EAAE;YACjF,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACxD,OAAO;YACT,CAAC;YAED,OAAO,CAAC,KAAK,CACX,iDAAiD,IAAI,YAAY,MAAM,KAAK;gBAC5E,WAAW,IAAI,CAAC,eAAe,GAAG,CAAC,IAAI,oBAAoB,EAAE,CAC9D,CAAC;YAEF,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YAErB,mDAAmD;YACnD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBACnC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;YAClC,CAAC;YAED,IAAI,IAAI,CAAC,eAAe,IAAI,oBAAoB,EAAE,CAAC;gBACjD,OAAO,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;gBAC7E,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACjC,OAAO;YACT,CAAC;YAED,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACzE,uEAAuE;YACvE,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACvC,OAAO;YACT,CAAC;YACD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,EAAE,sBAAsB,CAAC,CAAC;YACpF,IAAI,CAAC,eAAe,EAAE,CAAC;YAEvB,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;oBAC9D,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBAC7D,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBAEjD,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE;oBACzC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO;oBACjC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,IAAI;oBACzC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;oBAC/B,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;oBAC/B,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACtF,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC7F,CAAC,CAAC;gBAEH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;gBACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAE7B,iEAAiE;gBACjE,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBAErB,kCAAkC;gBAClC,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;oBAC3C,IAAI,CAAC;wBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;wBACtC,OAAO,CAAC,GAAG,CACT,yCAAyC,MAAM,CAAC,SAAS,IAAI;4BAC7D,WAAW,MAAM,CAAC,aAAa,YAAY,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK;4BAC5E,YAAY,MAAM,CAAC,QAAQ,IAAI,SAAS,EAAE,CAC3C,CAAC;oBACJ,CAAC;oBAAC,MAAM,CAAC;wBACP,8BAA8B;oBAChC,CAAC;gBACH,CAAC,EAAE,MAAM,CAAC,CAAC;gBAEX,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;gBACrE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC9B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,8CAA8C,GAAG,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC,CAAC;QAvUA,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CACrC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,EACvD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,UAAU,CAAgB;YAC5D,UAAU,EAAE,mBAAmB;YAC/B,OAAO,EAAE,CAAC,cAAc,CAAC;YACzB,gBAAgB,EAAE,MAAM;YACxB,cAAc,EAAE,MAAM;YACtB,UAAU,EAAE;gBACV,qDAAqD;gBACrD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,qBAAqB,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACxK,yCAAyC;gBACzC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,mBAAmB,CAAC;gBAC/D,yDAAyD;gBACzD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,mBAAmB,CAAC;gBAC/E,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,CAAC;aAC9E;YACD,gBAAgB,EAAE,KAAK;YACvB,MAAM,EAAE;gBACN,GAAG,EAAE,CAAC,KAAa,EAAE,OAAe,EAAE,EAAE;oBACtC,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;wBACtB,OAAO,CAAC,KAAK,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;oBAClD,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,GAAG,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;oBAChD,CAAC;gBACH,CAAC;aACF;SACF,CAAC,CAAC;QAEH,kCAAkC;QAClC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YAChD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,+BAA+B,EAAE,CAAC,IAAyB,EAAE,EAAE;YAC5E,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,SAAS,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,4CAA4C,MAAM,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,+BAA+B,EAAE,CAAC,IAAoB,EAAE,EAAE;YACvE,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,0BAA0B,EAAE,CAAC,IAA+B,EAAE,EAAE;YAC7E,OAAO,CAAC,GAAG,CAAC,8CAA8C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzF,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,yBAAyB,EAAE,CAAC,IAA+B,EAAE,EAAE;YAC5E,OAAO,CAAC,GAAG,CAAC,6CAA6C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACxF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,kCAAkC,EAAE,CAAC,IAAyC,EAAE,EAAE;YAC/F,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;YACpE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,OAAO;QACnB,IAAI,CAAC;YACH,IAAI,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC;gBACjD,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,kEAAkE,GAAG,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QAClB,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,mBAAmB,CAAC,MAAuB;QACvD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,gEAAgE;YAChE,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAE5B,oBAAoB;YACpB,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtD,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;oBACnC,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBACtC,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,+BAA+B,MAAM,CAAC,UAAU,CAAC,MAAM,MAAM,CAAC,CAAC;YAC7E,CAAC;YAED,oBAAoB;YACpB,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtD,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;oBACnC,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE;wBAC3C,IAAI,EAAE,EAAE,CAAC,IAAI;wBACb,QAAQ,EAAE,EAAE,CAAC,QAAQ;wBACrB,IAAI,EAAE,EAAE,CAAC,IAAI;wBACb,KAAK,EAAE,EAAE,CAAC,KAAK;wBACf,WAAW,EAAE,EAAE,CAAC,WAAW;qBAC5B,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,+BAA+B,MAAM,CAAC,UAAU,CAAC,MAAM,cAAc,CAAC,CAAC;YACrF,CAAC;YAED,uBAAuB;YACvB,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBAChC,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE;wBACvC,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;qBACtB,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,+BAA+B,MAAM,CAAC,KAAK,CAAC,MAAM,iBAAiB,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,wDAAwD,GAAG,EAAE,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,KAAK,CAAC,MAAuC;QACxD,IAAI,UAAuB,CAAC;QAE5B,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACpD,UAAU,GAAG;gBACX,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,MAAM,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QAEtB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QAED,qEAAqE;QACrE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAEjD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE;gBACzC,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,IAAI;gBACnC,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1E,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACjF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,qDAAqD;YACrD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,GAAG,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAE7B,yDAAyD;QACzD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,gCAAgC;QAChC,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;YAC3C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;gBACtC,OAAO,CAAC,GAAG,CACT,yCAAyC,MAAM,CAAC,SAAS,IAAI;oBAC7D,WAAW,MAAM,CAAC,aAAa,YAAY,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK;oBAC5E,YAAY,MAAM,CAAC,QAAQ,IAAI,SAAS,EAAE,CAC3C,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,8BAA8B;YAChC,CAAC;QACH,CAAC,EAAE,MAAM,CAAC,CAAC;IACb,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAClC,CAAC;QACD,0CAA0C;QAC1C,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,+CAA+C,GAAG,EAAE,CAAC,CAAC;YACrE,CAAC;YACD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QAClB,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,EAA2B,CAAC,CAAC;YACzE,CAAC;YAAC,MAAM,CAAC;gBACP,8BAA8B;YAChC,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,iDAAiD;QACjD,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACjC,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,SAAS;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,EAA2B,CAAC,CAAC;IAC/E,CAAC;IAED;;OAEG;IACH,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;CAmFF"}
329
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingressedge.js","sourceRoot":"","sources":["../ts/classes.remoteingressedge.ts"],"names":[],"mappings":"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"}
@@ -28,6 +28,51 @@ export interface IHubConfig {
28
28
  certPem?: string;
29
29
  keyPem?: string;
30
30
  };
31
+ performance?: IPerformanceConfig;
32
+ }
33
+ export type TPerformanceProfile = 'balanced' | 'throughput' | 'highConcurrency';
34
+ export interface IPerformanceConfig {
35
+ profile?: TPerformanceProfile;
36
+ maxStreamsPerEdge?: number;
37
+ totalWindowBudgetBytes?: number;
38
+ minStreamWindowBytes?: number;
39
+ maxStreamWindowBytes?: number;
40
+ sustainedStreamWindowBytes?: number;
41
+ quicDatagramReceiveBufferBytes?: number;
42
+ }
43
+ export interface IEffectivePerformanceConfig {
44
+ profile: TPerformanceProfile;
45
+ maxStreamsPerEdge: number;
46
+ totalWindowBudgetBytes: number;
47
+ minStreamWindowBytes: number;
48
+ maxStreamWindowBytes: number;
49
+ sustainedStreamWindowBytes: number;
50
+ quicDatagramReceiveBufferBytes: number;
51
+ }
52
+ export interface IFlowControlStatus {
53
+ applies: boolean;
54
+ currentWindowBytes: number;
55
+ minWindowBytes: number;
56
+ maxWindowBytes: number;
57
+ totalWindowBudgetBytes: number;
58
+ estimatedInFlightBytes: number;
59
+ stalledStreams: number;
60
+ }
61
+ export interface IQueueStatus {
62
+ ctrlQueueDepth: number;
63
+ dataQueueDepth: number;
64
+ sustainedQueueDepth: number;
65
+ }
66
+ export interface ITrafficStatus {
67
+ bytesIn: number;
68
+ bytesOut: number;
69
+ streamsOpenedTotal: number;
70
+ streamsClosedTotal: number;
71
+ rejectedStreams: number;
72
+ }
73
+ export interface IUdpStatus {
74
+ activeSessions: number;
75
+ droppedDatagrams: number;
31
76
  }
32
77
  type TAllowedEdge = {
33
78
  id: string;
@@ -36,6 +81,7 @@ type TAllowedEdge = {
36
81
  listenPortsUdp?: number[];
37
82
  stunIntervalSecs?: number;
38
83
  firewallConfig?: IFirewallConfig;
84
+ performance?: IPerformanceConfig;
39
85
  };
40
86
  export declare class RemoteIngressHub extends EventEmitter {
41
87
  private bridge;
@@ -69,6 +115,13 @@ export declare class RemoteIngressHub extends EventEmitter {
69
115
  connectedAt: number;
70
116
  activeStreams: number;
71
117
  peerAddr: string;
118
+ transportMode: "tcpTls" | "quic" | "quicWithFallback";
119
+ fallbackUsed: boolean;
120
+ performance: IEffectivePerformanceConfig;
121
+ flowControl: IFlowControlStatus;
122
+ queues: IQueueStatus;
123
+ traffic: ITrafficStatus;
124
+ udp: IUdpStatus;
72
125
  }>;
73
126
  }>;
74
127
  /**
@@ -48,6 +48,7 @@ export class RemoteIngressHub extends EventEmitter {
48
48
  ...(config.tls?.certPem && config.tls?.keyPem
49
49
  ? { tlsCertPem: config.tls.certPem, tlsKeyPem: config.tls.keyPem }
50
50
  : {}),
51
+ ...(config.performance ? { performance: config.performance } : {}),
51
52
  });
52
53
  // Restore allowed edges
53
54
  if (this.savedEdges.length > 0) {
@@ -123,6 +124,7 @@ export class RemoteIngressHub extends EventEmitter {
123
124
  await this.bridge.sendCommand('startHub', {
124
125
  tunnelPort: config.tunnelPort ?? 8443,
125
126
  targetHost: config.targetHost ?? '127.0.0.1',
127
+ ...(config.performance ? { performance: config.performance } : {}),
126
128
  ...(config.tls?.certPem && config.tls?.keyPem
127
129
  ? { tlsCertPem: config.tls.certPem, tlsKeyPem: config.tls.keyPem }
128
130
  : {}),
@@ -180,4 +182,4 @@ export class RemoteIngressHub extends EventEmitter {
180
182
  return this.bridge.running;
181
183
  }
182
184
  }
183
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingresshub.js","sourceRoot":"","sources":["../ts/classes.remoteingresshub.ts"],"names":[],"mappings":"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"}
185
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingresshub.js","sourceRoot":"","sources":["../ts/classes.remoteingresshub.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@serve.zone/remoteingress",
3
- "version": "4.15.3",
3
+ "version": "4.17.1",
4
4
  "private": false,
5
5
  "description": "Edge ingress tunnel for DcRouter - tunnels TCP and UDP traffic from the network edge to SmartProxy over TLS or QUIC, preserving client IP via PROXY protocol.",
6
6
  "main": "dist_ts/index.js",
@@ -24,7 +24,7 @@
24
24
  },
25
25
  "dependencies": {
26
26
  "@push.rocks/qenv": "^6.1.3",
27
- "@push.rocks/smartnftables": "^1.0.1",
27
+ "@push.rocks/smartnftables": "^1.2.0",
28
28
  "@push.rocks/smartrust": "^1.3.2"
29
29
  },
30
30
  "repository": {
package/readme.md CHANGED
@@ -130,7 +130,7 @@ await hub.stop();
130
130
 
131
131
  ### Setting Up the Edge (Network Edge Side)
132
132
 
133
- The edge can connect via **TCP+TLS** (default) or **QUIC** transport. Edges run as **root** so they can bind to privileged ports and apply nftables firewall rules.
133
+ The edge connects via **QUIC with TCP+TLS fallback** by default. Edges run as **root** so they can bind to privileged ports and apply nftables firewall rules.
134
134
 
135
135
  #### Option A: Connection Token (Recommended)
136
136
 
@@ -162,7 +162,7 @@ await edge.start({
162
162
  hubPort: 8443,
163
163
  edgeId: 'edge-nyc-01',
164
164
  secret: 'supersecrettoken1',
165
- transportMode: 'quic', // 'tcpTls' (default) | 'quic' | 'quicWithFallback'
165
+ transportMode: 'quic', // 'tcpTls' | 'quic' | 'quicWithFallback' (default)
166
166
  });
167
167
 
168
168
  const edgeStatus = await edge.getStatus();
@@ -175,9 +175,9 @@ await edge.stop();
175
175
 
176
176
  | Mode | Description |
177
177
  |------|-------------|
178
- | `'tcpTls'` | **Default.** Single TLS connection with frame-based multiplexing. Universal compatibility. |
178
+ | `'tcpTls'` | Single TLS connection with frame-based multiplexing. Universal compatibility. |
179
179
  | `'quic'` | QUIC with native stream multiplexing. Eliminates head-of-line blocking. Uses QUIC datagrams for UDP traffic. |
180
- | `'quicWithFallback'` | Tries QUIC first (5s timeout), falls back to TCP+TLS if UDP is blocked by the network. |
180
+ | `'quicWithFallback'` | **Default.** Tries QUIC first (5s timeout), falls back to TCP+TLS if UDP is blocked by the network. |
181
181
 
182
182
  ### Connection Tokens
183
183
 
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/remoteingress',
6
- version: '4.15.3',
6
+ version: '4.17.1',
7
7
  description: 'Edge ingress tunnel for DcRouter - tunnels TCP and UDP traffic from the network edge to SmartProxy over TLS or QUIC, preserving client IP via PROXY protocol.'
8
8
  }
@@ -57,6 +57,7 @@ export class RemoteIngressEdge extends EventEmitter {
57
57
  private restartAttempts = 0;
58
58
  private statusInterval: ReturnType<typeof setInterval> | undefined;
59
59
  private nft: InstanceType<typeof plugins.smartnftables.SmartNftables> | null = null;
60
+ private pendingFirewallConfig: IFirewallConfig | null = null;
60
61
 
61
62
  constructor() {
62
63
  super();
@@ -114,7 +115,9 @@ export class RemoteIngressEdge extends EventEmitter {
114
115
  });
115
116
  this.bridge.on('management:firewallConfigUpdated', (data: { firewallConfig: IFirewallConfig }) => {
116
117
  console.log(`[RemoteIngressEdge] Firewall config updated from hub`);
117
- this.applyFirewallConfig(data.firewallConfig);
118
+ void this.applyFirewallConfig(data.firewallConfig).catch((err) => {
119
+ console.error(`[RemoteIngressEdge] Failed to apply firewall config: ${err}`);
120
+ });
118
121
  this.emit('firewallConfigUpdated', data);
119
122
  });
120
123
  }
@@ -122,14 +125,22 @@ export class RemoteIngressEdge extends EventEmitter {
122
125
  /**
123
126
  * Initialize the nftables manager. Fails gracefully if not running as root.
124
127
  */
125
- private async initNft(): Promise<void> {
128
+ private async initNft(options: { reset?: boolean } = {}): Promise<void> {
126
129
  try {
127
130
  this.nft = new plugins.smartnftables.SmartNftables({
128
131
  tableName: 'remoteingress',
129
132
  dryRun: false,
130
133
  });
134
+ if (options.reset) {
135
+ await (this.nft as any).cleanup({ force: true });
136
+ }
131
137
  await this.nft.initialize();
132
138
  console.log('[RemoteIngressEdge] SmartNftables initialized');
139
+ if (this.pendingFirewallConfig) {
140
+ const pending = this.pendingFirewallConfig;
141
+ this.pendingFirewallConfig = null;
142
+ await this.applyFirewallConfig(pending);
143
+ }
133
144
  } catch (err) {
134
145
  console.warn(`[RemoteIngressEdge] Failed to initialize nftables (not root?): ${err}`);
135
146
  this.nft = null;
@@ -142,19 +153,22 @@ export class RemoteIngressEdge extends EventEmitter {
142
153
  */
143
154
  private async applyFirewallConfig(config: IFirewallConfig): Promise<void> {
144
155
  if (!this.nft) {
156
+ this.pendingFirewallConfig = config;
145
157
  return;
146
158
  }
147
159
 
148
160
  try {
149
161
  // Full cleanup and reinitialize to replace all rules atomically
150
- await this.nft.cleanup();
162
+ await (this.nft as any).cleanup({ force: true });
151
163
  await this.nft.initialize();
152
164
 
153
165
  // Apply blocked IPs
154
166
  if (config.blockedIps && config.blockedIps.length > 0) {
155
- for (const ip of config.blockedIps) {
156
- await this.nft.firewall.blockIP(ip);
157
- }
167
+ await (this.nft.firewall as any).blockIPSet('hub-blocklist', {
168
+ setName: 'blocked_ipv4',
169
+ ips: config.blockedIps,
170
+ comment: 'RemoteIngress hub blocklist',
171
+ });
158
172
  console.log(`[RemoteIngressEdge] Blocked ${config.blockedIps.length} IPs`);
159
173
  }
160
174
 
@@ -213,6 +227,10 @@ export class RemoteIngressEdge extends EventEmitter {
213
227
  this.savedConfig = edgeConfig;
214
228
  this.stopping = false;
215
229
 
230
+ // Clear any stale nftables state left by a prior process before the edge
231
+ // can accept hub config or bind public listener ports.
232
+ await this.initNft({ reset: true });
233
+
216
234
  const spawned = await this.bridge.spawn();
217
235
  if (!spawned) {
218
236
  throw new Error('Failed to spawn remoteingress-bin');
@@ -242,9 +260,6 @@ export class RemoteIngressEdge extends EventEmitter {
242
260
  this.restartAttempts = 0;
243
261
  this.restartBackoffMs = 1000;
244
262
 
245
- // Initialize nftables (graceful degradation if not root)
246
- await this.initNft();
247
-
248
263
  // Start periodic status logging
249
264
  this.statusInterval = setInterval(async () => {
250
265
  try {
@@ -272,7 +287,7 @@ export class RemoteIngressEdge extends EventEmitter {
272
287
  // Clean up nftables rules before stopping
273
288
  if (this.nft) {
274
289
  try {
275
- await this.nft.cleanup();
290
+ await (this.nft as any).cleanup({ force: true });
276
291
  } catch (err) {
277
292
  console.warn(`[RemoteIngressEdge] nftables cleanup error: ${err}`);
278
293
  }
@@ -289,6 +304,7 @@ export class RemoteIngressEdge extends EventEmitter {
289
304
  this.started = false;
290
305
  }
291
306
  this.savedConfig = null;
307
+ this.pendingFirewallConfig = null;
292
308
  // Remove all listeners to prevent memory buildup
293
309
  this.bridge.removeAllListeners();
294
310
  this.removeAllListeners();
@@ -344,6 +360,10 @@ export class RemoteIngressEdge extends EventEmitter {
344
360
  this.restartAttempts++;
345
361
 
346
362
  try {
363
+ // Drop stale kernel rules before reconnecting. The hub will send the
364
+ // current full firewall snapshot during handshake/config refresh.
365
+ await this.initNft({ reset: true });
366
+
347
367
  const spawned = await this.bridge.spawn();
348
368
  if (!spawned) {
349
369
  console.error('[RemoteIngressEdge] Failed to respawn binary');
@@ -366,9 +386,6 @@ export class RemoteIngressEdge extends EventEmitter {
366
386
  this.restartAttempts = 0;
367
387
  this.restartBackoffMs = 1000;
368
388
 
369
- // Re-initialize nftables (hub will re-push config via handshake)
370
- await this.initNft();
371
-
372
389
  // Restart periodic status logging
373
390
  this.statusInterval = setInterval(async () => {
374
391
  try {
@@ -9,11 +9,12 @@ type THubCommands = {
9
9
  };
10
10
  startHub: {
11
11
  params: {
12
- tunnelPort: number;
13
- targetHost?: string;
14
- tlsCertPem?: string;
15
- tlsKeyPem?: string;
16
- };
12
+ tunnelPort: number;
13
+ targetHost?: string;
14
+ tlsCertPem?: string;
15
+ tlsKeyPem?: string;
16
+ performance?: IPerformanceConfig;
17
+ };
17
18
  result: { started: boolean };
18
19
  };
19
20
  stopHub: {
@@ -22,7 +23,7 @@ type THubCommands = {
22
23
  };
23
24
  updateAllowedEdges: {
24
25
  params: {
25
- edges: Array<{ id: string; secret: string; listenPorts?: number[]; listenPortsUdp?: number[]; stunIntervalSecs?: number; firewallConfig?: IFirewallConfig }>;
26
+ edges: Array<{ id: string; secret: string; listenPorts?: number[]; listenPortsUdp?: number[]; stunIntervalSecs?: number; firewallConfig?: IFirewallConfig; performance?: IPerformanceConfig }>;
26
27
  };
27
28
  result: { updated: boolean };
28
29
  };
@@ -31,12 +32,19 @@ type THubCommands = {
31
32
  result: {
32
33
  running: boolean;
33
34
  tunnelPort: number;
34
- connectedEdges: Array<{
35
- edgeId: string;
36
- connectedAt: number;
37
- activeStreams: number;
38
- peerAddr: string;
39
- }>;
35
+ connectedEdges: Array<{
36
+ edgeId: string;
37
+ connectedAt: number;
38
+ activeStreams: number;
39
+ peerAddr: string;
40
+ transportMode: 'tcpTls' | 'quic' | 'quicWithFallback';
41
+ fallbackUsed: boolean;
42
+ performance: IEffectivePerformanceConfig;
43
+ flowControl: IFlowControlStatus;
44
+ queues: IQueueStatus;
45
+ traffic: ITrafficStatus;
46
+ udp: IUdpStatus;
47
+ }>;
40
48
  };
41
49
  };
42
50
  };
@@ -73,9 +81,61 @@ export interface IHubConfig {
73
81
  certPem?: string;
74
82
  keyPem?: string;
75
83
  };
84
+ performance?: IPerformanceConfig;
85
+ }
86
+
87
+ export type TPerformanceProfile = 'balanced' | 'throughput' | 'highConcurrency';
88
+
89
+ export interface IPerformanceConfig {
90
+ profile?: TPerformanceProfile;
91
+ maxStreamsPerEdge?: number;
92
+ totalWindowBudgetBytes?: number;
93
+ minStreamWindowBytes?: number;
94
+ maxStreamWindowBytes?: number;
95
+ sustainedStreamWindowBytes?: number;
96
+ quicDatagramReceiveBufferBytes?: number;
97
+ }
98
+
99
+ export interface IEffectivePerformanceConfig {
100
+ profile: TPerformanceProfile;
101
+ maxStreamsPerEdge: number;
102
+ totalWindowBudgetBytes: number;
103
+ minStreamWindowBytes: number;
104
+ maxStreamWindowBytes: number;
105
+ sustainedStreamWindowBytes: number;
106
+ quicDatagramReceiveBufferBytes: number;
107
+ }
108
+
109
+ export interface IFlowControlStatus {
110
+ applies: boolean;
111
+ currentWindowBytes: number;
112
+ minWindowBytes: number;
113
+ maxWindowBytes: number;
114
+ totalWindowBudgetBytes: number;
115
+ estimatedInFlightBytes: number;
116
+ stalledStreams: number;
117
+ }
118
+
119
+ export interface IQueueStatus {
120
+ ctrlQueueDepth: number;
121
+ dataQueueDepth: number;
122
+ sustainedQueueDepth: number;
123
+ }
124
+
125
+ export interface ITrafficStatus {
126
+ bytesIn: number;
127
+ bytesOut: number;
128
+ streamsOpenedTotal: number;
129
+ streamsClosedTotal: number;
130
+ rejectedStreams: number;
131
+ }
132
+
133
+ export interface IUdpStatus {
134
+ activeSessions: number;
135
+ droppedDatagrams: number;
76
136
  }
77
137
 
78
- type TAllowedEdge = { id: string; secret: string; listenPorts?: number[]; listenPortsUdp?: number[]; stunIntervalSecs?: number; firewallConfig?: IFirewallConfig };
138
+ type TAllowedEdge = { id: string; secret: string; listenPorts?: number[]; listenPortsUdp?: number[]; stunIntervalSecs?: number; firewallConfig?: IFirewallConfig; performance?: IPerformanceConfig };
79
139
 
80
140
  const MAX_RESTART_ATTEMPTS = 10;
81
141
  const MAX_RESTART_BACKOFF_MS = 30_000;
@@ -160,6 +220,7 @@ export class RemoteIngressHub extends EventEmitter {
160
220
  await this.bridge.sendCommand('startHub', {
161
221
  tunnelPort: config.tunnelPort ?? 8443,
162
222
  targetHost: config.targetHost ?? '127.0.0.1',
223
+ ...(config.performance ? { performance: config.performance } : {}),
163
224
  ...(config.tls?.certPem && config.tls?.keyPem
164
225
  ? { tlsCertPem: config.tls.certPem, tlsKeyPem: config.tls.keyPem }
165
226
  : {}),
@@ -266,6 +327,7 @@ export class RemoteIngressHub extends EventEmitter {
266
327
  ...(config.tls?.certPem && config.tls?.keyPem
267
328
  ? { tlsCertPem: config.tls.certPem, tlsKeyPem: config.tls.keyPem }
268
329
  : {}),
330
+ ...(config.performance ? { performance: config.performance } : {}),
269
331
  });
270
332
 
271
333
  // Restore allowed edges