pmcf 2.56.0 → 2.58.0

package/bin/pmcf-package

@@ -30,10 +30,10 @@ const publishingDetails = createPublishingDetails(
   env
 );
 
-for (const name of args) {
-  const object = await root.load(name);
+for (const object of root.find(args)) {
   const stagingDir = join(options.output, object.fullName);
 
+  //console.log(`packages for ${object.fullName}`);
   for await (const { sources, outputs, properties } of object.preparePackages(
     stagingDir
   )) {

package/package.json

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

package/src/base.mjs

@@ -111,11 +111,10 @@ export class Base {
               if (Array.isArray(current)) {
                 current.push(value);
               } else {
-                if(current instanceof Set) {
+                if (current instanceof Set) {
                   // TODO
                   this[property.name] = value;
-                }
-                else if (current instanceof Map) {
+                } else if (current instanceof Map) {
                   // TODO
                   this[property.name] = value;
                 } else {
@@ -427,16 +426,7 @@ export class Base {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
-  async *preparePackages(stagingDir) {
-    yield {
-      sources: [],
-      outputs: this.outputs,
-      properties: {
-        description: `${this.typeName} definitions for ${this.fullName}`,
-        access: "private"
-      }
-    };
-  }
+  async *preparePackages(stagingDir) {}
 
   get tags() {
     return this._tags;
@@ -509,6 +499,7 @@ export class Base {
   traverse(visitor, ...args) {
     const visited = new Set();
     this._traverse(visited, visitor, ...args);
+    return visited;
   }
 
   _traverse(visited, visitor, ...args) {

package/src/cluster.mjs

@@ -118,7 +118,7 @@ export class Cluster extends Host {
         cfg.push("  }");
         cfg.push(`  virtual_router_id ${cluster.routerId}`);
         cfg.push(
-          `  priority ${host.priority - (cluster.masters.has(ni) ? 0 : 5)}`
+          `  priority ${host.priority - 100 + (cluster.masters.has(ni) ? 0 : 5)}`
         );
         cfg.push("  smtp_alert");
         cfg.push("  advert_int 5");

package/src/dns-utils.mjs

@@ -23,13 +23,17 @@ export function sortZoneRecords(a, b) {
   if (a.type === "PTR") {
     const toNum = a => {
       const s = a.split(".");
-      s.pop();s.pop();s.pop();
-      return s.reverse().reduce((a, c) => BigInt(parseInt(c,16)) + 256n * 256n * a, 0n);
+      s.pop();
+      s.pop();
+      s.pop();
+      return s
+        .reverse()
+        .reduce((a, c) => BigInt(parseInt(c, 16)) + 256n * 256n * a, 0n);
     };
     return Number(toNum(a.key) - toNum(b.key));
   }
   order = a.key.localeCompare(b.key);
-  if(order) {
+  if (order) {
     return order;
   }
 
@@ -100,3 +104,7 @@ export function dnsMergeParameters(a, b) {
     ])
   );
 }
+
+export function dnsPriority(priority) {
+  return 500 - (priority ?? 10);
+}

package/src/owner.mjs

@@ -3,6 +3,7 @@ import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { addType, types } from "./types.mjs";
+
 const OwnerTypeDefinition = {
   name: "owner",
   owners: ["location", "owner", "root"],
@@ -57,6 +58,17 @@ export class Owner extends Base {
     return false;
   }
 
+  *find(pattern) {
+    for (const node of this.traverse(() => {})) {
+      for (const p of pattern) {
+        if (node.fullName.match(p)) {
+          yield node;
+          break;
+        }
+      }
+    }
+  }
+
   named(name) {
     if (name[0] === "/") {
       name = name.substring(this.fullName.length + 1);
@@ -185,9 +197,10 @@ export class Owner extends Base {
     }
 
     let subnet = this.subnetForAddress(address);
-  
+
     if (!subnet) {
-      subnet =  familyIP(address) === 'IPv4' ?  SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
+      subnet =
+        familyIP(address) === "IPv4" ? SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
 
       /*
       this.error(
@@ -196,7 +209,7 @@ export class Owner extends Base {
       );
       */
     }
-  
+
     return subnet;
   }
 
@@ -216,8 +229,7 @@ export class Owner extends Base {
     return this.typeList("cluster");
   }
 
-  get bridges()
-  {
+  get bridges() {
     return this._bridges;
   }
 

package/src/service.mjs

@@ -6,7 +6,8 @@ import {
   DNSRecord,
   dnsFullName,
   dnsFormatParameters,
-  dnsMergeParameters
+  dnsMergeParameters,
+  dnsPriority
 } from "./dns-utils.mjs";
 
 const ServiceTypes = {
@@ -268,7 +269,7 @@ export class Service extends Base {
 
   dnsRecordsForDomainName(domainName, hasSVRRecords) {
     const records = [];
-    if (this.priority <= 1 && this.alias) {
+    if (this.priority >= 390 && this.alias) {
       records.push(DNSRecord(this.alias, "CNAME", dnsFullName(domainName)));
     }
 
@@ -283,7 +284,7 @@ export class Service extends Base {
           DNSRecord(
             dnsFullName(`_${this.type}._${ep.protocol}.${domainName}`),
             "SRV",
-            this.priority ?? 10,
+            dnsPriority(this.priority),
             this.weight,
             ep.port,
             dnsFullName(this.domainName)
@@ -311,7 +312,7 @@ export class Service extends Base {
           DNSRecord(
             dnsFullName(domainName),
             dnsRecord.type,
-            this.priority ?? 10,
+            dnsPriority(this.priority),
             ".",
             dnsFormatParameters(parameters)
           )
@@ -321,7 +322,7 @@ export class Service extends Base {
           DNSRecord(
             "@",
             dnsRecord.type,
-            this.priority ?? 10,
+            dnsPriority(this.priority),
             dnsFullName(domainName)
           )
         );

package/src/services/bind.mjs

@@ -236,7 +236,7 @@ export class BindService extends ExtraSourceService {
     };
 
     const forwarders = serviceEndpoints(this.source, {
-      services: { type: "dns", priority: ">=20" },
+      services: { type: "dns", priority: ">=300" },
       select: e => e.address,
       limit: 5
     });
@@ -535,7 +535,7 @@ export class BindService extends ExtraSourceService {
   }
 
   get defaultRecords() {
-    const nameService = this.findService({ type: "dns", priority: "<10" });
+    const nameService = this.findService({ type: "dns", priority: ">=300" });
 
     const SOARecord = DNSRecord(
       "@",

package/src/services/chrony.mjs

@@ -58,7 +58,7 @@ export class ChronyService extends ExtraSourceService {
       ...serviceEndpoints(this, {
         services: {
           type: "ntp",
-          priority: "<10"
+          priority: ">=200"
         },
         endpoints: e =>
           e.service.host !== host &&

package/src/services/kea.mjs

@@ -125,6 +125,14 @@ export class KeaService extends Service {
   }
 
   async *preparePackages(dir) {
+    const ctrlAgentEndpoint = this.endpoint(
+      e => e.type === "kea-control-agent"
+    );
+
+    if (!ctrlAgentEndpoint) {
+      return;
+    }
+
     const network = this.network;
     const host = this.host;
     const name = host.name;
@@ -134,7 +142,7 @@ export class KeaService extends Service {
     const dnsServerEndpoints = serviceEndpoints(network, {
       services: {
         type: "dns",
-        priority: "<10"
+        priority: ">=300"
       },
       endpoints: endpoint => endpoint.networkInterface.kind !== "loopback"
     });
@@ -151,14 +159,10 @@ export class KeaService extends Service {
       }
     };
 
-    const ctrlAgentEndpoint = this.endpoint(
-      e => e.type === "kea-control-agent"
-    );
-
     const peers = async family =>
       (
         await Array.fromAsync(
-          network.findServices({ type: "dhcp", priority: "<20" })
+          network.findServices({ type: "dhcp", priority: ">=200" })
         )
       )
         .sort(sortInverseByPriority)
@@ -171,13 +175,16 @@ export class KeaService extends Service {
                 : "kea-control-agent")
           );
 
-          return {
-            name: dhcp.host.name,
-            role: i === 0 ? "primary" : i > 1 ? "backup" : "standby",
-            url: ctrlAgentEndpoint.url,
-            "auto-failover": i <= 1
-          };
-        });
+          if (ctrlAgentEndpoint) {
+            return {
+              name: dhcp.host.name,
+              role: i === 0 ? "primary" : i > 1 ? "backup" : "standby",
+              url: ctrlAgentEndpoint.url,
+              "auto-failover": i <= 1
+            };
+          }
+        })
+        .filter(p => p != null);
 
     const loggers = [
       {

package/types/base.d.mts

@@ -94,14 +94,7 @@ export class Base {
     get packaging(): Set<any>;
     get derivedPackaging(): any;
     get outputs(): Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
-    preparePackages(stagingDir: any): AsyncGenerator<{
-        sources: any[];
-        outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
-        properties: {
-            description: string;
-            access: string;
-        };
-    }, void, unknown>;
+    preparePackages(stagingDir: any): AsyncGenerator<never, void, unknown>;
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): boolean;
@@ -109,7 +102,7 @@ export class Base {
     finalize(action: any): void;
     execFinalize(): void;
     _execFinalize(): void;
-    traverse(visitor: any, ...args: any[]): void;
+    traverse(visitor: any, ...args: any[]): Set<any>;
     _traverse(visited: any, visitor: any, ...args: any[]): boolean;
     error(...args: any[]): void;
     info(...args: any[]): void;

package/types/dns-utils.d.mts

@@ -11,3 +11,4 @@ export function dnsFormatParameters(parameters: any): string;
 export function dnsMergeParameters(a: any, b: any): {
     [k: string]: Set<any>;
 };
+export function dnsPriority(priority: any): number;

package/types/owner.d.mts

@@ -134,6 +134,7 @@ export class Owner extends Base {
     _membersByType: Map<any, any>;
     _bridges: Set<any>;
     _traverse(...args: any[]): boolean;
+    find(pattern: any): Generator<any, void, unknown>;
     named(name: any): any;
     typeObject(typeName: any): any;
     typeList(typeName: any): any;