@serve.zone/dcrouter 13.1.2 → 13.1.3

package/dist_serve/bundle.js

@@ -45058,4 +45058,4 @@ ibantools/jsnext/ibantools.js:
    * @preferred
    *)
 */
-//# sourceMappingURL=bundle-1775602027263.js.map
+//# sourceMappingURL=bundle-1775609807124.js.map

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@serve.zone/dcrouter',
-    version: '13.1.2',
+    version: '13.1.3',
     description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=

package/dist_ts/opsserver/handlers/certificate.handler.d.ts

@@ -1,4 +1,17 @@
 import type { OpsServer } from '../classes.opsserver.js';
+/**
+ * Mirrors `SmartacmeCertMatcher.getCertificateDomainNameByDomainName` from
+ * @push.rocks/smartacme. Inlined here because the original is `private` on
+ * SmartAcme. The cert identity ('task.vc' for both 'outline.task.vc' and
+ * '*.task.vc') is what AcmeCertDoc is keyed by, so two route domains with
+ * the same identity share the same underlying ACME cert.
+ *
+ * Returns undefined for domains with 4+ levels (matching smartacme's
+ * "deeper domains not supported" behavior) and for malformed inputs.
+ *
+ * Exported for unit testing.
+ */
+export declare function deriveCertDomainName(domain: string): string | undefined;
 export declare class CertificateHandler {
     private opsServerRef;
     constructor(opsServerRef: OpsServer);
@@ -31,6 +44,24 @@ export declare class CertificateHandler {
      *   we trigger via routeConfigManager.applyRoutes().
      */
     private reprovisionCertificateDomain;
+    /**
+     * After a force-renew, walk every route in the smartproxy that resolves to
+     * the same cert identity as `forcedDomain` and write the freshly-issued cert
+     * PEM into ProxyCertDoc for each. This guarantees that the next applyRoutes
+     * → provisionCertificatesViaCallback iteration will hot-swap every sibling's
+     * rust loaded_certs entry with the new (correct) PEM, rather than relying on
+     * the in-memory cert returned by smartacme's per-domain cache.
+     *
+     * Why this is necessary:
+     *   Rust's `loaded_certs` is a HashMap<domain, TlsCertConfig>. Each
+     *   bridge.loadCertificate(domain, ...) only swaps that one entry. The
+     *   fire-and-forget cert provisioning path triggered by updateRoutes does
+     *   eventually iterate every auto-cert route, but it returns the cached
+     *   (broken pre-fix) cert from smartacme's per-domain mutex. With this
+     *   helper, ProxyCertDoc is updated synchronously to the correct PEM before
+     *   applyRoutes runs, so even the transient window stays consistent.
+     */
+    private propagateCertToSiblings;
     /**
      * Delete certificate data for a domain from storage
      */

package/dist_ts/opsserver/handlers/certificate.handler.js

@@ -1,6 +1,28 @@
 import * as plugins from '../../plugins.js';
 import * as interfaces from '../../../dist_ts_interfaces/index.js';
 import { AcmeCertDoc, ProxyCertDoc } from '../../db/index.js';
+import { logger } from '../../logger.js';
+/**
+ * Mirrors `SmartacmeCertMatcher.getCertificateDomainNameByDomainName` from
+ * @push.rocks/smartacme. Inlined here because the original is `private` on
+ * SmartAcme. The cert identity ('task.vc' for both 'outline.task.vc' and
+ * '*.task.vc') is what AcmeCertDoc is keyed by, so two route domains with
+ * the same identity share the same underlying ACME cert.
+ *
+ * Returns undefined for domains with 4+ levels (matching smartacme's
+ * "deeper domains not supported" behavior) and for malformed inputs.
+ *
+ * Exported for unit testing.
+ */
+export function deriveCertDomainName(domain) {
+    if (domain.startsWith('*.')) {
+        return domain.slice(2);
+    }
+    const parts = domain.split('.');
+    if (parts.length < 2 || parts.length > 3)
+        return undefined;
+    return parts.slice(-2).join('.');
+}
 export class CertificateHandler {
     opsServerRef;
     constructor(opsServerRef) {
@@ -307,13 +329,35 @@ export class CertificateHandler {
         }
         // If forceRenew, order a fresh cert from ACME now so it's already in
         // AcmeCertDoc by the time certProvisionFunction is invoked below.
+        //
+        // includeWildcard: when forcing a non-wildcard subdomain renewal, we still
+        // want the wildcard SAN in the order so the new cert keeps covering every
+        // sibling. Without this, smartacme defaults to includeWildcard: false and
+        // the re-issued cert would have only the base domain as SAN, breaking every
+        // sibling subdomain that was previously covered by the same wildcard cert.
         if (forceRenew && dcRouter.smartAcme) {
+            let newCert;
             try {
-                await dcRouter.smartAcme.getCertificateForDomain(domain, { forceRenew: true });
+                newCert = await dcRouter.smartAcme.getCertificateForDomain(domain, {
+                    forceRenew: true,
+                    includeWildcard: !domain.startsWith('*.'),
+                });
             }
             catch (err) {
                 return { success: false, message: `Failed to renew certificate for ${domain}: ${err.message}` };
             }
+            // Propagate the freshly-issued cert PEM to every sibling route domain that
+            // shares the same cert identity. Without this, the rust hot-swap (keyed by
+            // exact domain in `loaded_certs`) only fires for the clicked route via the
+            // fire-and-forget cert provisioning path, leaving siblings serving the
+            // stale in-memory cert until the next background reload completes.
+            try {
+                await this.propagateCertToSiblings(domain, newCert);
+            }
+            catch (err) {
+                // Best-effort: failure here doesn't undo the cert issuance, just log.
+                logger.log('warn', `Failed to propagate force-renewed cert to siblings of ${domain}: ${err.message}`);
+            }
         }
         // Clear status map entry so it gets refreshed by the certificate-issued event
         dcRouter.certificateStatusMap.delete(domain);
@@ -336,6 +380,77 @@ export class CertificateHandler {
             return { success: false, message: err.message || `Failed to reprovision certificate for ${domain}` };
         }
     }
+    /**
+     * After a force-renew, walk every route in the smartproxy that resolves to
+     * the same cert identity as `forcedDomain` and write the freshly-issued cert
+     * PEM into ProxyCertDoc for each. This guarantees that the next applyRoutes
+     * → provisionCertificatesViaCallback iteration will hot-swap every sibling's
+     * rust loaded_certs entry with the new (correct) PEM, rather than relying on
+     * the in-memory cert returned by smartacme's per-domain cache.
+     *
+     * Why this is necessary:
+     *   Rust's `loaded_certs` is a HashMap<domain, TlsCertConfig>. Each
+     *   bridge.loadCertificate(domain, ...) only swaps that one entry. The
+     *   fire-and-forget cert provisioning path triggered by updateRoutes does
+     *   eventually iterate every auto-cert route, but it returns the cached
+     *   (broken pre-fix) cert from smartacme's per-domain mutex. With this
+     *   helper, ProxyCertDoc is updated synchronously to the correct PEM before
+     *   applyRoutes runs, so even the transient window stays consistent.
+     */
+    async propagateCertToSiblings(forcedDomain, newCert) {
+        const dcRouter = this.opsServerRef.dcRouterRef;
+        const smartProxy = dcRouter.smartProxy;
+        if (!smartProxy)
+            return;
+        const certIdentity = deriveCertDomainName(forcedDomain);
+        if (!certIdentity)
+            return;
+        // Collect every route domain whose cert identity matches.
+        const affected = new Set();
+        for (const route of smartProxy.routeManager.getRoutes()) {
+            if (!route.match.domains)
+                continue;
+            const routeDomains = Array.isArray(route.match.domains)
+                ? route.match.domains
+                : [route.match.domains];
+            for (const routeDomain of routeDomains) {
+                if (deriveCertDomainName(routeDomain) === certIdentity) {
+                    affected.add(routeDomain);
+                }
+            }
+        }
+        if (affected.size === 0)
+            return;
+        // Parse expiry from PEM (defense-in-depth — same pattern as
+        // ts/classes.dcrouter.ts:988-995 and the existing certStore.save callback).
+        let validUntil = newCert.validUntil;
+        let validFrom;
+        if (newCert.publicKey) {
+            try {
+                const x509 = new plugins.crypto.X509Certificate(newCert.publicKey);
+                validUntil = new Date(x509.validTo).getTime();
+                validFrom = new Date(x509.validFrom).getTime();
+            }
+            catch { /* fall back to smartacme's value */ }
+        }
+        // Persist new cert PEM under each affected route domain
+        for (const routeDomain of affected) {
+            let doc = await ProxyCertDoc.findByDomain(routeDomain);
+            if (!doc) {
+                doc = new ProxyCertDoc();
+                doc.domain = routeDomain;
+            }
+            doc.publicKey = newCert.publicKey;
+            doc.privateKey = newCert.privateKey;
+            doc.ca = '';
+            doc.validUntil = validUntil || 0;
+            doc.validFrom = validFrom || 0;
+            await doc.save();
+            // Clear status so the next event refresh shows the new cert
+            dcRouter.certificateStatusMap.delete(routeDomain);
+        }
+        logger.log('info', `Propagated force-renewed cert for ${forcedDomain} (cert identity '${certIdentity}') to ${affected.size} sibling route domain(s): ${[...affected].join(', ')}`);
+    }
     /**
      * Delete certificate data for a domain from storage
      */
@@ -456,4 +571,4 @@ export class CertificateHandler {
         return { success: true, message: `Certificate imported for '${cert.domainName}'` };
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/certificate.handler.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/certificate.handler.ts"],"names":[],"mappings":"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"}

package/dist_ts_web/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@serve.zone/dcrouter',
-    version: '13.1.2',
+    version: '13.1.3',
     description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@serve.zone/dcrouter",
   "private": false,
-  "version": "13.1.2",
+  "version": "13.1.3",
   "description": "A multifaceted routing service handling mail and SMS delivery functions.",
   "type": "module",
   "exports": {

package/ts/00_commitinfo_data.ts

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

package/ts/opsserver/handlers/certificate.handler.ts

@@ -2,6 +2,28 @@ import * as plugins from '../../plugins.js';
 import type { OpsServer } from '../classes.opsserver.js';
 import * as interfaces from '../../../ts_interfaces/index.js';
 import { AcmeCertDoc, ProxyCertDoc } from '../../db/index.js';
+import { logger } from '../../logger.js';
+
+/**
+ * Mirrors `SmartacmeCertMatcher.getCertificateDomainNameByDomainName` from
+ * @push.rocks/smartacme. Inlined here because the original is `private` on
+ * SmartAcme. The cert identity ('task.vc' for both 'outline.task.vc' and
+ * '*.task.vc') is what AcmeCertDoc is keyed by, so two route domains with
+ * the same identity share the same underlying ACME cert.
+ *
+ * Returns undefined for domains with 4+ levels (matching smartacme's
+ * "deeper domains not supported" behavior) and for malformed inputs.
+ *
+ * Exported for unit testing.
+ */
+export function deriveCertDomainName(domain: string): string | undefined {
+  if (domain.startsWith('*.')) {
+    return domain.slice(2);
+  }
+  const parts = domain.split('.');
+  if (parts.length < 2 || parts.length > 3) return undefined;
+  return parts.slice(-2).join('.');
+}
 
 export class CertificateHandler {
   constructor(private opsServerRef: OpsServer) {
@@ -363,12 +385,34 @@ export class CertificateHandler {
 
     // If forceRenew, order a fresh cert from ACME now so it's already in
     // AcmeCertDoc by the time certProvisionFunction is invoked below.
+    //
+    // includeWildcard: when forcing a non-wildcard subdomain renewal, we still
+    // want the wildcard SAN in the order so the new cert keeps covering every
+    // sibling. Without this, smartacme defaults to includeWildcard: false and
+    // the re-issued cert would have only the base domain as SAN, breaking every
+    // sibling subdomain that was previously covered by the same wildcard cert.
     if (forceRenew && dcRouter.smartAcme) {
+      let newCert: plugins.smartacme.Cert;
       try {
-        await dcRouter.smartAcme.getCertificateForDomain(domain, { forceRenew: true });
+        newCert = await dcRouter.smartAcme.getCertificateForDomain(domain, {
+          forceRenew: true,
+          includeWildcard: !domain.startsWith('*.'),
+        });
       } catch (err: unknown) {
         return { success: false, message: `Failed to renew certificate for ${domain}: ${(err as Error).message}` };
       }
+
+      // Propagate the freshly-issued cert PEM to every sibling route domain that
+      // shares the same cert identity. Without this, the rust hot-swap (keyed by
+      // exact domain in `loaded_certs`) only fires for the clicked route via the
+      // fire-and-forget cert provisioning path, leaving siblings serving the
+      // stale in-memory cert until the next background reload completes.
+      try {
+        await this.propagateCertToSiblings(domain, newCert);
+      } catch (err: unknown) {
+        // Best-effort: failure here doesn't undo the cert issuance, just log.
+        logger.log('warn', `Failed to propagate force-renewed cert to siblings of ${domain}: ${(err as Error).message}`);
+      }
     }
 
     // Clear status map entry so it gets refreshed by the certificate-issued event
@@ -392,6 +436,86 @@ export class CertificateHandler {
     }
   }
 
+  /**
+   * After a force-renew, walk every route in the smartproxy that resolves to
+   * the same cert identity as `forcedDomain` and write the freshly-issued cert
+   * PEM into ProxyCertDoc for each. This guarantees that the next applyRoutes
+   * → provisionCertificatesViaCallback iteration will hot-swap every sibling's
+   * rust loaded_certs entry with the new (correct) PEM, rather than relying on
+   * the in-memory cert returned by smartacme's per-domain cache.
+   *
+   * Why this is necessary:
+   *   Rust's `loaded_certs` is a HashMap<domain, TlsCertConfig>. Each
+   *   bridge.loadCertificate(domain, ...) only swaps that one entry. The
+   *   fire-and-forget cert provisioning path triggered by updateRoutes does
+   *   eventually iterate every auto-cert route, but it returns the cached
+   *   (broken pre-fix) cert from smartacme's per-domain mutex. With this
+   *   helper, ProxyCertDoc is updated synchronously to the correct PEM before
+   *   applyRoutes runs, so even the transient window stays consistent.
+   */
+  private async propagateCertToSiblings(
+    forcedDomain: string,
+    newCert: plugins.smartacme.Cert,
+  ): Promise<void> {
+    const dcRouter = this.opsServerRef.dcRouterRef;
+    const smartProxy = dcRouter.smartProxy;
+    if (!smartProxy) return;
+
+    const certIdentity = deriveCertDomainName(forcedDomain);
+    if (!certIdentity) return;
+
+    // Collect every route domain whose cert identity matches.
+    const affected = new Set<string>();
+    for (const route of smartProxy.routeManager.getRoutes()) {
+      if (!route.match.domains) continue;
+      const routeDomains = Array.isArray(route.match.domains)
+        ? route.match.domains
+        : [route.match.domains];
+      for (const routeDomain of routeDomains) {
+        if (deriveCertDomainName(routeDomain) === certIdentity) {
+          affected.add(routeDomain);
+        }
+      }
+    }
+
+    if (affected.size === 0) return;
+
+    // Parse expiry from PEM (defense-in-depth — same pattern as
+    // ts/classes.dcrouter.ts:988-995 and the existing certStore.save callback).
+    let validUntil = newCert.validUntil;
+    let validFrom: number | undefined;
+    if (newCert.publicKey) {
+      try {
+        const x509 = new plugins.crypto.X509Certificate(newCert.publicKey);
+        validUntil = new Date(x509.validTo).getTime();
+        validFrom = new Date(x509.validFrom).getTime();
+      } catch { /* fall back to smartacme's value */ }
+    }
+
+    // Persist new cert PEM under each affected route domain
+    for (const routeDomain of affected) {
+      let doc = await ProxyCertDoc.findByDomain(routeDomain);
+      if (!doc) {
+        doc = new ProxyCertDoc();
+        doc.domain = routeDomain;
+      }
+      doc.publicKey = newCert.publicKey;
+      doc.privateKey = newCert.privateKey;
+      doc.ca = '';
+      doc.validUntil = validUntil || 0;
+      doc.validFrom = validFrom || 0;
+      await doc.save();
+
+      // Clear status so the next event refresh shows the new cert
+      dcRouter.certificateStatusMap.delete(routeDomain);
+    }
+
+    logger.log(
+      'info',
+      `Propagated force-renewed cert for ${forcedDomain} (cert identity '${certIdentity}') to ${affected.size} sibling route domain(s): ${[...affected].join(', ')}`,
+    );
+  }
+
   /**
    * Delete certificate data for a domain from storage
    */

package/ts_web/00_commitinfo_data.ts

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