pmcf 2.12.1 → 2.13.1

package/package.json

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

package/src/service.mjs

@@ -168,17 +168,16 @@ export class Service extends Base {
   get endpoints() {
     if (!ServiceTypes[this.type]) {
       return [
-        {
-          service: this,
-          address: this.rawAddress,
+        new Endpoint(this, {
+          rawAddress: this.rawAddress,
           port: this._port,
           tls: false
-        }
+        })
       ];
     }
 
-    return ServiceTypes[this.type].endpoints.map(e =>
-      Object.assign({ service: this, address: this.rawAddress }, e)
+    return ServiceTypes[this.type].endpoints.map(
+      e => new Endpoint(this, { rawAddress: this.rawAddress, ...e })
     );
   }
 
@@ -286,6 +285,13 @@ export class Service extends Base {
   }
 }
 
+export class Endpoint {
+  constructor(service, data) {
+    this.service = service;
+    Object.assign(this, data);
+  }
+}
+
 export const sortByPriority = (a, b) => a.priority - b.priority;
 
 export function serviceAddresses(
@@ -302,3 +308,12 @@ export function serviceAddresses(
     .flat()
     .filter(addressFilter);
 }
+
+export function serviceEndpoints(sources, filter) {
+  return asArray(sources)
+    .map(ft => Array.from(ft.findServices(filter)))
+    .flat()
+    .sort(sortByPriority)
+    .map(service => service.endpoints)
+    .flat();
+}

package/src/services/dhcp.mjs

@@ -3,7 +3,7 @@ import { FileContentProvider } from "npm-pkgbuild";
 import {
   Service,
   ServiceTypeDefinition,
-  serviceAddresses
+  serviceEndpoints
 } from "../service.mjs";
 import { addType } from "../types.mjs";
 import { writeLines } from "../utils.mjs";
@@ -42,7 +42,7 @@ export class DHCPService extends Service {
 
     console.log("kea", host.name, network.name);
 
-    const dnsServerAddreses = serviceAddresses(network, {
+    const dnsServerEndpoints = serviceEndpoints(network, {
       type: "dns",
       priority: "<10"
     });
@@ -115,8 +115,8 @@ export class DHCPService extends Service {
       domains.map(domain => {
         return {
           name: domain,
-          "dns-servers": dnsServerAddreses.map(address => {
-            return { "ip-address": address };
+          "dns-servers": dnsServerEndpoints.map(endpoint => {
+            return { "ip-address": endpoint.rawAddress };
           })
         };
       });
@@ -200,7 +200,9 @@ export class DHCPService extends Service {
         "option-data": [
           {
             name: "domain-name-servers",
-            data: dnsServerAddreses.join(",")
+            data: dnsServerEndpoints
+              .map(endpoint => endpoint.rawAddress)
+              .join(",")
           },
           {
             name: "domain-search",

package/src/services/ntp.mjs

@@ -1,7 +1,11 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { addType } from "../types.mjs";
-import { ServiceTypeDefinition, serviceAddresses } from "../service.mjs";
+import {
+  ServiceTypeDefinition,
+  serviceAddresses,
+  serviceEndpoints
+} from "../service.mjs";
 import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition
@@ -81,10 +85,15 @@ export class NTPService extends ExtraSourceService {
     };
 
     const lines = [
-      ...serviceAddresses(this, {
+      ...serviceEndpoints(this, {
         ...NTP_SERVICE_FILTER,
         priority: ">=10"
-      }).map(address => `server ${address} iburst`),
+      }).map(
+        endpoint =>
+          `${endpoint.service.isPool ? "pool" : "server"} ${
+            endpoint.rawAddress
+          } iburst`
+      ),
       `mailonchange ${this.administratorEmail} 0.5`,
       "local stratum 10",
       "leapsectz right/UTC",

package/types/service.d.mts

@@ -1,4 +1,5 @@
 export function serviceAddresses(sources: any, filter: any, addressType?: string, addressFilter?: (a: any) => boolean): any[];
+export function serviceEndpoints(sources: any, filter: any): any[];
 export namespace ServiceTypeDefinition {
     export let name: string;
     export let owners: string[];
@@ -283,5 +284,9 @@ export class Service extends Base {
         toString: (maxKeyLength?: number, ttl?: string) => string;
     }[];
 }
+export class Endpoint {
+    constructor(service: any, data: any);
+    service: any;
+}
 export function sortByPriority(a: any, b: any): number;
 import { Base } from "./base.mjs";