pmcf 1.64.3 → 1.64.5

package/package.json

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

package/src/base.mjs

@@ -284,6 +284,10 @@ export class Base {
     return this.owner?.timezone;
   }
 
+  get smtp() {
+    return this.findService({ type: "smtp" });
+  }
+
   findService(filter) {
     let best;
     for (const service of this.findServices(filter)) {
@@ -297,7 +301,7 @@ export class Base {
 
   *findServices(filter) {
     if (this.owner) {
-      yield* this.owner?.findServices(filter);
+      yield* this.owner.findServices(filter);
     }
   }
 

package/src/cluster.mjs

@@ -80,7 +80,7 @@ export class Cluster extends Host {
         "   notification_email {",
         "    " + this.administratorEmail,
         "  }",
-        "  smtp_server 192.168.1.1",
+        `  smtp_server ${this.smtp.rawAddress}`,
         `  notification_email_from keepalived@${host.domainName}`,
         "}"
       ];
@@ -114,13 +114,19 @@ export class Cluster extends Host {
           cfg.push(`  protocol ${service.protocol.toUpperCase()}`);
 
           for (const member of this.members) {
-            cfg.push(`  real_server ${member.rawAddress} ${service.port} {`);
-            cfg.push("    weight 100");
-
-            if (service.protocol === "tcp") {
-              cfg.push(`    TCP_CHECK {`);
-              cfg.push("      connect_timeout 3");
-              cfg.push("    }");
+            const memberService = member.findService({ type: service.type });
+
+            cfg.push(
+              `  real_server ${member.rawAddress} ${memberService.port} {`
+            );
+            cfg.push(`    weight ${memberService.weight}`);
+
+            switch (service.protocol) {
+              case "tcp":
+                cfg.push(`    TCP_CHECK {`);
+                cfg.push("      connect_timeout 3");
+                cfg.push("    }");
+                break;
             }
 
             cfg.push("  }");

package/src/host.mjs

@@ -263,15 +263,18 @@ export class Host extends Base {
   }
 
   *findServices(filter) {
-    for (const service of this.#services) {
-      if (
-        !filter ||
-        filter.type === "*" ||
-        filter.type === service.type ||
-        filter.name === service.name
-      ) {
-        yield service;
+    if (filter) {
+      for (const service of this.#services) {
+        if (
+          filter.type === "*" ||
+          filter.type === service.type ||
+          filter.name === service.name
+        ) {
+          yield service;
+        }
       }
+    } else {
+      yield* this.#services;
     }
   }
 

package/src/owner.mjs

@@ -146,9 +146,9 @@ export class Owner extends Base {
     return this.typeNamed("host", name);
   }
 
-  * hosts() {
-    yield * this.typeList("host");
-    yield * this.typeList("cluster");
+  *hosts() {
+    yield* this.typeList("host");
+    yield* this.typeList("cluster");
   }
 
   networkNamed(name) {
@@ -225,7 +225,10 @@ export class Owner extends Base {
       }
 
       for (const nameOrNetwork of asIterator(destinationNetworks)) {
-        const other = nameOrNetwork instanceof Owner ? nameOrNetwork : this.networkNamed(nameOrNetwork);
+        const other =
+          nameOrNetwork instanceof Owner
+            ? nameOrNetwork
+            : this.networkNamed(nameOrNetwork);
         if (other) {
           if (!bridge.has(other)) {
             bridge.add(other);
@@ -360,4 +363,5 @@ export class Owner extends Base {
       yield location.domain;
     }
   }
+
 }

package/src/service.mjs

@@ -131,7 +131,14 @@ export class Service extends Base {
   }
 
   get weight() {
-    return this.#weight || this.owner.weight || 0;
+    if (this.#weight !== undefined) {
+      return this.#weight;
+    }
+    if (this.owner.weight !== undefined) {
+      return this.owner.weight;
+    }
+
+    return 1;
   }
 
   set type(value) {

package/types/base.d.mts

@@ -62,6 +62,7 @@ export class Base {
     get locales(): any;
     get country(): any;
     get timezone(): any;
+    get smtp(): any;
     findService(filter: any): any;
     findServices(filter: any): Generator<any, void, any>;
     set directory(directory: any);