pmcf 1.59.11 → 1.59.13

package/package.json

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

package/src/cluster.mjs

@@ -1,6 +1,7 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { Owner } from "./owner.mjs";
+import { Host } from "./host.mjs";
 import { addType } from "./types.mjs";
 import { writeLines } from "./utils.mjs";
 
@@ -15,7 +16,7 @@ const ClusterTypeDefinition = {
   }
 };
 
-export class Cluster extends Owner {
+export class Cluster extends Host {
   #masters = new Set();
   #backups = new Set();
 
@@ -49,44 +50,61 @@ export class Cluster extends Owner {
   }
 
   async *preparePackages(stagingDir) {
-    for await (const result of super.preparePackages(stagingDir)) {
-      for (const ni of this.masters.union(this.backups)) {
-        const name = `${this.typeName}-${this.owner.name}-${this.name}-${ni.host.name}`;
-        const packageStagingDir = join(stagingDir, name);
-        const cfg = [
-          `vrrp_instance ${this.name} {`,
-          `  state ${this.masters.has(ni) ? "MASTER" : "BACKUP"}`,
-          `  interface ${ni.name}`,
-          "  virtual_router_id 101",
-          "  priority 255",
-          "  advert_int 1",
-          "  authentication {",
-          "    auth_type PASS",
-          "    auth_pass pass1234",
-          "  }",
-          "  virtual_ipaddress {",
-          `    ${ni.rawAddress}`,
-          "  }",
-          "}"
-        ];
-
-        await writeLines(
-          join(packageStagingDir, "etc/keepalived"),
-          "keepalived.conf",
-          cfg
-        );
-
-        result.properties.name = name;
-        result.properties.dependencies = ["keepalived"];
-
-        result.sources.push(
-          new FileContentProvider(packageStagingDir + "/")[
-            Symbol.asyncIterator
-          ]()
-        );
-
-        yield result;
+    
+    const result = {
+      sources: [],
+      outputs: this.outputs,
+      properties: {
+        description: `${this.typeName} definitions for ${this.fullName}`,
+        access: "private"
       }
+    };
+  
+    let interfaces = new Set();
+
+    for(const cluster of this.owner.clusters()) {
+      interfaces = interfaces.union(cluster.masters.union(cluster.backups));
+    }
+
+    for (const ni of interfaces) {
+      const name = `keepalived-${ni.host.name}`;
+      const packageStagingDir = join(stagingDir, name);
+  
+      const cfg = [];
+
+      for(const cluster of this.owner.clusters()) {
+        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.rawAddress}`);
+        cfg.push("  }");
+        cfg.push("  virtual_router_id 101");
+        cfg.push("  priority 255");
+        cfg.push("  advert_int 1");
+        cfg.push("  authentication {");
+        cfg.push("    auth_type PASS");
+        cfg.push("    auth_pass pass1234");
+        cfg.push("  }");
+        cfg.push("}");
+        cfg.push("");
+      }
+
+      await writeLines(
+        join(packageStagingDir, "etc/keepalived"),
+        "keepalived.conf",
+        cfg
+      );
+
+      result.properties.name = name;
+      result.properties.dependencies = ["keepalived"];
+      result.properties.replaces = [`${this.typeName}-${this.owner.name}-${this.name}-${ni.host.name}`];
+
+      result.sources.push(
+        new FileContentProvider(packageStagingDir + "/")[Symbol.asyncIterator]()
+      );
+
+      yield result;
     }
   }
 }

package/src/owner.mjs

@@ -146,8 +146,9 @@ export class Owner extends Base {
     return this.typeNamed("host", name);
   }
 
-  hosts() {
-    return this.typeList("host");
+  * hosts() {
+    yield * this.typeList("host");
+    yield * this.typeList("cluster");
   }
 
   networkNamed(name) {

package/types/cluster.d.mts

@@ -1,4 +1,4 @@
-export class Cluster extends Owner {
+export class Cluster extends Host {
     static get typeDefinition(): {
         name: string;
         owners: (string | {
@@ -377,4 +377,4 @@ export class Cluster extends Owner {
     get backups(): Set<any>;
     #private;
 }
-import { Owner } from "./owner.mjs";
+import { Host } from "./host.mjs";

package/types/owner.d.mts

@@ -188,7 +188,7 @@ export class Owner extends Base {
     locationNamed(name: any): any;
     locations(): any;
     hostNamed(name: any): any;
-    hosts(): any;
+    hosts(): Generator<any, void, any>;
     networkNamed(name: any): any;
     networks(): any;
     subnetNamed(name: any): any;