pmcf 2.22.0 → 2.22.1

package/package.json

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

package/src/cluster.mjs

@@ -4,6 +4,7 @@ import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
 import { addType } from "./types.mjs";
 import { writeLines } from "./utils.mjs";
+import { cidrAddresses } from "./network-support.mjs";
 
 const ClusterTypeDefinition = {
   name: "cluster",
@@ -102,10 +103,15 @@ export class Cluster extends Host {
         cfg.push(`vrrp_instance ${cluster.name} {`);
         cfg.push(`  state ${cluster.masters.has(ni) ? "MASTER" : "BACKUP"}`);
         cfg.push(`  interface ${ni.name}`);
+
         cfg.push("  virtual_ipaddress {");
-        cfg.push(
-          `    ${cluster.cidrAddress} dev ${ni.name} label ${cluster.name}`
-        );
+        for (const na of cluster.networkAddresses(
+          na => na.networkInterface.kind !== "loopback"
+        )) {
+          cfg.push(
+            `    ${na.cidrAddress} dev ${ni.name} label ${cluster.name}`
+          );
+        }
         cfg.push("  }");
         cfg.push(`  virtual_router_id ${cluster.routerId}`);
         cfg.push(
@@ -141,9 +147,7 @@ export class Cluster extends Host {
           for (const member of this.members) {
             const memberService = member.findService({ type: service.type });
 
-            cfg.push(
-              `  real_server ${member.address} ${memberService.port} {`
-            );
+            cfg.push(`  real_server ${member.address} ${memberService.port} {`);
             cfg.push(`    weight ${memberService.weight}`);
 
             switch (service.type) {

package/src/network-interface.mjs

@@ -1,4 +1,9 @@
-import { hasWellKnownSubnet, normalizeIP, familyIP } from "ip-utilties";
+import {
+  hasWellKnownSubnet,
+  normalizeIP,
+  familyIP,
+  formatCIDR
+} from "ip-utilties";
 import { Base } from "./base.mjs";
 import { Subnet } from "./subnet.mjs";
 import {
@@ -9,13 +14,35 @@ import { asArray } from "./utils.mjs";
 import { addType } from "./types.mjs";
 
 /**
- * @typedef {object} NetworkAddress
  * @property {NetworkInterface} networkInterface
  * @property {string|Uint8Array|Uint16Array} address
  * @property {string} family
  * @property {Subnet} subnet
  * @property {Set<string>} domainNames
  */
+export class NetworkAddress {
+  /** @type {Subnet} */ subnet;
+  /** @type {NetworkInterface} */ networkInterface;
+  /** @type {string|Uint8Array|Uint16Array} */ address;
+
+  constructor(networkInterface, address, subnet) {
+    this.networkInterface = networkInterface;
+    this.address = address;
+    this.subnet = subnet;
+  }
+
+  get domainNames() {
+    this.networkInterface.domainNames;
+  }
+
+  get family() {
+    return familyIP(this.address);
+  }
+
+  get cidrAddress() {
+    return formatCIDR(this.address, this.subnet.prefixLength);
+  }
+}
 
 class SkeletonNetworkInterface extends Base {
   _extends = [];
@@ -73,13 +100,7 @@ class SkeletonNetworkInterface extends Base {
    */
   *networkAddresses(filter = n => true) {
     for (const [address, subnet] of this.ipAddresses) {
-      const networkAddress = {
-        networkInterface: this,
-        domainNames: this.domainNames,
-        address,
-        family: familyIP(address),
-        subnet
-      };
+      const networkAddress = new NetworkAddress(this, address, subnet);
 
       if (filter(networkAddress)) {
         yield networkAddress;

package/src/network-support.mjs

@@ -1,5 +1,3 @@
-import { formatCIDR } from "ip-utilties";
-
 export const networkProperties = {
   scope: {
     type: "string",
@@ -46,7 +44,5 @@ export function addresses(networkAddresses) {
 }
 
 export function cidrAddresses(networkAddresses) {
-  return [...networkAddresses].map(na =>
-    formatCIDR(na.address, na.subnet.prefixLength)
-  );
+  return [...networkAddresses].map(na => na.cidrAddress);
 }

package/types/network-interface.d.mts

@@ -1,3 +1,19 @@
+/**
+ * @property {NetworkInterface} networkInterface
+ * @property {string|Uint8Array|Uint16Array} address
+ * @property {string} family
+ * @property {Subnet} subnet
+ * @property {Set<string>} domainNames
+ */
+export class NetworkAddress {
+    constructor(networkInterface: any, address: any, subnet: any);
+    /** @type {Subnet} */ subnet: Subnet;
+    /** @type {NetworkInterface} */ networkInterface: NetworkInterface;
+    /** @type {string|Uint8Array|Uint16Array} */ address: string | Uint8Array | Uint16Array;
+    get domainNames(): void;
+    get family(): any;
+    get cidrAddress(): any;
+}
 export namespace NetworkInterfaceTypeDefinition {
     export let name: string;
     export let priority: number;
@@ -685,21 +701,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
         prefixLength: number;
     }>;
 }
-export type NetworkAddress = {
-    networkInterface: NetworkInterface;
-    address: string | Uint8Array | Uint16Array;
-    family: string;
-    subnet: Subnet;
-    domainNames: Set<string>;
-};
-/**
- * @typedef {object} NetworkAddress
- * @property {NetworkInterface} networkInterface
- * @property {string|Uint8Array|Uint16Array} address
- * @property {string} family
- * @property {Subnet} subnet
- * @property {Set<string>} domainNames
- */
+import { Subnet } from "./subnet.mjs";
 declare class SkeletonNetworkInterface extends Base {
     _extends: any[];
     _network: any;
@@ -721,6 +723,5 @@ declare class SkeletonNetworkInterface extends Base {
     get address(): any;
     get addresses(): any[];
 }
-import { Subnet } from "./subnet.mjs";
 import { Base } from "./base.mjs";
 export {};