pmcf 6.33.5 → 6.34.0

package/package.json

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

package/src/core-service.mjs

@@ -110,11 +110,7 @@ export class CoreService extends Base {
   }
 
   endpoints(filter) {
-    const data = serviceTypeEndpoints(ServiceTypes[this.type]);
-    if (!data) {
-      return [];
-    }
-
+    const data = serviceTypeEndpoints(ServiceTypes[this.type], true);
     const result = [];
 
     const domainNames = new Set([undefined]);

package/src/endpoint.mjs

@@ -1,11 +1,12 @@
 import { getAttribute, string_attribute, url_attribute } from "pacc";
-import { FAMILY_IPV6 } from "ip-utilties";
+import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "pmcf";
 import { CoreService } from "./core-service.mjs";
 import { family_attribute, endpointAttributes } from "./common-attributes.mjs";
 
 export const FAMILY_UNIX = "unix";
 export const FAMILY_DNS = "dns";
+export const FAMILY_IPV4_IPV6 = new Set([FAMILY_IPV4, FAMILY_IPV6]);
 
 class BaseEndpoint {
   static name = "base_endpoint";

package/src/service-types.mjs

@@ -1,5 +1,6 @@
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
-import { FAMILY_UNIX } from "./endpoint.mjs";
+import { FAMILY_UNIX, FAMILY_IPV4_IPV6 } from "./endpoint.mjs";
+import { asArray } from "./utils.mjs";
 
 export const ServiceTypes = {
   "alpm-repo": {
@@ -13,25 +14,13 @@ export const ServiceTypes = {
     endpoints: [
       {
         protocol: "udp",
-        family: FAMILY_IPV4,
-        port: 514,
-        tls: false
-      },
-      {
-        protocol: "udp",
-        family: FAMILY_IPV6,
-        port: 514,
-        tls: false
-      },
-      {
-        protocol: "tcp",
-        family: FAMILY_IPV4,
+        family: FAMILY_IPV4_IPV6,
         port: 514,
         tls: false
       },
       {
         protocol: "tcp",
-        family: FAMILY_IPV6,
+        family: FAMILY_IPV4_IPV6,
         port: 514,
         tls: false
       }
@@ -39,53 +28,39 @@ export const ServiceTypes = {
   },
   mqtt: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 1883, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 1883, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 1883, tls: false }
     ]
   },
   "secure-mqtt": {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 8883, tls: true },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 8883, tls: true }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 8883, tls: true }
     ]
   },
   ntp: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "udp", port: 123, tls: false },
-      { family: FAMILY_IPV6, protocol: "udp", port: 123, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 123, tls: false }
     ]
   },
   dns: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "udp", port: 53, tls: false },
-      { family: FAMILY_IPV6, protocol: "udp", port: 53, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 53, tls: false }
     ]
   },
   mdns: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "udp", port: 5353, tls: false },
-      { family: FAMILY_IPV6, protocol: "udp", port: 5353, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 5353, tls: false }
     ]
   },
   llmnr: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "udp", port: 5355, tls: false },
-      { family: FAMILY_IPV4, protocol: "tcp", port: 5355, tls: false },
-      { family: FAMILY_IPV6, protocol: "udp", port: 5355, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 5355, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 5355, tls: false },
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 5355, tls: false }
     ]
   },
   ldap: {
     endpoints: [
       {
-        family: FAMILY_IPV4,
-        scheme: "ldap",
-        protocol: "tcp",
-        port: 389,
-        tls: false
-      },
-      {
-        family: FAMILY_IPV6,
+        family: FAMILY_IPV4_IPV6,
         scheme: "ldap",
         protocol: "tcp",
         port: 389,
@@ -96,14 +71,7 @@ export const ServiceTypes = {
   ldaps: {
     endpoints: [
       {
-        family: FAMILY_IPV4,
-        scheme: "ldaps",
-        protocol: "tcp",
-        port: 636,
-        tls: true
-      },
-      {
-        family: FAMILY_IPV6,
+        family: FAMILY_IPV4_IPV6,
         scheme: "ldaps",
         protocol: "tcp",
         port: 636,
@@ -117,14 +85,7 @@ export const ServiceTypes = {
   http: {
     endpoints: [
       {
-        family: FAMILY_IPV4,
-        scheme: "http",
-        protocol: "tcp",
-        port: 80,
-        tls: false
-      },
-      {
-        family: FAMILY_IPV6,
+        family: FAMILY_IPV4_IPV6,
         scheme: "http",
         protocol: "tcp",
         port: 80,
@@ -135,14 +96,7 @@ export const ServiceTypes = {
   https: {
     endpoints: [
       {
-        family: FAMILY_IPV4,
-        scheme: "https",
-        protocol: "tcp",
-        port: 443,
-        tls: true
-      },
-      {
-        family: FAMILY_IPV6,
+        family: FAMILY_IPV4_IPV6,
         scheme: "https",
         protocol: "tcp",
         port: 443,
@@ -154,14 +108,7 @@ export const ServiceTypes = {
   http3: {
     endpoints: [
       {
-        family: FAMILY_IPV4,
-        scheme: "https",
-        protocol: "udp",
-        port: 443,
-        tls: true
-      },
-      {
-        family: FAMILY_IPV6,
+        family: FAMILY_IPV4_IPV6,
         scheme: "https",
         protocol: "udp",
         port: 443,
@@ -175,64 +122,54 @@ export const ServiceTypes = {
   },
   rtsp: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 554, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 554, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 554, tls: false }
     ]
   },
   smtp: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 25, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 25, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 25, tls: false }
     ],
     dnsRecord: { type: "MX" }
   },
   smtps: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 465, tls: true },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 465, tls: true }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 465, tls: true }
     ],
     dnsRecord: { type: "MX" }
   },
   submission: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 587, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 587, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 587, tls: false }
     ]
   },
   lmtp: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 24, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 24, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 24, tls: false }
     ]
   },
   ssh: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 22, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 22, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 22, tls: false }
     ]
   },
   imap: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 143, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 143, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 143, tls: false }
     ]
   },
   imaps: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 993, tls: true },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 993, tls: true }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 993, tls: true }
     ]
   },
   dhcp: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "udp", port: 547, tls: false },
