pmcf 6.66.6 → 6.66.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.66.6",
+  "version": "6.66.8",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "aggregated-map": "^1.0.11",
-    "content-entry-transform": "^1.7.9",
+    "content-entry-transform": "^1.7.10",
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
     "npm-pkgbuild": "^22.2.9",

package/src/core-service.mjs

@@ -17,7 +17,7 @@ import {
   host,
   Endpoint,
   DomainNameEndpoint,
-  HTTPEndpoint,
+  url_endpoint,
   unix_endpoint
 } from "pmcf";
 import { addType } from "./type.mjs";
@@ -127,7 +127,7 @@ export class CoreService extends base {
   }
 
   get url() {
-    return this.endpoint()?.url;
+    return this.endpoints().find(e => e.url)?.url;
   }
 
   get serviceTypeEndpoints() {
@@ -166,15 +166,17 @@ export class CoreService extends base {
           delete options.kind;
 
           for (const na of this.host.networkAddresses()) {
-            if (
-              (e.family && e.family !== na.family) ||
-              (e.kind && e.kind !== na.networkInterface.kind)
-            ) {
-              continue;
+            if (e.family !== FAMILY_DNS) {
+              if (
+                (e.family && e.family !== na.family) ||
+                (e.kind && e.kind !== na.networkInterface.kind)
+              ) {
+                continue;
+              }
             }
 
             if (e.scheme || e.pathname) {
-              const he = new HTTPEndpoint(this, na, options);
+              const he = new url_endpoint(this, na, options);
               if (!seen.has(he.url.toString())) {
                 seen.add(he.url.toString());
                 result.push(he);
@@ -332,7 +334,7 @@ export class CoreService extends base {
       }
     }
 
-    for(const st of this.types) {
+    for (const st of this.types) {
       const dnsRecord = ServiceTypes[st]?.dnsRecord;
       if (dnsRecord) {
         let parameters = dnsRecord.parameters;

package/src/endpoint.mjs

@@ -1,5 +1,5 @@
 import { getAttribute, string_attribute, url_attribute } from "pacc";
-import { FAMILY_IPV6 } from "ip-utilties";
+import { FAMILY_IPV6, FAMILY_IPV4 } from "ip-utilties";
 import { addType } from "./type.mjs";
 import { CoreService } from "./core-service.mjs";
 import { family_attribute, endpointAttributes } from "./common-attributes.mjs";
@@ -171,8 +171,7 @@ export class DomainNameEndpoint extends PortEndpoint {
 /**
  * Endpoint based on url
  */
-export class HTTPEndpoint extends BaseEndpoint {
-  static name = "url_endpoint";
+export class url_endpoint extends BaseEndpoint {
   static attributes = {
     url: url_attribute,
     addressType: { ...string_attribute, name: "addressType" }
@@ -205,17 +204,25 @@ export class HTTPEndpoint extends BaseEndpoint {
 
       const scheme = data.scheme ? data.scheme : data.tls ? "https" : "http";
 
-      const domainName = [...address.domainNames][0];
-      const hostname =
-        domainName ??
-        (data.family === FAMILY_IPV6
-          ? "[" + address.address + "]"
-          : address.address);
-
+      let hostname;
+
+      switch (this.family) {
+        case FAMILY_DNS:
+          hostname = [...address.domainNames][0];
+          this.hostname = hostname;
+          break;
+        case FAMILY_IPV4:
+          hostname = address.address;
+          this.hostname = address.address;
+          break;
+        case FAMILY_IPV6:
+          hostname = "[" + address.address + "]";
+          this.hostname = address.address;
+          break;
+      }
       this.url = new URL(
         `${scheme}://${hostname}:${data.port}` + (data.pathname ?? "/")
       );
-      this.hostname = domainName ?? address.address;
     }
   }
 

package/src/service-types.mjs

@@ -3,6 +3,7 @@ import { FAMILY_IPV6 } from "ip-utilties";
 import {
   FAMILY_UNIX,
   FAMILY_IPV4_IPV6,
+  FAMILY_DNS_IPV4_IPV6,
   PROTOCOL_UDP,
   PROTOCOL_TCP
 } from "./constants.mjs";
@@ -103,7 +104,7 @@ export const ServiceTypes = {
   ldap: {
     endpoints: [
       {
-        family: FAMILY_IPV4_IPV6,
+        family: FAMILY_DNS_IPV4_IPV6,
         scheme: "ldap",
         protocol: PROTOCOL_TCP,
         port: 389,
@@ -114,7 +115,7 @@ export const ServiceTypes = {
   ldaps: {
     endpoints: [
       {
-        family: FAMILY_IPV4_IPV6,
+        family: FAMILY_DNS_IPV4_IPV6,
         scheme: "ldaps",
         protocol: PROTOCOL_TCP,
         port: 636,
@@ -128,7 +129,7 @@ export const ServiceTypes = {
   http: {
     endpoints: [
       {
-        family: FAMILY_IPV4_IPV6,
+        family: FAMILY_DNS_IPV4_IPV6,
         scheme: "http",
         protocol: PROTOCOL_TCP,
         port: 80,
@@ -139,7 +140,7 @@ export const ServiceTypes = {
   https: {
     endpoints: [
       {
-        family: FAMILY_IPV4_IPV6,
+        family: FAMILY_DNS_IPV4_IPV6,
         scheme: "https",
         protocol: PROTOCOL_TCP,
         port: 443,
@@ -151,7 +152,7 @@ export const ServiceTypes = {
   http3: {
     endpoints: [
       {
-        family: FAMILY_IPV4_IPV6,
+        family: FAMILY_DNS_IPV4_IPV6,
         scheme: "https",
         protocol: PROTOCOL_UDP,
         port: 443,

package/src/services/influxdb.mjs

@@ -3,7 +3,7 @@ import { stringify } from "yaml";
 import { boolean_attribute_writable_true } from "pacc";
 import { CoreService, addType } from "pmcf";
 import { writeLines, filterConfigurable } from "../utils.mjs";
-import { FAMILY_IPV4_IPV6, PROTOCOL_TCP } from "../constants.mjs";
+import { FAMILY_DNS_IPV4_IPV6, PROTOCOL_TCP } from "../constants.mjs";
 
 export class influxdb extends CoreService {
   static attributes = {
@@ -17,11 +17,11 @@ export class influxdb extends CoreService {
   static service = {
     endpoints: [
       {
-        family: FAMILY_IPV4_IPV6,
+        family: FAMILY_DNS_IPV4_IPV6,
         port: 8086,
         protocol: PROTOCOL_TCP,
         tls: false,
-        pathname: "/"
+        scheme: "http"
       }
     ]
   };

package/src/services/kea.mjs

@@ -136,8 +136,8 @@ export class kea extends CoreService {
               {
                 family: FAMILY_IPV4,
                 port: 53003,
-                pathname: "/",
                 protocol: PROTOCOL_TCP,
+                scheme: "http",
                 tls: false
               }
             ]
@@ -165,8 +165,8 @@ export class kea extends CoreService {
               {
                 family: FAMILY_IPV6,
                 port: 53004,
-                pathname: "/",
                 protocol: PROTOCOL_TCP,
+                scheme: "http",
                 tls: false
               }
             ]

package/src/services/keepalived.mjs

@@ -5,7 +5,7 @@ import {
   enum_string_attribute_writable,
   priority_attribute_writable
 } from "pacc";
-import { FAMILY_IPV4 } from "ip-utilties";
+import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "../type.mjs";
 import { PROTOCOL_TCP } from "../constants.mjs";
 import { core } from "../core.mjs";
@@ -125,14 +125,18 @@ export class keepalived extends CoreService {
 
       cfg.push(`  interface ${ni.name}`);
 
-      cfg.push("  virtual_ipaddress {");
-
-      for (const na of cluster.networkAddresses(
-        na => na.networkInterface.kind !== "loopback"
-      )) {
-        cfg.push(`    ${na.cidrAddress} dev ${ni.name} label ${clusterName}`);
+      function vip(slot, family) {
+        cfg.push(`  ${slot} {`);
+        for (const na of cluster.networkAddresses(
+          na => na.networkInterface.kind !== "loopback" && na.family === family
+        )) {
+          cfg.push(`    ${na.cidrAddress} dev ${ni.name} label ${clusterName}`);
+        }
+        cfg.push("  }");
       }
-      cfg.push("  }");
+
+      vip("virtual_ipaddress", FAMILY_IPV4);
+      vip("virtual_ipaddress_excluded", FAMILY_IPV6);
 
       cfg.push(`  virtual_router_id ${cluster.id}`);
 
@@ -220,7 +224,10 @@ export class keepalived extends CoreService {
             "[Unit]",
             `Description=${state} state of cluster ${clusterName}`,
             "PartOf=keepalived.service",
-            `Conflicts=${states.filter(s=>s!==state).map(other=>`${clusterName}-${other}.target`).join(' ')}`
+            `Conflicts=${states
+              .filter(s => s !== state)
+              .map(other => `${clusterName}-${other}.target`)
+              .join(" ")}`
           ]
         );
       }