pmcf 1.80.2 → 1.81.1

package/package.json

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

package/src/dns.mjs

@@ -197,17 +197,6 @@ async function generateZoneDefs(dns, targetDir) {
 
     let maxKeyLength;
 
-    if (isLocalDomain) {
-      for (const mail of dns.owner.findServices({
-        type: "smtp",
-        priority: "<10"
-      })) {
-        records.add(
-          DNSRecord("@", "MX", mail.priority, dnsFullName(mail.domainName))
-        );
-      }
-    }
-
     console.log(`${nameService} ${domain}`, nameService.ipAddressOrDomainName);
     //console.log(dns.owner.fullName, domain, nameService.domainName, rname);
     const reverseZones = new Map();

package/src/owner.mjs

@@ -382,7 +382,6 @@ export class Owner extends Base {
     return this.#domain || this.owner?.domain;
   }
 
-
   get domains() {
     let domains = new Set();
 
@@ -408,4 +407,14 @@ export class Owner extends Base {
     return domains;
   }
 */
+
+  get domainNames() {
+    let names = new Set();
+
+    for (const host of this.hosts()) {
+      names = names.union(new Set(host.domainNames));
+    }
+
+    return names;
+  }
 }

package/src/service.mjs

@@ -21,8 +21,8 @@ const ServiceTypes = {
     dnsRecord: { type: "HTTPS", parameters: { alpn: "h2" } }
   },
   http3: {
-    protocol: "tcp",
     type: "https",
+    protocol: "tcp",
     port: 443,
     tls: true,
     dnsRecord: {
@@ -31,7 +31,7 @@ const ServiceTypes = {
     }
   },
   rtsp: { protocol: "tcp", port: 554, tls: false },
-  smtp: { protocol: "tcp", port: 25, tls: false },
+  smtp: { protocol: "tcp", port: 25, tls: false, dnsRecord: { type: "MX" } },
   ssh: { protocol: "tcp", port: 22, tls: false },
   imap: { protocol: "tcp", port: 143, tls: false },
   imaps: { protocol: "tcp", port: 993, tls: true },
@@ -221,25 +221,31 @@ export class Service extends Base {
     if (dnsRecord) {
       let parameters = dnsRecord.parameters;
 
-      for (const service of this.findServices()) {
-        if (service !== this) {
-          const r = ServiceTypes[service.type]?.dnsRecord;
+      if (parameters) {
+        for (const service of this.findServices()) {
+          if (service !== this) {
+            const r = ServiceTypes[service.type]?.dnsRecord;
 
-          if (r?.type === dnsRecord.type) {
-            parameters = dnsMergeParameters(parameters, r.parameters);
+            if (r?.type === dnsRecord.type) {
+              parameters = dnsMergeParameters(parameters, r.parameters);
+            }
           }
         }
-      }
 
-      records.push(
-        DNSRecord(
-          dnsFullName(domainName),
-          dnsRecord.type,
-          this.priority,
-          ".",
-          dnsFormatParameters(parameters)
-        )
-      );
+        records.push(
+          DNSRecord(
+            dnsFullName(domainName),
+            dnsRecord.type,
+            this.priority,
+            ".",
+            dnsFormatParameters(parameters)
+          )
+        );
+      } else {
+        records.push(
+          DNSRecord("@", dnsRecord.type, this.priority, dnsFullName(domainName))
+        );
+      }
     }
 
     return records;

package/types/owner.d.mts

@@ -237,6 +237,7 @@ export class Owner extends Base {
     get domain(): any;
     get domains(): Set<any>;
     get localDomains(): Set<any>;
+    get domainNames(): Set<any>;
     #private;
 }
 import { Base } from "./base.mjs";