pmcf 2.12.0 → 2.13.0

package/package.json

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

package/src/host.mjs

@@ -115,6 +115,9 @@ export class Host extends Base {
 
   _applyExtends(host) {
     for (const service of host.services) {
+
+      //present.extends.push(service);
+
       this.services = service.forOwner(this);
     }
 

package/src/service.mjs

@@ -100,12 +100,13 @@ export const ServiceTypeDefinition = {
 };
 
 export class Service extends Base {
-  alias;
+  _alias;
   _weight;
   _type;
   _port;
   _ipAddresses;
   _systemd;
+  _extends = [];
 
   static {
     addType(this);
@@ -120,6 +121,14 @@ export class Service extends Base {
     this.read(data, ServiceTypeDefinition);
   }
 
+  set extends(value) {
+    this._extends.push(value);
+  }
+
+  get extends() {
+    return this._extends;
+  }
+
   get network() {
     return this.server.network;
   }
@@ -158,14 +167,28 @@ export class Service extends Base {
 
   get endpoints() {
     if (!ServiceTypes[this.type]) {
-      return [{ address: this.rawAddress, port: this._port, tls: false }];
+      return [
+        new Endpoint(this, {
+          rawAddress: this.rawAddress,
+          port: this._port,
+          tls: false
+        })
+      ];
     }
 
-    return ServiceTypes[this.type].endpoints.map(e =>
-      Object.assign({ address: this.rawAddress }, e)
+    return ServiceTypes[this.type].endpoints.map(
+      e => new Endpoint(this, { rawAddress: this.rawAddress, ...e })
     );
   }
 
+  set alias(value) {
+    this._alias = value;
+  }
+
+  get alias() {
+    return this.extendedProperty("_alias");
+  }
+
   set port(value) {
     this._port = value;
   }
@@ -187,7 +210,7 @@ export class Service extends Base {
   }
 
   get weight() {
-    return this._weight ?? this.owner.weight ?? 1;
+    return this.extendedProperty("_weight") ?? this.owner.weight ?? 1;
   }
 
   set type(value) {
@@ -199,7 +222,7 @@ export class Service extends Base {
   }
 
   get systemdServices() {
-    return this._systemd;
+    return this.extendedProperty("_systemd");
   }
 
   dnsRecordsForDomainName(domainName, hasSVRRecords) {
@@ -262,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(
@@ -278,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 };
           })
         };
       });

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[];
@@ -249,12 +250,15 @@ export class Service extends Base {
             };
         };
     };
-    alias: any;
+    _alias: any;
     _weight: any;
     _type: any;
     _port: any;
     _ipAddresses: any;
     _systemd: any;
+    _extends: any[];
+    set extends(value: any[]);
+    get extends(): any[];
     get server(): any;
     get domainName(): any;
     get ipAddressOrDomainName(): any;
@@ -264,6 +268,8 @@ export class Service extends Base {
     get addresses(): any;
     get networks(): any;
     get endpoints(): any;
+    set alias(value: any);
+    get alias(): any;
     set port(value: any);
     get port(): any;
     get protocol(): any;
@@ -278,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";