pmcf 1.102.0 → 1.102.2

package/package.json

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

package/src/service.mjs

@@ -1,6 +1,6 @@
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
-import { asArray } from "./utils.mjs";
+import { asArray,isLocalhost } from "./utils.mjs";
 import { networkAddressProperties } from "./network-support.mjs";
 import {
   DNSRecord,
@@ -277,12 +277,13 @@ export const sortByPriority = (a, b) => a.priority - b.priority;
 export function serviceAddresses(
   sources,
   filter,
-  addressType = "rawAddresses"
+  addressType = "rawAddresses",
+  addressFilter = a=>!isLocalhost(a)
 ) {
   return asArray(sources)
     .map(ft => Array.from(ft.findServices(filter)))
     .flat()
     .sort(sortByPriority)
     .map(s => s[addressType])
-    .flat();
+    .flat().filter(addressFilter);
 }

package/src/services/dns.mjs

@@ -5,8 +5,7 @@ import {
   writeLines,
   isIPv6Address,
   normalizeIPAddress,
-  isLinkLocal,
-  isLocalhost
+  isLinkLocal
 } from "../utils.mjs";
 import { DNSRecord, dnsFullName } from "../dns-utils.mjs";
 import { addType } from "../types.mjs";
@@ -158,7 +157,7 @@ export class DNSService extends Service {
         DNS: serviceAddresses(this, {
           ...DNS_SERVICE_FILTER,
           priority: "<10"
-        }).filter(a=>!isLocalhost(a)).join(" "),
+        }).join(" "),
         FallbackDNS: serviceAddresses(this, {
           ...DNS_SERVICE_FILTER,
           priority: ">=10"

package/src/services/ntp.mjs

@@ -62,7 +62,8 @@ export class NTPService extends Service {
             ...NTP_SERVICE_FILTER,
             priority: "<20"
           },
-          "domainName"
+          "domainName",
+          ()=>true
         ).join(" ")
       }
     ];

package/src/utils.mjs

@@ -79,7 +79,12 @@ export function asIterator(value) {
 }
 
 export function isIPv4Address(address) {
-  return address.indexOf(".") >= 0;
+  switch (typeof address) {
+    case "string":
+      return address.indexOf(".") >= 0;
+  }
+
+  return false;
 }
 
 export function generateEU64(mac) {
@@ -123,6 +128,7 @@ const ipv4 = {
 };
 const ipv6 = {
   separator: ":",
+  compressor: "::",
   length: 128,
   segmentLength: 16,
   segmentMask: 0xffffn,
@@ -132,22 +138,44 @@ const ipv6 = {
 };
 
 function _decode(definition, address, length = definition.length) {
-  const words = [];
+  let result = "";
+  let compressed = 0;
   let shift = definition.length;
+  let j, word;
+  const last = length / definition.segmentLength;
+
+  for (let i = 0; i < last; i = j + 1) {
+    for (j = i; j < last; j++) {
+      shift -= definition.segmentLength;
+      word = (address >> BigInt(shift)) & definition.segmentMask;
 
-  for (let i = 0; i < length / definition.segmentLength; i++) {
-    shift -= definition.segmentLength;
-    words.push(
-      ((address >> BigInt(shift)) & definition.segmentMask)
-        .toString(definition.base)
-        .padStart(definition.pad, "0")
-    );
+      if (word !== 0n || !definition.compressor || compressed > 0) {
+        break;
+      }
+    }
+
+    if (j > i + 1) {
+      compressed++;
+      result += definition.compressor;
+    } else {
+      if (result.length > 0) {
+        result += definition.separator;
+      }
+    }
+
+    if (j < last) {
+      result += word.toString(definition.base).padStart(definition.pad, "0");
+    }
   }
 
-  return words.join(definition.separator);
+  return result;
 }
 
 export function _encode(definition, address) {
+  if (typeof address !== "string") {
+    return address;
+  }
+
   let res = 0n;
   let shift = BigInt(definition.length);
 

package/types/service.d.mts

@@ -1,4 +1,4 @@
-export function serviceAddresses(sources: any, filter: any, addressType?: string): any[];
+export function serviceAddresses(sources: any, filter: any, addressType?: string, addressFilter?: (a: any) => boolean): any[];
 export namespace ServiceTypeDefinition {
     export let name: string;
     export let owners: string[];

package/types/utils.d.mts

@@ -11,13 +11,13 @@ export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): any;
 export function isLocalhost(address: any): boolean;
 export function normalizeIPAddress(address: any): any;
-export function _encode(definition: any, address: any): bigint;
+export function _encode(definition: any, address: any): any;
 export function decodeIPv6(address: any, length: any): string;
-export function encodeIPv6(address: any): bigint;
+export function encodeIPv6(address: any): any;
 export function decodeIPv4(address: any, length: any): string;
-export function encodeIPv4(address: any): bigint;
+export function encodeIPv4(address: any): any;
 export function decodeIP(address: any, length: any): string;
-export function encodeIP(address: any): bigint;
+export function encodeIP(address: any): any;
 export function formatCIDR(address: any, subnet: any): any;
 export function normalizeCIDR(address: any): {
     prefix?: undefined;
@@ -29,7 +29,7 @@ export function normalizeCIDR(address: any): {
     cidr: string;
 };
 export function hasWellKnownSubnet(address: any): any;
-export const IPV4_LOCALHOST: bigint;
-export const IPV6_LOCALHOST: bigint;
-export const IPV6_LINK_LOCAL_BROADCAST: bigint;
-export const IPV6_ROUTER_BROADCAST: bigint;
+export const IPV4_LOCALHOST: any;
+export const IPV6_LOCALHOST: any;
+export const IPV6_LINK_LOCAL_BROADCAST: any;
+export const IPV6_ROUTER_BROADCAST: any;