pmcf 2.24.3 → 2.26.0

package/README.md

@@ -14,6 +14,7 @@
 
 ## Poor mans configuration management
 
+
 # API
 
 <!-- Generated by documentation.js. Update this documentation by updating the source code. -->

package/package.json

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

package/src/dns-utils.mjs

@@ -1,14 +1,51 @@
 import { decodeIPv4, decodeIPv6 } from "ip-utilties";
 import { asIterator } from "./utils.mjs";
 
+const typeOrder = {
+  SOA: 0,
+  NS: 1,
+  MX: 2,
+  A: 3,
+  AAAA: 3,
+  CNAME: 4,
+  PTR: 5,
+  HTTPS: 6,
+  SRV: 7,
+  TXT: 8
+};
+
+export function sortZoneRecords(a, b) {
+  let order = typeOrder[a.type] - typeOrder[b.type];
+  if (order) {
+    return order;
+  }
+
+  if (a.type === "PTR") {
+    const toNum = a => {
+      const s = a.split(".");
+      s.pop();s.pop();s.pop();
+      return s.reverse().reduce((a, c) => BigInt(parseInt(c,16)) + 256n * 256n * a, 0n);
+    };
+    return Number(toNum(a.key) - toNum(b.key));
+  }
+  order = a.key.localeCompare(b.key);
+  if(order) {
+    return order;
+  }
+
+  return a.values[0] - b.values[0];
+}
+
 export function dnsFullName(name) {
   return name.endsWith(".") ? name : name + ".";
 }
 
 export function dnsRecordTypeForAddressFamily(family) {
-  switch(family) {
-    case 'IPv4': return "A";
-    case 'IPv6': return "AAAA";
+  switch (family) {
+    case "IPv4":
+      return "A";
+    case "IPv6":
+      return "AAAA";
   }
 }
 
@@ -33,7 +70,9 @@ export function DNSRecord(key, type, ...values) {
   );
 
   return {
+    type,
     key,
+    values,
     toString: (maxKeyLength = 0, ttl = "1W") =>
       `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(
         5,

package/src/endpoint.mjs

@@ -1,9 +1,7 @@
-import { familyIP } from "ip-utilties";
-
 export class Endpoint {
-  constructor(service, networkInterface, data) {
+  constructor(service, networkAddress, data) {
     this.service = service;
-    this.networkInterface = networkInterface;
+    this.networkAddress = networkAddress;
     Object.assign(this, data);
   }
 
@@ -16,13 +14,13 @@ export class Endpoint {
   }
 
   get hostName() {
-    return this.networkInterface.hostName;
+    return this.networkAddress.networkInterface.hostName;
   }
 
   #address;
 
   get address() {
-    return this.#address ?? this.networkInterface.address;
+    return this.#address ?? this.networkAddress.address;
   }
 
   set address(value) {
@@ -30,6 +28,10 @@ export class Endpoint {
   }
 
   get family() {
-    return familyIP(this.address);
+    return this.networkAddress.family;
+  }
+
+  get networkInterface() {
+    return this.networkAddress.networkInterface;
   }
 }

package/src/service.mjs

@@ -189,12 +189,11 @@ export class Service extends Base {
     ];
 
     const result = [...this.server.networkAddresses()]
-      .map(sa =>
+      .map(na =>
         data.map(
           d =>
-            new Endpoint(this, sa.networkInterface, {
+            new Endpoint(this, na, {
               ...d,
-              address: sa.address,
               ...local
             })
         )

package/src/services/dhcp.mjs

@@ -19,7 +19,6 @@ const DHCPServiceTypeDefinition = {
 };
 
 const controlAgentEndpoint = {
-  // extends: ["http"],
   type: "kea-control-agent",
   port: 8000,
   protocol: "tcp",
@@ -52,17 +51,16 @@ export class DHCPService extends Service {
   }
 
   endpoints(filter) {
-    const l0 = this.server.findNetworkInterface({ scope: "host" });
+    const endpoints = super.endpoints(filter);
 
-    if (l0) {
-      return [
-        ...super.endpoints(filter),
-        new Endpoint(this, l0, controlAgentEndpoint),
-        new Endpoint(this, l0, ddnsEndpoint)
-      ];
+    for (const na of this.server.networkAddresses(
+      na => na.networkInterface.kind === "localhost"
+    )) {
+      endpoints.push(new Endpoint(this, na, controlAgentEndpoint));
+      endpoints.push(new Endpoint(this, na, ddnsEndpoint));
     }
 
-    return super.endpoints(filter);
+    return endpoints;
   }
 
   async *preparePackages(dir) {
@@ -256,7 +254,7 @@ export class DHCPService extends Service {
           }
         ],
         subnet4: [...subnets]
-          .filter(s => s.family==='IPv4')
+          .filter(s => s.family === "IPv4")
           .map((subnet, index) => {
             return {
               id: index + 1,
@@ -295,30 +293,29 @@ export class DHCPService extends Service {
               .join(",")
           }
         ],
-        subnet6: [
-          {
-            id: 1,
-            subnet: "2001:db8:1::/64",
-            pools: [
-              {
-                pool: "2001:db8:1::/80"
-              }
-            ],
-            "pd-pools": [
-              {
-                prefix: "2001:db8:8::",
-                "prefix-len": 56,
-                "delegated-len": 64
-              }
-            ],
-            reservations: [
-              {
-                duid: "01:02:03:04:05:0A:0B:0C:0D:0E",
-                "ip-addresses": ["2001:db8:1::100"]
-              }
-            ]
-          }
-        ],
+        subnet6: [...subnets]
+          .filter(s => s.family === "IPv6")
+          .map((subnet, index) => {
+            return {
+              id: index + 1,
+              subnet: subnet.longAddress,
+              pools: [{ pool: subnet.addressRange.join(" - ") }],
+
+              "pd-pools": [
+                {
+                  prefix: "2001:db8:8::",
+                  "prefix-len": 56,
+                  "delegated-len": 64
+                }
+              ],
+              reservations: [
+                {
+                  duid: "01:02:03:04:05:0A:0B:0C:0D:0E",
+                  "ip-addresses": ["2001:db8:1::100"]
+                }
+              ]
+            };
+          }),
         "dhcp-ddns": dhcpServerDdns,
         loggers
       }

package/src/services/dns.mjs

@@ -6,7 +6,8 @@ import { writeLines } from "../utils.mjs";
 import {
   DNSRecord,
   dnsFullName,
-  dnsRecordTypeForAddressFamily
+  dnsRecordTypeForAddressFamily,
+  sortZoneRecords
 } from "../dns-utils.mjs";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition, serviceAddresses } from "../service.mjs";
@@ -481,7 +482,9 @@ async function generateZoneDefs(dns, location, packageData) {
       await writeLines(
         join(packageData.dir, "var/lib/named"),
         zone.file,
-        [...zone.records].map(r => r.toString(maxKeyLength, ttl))
+        [...zone.records]
+          .sort(sortZoneRecords)
+          .map(r => r.toString(maxKeyLength, ttl))
       );
     }
 

package/src/services/ntp.mjs

@@ -85,10 +85,14 @@ export class NTPService extends ExtraSourceService {
     };
 
     const lines = [
-      ...serviceEndpoints(this, {
-        ...NTP_SERVICE_FILTER,
-        priority: ">=10"
-      }).map(
+      ...serviceEndpoints(
+        this,
+        {
+          ...NTP_SERVICE_FILTER,
+          priority: ">=10"
+        },
+        e => e.family === 'IPv4' && e.networkInterface.kind !== "loopback"
+      ).map(
         endpoint =>
           `${endpoint.service.isPool ? "pool" : "server"} ${
             endpoint.address

package/types/dns-utils.d.mts

@@ -1,7 +1,10 @@
+export function sortZoneRecords(a: any, b: any): number;
 export function dnsFullName(name: any): any;
 export function dnsRecordTypeForAddressFamily(family: any): "A" | "AAAA";
 export function DNSRecord(key: any, type: any, ...values: any[]): {
+    type: any;
     key: any;
+    values: any[];
     toString: (maxKeyLength?: number, ttl?: string) => string;
 };
 export function dnsFormatParameters(parameters: any): string;

package/types/endpoint.d.mts

@@ -1,12 +1,13 @@
 export class Endpoint {
-    constructor(service: any, networkInterface: any, data: any);
+    constructor(service: any, networkAddress: any, data: any);
     service: any;
-    networkInterface: any;
+    networkAddress: any;
     toString(): string;
     get socketAddress(): string;
     get hostName(): any;
     set address(value: any);
     get address(): any;
     get family(): any;
+    get networkInterface(): any;
     #private;
 }

package/types/service.d.mts

@@ -325,7 +325,9 @@ export class Service extends Base {
     get type(): any;
     get systemdServices(): any;
     dnsRecordsForDomainName(domainName: any, hasSVRRecords: any): {
+        type: any;
         key: any;
+        values: any[];
         toString: (maxKeyLength?: number, ttl?: string) => string;
     }[];
 }