pmcf 1.79.10 → 1.80.0

package/package.json

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

package/src/base.mjs

@@ -278,6 +278,10 @@ export class Base {
     return this.owner?.domains || new Set();
   }
 
+  get localDomains() {
+    return this.owner?.localDomains || new Set();
+  }
+
   get administratorEmail() {
     return this.owner?.administratorEmail;
   }

package/src/dns-utils.mjs

@@ -23,7 +23,7 @@ export function dnsFormatParameters(parameters) {
       value !== undefined && [...asIterator(value)].length > 0
         ? `${name}="${[...asIterator(value)].join(",")}"`
         : name
-    )
+    ).sort((a,b)=>a[0].localeCompare(b[0]))
     .join(" ");
 }
 
@@ -35,8 +35,3 @@ export function dnsMergeParameters(a, b) {
     ])
   );
 }
-/*
-console.log(
-  dnsFormatParameters(dnsMergeParameters({ alpn: "h2" }, { alpn: "h3" }))
-);
-*/

package/src/dns.mjs

@@ -186,6 +186,9 @@ async function generateZoneDefs(dns, targetDir) {
   const updates = [Math.ceil(Date.now() / 1000), ...dns.soaUpdates].join(" ");
 
   for (const domain of dns.domains) {
+    const isLocalDomain = dns.localDomains.has(domain);
+
+    const ownerName = isLocalDomain ? dns.owner.name : "FOREIGN";
     const zones = [];
     const records = new Set();
 
@@ -194,13 +197,13 @@ async function generateZoneDefs(dns, targetDir) {
 
     let maxKeyLength;
 
-    for (const mail of dns.owner.findServices({ type: "smtp" })) {
+    for (const mail of dns.owner.findServices({ type: "smtp", priority: "<10" })) {
       records.add(
         DNSRecord("@", "MX", mail.priority, dnsFullName(mail.domainName))
       );
     }
 
-    console.log(`${nameService}`, nameService.ipAddressOrDomainName);
+    console.log(`${nameService} ${domain}`, nameService.ipAddressOrDomainName);
     //console.log(dns.owner.fullName, domain, nameService.domainName, rname);
     const reverseZones = new Map();
 
@@ -218,26 +221,18 @@ async function generateZoneDefs(dns, targetDir) {
       dnsFullName(nameService.ipAddressOrDomainName)
     );
 
-    const ALPNRecord = DNSRecord(
-      "@",
-      "HTTPS",
-      1,
-      ".",
-      dnsFormatParameters({ alpn: "h3" })
-    );
-
     const zone = {
       id: domain,
       type: "plain",
-      file: `${dns.owner.name}/${domain}.zone`,
-      records: new Set([SOARecord, NSRecord, ALPNRecord, ...records])
+      file: `${ownerName}/${domain}.zone`,
+      records: new Set([SOARecord, NSRecord, ...records])
     };
     zones.push(zone);
 
     const catalogZone = {
       id: `catalog.${domain}`,
       type: "catalog",
-      file: `${dns.owner.name}/catalog.${domain}.zone`,
+      file: `${ownerName}/catalog.${domain}.zone`,
       records: new Set([
         SOARecord,
         NSRecord,
@@ -249,7 +244,7 @@ async function generateZoneDefs(dns, targetDir) {
       plain: { name: `${domain}.zone.conf`, content: [] }
     };
 
-    if (dns.hasCatalog) {
+    if (isLocalDomain && dns.hasCatalog) {
       zones.push(catalogZone);
       configs.catalog = { name: `catalog.${domain}.zone.conf`, content: [] };
     }
@@ -287,7 +282,7 @@ async function generateZoneDefs(dns, targetDir) {
               reverseZone = {
                 id: reverseArpa,
                 type: "plain",
-                file: `${dns.owner.name}/${reverseArpa}.zone`,
+                file: `${ownerName}/${reverseArpa}.zone`,
                 records: new Set([SOARecord, NSRecord])
               };
               zones.push(reverseZone);
@@ -306,7 +301,7 @@ async function generateZoneDefs(dns, targetDir) {
           }
         }
 
-        if (!hosts.has(host)) {
+        if (isLocalDomain && !hosts.has(host)) {
           hosts.add(host);
           for (const service of host.findServices()) {
             for (const record of service.dnsRecordsForDomainName(

package/src/host.mjs

@@ -254,14 +254,9 @@ export class Host extends Base {
   }
 
   get domains() {
-    const domains = new Set(
+    return new Set(
       [...this.aliases].map(n => domainFromDominName(n, this.domain))
-    );
-
-    if(this.domain) {
-      domains.add(this.domain);
-    }
-    return domains;
+    ).union(this.localDomains);
   }
 
   get domainNames() {

package/src/owner.mjs

@@ -28,6 +28,7 @@ const OwnerTypeDefinition = {
 
     country: { type: "string", collection: false, writeable: true },
     domain: { type: "string", collection: false, writeable: true },
+    domains: { type: "string", collection: true, writeable: true },
     timezone: { type: "string", collection: false, writeable: true },
     locales: { type: "string", collection: true, writeable: true },
     administratorEmail: { type: "string", collection: false, writeable: true }
@@ -381,6 +382,7 @@ export class Owner extends Base {
     return this.#domain || this.owner?.domain;
   }
 
+
   get domains() {
     let domains = new Set();
 
@@ -390,4 +392,20 @@ export class Owner extends Base {
 
     return domains;
   }
+
+  get localDomains() {
+    return this.domain ? new Set([this.domain]) : new Set();
+  }
+
+  /*
+  get localDomains() {
+    let domains = new Set();
+
+    for (const object of this.hosts()) {
+      domains = domains.union(object.localDomains);
+    }
+
+    return domains;
+  }
+*/
 }

package/src/service.mjs

@@ -22,6 +22,7 @@ const ServiceTypes = {
   },
   http3: {
     protocol: "tcp",
+    type: "https",
     port: 443,
     tls: true,
     dnsRecord: {
@@ -193,7 +194,7 @@ export class Service extends Base {
   get srvPrefix() {
     const st = ServiceTypes[this.type];
     if (st?.protocol) {
-      return `_${this.type}._${st.protocol}`;
+      return `_${st.type || this.type}._${st.protocol}`;
     }
   }
 

package/types/base.d.mts

@@ -59,6 +59,7 @@ export class Base {
     get network(): any;
     get domain(): any;
     get domains(): any;
+    get localDomains(): any;
     get administratorEmail(): any;
     get locales(): any;
     get country(): any;

package/types/cluster.d.mts

@@ -183,6 +183,11 @@ export class Cluster extends Host {
                     collection: boolean;
                     writeable: boolean;
                 };
+                domains: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 timezone: {
                     type: string;
                     collection: boolean;

package/types/location.d.mts

@@ -183,6 +183,11 @@ export class Location extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                domains: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 timezone: {
                     type: string;
                     collection: boolean;
@@ -383,6 +388,11 @@ export class Location extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                domains: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 timezone: {
                     type: string;
                     collection: boolean;

package/types/network.d.mts

@@ -185,6 +185,11 @@ export class Network extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                domains: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 timezone: {
                     type: string;
                     collection: boolean;

package/types/owner.d.mts

@@ -181,6 +181,11 @@ export class Owner extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            domains: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             timezone: {
                 type: string;
                 collection: boolean;
@@ -231,6 +236,7 @@ export class Owner extends Base {
     set domain(value: any);
     get domain(): any;
     get domains(): Set<any>;
+    get localDomains(): Set<any>;
     #private;
 }
 import { Base } from "./base.mjs";

package/types/root.d.mts

@@ -187,6 +187,11 @@ export class Root extends Location {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    domains: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     timezone: {
                         type: string;
                         collection: boolean;
@@ -387,6 +392,11 @@ export class Root extends Location {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    domains: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     timezone: {
                         type: string;
                         collection: boolean;