pmcf 2.24.2 → 2.25.0

package/package.json

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

package/src/endpoint.mjs

@@ -0,0 +1,37 @@
+export class Endpoint {
+  constructor(service, networkAddress, data) {
+    this.service = service;
+    this.networkAddress = networkAddress;
+    Object.assign(this, data);
+  }
+
+  toString() {
+    return `${this.address}[${this.port}]`;
+  }
+
+  get socketAddress() {
+    return `${this.address}:${this.port}`;
+  }
+
+  get hostName() {
+    return this.networkAddress.networkInterface.hostName;
+  }
+
+  #address;
+
+  get address() {
+    return this.#address ?? this.networkAddress.address;
+  }
+
+  set address(value) {
+    this.#address = value;
+  }
+
+  get family() {
+    return this.networkAddress.family;
+  }
+
+  get networkInterface() {
+    return this.networkAddress.networkInterface;
+  }
+}

package/src/module.mjs

@@ -1,8 +1,4 @@
 export * from "./base.mjs";
-export * from "./service.mjs";
-export * from "./services/dns.mjs";
-export * from "./services/ntp.mjs";
-export * from "./services/dhcp.mjs";
 export * from "./cluster.mjs";
 export * from "./owner.mjs";
 export * from "./location.mjs";
@@ -10,7 +6,13 @@ export * from "./root.mjs";
 export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
+export * from "./network-address.mjs";
 export * from "./network-support.mjs";
 export * from "./network-interface.mjs";
 export * from "./host.mjs";
+export * from "./service.mjs";
+export * from "./endpoint.mjs";
+export * from "./services/dns.mjs";
+export * from "./services/ntp.mjs";
+export * from "./services/dhcp.mjs";
 export * from "./types.mjs";

package/src/network-address.mjs

@@ -0,0 +1,33 @@
+import { familyIP, formatCIDR } from "ip-utilties";
+import { Subnet } from "./subnet.mjs";
+
+/**
+ * @property {NetworkInterface} networkInterface
+ * @property {string|Uint8Array|Uint16Array} address
+ * @property {string} family
+ * @property {Subnet} subnet
+ * @property {Set<string>} domainNames
+ */
+export class NetworkAddress {
+  /** @type {Subnet} */ subnet;
+  /** @type {NetworkInterface} */ networkInterface;
+  /** @type {string|Uint8Array|Uint16Array} */ address;
+
+  constructor(networkInterface, address, subnet) {
+    this.networkInterface = networkInterface;
+    this.address = address;
+    this.subnet = subnet;
+  }
+
+  get domainNames() {
+    return this.networkInterface.domainNames;
+  }
+
+  get family() {
+    return familyIP(this.address);
+  }
+
+  get cidrAddress() {
+    return formatCIDR(this.address, this.subnet.prefixLength);
+  }
+}

package/src/network-interface.mjs

@@ -1,15 +1,10 @@
+import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
 import {
-  hasWellKnownSubnet,
-  normalizeIP,
-  familyIP,
-  formatCIDR
-} from "ip-utilties";
-import { Base } from "./base.mjs";
-import {
-  Subnet,
+  NetworkAddress,
+  Base,
   SUBNET_LOCALHOST_IPV4,
   SUBNET_LOCALHOST_IPV6
-} from "./subnet.mjs";
+} from "pmcf";
 import {
   networkProperties,
   networkAddressProperties
@@ -17,37 +12,6 @@ import {
 import { asArray } from "./utils.mjs";
 import { addType } from "./types.mjs";
 
-/**
- * @property {NetworkInterface} networkInterface
- * @property {string|Uint8Array|Uint16Array} address
- * @property {string} family
- * @property {Subnet} subnet
- * @property {Set<string>} domainNames
- */
-export class NetworkAddress {
-  /** @type {Subnet} */ subnet;
-  /** @type {NetworkInterface} */ networkInterface;
-  /** @type {string|Uint8Array|Uint16Array} */ address;
-
-  constructor(networkInterface, address, subnet) {
-    this.networkInterface = networkInterface;
-    this.address = address;
-    this.subnet = subnet;
-  }
-
-  get domainNames() {
-    return this.networkInterface.domainNames;
-  }
-
-  get family() {
-    return familyIP(this.address);
-  }
-
-  get cidrAddress() {
-    return formatCIDR(this.address, this.subnet.prefixLength);
-  }
-}
-
 class SkeletonNetworkInterface extends Base {
   _extends = [];
   _network;

package/src/service.mjs

@@ -1,5 +1,5 @@
-import { isLocalhost, familyIP } from "ip-utilties";
-import { Base } from "./base.mjs";
+import { isLocalhost } from "ip-utilties";
+import { Base, Endpoint } from "pmcf";
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 import { networkAddressProperties } from "./network-support.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
             })
         )
@@ -310,40 +309,6 @@ export class Service extends Base {
   }
 }
 
