pmcf 6.1.9 → 6.2.1

package/package.json

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

package/src/core-service.mjs

@@ -16,7 +16,9 @@ import {
   DomainNameEndpoint,
   HTTPEndpoint,
   UnixEndpoint,
-  addType
+  addType,
+  FAMILY_UNIX,
+  FAMILY_DNS
 } from "pmcf";
 import { asArray } from "./utils.mjs";
 import { networkAddressAttributes } from "./common-attributes.mjs";
@@ -135,12 +137,12 @@ export class CoreService extends Base {
 
     for (const e of data) {
       switch (e.family) {
-        case "unix":
+        case FAMILY_UNIX:
           result.push(new UnixEndpoint(this, e.path, e));
           break;
 
         case undefined:
-        case "dns":
+        case FAMILY_DNS:
         case FAMILY_IPV4:
         case FAMILY_IPV6:
           const options =

package/src/endpoint.mjs

@@ -2,6 +2,9 @@ import { FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "pmcf";
 import { endpointAttributes, CoreService } from "./core-service.mjs";
 
+export const FAMILY_UNIX = "unix";
+export const FAMILY_DNS = "dns";
+
 class BaseEndpoint {
   static name = "endpoint";
   static priority = 1.1;
@@ -112,7 +115,7 @@ export class DomainNameEndpoint extends PortEndpoint {
   }
 
   get family() {
-    return "dns"; // TODO
+    return FAMILY_DNS;
   }
 
   get address() {
@@ -198,7 +201,7 @@ export class UnixEndpoint extends BaseEndpoint {
   }
 
   get family() {
-    return "unix";
+    return FAMILY_UNIX;
   }
 
   get host() {

package/src/service-types.mjs

@@ -1,4 +1,5 @@
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+import { FAMILY_UNIX } from "./endpoint.mjs";
 
 export const ServiceTypes = {
   "alpm-repo": {
@@ -83,7 +84,7 @@ export const ServiceTypes = {
     ]
   },
   ldapi: {
-    endpoints: [{ family: "unix", scheme: "ldapi", path: "/run/ldapi" }]
+    endpoints: [{ family: FAMILY_UNIX, scheme: "ldapi", path: "/run/ldapi" }]
   },
   http: {
     endpoints: [

package/src/services/bind.mjs

@@ -23,7 +23,8 @@ import {
   serviceEndpoints,
   addresses,
   networkAddressType,
-  addType
+  addType,
+  FAMILY_DNS
 } from "pmcf";
 import { yesno, writeLines, asArray } from "../utils.mjs";
 import {
@@ -501,8 +502,8 @@ export class bind extends ExtraSourceService {
 
   async writeForwarders(outputControl) {
     const forwarders = serviceEndpoints(this.source, {
-      services: 'services[types[dns] && priority>=100 && priority<200]',
-      endpoints: endpoint => endpoint.family !== "dns",
+      services: "services[types[dns] && priority>=100 && priority<200]",
+      endpoints: endpoint => endpoint.family !== FAMILY_DNS,
       select: e => e.address,
       limit: 5
     });

package/src/services/chrony.mjs

@@ -2,7 +2,7 @@ import { join } from "node:path";
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal } from "ip-utilties";
-import { serviceEndpoints, addType, ExtraSourceService } from "pmcf";
+import { serviceEndpoints, addType, ExtraSourceService, FAMILY_UNIX } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
 export class chrony extends ExtraSourceService {
@@ -25,7 +25,7 @@ export class chrony extends ExtraSourceService {
             tls: false
           },
           {
-            family: "unix",
+            family: FAMILY_UNIX,
             path: "/var/run/chrony/chronyd.sock"
           }
         ]

package/src/services/headscale.mjs

@@ -1,11 +1,11 @@
 import { FAMILY_IPV4 } from "ip-utilties";
-import { CoreService, addType } from "pmcf";
+import { CoreService, addType, FAMILY_UNIX } from "pmcf";
 
 export class headscale extends CoreService {
   static service = {
     endpoints: [
       {
-        family: "unix",
+        family: FAMILY_UNIX,
         path: "/run/headscale/headscale.sock"
       },
       {

package/src/services/kea.mjs

@@ -17,7 +17,8 @@ import {
   sortDescendingByPriority,
   serviceEndpoints,
   SUBNET_LOCALHOST_IPV4,
-  SUBNET_LOCALHOST_IPV6
+  SUBNET_LOCALHOST_IPV6,
+  FAMILY_UNIX
 } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
@@ -106,7 +107,7 @@ export class kea extends CoreService {
       "kea-control-dhcp4": {
         endpoints: [
           {
-            family: "unix",
+            family: FAMILY_UNIX,
             path: "/run/kea/ctrl-4"
           }
         ]
@@ -114,7 +115,7 @@ export class kea extends CoreService {
       "kea-control-dhcp6": {
         endpoints: [
           {
-            family: "unix",
+            family: FAMILY_UNIX,
             path: "/run/kea/ctrl-6"
           }
         ]
@@ -122,7 +123,7 @@ export class kea extends CoreService {
       "kea-control-ddns": {
         endpoints: [
           {
-            family: "unix",
+            family: FAMILY_UNIX,
             path: "/run/kea/ctrl-ddns"
           }
         ]
@@ -272,7 +273,7 @@ export class kea extends CoreService {
 
     const toUnix = endpoint => {
       return {
-        "socket-type": "unix",
+        "socket-type": FAMILY_UNIX,
         "socket-name": endpoint?.path
       };
     };