pmcf 1.31.2 → 1.32.0

package/bin/pmcf-named-defs

@@ -91,6 +91,8 @@ async function generateNamedDefs(owner, targetDir) {
       }
     }
 
+    const hosts = new Set();
+
     for await (const {
       address,
       networkInterface
@@ -104,25 +106,29 @@ async function generateNamedDefs(owner, targetDir) {
         )
       );
 
-      for (const service of host.services()) {
-        if (service.master && service.alias) {
-          zone.records.add(
-            createRecord(service.alias, "CNAME", `${host.domainName}.`)
-          );
-        }
-
-        if (service.srvPrefix) {
-          zone.records.add(
-            createRecord(
-              `${service.srvPrefix}.${host.domainName}.`,
-              "SRV",
-              `${String(service.priority).padStart(4)} ${String(
-                service.weight
-              ).padStart(3)} ${String(service.port).padStart(5)} ${
-                host.domainName
-              }.`
-            )
-          );
+      if (!hosts.has(host)) {
+        hosts.add(host);
+        for (const service of host.services()) {
+          //console.log(service.name);
+          if (service.master && service.alias) {
+            zone.records.add(
+              createRecord(service.alias, "CNAME", `${host.domainName}.`)
+            );
+          }
+
+          if (dns.hasSVRRecords && service.srvPrefix) {
+            zone.records.add(
+              createRecord(
+                `${service.srvPrefix}.${host.domainName}.`,
+                "SRV",
+                `${String(service.priority).padStart(4)} ${String(
+                  service.weight
+                ).padStart(3)} ${String(service.port).padStart(5)} ${
+                  host.domainName
+                }.`
+              )
+            );
+          }
         }
       }
 
@@ -141,7 +147,9 @@ async function generateNamedDefs(owner, targetDir) {
 
     const zoneConfig = [];
 
-    zones.push(catalogZone);
+    if (dns.hasCatalog) {
+      zones.push(catalogZone);
+    }
 
     for (const zone of zones) {
       if (zone !== catalogZone) {

package/package.json

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

package/src/dns.mjs

@@ -5,6 +5,8 @@ export class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
   soaUpdates = [36000, 72000, 600000, 60000];
+  hasSVRRecords = true;
+  hasCatalog = true;
 
   forwardsTo = [];
 
@@ -34,7 +36,14 @@ export class DNSService extends Base {
   }
 
   get propertyNames() {
-    return ["recordTTL", "soaUpdates", "forwardsTo", "allowedUpdates"];
+    return [
+      "recordTTL",
+      "soaUpdates",
+      "hasSVRRecords",
+      "hasCatalog",
+      "forwardsTo",
+      "allowedUpdates"
+    ];
   }
 
   async resolvedConfig() {

package/src/model.mjs

@@ -468,7 +468,7 @@ export class NetworkInterface extends Base {
 
   get ipAddressesWithPrefixLength() {
     return this.#ipAddresses.map(a =>
-      isIPv4Address(a) ? `${a}/${this.network.prefixLength}` : a
+      isIPv4Address(a) ? `${a}/${this.prefixLength}` : a
     );
   }
 
@@ -480,6 +480,11 @@ export class NetworkInterface extends Base {
     return this.#ipAddresses.filter(a => isIPv6Address(a));
   }
 
+  get prefixLength()
+  {
+    return this.network?.prefixLength;
+  }
+
   get network() {
     return this.#network;
   }

package/src/owner.mjs

@@ -1,4 +1,4 @@
-import { asArray, bridgeToJSON } from "./utils.mjs";
+import { asArray } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";
 
@@ -14,18 +14,33 @@ export class Owner extends Base {
     return "owner";
   }
 
-  constructor(owner, data) {
+  constructor(owner, data={}) {
     super(owner, data);
 
     let dns;
-    if (data?.dns) {
+    if (data.dns) {
       dns = data.dns;
       delete data.dns;
     }
 
     this.#dns = new DNSService(this, dns);
 
-    if (data?.networks) {
+    if (data.administratorEmail) {
+      this.#administratorEmail = data.administratorEmail;
+      delete data.administratorEmail;
+    }
+
+    if (data.domain) {
+      this.domain = data.domain;
+      delete data.domain;
+    }
+
+    if (data.ntp) {
+      this.ntp = data.ntp;
+      delete data.ntp;
+    }
+
+    if (data.networks) {
       const networks = data.networks;
       delete data.networks;
 
@@ -34,7 +49,6 @@ export class Owner extends Base {
         new Network(this, data);
       }
     }
-    Object.assign(this, data);
 
     owner?.addObject(this);
   }
@@ -246,9 +260,9 @@ export class Network extends Owner {
   kind;
   scope;
   metric;
-  ipv4;
   subnet;
   bridge;
+  #ipAddresses = [];
 
   static get typeName() {
     return "network";
@@ -257,6 +271,11 @@ export class Network extends Owner {
   constructor(owner, data) {
     super(owner, data);
 
+    if (data.ipAddresses) {
+      this.#ipAddresses.push(...asArray(data.ipAddresses));
+      delete data.ipAddresses;
+    }
+
     let bridge;
     if (data.bridge) {
       bridge = data.bridge;
@@ -277,7 +296,7 @@ export class Network extends Owner {
       subnet.networks.add(this);
     }
 
-    owner.addObject(this);
+    //owner.addObject(this);
 
     this.bridge = owner.addBridge(this, bridge);
   }
@@ -289,18 +308,32 @@ export class Network extends Owner {
     return super.networkNamed(name);
   }
 
+  set ipAddresses(value) {
+    this.#ipAddresses = asArray(value);
+  }
+
+  get ipAddresses() {
+    return this.#ipAddresses;
+  }
+
   get prefixLength() {
-    const m = this.ipv4?.match(/\/(\d+)$/);
-    if (m) {
-      return parseInt(m[1]);
+    for (const a of this.#ipAddresses) {
+      const m = a.match(/\/(\d+)$/);
+      if (m) {
+        return parseInt(m[1]);
+      }
     }
+
+    this.error("no prefixLength",this.#ipAddresses);
   }
 
   get subnetAddress() {
-    if (this.ipv4) {
-      const [addr, bits] = this.ipv4.split(/\//);
-      const parts = addr.split(/\./);
-      return parts.slice(0, bits / 8).join(".");
+    for (const a of this.#ipAddresses) {
+      const [addr, bits] = a.split(/\//);
+      if (bits) {
+        const parts = addr.split(/\./);
+        return parts.slice(0, bits / 8).join(".");
+      }
     }
   }
 
@@ -308,7 +341,7 @@ export class Network extends Owner {
     return [
       ...super.propertyNames,
       "kind",
-      "ipv4",
+      "ipAddresses",
       "prefixLength",
       "scope",
       "metric",

package/types/cluster.d.mts

@@ -1,3 +1,4 @@
 export class Cluster extends Owner {
+    constructor(owner: any, data: any);
 }
 import { Owner } from "./owner.mjs";

package/types/dns.d.mts

@@ -2,6 +2,8 @@ export class DNSService extends Base {
     allowedUpdates: any[];
     recordTTL: string;
     soaUpdates: number[];
+    hasSVRRecords: boolean;
+    hasCatalog: boolean;
     forwardsTo: any[];
     services(): AsyncGenerator<any, void, any>;
     get domains(): any[];

package/types/model.d.mts

@@ -59,6 +59,7 @@ export class NetworkInterface extends Base {
     get ipAddressesWithPrefixLength(): any[];
     get ipv4Addresses(): any[];
     get ipv6Addresses(): any[];
+    get prefixLength(): any;
     get scope(): any;
     get metric(): any;
     get ssid(): any;

package/types/owner.d.mts

@@ -1,4 +1,5 @@
 export class Owner extends Base {
+    constructor(owner: any, data?: {});
     domain: any;
     ntp: {
         servers: any[];
@@ -29,14 +30,17 @@ export class Owner extends Base {
     #private;
 }
 export class Network extends Owner {
+    constructor(owner: any, data: any);
     kind: any;
     scope: any;
     metric: any;
-    ipv4: any;
     subnet: any;
     bridge: any;
+    set ipAddresses(value: any[]);
+    get ipAddresses(): any[];
     get prefixLength(): number;
     get subnetAddress(): any;
+    #private;
 }
 export class Subnet extends Base {
     networks: Set<any>;