@serve.zone/dcrouter 15.0.1 → 15.0.2

package/dist_ts/remoteingress/classes.hub-lifecycle.js

@@ -0,0 +1,241 @@
+import * as plugins from '../plugins.js';
+import { logger } from '../logger.js';
+import { ProxyCertDoc } from '../db/index.js';
+import { RemoteIngressManager } from './classes.remoteingress-manager.js';
+import { TunnelManager } from './classes.tunnel-manager.js';
+/**
+ * Generation-guarded lifecycle for the RemoteIngress tunnel hub: serialized
+ * start/stop/restart of the Rust hub, edge mutations, route/firewall pushes,
+ * and hub-settings updates that may require a SmartProxy restart.
+ */
+export class RemoteIngressHubLifecycle {
+    dcRouterRef;
+    lifecycleChain = Promise.resolve();
+    stopping = false;
+    generation = 0;
+    constructor(dcRouterRef) {
+        this.dcRouterRef = dcRouterRef;
+    }
+    async setup() {
+        const remoteIngressManager = this.dcRouterRef.remoteIngressManager;
+        if (!remoteIngressManager) {
+            return;
+        }
+        const hubSettings = remoteIngressManager.getHubSettings();
+        if (!hubSettings.enabled) {
+            logger.log('info', 'Remote Ingress hub is disabled in DB settings');
+            return;
+        }
+        logger.log('info', 'Setting up Remote Ingress hub...');
+        this.stopping = false;
+        const generation = ++this.generation;
+        const firewallConfig = await this.dcRouterRef.securityPolicyManager?.compileRemoteIngressFirewall();
+        if (!this.isGenerationCurrent(generation, remoteIngressManager)) {
+            return;
+        }
+        remoteIngressManager.setFirewallConfig(firewallConfig);
+        // Pass current bootstrap routes so the manager can derive edge ports initially.
+        // Once RouteConfigManager applies the full DB set, the onRoutesApplied callback
+        // will push the complete merged routes here.
+        remoteIngressManager.setRoutes(this.dcRouterRef.getRemoteIngressBootstrapRoutes());
+        // If ConfigManagers finished before us, re-apply routes
+        // so the callback delivers the full DB set to our newly-created remoteIngressManager.
+        if (this.dcRouterRef.routeConfigManager) {
+            await this.dcRouterRef.routeConfigManager.applyRoutes();
+        }
+        if (!this.isGenerationCurrent(generation, remoteIngressManager)) {
+            return;
+        }
+        await this.queueTask(async () => {
+            await this.startTunnelHubLocked(generation);
+        });
+        if (!this.isGenerationCurrent(generation, remoteIngressManager)) {
+            return;
+        }
+        const edgeCount = remoteIngressManager.getAllEdges().length;
+        logger.log('info', `Remote Ingress hub started on port ${hubSettings.tunnelPort} with ${edgeCount} registered edge(s)`);
+    }
+    async stop() {
+        this.stopping = true;
+        this.generation++;
+        await this.queueTask(async () => {
+            const currentTunnelManager = this.dcRouterRef.tunnelManager;
+            if (currentTunnelManager) {
+                await currentTunnelManager.stop();
+                if (this.dcRouterRef.tunnelManager === currentTunnelManager) {
+                    this.dcRouterRef.tunnelManager = undefined;
+                }
+            }
+        });
+    }
+    async mutateEdges(mutation, syncAllowedEdges = true) {
+        return await this.queueTask(async () => {
+            if (this.stopping) {
+                throw new Error('RemoteIngress is stopping');
+            }
+            const manager = this.dcRouterRef.remoteIngressManager;
+            if (!manager) {
+                throw new Error('RemoteIngress not configured');
+            }
+            const result = await mutation(manager);
+            if (syncAllowedEdges && this.dcRouterRef.tunnelManager) {
+                await this.dcRouterRef.tunnelManager.syncAllowedEdges();
+            }
+            return result;
+        });
+    }
+    async updateRoutes(routes) {
+        await this.queueTask(async () => {
+            if (this.stopping)
+                return;
+            if (this.dcRouterRef.remoteIngressManager) {
+                this.dcRouterRef.remoteIngressManager.setRoutes(routes);
+            }
+            if (this.dcRouterRef.tunnelManager) {
+                await this.dcRouterRef.tunnelManager.syncAllowedEdges();
+            }
+        });
+    }
+    async applyFirewallConfig(firewallConfig) {
+        await this.queueTask(async () => {
+            if (this.stopping)
+                return;
+            if (this.dcRouterRef.remoteIngressManager) {
+                this.dcRouterRef.remoteIngressManager.setFirewallConfig(firewallConfig);
+            }
+            if (this.dcRouterRef.tunnelManager) {
+                await this.dcRouterRef.tunnelManager.syncAllowedEdges();
+            }
+        });
+    }
+    async updateHubSettings(updates, updatedBy) {
+        const manager = this.dcRouterRef.remoteIngressManager;
+        if (!manager) {
+            throw new Error('RemoteIngress is not configured');
+        }
+        const previousSettings = manager.getHubSettings();
+        const settings = await manager.updateHubSettings(updates, updatedBy);
+        const enabledChanged = previousSettings.enabled !== settings.enabled;
+        if (!settings.enabled) {
+            await this.queueTask(async () => {
+                await this.stopTunnelHubLocked();
+            });
+        }
+        if (enabledChanged) {
+            await this.dcRouterRef.restartSmartProxyForRemoteIngressSettings();
+        }
+        if (settings.enabled) {
+            await this.queueTask(async () => {
+                await this.restartTunnelHubLocked();
+            });
+        }
+        return settings;
+    }
+    isGenerationCurrent(generation, manager) {
+        return !this.stopping
+            && generation === this.generation
+            && this.dcRouterRef.remoteIngressManager === manager;
+    }
+    queueTask(task) {
+        const run = this.lifecycleChain.then(task);
+        this.lifecycleChain = run.then(() => undefined, () => undefined);
+        return run;
+    }
+    async stopTunnelHubLocked() {
+        this.generation++;
+        const currentTunnelManager = this.dcRouterRef.tunnelManager;
+        if (currentTunnelManager) {
+            await currentTunnelManager.stop();
+            if (this.dcRouterRef.tunnelManager === currentTunnelManager) {
+                this.dcRouterRef.tunnelManager = undefined;
+            }
+        }
+    }
+    async restartTunnelHubLocked() {
+        const generation = ++this.generation;
+        const hubSettings = this.dcRouterRef.remoteIngressManager?.getHubSettings();
+        if (!this.dcRouterRef.remoteIngressManager || !hubSettings?.enabled || this.stopping) {
+            return;
+        }
+        const currentTunnelManager = this.dcRouterRef.tunnelManager;
+        if (currentTunnelManager) {
+            await currentTunnelManager.stop();
+            if (this.dcRouterRef.tunnelManager === currentTunnelManager) {
+                this.dcRouterRef.tunnelManager = undefined;
+            }
+        }
+        if (this.stopping || generation !== this.generation) {
+            return;
+        }
+        await this.startTunnelHubLocked(generation);
+    }
+    async startTunnelHubLocked(generation) {
+        const manager = this.dcRouterRef.remoteIngressManager;
+        const hubSettings = manager?.getHubSettings();
+        if (!manager || !hubSettings?.enabled || this.stopping || generation !== this.generation) {
+            return;
+        }
+        const firewallConfig = await this.dcRouterRef.securityPolicyManager?.compileRemoteIngressFirewall();
+        if (this.stopping || generation !== this.generation || this.dcRouterRef.remoteIngressManager !== manager) {
+            return;
+        }
+        manager.setFirewallConfig(firewallConfig);
+        const tlsConfig = await this.resolveTlsConfig(hubSettings.hubDomain);
+        if (this.stopping || generation !== this.generation || this.dcRouterRef.remoteIngressManager !== manager) {
+            return;
+        }
+        const tunnelManager = new TunnelManager(manager, {
+            tunnelPort: hubSettings.tunnelPort,
+            targetHost: '127.0.0.1',
+            tls: tlsConfig,
+            performance: manager.getHubPerformanceConfig(),
+        });
+        try {
+            await tunnelManager.start();
+        }
+        catch (err) {
+            await tunnelManager.stop().catch(() => { });
+            throw err;
+        }
+        if (this.stopping || generation !== this.generation || this.dcRouterRef.remoteIngressManager !== manager) {
+            await tunnelManager.stop().catch((err) => {
+                logger.log('warn', `Failed to stop stale RemoteIngress tunnel hub: ${err.message}`);
+            });
+            return;
+        }
+        this.dcRouterRef.tunnelManager = tunnelManager;
+    }
+    async resolveTlsConfig(hubDomain) {
+        // Resolve TLS certs for tunnel: explicit paths > ACME for hubDomain > self-signed (Rust default)
+        let tlsConfig;
+        // Priority 1: Explicit cert/key file paths
+        const explicitTls = this.dcRouterRef.options.remoteIngressConfig?.tls;
+        if (explicitTls?.certPath && explicitTls?.keyPath) {
+            try {
+                const certPem = plugins.fs.readFileSync(explicitTls.certPath, 'utf8');
+                const keyPem = plugins.fs.readFileSync(explicitTls.keyPath, 'utf8');
+                tlsConfig = { certPem, keyPem };
+                logger.log('info', 'Using explicit TLS cert/key for RemoteIngress tunnel');
+            }
+            catch (err) {
+                logger.log('warn', `Failed to read RemoteIngress TLS cert/key files: ${err.message}`);
+            }
+        }
+        // Priority 2: Existing cert from SmartProxy cert store for hubDomain
+        if (!tlsConfig && hubDomain) {
+            try {
+                const stored = await ProxyCertDoc.findByDomain(hubDomain);
+                if (stored?.publicKey && stored?.privateKey) {
+                    tlsConfig = { certPem: stored.publicKey, keyPem: stored.privateKey };
+                    logger.log('info', `Using stored ACME cert for RemoteIngress tunnel TLS: ${hubDomain}`);
+                }
+            }
+            catch { /* no stored cert, fall through */ }
+        }
+        if (!tlsConfig) {
+            logger.log('info', 'No TLS cert configured for RemoteIngress tunnel — using auto-generated self-signed');
+        }
+        return tlsConfig;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.hub-lifecycle.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.hub-lifecycle.ts"],"names":[],"mappings":"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"}

package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts

@@ -1,5 +1,5 @@
 import type { IDcRouterRouteConfig, IRemoteIngress, IRemoteIngressHubSettings, IRemoteIngressPerformanceConfig, TRemoteIngressHubSettingsUpdate } from '../../dist_ts_interfaces/data/remoteingress.js';
-interface IRemoteIngressFirewallConfig {
+export interface IRemoteIngressFirewallConfig {
     blockedIps?: string[];
 }
 /**
@@ -109,4 +109,3 @@ export declare class RemoteIngressManager {
     private normalizePerformanceConfig;
     private toHubSettings;
 }
-export {};

package/dist_ts/remoteingress/index.d.ts

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

package/dist_ts/remoteingress/index.js

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

package/dist_ts/security/classes.route-policy-augmenter.d.ts

@@ -0,0 +1,22 @@
+import * as plugins from '../plugins.js';
+import type { ISecurityCompiledPolicy } from '../../dist_ts_interfaces/data/security-policy.js';
+import type { DcRouter } from '../classes.dcrouter.js';
+/**
+ * Pure route-policy transformations applied before routes reach SmartProxy:
+ * per-listener inbound PROXY protocol policies (driven by RemoteIngress and
+ * VPN) and merging of compiled security policies.
+ */
+export declare class RoutePolicyAugmenter {
+    private dcRouterRef;
+    constructor(dcRouterRef: DcRouter);
+    /**
+     * Ensure every route on a shared listener carries a compatible
+     * inboundProxyProtocol policy, deriving defaults from RemoteIngress/VPN.
+     */
+    applyInboundProxyProtocolPolicies(routes: plugins.smartproxy.IRouteConfig[]): plugins.smartproxy.IRouteConfig[];
+    /** Union blocked IPs/CIDRs across configured and compiled security policies. */
+    mergeSecurityPolicies(...policies: Array<Partial<ISecurityCompiledPolicy> | undefined>): ISecurityCompiledPolicy | undefined;
+    private getDesiredInboundProxyProtocolPolicy;
+    private getInboundProxyListenerKeys;
+    private mergeInboundProxyProtocolPolicies;
+}

package/dist_ts/security/classes.route-policy-augmenter.js

@@ -0,0 +1,120 @@
+import * as plugins from '../plugins.js';
+/**
+ * Pure route-policy transformations applied before routes reach SmartProxy:
+ * per-listener inbound PROXY protocol policies (driven by RemoteIngress and
+ * VPN) and merging of compiled security policies.
+ */
+export class RoutePolicyAugmenter {
+    dcRouterRef;
+    constructor(dcRouterRef) {
+        this.dcRouterRef = dcRouterRef;
+    }
+    /**
+     * Ensure every route on a shared listener carries a compatible
+     * inboundProxyProtocol policy, deriving defaults from RemoteIngress/VPN.
+     */
+    applyInboundProxyProtocolPolicies(routes) {
+        const policiesByListener = new Map();
+        for (const route of routes) {
+            const policy = route.match?.inboundProxyProtocol || this.getDesiredInboundProxyProtocolPolicy(route);
+            if (!policy) {
+                continue;
+            }
+            for (const listenerKey of this.getInboundProxyListenerKeys(route)) {
+                const mergedPolicy = this.mergeInboundProxyProtocolPolicies(policiesByListener.get(listenerKey), policy);
+                if (mergedPolicy) {
+                    policiesByListener.set(listenerKey, mergedPolicy);
+                }
+            }
+        }
+        if (policiesByListener.size === 0) {
+            return routes;
+        }
+        return routes.map((route) => {
+            if (route.match?.inboundProxyProtocol) {
+                return route;
+            }
+            let listenerPolicy;
+            for (const listenerKey of this.getInboundProxyListenerKeys(route)) {
+                listenerPolicy = this.mergeInboundProxyProtocolPolicies(listenerPolicy, policiesByListener.get(listenerKey));
+            }
+            if (!listenerPolicy) {
+                return route;
+            }
+            return {
+                ...route,
+                match: {
+                    ...route.match,
+                    inboundProxyProtocol: listenerPolicy,
+                },
+            };
+        });
+    }
+    /** Union blocked IPs/CIDRs across configured and compiled security policies. */
+    mergeSecurityPolicies(...policies) {
+        const blockedIps = new Set();
+        const blockedCidrs = new Set();
+        for (const policy of policies) {
+            for (const ip of policy?.blockedIps || []) {
+                if (ip)
+                    blockedIps.add(ip);
+            }
+            for (const cidr of policy?.blockedCidrs || []) {
+                if (cidr)
+                    blockedCidrs.add(cidr);
+            }
+        }
+        if (blockedIps.size === 0 && blockedCidrs.size === 0) {
+            return undefined;
+        }
+        return {
+            blockedIps: [...blockedIps].sort(),
+            blockedCidrs: [...blockedCidrs].sort(),
+        };
+    }
+    getDesiredInboundProxyProtocolPolicy(route) {
+        const dcRoute = route;
+        if (this.dcRouterRef.isRemoteIngressHubEnabled() && dcRoute.remoteIngress?.enabled) {
+            const ports = plugins.smartproxy.expandPortRange(route.match.ports);
+            if (ports.some((port) => port === 25 || port === 587)) {
+                return { mode: 'required' };
+            }
+            return { mode: 'optional' };
+        }
+        if (this.dcRouterRef.options.vpnConfig?.enabled) {
+            return { mode: 'optional' };
+        }
+        return undefined;
+    }
+    getInboundProxyListenerKeys(route) {
+        const ports = plugins.smartproxy.expandPortRange(route.match.ports);
+        const transports = route.match.transport === 'udp'
+            ? ['udp']
+            : route.match.transport === 'all'
+                ? ['tcp', 'udp']
+                : ['tcp'];
+        const keys = [];
+        for (const port of ports) {
+            for (const transport of transports) {
+                keys.push(`${transport}:${port}`);
+            }
+        }
+        return keys;
+    }
+    mergeInboundProxyProtocolPolicies(current, next) {
+        if (!current)
+            return next;
+        if (!next)
+            return current;
+        if (current.mode === 'required')
+            return current;
+        if (next.mode === 'required')
+            return next;
+        if (current.mode === 'optional')
+            return current;
+        if (next.mode === 'optional')
+            return next;
+        return current;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5yb3V0ZS1wb2xpY3ktYXVnbWVudGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvc2VjdXJpdHkvY2xhc3Nlcy5yb3V0ZS1wb2xpY3ktYXVnbWVudGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sZUFBZSxDQUFDO0FBT3pDOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sb0JBQW9CO0lBQ1g7SUFBcEIsWUFBb0IsV0FBcUI7UUFBckIsZ0JBQVcsR0FBWCxXQUFXLENBQVU7SUFBRyxDQUFDO0lBRTdDOzs7T0FHRztJQUNJLGlDQUFpQyxDQUN0QyxNQUF5QztRQUV6QyxNQUFNLGtCQUFrQixHQUFHLElBQUksR0FBRyxFQUF1QyxDQUFDO1FBRTFFLEtBQUssTUFBTSxLQUFLLElBQUksTUFBTSxFQUFFLENBQUM7WUFDM0IsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLEtBQUssRUFBRSxvQkFBb0IsSUFBSSxJQUFJLENBQUMsb0NBQW9DLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDckcsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO2dCQUNaLFNBQVM7WUFDWCxDQUFDO1lBQ0QsS0FBSyxNQUFNLFdBQVcsSUFBSSxJQUFJLENBQUMsMkJBQTJCLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDbEUsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLGlDQUFpQyxDQUN6RCxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEVBQ25DLE1BQU0sQ0FDUCxDQUFDO2dCQUNGLElBQUksWUFBWSxFQUFFLENBQUM7b0JBQ2pCLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsWUFBWSxDQUFDLENBQUM7Z0JBQ3BELENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztRQUVELElBQUksa0JBQWtCLENBQUMsSUFBSSxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ2xDLE9BQU8sTUFBTSxDQUFDO1FBQ2hCLENBQUM7UUFFRCxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUMxQixJQUFJLEtBQUssQ0FBQyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQztnQkFDdEMsT0FBTyxLQUFLLENBQUM7WUFDZixDQUFDO1lBQ0QsSUFBSSxjQUF1RCxDQUFDO1lBQzVELEtBQUssTUFBTSxXQUFXLElBQUksSUFBSSxDQUFDLDJCQUEyQixDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQ2xFLGNBQWMsR0FBRyxJQUFJLENBQUMsaUNBQWlDLENBQ3JELGNBQWMsRUFDZCxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQ3BDLENBQUM7WUFDSixDQUFDO1lBQ0QsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO2dCQUNwQixPQUFPLEtBQUssQ0FBQztZQUNmLENBQUM7WUFDRCxPQUFPO2dCQUNMLEdBQUcsS0FBSztnQkFDUixLQUFLLEVBQUU7b0JBQ0wsR0FBRyxLQUFLLENBQUMsS0FBSztvQkFDZCxvQkFBb0IsRUFBRSxjQUFjO2lCQUNyQzthQUNGLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxnRkFBZ0Y7SUFDekUscUJBQXFCLENBQzFCLEdBQUcsUUFBNkQ7UUFFaEUsTUFBTSxVQUFVLEdBQUcsSUFBSSxHQUFHLEVBQVUsQ0FBQztRQUNyQyxNQUFNLFlBQVksR0FBRyxJQUFJLEdBQUcsRUFBVSxDQUFDO1FBRXZDLEtBQUssTUFBTSxNQUFNLElBQUksUUFBUSxFQUFFLENBQUM7WUFDOUIsS0FBSyxNQUFNLEVBQUUsSUFBSSxNQUFNLEVBQUUsVUFBVSxJQUFJLEVBQUUsRUFBRSxDQUFDO2dCQUMxQyxJQUFJLEVBQUU7b0JBQUUsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUM3QixDQUFDO1lBQ0QsS0FBSyxNQUFNLElBQUksSUFBSSxNQUFNLEVBQUUsWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUFDO2dCQUM5QyxJQUFJLElBQUk7b0JBQUUsWUFBWSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNuQyxDQUFDO1FBQ0gsQ0FBQztRQUVELElBQUksVUFBVSxDQUFDLElBQUksS0FBSyxDQUFDLElBQUksWUFBWSxDQUFDLElBQUksS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNyRCxPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBRUQsT0FBTztZQUNMLFVBQVUsRUFBRSxDQUFDLEdBQUcsVUFBVSxDQUFDLENBQUMsSUFBSSxFQUFFO1lBQ2xDLFlBQVksRUFBRSxDQUFDLEdBQUcsWUFBWSxDQUFDLENBQUMsSUFBSSxFQUFFO1NBQ3ZDLENBQUM7SUFDSixDQUFDO0lBRU8sb0NBQW9DLENBQzFDLEtBQXNDO1FBRXRDLE1BQU0sT0FBTyxHQUFHLEtBQTZCLENBQUM7UUFDOUMsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLHlCQUF5QixFQUFFLElBQUksT0FBTyxDQUFDLGFBQWEsRUFBRSxPQUFPLEVBQUUsQ0FBQztZQUNuRixNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQVksQ0FBYSxDQUFDO1lBQ3ZGLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLEVBQUUsSUFBSSxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsQ0FBQztnQkFDdEQsT0FBTyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsQ0FBQztZQUM5QixDQUFDO1lBQ0QsT0FBTyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsQ0FBQztRQUM5QixDQUFDO1FBQ0QsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsT0FBTyxFQUFFLENBQUM7WUFDaEQsT0FBTyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsQ0FBQztRQUM5QixDQUFDO1FBQ0QsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVPLDJCQUEyQixDQUFDLEtBQXNDO1FBQ3hFLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBWSxDQUFhLENBQUM7UUFDdkYsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLEtBQUssS0FBSztZQUNoRCxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDVCxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLEtBQUssS0FBSztnQkFDL0IsQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQztnQkFDaEIsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDZCxNQUFNLElBQUksR0FBYSxFQUFFLENBQUM7UUFDMUIsS0FBSyxNQUFNLElBQUksSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUN6QixLQUFLLE1BQU0sU0FBUyxJQUFJLFVBQVUsRUFBRSxDQUFDO2dCQUNuQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsU0FBUyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUM7WUFDcEMsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFTyxpQ0FBaUMsQ0FDdkMsT0FBcUMsRUFDckMsSUFBa0M7UUFFbEMsSUFBSSxDQUFDLE9BQU87WUFBRSxPQUFPLElBQUksQ0FBQztRQUMxQixJQUFJLENBQUMsSUFBSTtZQUFFLE9BQU8sT0FBTyxDQUFDO1FBQzFCLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxVQUFVO1lBQUUsT0FBTyxPQUFPLENBQUM7UUFDaEQsSUFBSSxJQUFJLENBQUMsSUFBSSxLQUFLLFVBQVU7WUFBRSxPQUFPLElBQUksQ0FBQztRQUMxQyxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssVUFBVTtZQUFFLE9BQU8sT0FBTyxDQUFDO1FBQ2hELElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxVQUFVO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDMUMsT0FBTyxPQUFPLENBQUM7SUFDakIsQ0FBQztDQUNGIn0=

package/dist_ts/security/index.d.ts

@@ -2,3 +2,4 @@ export { SecurityLogger, SecurityLogLevel, SecurityEventType, type ISecurityEven
 export { IPReputationChecker, ReputationThreshold, IPType, type IReputationResult, type IIPReputationOptions } from './classes.ipreputationchecker.js';
 export { ContentScanner, ThreatCategory, type IScanResult, type IContentScannerOptions } from './classes.contentscanner.js';
 export { SecurityPolicyManager, type ISecurityPolicyManagerOptions, type IRemoteIngressFirewallSnapshot, } from './classes.security-policy-manager.js';
+export * from './classes.route-policy-augmenter.js';

package/dist_ts/security/index.js

@@ -2,4 +2,5 @@ export { SecurityLogger, SecurityLogLevel, SecurityEventType } from './classes.s
 export { IPReputationChecker, ReputationThreshold, IPType } from './classes.ipreputationchecker.js';
 export { ContentScanner, ThreatCategory } from './classes.contentscanner.js';
 export { SecurityPolicyManager, } from './classes.security-policy-manager.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9zZWN1cml0eS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsY0FBYyxFQUNkLGdCQUFnQixFQUNoQixpQkFBaUIsRUFFbEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEVBQ0wsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQixNQUFNLEVBR1AsTUFBTSxrQ0FBa0MsQ0FBQztBQUUxQyxPQUFPLEVBQ0wsY0FBYyxFQUNkLGNBQWMsRUFHZixNQUFNLDZCQUE2QixDQUFDO0FBRXJDLE9BQU8sRUFDTCxxQkFBcUIsR0FHdEIsTUFBTSxzQ0FBc0MsQ0FBQyJ9
+export * from './classes.route-policy-augmenter.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9zZWN1cml0eS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsY0FBYyxFQUNkLGdCQUFnQixFQUNoQixpQkFBaUIsRUFFbEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEVBQ0wsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQixNQUFNLEVBR1AsTUFBTSxrQ0FBa0MsQ0FBQztBQUUxQyxPQUFPLEVBQ0wsY0FBYyxFQUNkLGNBQWMsRUFHZixNQUFNLDZCQUE2QixDQUFDO0FBRXJDLE9BQU8sRUFDTCxxQkFBcUIsR0FHdEIsTUFBTSxzQ0FBc0MsQ0FBQztBQUM5QyxjQUFjLHFDQUFxQyxDQUFDIn0=

package/dist_ts/vpn/classes.vpn-access-resolver.d.ts

@@ -0,0 +1,34 @@
+import type { TVpnClientAllowEntry } from '../config/classes.route-config-manager.js';
+import type { IDcRouterRouteConfig } from '../../dist_ts_interfaces/data/remoteingress.js';
+import type { DcRouter } from '../classes.dcrouter.js';
+/**
+ * Resolves which VPN clients may access which routes and which IPs belong in
+ * a client's WireGuard AllowedIPs, including cached DNS resolution of
+ * VPN-gated route domains.
+ */
+export declare class VpnAccessResolver {
+    private dcRouterRef;
+    /** Cache for DNS-resolved IPs of VPN-gated domains. TTL: 5 minutes. */
+    private domainIpCache;
+    /** Deduplicate wildcard-resolution warnings for WireGuard AllowedIPs generation. */
+    private warnedWildcardDomains;
+    constructor(dcRouterRef: DcRouter);
+    /** Clear DNS and warning caches, e.g. after a VPN config change. */
+    reset(): void;
+    /**
+     * Build the per-route VPN client allow resolver handed to RouteConfigManager,
+     * or undefined when VPN is disabled.
+     */
+    createRouteAllowResolver(): ((route: IDcRouterRouteConfig, routeId?: string) => TVpnClientAllowEntry[]) | undefined;
+    /**
+     * Compute the WireGuard AllowedIPs for a client from its target profiles:
+     * the VPN subnet, direct target IPs, and DNS-resolved route domains.
+     */
+    getClientAllowedIPs(targetProfileIds: string[]): Promise<string[]>;
+    /**
+     * Resolve a domain's A record(s) for VPN AllowedIPs, with a 5-minute cache.
+     */
+    private resolveDomainIPs;
+    private isWildcardDomain;
+    private logSkippedWildcardAllowedIp;
+}

package/dist_ts/vpn/classes.vpn-access-resolver.js

@@ -0,0 +1,101 @@
+import { logger } from '../logger.js';
+/**
+ * Resolves which VPN clients may access which routes and which IPs belong in
+ * a client's WireGuard AllowedIPs, including cached DNS resolution of
+ * VPN-gated route domains.
+ */
+export class VpnAccessResolver {
+    dcRouterRef;
+    /** Cache for DNS-resolved IPs of VPN-gated domains. TTL: 5 minutes. */
+    domainIpCache = new Map();
+    /** Deduplicate wildcard-resolution warnings for WireGuard AllowedIPs generation. */
+    warnedWildcardDomains = new Set();
+    constructor(dcRouterRef) {
+        this.dcRouterRef = dcRouterRef;
+    }
+    /** Clear DNS and warning caches, e.g. after a VPN config change. */
+    reset() {
+        this.domainIpCache.clear();
+        this.warnedWildcardDomains.clear();
+    }
+    /**
+     * Build the per-route VPN client allow resolver handed to RouteConfigManager,
+     * or undefined when VPN is disabled.
+     */
+    createRouteAllowResolver() {
+        if (!this.dcRouterRef.options.vpnConfig?.enabled) {
+            return undefined;
+        }
+        return (route, routeId) => {
+            if (!this.dcRouterRef.vpnManager || !this.dcRouterRef.targetProfileManager) {
+                // VPN not ready yet — deny all until re-apply after VPN starts.
+                return [];
+            }
+            return this.dcRouterRef.targetProfileManager.getMatchingVpnClients(route, routeId, this.dcRouterRef.vpnManager.listClients(), this.dcRouterRef.routeConfigManager?.getRoutes() || new Map());
+        };
+    }
+    /**
+     * Compute the WireGuard AllowedIPs for a client from its target profiles:
+     * the VPN subnet, direct target IPs, and DNS-resolved route domains.
+     */
+    async getClientAllowedIPs(targetProfileIds) {
+        const subnet = this.dcRouterRef.options.vpnConfig?.subnet || '10.8.0.0/24';
+        const ips = new Set([subnet]);
+        const targetProfileManager = this.dcRouterRef.targetProfileManager;
+        if (!targetProfileManager)
+            return [...ips];
+        const allRoutes = this.dcRouterRef.routeConfigManager?.getRoutes() || new Map();
+        const { domains, targetIps } = targetProfileManager.getClientAccessSpec(targetProfileIds, allRoutes);
+        // Add target IPs directly
+        for (const ip of targetIps) {
+            ips.add(`${ip}/32`);
+        }
+        // Resolve DNS A records for matched domains (with caching)
+        for (const domain of domains) {
+            if (this.isWildcardDomain(domain)) {
+                this.logSkippedWildcardAllowedIp(domain);
+                continue;
+            }
+            const resolvedIps = await this.resolveDomainIPs(domain);
+            for (const ip of resolvedIps) {
+                ips.add(`${ip}/32`);
+            }
+        }
+        return [...ips];
+    }
+    /**
+     * Resolve a domain's A record(s) for VPN AllowedIPs, with a 5-minute cache.
+     */
+    async resolveDomainIPs(domain) {
+        const cached = this.domainIpCache.get(domain);
+        if (cached && cached.expiresAt > Date.now()) {
+            return cached.ips;
+        }
+        try {
+            const { promises: dnsPromises } = await import('dns');
+            const ips = await dnsPromises.resolve4(domain);
+            this.domainIpCache.set(domain, { ips, expiresAt: Date.now() + 5 * 60 * 1000 });
+            // Evict oldest entries if cache exceeds 1000 entries
+            if (this.domainIpCache.size > 1000) {
+                const firstKey = this.domainIpCache.keys().next().value;
+                if (firstKey)
+                    this.domainIpCache.delete(firstKey);
+            }
+            return ips;
+        }
+        catch (err) {
+            logger.log('warn', `VPN: Failed to resolve ${domain} for AllowedIPs: ${err.message}`);
+            return cached?.ips || []; // Return stale cache on failure, or empty
+        }
+    }
+    isWildcardDomain(domain) {
+        return domain.includes('*');
+    }
+    logSkippedWildcardAllowedIp(domain) {
+        if (this.warnedWildcardDomains.has(domain))
+            return;
+        this.warnedWildcardDomains.add(domain);
+        logger.log('warn', `VPN: Skipping wildcard domain '${domain}' for WireGuard AllowedIPs; wildcard patterns must be resolved to concrete hostnames by matching routes.`);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy52cG4tYWNjZXNzLXJlc29sdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvdnBuL2NsYXNzZXMudnBuLWFjY2Vzcy1yZXNvbHZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBS3RDOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8saUJBQWlCO0lBTVI7SUFMcEIsdUVBQXVFO0lBQy9ELGFBQWEsR0FBRyxJQUFJLEdBQUcsRUFBZ0QsQ0FBQztJQUNoRixvRkFBb0Y7SUFDNUUscUJBQXFCLEdBQUcsSUFBSSxHQUFHLEVBQVUsQ0FBQztJQUVsRCxZQUFvQixXQUFxQjtRQUFyQixnQkFBVyxHQUFYLFdBQVcsQ0FBVTtJQUFHLENBQUM7SUFFN0Msb0VBQW9FO0lBQzdELEtBQUs7UUFDVixJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzNCLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksd0JBQXdCO1FBSTdCLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsT0FBTyxFQUFFLENBQUM7WUFDakQsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQztRQUVELE9BQU8sQ0FBQyxLQUEyQixFQUFFLE9BQWdCLEVBQUUsRUFBRTtZQUN2RCxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxVQUFVLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLG9CQUFvQixFQUFFLENBQUM7Z0JBQzNFLGdFQUFnRTtnQkFDaEUsT0FBTyxFQUFFLENBQUM7WUFDWixDQUFDO1lBRUQsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLG9CQUFvQixDQUFDLHFCQUFxQixDQUNoRSxLQUFLLEVBQ0wsT0FBTyxFQUNQLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLFdBQVcsRUFBRSxFQUN6QyxJQUFJLENBQUMsV0FBVyxDQUFDLGtCQUFrQixFQUFFLFNBQVMsRUFBRSxJQUFJLElBQUksR0FBRyxFQUFFLENBQzlELENBQUM7UUFDSixDQUFDLENBQUM7SUFDSixDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksS0FBSyxDQUFDLG1CQUFtQixDQUFDLGdCQUEwQjtRQUN6RCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsTUFBTSxJQUFJLGFBQWEsQ0FBQztRQUMzRSxNQUFNLEdBQUcsR0FBRyxJQUFJLEdBQUcsQ0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFFdEMsTUFBTSxvQkFBb0IsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLG9CQUFvQixDQUFDO1FBQ25FLElBQUksQ0FBQyxvQkFBb0I7WUFBRSxPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQztRQUUzQyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLGtCQUFrQixFQUFFLFNBQVMsRUFBRSxJQUFJLElBQUksR0FBRyxFQUFFLENBQUM7UUFFaEYsTUFBTSxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsR0FBRyxvQkFBb0IsQ0FBQyxtQkFBbUIsQ0FDckUsZ0JBQWdCLEVBQ2hCLFNBQVMsQ0FDVixDQUFDO1FBRUYsMEJBQTBCO1FBQzFCLEtBQUssTUFBTSxFQUFFLElBQUksU0FBUyxFQUFFLENBQUM7WUFDM0IsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDdEIsQ0FBQztRQUVELDJEQUEyRDtRQUMzRCxLQUFLLE1BQU0sTUFBTSxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQzdCLElBQUksSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7Z0JBQ2xDLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxNQUFNLENBQUMsQ0FBQztnQkFDekMsU0FBUztZQUNYLENBQUM7WUFDRCxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUN4RCxLQUFLLE1BQU0sRUFBRSxJQUFJLFdBQVcsRUFBRSxDQUFDO2dCQUM3QixHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN0QixDQUFDO1FBQ0gsQ0FBQztRQUVELE9BQU8sQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDO0lBQ2xCLENBQUM7SUFFRDs7T0FFRztJQUNLLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFjO1FBQzNDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzlDLElBQUksTUFBTSxJQUFJLE1BQU0sQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUM7WUFDNUMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDO1FBQ3BCLENBQUM7UUFDRCxJQUFJLENBQUM7WUFDSCxNQUFNLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxHQUFHLE1BQU0sTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3RELE1BQU0sR0FBRyxHQUFHLE1BQU0sV0FBVyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUMvQyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksRUFBRSxDQUFDLENBQUM7WUFDL0UscURBQXFEO1lBQ3JELElBQUksSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLEdBQUcsSUFBSSxFQUFFLENBQUM7Z0JBQ25DLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDO2dCQUN4RCxJQUFJLFFBQVE7b0JBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDcEQsQ0FBQztZQUNELE9BQU8sR0FBRyxDQUFDO1FBQ2IsQ0FBQztRQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7WUFDYixNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSwwQkFBMEIsTUFBTSxvQkFBcUIsR0FBYSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDakcsT0FBTyxNQUFNLEVBQUUsR0FBRyxJQUFJLEVBQUUsQ0FBQyxDQUFDLDBDQUEwQztRQUN0RSxDQUFDO0lBQ0gsQ0FBQztJQUVPLGdCQUFnQixDQUFDLE1BQWM7UUFDckMsT0FBTyxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzlCLENBQUM7SUFFTywyQkFBMkIsQ0FBQyxNQUFjO1FBQ2hELElBQUksSUFBSSxDQUFDLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUM7WUFBRSxPQUFPO1FBQ25ELElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDdkMsTUFBTSxDQUFDLEdBQUcsQ0FDUixNQUFNLEVBQ04sa0NBQWtDLE1BQU0sMEdBQTBHLENBQ25KLENBQUM7SUFDSixDQUFDO0NBQ0YifQ==

package/dist_ts/vpn/index.d.ts

@@ -1 +1,2 @@
 export * from './classes.vpn-manager.js';
+export * from './classes.vpn-access-resolver.js';

package/dist_ts/vpn/index.js

@@ -1,2 +1,3 @@
 export * from './classes.vpn-manager.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy92cG4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywwQkFBMEIsQ0FBQyJ9
+export * from './classes.vpn-access-resolver.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy92cG4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLGtDQUFrQyxDQUFDIn0=