pmcf 2.14.0 → 2.14.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.14.0",
+  "version": "2.14.2",
   "publishConfig": {
     "access": "public"
   },
@@ -48,7 +48,7 @@
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
     "semantic-release": "^24.2.3",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.3"
   },
   "engines": {
     "node": ">=22.14.0"

package/src/service.mjs

@@ -166,28 +166,26 @@ export class Service extends Base {
   }
 
   get endpoints() {
-    const nis = [...this.server.networkInterfaces.values()];
-
-    if (!ServiceTypes[this.type]) {
-      return nis.map(
-        networkInterface =>
-          new Endpoint(this, networkInterface, {
-            rawAddress: this.rawAddress,
-            port: this._port,
-            tls: false
-          })
-      );
-    }
+    const local = this._port === undefined ? {} : { port: this._port };
 
-    return nis.map(networkInterface =>
-      ServiceTypes[this.type].endpoints.map(
-        e =>
-          new Endpoint(this, networkInterface, {
-            rawAddress: this.rawAddress,
-            ...e
-          })
+    const data = ServiceTypes[this.type]?.endpoints || [
+      {
+        tls: false
+      }
+    ];
+
+    return [...this.server.networkAddresses()]
+      .map(sa =>
+        data.map(
+          d =>
+            new Endpoint(this, sa.networkInterface, {
+              ...d,
+              rawAddress: sa.address,
+              ...local
+            })
+        )
       )
-    ).flat();
+      .flat();
   }
 
   set alias(value) {
@@ -241,7 +239,9 @@ export class Service extends Base {
     }
 
     if (hasSVRRecords) {
-      for (const ep of this.endpoints.filter(e => e.protocol)) {
+      for (const ep of this.endpoints.filter(
+        e => e.protocol && e.networkInterface.scope !== "host" // TODO how to identify related interfaces
+      )) {
         records.push(
           DNSRecord(
             dnsFullName(
@@ -300,6 +300,24 @@ export class Endpoint {
     this.networkInterface = networkInterface;
     Object.assign(this, data);
   }
+
+  toString() {
+    return `${this.rawAddress}[${this.port}]`;
+  }
+
+  get hostName() {
+    return this.networkInterface.hostName;
+  }
+
+  #rawAddress;
+
+  get rawAddress() {
+    return this.#rawAddress ?? this.networkInterface.rawAddress;
+  }
+
+  set rawAddress(value) {
+    this.#rawAddress = value;
+  }
 }
 
 export const sortByPriority = (a, b) => a.priority - b.priority;

package/src/services/dhcp.mjs

@@ -6,7 +6,7 @@ import {
   serviceEndpoints
 } from "../service.mjs";
 import { addType } from "../types.mjs";
-import { writeLines } from "../utils.mjs";
+import { writeLines, isIPv4Address, isIPv6Address } from "../utils.mjs";
 
 const DHCPServiceTypeDefinition = {
   name: "dhcp",
@@ -186,9 +186,16 @@ export class DHCPService extends Service {
       Dhcp4: {
         ...commonConfig,
         "interfaces-config": {
-          interfaces: [...host.networkInterfaces.values()]
-            .filter(ni => ni.kind !== "loopback")
-            .map(ni => `${ni.name}/${ni.rawIPv4Address}`)
+          interfaces: this.endpoints
+            .filter(
+              endpoint =>
+                isIPv4Address(endpoint.rawAddress) &&
+                endpoint.networkInterface.kind !== "loopback"
+            )
+            .map(
+              endpoint =>
+                `${endpoint.networkInterface.name}/${endpoint.rawAddress}`
+            )
         },
         "multi-threading": {
           "enable-multi-threading": false
@@ -233,9 +240,16 @@ export class DHCPService extends Service {
       Dhcp6: {
         ...commonConfig,
         "interfaces-config": {
-          interfaces: [...host.networkInterfaces.values()]
-            .filter(ni => ni.kind !== "loopback")
-            .map(ni => `${ni.name}/${ni.rawIPv6Address}`)
+          interfaces: this.endpoints
+            .filter(
+              endpoint =>
+                isIPv6Address(endpoint.rawAddress) &&
+                endpoint.networkInterface.kind !== "loopback"
+            )
+            .map(
+              endpoint =>
+                `${endpoint.networkInterface.name}/${endpoint.rawAddress}`
+            )
         },
         "control-socket": {
           "socket-type": "unix",

package/types/service.d.mts

@@ -288,6 +288,11 @@ export class Endpoint {
     constructor(service: any, networkInterface: any, data: any);
     service: any;
     networkInterface: any;
+    toString(): string;
+    get hostName(): any;
+    set rawAddress(value: any);
+    get rawAddress(): any;
+    #private;
 }
 export function sortByPriority(a: any, b: any): number;
 import { Base } from "./base.mjs";