pmcf 6.42.0 → 6.44.0

package/package.json

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

package/src/content.mjs

@@ -1,4 +1,4 @@
-import path, { join } from "node:path";
+import { join } from "node:path";
 import {
   name_attribute_writable,
   string_attribute_writable,
@@ -8,7 +8,8 @@ import {
   extendingAttributeIterator
 } from "pacc";
 import { allOutputs } from "npm-pkgbuild";
-import { core, addType } from "pmcf";
+import { core } from "./core.mjs";
+import { addType } from "./type.mjs";
 import { union } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";
 
@@ -236,7 +237,9 @@ export class content extends core {
   }
 
   get permissions() {
-    return this.expand(this.mapFromDirections(["this", "extends"], "_permissions"));
+    return this.expand(
+      this.mapFromDirections(["this", "extends"], "_permissions")
+    );
   }
 
   /**

package/src/core.mjs

@@ -8,7 +8,7 @@ import {
   expand,
   globals
 } from "pacc";
-import { addType } from "pmcf";
+import { addType } from "./type.mjs";
 
 export class core {
   static priority = 1;

package/src/services/kea.mjs

@@ -2,7 +2,6 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import {
   reverseArpa,
-  isLinkLocal,
   addressType,
   FAMILY_IPV4,
   FAMILY_IPV6,
@@ -10,6 +9,7 @@ import {
 } from "ip-utilties";
 import {
   string_attribute_writable,
+  string_collection_attribute_writable,
   number_attribute_writable,
   boolean_attribute_writable_true,
   default_collection_attribute_writable,
@@ -17,17 +17,42 @@ import {
 } from "pacc";
 import {
   addType,
+  Subnet,
   CoreService,
   Endpoint,
   sortDescendingByPriority,
-  SUBNET_LOCALHOST_IPV4,
-  SUBNET_LOCALHOST_IPV6,
   FAMILY_UNIX
 } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
+class kea_subnet extends Subnet {
+  static attributes = {
+    pool: {
+      ...string_collection_attribute_writable,
+      name: "pool"
+    }
+  };
+
+  static {
+    addType(this);
+  }
+
+  pool = [];
+}
+
 export class kea extends CoreService {
   static attributes = {
+    subnets: {
+      ...default_collection_attribute_writable,
+      type: kea_subnet,
+      name: "subnets"
+    },
+    peers: {
+      ...default_collection_attribute_writable,
+      type: CoreService,
+      name: "peers",
+      deferredExpression: true
+    },
     dnsServerEndpoints: {
       ...default_collection_attribute_writable,
       type: Endpoint,
@@ -135,6 +160,8 @@ export class kea extends CoreService {
     addType(this);
   }
 
+  subnets = new Map();
+
   async *preparePackages(dir) {
     const ctrlAgentEndpoint = this.endpoint("kea-ha-4");
 
@@ -144,18 +171,9 @@ export class kea extends CoreService {
 
     const network = this.network;
     const host = this.host;
-
     const source = host.owner;
     const name = host.name;
-
-    const subnets = [...new Map(this.subnets).values()].filter(
-      s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
-    ); // TODO should be normal
-    /*console.log(
-      "SUBNETS",
-      subnets.map(s => s.fullName)
-    );*/
-
+    const subnets = [...this.subnets.values()];
     const dnsServerEndpoints = this.dnsServerEndpoints;
     const packageData = await this.packageData;
 
@@ -170,27 +188,6 @@ export class kea extends CoreService {
       })
     );
 
