pmcf 2.6.5 → 2.6.7

package/package.json

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

package/src/service.mjs

@@ -8,7 +8,6 @@ import {
   dnsFormatParameters,
   dnsMergeParameters
 } from "./dns-utils.mjs";
-import { DHCPService, DNSService, NTPService } from "./module.mjs";
 
 const ServiceTypes = {
   ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
@@ -47,7 +46,7 @@ const ServiceTypes = {
   smb: { endpoints: [{ protocol: "tcp", port: 445, tls: false }] },
   timemachine: {
     type: "adisk",
-    endpoints: [{ protocol: "tcp", tls: false }],
+    endpoints: [{ protocol: "tcp", port: 445, tls: false }],
     dnsRecord: {
       type: "TXT",
       parameters: {
@@ -149,13 +148,13 @@ export class Service extends Base {
   }
 
   get endpoints() {
-    if (this._port !== undefined) {
+    if (!ServiceTypes[this.type]) {
       return [
-        { protocol: this.protocol, address: this.rawAddress, port: this._port }
+        { address: this.rawAddress, port: this._port, tls: false }
       ];
     }
 
-    return ServiceTypes[this.type]?.endpoints || [];
+    return ServiceTypes[this.type].endpoints;
   }
 
   set port(value) {
@@ -163,7 +162,15 @@ export class Service extends Base {
   }
 
   get port() {
-    return this._port ?? ServiceTypes[this.type]?.endpoints[0].port;
+    return this.endpoints[0].port;
+  }
+
+  get protocol() {
+    return this.endpoints[0].protocol;
+  }
+
+  get tls() {
+    return this.endpoints[0].tls;
   }
 
   set weight(value) {
@@ -182,14 +189,6 @@ export class Service extends Base {
     return this._type ?? this.name;
   }
 
-  get protocol() {
-    return ServiceTypes[this.type]?.endpoints[0].protocol;
-  }
-
-  get tls() {
-    return ServiceTypes[this.type]?.tls ?? false;
-  }
-
   get systemdServices() {
     return this._systemd;
   }

package/src/services/dhcp.mjs

@@ -50,8 +50,7 @@ export class DHCPService extends Service {
         name: `kea-${this.location.name}-${host.name}`,
         description: `kea definitions for ${this.fullName}@${name}`,
         access: "private",
-        dependencies: ["kea"],
-        replaces: [`kea-${name}`] // TODO remove
+        dependencies: ["kea>=2.6.1"]
       }
     };
 

package/types/service.d.mts

@@ -261,12 +261,12 @@ export class Service extends Base {
     get endpoints(): any;
     set port(value: any);
     get port(): any;
+    get protocol(): any;
+    get tls(): any;
     set weight(value: any);
     get weight(): any;
     set type(value: any);
     get type(): any;
-    get protocol(): any;
-    get tls(): any;
     get systemdServices(): any;
     dnsRecordsForDomainName(domainName: any, hasSVRRecords: any): {
         key: any;

package/types/services/dhcp.d.mts

@@ -259,7 +259,6 @@ export class DHCPService extends Service {
             description: string;
             access: string;
             dependencies: string[];
-            replaces: string[];
         };
     }, void, unknown>;
 }