-export class Endpoint {
-  constructor(service, networkInterface, data) {
-    this.service = service;
-    this.networkInterface = networkInterface;
-    Object.assign(this, data);
-  }
-
-  toString() {
-    return `${this.address}[${this.port}]`;
-  }
-
-  get socketAddress() {
-    return `${this.address}:${this.port}`;
-  }
-
-  get hostName() {
-    return this.networkInterface.hostName;
-  }
-
-  #address;
-
-  get address() {
-    return this.#address ?? this.networkInterface.address;
-  }
-
-  set address(value) {
-    this.#address = value;
-  }
-
-  get family() {
-    return familyIP(this.address);
-  }
-}
-
 export const sortByPriority = (a, b) => a.priority - b.priority;
 
 export function serviceAddresses(

package/src/services/dhcp.mjs

@@ -5,7 +5,7 @@ import {
   ServiceTypeDefinition,
   Endpoint,
   serviceEndpoints
-} from "../service.mjs";
+} from "pmcf";
 import { addType } from "../types.mjs";
 import { writeLines } from "../utils.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

@@ -0,0 +1,13 @@
+export class Endpoint {
+    constructor(service: any, networkAddress: any, data: any);
+    service: 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;
+}

package/types/module.d.mts

@@ -1,8 +1,4 @@
 export * from "./base.mjs";
-export * from "./service.mjs";
-export * from "./services/dns.mjs";
-export * from "./services/ntp.mjs";
-export * from "./services/dhcp.mjs";
 export * from "./cluster.mjs";
 export * from "./owner.mjs";
 export * from "./location.mjs";
@@ -10,7 +6,13 @@ export * from "./root.mjs";
 export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
+export * from "./network-address.mjs";
 export * from "./network-support.mjs";
 export * from "./network-interface.mjs";
 export * from "./host.mjs";
+export * from "./service.mjs";
+export * from "./endpoint.mjs";
+export * from "./services/dns.mjs";
+export * from "./services/ntp.mjs";
+export * from "./services/dhcp.mjs";
 export * from "./types.mjs";

package/types/network-address.d.mts

@@ -0,0 +1,17 @@
+/**
+ * @property {NetworkInterface} networkInterface
+ * @property {string|Uint8Array|Uint16Array} address
+ * @property {string} family
+ * @property {Subnet} subnet
+ * @property {Set<string>} domainNames
+ */
+export class NetworkAddress {
+    constructor(networkInterface: any, address: any, subnet: any);
+    /** @type {Subnet} */ subnet: Subnet;
+    /** @type {NetworkInterface} */ networkInterface: NetworkInterface;
+    /** @type {string|Uint8Array|Uint16Array} */ address: string | Uint8Array | Uint16Array;
+    get domainNames(): any;
+    get family(): any;
+    get cidrAddress(): any;
+}
+import { Subnet } from "./subnet.mjs";

package/types/network-interface.d.mts

@@ -1,19 +1,3 @@
-/**
- * @property {NetworkInterface} networkInterface
- * @property {string|Uint8Array|Uint16Array} address
- * @property {string} family
- * @property {Subnet} subnet
- * @property {Set<string>} domainNames
- */
-export class NetworkAddress {
-    constructor(networkInterface: any, address: any, subnet: any);
-    /** @type {Subnet} */ subnet: Subnet;
-    /** @type {NetworkInterface} */ networkInterface: NetworkInterface;
-    /** @type {string|Uint8Array|Uint16Array} */ address: string | Uint8Array | Uint16Array;
-    get domainNames(): any;
-    get family(): any;
-    get cidrAddress(): any;
-}
 export namespace NetworkInterfaceTypeDefinition {
     export let name: string;
     export let priority: number;
@@ -695,7 +679,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
     get kind(): string;
     get scope(): string;
     get hostName(): string;
-    get ipAddresses(): Map<string, Subnet>;
+    get ipAddresses(): Map<string, import("pmcf").Subnet>;
 }
 export class WireguardNetworkInterface extends SkeletonNetworkInterface {
     static get typeDefinition(): {
@@ -1022,7 +1006,6 @@ export class WireguardNetworkInterface extends SkeletonNetworkInterface {
     };
     get kind(): string;
 }
-import { Subnet } from "./subnet.mjs";
 declare class SkeletonNetworkInterface extends Base {
     _extends: any[];
     _network: any;
@@ -1044,5 +1027,6 @@ declare class SkeletonNetworkInterface extends Base {
     get address(): any;
     get addresses(): any[];
 }
-import { Base } from "./base.mjs";
+import { Base } from "pmcf";
+import { NetworkAddress } from "pmcf";
 export {};

package/types/service.d.mts

@@ -329,17 +329,5 @@ export class Service extends Base {
         toString: (maxKeyLength?: number, ttl?: string) => string;
     }[];
 }
-export class Endpoint {
-    constructor(service: any, networkInterface: any, data: any);
-    service: any;
-    networkInterface: any;
-    toString(): string;
-    get socketAddress(): string;
-    get hostName(): any;
-    set address(value: any);
-    get address(): any;
-    get family(): any;
-    #private;
-}
 export function sortByPriority(a: any, b: any): number;
-import { Base } from "./base.mjs";
+import { Base } from "pmcf";

package/types/services/dhcp.d.mts

@@ -266,5 +266,5 @@ export class DHCPService extends Service {
         };
     }, void, unknown>;
 }
-import { Service } from "../service.mjs";
+import { Service } from "pmcf";
 import { FileContentProvider } from "npm-pkgbuild";