pmcf 6.7.5 → 6.8.1

package/bin/pmcf-info

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { extendingAttributeIterator } from "pacc";
 import { prepare } from "../src/cli.mjs";
 
 const { root, args, options } = await prepare({});
@@ -15,7 +16,14 @@ function show(value) {
       show(v);
     }
   } else {
-    console.log(`${value.fullName}:`);
+    console.log(`${value.fullName}(${value.constructor.name}):`);
+
+    for (const [path, attribute] of extendingAttributeIterator(
+      value,
+      attribute => !attribute.private
+    )) {
+      console.log(path);
+    }
     ex(value);
   }
 }

package/package.json

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

package/src/network-interfaces/network-interface.mjs

@@ -101,7 +101,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get hostName() {
-    return this.attribute("_hostName") ?? this.host.hostName;
+    return this.attribute("_hostName") ?? this.host?.hostName;
   }
 
   set hostName(value) {

package/src/services/kea.mjs

@@ -143,9 +143,21 @@ export class kea extends CoreService {
 
     const network = this.network;
     const host = this.host;
+
+    const source = host.owner;
     const name = host.name;
 
-    const dnsServerEndpoints = serviceEndpoints(network, {
+    const subnets = [
+      ...new Set(
+        [...this.subnets.values()].filter(
+          s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
+        )
+      )
+    ]; // TODO should be normal
+
+    //console.log(source.fullName, [...source.hosts.keys()]);
+
+    const dnsServerEndpoints = serviceEndpoints(source, {
       services: "services[types[dns] && priority>=300]",
       endpoints: endpoint => endpoint.networkInterface?.kind !== "loopback"
     });
@@ -156,7 +168,7 @@ export class kea extends CoreService {
 
     const peers = async family =>
       Array.from(
-        network.expression(
+        source.expression(
           `services[types[kea] && priority>=${Math.min(this.priority, 100)}]`
         )
       )
@@ -311,12 +323,6 @@ export class kea extends CoreService {
 
     const ddnsEndpoint = this.endpoint("kea-ddns");
 
-    const subnetPrefixes = new Set(
-      [...this.subnets.values()]
-        .filter(s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6)
-        .map(s => s.prefix)
-    );
-
     const ddns = {
       DhcpDdns: {
         "ip-address": ddnsEndpoint.address,
@@ -330,7 +336,7 @@ export class kea extends CoreService {
         },
         "reverse-ddns": {
           "ddns-domains": dnsServersSlot(
-            [...subnetPrefixes].map(prefix => reverseArpa(prefix))
+            subnets.map(s => s.prefix).map(prefix => reverseArpa(prefix))
           )
         },
 
@@ -350,7 +356,7 @@ export class kea extends CoreService {
     const hwmap = new Map();
     const hostNames = new Set();
 
-    for await (const { networkInterface } of network.networkAddresses()) {
+    for await (const { networkInterface } of source.networkAddresses()) {
       if (networkInterface.hwaddr) {
         if (!hostNames.has(networkInterface.hostName)) {
           hwmap.set(networkInterface.hwaddr, networkInterface);
@@ -379,7 +385,7 @@ export class kea extends CoreService {
             "client-classes": ["SKIP_DDNS"]
           };
         })
-        .sort((a, b) => a.hostname.localeCompare(b.hostname));
+        .sort((a, b) => a.hostname?.localeCompare(b.hostname));
 
     const listenInterfaces = family =>
       this.endpoints(
@@ -393,10 +399,6 @@ export class kea extends CoreService {
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
       );
 
-    const subnets = [...this.subnets.values()].filter(
-      s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
-    );
-
     const pools = subnet => {
       return subnet.dhcpPools.map(pool => {
         return { pool: Array.isArray(pool) ? pool.join(" - ") : pool };