pmcf 1.95.0 → 1.96.0

package/package.json

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

package/src/dhcp.mjs

@@ -0,0 +1,248 @@
+import { join } from "node:path";
+import { FileContentProvider } from "npm-pkgbuild";
+import { Base } from "./base.mjs";
+import { addType } from "./types.mjs";
+import { writeLines } from "./utils.mjs";
+import { serviceAddresses } from "./service.mjs";
+
+const DHCPServiceTypeDefinition = {
+  name: "dhcp",
+  owners: ["location", "owner", "network", "cluster", "root"],
+  priority: 0.1,
+  properties: {}
+};
+
+export class DHCPService extends Base {
+  static {
+    addType(this);
+  }
+
+  static get typeDefinition() {
+    return DHCPServiceTypeDefinition;
+  }
+
+  constructor(owner, data) {
+    if (!data.name) {
+      data.name = DHCPServiceTypeDefinition.name; // TODO
+    }
+    super(owner, data);
+    this.read(data, DHCPServiceTypeDefinition);
+
+    owner.addObject(this);
+  }
+
+  async *preparePackages(dir) {
+    const name = this.owner.name;
+    const packageData = {
+      dir,
+      sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
+      outputs: this.outputs,
+      properties: {
+        name: `kea-${name}`,
+        description: `kea definitions for ${this.fullName}`,
+        access: "private",
+        dependencies: ["kea"]
+      }
+    };
+
+    const loggers = [
+      {
+        "output-options": [
+          {
+            output: "systlog"
+          }
+        ],
+        severity: "INFO",
+        debuglevel: 0
+      }
+    ];
+
+    const ctrlAgent = {
+      "Control-agent": {
+        "http-host": "127.0.0.1",
+        "http-port": 8000,
+        "control-sockets": {
+          dhcp4: {
+            "socket-type": "unix",
+            "socket-name": "/run/kea/4-ctrl-socket"
+          },
+          dhcp6: {
+            "socket-type": "unix",
+            "socket-name": "/run/kea/6-ctrl-socket"
+          },
+          d2: {
+            "socket-type": "unix",
+            "socket-name": "/run/kea/ddns-ctrl-socket"
+          }
+        },
+        loggers
+      }
+    };
+
+    const ddns = {
+      DhcpDdns: {
+        "ip-address": "127.0.0.1",
+        port: 53001,
+        "control-socket": {
+          "socket-type": "unix",
+          "socket-name": "/run/kea/ddns-ctrl-socket"
+        },
+        "tsig-keys": [],
+        "forward-ddns": {},
+        "reverse-ddns": {},
+        loggers
+      }
+    };
+
+    const dhcp4 = {
+      Dhcp4: {
+        "interfaces-config": {
+          interfaces: ["end0"]
+        },
+        "control-socket": {
+          "socket-type": "unix",
+          "socket-name": "/run/kea/4-ctrl-socket"
+        },
+        "lease-database": {
+          type: "memfile",
+          "lfc-interval": 3600
+        },
+        "expired-leases-processing": {
+          "reclaim-timer-wait-time": 10,
+          "flush-reclaimed-timer-wait-time": 25,
+          "hold-reclaimed-time": 3600,
+          "max-reclaim-leases": 100,
+          "max-reclaim-time": 250,
+          "unwarned-reclaim-cycles": 5
+        },
+        "renew-timer": 900,
+        "rebind-timer": 1800,
+        "valid-lifetime": 3600,
+        "option-data": [
+          {
+            name: "domain-name-servers",
+            data: serviceAddresses(this, {
+              type: "dns",
+              priority: "<10"
+            }).join(",")
+          },
+          {
+            name: "domain-search",
+            data: [...this.domains].join(",")
+          }
+        ],
+        subnet4: [
+          {
+            id: 1,
+            subnet: "192.168.1.0/24",
+            pools: [
+              {
+                pool: "192.168.1.100 - 192.168.1.200"
+              }
+            ],
+            "option-data": [
+              {
+                name: "routers",
+                data: "192.168.1.254"
+              }
+            ],
+            reservations: [
+              {
+                "hw-address": "1a:1b:1c:1d:1e:1f",
+                "ip-address": "192.168.1.199"
+              },
+              {
+                "client-id": "01:11:22:33:44:55:66",
+                "ip-address": "192.168.1.198",
+                hostname: "special-snowflake"
+              }
+            ]
+          }
+        ],
+        loggers
+      }
+    };
+    const dhcp6 = {
+      Dhcp6: {
+        "interfaces-config": {
+          interfaces: []
+        },
+        "control-socket": {
+          "socket-type": "unix",
+          "socket-name": "/run/kea/6-ctrl-socket"
+        },
+        "lease-database": {
+          type: "memfile",
+          "lfc-interval": 3600
+        },
+        "expired-leases-processing": {
+          "reclaim-timer-wait-time": 10,
+          "flush-reclaimed-timer-wait-time": 25,
+          "hold-reclaimed-time": 3600,
+          "max-reclaim-leases": 100,
+          "max-reclaim-time": 250,
+          "unwarned-reclaim-cycles": 5
+        },
+        "renew-timer": 1000,
+        "rebind-timer": 2000,
+        "preferred-lifetime": 3000,
+        "valid-lifetime": 4000,
+        "option-data": [
+          {
+            name: "dns-servers",
+            data: "2001:db8:2::45, 2001:db8:2::100"
+          }
+        ],
+        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
+              }
+            ],
+            "option-data": [
+              {
+                name: "dns-servers",
+                data: "2001:db8:2::dead:beef, 2001:db8:2::cafe:babe"
+              }
+            ],
+            reservations: [
+              {
+                duid: "01:02:03:04:05:0A:0B:0C:0D:0E",
+                "ip-addresses": ["2001:db8:1::100"]
+              }
+            ]
+          }
+        ],
+        loggers
+      }
+    };
+
+    const files = {
+      "kea-ctrl-agent": ctrlAgent,
+      "kea-dhcp-ddns": ddns,
+      "kea-dhcp4": dhcp4,
+      "kea-dhcp6": dhcp6
+    };
+
+    for (const [name, data] of Object.entries(files)) {
+      loggers[0].name = name;
+      await writeLines(
+        join(packageData.dir, "etc/kea"),
+        `${name}.conf`,
+        JSON.stringify(data, undefined, 2)
+      );
+    }
+
+    yield packageData;
+  }
+}

