pmcf 2.32.0 → 2.32.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.32.0",
+  "version": "2.32.1",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "ip-utilties": "^1.3.0",
+    "ip-utilties": "^1.3.1",
     "npm-pkgbuild": "^18.0.1",
     "pacc": "^3.4.0",
     "pkg-dir": "^8.0.0"

package/src/network-address.mjs

@@ -1,8 +1,8 @@
-import { familyIP, formatCIDR,decodeIP } from "ip-utilties";
+import { familyIP, formatCIDR, decodeIP } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 
 /**
- * 
+ *
  */
 export class NetworkAddress {
   /** @type {Subnet} */ subnet;
@@ -27,9 +27,7 @@ export class NetworkAddress {
     return formatCIDR(this.address, this.subnet.prefixLength);
   }
 
-
-  toString()
-  {
+  toString() {
     return `${this.networkInterface.fullName} ${decodeIP(this.address)}`;
   }
 }

package/src/network-interfaces/network-interface.mjs

@@ -20,9 +20,9 @@ export const NetworkInterfaceTypeDefinition = {
     const kind = value.kind;
     const t = NetworkInterfaceTypeDefinition.specializations[kind];
 
-    if (!t) {
+    /*if (!t) {
       console.warn("FACTORY", owner.name, value, t?.name);
-    }
+    }*/
     if (t) {
       delete value.type;
       delete value.kind;

package/src/network.mjs

@@ -39,6 +39,12 @@ export class Network extends Owner {
     return this;
   }
 
+  get address() {
+    for(const subnet of this.subnets()) {
+      return subnet.address;
+    }
+  }
+
   networkNamed(name) {
     if (this.isNamed(name)) {
       return this;

package/src/owner.mjs

@@ -1,7 +1,7 @@
-import { normalizeCIDR } from "ip-utilties";
+import { normalizeCIDR, familyIP } from "ip-utilties";
 import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
-import { Subnet } from "./subnet.mjs";
+import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { addType, types } from "./types.mjs";
 const OwnerTypeDefinition = {
   name: "owner",
@@ -182,19 +182,25 @@ export class Owner extends Base {
   }
 
   addSubnet(address) {
-    const { cidr } = normalizeCIDR(address);
+    const { cidr, prefixLength } = normalizeCIDR(address);
 
-    if (cidr) {
+    if (cidr && prefixLength !== 0) {
       return this.subnetNamed(cidr) || new Subnet(this, cidr);
     }
 
-    const subnet = this.subnetForAddress(address);
+    let subnet = this.subnetForAddress(address);
+  
     if (!subnet) {
+      subnet =  familyIP(address) === 'IPv4' ?  SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
+
+      /*
       this.error(
         `Address without subnet ${address}`,
         [...this.subnets()].map(s => s.address)
       );
+      */
     }
+  
     return subnet;
   }
 

package/src/services/dns.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isLinkLocal, reverseArpa } from "ip-utilties";
+import { isLinkLocal, reverseArpa, decodeIP } from "ip-utilties";
 import { writeLines } from "../utils.mjs";
 import {
   DNSRecord,
@@ -16,7 +16,7 @@ import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition
 } from "../extra-source-service.mjs";
-import { subnets } from "../subnet.mjs";
+import { addresses } from "../network-support.mjs";
 import { addHook } from "../hooks.mjs";
 
 const address_types = ["network", "host", "network_interface"];
@@ -93,9 +93,18 @@ const statisticsEndpoint = {
 const DNS_SERVICE_FILTER = { type: DNSServiceTypeDefinition.name };
 
 function addressList(objects) {
-  return Array.from(objects).map(object =>
-    typeof object === "string" ? object : object.name
-  );
+  return Array.from(objects).map(object => {
+    switch (typeof object) {
+      case "string":
+        return object;
+      case "object":
+        if (object.name) {
+          return object.name;
+        }
+
+        return decodeIP(object);
+    }
+  });
 }
 
 function addressesStatement(prefix, objects, generateEmpty = false) {
@@ -147,7 +156,7 @@ export class DNSService extends ExtraSourceService {
   endpoints(filter) {
     const endpoints = super.endpoints(filter);
 
-    for (const na of this.server.networkAddresses(
+    for (const na of this.owner.networkAddresses(
       na => na.networkInterface.kind === "localhost"
     )) {
       endpoints.push(new Endpoint(this, na, rdncEndpoint));
@@ -249,9 +258,9 @@ export class DNSService extends ExtraSourceService {
     }
 
     const acls = [
-      addressesStatement("acl trusted", subnets(this.trusted)),
-      addressesStatement("acl protected", subnets(this.protected)),
-      addressesStatement("acl open", subnets(this.open), true)
+      addressesStatement("acl trusted", addresses(this.trusted)),
+      addressesStatement("acl protected", addresses(this.protected)),
+      addressesStatement("acl open", addresses(this.open), true)
     ].flat();
 
     if (acls.length) {

package/src/subnet.mjs

@@ -56,9 +56,8 @@ export class Subnet extends Base {
     try {
       return matchPrefixIP(this.address, this.prefixLength, address);
     } catch (e) {
-      console.error(e, address, this.address, this.prefixLength);
+      console.error(e, this.toString(), address);
     }
-
     return false;
   }
 
@@ -92,6 +91,7 @@ export class Subnet extends Base {
 
 const _owner = { addObject() {} };
 export const SUBNET_GLOBAL_IPV4 = new Subnet(_owner, "0.0.0.0/0");
+export const SUBNET_GLOBAL_IPV6 = new Subnet(_owner, "::0/0");
 export const SUBNET_LOCALHOST_IPV4 = new Subnet(_owner, "127.0.0.1/8");
 export const SUBNET_LOCALHOST_IPV6 = new Subnet(_owner, "::1/128");
 

package/types/network.d.mts

@@ -201,6 +201,7 @@ export class Network extends Owner {
     gateway: any;
     _bridge: any;
     get network(): this;
+    get address(): any;
     set bridge(network: any);
     get bridge(): any;
 }

package/types/subnet.d.mts

@@ -38,6 +38,7 @@ export class Subnet extends Base {
     _traverse(...args: any[]): boolean;
 }
 export const SUBNET_GLOBAL_IPV4: Subnet;
+export const SUBNET_GLOBAL_IPV6: Subnet;
 export const SUBNET_LOCALHOST_IPV4: Subnet;
 export const SUBNET_LOCALHOST_IPV6: Subnet;
 import { Base } from "./base.mjs";