pmcf 2.65.1 → 2.65.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.65.1",
+  "version": "2.65.3",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
     "pkg-dir": "^8.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.15.29",
+    "@types/node": "^22.15.30",
     "ava": "^6.3.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/module.mjs

@@ -14,6 +14,7 @@ export * from "./network-interfaces/ethernet.mjs";
 export * from "./network-interfaces/wlan.mjs";
 export * from "./network-interfaces/wireguard.mjs";
 export * from "./host.mjs";
+export * from "./service-types.mjs";
 export * from "./service.mjs";
 export * from "./extra-source-service.mjs";
 export * from "./endpoint.mjs";

package/src/service-types.mjs

@@ -0,0 +1,77 @@
+export const ServiceTypes = {
+  "pacman-repo": {
+    extends: ["https"]
+  },
+  mqtt: { endpoints: [{ protocol: "tcp", port: 1883, tls: false }] },
+  "secure-mqtt": { endpoints: [{ protocol: "tcp", port: 8883, tls: true }] },
+  ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
+  dns: { endpoints: [{ protocol: "udp", port: 53, tls: false }] },
+  ldap: { endpoints: [{ protocol: "tcp", port: 389, tls: false }] },
+  ldaps: { endpoints: [{ protocol: "tcp", port: 636, tls: true }] },
+  http: { endpoints: [{ protocol: "tcp", port: 80, tls: false }] },
+  https: {
+    endpoints: [{ protocol: "tcp", port: 443, tls: true }],
+    dnsRecord: { type: "HTTPS", parameters: { alpn: "h2" } }
+  },
+  http3: {
+    extends: ["https"],
+    dnsRecord: {
+      type: "HTTPS",
+      parameters: { "no-default-alpn": undefined, alpn: "h3" }
+    }
+  },
+  rtsp: { endpoints: [{ protocol: "tcp", port: 554, tls: false }] },
+  smtp: {
+    endpoints: [{ protocol: "tcp", port: 25, tls: false }],
+    dnsRecord: { type: "MX" }
+  },
+  ssh: { endpoints: [{ protocol: "tcp", port: 22, tls: false }] },
+  imap: { endpoints: [{ protocol: "tcp", port: 143, tls: false }] },
+  imaps: { endpoints: [{ protocol: "tcp", port: 993, tls: true }] },
+  dhcp: { endpoints: [{ protocol: "udp", port: 547, tls: false }] },
+  "dhcpv6-client": {
+    endpoints: [
+      { protocol: "tcp", port: 546, tls: false },
+      { protocol: "udp", port: 546, tls: false }
+    ]
+  },
+  "dhcpv6-server": { endpoints: [{ port: 547, tls: false }] },
+  smb: { endpoints: [{ protocol: "tcp", port: 445, tls: false }] },
+  timemachine: {
+    extends: ["smb"],
+    endpoints: [{ protocol: "tcp", port: 445, tls: false }],
+    dnsRecord: {
+      type: "TXT",
+      parameters: {
+        sys: "waMa=0",
+        adVF: "0x100",
+        dk0: "adVN=MF-TM-999"
+        //  adVF: "0x82"
+      }
+    }
+  }
+};
+
+export function addServiceTypes(st) {
+  Object.assign(ServiceTypes, st);
+}
+
+export function serviceTypeEndpoints(type) {
+  let st = ServiceTypes[type];
+  if (st) {
+    if (st.extends) {
+      return st.extends.reduce(
+        (a, c) => [...a, ...(ServiceTypes[c]?.endpoints || [])],
+        st.endpoints || []
+      );
+    }
+
+    return st.endpoints;
+  }
+
+  return [
+    {
+      tls: false
+    }
+  ];
+}

package/src/service.mjs

