@serve.zone/dcrouter 17.9.6 → 17.10.0

package/ts/dns/classes.gateway-route-dns-reconciler.ts

@@ -17,6 +17,7 @@ export interface IGatewayRouteDnsReconcileOptions {
   gatewayClientId: string;
   hostname?: string;
   mode?: plugins.servezoneInterfaces.data.TGatewayRouteDnsMode;
+  proxied?: boolean;
   delete?: boolean;
 }
 
@@ -131,7 +132,8 @@ export class GatewayRouteDnsReconciler {
     const targetIp = optionsArg.delete
       ? undefined
       : this.getDesiredTargetIp(optionsArg.gatewayClientId, hostname);
-    const workKey = this.buildWorkKey(optionsArg, hostname, mode, targetIp);
+    const proxied = optionsArg.proxied ?? false;
+    const workKey = this.buildWorkKey(optionsArg, hostname, mode, targetIp, proxied);
     const latestIntent = this.latestIntentByHostname.get(hostname);
     if (latestIntent?.workKey === workKey) return await latestIntent.promise;
 
@@ -154,6 +156,7 @@ export class GatewayRouteDnsReconciler {
         mode,
         checkedAt,
         targetIp,
+        proxied,
         executionArg.providerZoneRefreshes,
       );
     });
@@ -181,6 +184,7 @@ export class GatewayRouteDnsReconciler {
     mode: Exclude<plugins.servezoneInterfaces.data.TGatewayRouteDnsMode, 'skip'>,
     checkedAt: number,
     targetIp: string | undefined,
+    proxied: boolean,
     providerZoneRefreshes?: Map<string, Promise<IProviderZoneRefreshResult>>,
   ): Promise<TGatewayDnsResult> {
     const claimOwnerId = this.buildClaimOwnerId(optionsArg.gatewayClientId, hostname);
@@ -293,9 +297,13 @@ export class GatewayRouteDnsReconciler {
     const desired = records.find((recordArg) => recordArg.type === recordType
       && recordArg.value === targetIp
       && recordArg.ttl === GATEWAY_ROUTE_DNS_TTL
-      && recordArg.proxied === false);
+      && recordArg.proxied === proxied);
     if (mode === 'observe') {
-      const satisfied = records.some((recordArg) => recordArg.type === recordType && recordArg.value === targetIp);
+      const satisfied = records.some((recordArg) => {
+        return recordArg.type === recordType
+          && recordArg.value === targetIp
+          && recordArg.proxied === proxied;
+      });
       return {
         success: satisfied,
         retryable: !satisfied,
@@ -327,7 +335,7 @@ export class GatewayRouteDnsReconciler {
         type: recordType,
         value: targetIp,
         ttl: GATEWAY_ROUTE_DNS_TTL,
-        proxied: false,
+        proxied,
         managedBy: GATEWAY_ROUTE_DNS_MANAGED_BY,
         managedOwnerId: claimOwnerId,
         managedRecordKey: stableKey,
@@ -373,7 +381,7 @@ export class GatewayRouteDnsReconciler {
         type: recordType,
         value: targetIp,
         ttl: GATEWAY_ROUTE_DNS_TTL,
-        proxied: false,
+        proxied,
         createdBy: GATEWAY_ROUTE_DNS_MANAGED_BY,
         managedBy: GATEWAY_ROUTE_DNS_MANAGED_BY,
         managedOwnerId: claimOwnerId,
@@ -453,7 +461,14 @@ export class GatewayRouteDnsReconciler {
       activeOwners.add(claimOwnerId);
       if (!isFirstRouteForClaim) continue;
       const result = await this.reconcileRouteWithExecution(
-        { externalKey, gatewayClientId, hostname, mode: 'reconcile' },
+        {
+          externalKey,
+          gatewayClientId,
+          hostname,
+          mode: 'reconcile',
+          ...(typeof route.metadata.gatewayDnsProxied === 'boolean'
+            ? { proxied: route.metadata.gatewayDnsProxied } : {}),
+        },
         { respectCooldown: !force, providerZoneRefreshes },
       );
       if (!result.success) {
@@ -605,6 +620,7 @@ export class GatewayRouteDnsReconciler {
     hostnameArg: string,
     modeArg: Exclude<plugins.servezoneInterfaces.data.TGatewayRouteDnsMode, 'skip'>,
     targetIpArg: string | undefined,
+    proxiedArg: boolean,
   ): string {
     return JSON.stringify({
       hostname: hostnameArg,
@@ -613,6 +629,7 @@ export class GatewayRouteDnsReconciler {
       mode: modeArg,
       delete: optionsArg.delete === true,
       targetIp: targetIpArg || null,
+      proxied: proxiedArg,
       claims: this.getActiveClaimsForHostname(hostnameArg),
     });
   }

package/ts/opsserver/handlers/gatewayclient.handler.ts

@@ -391,7 +391,7 @@ export class GatewayClientHandler {
         async (dataArg) => {
           const auth = await this.requireAuth(dataArg, 'gateway-clients:write');
           this.assertCapability(auth, 'syncRoutes');
-          return await this.syncGatewayClientRoute(auth, dataArg.ownership, dataArg.route, dataArg.enabled, dataArg.delete, dataArg.sourceProfileRef, dataArg.dnsMode);
+          return await this.syncGatewayClientRoute(auth, dataArg.ownership, dataArg.route, dataArg.enabled, dataArg.delete, dataArg.sourceProfileRef, dataArg.dnsMode, dataArg.dnsProxied);
         },
       ),
     );
@@ -1053,6 +1053,8 @@ export class GatewayClientHandler {
       ownership,
       route,
       sourceProfileRef: metadata.sourceBindings?.find((bindingArg) => bindingArg.sourceProfileRef)?.sourceProfileRef,
+      dnsMode: metadata.gatewayDnsMode,
+      dnsProxied: metadata.gatewayDnsProxied,
       managePath: `/routes/${routeArg.id}`,
     };
   }
@@ -1209,6 +1211,7 @@ export class GatewayClientHandler {
     deleteRoute?: boolean,
     sourceProfileRef?: string,
     dnsModeArg?: plugins.servezoneInterfaces.data.TGatewayRouteDnsMode,
+    dnsProxiedArg?: boolean,
   ): Promise<plugins.servezoneInterfaces.data.IGatewayRouteSyncResult> {
     const validatedRoute = route === undefined ? undefined : this.validateGatewayRouteConfig(route);
     const resolvedOwnership = this.resolveGatewayClientOwnership(auth, ownership);
@@ -1227,6 +1230,8 @@ export class GatewayClientHandler {
     return await this.withRouteSyncLock(externalKey, async () => {
     const existingRoute = manager.findApiRouteByExternalKey(externalKey);
     const dnsMode = dnsModeArg || existingRoute?.metadata?.gatewayDnsMode || 'skip';
+    const dnsProxied = dnsProxiedArg
+      ?? existingRoute?.metadata?.gatewayDnsProxied;
     const includeDns = dnsModeArg !== undefined || dnsMode !== 'skip';
     if (dnsMode === 'observe') this.assertCapability(auth, 'readDnsRecords');
     if (dnsMode === 'reconcile') this.assertCapability(auth, 'syncDnsRecords');
@@ -1236,6 +1241,7 @@ export class GatewayClientHandler {
       externalKeyArg: string,
       deleteArg = false,
       effectiveModeArg = dnsMode,
+      proxiedArg = dnsProxied,
     ) => {
       const reconciler = this.opsServerRef.dcRouterRef.gatewayRouteDnsReconciler;
       if (!reconciler) {
@@ -1256,6 +1262,8 @@ export class GatewayClientHandler {
           mode: effectiveModeArg,
           gatewayClientId: gatewayClientIdArg,
           delete: deleteArg,
+          ...(!deleteArg && typeof proxiedArg === 'boolean'
+            ? { proxied: proxiedArg } : {}),
         });
       } catch (error) {
         return {
@@ -1270,12 +1278,14 @@ export class GatewayClientHandler {
       }
     };
     const reconcileDns = async (deleteArg = false, effectiveModeArg = dnsMode) => {
+      const proxied = deleteArg ? undefined : dnsProxied;
       return await reconcileDnsFor(
         resolvedOwnership.hostname,
         resolvedOwnership.gatewayClientId,
         externalKey,
         deleteArg,
         effectiveModeArg,
+        proxied,
       );
     };
 
@@ -1288,6 +1298,7 @@ export class GatewayClientHandler {
       }
       const snapshot = structuredClone(existingRoute);
       const existingDnsMode = snapshot.metadata?.gatewayDnsMode || dnsMode;
+      const existingDnsProxied = snapshot.metadata?.gatewayDnsProxied;
       const disableResult = await manager.updateManagedRoute(existingRoute.id, {
         enabled: false,
       });
@@ -1330,6 +1341,7 @@ export class GatewayClientHandler {
           snapshot.metadata?.externalKey || externalKey,
           false,
           'reconcile',
+          existingDnsProxied,
         );
       }
       return {
@@ -1367,6 +1379,8 @@ export class GatewayClientHandler {
       gatewayClientAppId: resolvedOwnership.appId,
       externalKey,
       gatewayDnsMode: dnsMode,
+      ...(typeof dnsProxied === 'boolean'
+        ? { gatewayDnsProxied: dnsProxied } : {}),
     };
     const normalizedRoute = this.normalizeGatewayClientRoute(validatedRoute, resolvedOwnership, externalKey);
     if (!normalizedRoute.ingress) {
@@ -1387,6 +1401,7 @@ export class GatewayClientHandler {
       const snapshot = structuredClone(existingRoute);
       const snapshotHostname = this.getRouteHostnames(snapshot.route)[0];
       const snapshotDnsMode = snapshot.metadata?.gatewayDnsMode || 'skip';
+      const snapshotDnsProxied = snapshot.metadata?.gatewayDnsProxied;
       const snapshotGatewayClientId = snapshot.metadata?.gatewayClientId || resolvedOwnership.gatewayClientId;
       const snapshotExternalKey = snapshot.metadata?.externalKey || externalKey;
       const shouldCleanPreviousDns = snapshotDnsMode === 'reconcile'
@@ -1425,6 +1440,7 @@ export class GatewayClientHandler {
               snapshotExternalKey,
               false,
               'reconcile',
+              snapshotDnsProxied,
             );
             if (!restoredDns.success) {
               cleanupDns.status = 'compensation-failed';
@@ -1451,6 +1467,7 @@ export class GatewayClientHandler {
           snapshotExternalKey,
           false,
           'reconcile',
+          snapshotDnsProxied,
         );
         if (!restoredDns.success) {
           dns.status = 'compensation-failed';

package/ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/dcrouter',
-  version: '17.9.6',
+  version: '17.10.0',
   description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 }