pmcf 1.46.2 → 1.46.3

package/bin/pmcf-named-defs

@@ -4,7 +4,7 @@ import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import {
   writeLines,
-  isIPv4Address,
+  isIPv6Address,
   normalizeIPAddress
 } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
@@ -58,17 +58,7 @@ async function generateNamedDefs(owner, targetDir) {
       );
     }
 
-    const subnets = [
-      ...new Set([...owner.networks()].map(n => [...n.subnets()]).flat())
-    ];
-
-    console.log(
-      owner.fullName,
-      domain,
-      nameserver?.hostName,
-      rname,
-      subnets.map(s => `${s.owner.name}/${s.name}`)
-    );
+    console.log(owner.fullName, domain, nameserver?.hostName, rname);
     const reverseZones = new Map();
 
     const SOARecord = createRecord(
@@ -99,6 +89,7 @@ async function generateNamedDefs(owner, targetDir) {
     zones.push(zone);
 
     const hosts = new Set();
+    const addresses = new Set();
 
     for await (const {
       address,
@@ -107,14 +98,19 @@ async function generateNamedDefs(owner, targetDir) {
     } of owner.networkAddresses()) {
       const host = networkInterface.host;
 
-      if (!hosts.has(host)) {
+      if (!addresses.has(address)) {
+        addresses.add(address);
+  
         zone.records.add(
           createRecord(
             fullName(host.domainName),
-            isIPv4Address(address) ? "A" : "AAAA",
+            isIPv6Address(address) ? "AAAA" : "A",
             normalizeIPAddress(address)
           )
         );
+      }
+
+      if (!hosts.has(host)) {
         hosts.add(host);
         for (const service of host.services()) {
           if (service.master && service.alias) {
@@ -207,20 +203,20 @@ async function generateNamedDefs(owner, targetDir) {
 }
 
 export function reverseAddress(address) {
-  if (isIPv4Address(address)) {
-    return address.split(".").reverse().join(".");
-  }
-
-  return normalizeIPAddress(address)
+  if (isIPv6Address(address)) {
+    return normalizeIPAddress(address)
     .replaceAll(":", "")
     .split("")
     .reverse()
     .join(".");
+  }
+
+    return address.split(".").reverse().join(".");
 }
 
 export function reverseArpaAddress(address) {
   return (
     reverseAddress(address) +
-    (isIPv4Address(address) ? ".in-addr.arpa" : ".ip6.arpa")
+    (isIPv6Address(address) ?  ".ip6.arpa" : ".in-addr.arpa")
   );
 }

package/package.json

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

package/src/base.mjs

@@ -67,16 +67,24 @@ export class Base {
     for (const [slotName, typeDef] of Object.entries(
       this.constructor.typeDefinition.properties
     )) {
-      const slot = data[slotName];
+      let slot = data[slotName];
       if (slot) {
         delete data[slotName];
 
-        const type = typeof typeDef.type === "string" ? typesByName[typeDef.type] : typeDef.type;
+        const type =
+          typeof typeDef.type === "string"
+            ? typesByName[typeDef.type]
+            : typeDef.type;
 
         if (typeDef.collection) {
           if (Array.isArray(slot) || typeof slot === "string") {
-            for (const item of asArray(slot)) {
-              new type(this, item);
+            slot = asArray(slot);
+            if (type) {
+              for (const item of slot) {
+                new type(this, item);
+              }
+            } else {
+              this[slotName] = slot;
             }
           } else {
             for (const [objectName, objectData] of Object.entries(slot)) {

package/src/host.mjs

@@ -310,6 +310,7 @@ export class NetworkInterface extends Base {
         ssid: { type: "string" },
         psk: { type: "string" },
         metric: { type: "number" },
+        MTU: { type: "number" },
         cidrAddresses: { type: "string", collection: true, writeable: false },
         rawAddresses: { type: "string", collection: true, writeable: false },
         network: { type: "network" },

package/src/location.mjs

@@ -21,7 +21,8 @@ export class Location extends Owner {
         clusters: { type: Cluster, collection: true },
         subnets: { type: Subnet, collection: true },
         dns: { type: DNSService },
-        country: { type: "string" }
+        country: { type: "string" },
+        locales: { type: "string", collection: true }
       }
     };
   }

package/src/owner.mjs

@@ -171,14 +171,10 @@ export class Owner extends Base {
 
     const subnets = [...this.subnets()];
 
-    const subnet = subnets.find(s =>s.matchesAddress(address));
-    if(subnet) {
+    const subnet = subnets.find(s => s.matchesAddress(address));
+    if (subnet) {
       return subnet;
     }
-    /*
-    if (subnets.length === 1) {
-      return subnets[0];
-    }*/
 
     this.error(
       `Address without subnet ${address}`,
@@ -277,9 +273,7 @@ export class Owner extends Base {
 
   *networkAddresses() {
     for (const host of this.hosts()) {
-      for (const networkAddresses of host.networkAddresses()) {
-        yield networkAddresses;
-      }
+      yield* host.networkAddresses();
     }
   }
 

package/src/utils.mjs

@@ -142,7 +142,7 @@ export function normalizeCIDR(address) {
     prefix = "fe80::";
     prefixLength = 64;
   } else {
-    const definition = isIPv4Address(prefix) ? ipv4 : ipv6;
+    const definition = isIPv6Address(prefix) ? ipv6 : ipv4;
     let n = _encode(definition, prefix);
 
     if (prefixLength) {

package/types/host.d.mts

@@ -108,6 +108,9 @@ export class NetworkInterface extends Base {
             metric: {
                 type: string;
             };
+            MTU: {
+                type: string;
+            };
             cidrAddresses: {
                 type: string;
                 collection: boolean;

package/types/location.d.mts

@@ -25,6 +25,10 @@ export class Location extends Owner {
             country: {
                 type: string;
             };
+            locales: {
+                type: string;
+                collection: boolean;
+            };
         };
     };
     get location(): this;

package/types/owner.d.mts

@@ -59,7 +59,7 @@ export class Owner extends Base {
     clusters(): any;
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
-    networkAddresses(): Generator<any, void, unknown>;
+    networkAddresses(): Generator<any, void, any>;
     domains(): Generator<any, void, unknown>;
     #private;
 }