@serve.zone/dcrouter 13.17.2 → 13.17.5

package/dist_ts/config/classes.target-profile-manager.js

@@ -7,7 +7,11 @@ import { TargetProfileDoc, VpnClientDoc } from '../db/index.js';
  * domains, specific IP:port targets, and/or direct route references.
  */
 export class TargetProfileManager {
+    getAllRoutes;
     profiles = new Map();
+    constructor(getAllRoutes) {
+        this.getAllRoutes = getAllRoutes;
+    }
     // =========================================================================
     // Lifecycle
     // =========================================================================
@@ -26,13 +30,14 @@ export class TargetProfileManager {
         }
         const id = plugins.uuid.v4();
         const now = Date.now();
+        const routeRefs = this.normalizeRouteRefs(data.routeRefs);
         const profile = {
             id,
             name: data.name,
             description: data.description,
             domains: data.domains,
             targets: data.targets,
-            routeRefs: data.routeRefs,
+            routeRefs,
             createdAt: now,
             updatedAt: now,
             createdBy: data.createdBy,
@@ -47,6 +52,13 @@ export class TargetProfileManager {
         if (!profile) {
             throw new Error(`Target profile '${id}' not found`);
         }
+        if (patch.name !== undefined && patch.name !== profile.name) {
+            for (const existing of this.profiles.values()) {
+                if (existing.id !== id && existing.name === patch.name) {
+                    throw new Error(`Target profile with name '${patch.name}' already exists (id: ${existing.id})`);
+                }
+            }
+        }
         if (patch.name !== undefined)
             profile.name = patch.name;
         if (patch.description !== undefined)
@@ -56,7 +68,7 @@ export class TargetProfileManager {
         if (patch.targets !== undefined)
             profile.targets = patch.targets;
         if (patch.routeRefs !== undefined)
-            profile.routeRefs = patch.routeRefs;
+            profile.routeRefs = this.normalizeRouteRefs(patch.routeRefs);
         profile.updatedAt = Date.now();
         await this.persistProfile(profile);
         logger.log('info', `Updated target profile '${profile.name}' (${id})`);
@@ -97,6 +109,24 @@ export class TargetProfileManager {
     getProfile(id) {
         return this.profiles.get(id);
     }
+    /**
+     * Normalize stored route references to route IDs when they can be resolved
+     * uniquely against the current route registry.
+     */
+    async normalizeAllRouteRefs() {
+        const allRoutes = this.getAllRoutes?.();
+        if (!allRoutes?.size)
+            return;
+        for (const profile of this.profiles.values()) {
+            const normalizedRouteRefs = this.normalizeRouteRefsAgainstRoutes(profile.routeRefs, allRoutes, 'bestEffort');
+            if (this.sameStringArray(profile.routeRefs, normalizedRouteRefs))
+                continue;
+            profile.routeRefs = normalizedRouteRefs;
+            profile.updatedAt = Date.now();
+            await this.persistProfile(profile);
+            logger.log('info', `Normalized route refs for target profile '${profile.name}' (${profile.id})`);
+        }
+    }
     listProfiles() {
         return [...this.profiles.values()];
     }
@@ -140,9 +170,10 @@ export class TargetProfileManager {
      * a subset of the route's wildcard. Plain IPs are returned for routeRef/target matches
      * or when profile domains exactly equal the route's domains.
      */
-    getMatchingClientIps(route, routeId, clients) {
+    getMatchingClientIps(route, routeId, clients, allRoutes = new Map()) {
         const entries = [];
         const routeDomains = route.match?.domains || [];
+        const routeNameIndex = this.buildRouteNameIndex(allRoutes);
         for (const client of clients) {
             if (!client.enabled || !client.assignedIp)
                 continue;
@@ -155,7 +186,7 @@ export class TargetProfileManager {
                 const profile = this.profiles.get(profileId);
                 if (!profile)
                     continue;
-                const matchResult = this.routeMatchesProfileDetailed(route, routeId, profile, routeDomains);
+                const matchResult = this.routeMatchesProfileDetailed(route, routeId, profile, routeDomains, routeNameIndex);
                 if (matchResult === 'full') {
                     fullAccess = true;
                     break; // No need to check more profiles
@@ -181,6 +212,7 @@ export class TargetProfileManager {
     getClientAccessSpec(targetProfileIds, allRoutes) {
         const domains = new Set();
         const targetIps = new Set();
+        const routeNameIndex = this.buildRouteNameIndex(allRoutes);
         // Collect all access specifiers from assigned profiles
         for (const profileId of targetProfileIds) {
             const profile = this.profiles.get(profileId);
@@ -202,7 +234,7 @@ export class TargetProfileManager {
             for (const [routeId, route] of allRoutes) {
                 if (!route.enabled)
                     continue;
-                if (this.routeMatchesProfile(route.route, routeId, profile)) {
+                if (this.routeMatchesProfile(route.route, routeId, profile, routeNameIndex)) {
                     const routeDomains = route.route.match?.domains;
                     if (Array.isArray(routeDomains)) {
                         for (const d of routeDomains) {
@@ -223,9 +255,9 @@ export class TargetProfileManager {
     /**
      * Check if a route matches a profile (boolean convenience wrapper).
      */
-    routeMatchesProfile(route, routeId, profile) {
+    routeMatchesProfile(route, routeId, profile, routeNameIndex) {
         const routeDomains = route.match?.domains || [];
-        const result = this.routeMatchesProfileDetailed(route, routeId, profile, routeDomains);
+        const result = this.routeMatchesProfileDetailed(route, routeId, profile, routeDomains, routeNameIndex);
         return result !== 'none';
     }
     /**
@@ -236,13 +268,17 @@ export class TargetProfileManager {
      * - domain match where profile domains are a subset of route wildcard → 'scoped'
      * - domain match where domains are identical or profile is a wildcard → 'full'
      */
-    routeMatchesProfileDetailed(route, routeId, profile, routeDomains) {
+    routeMatchesProfileDetailed(route, routeId, profile, routeDomains, routeNameIndex) {
         // 1. Route reference match → full access
         if (profile.routeRefs?.length) {
             if (routeId && profile.routeRefs.includes(routeId))
                 return 'full';
-            if (route.name && profile.routeRefs.includes(route.name))
-                return 'full';
+            if (routeId && route.name && profile.routeRefs.includes(route.name)) {
+                const matchingRouteIds = routeNameIndex.get(route.name) || [];
+                if (matchingRouteIds.length === 1 && matchingRouteIds[0] === routeId) {
+                    return 'full';
+                }
+            }
         }
         // 2. Domain match
         if (profile.domains?.length && routeDomains.length) {
@@ -296,6 +332,57 @@ export class TargetProfileManager {
         }
         return false;
     }
+    normalizeRouteRefs(routeRefs) {
+        const allRoutes = this.getAllRoutes?.() || new Map();
+        return this.normalizeRouteRefsAgainstRoutes(routeRefs, allRoutes, 'strict');
+    }
+    normalizeRouteRefsAgainstRoutes(routeRefs, allRoutes, mode) {
+        if (!routeRefs?.length)
+            return undefined;
+        if (!allRoutes.size)
+            return [...new Set(routeRefs)];
+        const routeNameIndex = this.buildRouteNameIndex(allRoutes);
+        const normalizedRefs = new Set();
+        for (const routeRef of routeRefs) {
+            if (allRoutes.has(routeRef)) {
+                normalizedRefs.add(routeRef);
+                continue;
+            }
+            const matchingRouteIds = routeNameIndex.get(routeRef) || [];
+            if (matchingRouteIds.length === 1) {
+                normalizedRefs.add(matchingRouteIds[0]);
+                continue;
+            }
+            if (mode === 'bestEffort') {
+                normalizedRefs.add(routeRef);
+                continue;
+            }
+            if (matchingRouteIds.length > 1) {
+                throw new Error(`Route reference '${routeRef}' is ambiguous; use a route ID instead`);
+            }
+            throw new Error(`Route reference '${routeRef}' not found`);
+        }
+        return [...normalizedRefs];
+    }
+    buildRouteNameIndex(allRoutes) {
+        const routeNameIndex = new Map();
+        for (const [routeId, route] of allRoutes) {
+            const routeName = route.route.name;
+            if (!routeName)
+                continue;
+            const matchingRouteIds = routeNameIndex.get(routeName) || [];
+            matchingRouteIds.push(routeId);
+            routeNameIndex.set(routeName, matchingRouteIds);
+        }
+        return routeNameIndex;
+    }
+    sameStringArray(left, right) {
+        if (!left?.length && !right?.length)
+            return true;
+        if (!left || !right || left.length !== right.length)
+            return false;
+        return left.every((value, index) => value === right[index]);
+    }
     // =========================================================================
     // Private: persistence
     // =========================================================================
@@ -346,4 +433,4 @@ export class TargetProfileManager {
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.target-profile-manager.js","sourceRoot":"","sources":["../../../ts/config/classes.target-profile-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAKhE;;;;GAIG;AACH,MAAM,OAAO,oBAAoB;IACvB,QAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;IAErD,4EAA4E;IAC5E,YAAY;IACZ,4EAA4E;IAErE,KAAK,CAAC,UAAU;QACrB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IAC5B,CAAC;IAED,4EAA4E;IAC5E,OAAO;IACP,4EAA4E;IAErE,KAAK,CAAC,aAAa,CAAC,IAO1B;QACC,+BAA+B;QAC/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC9C,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,IAAI,yBAAyB,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC;YACjG,CAAC;QACH,CAAC;QAED,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,MAAM,OAAO,GAAmB;YAC9B,EAAE;YACF,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,OAAO,CAAC,IAAI,MAAM,EAAE,GAAG,CAAC,CAAC;QACvE,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,EAAU,EACV,KAAsE;QAEtE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxD,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS;YAAE,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QAC7E,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QACjE,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QACjE,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;YAAE,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACvE,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE/B,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,OAAO,CAAC,IAAI,MAAM,EAAE,GAAG,CAAC,CAAC;IACzE,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,EAAU,EACV,KAAe;QAEf,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,CAAC;QACzE,CAAC;QAED,kDAAkD;QAClD,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;QAC7C,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC,CACxC,CAAC;QAEF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5C,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,YAAY,OAAO,CAAC,IAAI,kBAAkB,kBAAkB,CAAC,MAAM,2CAA2C;aACxH,CAAC;QACJ,CAAC;QAED,iBAAiB;QACjB,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAChD,IAAI,GAAG;YAAE,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;QAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEzB,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,kCAAkC;YAClC,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE,CAAC;gBACxC,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;gBAC/E,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC9B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,OAAO,CAAC,IAAI,wBAAwB,kBAAkB,CAAC,MAAM,YAAY,CAAC,CAAC;QACjI,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,OAAO,CAAC,IAAI,MAAM,EAAE,GAAG,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAEM,UAAU,CAAC,EAAU;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAEM,YAAY;QACjB,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACrC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,eAAe,CAAC,SAAiB;QAC5C,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;QAC7C,OAAO,OAAO;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;aACtD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,4EAA4E;IAC5E,wCAAwC;IACxC,4EAA4E;IAE5E;;;;OAIG;IACI,kBAAkB,CAAC,gBAA0B;QAClD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;QAC9B,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YACzC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM;gBAAE,SAAS;YACxC,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBAChC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAChB,CAAC;QACH,CAAC;QACD,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,4EAA4E;IAC5E,oCAAoC;IACpC,4EAA4E;IAE5E;;;;;;;OAOG;IACI,oBAAoB,CACzB,KAA2B,EAC3B,OAA2B,EAC3B,OAAuB;QAEvB,MAAM,OAAO,GAAsD,EAAE,CAAC;QACtE,MAAM,YAAY,GAAc,KAAK,CAAC,KAAa,EAAE,OAAO,IAAI,EAAE,CAAC;QAEnE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU;gBAAE,SAAS;YACpD,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM;gBAAE,SAAS;YAE/C,oEAAoE;YACpE,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;YAExC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAChD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC7C,IAAI,CAAC,OAAO;oBAAE,SAAS;gBAEvB,MAAM,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;gBAC5F,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;oBAC3B,UAAU,GAAG,IAAI,CAAC;oBAClB,MAAM,CAAC,iCAAiC;gBAC1C,CAAC;gBACD,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;oBAC3B,KAAK,MAAM,CAAC,IAAI,WAAW,CAAC,OAAO;wBAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;YAED,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC;iBAAM,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAClC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;OAGG;IACI,mBAAmB,CACxB,gBAA0B,EAC1B,SAA8B;QAE9B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;QAEpC,uDAAuD;QACvD,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YACzC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO;gBAAE,SAAS;YAEvB,wBAAwB;YACxB,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC5B,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC;YACH,CAAC;YAED,2BAA2B;YAC3B,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC5B,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBAChC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC;YAED,oCAAoC;YACpC,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;gBACzC,IAAI,CAAC,KAAK,CAAC,OAAO;oBAAE,SAAS;gBAC7B,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAA6B,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;oBACpF,MAAM,YAAY,GAAI,KAAK,CAAC,KAAK,CAAC,KAAa,EAAE,OAAO,CAAC;oBACzD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;wBAChC,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;4BAC7B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;wBACjB,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO;YACL,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;YACrB,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;SAC1B,CAAC;IACJ,CAAC;IAED,4EAA4E;IAC5E,0BAA0B;IAC1B,4EAA4E;IAE5E;;OAEG;IACK,mBAAmB,CACzB,KAA2B,EAC3B,OAA2B,EAC3B,OAAuB;QAEvB,MAAM,YAAY,GAAc,KAAK,CAAC,KAAa,EAAE,OAAO,IAAI,EAAE,CAAC;QACnE,MAAM,MAAM,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QACvF,OAAO,MAAM,KAAK,MAAM,CAAC;IAC3B,CAAC;IAED;;;;;;;OAOG;IACK,2BAA2B,CACjC,KAA2B,EAC3B,OAA2B,EAC3B,OAAuB,EACvB,YAAsB;QAEtB,yCAAyC;QACzC,IAAI,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YAC9B,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,OAAO,MAAM,CAAC;YAClE,IAAI,KAAK,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,OAAO,MAAM,CAAC;QAC1E,CAAC;QAED,kBAAkB;QAClB,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACnD,MAAM,qBAAqB,GAAa,EAAE,CAAC;YAE3C,KAAK,MAAM,aAAa,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC5C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;oBACvC,IAAI,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE,aAAa,CAAC;wBACrD,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;wBAC1D,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAC1C,MAAM,CAAC,+CAA+C;oBACxD,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrC,mFAAmF;gBACnF,MAAM,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAC/C,qBAAqB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAChC,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,EAAE,CAAC,CAC/C,CACF,CAAC;gBACF,IAAI,cAAc;oBAAE,OAAO,MAAM,CAAC;gBAElC,yEAAyE;gBACzE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC;YAC5D,CAAC;QACH,CAAC;QAED,kEAAkE;QAClE,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YAC5B,MAAM,YAAY,GAAI,KAAK,CAAC,MAAc,EAAE,OAAO,CAAC;YACpD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;gBAChC,KAAK,MAAM,aAAa,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBAC5C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;wBACvC,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;wBACnC,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;wBACnC,IAAI,SAAS,KAAK,aAAa,CAAC,EAAE,IAAI,SAAS,KAAK,aAAa,CAAC,IAAI,EAAE,CAAC;4BACvE,OAAO,MAAM,CAAC;wBAChB,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACK,oBAAoB,CAAC,MAAc,EAAE,OAAe;QAC1D,IAAI,OAAO,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC;QACpC,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB;YAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAClE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,4EAA4E;IAC5E,uBAAuB;IACvB,4EAA4E;IAEpE,KAAK,CAAC,YAAY;QACxB,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;gBACX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE;oBACxB,EAAE,EAAE,GAAG,CAAC,EAAE;oBACV,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,WAAW,EAAE,GAAG,CAAC,WAAW;oBAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,SAAS,EAAE,GAAG,CAAC,SAAS;iBACzB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,iCAAiC,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAuB;QAClD,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI,WAAW,EAAE,CAAC;YAChB,WAAW,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAChC,WAAW,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;YAC9C,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YACtC,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YACtC,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAC1C,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAC1C,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACnC,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;YACpB,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YACxB,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;YACtC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAC9B,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAC9B,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAClC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAClC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAClC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAClC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;IACH,CAAC;CACF"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.target-profile-manager.js","sourceRoot":"","sources":["../../../ts/config/classes.target-profile-manager.ts"],"names":[],"mappings":"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"}

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

@@ -52,6 +52,8 @@ export declare class VpnManager {
     private vpnServer?;
     private clients;
     private serverKeys?;
+    private resolvedForwardingMode?;
+    private forwardingModeOverride?;
     constructor(config: IVpnManagerConfig);
     /** The VPN subnet CIDR. */
     getSubnet(): string;
@@ -144,8 +146,7 @@ export declare class VpnManager {
     } | null;
     /**
      * Build per-client security settings for the smartvpn daemon.
-     * All VPN traffic is forced through SmartProxy (forceTarget to 127.0.0.1).
-     * TargetProfile direct IP:port targets bypass SmartProxy via allowList.
+     * TargetProfile direct IP:port targets extend the effective allow-list.
      */
     private buildClientSecurity;
     /**
@@ -155,5 +156,13 @@ export declare class VpnManager {
     refreshAllClientSecurity(): Promise<void>;
     private loadOrGenerateServerKeys;
     private loadPersistedClients;
+    private getResolvedForwardingMode;
+    private getDefaultDestinationPolicy;
+    private getServerDestinationPolicy;
+    private getBaseDestinationPolicy;
+    private mergeDestinationLists;
+    private normalizeClientRoutingSettings;
+    private buildClientRuntimeUpdate;
+    private ensureForwardingModeForHostIpClient;
     private persistClient;
 }