pmcf 2.1.3 → 2.2.0

package/package.json

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

package/src/dns-utils.mjs

@@ -1,11 +1,29 @@
-import { asArray, asIterator } from "./utils.mjs";
+import {
+  asIterator,
+  decodeIPv6,
+  encodeIPv6,
+  normalizeIPAddress
+} from "./utils.mjs";
 
 export function dnsFullName(name) {
   return name.endsWith(".") ? name : name + ".";
 }
 
 export function DNSRecord(key, type, ...values) {
-  const pad = type === "MX" ? "        " : "";
+  let pad = "";
+
+  switch (type) {
+    case "MX":
+      pad = "        ";
+      break;
+
+    case "A":
+      values[0] = normalizeIPAddress(values[0]);
+      break;
+    case "AAAA":
+      values[0] = decodeIPv6(encodeIPv6(values[0]));
+      break;
+  }
 
   values = values.map(v =>
     typeof v === "number" ? String(v).padStart(3) + pad : v

package/src/services/dns.mjs

@@ -5,16 +5,16 @@ import {
   writeLines,
   isIPv6Address,
   normalizeIPAddress,
-  isLinkLocal
+  isLinkLocal,
+  isLocalhost
 } from "../utils.mjs";
 import { DNSRecord, dnsFullName } from "../dns-utils.mjs";
 import { addType } from "../types.mjs";
+import { ServiceTypeDefinition, serviceAddresses } from "../service.mjs";
 import {
-  Service,
-  ServiceTypeDefinition,
-  serviceAddresses
-} from "../service.mjs";
-import { ExtraSourceService, ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
+  ExtraSourceService,
+  ExtraSourceServiceTypeDefinition
+} from "../extra-source-service.mjs";
 import { subnets } from "../subnet.mjs";
 
 const DNSServiceTypeDefinition = {
@@ -262,15 +262,14 @@ async function generateZoneDefs(dns, location, packageData) {
       };
       configs.push(config);
 
+      zone.records.add(DNSRecord("location", "TXT", host.location.name));
+
       for (const address of host.rawAddresses) {
-        zone.records.add(
-          DNSRecord(
-            "@",
-            isIPv6Address(address) ? "AAAA" : "A",
-            normalizeIPAddress(address)
-          )
-        );
-        zone.records.add(DNSRecord("location", "TXT", host.location.name));
+        if (!isLocalhost(address)) {
+          zone.records.add(
+            DNSRecord("@", isIPv6Address(address) ? "AAAA" : "A", address)
+          );
+        }
       }
     }
   }
@@ -335,7 +334,7 @@ async function generateZoneDefs(dns, location, packageData) {
               DNSRecord(
                 dnsFullName(domainName),
                 isIPv6Address(address) ? "AAAA" : "A",
-                normalizeIPAddress(address)
+                address
               )
             );
           }

package/src/utils.mjs

@@ -96,7 +96,15 @@ export function isIPv6Address(address) {
 }
 
 export function isLinkLocal(address) {
-  return address.startsWith("fe80");
+  switch (typeof address) {
+    case "string":
+      return address.startsWith("fe80");
+
+    case "bigint":
+      return ((address >> 112n) & 0xffffn) === 0xfe80n;
+  }
+
+  return false;
 }
 
 export function isLocalhost(address) {
@@ -136,6 +144,10 @@ const ipv6 = {
 };
 
 function _decode(definition, address, length = definition.length) {
+  if (typeof address === "string") {
+    return address;
+  }
+
   let result = "";
   let compressed = 0;
   let shift = definition.length;

package/types/services/dns.d.mts

@@ -58,7 +58,7 @@ export class DNSService extends ExtraSourceService {
                         };
                     };
                 };
-                factoryFor(value: any): typeof Service | typeof DNSService | typeof import("./ntp.mjs").NTPService | typeof import("./dhcp.mjs").DHCPService;
+                factoryFor(value: any): typeof import("../service.mjs").Service | typeof DNSService | typeof import("./ntp.mjs").NTPService | typeof import("./dhcp.mjs").DHCPService;
                 properties: {
                     ipAddresses: {
                         type: string;
@@ -264,4 +264,3 @@ export class DNSService extends ExtraSourceService {
     }, void, unknown>;
 }
 import { ExtraSourceService } from "../extra-source-service.mjs";
-import { Service } from "../service.mjs";

package/types/subnet.d.mts

@@ -27,7 +27,7 @@ export class Subnet extends Base {
     networks: Set<any>;
     get fullName(): string;
     matchesAddress(address: any): any;
-    get isLinkLocal(): any;
+    get isLinkLocal(): boolean;
     get prefix(): string;
     get prefixLength(): number;
     get address(): string;

package/types/utils.d.mts

@@ -8,7 +8,7 @@ export function asIterator(value: any): any;
 export function isIPv4Address(address: any): boolean;
 export function generateEU64(mac: any): void;
 export function isIPv6Address(address: any): boolean;
-export function isLinkLocal(address: any): any;
+export function isLinkLocal(address: any): boolean;
 export function isLocalhost(address: any): boolean;
 export function normalizeIPAddress(address: any): any;
 export function _encode(definition: any, address: any): any;
@@ -28,7 +28,7 @@ export function normalizeCIDR(address: any): {
     prefixLength: any;
     cidr: string;
 };
-export function hasWellKnownSubnet(address: any): any;
+export function hasWellKnownSubnet(address: any): boolean;
 export const IPV4_LOCALHOST: any;
 export const IPV6_LOCALHOST: any;
 export const IPV6_LINK_LOCAL_BROADCAST: any;