pmcf 2.49.0 → 2.49.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.49.0",
+  "version": "2.49.1",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
     "pkg-dir": "^8.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.15.18",
     "ava": "^6.3.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/endpoint.mjs

@@ -1,17 +1,16 @@
 class BaseEndpoint {
-  #type;
+  _type;
 
   constructor(service, data) {
     this.service = service;
 
     if (data.type !== undefined) {
-      this.#type = data.type;
-      delete data.type;
+      this._type = data.type;
     }
   }
 
   get type() {
-    return this.#type ?? this.service.type;
+    return this._type ?? this.service.type;
   }
 
   toString() {
@@ -20,24 +19,27 @@ class BaseEndpoint {
 }
 
 class PortEndpoint extends BaseEndpoint {
-  #port;
+  _port;
   constructor(service, data) {
     super(service, data);
 
     if (data.port !== undefined) {
-      this.#port = data.port;
-      delete data.port;
+      this._port = data.port;
+    }
+    if (data.protocol !== undefined) {
+      this.protocol = data.protocol;
+    }
+    if (data.tls !== undefined) {
+      this.tls = data.tls;
     }
-
-    Object.assign(this, data);
   }
 
   get port() {
-    return this.#port ?? this.service.port;
+    return this._port ?? this.service.port;
   }
 
   toString() {
-    return `${this.type}/${this.address}[${this.port}]`;
+    return `${this.type}:${this.family}/${this.address}[${this.port}]`;
   }
 }
 
@@ -96,6 +98,10 @@ export class HTTPEndpoint extends PortEndpoint {
   get address() {
     return this.url;
   }
+
+  toString() {
+    return `${this.type}:${this.url}`;
+  }
 }
 
 export class UnixEndpoint extends BaseEndpoint {
@@ -108,7 +114,15 @@ export class UnixEndpoint extends BaseEndpoint {
     return "unix";
   }
 
+  get host() {
+    return this.service.host;
+  }
+
   get address() {
     return this.path;
   }
+
+  toString() {
+    return `${this.type}:${this.family}:${this.path}`;
+  }
 }

package/src/services/dhcp.mjs

@@ -4,6 +4,7 @@ import {
   Service,
   ServiceTypeDefinition,
   Endpoint,
+  UnixEndpoint,
   serviceEndpoints,
   SUBNET_LOCALHOST_IPV4,
   SUBNET_LOCALHOST_IPV6
@@ -34,6 +35,24 @@ const ddnsEndpoint = {
   tls: false
 };
 
+const control4Endpoint = {
+  type: "kea-control-dhcp4",
+  family: "unix",
+  path: "/run/kea/4-ctrl-socket"
+};
+
+const control6Endpoint = {
+  type: "kea-control-dhcp6",
+  family: "unix",
+  path: "/run/kea/6-ctrl-socket"
+};
+
+const controlDDNSEndpoint = {
+  type: "kea-control-ddns",
+  family: "unix",
+  path: "/run/kea/ddns-ctrl-socket"
+};
+
 export class DHCPService extends Service {
   static {
     addType(this);
@@ -62,6 +81,12 @@ export class DHCPService extends Service {
       endpoints.push(new Endpoint(this, na, ddnsEndpoint));
     }
 
+    endpoints.push(
+      new UnixEndpoint(this, control4Endpoint.path, control4Endpoint),
+      new UnixEndpoint(this, control6Endpoint.path, control6Endpoint),
+      new UnixEndpoint(this, controlDDNSEndpoint.path, controlDDNSEndpoint)
+    );
+
     return filter ? endpoints.filter(filter) : endpoints;
   }
 
@@ -70,7 +95,7 @@ export class DHCPService extends Service {
     const host = this.host;
     const name = host.name;
 
-    console.log("kea", host.name, network.name);
+    console.log("kea", name, network.name);
 
     const dnsServerEndpoints = serviceEndpoints(network, {
       services: {
@@ -85,7 +110,7 @@ export class DHCPService extends Service {
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: `kea-${this.location.name}-${host.name}`,
+        name: `kea-${this.location.name}-${name}`,
         description: `kea definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["kea>=2.6.2"]
@@ -125,23 +150,21 @@ export class DHCPService extends Service {
       }
     ];
 
+    const toUnix = endpoint => {
+      return {
+        "socket-type": "unix",
+        "socket-name": endpoint?.path
+      };
+    };
+
     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"
-          }
+          dhcp4: toUnix(this.endpoint(e => e.type === "kea-control-dhcp4")),
+          dhcp6: toUnix(this.endpoint(e => e.type === "kea-control-dhcp6")),
+          d2: toUnix(this.endpoint(e => e.type === "kea-control-ddns"))
         },
         loggers
       }
@@ -163,11 +186,13 @@ export class DHCPService extends Service {
       DhcpDdns: {
         "ip-address": "127.0.0.1",
         port: 53001,
-        "control-socket": {
+        "control-socket": toUnix(
+          this.endpoint(e => e.type === "kea-control-ddns")
+        ),
+        /* {
           "socket-type": "unix",
           "socket-name": "/run/kea/ddns-ctrl-socket"
-        },
-        "tsig-keys": [],
+        } */ "tsig-keys": [],
         "forward-ddns": {
           "ddns-domains": dnsServersSlot([...this.domains])
         },
@@ -223,7 +248,11 @@ export class DHCPService extends Service {
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
       );
 
-    const subnets = [...this.subnets].filter(s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6/* s.address !== "127/8"*/); // TODO no localhost
+    const subnets = [...this.subnets].filter(
+      s =>
+        s !== SUBNET_LOCALHOST_IPV4 &&
+        s !== SUBNET_LOCALHOST_IPV6 /* s.address !== "127/8"*/
+    ); // TODO no localhost
     const dhcp4 = {
       Dhcp4: {
         ...commonConfig,

package/types/endpoint.d.mts

@@ -23,17 +23,20 @@ export class UnixEndpoint extends BaseEndpoint {
     constructor(service: any, path: any, data: any);
     path: any;
     get family(): string;
+    get host(): any;
     get address(): any;
 }
 declare class PortEndpoint extends BaseEndpoint {
+    _port: any;
+    protocol: any;
+    tls: any;
     get port(): any;
-    #private;
 }
 declare class BaseEndpoint {
     constructor(service: any, data: any);
+    _type: any;
     service: any;
     get type(): any;
     toString(): string;
-    #private;
 }
 export {};