pmcf 2.24.1 → 2.24.2

package/package.json

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

package/src/dns-utils.mjs

@@ -5,6 +5,13 @@ export function dnsFullName(name) {
   return name.endsWith(".") ? name : name + ".";
 }
 
+export function dnsRecordTypeForAddressFamily(family) {
+  switch(family) {
+    case 'IPv4': return "A";
+    case 'IPv6': return "AAAA";
+  }
+}
+
 export function DNSRecord(key, type, ...values) {
   let pad = "";
 

package/src/network-interface.mjs

@@ -36,7 +36,7 @@ export class NetworkAddress {
   }
 
   get domainNames() {
-    this.networkInterface.domainNames;
+    return this.networkInterface.domainNames;
   }
 
   get family() {

package/src/services/dns.mjs

@@ -1,9 +1,13 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isIPv6, isLinkLocal, reverseArpa } from "ip-utilties";
+import { isLinkLocal, reverseArpa } from "ip-utilties";
 import { writeLines } from "../utils.mjs";
-import { DNSRecord, dnsFullName } from "../dns-utils.mjs";
+import {
+  DNSRecord,
+  dnsFullName,
+  dnsRecordTypeForAddressFamily
+} from "../dns-utils.mjs";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition, serviceAddresses } from "../service.mjs";
 import {
@@ -299,7 +303,7 @@ async function generateZoneDefs(dns, location, packageData) {
         na => na.networkInterface.kind != "loopback"
       )) {
         zone.records.add(
-          DNSRecord("@", na.family === "IPv6" ? "AAAA" : "A", na.address)
+          DNSRecord("@", dnsRecordTypeForAddressFamily(na.family), na.address)
         );
       }
     }
@@ -364,7 +368,8 @@ async function generateZoneDefs(dns, location, packageData) {
       address,
       subnet,
       networkInterface,
-      domainNames
+      domainNames,
+      family
     } of location.networkAddresses()) {
       if (
         !dns.exclude.has(networkInterface.network) &&
@@ -381,7 +386,7 @@ async function generateZoneDefs(dns, location, packageData) {
             zone.records.add(
               DNSRecord(
                 dnsFullName(domainName),
-                isIPv6(address) ? "AAAA" : "A",
+                dnsRecordTypeForAddressFamily(family),
                 address
               )
             );

package/types/dns-utils.d.mts

@@ -1,4 +1,5 @@
 export function dnsFullName(name: any): any;
+export function dnsRecordTypeForAddressFamily(family: any): "A" | "AAAA";
 export function DNSRecord(key: any, type: any, ...values: any[]): {
     key: any;
     toString: (maxKeyLength?: number, ttl?: string) => string;

package/types/network-interface.d.mts

@@ -10,7 +10,7 @@ export class NetworkAddress {
     /** @type {Subnet} */ subnet: Subnet;
     /** @type {NetworkInterface} */ networkInterface: NetworkInterface;
     /** @type {string|Uint8Array|Uint16Array} */ address: string | Uint8Array | Uint16Array;
-    get domainNames(): void;
+    get domainNames(): any;
     get family(): any;
     get cidrAddress(): any;
 }