pmcf 2.14.2 → 2.15.0

package/package.json

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

package/src/host.mjs

@@ -115,7 +115,6 @@ export class Host extends Base {
 
   _applyExtends(host) {
     for (const service of host.services) {
-
       //present.extends.push(service);
 
       this.services = service.forOwner(this);
@@ -402,6 +401,24 @@ export class Host extends Base {
     );
   }
 
+  *findNetworkInterfaces(filter) {
+    yield* objectFilter(
+      types.network_interface,
+      this._networkInterfaces.values(),
+      filter
+    );
+  }
+  
+  findNetworkInterface(filter) {
+    for (const ni of objectFilter(
+      types.network_interface,
+      this._networkInterfaces.values(),
+      filter
+    )) {
+      return ni;
+    }
+  }
+
   get networkInterfaces() {
     return this._networkInterfaces;
   }
@@ -671,7 +688,11 @@ export class NetworkInterface extends Base {
   }
 
   get scope() {
-    return this.extendedProperty("_scope") ?? this.network?.scope ?? networkProperties.scope.default;
+    return (
+      this.extendedProperty("_scope") ??
+      this.network?.scope ??
+      networkProperties.scope.default
+    );
   }
 
   set hwaddr(value) {
@@ -687,7 +708,11 @@ export class NetworkInterface extends Base {
   }
 
   get metric() {
-    return this.extendedProperty("_metric") ?? this.network?.metric ?? networkProperties.metric.default;
+    return (
+      this.extendedProperty("_metric") ??
+      this.network?.metric ??
+      networkProperties.metric.default
+    );
   }
 
   set MTU(value) {

package/src/service.mjs

@@ -35,7 +35,7 @@ const ServiceTypes = {
   ssh: { endpoints: [{ protocol: "tcp", port: 22, tls: false }] },
   imap: { endpoints: [{ protocol: "tcp", port: 143, tls: false }] },
   imaps: { endpoints: [{ protocol: "tcp", port: 993, tls: true }] },
-  dhcp: { endpoints: [{ port: 547, tls: false }] },
+  dhcp: { endpoints: [{ port: 547, protocol: "udp", tls: false }] },
   "dhcpv6-client": {
     endpoints: [
       { protocol: "tcp", port: 546, tls: false },
@@ -166,7 +166,10 @@ export class Service extends Base {
   }
 
   get endpoints() {
-    const local = this._port === undefined ? {} : { port: this._port };
+    const local =
+      this._port === undefined
+        ? { type: this.type }
+        : { type: this.type, port: this._port };
 
     const data = ServiceTypes[this.type]?.endpoints || [
       {

package/src/services/dhcp.mjs

@@ -3,6 +3,7 @@ import { FileContentProvider } from "npm-pkgbuild";
 import {
   Service,
   ServiceTypeDefinition,
+  Endpoint,
   serviceEndpoints
 } from "../service.mjs";
 import { addType } from "../types.mjs";
@@ -17,6 +18,20 @@ const DHCPServiceTypeDefinition = {
   properties: {}
 };
 
+const controlAgentEndpoint = {
+  type: "kea-control-agent",
+  port: 8000,
+  protocol: "tcp",
+  tls: false
+};
+
+const ddnsEndpoint = {
+  type: "kea-ddns",
+  port: 53001,
+  protocol: "tcp",
+  tls: false
+};
+
 export class DHCPService extends Service {
   static {
     addType(this);
@@ -35,6 +50,20 @@ export class DHCPService extends Service {
     return DHCPServiceTypeDefinition.name;
   }
 
+  get endpoints() {
+    const l0 = this.server.findNetworkInterface({ scope: "host" });
+
+    if (l0) {
+      return [
+        ...super.endpoints,
+        new Endpoint(this, l0, controlAgentEndpoint),
+        new Endpoint(this, l0, ddnsEndpoint)
+      ];
+    }
+
+    return super.endpoints;
+  }
+
   async *preparePackages(dir) {
     const network = this.network;
     const host = this.server;
@@ -182,20 +211,23 @@ export class DHCPService extends Service {
       })
       .sort((a, b) => a.hostname.localeCompare(b.hostname));
 
+    const listenInterfaces = filter =>
+      this.endpoints
+        .filter(
+          endpoint =>
+            endpoint.type === "dhcp" &&
+            filter(endpoint.rawAddress) &&
+            endpoint.networkInterface.kind !== "loopback"
+        )
+        .map(
+          endpoint => `${endpoint.networkInterface.name}/${endpoint.rawAddress}`
+        );
+
     const dhcp4 = {
       Dhcp4: {
         ...commonConfig,
         "interfaces-config": {
-          interfaces: this.endpoints
-            .filter(
-              endpoint =>
-                isIPv4Address(endpoint.rawAddress) &&
-                endpoint.networkInterface.kind !== "loopback"
-            )
-            .map(
-              endpoint =>
-                `${endpoint.networkInterface.name}/${endpoint.rawAddress}`
-            )
+          interfaces: listenInterfaces(isIPv4Address)
         },
         "multi-threading": {
           "enable-multi-threading": false
@@ -240,16 +272,7 @@ export class DHCPService extends Service {
       Dhcp6: {
         ...commonConfig,
         "interfaces-config": {
-          interfaces: this.endpoints
-            .filter(
-              endpoint =>
-                isIPv6Address(endpoint.rawAddress) &&
-                endpoint.networkInterface.kind !== "loopback"
-            )
-            .map(
-              endpoint =>
-                `${endpoint.networkInterface.name}/${endpoint.rawAddress}`
-            )
+          interfaces: listenInterfaces(isIPv6Address)
         },
         "control-socket": {
           "socket-type": "unix",

package/types/host.d.mts

@@ -228,6 +228,8 @@ export class Host extends Base {
     get host(): this;
     named(name: any): any;
     get networks(): Set<any>;
+    findNetworkInterfaces(filter: any): Generator<any, void, any>;
+    findNetworkInterface(filter: any): any;
     set networkInterfaces(networkInterface: Map<any, any>);
     get networkInterfaces(): Map<any, any>;
     networkAddresses(): Generator<{