@@ -2,6 +2,7 @@ import { Base, Host, Endpoint, DomainNameEndpoint } from "pmcf";
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 import { networkAddressProperties } from "./network-support.mjs";
+import { serviceTypeEndpoints, ServiceTypes } from "./service-types.mjs";
 import {
   DNSRecord,
   dnsFullName,
@@ -10,79 +11,6 @@ import {
   dnsPriority
 } from "./dns-utils.mjs";
 
-const ServiceTypes = {
-  "pacman-repo": {
-    extends: ["https"]
-  },
-  mqtt: { endpoints: [{ protocol: "tcp", port: 1883, tls: false }] },
-  ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
-  dns: { endpoints: [{ protocol: "udp", port: 53, tls: false }] },
-  ldap: { endpoints: [{ protocol: "tcp", port: 389, tls: false }] },
-  ldaps: { endpoints: [{ protocol: "tcp", port: 636, tls: true }] },
-  http: { endpoints: [{ protocol: "tcp", port: 80, tls: false }] },
-  https: {
-    endpoints: [{ protocol: "tcp", port: 443, tls: true }],
-    dnsRecord: { type: "HTTPS", parameters: { alpn: "h2" } }
-  },
-  http3: {
-    extends: ["https"],
-    dnsRecord: {
-      type: "HTTPS",
-      parameters: { "no-default-alpn": undefined, alpn: "h3" }
-    }
-  },
-  rtsp: { endpoints: [{ protocol: "tcp", port: 554, tls: false }] },
-  smtp: {
-    endpoints: [{ protocol: "tcp", port: 25, tls: false }],
-    dnsRecord: { type: "MX" }
-  },
-  ssh: { endpoints: [{ protocol: "tcp", port: 22, tls: false }] },
-  imap: { endpoints: [{ protocol: "tcp", port: 143, tls: false }] },
-  imaps: { endpoints: [{ protocol: "tcp", port: 993, tls: true }] },
-  dhcp: { endpoints: [{ protocol: "udp", port: 547, tls: false }] },
-  "dhcpv6-client": {
-    endpoints: [
-      { protocol: "tcp", port: 546, tls: false },
-      { protocol: "udp", port: 546, tls: false }
-    ]
-  },
-  "dhcpv6-server": { endpoints: [{ port: 547, tls: false }] },
-  smb: { endpoints: [{ protocol: "tcp", port: 445, tls: false }] },
-  timemachine: {
-    extends: ["smb"],
-    endpoints: [{ protocol: "tcp", port: 445, tls: false }],
-    dnsRecord: {
-      type: "TXT",
-      parameters: {
-        sys: "waMa=0",
-        adVF: "0x100",
-        dk0: "adVN=MF-TM-999"
-        //  adVF: "0x82"
-      }
-    }
-  }
-};
-
-export function serviceTypeEndpoints(type) {
-  let st = ServiceTypes[type];
-  if (st) {
-    if (st.extends) {
-      return st.extends.reduce(
-        (a, c) => [...a, ...(ServiceTypes[c]?.endpoints || [])],
-        st.endpoints || []
-      );
-    }
-
-    return st.endpoints;
-  }
-
-  return [
-    {
-      tls: false
-    }
-  ];
-}
-
 export const endpointProperties = {
   port: { type: "number", collection: false, writeable: true },
   protocol: {
@@ -194,9 +122,8 @@ export class Service extends Base {
     return this.host.subnets;
   }
 
-  get serviceTypeEndpoints()
-  {
-      return serviceTypeEndpoints(this.type);
+  get serviceTypeEndpoints() {
+    return serviceTypeEndpoints(this.type);
   }
 
   endpoints(filter) {

package/src/services/bind.mjs

@@ -16,11 +16,8 @@ import {
   addresses
 } from "pmcf";
 import { addType } from "../types.mjs";
-import {
-  ServiceTypeDefinition,
-  Service,
-  serviceTypeEndpoints
-} from "../service.mjs";
+import { serviceTypeEndpoints, addServiceTypes } from "../service-types.mjs";
+import { Service, ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addHook } from "../hooks.mjs";
 
@@ -93,19 +90,26 @@ const BindServiceTypeDefinition = {
   }
 };
 
-const rdncEndpoint = {
-  type: "rdnc",
-  port: 953,
-  protocol: "tcp",
-  tls: false
+const BindServiceTypes = {
+  "bind": {
+    extends: ["dns"]
+  },
+  "bind-statistics": {
+    endpoints: [
+      {
+        port: 19521,
+        protocol: "tcp",
+        tls: false
+      }
+    ]
+  },
+  rdnc: {
+    endpoints: [{ type: "rdnc", port: 953, protocol: "tcp", tls: false }]
+  }
 };
 
-const statisticsEndpoint = {
-  type: "bind-statistics",
-  port: 19521,
-  protocol: "tcp",
-  tls: false
-};
+const rdncEndpoint = BindServiceTypes.rdnc.endpoints[0];
+const statisticsEndpoint = BindServiceTypes["bind-statistics"].endpoints[0];
 
 function addressesStatement(prefix, objects, generateEmpty = false) {
   const body = asArray(objects).map(name => `  ${name};`);
@@ -138,6 +142,7 @@ export class BindService extends ExtraSourceService {
 
   static {
     addType(this);
+    addServiceTypes(BindServiceTypes);
   }
 
   static get typeDefinition() {

package/src/services/kea.mjs

@@ -12,6 +12,7 @@ import {
   SUBNET_LOCALHOST_IPV4,
   SUBNET_LOCALHOST_IPV6
 } from "pmcf";
+import { addServiceTypes } from "../service-types.mjs";
 import { addType } from "../types.mjs";
 import { writeLines } from "../utils.mjs";
 
@@ -31,6 +32,13 @@ const ddnsEndpoint = {
   tls: false
 };
 
+const KEAServiceTypes = {
+  kea: { extends: ["dhcp"] },
+  "kea-ddns": {
+    endpoints: [ddnsEndpoint]
+  }
+};
+
 const controlAgentEndpoint = {
   type: "kea-control-agent",
   port: 53002,
@@ -79,6 +87,7 @@ export const fetureHasHTTPEndpoints = keaVersion > 2.7;
 export class KeaService extends Service {
   static {
     addType(this);
+    addServiceTypes(KEAServiceTypes);
   }
 
   static get typeDefinition() {
@@ -367,9 +376,7 @@ export class KeaService extends Service {
 
           if (addr && subnet.matchesAddress(addr)) {
             ip =
-              family == 6
-                ? { "ip-addresses": [addr] }
-                : { "ip-address": addr };
+              family == 6 ? { "ip-addresses": [addr] } : { "ip-address": addr };
           }
 
           return {

package/types/module.d.mts

@@ -14,6 +14,7 @@ export * from "./network-interfaces/ethernet.mjs";
 export * from "./network-interfaces/wlan.mjs";
 export * from "./network-interfaces/wireguard.mjs";
 export * from "./host.mjs";
+export * from "./service-types.mjs";
 export * from "./service.mjs";
 export * from "./extra-source-service.mjs";
 export * from "./endpoint.mjs";

package/types/service-types.d.mts

@@ -0,0 +1,160 @@
+export function addServiceTypes(st: any): void;
+export function serviceTypeEndpoints(type: any): any;
+export const ServiceTypes: {
+    "pacman-repo": {
+        extends: string[];
+    };
+    mqtt: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    "secure-mqtt": {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    ntp: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    dns: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    ldap: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    ldaps: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    http: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    https: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+        dnsRecord: {
+            type: string;
+            parameters: {
+                alpn: string;
+            };
+        };
+    };
+    http3: {
+        extends: string[];
+        dnsRecord: {
+            type: string;
+            parameters: {
+                "no-default-alpn": any;
+                alpn: string;
+            };
+        };
+    };
+    rtsp: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    smtp: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+        dnsRecord: {
+            type: string;
+        };
+    };
+    ssh: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    imap: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    imaps: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    dhcp: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    "dhcpv6-client": {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    "dhcpv6-server": {
+        endpoints: {
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    smb: {
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+    };
+    timemachine: {
+        extends: string[];
+        endpoints: {
+            protocol: string;
+            port: number;
+            tls: boolean;
+        }[];
+        dnsRecord: {
+            type: string;
+            parameters: {
+                sys: string;
+                adVF: string;
+                dk0: string;
+            };
+        };
+    };
+};

package/types/service.d.mts

@@ -1,4 +1,3 @@
-export function serviceTypeEndpoints(type: any): any;
 /**
  *
  * @param {*} sources