-      { family: FAMILY_IPV6, protocol: "udp", port: 547, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 547, tls: false }
     ]
   },
   "dhcpv6-client": {
     endpoints: [
-      { family: FAMILY_IPV6, protocol: "tcp", port: 546, tls: false },
-      { family: FAMILY_IPV6, protocol: "udp", port: 546, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 546, tls: false }
     ]
   },
   "dhcpv6-server": {
@@ -240,8 +177,7 @@ export const ServiceTypes = {
   },
   smb: {
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "tcp", port: 445, tls: false },
-      { family: FAMILY_IPV6, protocol: "tcp", port: 445, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 445, tls: false }
     ]
   },
   nginx: {
@@ -262,15 +198,13 @@ export const ServiceTypes = {
   pcp: {
     // rfc6887
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "udp", port: 5351, tls: false },
-      { family: FAMILY_IPV6, protocol: "udp", port: 5351, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 5351, tls: false }
     ]
   },
   "pcp-multicast": {
     // rfc6887
     endpoints: [
-      { family: FAMILY_IPV4, protocol: "udp", port: 5350, tls: false },
-      { family: FAMILY_IPV6, protocol: "udp", port: 5350, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 5350, tls: false }
     ]
   }
 };
@@ -293,11 +227,11 @@ export function addServiceType(type, name) {
     }
 
     if (type.services) {
-      Object.entries(type.services).forEach(([name, type]) =>
+      type.services = Object.entries(type.services).map(([name, type]) =>
         addServiceType(type, name)
       );
     } else {
-      type.services = {};
+      type.services = [];
     }
 
     if (type.extends) {
@@ -324,23 +258,25 @@ export function serviceTypes(type) {
   return new Set();
 }
 
-export function serviceTypeEndpoints(type) {
+export function serviceTypeEndpoints(type, bundeledToo) {
   if (type) {
-    const all = type.services
-      ? Object.values(type.services)
-          .map(type => serviceTypeEndpoints(type))
-          .flat()
-      : [];
-
-    if (type.extends) {
-      all.push(type.extends.reduce((a, c) => [...a, ...c?.endpoints], []));
-    }
-
-    if (type.endpoints) {
-      all.push(type.endpoints);
-    }
+    const aggregator = (acc, type) => {
+      acc.push(...serviceTypeEndpoints(type, bundeledToo));
+      return acc;
+    };
 
-    return all.flat();
+    return type.extends.reduce(
+      aggregator,
+      type.endpoints.reduce(
+        (acc, ep) => {
+          for (const family of asArray(ep.family)) {
+            acc.push({ ...ep, family });
+          }
+          return acc;
+        },
+        bundeledToo ? type.services.reduce(aggregator, []) : []
+      )
+    );
   }
 
   return [];

package/src/services/bind.mjs

@@ -30,7 +30,8 @@ import {
   Endpoint,
   addresses,
   networkAddressType,
-  addType
+  addType,
+  FAMILY_IPV4_IPV6
 } from "pmcf";
 import { yesno, writeLines, asArray } from "../utils.mjs";
 import {
@@ -739,18 +740,10 @@ export class bind extends CoreService {
     systemGroupName: "named",
     services: {
       "bind-statistics": {
-//        extends: ["http"],
+        //        extends: ["http"],
         endpoints: [
           {
-            family: FAMILY_IPV4,
-            port: 19521,
-            protocol: "tcp",
-            pathname: "/",
-            tls: false,
-            kind: "loopback"
-          },
-          {
-            family: FAMILY_IPV6,
+            family: FAMILY_IPV4_IPV6,
             port: 19521,
             protocol: "tcp",
             pathname: "/",
@@ -762,7 +755,7 @@ export class bind extends CoreService {
       "bind-rndc": {
         endpoints: [
           {
-            family: FAMILY_IPV4,
+            family: FAMILY_IPV4_IPV6,
             port: 953,
             protocol: "tcp",
             tls: false,

package/src/services/chrony.mjs

@@ -1,7 +1,13 @@
 import { join } from "node:path";
-import { FAMILY_IPV4, FAMILY_IPV6, isLinkLocal } from "ip-utilties";
+import { FAMILY_IPV4, isLinkLocal } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
-import { serviceEndpoints, addType, ExtraSourceService, FAMILY_UNIX } from "pmcf";
+import {
+  serviceEndpoints,
+  addType,
+  ExtraSourceService,
+  FAMILY_UNIX,
+  FAMILY_IPV4_IPV6
+} from "pmcf";
 import { writeLines } from "../utils.mjs";
 
 export class chrony extends ExtraSourceService {
@@ -12,13 +18,7 @@ export class chrony extends ExtraSourceService {
       "chrony-cmd": {
         endpoints: [
           {
-            family: FAMILY_IPV4,
-            port: 323,
-            protocol: "tcp",
-            tls: false
-          },
-          {
-            family: FAMILY_IPV6,
+            family: FAMILY_IPV4_IPV6,
             port: 323,
             protocol: "tcp",
             tls: false

package/src/services/influxdb.mjs

@@ -1,9 +1,8 @@
 import { join } from "node:path";
 import { stringify } from "yaml";
-import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
 import { boolean_attribute_writable_true } from "pacc";
-import { CoreService, addType } from "pmcf";
+import { CoreService, addType, FAMILY_IPV4_IPV6 } from "pmcf";
 import { writeLines, filterConfigurable } from "../utils.mjs";
 
 export class influxdb extends CoreService {
@@ -18,14 +17,7 @@ export class influxdb extends CoreService {
   static service = {
     endpoints: [
       {
-        family: FAMILY_IPV4,
-        port: 8086,
-        protocol: "tcp",
-        tls: false,
-        pathname: "/"
-      },
-      {
-        family: FAMILY_IPV6,
+        family: FAMILY_IPV4_IPV6,
         port: 8086,
         protocol: "tcp",
         tls: false,

package/src/services/kea.mjs

@@ -70,17 +70,6 @@ export class kea extends CoreService {
           }
         ]
       },
-      /*"kea-control-agent": {
-        endpoints: [
-          {
-            family: FAMILY_IPV4,
-            port: 53002,
-            pathname: "/",
-            protocol: "tcp",
-            tls: false
-          }
-        ]
-      },*/
       "kea-ha-4": {
         endpoints: [
           {

package/src/services/systemd-journal-remote.mjs

@@ -1,11 +1,10 @@
-import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
   string_attribute_writable,
   string_collection_attribute_writable,
   boolean_attribute_writable,
   integer_attribute_writable
 } from "pacc";
-import { CoreService, addType } from "pmcf";
+import { CoreService, addType, FAMILY_IPV4_IPV6 } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 /**
@@ -76,14 +75,7 @@ export class SystemdJournalRemoteService extends CoreService {
     //extends: ["http"],
     endpoints: [
       {
-        family: FAMILY_IPV4,
-        port: 19532,
-        protocol: "tcp",
-        tls: false,
-        pathname: "/"
-      },
-      {
-        family: FAMILY_IPV6,
+        family: FAMILY_IPV4_IPV6,
         port: 19532,
         protocol: "tcp",
         tls: false,

package/src/services/systemd-resolved.mjs

@@ -6,7 +6,7 @@ import {
   boolean_attribute_writable,
   yesno_attribute_writable
 } from "pacc";
-import { ExtraSourceService, serviceEndpoints, addType, FAMILY_DNS } from "pmcf";
+import { ExtraSourceService, serviceEndpoints, addType } from "pmcf";
 import {
   filterConfigurable,
   yesno,

package/src/utils.mjs

@@ -96,15 +96,17 @@ export function bridgeToJSON(bridge) {
  * @returns {Array<any>}
  */
 export function asArray(value) {
-  if (value === undefined) {
-    return [];
-  }
-  if (Array.isArray(value)) {
-    return value;
-  }
-
-  if (value instanceof Iterator) {
-    return [...value];
+  switch (typeof value) {
+    case "undefined":
+      return [];
+    case "object":
+      if (Array.isArray(value)) {
+        return value;
+      }
+
+      if (value instanceof Iterator || value[Symbol.iterator]) {
+        return [...value];
+      }
   }
 
   return [value];