pmcf 1.43.0 → 1.43.2

package/package.json

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

package/src/host.mjs

@@ -402,7 +402,7 @@ export class NetworkInterface extends Base {
   subnetForAddress(address) {
     return (
       this.network?.subnetForAddress(address) ||
-      this.owner.owner.subnetForAddress(address)
+      this.host.owner.subnetForAddress(address)
     );
   }
 
@@ -427,8 +427,8 @@ export class NetworkInterface extends Base {
   }
 
   get ipAddressesWithPrefixLength() {
-    return [...this.ipAddresses].map(address =>
-      this.addressWithPrefixLength(address)
+    return [...this.#ipAddresses].map(
+      ([address, subnet]) => `${address}/${subnet?.prefixLength}`
     );
   }
 
@@ -440,10 +440,6 @@ export class NetworkInterface extends Base {
     return [...this.ipAddresses].filter(a => isIPv6Address(a));
   }
 
-  get prefixLength() {
-    return this.network?.prefixLength;
-  }
-
   get host() {
     return this.owner;
   }

package/src/owner.mjs

@@ -165,6 +165,16 @@ export class Owner extends Base {
     if (cidr) {
       return this.subnetNamed(cidr) || new Subnet(this, cidr);
     }
+
+    const subnets = [...this.subnets()];
+    if (subnets.length === 1) {
+      return subnets[0];
+    }
+
+    this.error(
+      `Address without subnet ${address}`,
+      [...this.subnets()].map(s => s.address)
+    );
   }
 
   subnetForAddress(address) {

package/src/subnet.mjs

@@ -14,7 +14,11 @@ export class Subnet extends Base {
       name: "subnet",
       extends: "base",
       properties: {
-        //  address: {}
+        /*
+        address: {},
+        networks: { type: "network", collection true },
+        prefixLength: { type: "number", writeable: false }
+        */
       }
     };
   }

package/src/utils.mjs

@@ -137,15 +137,27 @@ export function normalizeCIDR(address) {
     prefix = "fe80::";
     prefixLength = 64;
   } else {
+    const definition = isIPv4Address(prefix) ? ipv4 : ipv6;
+    let n = _encode(definition, prefix);
+
     if (prefixLength) {
-      const definition = isIPv4Address(prefix) ? ipv4 : ipv6;
-      let n = _encode(definition, prefix);
       n = n & (definition.mask << BigInt(definition.length - prefixLength));
       prefix = _decode(definition, n, prefixLength);
     } else {
-      return {};
+      if (n === IPV4_LOCALHOST) {
+        prefixLength = 8;
+        prefix = _decode(definition, n, prefixLength);
+      } else if (n === IPV6_LOCALHOST) {
+        prefixLength = 127;
+        prefix = _decode(definition, n, prefixLength);
+      } else {
+        return {};
+      }
     }
   }
 
   return { prefix, prefixLength, cidr: `${prefix}/${prefixLength}` };
 }
+
+const IPV4_LOCALHOST = _encode(ipv4, "127.0.0.1");
+const IPV6_LOCALHOST = _encode(ipv6, "::1");

package/types/host.d.mts

@@ -75,7 +75,6 @@ export class NetworkInterface extends Base {
     get ipAddressesWithPrefixLength(): string[];
     get ipv4Addresses(): any[];
     get ipv6Addresses(): any[];
-    get prefixLength(): any;
     get scope(): any;
     get metric(): any;
     get ssid(): any;