pmcf 1.45.2 → 1.46.1

package/package.json

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

package/src/host.mjs

@@ -6,7 +6,8 @@ import {
   isIPv4Address,
   isIPv6Address,
   normalizeIPAddress,
-  formatCIDR
+  formatCIDR,
+  hasWellKnownSubnet
 } from "./utils.mjs";
 import { addType } from "./types.mjs";
 
@@ -375,6 +376,10 @@ export class NetworkInterface extends Base {
   }
 
   addSubnet(address) {
+    if(hasWellKnownSubnet(address)) {
+      return;
+    }
+
     if (!this.network) {
       this.error("Missing network", address);
     } else {

package/src/network.mjs

@@ -1,6 +1,7 @@
 import { Owner } from "./owner.mjs";
 import { Subnet } from "./subnet.mjs";
 import { Host } from "./host.mjs";
+import { DNSService } from "./dns.mjs";
 import { addType } from "./types.mjs";
 
 export class Network extends Owner {
@@ -23,7 +24,7 @@ export class Network extends Owner {
         hosts: { type: Host, collection: true },
         clusters: { type: "cluster", collection: true },
         subnets: { type: Subnet, collection: true },
-        dns: { type: "dns", collection: false },
+        dns: { type: DNSService, collection: false }
         //metric: { type: "number" }
         /*kind: { type: "string" },
         scope: { type: "string" },

package/src/types.mjs

@@ -5,6 +5,19 @@ export function addType(clazz) {
   typeDefinition.clazz = clazz;
 
   typesByName[typeDefinition.name] = clazz;
+
+  for (const type of types) {
+    for (const [name, property] of Object.entries(
+      type.typeDefinition.properties
+    )) {
+      if (typeof property.type === "string") {
+        const t = typesByName[property.type];
+        if (t) {
+          property.type = t;
+        }
+      }
+    }
+  }
 }
 
 export const types = [];

package/src/utils.mjs

@@ -153,7 +153,7 @@ export function normalizeCIDR(address) {
         prefixLength = 8;
         prefix = _decode(definition, n, prefixLength);
       } else if (n === IPV6_LOCALHOST) {
-        prefixLength = 127;
+        prefixLength = 128;
         prefix = _decode(definition, n, prefixLength);
       } else {
         return {};
@@ -164,5 +164,11 @@ export function normalizeCIDR(address) {
   return { prefix, prefixLength, cidr: `${prefix}/${prefixLength}` };
 }
 
+export function hasWellKnownSubnet(address)
+{
+  const n = encodeIP(address);
+  return n === IPV4_LOCALHOST || n === IPV6_LOCALHOST;
+}
+
 const IPV4_LOCALHOST = _encode(ipv4, "127.0.0.1");
 const IPV6_LOCALHOST = _encode(ipv6, "::1");

package/types/network.d.mts

@@ -20,7 +20,7 @@ export class Network extends Owner {
                 collection: boolean;
             };
             dns: {
-                type: string;
+                type: typeof DNSService;
                 collection: boolean;
             };
         };
@@ -38,3 +38,4 @@ export class Network extends Owner {
 import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
 import { Subnet } from "./subnet.mjs";
+import { DNSService } from "./dns.mjs";

package/types/utils.d.mts

@@ -23,3 +23,4 @@ export function normalizeCIDR(address: any): {
     prefixLength: any;
     cidr: string;
 };
+export function hasWellKnownSubnet(address: any): boolean;