pmcf 1.77.0 → 1.77.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.77.0",
+  "version": "1.77.1",
   "publishConfig": {
     "access": "public"
   },

package/src/dns-utils.mjs

@@ -14,3 +14,9 @@ export function DNSRecord(key, type, ...values) {
       )} ${values.join(" ")}`
   };
 }
+
+export function dnsFormatParameters(parameters) {
+  return Object.entries(parameters)
+    .map(([name, value]) => (value !== undefined ? `${name}="${value}"` : name))
+    .join(" ");
+}

package/src/dns.mjs

@@ -7,7 +7,7 @@ import {
   normalizeIPAddress,
   isLinkLocal
 } from "./utils.mjs";
-import { DNSRecord, dnsFullName } from "./dns-utils.mjs";
+import { DNSRecord, dnsFullName, dnsFormatParameters } from "./dns-utils.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 import { serviceAddresses } from "./service.mjs";
@@ -213,7 +213,13 @@ async function generateZoneDefs(dns, targetDir) {
       dnsFullName(nameService.ipAddressOrDomainName)
     );
 
-    const ALPNRecord = DNSRecord("@", "HTTPS", 1, ".", "alpn=h3");
+    const ALPNRecord = DNSRecord(
+      "@",
+      "HTTPS",
+      1,
+      ".",
+      dnsFormatParameters({ alpn: "h3" })
+    );
 
     const zone = {
       id: domain,
@@ -298,7 +304,10 @@ async function generateZoneDefs(dns, targetDir) {
         if (!hosts.has(host)) {
           hosts.add(host);
           for (const service of host.findServices()) {
-            for (const record of service.dnsRecordsForDomainName(domainName, dns.hasSVRRecords)) {
+            for (const record of service.dnsRecordsForDomainName(
+              domainName,
+              dns.hasSVRRecords
+            )) {
               zone.records.add(record);
             }
           }

package/src/service.mjs

@@ -2,14 +2,28 @@ import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 import { networkAddressProperties } from "./network-support.mjs";
-import { DNSRecord, dnsFullName } from "./dns-utils.mjs";
+import { DNSRecord, dnsFullName, dnsFormatParameters } from "./dns-utils.mjs";
 
 const ServiceTypes = {
   dns: { protocol: "udp", port: 53, tls: false },
   ldap: { protocol: "tcp", port: 389, tls: false },
   ldaps: { protocol: "tcp", port: 636, tls: true },
   http: { protocol: "tcp", port: 80, tls: false },
-  https: { protocol: "tcp", port: 443, tls: true },
+  https: {
+    protocol: "tcp",
+    port: 443,
+    tls: true,
+    dnsRecord: { type: "HTTPS", parameters: { alpn: "h2" } }
+  },
+  http3: {
+    protocol: "tcp",
+    port: 443,
+    tls: true,
+    dnsRecord: {
+      type: "HTTPS",
+      parameters: { "no-default-alpn": undefined, alpn: "h3" }
+    }
+  },
   rtsp: { protocol: "tcp", port: 554, tls: false },
   smtp: { protocol: "tcp", port: 25, tls: false },
   ssh: { protocol: "tcp", port: 22, tls: false },
@@ -197,10 +211,36 @@ export class Service extends Base {
       );
     }
 
+    const dnsRecord = ServiceTypes[this.type]?.dnsRecord;
+    if (dnsRecord) {
+      records.push(
+        DNSRecord(
+          dnsFullName(domainName),
+          dnsRecord.type,
+          this.priority,
+          ".",
+          dnsFormatParameters(dnsRecord.parameters)
+        )
+      );
+
+      if (this.master && this.alias) {
+        records.push(
+          DNSRecord(
+            this.alias,
+            dnsRecord.type,
+            this.priority,
+            dnsFullName(domainName),
+            dnsFormatParameters(dnsRecord.parameters)
+          )
+        );
+      }
+    }
+
     return records;
   }
 }
 
+
 export const sortByPriority = (a, b) => a.priority - b.priority;
 
 export function serviceAddresses(

package/types/dns-utils.d.mts

@@ -3,3 +3,4 @@ export function DNSRecord(key: any, type: any, ...values: any[]): {
     key: any;
     toString: (maxKeyLength: any, ttl: any) => string;
 };
+export function dnsFormatParameters(parameters: any): string;