pmcf 1.57.2 → 1.58.0

package/package.json

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

package/src/base.mjs

@@ -271,6 +271,23 @@ export class Base {
     return this.owner?.timezone;
   }
 
+  findService(filter) {
+    let best;
+    for (const service of this.findServices(filter)) {
+      if (!best || service.priority < best.priority) {
+        best = service;
+      }
+    }
+
+    return best;
+  }
+
+  *findServices(filter) {
+    if (this.owner) {
+      yield* this.owner?.findServices(filter);
+    }
+  }
+
   #directory;
   set directory(directory) {
     this.#directory = directory;

package/src/dns.mjs

@@ -22,6 +22,8 @@ const DNSServiceTypeDefinition = {
   }
 };
 
+const DNS_SERVICE_FILTER = { type: DNSServiceTypeDefinition.name };
+
 export class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
@@ -65,9 +67,7 @@ export class DNSService extends Base {
     return this.#forwardsTo;
   }
 
-  async *findServices() {
-    const filter = { type: DNSServiceTypeDefinition.name };
-
+  *findServices(filter) {
     yield* this.owner.findServices(filter);
 
     for (const s of this.forwardsTo) {
@@ -80,17 +80,17 @@ export class DNSService extends Base {
   }
 
   async resolvedConfig() {
-    const dnsServices = (await Array.fromAsync(this.findServices())).sort(
+    const dnsServices = Array.from(this.findServices(DNS_SERVICE_FILTER)).sort(
       (a, b) => a.priority - b.priority
     );
 
     const master = dnsServices
       .filter(s => s.priority < 10)
-      .map(s => s.ipAddresses)
+      .map(s => s.rawAddresses)
       .flat();
     const fallback = dnsServices
       .filter(s => s.priority >= 10)
-      .map(s => s.ipAddresses)
+      .map(s => s.rawAddresses)
       .flat();
 
     return {
@@ -131,7 +131,7 @@ async function generateNamedDefs(dns, targetDir) {
     const zones = [];
     const records = new Set();
 
-    const nameserver = (await dns.owner.findService({ type: "dns" }))?.owner;
+    const nameService = dns.findService(DNS_SERVICE_FILTER);
     const rname = dns.administratorEmail.replace(/@/, ".");
 
     let maxKeyLength;
@@ -157,18 +157,18 @@ async function generateNamedDefs(dns, targetDir) {
       );
     }
 
-    console.log(dns.owner.fullName, domain, nameserver?.hostName, rname);
+    console.log(dns.owner.fullName, domain, nameService.domainName, rname);
     const reverseZones = new Map();
 
     const SOARecord = createRecord(
       "@",
       "SOA",
-      fullName(nameserver?.domainName),
+      fullName(nameService.domainName),
       fullName(rname),
       `(${updates})`
     );
 
-    const NSRecord = createRecord("@", "NS", fullName(nameserver?.rawAddress));
+    const NSRecord = createRecord("@", "NS", fullName(nameService.rawAddress));
 
     const catalogZone = {
       id: `catalog.${domain}`,
@@ -290,7 +290,11 @@ async function generateNamedDefs(dns, targetDir) {
         }
       }
 
-      await writeLines(join(targetDir, "var/lib/named"), zone.file, zone.records);
+      await writeLines(
+        join(targetDir, "var/lib/named"),
+        zone.file,
+        zone.records
+      );
     }
 
     await writeLines(

package/src/host.mjs

@@ -109,7 +109,7 @@ export class Host extends Base {
       for (const ni of this.networkInterfaces.values()) {
         ni._traverse(...args);
       }
-      for (const service of this.findServices()) {
+      for (const service of this.#services) {
         service._traverse(...args);
       }
 

package/src/owner.mjs

@@ -121,17 +121,6 @@ export class Owner extends Base {
     this.addTypeObject(object.typeName, object.name, object);
   }
 
-  findService(filter) {
-    let best;
-    for (const service of this.findServices(filter)) {
-      if (!best || service.priority < best.priority) {
-        best = service;
-      }
-    }
-
-    return best;
-  }
-
   *findServices(filter) {
     for (const host of this.hosts()) {
       for (const service of host.findServices(filter)) {

package/src/service.mjs

@@ -79,16 +79,31 @@ export class Service extends Base {
     return this;
   }
 
+  get server()
+  {
+    return this.owner;
+  }
+
+  get domainName()
+  {
+    return this.server.domainName;
+  }
+
+  get rawAddress()
+  {
+    return this.#ipAddresses?.[0] || this.server.rawAddress;
+  }
+
   set ipAddresses(value) {
     this.#ipAddresses = value;
   }
 
-  get ipAddresses() {
+  get rawAddresses() {
     return this.#ipAddresses || this.owner.rawAddresses;
   }
 
   get addresses() {
-    return this.ipAddresses.map(a => `${a}:${this.port}`);
+    return this.rawAddresses.map(a => `${a}:${this.port}`);
   }
 
   set port(value) {

package/types/base.d.mts

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

package/types/dns.d.mts

@@ -70,7 +70,6 @@ export class DNSService extends Base {
     get soaUpdates(): number[];
     set forwardsTo(value: any[]);
     get forwardsTo(): any[];
-    findServices(): AsyncGenerator<any, void, any>;
     get domains(): any[];
     resolvedConfig(): Promise<{
         DNS: string;

package/types/owner.d.mts

@@ -184,7 +184,6 @@ export class Owner extends Base {
     typeList(typeName: any): any;
     addTypeObject(typeName: any, name: any, object: any): void;
     addObject(object: any): void;
-    findService(filter: any): any;
     findServices(filter: any): Generator<any, void, unknown>;
     locationNamed(name: any): any;
     locations(): any;

package/types/service.d.mts

@@ -89,8 +89,11 @@ export class Service extends Base {
         };
     };
     alias: any;
+    get server(): any;
+    get domainName(): any;
+    get rawAddress(): any;
     set ipAddresses(value: any);
-    get ipAddresses(): any;
+    get rawAddresses(): any;
     get addresses(): any;
     set port(value: any);
     get port(): any;