pmcf 1.73.2 → 1.74.0

package/package.json

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

package/src/dns.mjs

@@ -211,12 +211,13 @@ async function generateZoneDefs(dns, targetDir) {
       };
     };
 
-    for await (const mail of dns.owner.findServices({ type: "smtp" })) {
+    for (const mail of dns.owner.findServices({ type: "smtp" })) {
       records.add(
-        createRecord("@", "MX", mail.priority, fullName(mail.owner.domainName))
+        createRecord("@", "MX", mail.priority, fullName(mail.ipAddressOrDomainName))
       );
     }
 
+    console.log(`${nameService}`,nameService.ipAddressOrDomainName);
     //console.log(dns.owner.fullName, domain, nameService.domainName, rname);
     const reverseZones = new Map();
 
@@ -228,7 +229,7 @@ async function generateZoneDefs(dns, targetDir) {
       `(${updates})`
     );
 
-    const NSRecord = createRecord("@", "NS", fullName(nameService.rawAddress));
+    const NSRecord = createRecord("@", "NS", fullName(nameService.ipAddressOrDomainName));
 
     const zone = {
       id: domain,

package/src/host.mjs

@@ -26,6 +26,7 @@ const HostTypeDefinition = {
   owners: ["owner", "network", "root"],
   extends: Base.typeDefinition,
   properties: {
+    ...networkAddressProperties,
     networkInterfaces: {
       type: "network_interface",
       collection: true,
@@ -45,9 +46,6 @@ const HostTypeDefinition = {
     depends: { type: "string", collection: true, writeable: true },
     provides: { type: "string", collection: true, writeable: true },
     extends: { type: "host", collection: true, writeable: true },
-    cidrAddresses: { type: "string", collection: true, writeable: false },
-    rawAddresses: { type: "string", collection: true, writeable: false },
-    rawAddress: { type: "string", collection: false, writeable: false },
     model: { type: "string", collection: false, writeable: false },
     isModel: { type: "boolean", collection: false, writeable: false }
   }

package/src/service.mjs

@@ -92,6 +92,10 @@ export class Service extends Base {
     return this.server.domainName;
   }
 
+  get ipAddressOrDomainName() {
+    return this.rawAddress || this.domainName;
+  }
+
   get rawAddresses() {
     return this.#ipAddresses || this.owner.rawAddresses;
   }

package/types/host.d.mts

@@ -116,27 +116,32 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
-            cidrAddresses: {
+            model: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            rawAddresses: {
+            isModel: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            rawAddress: {
+            cidrAddresses: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            model: {
+            cidrAddress: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            isModel: {
+            rawAddresses: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            rawAddress: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;

package/types/service.d.mts

@@ -117,6 +117,7 @@ export class Service extends Base {
     alias: any;
     get server(): any;
     get domainName(): any;
+    get ipAddressOrDomainName(): any;
     get rawAddresses(): any;
     get rawAddress(): any;
     set ipAddresses(value: any);