pmcf 2.24.3 → 2.25.0

package/package.json

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

package/src/endpoint.mjs

@@ -1,9 +1,7 @@
-import { familyIP } from "ip-utilties";
-
 export class Endpoint {
-  constructor(service, networkInterface, data) {
+  constructor(service, networkAddress, data) {
     this.service = service;
-    this.networkInterface = networkInterface;
+    this.networkAddress = networkAddress;
     Object.assign(this, data);
   }
 
@@ -16,13 +14,13 @@ export class Endpoint {
   }
 
   get hostName() {
-    return this.networkInterface.hostName;
+    return this.networkAddress.networkInterface.hostName;
   }
 
   #address;
 
   get address() {
-    return this.#address ?? this.networkInterface.address;
+    return this.#address ?? this.networkAddress.address;
   }
 
   set address(value) {
@@ -30,6 +28,10 @@ export class Endpoint {
   }
 
   get family() {
-    return familyIP(this.address);
+    return this.networkAddress.family;
+  }
+
+  get networkInterface() {
+    return this.networkAddress.networkInterface;
   }
 }

package/src/service.mjs

@@ -189,12 +189,11 @@ export class Service extends Base {
     ];
 
     const result = [...this.server.networkAddresses()]
-      .map(sa =>
+      .map(na =>
         data.map(
           d =>
-            new Endpoint(this, sa.networkInterface, {
+            new Endpoint(this, na, {
               ...d,
-              address: sa.address,
               ...local
             })
         )

package/src/services/dhcp.mjs

@@ -52,17 +52,16 @@ export class DHCPService extends Service {
   }
 
   endpoints(filter) {
-    const l0 = this.server.findNetworkInterface({ scope: "host" });
+    const endpoints = super.endpoints(filter);
 
-    if (l0) {
-      return [
-        ...super.endpoints(filter),
-        new Endpoint(this, l0, controlAgentEndpoint),
-        new Endpoint(this, l0, ddnsEndpoint)
-      ];
+    for (const na of this.server.networkAddresses(
+      na => na.networkInterface.kind === "localhost"
+    )) {
+      endpoints.push(new Endpoint(this, na, controlAgentEndpoint));
+      endpoints.push(new Endpoint(this, na, ddnsEndpoint));
     }
 
-    return super.endpoints(filter);
+    return endpoints;
   }
 
   async *preparePackages(dir) {
@@ -256,7 +255,7 @@ export class DHCPService extends Service {
           }
         ],
         subnet4: [...subnets]
-          .filter(s => s.family==='IPv4')
+          .filter(s => s.family === "IPv4")
           .map((subnet, index) => {
             return {
               id: index + 1,

package/src/services/ntp.mjs

@@ -85,10 +85,14 @@ export class NTPService extends ExtraSourceService {
     };
 
     const lines = [
-      ...serviceEndpoints(this, {
-        ...NTP_SERVICE_FILTER,
-        priority: ">=10"
-      }).map(
+      ...serviceEndpoints(
+        this,
+        {
+          ...NTP_SERVICE_FILTER,
+          priority: ">=10"
+        },
+        e => e.family === 'IPv4' && e.networkInterface.kind !== "loopback"
+      ).map(
         endpoint =>
           `${endpoint.service.isPool ? "pool" : "server"} ${
             endpoint.address

package/types/endpoint.d.mts

@@ -1,12 +1,13 @@
 export class Endpoint {
-    constructor(service: any, networkInterface: any, data: any);
+    constructor(service: any, networkAddress: any, data: any);
     service: any;
-    networkInterface: any;
+    networkAddress: any;
     toString(): string;
     get socketAddress(): string;
     get hostName(): any;
     set address(value: any);
     get address(): any;
     get family(): any;
+    get networkInterface(): any;
     #private;
 }