pmcf 2.26.1 → 2.28.0

package/bin/pmcf-diagram

@@ -9,38 +9,27 @@ const location = await root.load(args[0]);
 function q(str) {
   return str.match(/^\w+$/) ? str : `"${str}"`;
 }
-function id(str) {
-  return q(str.replaceAll(/-/g, ""));
-}
 
 console.log("graph G {");
 console.log("  node [shape=record];");
 for await (const host of location.hosts()) {
   console.log(
-    `  ${id(host.name)} [label="${host.name}|{${[
+    `  ${q(host.name)} [label="${host.name}|{${[
       ...host.networkInterfaces.values()
     ]
       .filter(ni => !ni.isTemplate && ni.kind !== "loopback")
-      .map(ni => `<${id(ni.name)}> ${ni.name}`)
+      .map(ni => `<${q(ni.name)}> ${ni.name}`)
       .join("|")}}"];`
   );
 }
 
 for await (const network of location.networks()) {
   console.log(
-    `  ${id(network.name)} [label="${network.name}\\n${[...network.subnets()]
+    `  ${q(network.name)} [label="${network.name}\\n${[...network.subnets()]
       .map(s => s.address)
       .join(" ")}" shape=circle];`
   );
 
-  if (network.bridge) {
-    for (const n of network.bridge) {
-      if (n !== network) {
-        console.log(`  ${id(network.name)} -- ${id(n.name)};`);
-      }
-    }
-  }
-
   for await (const na of network.networkAddresses(
     na =>
       na.networkInterface.network === network &&
@@ -48,11 +37,19 @@ for await (const network of location.networks()) {
       na.networkInterface.kind !== "loopback"
   )) {
     console.log(
-      `  ${id(network.name)} -- ${id(na.networkInterface.host.name)}:${id(
+      `  ${q(network.name)} -- ${q(na.networkInterface.host.name)}:${q(
         na.networkInterface.name
       )}[label="${na.address}"];`
     );
   }
 }
 
+for await (const cluster of location.clusters()) {
+  console.log(` ${[...cluster.members].map(b => `${q(b.host.name)}:${b.name}`).join(" -- ")};`);
+}
+
+for (const bridge of location.bridges) {
+  console.log(` ${[...bridge].map(b => q(b.name)).join(" -- ")};`);
+}
+
 console.log("}");

package/package.json

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

package/src/cluster.mjs

@@ -4,7 +4,6 @@ import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
 import { addType } from "./types.mjs";
 import { writeLines } from "./utils.mjs";
-import { cidrAddresses } from "./network-support.mjs";
 
 const ClusterTypeDefinition = {
   name: "cluster",

package/src/owner.mjs

@@ -214,6 +214,11 @@ export class Owner extends Base {
     return this.typeList("cluster");
   }
 
+  get bridges()
+  {
+    return this._bridges;
+  }
+
   addBridge(network, destinationNetworks) {
     if (destinationNetworks) {
       let bridge;

package/src/services/dns.mjs

@@ -9,6 +9,7 @@ import {
   dnsRecordTypeForAddressFamily,
   sortZoneRecords
 } from "../dns-utils.mjs";
+import { Endpoint, serviceEndpoints } from "pmcf";
 import { addType } from "../types.mjs";
 import { ServiceTypeDefinition, serviceAddresses } from "../service.mjs";
 import {
@@ -69,6 +70,20 @@ const DNSServiceTypeDefinition = {
   }
 };
 
+const rdncEndpoint = {
+  type: "rdnc",
+  port: 953,
+  protocol: "tcp",
+  tls: false
+};
+
+const statisticsEndpoint = {
+  type: "bind-statistics",
+  port: 19521,
+  protocol: "tcp",
+  tls: false
+};
+
 const DNS_SERVICE_FILTER = { type: DNSServiceTypeDefinition.name };
 
 function addressList(objects) {
@@ -123,6 +138,19 @@ export class DNSService extends ExtraSourceService {
     return DNSServiceTypeDefinition.name;
   }
 
+  endpoints(filter) {
+    const endpoints = super.endpoints(filter);
+
+    for (const na of this.server.networkAddresses(
+      na => na.networkInterface.kind === "localhost"
+    )) {
+      endpoints.push(new Endpoint(this, na, rdncEndpoint));
+      endpoints.push(new Endpoint(this, na, statisticsEndpoint));
+    }
+
+    return endpoints;
+  }
+
   get soaUpdates() {
     return [this.serial, this.refresh, this.retry, this.expire, this.minimum];
   }
@@ -202,15 +230,15 @@ export class DNSService extends ExtraSourceService {
       }
     };
 
-    const options = addressesStatement(
-      "forwarders",
-      serviceAddresses(this.source, DNS_SERVICE_FILTER)
+    const forwarders = new Set(
+      serviceEndpoints(this.source, DNS_SERVICE_FILTER).map(e => e.address)
     );
-    if (options.length > 2) {
+
+    if (forwarders.size) {
       await writeLines(
         join(p1, "etc/named/options"),
         `forwarders.conf`,
-        options
+        addressesStatement("forwarders", forwarders)
       );
     }
 
@@ -223,7 +251,7 @@ export class DNSService extends ExtraSourceService {
     if (acls.length) {
       await writeLines(join(p1, "etc/named"), `0-acl-${name}.conf`, acls);
     }
-    if (options.length || acls.length) {
+    if (forwarders.size || acls.length) {
       yield packageData;
     }
 

package/types/owner.d.mts

@@ -152,6 +152,7 @@ export class Owner extends Base {
     subnetForAddress(address: any): any;
     clusterNamed(name: any): any;
     clusters(): any;
+    get bridges(): Set<any>;
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
     get derivedPackaging(): Set<any>;