pmcf 1.25.0 → 1.25.1

package/bin/pmcf-named-defs

@@ -2,7 +2,11 @@
 
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
-import { writeLines, isIPv4Address } from "../src/utils.mjs";
+import {
+  writeLines,
+  isIPv4Address,
+  normalizeIPAddress
+} from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
 const { world, args, options } = prepare();
@@ -41,7 +45,10 @@ async function generateNamedDefs(owner, targetDir) {
         type,
         value,
         toString: () =>
-          `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(5, " ")} ${value}`
+          `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(
+            5,
+            " "
+          )} ${value}`
       };
     };
 
@@ -201,16 +208,3 @@ export function reverseArpaAddress(address) {
     (isIPv4Address(address) ? ".in-addr.arpa" : ".ip6.arpa")
   );
 }
-
-export function normalizeIPAddress(address) {
-  if (isIPv4Address(address)) {
-    return address;
-  }
-  address = address.replace(/\/\d+$/, "");
-  const parts = address.split(":");
-  const i = parts.indexOf("");
-  if (i >= 0) {
-    parts.splice(i, 1, ..."0".repeat(9 - parts.length));
-  }
-  return parts.map(s => s.padStart(4, "0")).join(":");
-}

package/package.json

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

package/src/model.mjs

@@ -4,7 +4,8 @@ import {
   asArray,
   bridgeToJSON,
   isIPv4Address,
-  isIPv6Address
+  isIPv6Address,
+  normalizeIPAddress
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Service } from "./service.mjs";
@@ -659,13 +660,11 @@ export class Host extends Base {
   }
 
   get ipAddresses() {
-    return [...this.networkAddresses()].map(na => na.address);
+    return [...this.networkAddresses()].map(na => normalizeIPAddress(na.address));
   }
 
   get ipAddress() {
-    for (const a of this.networkAddresses()) {
-      return a.address;
-    }
+    return this.ipAddresses[0];
   }
 
   async publicKey(type = "ed25519") {

package/src/utils.mjs

@@ -39,3 +39,16 @@ export function isIPv4Address(address) {
 export function isIPv6Address(address) {
   return address.indexOf(":") >= 0;
 }
+
+export function normalizeIPAddress(address) {
+  address = address.replace(/\/\d+$/, "");
+  if (isIPv4Address(address)) {
+    return address;
+  }
+  const parts = address.split(":");
+  const i = parts.indexOf("");
+  if (i >= 0) {
+    parts.splice(i, 1, ..."0".repeat(9 - parts.length));
+  }
+  return parts.map(s => s.padStart(4, "0")).join(":");
+}

package/types/utils.d.mts

@@ -4,3 +4,4 @@ export function bridgeToJSON(bridge: any): any[];
 export function asArray(value: any): any[];
 export function isIPv4Address(address: any): boolean;
 export function isIPv6Address(address: any): boolean;
+export function normalizeIPAddress(address: any): any;