package/src/dns.mjs

@@ -378,14 +378,14 @@ async function generateZoneDefs(dns, packageData) {
         }
 
         for (const service of host.findServices()) {
-          for (const domainName of domainNames) {
+          //for (const domainName of domainNames) {
             for (const record of service.dnsRecordsForDomainName(
-              domainName,
+              host.domainName,
               dns.hasSVRRecords
             )) {
               zone.records.add(record);
             }
-          }
+          //}
         }
       }
     }

package/src/module.mjs

@@ -2,6 +2,7 @@ export * from "./base.mjs";
 export * from "./service.mjs";
 export * from "./dns.mjs";
 export * from "./ntp.mjs";
+export * from "./dhcp.mjs";
 export * from "./cluster.mjs";
 export * from "./owner.mjs";
 export * from "./location.mjs";

package/src/owner.mjs

@@ -4,6 +4,7 @@ import { Subnet } from "./subnet.mjs";
 import { addType, types } from "./types.mjs";
 import { DNSService } from "./dns.mjs";
 import { NTPService } from "./ntp.mjs";
+import { DHCPService } from "./dhcp.mjs";
 
 const OwnerTypeDefinition = {
   name: "owner",
@@ -25,6 +26,11 @@ const OwnerTypeDefinition = {
       collection: false,
       writeable: true
     },
+    dhcp: {
+      type: DHCPService.typeDefinition,
+      collection: false,
+      writeable: true
+    },
 
     country: { type: "string", collection: false, writeable: true },
     domain: { type: "string", collection: false, writeable: true },
@@ -65,6 +71,7 @@ export class Owner extends Base {
 
       this.dns?._traverse(...args);
       this.ntp?._traverse(...args);
+      this.dhcp?._traverse(...args);
 
       return true;
     }

package/src/utils.mjs

@@ -20,11 +20,21 @@ export function domainFromDominName(domainName, defaultDomain) {
 }
 
 export async function writeLines(dir, name, lines) {
+  let data;
+
   switch (typeof lines) {
     case "undefined":
       return;
     case "string":
-      lines = [lines];
+      data = lines;
+      break;
+
+    default:
+      data = [...lines]
+        .flat()
+        .filter(line => line !== undefined)
+        .map(l => l + "\n")
+        .join("");
   }
 
   const full = join(dir, name);
@@ -32,15 +42,7 @@ export async function writeLines(dir, name, lines) {
   name = basename(full);
   await mkdir(dir, { recursive: true });
 
-  return writeFile(
-    join(dir, name),
-    [...lines]
-      .flat()
-      .filter(line => line !== undefined)
-      .map(l => l + "\n")
-      .join(""),
-    "utf8"
-  );
+  return writeFile(join(dir, name), data, "utf8");
 }
 
 export function sectionLines(sectionName, values) {
@@ -80,9 +82,8 @@ export function isIPv4Address(address) {
   return address.indexOf(".") >= 0;
 }
 
-export function generateEU64(mac)
-{
- //TODO
+export function generateEU64(mac) {
+  //TODO
 }
 
 export function isIPv6Address(address) {

package/types/cluster.d.mts

@@ -193,6 +193,16 @@ export class Cluster extends Host {
                     collection: boolean;
                     writeable: boolean;
                 };
+                dhcp: {
+                    type: {
+                        name: string;
+                        owners: string[];
+                        priority: number;
+                        properties: {};
+                    };
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 country: {
                     type: string;
                     collection: boolean;

package/types/dhcp.d.mts

@@ -0,0 +1,20 @@
+export class DHCPService extends Base {
+    static get typeDefinition(): {
+        name: string;
+        owners: string[];
+        priority: number;
+        properties: {};
+    };
+    preparePackages(dir: any): AsyncGenerator<{
+        dir: any;
+        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
+        properties: {
+            name: string;
+            description: string;
+            access: string;
+            dependencies: string[];
+        };
+    }, void, unknown>;
+}
+import { Base } from "./base.mjs";

package/types/location.d.mts

@@ -193,6 +193,16 @@ export class Location extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                dhcp: {
+                    type: {
+                        name: string;
+                        owners: string[];
+                        priority: number;
+                        properties: {};
+                    };
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 country: {
                     type: string;
                     collection: boolean;
@@ -423,6 +433,16 @@ export class Location extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                dhcp: {
+                    type: {
+                        name: string;
+                        owners: string[];
+                        priority: number;
+                        properties: {};
+                    };
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 country: {
                     type: string;
                     collection: boolean;

package/types/module.d.mts

@@ -2,6 +2,7 @@ export * from "./base.mjs";
 export * from "./service.mjs";
 export * from "./dns.mjs";
 export * from "./ntp.mjs";
+export * from "./dhcp.mjs";
 export * from "./cluster.mjs";
 export * from "./owner.mjs";
 export * from "./location.mjs";

package/types/network.d.mts

@@ -195,6 +195,16 @@ export class Network extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                dhcp: {
+                    type: {
+                        name: string;
+                        owners: string[];
+                        priority: number;
+                        properties: {};
+                    };
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 country: {
                     type: string;
                     collection: boolean;

package/types/owner.d.mts

@@ -191,6 +191,16 @@ export class Owner extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            dhcp: {
+                type: {
+                    name: string;
+                    owners: string[];
+                    priority: number;
+                    properties: {};
+                };
+                collection: boolean;
+                writeable: boolean;
+            };
             country: {
                 type: string;
                 collection: boolean;

package/types/root.d.mts

@@ -197,6 +197,16 @@ export class Root extends Location {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    dhcp: {
+                        type: {
+                            name: string;
+                            owners: string[];
+                            priority: number;
+                            properties: {};
+                        };
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     country: {
                         type: string;
                         collection: boolean;
@@ -427,6 +437,16 @@ export class Root extends Location {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    dhcp: {
+                        type: {
+                            name: string;
+                            owners: string[];
+                            priority: number;
+                            properties: {};
+                        };
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     country: {
                         type: string;
                         collection: boolean;