@serve.zone/dcrouter 15.10.0 → 16.0.0

package/dist_ts/remoteingress/classes.tunnel-manager.js

@@ -1,5 +1,7 @@
 import * as plugins from '../plugins.js';
 import { logger } from '../logger.js';
+/** Cooldown applied to an edge after a failed egress open before it is deprioritized. */
+const egressFailureCooldownMs = 30_000;
 /**
  * Manages the RemoteIngressHub instance and tracks connected edge statuses.
  */
@@ -12,6 +14,9 @@ export class TunnelManager {
     syncChain = Promise.resolve();
     reconcileChain = Promise.resolve();
     stopped = true;
+    egressProxyEdgeByProxyId = new Map();
+    activeEgressProxiesByEdge = new Map();
+    egressFailureCooldownUntil = new Map();
     constructor(manager, config = {}) {
         this.manager = manager;
         this.config = config;
@@ -45,6 +50,10 @@ export class TunnelManager {
             const message = `RemoteIngress egress ${data.outcome}: edge=${data.edgeId} proxy=${data.proxyId} target=${data.logicalHost}:${data.port}${data.resolvedIp ? ` resolvedIp=${data.resolvedIp}` : ''}${data.error ? ` error=${data.error}` : ''}`;
             const isExpectedLifecycleEvent = data.outcome === 'connected' || data.outcome === 'closed';
             logger.log(isExpectedLifecycleEvent ? 'info' : 'warn', message);
+            if (!isExpectedLifecycleEvent) {
+                // Connection-level failures steer subsequent selections to other edges.
+                this.egressFailureCooldownUntil.set(data.edgeId, Date.now() + egressFailureCooldownMs);
+            }
         });
     }
     /**
@@ -99,6 +108,9 @@ export class TunnelManager {
         this.hub.removeAllListeners();
         await this.hub.stop();
         this.edgeStatuses.clear();
+        this.egressProxyEdgeByProxyId.clear();
+        this.activeEgressProxiesByEdge.clear();
+        this.egressFailureCooldownUntil.clear();
     }
     /**
      * Reconcile TS-side edge statuses with the authoritative Rust hub status.
@@ -171,28 +183,118 @@ export class TunnelManager {
             throw new Error('RemoteIngress hub is not running');
         }
         const connectedEdges = Array.isArray(status?.connectedEdges) ? status.connectedEdges : [];
-        const eligibleEdges = connectedEdges.filter((edge) => {
+        const candidates = this.selectEgressCandidates(connectedEdges, request);
+        if (candidates.length === 0) {
+            throw new Error(`No eligible RemoteIngress QUIC egress edge is connected${this.describeEgressScope(request)}`);
+        }
+        const { edgeId: _ignored, edgeFilter: _alsoIgnored, ...proxyRequest } = request;
+        let lastError;
+        for (const candidate of candidates) {
+            try {
+                const proxy = await this.hub.startEgressTcpProxy({
+                    ...proxyRequest,
+                    edgeId: candidate.edgeId,
+                });
+                this.egressProxyEdgeByProxyId.set(proxy.proxyId, candidate.edgeId);
+                this.activeEgressProxiesByEdge.set(candidate.edgeId, (this.activeEgressProxiesByEdge.get(candidate.edgeId) || 0) + 1);
+                return proxy;
+            }
+            catch (error) {
+                lastError = error;
+                this.egressFailureCooldownUntil.set(candidate.edgeId, Date.now() + egressFailureCooldownMs);
+                logger.log('warn', `RemoteIngress egress open failed on edge ${candidate.edgeId}, trying next candidate: ${lastError.message}`);
+            }
+        }
+        throw new Error(`All eligible RemoteIngress egress edges failed${this.describeEgressScope(request)}: ${lastError?.message || 'unknown error'}`);
+    }
+    /**
+     * Eligibility (connected + egressEnabled + egressTcpV1 + native QUIC), scoped by
+     * edgeId/edgeFilter, capped by per-edge maxConcurrentStreams, ordered deterministically:
+     * not-in-cooldown first, then fewest active tunnels, then edgeId.
+     */
+    selectEgressCandidates(connectedEdges, request) {
+        const eligible = connectedEdges.filter((edge) => {
             const hasEgressCapability = Array.isArray(edge.capabilities) && edge.capabilities.includes('egressTcpV1');
             const usesQuic = edge.transportMode === 'quic'
                 || (edge.transportMode === 'quicWithFallback' && edge.fallbackUsed === false);
             return edge.egressEnabled === true && hasEgressCapability && usesQuic;
         });
-        const selectedEdge = request.edgeId
-            ? eligibleEdges.find((edge) => edge.edgeId === request.edgeId)
-            : eligibleEdges[0];
-        if (!selectedEdge) {
-            const edgeHint = request.edgeId ? ` for edge ${request.edgeId}` : '';
-            throw new Error(`No eligible RemoteIngress QUIC egress edge is connected${edgeHint}`);
-        }
-        return await this.hub.startEgressTcpProxy({
-            ...request,
-            edgeId: selectedEdge.edgeId,
+        let scoped = eligible;
+        if (request.edgeId) {
+            scoped = eligible.filter((edge) => edge.edgeId === request.edgeId);
+        }
+        else if (request.edgeFilter && request.edgeFilter.length > 0) {
+            const allowedIds = new Set(this.manager.resolveEdgesByFilter(request.edgeFilter).map((edge) => edge.id));
+            scoped = eligible.filter((edge) => allowedIds.has(edge.edgeId));
+        }
+        const underCap = scoped.filter((edge) => {
+            const cap = this.manager.getEdge(edge.edgeId)?.egress?.maxConcurrentStreams;
+            if (!cap)
+                return true;
+            return (this.activeEgressProxiesByEdge.get(edge.edgeId) || 0) < cap;
+        });
+        const now = Date.now();
+        const inCooldown = (edgeId) => (this.egressFailureCooldownUntil.get(edgeId) || 0) > now;
+        return underCap
+            .map((edge) => ({ edgeId: edge.edgeId, activeStreams: Number(edge.activeStreams) || 0 }))
+            .sort((a, b) => {
+            const cooldownDelta = Number(inCooldown(a.edgeId)) - Number(inCooldown(b.edgeId));
+            if (cooldownDelta !== 0)
+                return cooldownDelta;
+            if (a.activeStreams !== b.activeStreams)
+                return a.activeStreams - b.activeStreams;
+            return a.edgeId.localeCompare(b.edgeId);
         });
     }
+    describeEgressScope(request) {
+        if (request.edgeId)
+            return ` (pinned edge: ${request.edgeId})`;
+        if (request.edgeFilter && request.edgeFilter.length > 0)
+            return ` (filter: ${request.edgeFilter.join(', ')})`;
+        return '';
+    }
+    /**
+     * Readiness of the outbound egress path for a given edge scope —
+     * consumed by the ops API and the email-setup preflight.
+     */
+    getEgressReadiness(edgeFilter) {
+        const allowedIds = new Set(this.manager.resolveEdgesByFilter(edgeFilter).map((edge) => edge.id));
+        let eligibleEdgeCount = 0;
+        for (const status of this.edgeStatuses.values()) {
+            if (!status.connected)
+                continue;
+            if (!allowedIds.has(status.edgeId))
+                continue;
+            const hasEgressCapability = status.capabilities?.includes('egressTcpV1') ?? false;
+            const usesQuic = status.transportMode === 'quic'
+                || (status.transportMode === 'quicWithFallback' && status.fallbackUsed === false);
+            if (status.egressEnabled === true && hasEgressCapability && usesQuic) {
+                eligibleEdgeCount++;
+            }
+        }
+        if (eligibleEdgeCount > 0) {
+            return { ready: true, eligibleEdgeCount };
+        }
+        const reason = allowedIds.size === 0
+            ? `no enabled edge matches filter [${edgeFilter.join(', ')}]`
+            : 'no connected matching edge with native QUIC egress capability';
+        return { ready: false, eligibleEdgeCount: 0, reason };
+    }
     async stopEgressTcpProxy(proxyId) {
         if (this.stopped) {
             return false;
         }
+        const edgeId = this.egressProxyEdgeByProxyId.get(proxyId);
+        if (edgeId) {
+            this.egressProxyEdgeByProxyId.delete(proxyId);
+            const current = this.activeEgressProxiesByEdge.get(edgeId) || 0;
+            if (current <= 1) {
+                this.activeEgressProxiesByEdge.delete(edgeId);
+            }
+            else {
+                this.activeEgressProxiesByEdge.set(edgeId, current - 1);
+            }
+        }
         return await this.hub.stopEgressTcpProxy(proxyId);
     }
     applyRustStatus(status, rustEdge) {
@@ -252,4 +354,4 @@ export class TunnelManager {
         return total;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tunnel-manager.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.tunnel-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAkBtC;;GAEG;AACH,MAAM,OAAO,aAAa;IAChB,GAAG,CAA8D;IACjE,OAAO,CAAuB;IAC9B,MAAM,CAAuB;IAC7B,YAAY,GAAsC,IAAI,GAAG,EAAE,CAAC;IAC5D,iBAAiB,GAA0C,IAAI,CAAC;IAChE,SAAS,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7C,cAAc,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAClD,OAAO,GAAG,IAAI,CAAC;IAEvB,YAAY,OAA6B,EAAE,SAA+B,EAAE;QAC1E,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC;QAExD,4CAA4C;QAC5C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,IAA0C,EAAE,EAAE;YAC1E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;gBACjC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI;gBAC/B,aAAa,EAAE,CAAC;gBAChB,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;gBACzB,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE;aACxB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAAwB,EAAE,EAAE;YAC3D,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,IAK7B,EAAE,EAAE;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpD,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;gBAC5C,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACpC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACrB,QAAQ,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;oBAC9D,QAAQ,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;gBAChE,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAQhC,EAAE,EAAE;YACH,MAAM,OAAO,GAAG,wBAAwB,IAAI,CAAC,OAAO,UAAU,IAAI,CAAC,MAAM,UAAU,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAC/O,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,KAAK,WAAW,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC;YAC3F,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;gBACnB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI;gBAC1C,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,WAAW;gBACjD,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACpB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5E,eAAe,EAAE,SAAS;aACpB,CAAC,CAAC;YAEV,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YAEzB,gCAAgC;YAChC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAE9B,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YAEzB,4DAA4D;YAC5D,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;gBACxC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc;qBACtC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;qBACf,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBAChC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACtC,CAAC,EAAE,MAAM,CAAC,CAAC;QACb,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAChC,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;YAC9B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;SACpC,CAAC,CAAC;QACH,0DAA0D;QAC1D,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;QAC9B,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,SAAS;QACrB,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAC7C,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,cAAc;YAAE,OAAO;QAEpD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;QAEtC,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;YAChD,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACxD,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;gBAChD,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACzC,iDAAiD;gBACjD,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;oBACtB,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBACxC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,yCAAyC;gBACzC,MAAM,MAAM,GAAyB;oBACnC,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,SAAS,EAAE,IAAI;oBACf,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,IAAI;oBACnC,aAAa,EAAE,QAAQ,CAAC,aAAa;oBACrC,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;oBACzB,WAAW,EAAE,QAAQ,CAAC,WAAW,GAAG,IAAI;iBACzC,CAAC;gBACF,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAED,iFAAiF;QACjF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,gBAAgB;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACzD,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YACzB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7C,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YACzB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAY,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;QACrB,MAAM,GAAG,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,OAAyC;QAEzC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE;YACxD,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC1G,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,KAAK,MAAM;mBACzC,CAAC,IAAI,CAAC,aAAa,KAAK,kBAAkB,IAAI,IAAI,CAAC,YAAY,KAAK,KAAK,CAAC,CAAC;YAChF,OAAO,IAAI,CAAC,aAAa,KAAK,IAAI,IAAI,mBAAmB,IAAI,QAAQ,CAAC;QACxE,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM;YACjC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;YACnE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAErB,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,0DAA0D,QAAQ,EAAE,CAAC,CAAC;QACxF,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;YACxC,GAAG,OAAO;YACV,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,OAAe;QAC7C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAEO,eAAe,CAAC,MAA4B,EAAE,QAAa;QACjE,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC9C,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC5C,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC5C,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC9C,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAC1C,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAC1C,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAChC,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAClC,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;IAC5B,CAAC;IAED;;OAEG;IACI,eAAe;QACpB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAChD,IAAI,MAAM,CAAC,SAAS;gBAAE,KAAK,EAAE,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACI,mBAAmB;QACxB,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAChD,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACxC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACI,qBAAqB;QAC1B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAChD,KAAK,IAAI,MAAM,CAAC,aAAa,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tunnel-manager.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.tunnel-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAqBtC,yFAAyF;AACzF,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAEvC;;GAEG;AACH,MAAM,OAAO,aAAa;IAChB,GAAG,CAA8D;IACjE,OAAO,CAAuB;IAC9B,MAAM,CAAuB;IAC7B,YAAY,GAAsC,IAAI,GAAG,EAAE,CAAC;IAC5D,iBAAiB,GAA0C,IAAI,CAAC;IAChE,SAAS,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7C,cAAc,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAClD,OAAO,GAAG,IAAI,CAAC;IACf,wBAAwB,GAAwB,IAAI,GAAG,EAAE,CAAC;IAC1D,yBAAyB,GAAwB,IAAI,GAAG,EAAE,CAAC;IAC3D,0BAA0B,GAAwB,IAAI,GAAG,EAAE,CAAC;IAEpE,YAAY,OAA6B,EAAE,SAA+B,EAAE;QAC1E,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC;QAExD,4CAA4C;QAC5C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,IAA0C,EAAE,EAAE;YAC1E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;gBACjC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,SAAS,EAAE,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI;gBAC/B,aAAa,EAAE,CAAC;gBAChB,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;gBACzB,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE;aACxB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAAwB,EAAE,EAAE;YAC3D,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,IAK7B,EAAE,EAAE;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpD,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;gBAC5C,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACpC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACrB,QAAQ,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;oBAC9D,QAAQ,CAAC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;gBAChE,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAQhC,EAAE,EAAE;YACH,MAAM,OAAO,GAAG,wBAAwB,IAAI,CAAC,OAAO,UAAU,IAAI,CAAC,MAAM,UAAU,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAC/O,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,KAAK,WAAW,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC;YAC3F,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAChE,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAC9B,wEAAwE;gBACxE,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,uBAAuB,CAAC,CAAC;YACzF,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;gBACnB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI;gBAC1C,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,WAAW;gBACjD,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACpB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5E,eAAe,EAAE,SAAS;aACpB,CAAC,CAAC;YAEV,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YAEzB,gCAAgC;YAChC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAE9B,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YAEzB,4DAA4D;YAC5D,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;gBACxC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc;qBACtC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;qBACf,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBAChC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACtC,CAAC,EAAE,MAAM,CAAC,CAAC;QACb,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAChC,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;YAC9B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;SACpC,CAAC,CAAC;QACH,0DAA0D;QAC1D,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;QAC9B,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC;QACtC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,CAAC;QACvC,IAAI,CAAC,0BAA0B,CAAC,KAAK,EAAE,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,SAAS;QACrB,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAC7C,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,cAAc;YAAE,OAAO;QAEpD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;QAEtC,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;YAChD,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACxD,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;gBAChD,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACzC,iDAAiD;gBACjD,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;oBACtB,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBACxC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,yCAAyC;gBACzC,MAAM,MAAM,GAAyB;oBACnC,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,SAAS,EAAE,IAAI;oBACf,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,IAAI;oBACnC,aAAa,EAAE,QAAQ,CAAC,aAAa;oBACrC,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;oBACzB,WAAW,EAAE,QAAQ,CAAC,WAAW,GAAG,IAAI;iBACzC,CAAC;gBACF,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAED,iFAAiF;QACjF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,gBAAgB;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACzD,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YACzB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7C,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YACzB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAY,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;QACrB,MAAM,GAAG,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,OAAyC;QAEzC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAExE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,0DAA0D,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjH,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC;QAChF,IAAI,SAA4B,CAAC;QACjC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC;oBAC/C,GAAG,YAAY;oBACf,MAAM,EAAE,SAAS,CAAC,MAAM;iBACzB,CAAC,CAAC;gBACH,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;gBACnE,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAChC,SAAS,CAAC,MAAM,EAChB,CAAC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAChE,CAAC;gBACF,OAAO,KAAK,CAAC;YACf,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,SAAS,GAAG,KAAc,CAAC;gBAC3B,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,uBAAuB,CAAC,CAAC;gBAC5F,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4CAA4C,SAAS,CAAC,MAAM,4BAA4B,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAClI,CAAC;QACH,CAAC;QAED,MAAM,IAAI,KAAK,CACb,iDAAiD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,SAAS,EAAE,OAAO,IAAI,eAAe,EAAE,CAC/H,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACK,sBAAsB,CAC5B,cAAqB,EACrB,OAAyC;QAEzC,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE;YACnD,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC1G,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,KAAK,MAAM;mBACzC,CAAC,IAAI,CAAC,aAAa,KAAK,kBAAkB,IAAI,IAAI,CAAC,YAAY,KAAK,KAAK,CAAC,CAAC;YAChF,OAAO,IAAI,CAAC,aAAa,KAAK,IAAI,IAAI,mBAAmB,IAAI,QAAQ,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,QAAQ,CAAC;QACtB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1E,CAAC;aAAM,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/D,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAC7E,CAAC;YACF,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC;YAC5E,IAAI,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC;YACtB,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC;QACtE,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC;QAChG,OAAO,QAAQ;aACZ,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAgB,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACvG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAClF,IAAI,aAAa,KAAK,CAAC;gBAAE,OAAO,aAAa,CAAC;YAC9C,IAAI,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,aAAa;gBAAE,OAAO,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC;YAClF,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,mBAAmB,CAAC,OAAyC;QACnE,IAAI,OAAO,CAAC,MAAM;YAAE,OAAO,kBAAkB,OAAO,CAAC,MAAM,GAAG,CAAC;QAC/D,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,aAAa,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QAC9G,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,UAAoB;QAC5C,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CACrE,CAAC;QACF,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,SAAS;gBAAE,SAAS;YAChC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAE,SAAS;YAC7C,MAAM,mBAAmB,GAAG,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC;YAClF,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,KAAK,MAAM;mBAC3C,CAAC,MAAM,CAAC,aAAa,KAAK,kBAAkB,IAAI,MAAM,CAAC,YAAY,KAAK,KAAK,CAAC,CAAC;YACpF,IAAI,MAAM,CAAC,aAAa,KAAK,IAAI,IAAI,mBAAmB,IAAI,QAAQ,EAAE,CAAC;gBACrE,iBAAiB,EAAE,CAAC;YACtB,CAAC;QACH,CAAC;QACD,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;QAC5C,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,KAAK,CAAC;YAClC,CAAC,CAAC,mCAAmC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAC7D,CAAC,CAAC,+DAA+D,CAAC;QACpE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;IACxD,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,OAAe;QAC7C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAChE,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;gBACjB,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAEO,eAAe,CAAC,MAA4B,EAAE,QAAa;QACjE,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC9C,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC5C,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC5C,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC9C,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAC1C,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAC1C,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAChC,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAClC,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;IAC5B,CAAC;IAED;;OAEG;IACI,eAAe;QACpB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAChD,IAAI,MAAM,CAAC,SAAS;gBAAE,KAAK,EAAE,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACI,mBAAmB;QACxB,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAChD,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACxC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACI,qBAAqB;QAC1B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAChD,KAAK,IAAI,MAAM,CAAC,aAAa,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}

package/dist_ts/remoteingress/edge-derivation-routes.d.ts

@@ -0,0 +1,10 @@
+import type { IDcRouterRouteConfig } from '../../dist_ts_interfaces/data/remoteingress.js';
+/**
+ * Synthetic routes that exist ONLY for RemoteIngress edge port derivation and
+ * must never reach SmartProxy (smartdns owns host-side 53; a SmartProxy listener
+ * on 53 would collide). Forwards public TCP+UDP 53 on dns-tagged edges to the
+ * hub's authoritative DNS server.
+ */
+export declare function buildEdgeOnlyDerivationRoutes(options: {
+    dnsNsDomains?: string[];
+}): IDcRouterRouteConfig[];

package/dist_ts/remoteingress/edge-derivation-routes.js

@@ -0,0 +1,28 @@
+import { REMOTE_INGRESS_DNS_TAG } from '../../dist_ts_interfaces/data/remoteingress.js';
+/**
+ * Synthetic routes that exist ONLY for RemoteIngress edge port derivation and
+ * must never reach SmartProxy (smartdns owns host-side 53; a SmartProxy listener
+ * on 53 would collide). Forwards public TCP+UDP 53 on dns-tagged edges to the
+ * hub's authoritative DNS server.
+ */
+export function buildEdgeOnlyDerivationRoutes(options) {
+    if (!options.dnsNsDomains?.length) {
+        return [];
+    }
+    return [{
+            name: 'dns-53-edge-forwarding',
+            match: {
+                ports: [53],
+                transport: 'all',
+            },
+            action: {
+                type: 'forward',
+                targets: [{ host: '127.0.0.1', port: 53 }],
+            },
+            remoteIngress: {
+                enabled: true,
+                edgeFilter: [REMOTE_INGRESS_DNS_TAG],
+            },
+        }];
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWRnZS1kZXJpdmF0aW9uLXJvdXRlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL3JlbW90ZWluZ3Jlc3MvZWRnZS1kZXJpdmF0aW9uLXJvdXRlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUVuRjs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSw2QkFBNkIsQ0FBQyxPQUFvQztJQUNoRixJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxNQUFNLEVBQUUsQ0FBQztRQUNsQyxPQUFPLEVBQUUsQ0FBQztJQUNaLENBQUM7SUFDRCxPQUFPLENBQUM7WUFDTixJQUFJLEVBQUUsd0JBQXdCO1lBQzlCLEtBQUssRUFBRTtnQkFDTCxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUM7Z0JBQ1gsU0FBUyxFQUFFLEtBQUs7YUFDakI7WUFDRCxNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLFNBQVM7Z0JBQ2YsT0FBTyxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQzthQUMzQztZQUNELGFBQWEsRUFBRTtnQkFDYixPQUFPLEVBQUUsSUFBSTtnQkFDYixVQUFVLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQzthQUNyQztTQUNzQixDQUFDLENBQUM7QUFDN0IsQ0FBQyJ9

package/dist_ts/remoteingress/index.d.ts

@@ -1,3 +1,4 @@
 export * from './classes.remoteingress-manager.js';
 export * from './classes.tunnel-manager.js';
 export * from './classes.hub-lifecycle.js';
+export * from './edge-derivation-routes.js';

package/dist_ts/remoteingress/index.js

@@ -1,4 +1,5 @@
 export * from './classes.remoteingress-manager.js';
 export * from './classes.tunnel-manager.js';
 export * from './classes.hub-lifecycle.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9yZW1vdGVpbmdyZXNzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0NBQW9DLENBQUM7QUFDbkQsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLDRCQUE0QixDQUFDIn0=
+export * from './edge-derivation-routes.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9yZW1vdGVpbmdyZXNzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0NBQW9DLENBQUM7QUFDbkQsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsNkJBQTZCLENBQUMifQ==

package/dist_ts_interfaces/data/email-domain.d.ts

@@ -21,11 +21,21 @@ export interface IEmailDomain {
     dkim: IEmailDomainDkim;
     /** Optional per-domain rate limits. */
     rateLimits?: IEmailDomainRateLimits;
+    /** Optional RemoteIngress edge pinning — restricts inbound MX targets and outbound egress to matching edges. */
+    remoteIngress?: IEmailDomainRemoteIngress;
     /** DNS record validation status — populated by validateDns(). */
     dnsStatus: IEmailDomainDnsStatus;
     createdAt: string;
     updatedAt: string;
 }
+/**
+ * Per-mail-domain RemoteIngress pinning (mirrors IRouteRemoteIngress.edgeFilter semantics).
+ */
+export interface IEmailDomainRemoteIngress {
+    /** Edge ids or tags. When set, only matching edges front this domain (inbound MX target + outbound egress).
+     *  Absent/empty = all mail-capable edges. */
+    edgeFilter?: string[];
+}
 export interface IEmailDomainDkim {
     /** DKIM selector (default: 'default'). */
     selector: string;
@@ -63,7 +73,7 @@ export interface IEmailDomainDnsStatus {
  * A single required DNS record for an email domain — used for display / copy-paste.
  */
 export interface IEmailDnsRecord {
-    type: 'MX' | 'TXT';
+    type: 'MX' | 'TXT' | 'A' | 'AAAA';
     name: string;
     value: string;
     status: TDnsRecordStatus;

package/dist_ts_interfaces/data/email-settings.d.ts

@@ -1,5 +1,14 @@
 import type { IUnifiedEmailServerOptions } from '@push.rocks/smartmta';
+/** Outbound SMTP egress mode. 'remoteIngress' (default): deliver via RemoteIngress edges only,
+ *  no direct-from-hub fallback. 'direct' is an explicit operator opt-out. */
 export type TEmailOutboundMode = 'direct' | 'remoteIngress';
+/** Readiness of the RemoteIngress outbound egress path — surfaced when outboundMode is 'remoteIngress'. */
+export interface IEmailOutboundEgressStatus {
+    ready: boolean;
+    eligibleEdgeCount: number;
+    /** Populated when not ready, e.g. 'no connected mail edge with native QUIC egress'. */
+    reason?: string;
+}
 export interface IEmailPortConfig {
     /** External to internal SMTP port mapping. */
     portMapping?: Record<number, number>;
@@ -23,6 +32,8 @@ export interface IEmailServerSettings {
     domainCount: number;
     routeCount: number;
     authUserCount: number;
+    /** Present when outboundMode is 'remoteIngress': whether a mail egress edge is currently available. */
+    outboundEgress?: IEmailOutboundEgressStatus;
     updatedAt: number;
     updatedBy: string;
 }

package/dist_ts_interfaces/data/remoteingress.d.ts

@@ -1,4 +1,8 @@
 import type { IRouteConfig } from '@push.rocks/smartproxy';
+/** Edges tagged 'mail' bind SMTP ports and are eligible for outbound SMTP egress and mail DNS fronting. */
+export declare const REMOTE_INGRESS_MAIL_TAG = "mail";
+/** Edges tagged 'dns' forward public TCP/UDP 53 to the hub's authoritative DNS. */
+export declare const REMOTE_INGRESS_DNS_TAG = "dns";
 /**
  * A stored remote ingress edge registration.
  */
@@ -17,6 +21,12 @@ export interface IRemoteIngress {
     /** Optional per-edge outbound egress policy. Omitted or disabled means no egress. */
     egress?: IRemoteIngressEgressPolicyConfig;
     tags?: string[];
+    /** Operator-declared public IPv4 of the edge host — used to generate mail/DNS A records. */
+    publicIp?: string;
+    /** Operator-declared public IPv6 of the edge host — used to generate AAAA records once the edge has an IPv6 PTR. */
+    publicIpV6?: string;
+    /** FQDN matching this edge's PTR record — used as per-delivery outbound EHLO identity and FCrDNS A record. */
+    mailHostname?: string;
     createdAt: number;
     updatedAt: number;
     /** Effective ports (union of manual + derived) — only present in API responses. */

package/dist_ts_interfaces/data/remoteingress.js

@@ -1,2 +1,5 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3RlaW5ncmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX2ludGVyZmFjZXMvZGF0YS9yZW1vdGVpbmdyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
+/** Edges tagged 'mail' bind SMTP ports and are eligible for outbound SMTP egress and mail DNS fronting. */
+export const REMOTE_INGRESS_MAIL_TAG = 'mail';
+/** Edges tagged 'dns' forward public TCP/UDP 53 to the hub's authoritative DNS. */
+export const REMOTE_INGRESS_DNS_TAG = 'dns';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3RlaW5ncmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX2ludGVyZmFjZXMvZGF0YS9yZW1vdGVpbmdyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLDJHQUEyRztBQUMzRyxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxNQUFNLENBQUM7QUFDOUMsbUZBQW1GO0FBQ25GLE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUFHLEtBQUssQ0FBQyJ9

package/dist_ts_interfaces/requests/email-domains.d.ts

@@ -1,6 +1,6 @@
 import * as plugins from '../plugins.js';
 import type * as authInterfaces from '../data/auth.js';
-import type { IEmailDomain, IEmailDnsRecord } from '../data/email-domain.js';
+import type { IEmailDomain, IEmailDnsRecord, IEmailDomainRemoteIngress } from '../data/email-domain.js';
 /**
  * List all email domains.
  */
@@ -49,6 +49,8 @@ export interface IReq_CreateEmailDomain extends plugins.typedrequestInterfaces.i
         rotateKeys?: boolean;
         /** Days between rotations (default: 90). */
         rotationIntervalDays?: number;
+        /** Optional RemoteIngress edge pinning for this domain. */
+        remoteIngress?: IEmailDomainRemoteIngress;
     };
     response: {
         success: boolean;
@@ -68,6 +70,8 @@ export interface IReq_UpdateEmailDomain extends plugins.typedrequestInterfaces.i
         rotateKeys?: boolean;
         rotationIntervalDays?: number;
         rateLimits?: IEmailDomain['rateLimits'];
+        /** RemoteIngress edge pinning; null clears the pin. */
+        remoteIngress?: IEmailDomainRemoteIngress | null;
     };
     response: {
         success: boolean;

package/dist_ts_interfaces/requests/email-ops.d.ts

@@ -54,6 +54,10 @@ export interface IReq_GetAllEmails extends plugins.typedrequestInterfaces.implem
     request: {
         identity?: authInterfaces.IIdentity;
         apiToken?: string;
+        /** Restrict the listing to one direction. Absent = both. */
+        direction?: TEmailDirection;
+        /** Maximum number of entries to return (default 200). */
+        limit?: number;
     };
     response: {
         emails: IEmail[];

package/dist_ts_interfaces/requests/remoteingress.d.ts

@@ -15,10 +15,15 @@ export interface IReq_CreateRemoteIngress extends plugins.typedrequestInterfaces
         performance?: IRemoteIngressPerformanceConfig;
         egress?: IRemoteIngressEgressPolicyConfig;
         tags?: string[];
+        publicIp?: string;
+        publicIpV6?: string;
+        mailHostname?: string;
     };
     response: {
         success: boolean;
         edge: IRemoteIngress;
+        /** Failure reason (e.g. rejected publicIp) when success is false. */
+        message?: string;
     };
 }
 /**
@@ -52,10 +57,16 @@ export interface IReq_UpdateRemoteIngress extends plugins.typedrequestInterfaces
         performance?: IRemoteIngressPerformanceConfig;
         egress?: IRemoteIngressEgressPolicyConfig;
         tags?: string[];
+        /** null clears the stored value. */
+        publicIp?: string | null;
+        publicIpV6?: string | null;
+        mailHostname?: string | null;
     };
     response: {
         success: boolean;
         edge: IRemoteIngress;
+        /** Failure reason (e.g. rejected publicIp) when success is false. */
+        message?: string;
     };
 }
 /**