@push.rocks/smartproxy 30.0.1 → 31.0.0

package/ts/proxies/smart-proxy/utils/rust-config.ts

@@ -115,7 +115,10 @@ export function serializeRouteForRust(route: IRouteConfig): IRustRouteConfig {
   };
 }
 
-function serializeAcmeForRust(acme?: IAcmeOptions): IRustAcmeOptions | undefined {
+function serializeAcmeForRust(
+  acme: IAcmeOptions | undefined,
+  certProvisionFunction: ISmartProxyOptions['certProvisionFunction'],
+): IRustAcmeOptions | undefined {
   if (!acme) {
     return undefined;
   }
@@ -131,6 +134,9 @@ function serializeAcmeForRust(acme?: IAcmeOptions): IRustAcmeOptions | undefined
     autoRenew: acme.autoRenew,
     skipConfiguredCerts: acme.skipConfiguredCerts,
     renewCheckIntervalHours: acme.renewCheckIntervalHours,
+    // A certProvisionFunction owns provisioning and renewal; the engine orders
+    // only what it is asked to: 'http01' results and the ACME fallback.
+    autoProvision: certProvisionFunction ? false : undefined,
   };
 }
 
@@ -171,16 +177,14 @@ export function buildChallengeOptionsForRust(settings: ISmartProxyOptions): IRus
 export function buildRustProxyOptions(
   settings: ISmartProxyOptions,
   routes: IRustRouteConfig[],
-  acmeOverride?: IAcmeOptions,
   challengeOverride?: IRustChallengeOptions,
 ): IRustProxyOptions {
-  const acme = acmeOverride !== undefined ? acmeOverride : settings.acme;
-
   return {
     routes,
     preserveSourceIp: settings.preserveSourceIP,
     trustedProxyIPs: settings.trustedProxyIPs,
     sendProxyProtocol: settings.sendProxyProtocol,
+    backendTls: settings.backendTls,
     defaults: serializeDefaultsForRust(settings.defaults),
     connectionTimeout: settings.connectionTimeout,
     initialDataTimeout: settings.initialDataTimeout,
@@ -198,6 +202,7 @@ export function buildRustProxyOptions(
     enableDetailedLogging: settings.enableDetailedLogging,
     enableTlsDebugLogging: settings.enableTlsDebugLogging,
     enableRandomizedTimeouts: settings.enableRandomizedTimeouts,
+    // `null` travels as JSON `null`, which the engine reads as `None`: no per-IP limit.
     maxConnectionsPerIp: settings.maxConnectionsPerIP,
     connectionRateLimitPerMinute: settings.connectionRateLimitPerMinute,
     keepAliveTreatment: settings.keepAliveTreatment,
@@ -206,6 +211,6 @@ export function buildRustProxyOptions(
     metrics: settings.metrics,
     securityPolicy: settings.securityPolicy,
     challenge: challengeOverride || buildChallengeOptionsForRust(settings),
-    acme: serializeAcmeForRust(acme),
+    acme: serializeAcmeForRust(settings.acme, settings.certProvisionFunction),
   };
 }