pmcf 2.35.4 → 2.36.0

package/package.json

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

package/src/network-address.mjs

@@ -1,5 +1,6 @@
 import { familyIP, formatCIDR, decodeIP } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
+import { Owner } from "pmcf";
 
 /**
  *
@@ -32,12 +33,21 @@ export class NetworkAddress {
   }
 }
 
-export function addresses(networkAddresses) {
+export function addresses(sources, options) {
   return [
     ...new Set(
-      [...networkAddresses].map(object =>
-        /*object?.name ||*/ decodeIP(object.address)
-      )
+      [...sources]
+        .map(s => {
+          if (options?.aggregate && s instanceof Owner && s.subnets) {
+            return [...s.subnets()];
+          }
+
+          return s.networkAddresses
+            ? [...s.networkAddresses(options?.filter)]
+            : s;
+        })
+        .flat()
+        .map(object => decodeIP(object.address))
     )
   ];
 }

package/src/service.mjs

@@ -318,5 +318,9 @@ export function serviceEndpoints(sources, options = {}) {
 
   const res = [...new Set(options.select ? all.map(options.select) : all)];
 
+  if(options.limit < res.length) {
+    res.length = options.limit;
+  }
+  
   return options.join ? res.join(options.join) : res;
 }

package/src/services/dns.mjs

@@ -211,7 +211,8 @@ export class DNSService extends ExtraSourceService {
 
     const forwarders = serviceEndpoints(this.source, {
       services: { type: "dns", priority: ">=20" },
-      select: e => e.address
+      select: e => e.address,
+      limit: 5
     });
 
     if (forwarders.length) {
@@ -223,10 +224,17 @@ export class DNSService extends ExtraSourceService {
     }
 
     const acls = [
-      addressesStatement("acl trusted", addresses(this.trusted)),
-      addressesStatement("acl open", addresses(this.open), true),
+      addressesStatement(
+        "acl trusted",
+        addresses(this.trusted, { aggregate: true })
+      ),
+      addressesStatement(
+        "acl open",
+        addresses(this.open, { aggregate: true }),
+        true
+      ),
       addressesStatement("acl protected", [
-        ...addresses(this.protected),
+        ...addresses(this.protected, { aggregate: true }),
         "!open"
       ])
     ].flat();

package/src/services/systemd-resolved.mjs

@@ -42,7 +42,8 @@ export class SystemdResolvedService extends ExtraSourceService {
         services: { type: "dns", priority },
         endpoints: e => e.networkInterface.kind !== "loopback",
         select: endpoint => endpoint.address,
-        join: " "
+        join: " ",
+        limit: 5
       };
     };
 

package/types/network-address.d.mts

@@ -1,4 +1,4 @@
-export function addresses(networkAddresses: any): any[];
+export function addresses(sources: any, options: any): any[];
 export function cidrAddresses(networkAddresses: any): any[];
 /**
  *