-    const peers = async family =>
-      Array.from(
-        source.expression(
-          `services[types[kea] && priority>=${Math.min(this.priority, 100)}]`
-        )
-      )
-        .sort(sortDescendingByPriority)
-        .map((dhcp, i) => {
-          const ctrlAgentEndpoint = dhcp.endpoint(`kea-ha-${family}`);
-
-          if (ctrlAgentEndpoint) {
-            return {
-              name: dhcp.host.name,
-              role: i === 0 ? "primary" : i > 1 ? "backup" : "standby",
-              url: ctrlAgentEndpoint.url,
-              "auto-failover": i <= 1
-            };
-          }
-        })
-        .filter(p => p != null);
-
     const loggers = [
       {
         "output-options": [
@@ -203,7 +200,9 @@ export class kea extends CoreService {
       }
     ];
 
-    const commonConfig = async family => {
+    const peers = this.peers;
+
+    const commonConfig = family => {
       const cfg = {
         "interfaces-config": {
           interfaces: listenInterfaces(`IPv${family}`)
@@ -250,7 +249,24 @@ export class kea extends CoreService {
                     "http-listener-threads": 2,
                     "http-client-threads": 2
                   },*/
-                  peers: await peers(family)
+                  peers: peers
+                    .sort(sortDescendingByPriority)
+                    .reduce((a, kea) => {
+                      const ctrlAgentEndpoint = kea.endpoint(
+                        `kea-ha-${family}`
+                      );
+                      if (ctrlAgentEndpoint) {
+                        const i = a.length;
+                        a.push({
+                          name: kea.host.name,
+                          role:
+                            i === 0 ? "primary" : i > 1 ? "backup" : "standby",
+                          url: ctrlAgentEndpoint.url,
+                          "auto-failover": i <= 1
+                        });
+                      }
+                      return a;
+                    }, [])
                 }
               ]
             }
@@ -399,34 +415,21 @@ export class kea extends CoreService {
           endpoint.type === "dhcp" &&
           endpoint.family === family &&
           endpoint.networkInterface.kind !== "loopback" &&
-          endpoint.networkInterface.kind !== "wlan" &&
           endpoint.networkInterface.kind !== "tun"
       ).map(
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
       );
 
-    const pools = subnet => {
-      return subnet.dhcpPools.map(pool => {
-        return { pool: Array.isArray(pool) ? pool.join(" - ") : pool };
-      });
-    };
-
     const dhcp4 = {
       Dhcp4: {
-        ...(await commonConfig("4")),
+        ...commonConfig("4"),
         subnet4: subnets
-          .filter(
-            s =>
-              s.family === FAMILY_IPV4 &&
-              // TODO keep out tailscale
-              s.cidr !== "100.64.0.2/32" &&
-              s.cidr !== "100.64.0.3/32"
-          )
+          .filter(s => s.family === FAMILY_IPV4)
           .map((subnet, index) => {
             return {
               id: index + 1,
               subnet: subnet.longAddress,
-              pools: pools(subnet),
+              pools: [{ pool: subnet.pool.join(" - ") }],
               reservations: reservations(subnet, "4"),
               "option-data": [
                 {
@@ -440,20 +443,14 @@ export class kea extends CoreService {
     };
     const dhcp6 = {
       Dhcp6: {
-        ...(await commonConfig("6")),
+        ...commonConfig("6"),
         subnet6: subnets
-          .filter(
-            s =>
-              s.family === FAMILY_IPV6 &&
-              !isLinkLocal(s.address) &&
-              // TODO keep out tailscale
-              s.cidr !== "fd7a:115c:a1e0::/64"
-          )
+          .filter(s => s.family === FAMILY_IPV6)
           .map((subnet, index) => {
             return {
               id: index + 1,
               subnet: subnet.longAddress,
-              pools: pools(subnet),
+              pools: [{ pool: subnet.pool.join(" - ") }],
               reservations: reservations(subnet, "6")
             };
           })

package/src/subnet.mjs

@@ -3,7 +3,6 @@ import {
   rangeIP,
   decodeIP,
   matchPrefixIP,
-  FAMILY_IPV6
 } from "ip-utilties";
 import { string_attribute, name_attribute, integer_attribute } from "pacc";
 import { networks_attribute } from "./common-attributes.mjs";
@@ -30,6 +29,12 @@ export class Subnet extends core {
 
   constructor(owner, address) {
     super();
+
+    switch(typeof address) {
+      case "object":
+        address = address.address;
+    }
+
     const { longPrefix, prefix, prefixLength, cidr, family } =
       normalizeCIDR(address);
 
@@ -71,16 +76,6 @@ export class Subnet extends core {
     return rangeIP(this.prefix, this.prefixLength, 1, 1).map(a => decodeIP(a));
   }
 
-  get dhcpPools() {
-    /* TODO where to take values from ? */
-
-    return [
-      this.family === FAMILY_IPV6
-        ? this.cidr
-        : rangeIP(this.prefix, this.prefixLength, 51, 20).map(a => decodeIP(a))
-    ];
-  }
-
   get longAddress() {
     return `${this.longPrefix}/${this.prefixLength}`;
   }