pmcf 1.36.1 → 1.37.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.36.1",
+  "version": "1.37.1",
   "publishConfig": {
     "access": "public"
   },
@@ -47,7 +47,7 @@
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.1",
+    "semantic-release": "^24.2.2",
     "typescript": "^5.7.3"
   },
   "engines": {

package/src/model.mjs

@@ -12,7 +12,29 @@ import { Service } from "./service.mjs";
 import { Cluster } from "./cluster.mjs";
 import { DNSService } from "./dns.mjs";
 
-export class Root extends Owner {
+export class Location extends Owner {
+  static get typeName() {
+    return "location";
+  }
+
+  get location() {
+    return this;
+  }
+
+  locationNamed(name) {
+    if (this.fullName === name) {
+      return this;
+    }
+
+    return super.locationNamed(name);
+  }
+
+  get network() {
+    return [...this.typeList("network")][0] || super.network;
+  }
+}
+
+export class Root extends Location {
   static get types() {
     return _typesByName;
   }
@@ -27,8 +49,7 @@ export class Root extends Owner {
     this.addObject(this);
   }
 
-  get types()
-  {
+  get types() {
     return this.constructor.types;
   }
 
@@ -109,24 +130,6 @@ export class Root extends Owner {
   }
 }
 
-export class Location extends Owner {
-  static get typeName() {
-    return "location";
-  }
-
-  get location() {
-    return this;
-  }
-
-  locationNamed(name) {
-    if (this.fullName === name) {
-      return this;
-    }
-
-    return super.locationNamed(name);
-  }
-}
-
 export class Host extends Base {
   postinstall = [];
   #services = [];
@@ -326,6 +329,10 @@ export class Host extends Base {
     return this;
   }
 
+  get network() {
+    return this.owner.network;
+  }
+
   addService(service) {
     this.#services.push(service);
   }
@@ -347,7 +354,7 @@ export class Host extends Base {
     return this.#networkInterfaces;
   }
 
-  networkInterfacesNamed(name) {
+  networkInterfaceNamed(name) {
     return this.#networkInterfaces.get(name);
   }
 
@@ -477,11 +484,20 @@ export class NetworkInterface extends Base {
     //this.arpbridge = owner.addARPBridge(this, data.arpbridge);
   }
 
+  addSubnet(address) {
+    if (!this.network) {
+      this.error("Missing network", address);
+    } else {
+      return this.network.addSubnet(address);
+    }
+  }
+
   set ipAddresses(value) {
-    const networkOwner = this.owner.owner;
     for (const address of asArray(value)) {
-      const subnet = networkOwner.createSubnet(address);
-      this.#ipAddresses.set(normalizeIPAddress(address), subnet);
+      this.#ipAddresses.set(
+        normalizeIPAddress(address),
+        this.addSubnet(address)
+      );
     }
   }
 
@@ -501,7 +517,6 @@ export class NetworkInterface extends Base {
   }
 
   get gatewayAddress() {
-    console.log(typeof this.gateway);
     for (const a of this.gateway.networkAddresses()) {
       if (a.networkInterface.network === this.network) {
         return a.address;
@@ -510,7 +525,7 @@ export class NetworkInterface extends Base {
   }
 
   get ipAddresses() {
-    return this.#ipAddresses.keys();
+    return [...this.#ipAddresses.keys()];
   }
 
   get ipAddressesWithPrefixLength() {
@@ -531,13 +546,17 @@ export class NetworkInterface extends Base {
     return this.network?.prefixLength;
   }
 
+  get host() {
+    return this.owner;
+  }
+
   get network() {
-    return this.#network;
+    return this.#network || this.host.network;
   }
 
   set network(networkOrName) {
     if (!(networkOrName instanceof Network)) {
-      let network = this.owner.owner.networkNamed(networkOrName);
+      let network = this.host.owner.networkNamed(networkOrName);
 
       if (network) {
         this.#network = network;
@@ -550,10 +569,6 @@ export class NetworkInterface extends Base {
     this.#network = networkOrName;
   }
 
-  get host() {
-    return this.owner;
-  }
-
   get scope() {
     return this.#scope || this.network?.scope || "global";
   }

package/src/owner.mjs

@@ -166,10 +166,18 @@ export class Owner extends Base {
   }
 
   subnetNamed(name) {
+    if (this !== this.location) {
+      return this.location.subnetNamed(name);
+    }
+
     return this.typeNamed("subnet", name);
   }
 
   subnets() {
+    if (this !== this.location) {
+      return this.location.subnets();
+    }
+
     return this.typeList("subnet");
   }
 
@@ -181,18 +189,28 @@ export class Owner extends Base {
     }
   }
 
-  createSubnet(address) {
+  addSubnet(address) {
+    if (this !== this.location) {
+      return this.location.addSubnet(address);
+    }
+
     if (address instanceof Subnet) {
       return address;
     }
 
     const { cidr } = normalizeCIDR(address);
 
+    //console.log("ADD SUBNET", this.toString(), address, cidr);
+
     if (cidr) {
       let subnet = this.subnetNamed(cidr);
 
       if (!subnet) {
         subnet = new Subnet(this, { name: cidr });
+
+        /*if(this.owner) {
+          this.owner.addSubnet(subnet);
+        }*/
       }
 
       return subnet;
@@ -331,6 +349,10 @@ export class Network extends Owner {
     this.bridge = owner.addBridge(this, bridge);
   }
 
+  get network() {
+    return this;
+  }
+
   networkNamed(name) {
     if (this.fullName === name) {
       return this;
@@ -340,8 +362,7 @@ export class Network extends Owner {
 
   addSubnets(value) {
     for (const address of asArray(value)) {
-      const subnet = this.owner.createSubnet(address);
-      this.addObject(subnet);
+      const subnet = this.addSubnet(address);
       subnet.networks.add(this);
     }
   }

package/src/utils.mjs

@@ -81,6 +81,38 @@ function decodeIPv4(address, length = 32) {
   return octets.join(".");
 }
 
+export function encodeIPv6(address) {
+  const words = [0, 0, 0, 0, 0, 0, 0, 0];
+
+  let i = 0;
+  for (const a of normalizeIPAddress(address).split(/\:/)) {
+    words[i++] = parseInt(a,16);
+  }
+
+  let res = 0n;
+  let shift = 128n;
+
+  for(const word of words) {
+    shift -= 16n;
+    res += BigInt(word) << shift;
+  }
+
+  return res;
+}
+
+export function decodeIPv6(address, length = 128) {
+
+  let words = [];
+  let shift = 128n;
+
+  for(let i = 0; i < length / 16; i++) {
+    shift -= 16n;
+    words[i] = ((address >> shift) & 0xffffn).toString(16).padStart(4,'0');
+  }
+
+  return words.join(":");
+}
+
 export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
 
@@ -94,9 +126,9 @@ export function normalizeCIDR(address) {
         n = n & (0xffffffff << (32 - prefixLength));
         prefix = decodeIPv4(n, prefixLength);
       } else {
-        prefix = normalizeIPAddress(prefix);
-        const parts = prefix.split(/\:/);
-        prefix = parts.slice(0, prefixLength / 16).join(":");
+        let n = encodeIPv6(prefix);
+        n = n & (0xffffffffffffffffffffffffffffffffn << (128n - BigInt(prefixLength)));
+        prefix = decodeIPv6(n, prefixLength);
       }
     } else {
       return {};

package/types/model.d.mts

@@ -1,4 +1,7 @@
-export class Root extends Owner {
+export class Location extends Owner {
+    get location(): this;
+}
+export class Root extends Location {
     static get types(): {
         [k: string]: typeof DNSService | typeof Owner | typeof Subnet | typeof Service | typeof Host | typeof NetworkInterface;
     };
@@ -9,9 +12,6 @@ export class Root extends Owner {
     load(name: any, options: any): any;
     loadAll(): Promise<void>;
 }
-export class Location extends Owner {
-    get location(): this;
-}
 export class Host extends Base {
     static prepareData(root: any, data: any): Promise<typeof Host>;
     postinstall: any[];
@@ -37,7 +37,7 @@ export class Host extends Base {
     addService(service: any): void;
     services(filter: any): Generator<any, void, unknown>;
     get networkInterfaces(): Map<any, any>;
-    networkInterfacesNamed(name: any): any;
+    networkInterfaceNamed(name: any): any;
     addNetworkInterface(networkInterface: any): void;
     networkAddresses(): Generator<{
         networkInterface: any;
@@ -60,8 +60,9 @@ export class NetworkInterface extends Base {
     hwaddr: any;
     set network(networkOrName: any);
     get network(): any;
-    set ipAddresses(value: MapIterator<any>);
-    get ipAddresses(): MapIterator<any>;
+    addSubnet(address: any): any;
+    set ipAddresses(value: any[]);
+    get ipAddresses(): any[];
     subnetForAddress(address: any): any;
     addressWithPrefixLength(address: any): string;
     get gateway(): any;

package/types/owner.d.mts

@@ -20,9 +20,9 @@ export class Owner extends Base {
     networkNamed(name: any): any;
     networks(): Generator<any, void, unknown>;
     subnetNamed(name: any): any;
-    subnets(): Generator<any, void, unknown>;
+    subnets(): any;
     subnetForAddress(address: any): any;
-    createSubnet(address: any): any;
+    addSubnet(address: any): any;
     clusterNamed(name: any): any;
     clusters(): Generator<any, void, unknown>;
     addBridge(network: any, destinationNetworks: any): any;
@@ -38,6 +38,7 @@ export class Network extends Owner {
     metric: any;
     bridge: any;
     gateway: any;
+    get network(): this;
     addSubnets(value: any): void;
 }
 export class Subnet extends Base {

package/types/utils.d.mts

@@ -6,6 +6,8 @@ export function isIPv4Address(address: any): boolean;
 export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): any;
 export function normalizeIPAddress(address: any): any;
+export function encodeIPv6(address: any): bigint;
+export function decodeIPv6(address: any, length?: number): string;
 export function normalizeCIDR(address: any): {
     prefix?: undefined;
     prefixLength?: undefined;