pmcf 1.71.0 → 1.73.0

package/package.json

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

package/src/cluster.mjs

@@ -56,24 +56,27 @@ export class Cluster extends Host {
   }
 
   async *preparePackages(stagingDir) {
-    const result = {
-      sources: [],
-      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) {
+    for (const ni of [...this.owner.clusters()].reduce(
+      (all, cluster) => all.union(cluster.members),
+      new Set()
+    )) {
       const host = ni.host;
       const name = `keepalived-${host.name}`;
       const packageStagingDir = join(stagingDir, name);
+      const result = {
+        sources: [
+          new FileContentProvider(packageStagingDir + "/")[
+            Symbol.asyncIterator
+          ]()
+        ],
+        outputs: host.outputs,
+        properties: {
+          name,
+          description: `${this.typeName} definitions for ${this.fullName}`,
+          access: "private",
+          dependencies: ["keepalived"]
+        }
+      };
 
       const cfg = [
         "global_defs {",
@@ -146,13 +149,6 @@ export class Cluster extends Host {
         cfg
       );
 
-      (result.outputs = host.outputs), (result.properties.name = name);
-      result.properties.dependencies = ["keepalived"];
-
-      result.sources.push(
-        new FileContentProvider(packageStagingDir + "/")[Symbol.asyncIterator]()
-      );
-
       yield result;
     }
   }

package/src/dns.mjs

@@ -9,7 +9,7 @@ import {
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
-import { sortByPriority } from "./service.mjs";
+import { serviceAddresses } from "./service.mjs";
 import { subnets } from "./subnet.mjs";
 
 const DNSServiceTypeDefinition = {
@@ -91,15 +91,6 @@ export class DNSService extends Base {
     return this.#forwardsTo;
   }
 
-  get forwardsToAdresses() {
-    return this.forwardsTo
-      .map(ft => Array.from(ft.findServices(DNS_SERVICE_FILTER)))
-      .flat()
-      .sort(sortByPriority)
-      .map(s => s.rawAddresses)
-      .flat();
-  }
-
   *findServices(filter) {
     yield* this.owner.findServices(filter);
 
@@ -113,22 +104,15 @@ export class DNSService extends Base {
   }
 
   async resolvedConfig() {
-    const dnsServices = Array.from(this.findServices(DNS_SERVICE_FILTER)).sort(
-      sortByPriority
-    );
-
-    const master = dnsServices
-      .filter(s => s.priority < 10)
-      .map(s => s.rawAddresses)
-      .flat();
-    const fallback = dnsServices
-      .filter(s => s.priority >= 10)
-      .map(s => s.rawAddresses)
-      .flat();
-
     return {
-      DNS: master.join(" "),
-      FallbackDNS: fallback.join(" "),
+      DNS: serviceAddresses(this, {
+        ...DNS_SERVICE_FILTER,
+        priority: "<10"
+      }).join(" "),
+      FallbackDNS: serviceAddresses(this, {
+        ...DNS_SERVICE_FILTER,
+        priority: ">=10"
+      }).join(" "),
       Domains: this.domains.join(" "),
       DNSSEC: "no",
       MulticastDNS: "yes",
@@ -152,7 +136,9 @@ export class DNSService extends Base {
 
     const options = [
       "forwarders {",
-      ...this.forwardsToAdresses.map(a => `  ${a};`),
+      ...serviceAddresses(this.forwardsTo, DNS_SERVICE_FILTER).map(
+        a => `  ${a};`
+      ),
       "};"
     ];
     await writeLines(join(p1, "etc/named.d/options"), `${name}.conf`, options);

package/src/service.mjs

@@ -1,17 +1,19 @@
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
+import { asArray } from "./utils.mjs";
 
 const ServiceTypes = {
-  dns: { protocol: "udp", port: 53 },
-  ldap: { protocol: "tcp", port: 389 },
-  http: { protocol: "tcp", port: 80 },
-  https: { protocol: "tcp", port: 443 },
-  rtsp: { protocol: "tcp", port: 554 },
-  smtp: { protocol: "tcp", port: 25 },
-  ssh: { protocol: "tcp", port: 22 },
-  imap: { protocol: "tcp", port: 143 },
-  imaps: { protocol: "tcp", port: 993 },
-  dhcp: {}
+  dns: { protocol: "udp", port: 53, tls: false },
+  ldap: { protocol: "tcp", port: 389, tls: false },
+  ldaps: { protocol: "tcp", port: 636, tls: true },
+  http: { protocol: "tcp", port: 80, tls: false },
+  https: { protocol: "tcp", port: 443, tls: true },
+  rtsp: { protocol: "tcp", port: 554, tls: false },
+  smtp: { protocol: "tcp", port: 25, tls: false },
+  ssh: { protocol: "tcp", port: 22, tls: false },
+  imap: { protocol: "tcp", port: 143, tls: false },
+  imaps: { protocol: "tcp", port: 993, tls: true },
+  dhcp: { tls: false }
 };
 
 const ServiceTypeDefinition = {
@@ -28,7 +30,8 @@ const ServiceTypeDefinition = {
     master: { type: "boolean", collection: false, writeable: true },
     priority: { type: "number", collection: false, writeable: true },
     weight: { type: "number", collection: false, writeable: true },
-    srvPrefix: { type: "string", collection: false, writeable: false }
+    srvPrefix: { type: "string", collection: false, writeable: false },
+    tls: { type: "string", collection: false, writeable: false }
   }
 };
 
@@ -157,6 +160,10 @@ export class Service extends Base {
     return ServiceTypes[this.type]?.protocol;
   }
 
+  get tls() {
+    return ServiceTypes[this.type]?.tls || false;
+  }
+
   get srvPrefix() {
     const st = ServiceTypes[this.type];
     if (st?.protocol) {
@@ -166,3 +173,16 @@ export class Service extends Base {
 }
 
 export const sortByPriority = (a, b) => a.priority - b.priority;
+
+export function serviceAddresses(
+  sources,
+  filter,
+  addressType = "rawAddresses"
+) {
+  return asArray(sources)
+    .map(ft => Array.from(ft.findServices(filter)))
+    .flat()
+    .sort(sortByPriority)
+    .map(s => s[addressType])
+    .flat();
+}

package/types/cluster.d.mts

@@ -403,10 +403,13 @@ export class Cluster extends Host {
     get backups(): Set<any>;
     get members(): Set<any>;
     preparePackages(stagingDir: any): AsyncGenerator<{
-        sources: any[];
+        sources: AsyncGenerator<any, void, unknown>[];
+        outputs: any;
         properties: {
+            name: string;
             description: string;
             access: string;
+            dependencies: string[];
         };
     }, void, unknown>;
     #private;

package/types/dns.d.mts

@@ -83,7 +83,6 @@ export class DNSService extends Base {
     get trusted(): any[];
     set forwardsTo(value: any[]);
     get forwardsTo(): any[];
-    get forwardsToAdresses(): any[];
     get domains(): any[];
     resolvedConfig(): Promise<{
         DNS: string;

package/types/service.d.mts

@@ -1,3 +1,4 @@
+export function serviceAddresses(sources: any, filter: any, addressType?: string): any[];
 export class Service extends Base {
     static get typeDefinition(): {
         name: string;
@@ -86,6 +87,11 @@ export class Service extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            tls: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
         };
     };
     alias: any;
@@ -105,6 +111,7 @@ export class Service extends Base {
     get type(): any;
     get master(): any;
     get protocol(): any;
+    get tls(): any;
     get srvPrefix(): string;
     #private;
 }