pmcf 2.11.5 → 2.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.11.5",
+  "version": "2.12.1",
   "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,29 @@ export class Service extends Base {
 
   get endpoints() {
     if (!ServiceTypes[this.type]) {
-      return [{ address: this.rawAddress, port: this._port, tls: false }];
+      return [
+        {
+          service: this,
+          address: this.rawAddress,
+          port: this._port,
+          tls: false
+        }
+      ];
     }
 
     return ServiceTypes[this.type].endpoints.map(e =>
-      Object.assign({ address: this.rawAddress }, e)
+      Object.assign({ service: this, address: this.rawAddress }, e)
     );
   }
 
+  set alias(value) {
+    this._alias = value;
+  }
+
+  get alias() {
+    return this.extendedProperty("_alias");
+  }
+
   set port(value) {
     this._port = value;
   }
@@ -187,7 +211,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 +223,7 @@ export class Service extends Base {
   }
 
   get systemdServices() {
-    return this._systemd;
+    return this.extendedProperty("_systemd");
   }
 
   dnsRecordsForDomainName(domainName, hasSVRRecords) {

package/src/services/ntp.mjs

@@ -14,7 +14,14 @@ const NTPServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  properties: {}
+  properties: {
+    isPool: {
+      type: "boolean",
+      collection: false,
+      writeable: true,
+      default: false
+    }
+  }
 };
 
 const NTP_SERVICE_FILTER = { type: NTPServiceTypeDefinition.name };

package/types/service.d.mts

@@ -249,12 +249,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 +267,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;

package/types/services/ntp.d.mts

@@ -263,7 +263,14 @@ export class NTPService extends ExtraSourceService {
             };
         };
         priority: number;
-        properties: {};
+        properties: {
+            isPool: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+                default: boolean;
+            };
+        };
     };
     get systemdConfig(): (string | {
         NTP: string;