pmcf 6.69.0 → 6.69.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.69.0",
+  "version": "6.69.2",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.11",
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
-    "npm-pkgbuild": "^22.2.19",
+    "npm-pkgbuild": "^22.2.20",
     "pacc": "^14.4.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"

package/src/base.mjs

@@ -118,10 +118,6 @@ export class base extends core {
     return this.owner?.network;
   }
 
-  get smtpServer() {
-    return this.owner?.smtpServer;
-  }
-
   get domain() {
     return this.owner?.domain;
   }

package/src/core-service.mjs

@@ -165,27 +165,28 @@ export class CoreService extends base {
             this._port === undefined ? { ...e } : { ...e, port: this._port };
           delete options.kind;
 
-          for (const na of this.host.networkAddresses()) {
-            if (e.family !== FAMILY_DNS) {
-              if (
-                (e.family && e.family !== na.family) ||
-                (e.kind && e.kind !== na.networkInterface.kind)
-              ) {
-                continue;
+          if (this.host) {
+            for (const na of this.host.networkAddresses()) {
+              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 url_endpoint(this, na, options);
-              if (!seen.has(he.url.toString())) {
-                seen.add(he.url.toString());
-                result.push(he);
+              if (e.scheme || e.pathname) {
+                const he = new url_endpoint(this, na, options);
+                if (!seen.has(he.url.toString())) {
+                  seen.add(he.url.toString());
+                  result.push(he);
+                }
+              } else {
+                result.push(new endpoint(this, na, options));
               }
-            } else {
-              result.push(new endpoint(this, na, options));
             }
           }
-
           if (!domainNames.has(this.domainName)) {
             domainNames.add(this.domainName);
             result.push(new domain_endpoint(this, this.domainName, options));

package/src/host.mjs

@@ -136,7 +136,9 @@ export class host extends ServiceOwner {
   get services() {
     return new AggregatedMap([
       this._services,
-      ...this._networkInterfaces.values().map(ni => ni._services)
+      ...[...this.networkInterfaces.values()]
+        .filter(ni => ni.services.size > 0)
+        .map(ni => ni._services)
     ]);
   }
 
@@ -210,7 +212,7 @@ export class host extends ServiceOwner {
 
   get network() {
     for (const ni of this.networkInterfaces.values()) {
-      if (ni._kind !== "loopback" && ni._network) {
+      if (ni._network) {
         return ni._network;
       }
     }

package/src/owner.mjs

@@ -33,11 +33,6 @@ export class owner extends ServiceOwner {
     networkInterfaces: networkInterfaces_attribute,
     owners: owners_attribute,
     country: { ...string_attribute_writable, name: "country" },
-    smtpServer: {
-      ...string_attribute_writable,
-      name: "smtpServer",
-      deferredExpression: true
-    },
     domain: { ...string_attribute_writable, name: "domain" },
     domains: { ...string_set_attribute_writable, skipEmpty: true, name: "domains" },
     timezone: { ...string_attribute_writable, name: "timezone" },

package/src/services/keepalived.mjs

@@ -2,11 +2,13 @@ import { join } from "node:path";
 import {
   default_attribute_writable,
   default_collection_attribute_writable,
+  string_attribute_writable,
   enum_string_attribute_writable,
   priority_attribute_writable,
   email_attribute_writable
 } from "pacc";
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+import { SOURCES_THIS_EXTENDS } from "../common-attributes.mjs";
 import { addType } from "../type.mjs";
 import { PROTOCOL_TCP } from "../constants.mjs";
 import { core } from "../core.mjs";
@@ -84,10 +86,18 @@ export class keepalived extends CoreService {
       type: keepalive_cluster_member,
       name: "clusters"
     },
+    smtp_server: {
+      ...string_attribute_writable,
+      name: "smtp_server",
+      deferredExpression: true,
+      scope: SCOPE_KEEPALIVED
+    },
+
     notification_email_from: {
       ...email_attribute_writable,
       name: "notification_email_from",
       default: "keepalived",
+      sources: SOURCES_THIS_EXTENDS,
       scope: SCOPE_KEEPALIVED
     }
   };
@@ -103,10 +113,10 @@ export class keepalived extends CoreService {
 
     const extra = [];
 
-    const smtpServer = this.smtpServer;
+    const smtp_server = this.smtp_server;
 
-    if (smtpServer) {
-      extra.push(`  smtp_server ${smtpServer.address}`);
+    if (smtp_server) {
+      extra.push(`  smtp_server ${smtp_server.address}`);
     }
 
     const cfg = [