pmcf 1.27.2 → 1.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.27.2",
+  "version": "1.28.0",
   "publishConfig": {
     "access": "public"
   },
@@ -43,7 +43,7 @@
     "pacc": "^3.1.9"
   },
   "devDependencies": {
-    "@types/node": "^22.10.10",
+    "@types/node": "^22.12.0",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -43,6 +43,7 @@ export class Base {
 
   withOwner(owner) {
     if (this.owner !== owner) {
+      // @ts-ignore
       return new this.constructor(owner, this);
     }
 
@@ -50,6 +51,7 @@ export class Base {
   }
 
   get typeName() {
+    // @ts-ignore
     return this.constructor.typeName;
   }
 

package/src/cluster.mjs

@@ -4,4 +4,10 @@ export class Cluster extends Owner {
   static get typeName() {
     return "cluster";
   }
+
+  constructor(owner, data) {
+    super(owner, data);
+
+    owner.addCluster(this);
+  }
 }

package/src/model.mjs

@@ -7,7 +7,7 @@ import {
   normalizeIPAddress
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
-import { Owner } from "./owner.mjs";
+import { Owner, Network, Subnet } from "./owner.mjs";
 import { Service } from "./service.mjs";
 import { Cluster } from "./cluster.mjs";
 import { DNSService } from "./dns.mjs";
@@ -169,73 +169,6 @@ export class Location extends Owner {
   }
 }
 
-export class Network extends Owner {
-  kind;
-  scope;
-  metric;
-  ipv4;
-  subnet;
-  bridge;
-
-  static get typeName() {
-    return "network";
-  }
-
-  constructor(owner, data) {
-    super(owner, data);
-
-    let bridge;
-    if (data.bridge) {
-      bridge = data.bridge;
-      delete data.bridge;
-    }
-
-    Object.assign(this, data);
-
-    const subnetAddress = this.subnetAddress;
-
-    if (subnetAddress) {
-      let subnet = owner.subnet(subnetAddress);
-      if (!subnet) {
-        subnet = new Subnet(owner, { name: subnetAddress });
-      }
-
-      this.subnet = subnet;
-      subnet.networks.add(this);
-    }
-
-    owner.addNetwork(this);
-
-    this.bridge = owner.addBridge(this, bridge);
-  }
-
-  get netmask() {
-    const m = this.ipv4?.match(/\/(\d+)$/);
-    if (m) {
-      return parseInt(m[1]);
-    }
-  }
-
-  get subnetAddress() {
-    if (this.ipv4) {
-      const [addr, bits] = this.ipv4.split(/\//);
-      const parts = addr.split(/\./);
-      return parts.slice(0, bits / 8).join(".");
-    }
-  }
-
-  get propertyNames() {
-    return [
-      ...super.propertyNames,
-      "kind",
-      "ipv4",
-      "netmask",
-      "scope",
-      "metric",
-      "bridge"
-    ];
-  }
-}
 
 export class Host extends Base {
   networkInterfaces = {};
@@ -655,25 +588,6 @@ export class NetworkInterface extends Base {
   }
 }
 
-export class Subnet extends Base {
-  networks = new Set();
-
-  static get typeName() {
-    return "subnet";
-  }
-
-  constructor(owner, data) {
-    super(owner, data);
-
-    Object.assign(this, data);
-
-    owner.addSubnet(this);
-  }
-
-  get address() {
-    return this.name;
-  }
-}
 
 const _types = [Location, Network, Subnet, Host, Cluster, Service, DNSService];
 const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));

package/src/owner.mjs

@@ -5,6 +5,7 @@ import { DNSService } from "./dns.mjs";
 
 export class Owner extends Base {
   #hosts = new Map();
+  #clusters = new Map();
   #networks = new Map();
   #subnets = new Map();
   #bridges = new Set();
@@ -46,6 +47,10 @@ export class Owner extends Base {
         host._traverse(...args);
       }
 
+      for (const cluster of this.#clusters.values()) {
+        cluster._traverse(...args);
+      }
+
       return true;
     }
 
@@ -71,6 +76,11 @@ export class Owner extends Base {
     this.addObject(host);
   }
 
+  addCluster(cluster) {
+    this.#clusters.set(cluster.name, cluster);
+    this.addObject(cluster);
+  }
+
   async service(filter) {
     let best;
     for await (const service of this.services(filter)) {
@@ -91,6 +101,7 @@ export class Owner extends Base {
   }
 
   networkNamed(name) {
+    //console.log(this.toString(), name, this.#networks.keys());
     return this.#networks.get(name);
   }
 
@@ -197,3 +208,91 @@ export class Owner extends Base {
     };
   }
 }
+
+export class Network extends Owner {
+  kind;
+  scope;
+  metric;
+  ipv4;
+  subnet;
+  bridge;
+
+  static get typeName() {
+    return "network";
+  }
+
+  constructor(owner, data) {
+    super(owner, data);
+
+    let bridge;
+    if (data.bridge) {
+      bridge = data.bridge;
+      delete data.bridge;
+    }
+
+    Object.assign(this, data);
+
+    const subnetAddress = this.subnetAddress;
+
+    if (subnetAddress) {
+      let subnet = owner.subnet(subnetAddress);
+      if (!subnet) {
+        subnet = new Subnet(owner, { name: subnetAddress });
+      }
+
+      this.subnet = subnet;
+      subnet.networks.add(this);
+    }
+
+    owner.addNetwork(this);
+
+    this.bridge = owner.addBridge(this, bridge);
+  }
+
+  get netmask() {
+    const m = this.ipv4?.match(/\/(\d+)$/);
+    if (m) {
+      return parseInt(m[1]);
+    }
+  }
+
+  get subnetAddress() {
+    if (this.ipv4) {
+      const [addr, bits] = this.ipv4.split(/\//);
+      const parts = addr.split(/\./);
+      return parts.slice(0, bits / 8).join(".");
+    }
+  }
+
+  get propertyNames() {
+    return [
+      ...super.propertyNames,
+      "kind",
+      "ipv4",
+      "netmask",
+      "scope",
+      "metric",
+      "bridge"
+    ];
+  }
+}
+
+export class Subnet extends Base {
+  networks = new Set();
+
+  static get typeName() {
+    return "subnet";
+  }
+
+  constructor(owner, data) {
+    super(owner, data);
+
+    Object.assign(this, data);
+
+    owner.addSubnet(this);
+  }
+
+  get address() {
+    return this.name;
+  }
+}

package/src/service.mjs

@@ -71,6 +71,7 @@ export class Service extends Base {
       if (this.#ipAddresses) {
         data.ipAddresses = this.#ipAddresses;
       }
+      // @ts-ignore
       return new this.constructor(owner, data);
     }
 

package/types/model.d.mts

@@ -1,6 +1,6 @@
 export class World extends Owner {
     static get types(): {
-        [k: string]: typeof DNSService | typeof Cluster | typeof Service | typeof Host | typeof Network | typeof Subnet;
+        [k: string]: typeof DNSService | typeof Network | typeof Subnet | typeof Cluster | typeof Service | typeof Host;
     };
     constructor(directory: any);
     get fullName(): string;
@@ -16,16 +16,6 @@ export class World extends Owner {
 export class Location extends Owner {
     get location(): this;
 }
-export class Network extends Owner {
-    kind: any;
-    scope: any;
-    metric: any;
-    ipv4: any;
-    subnet: any;
-    bridge: any;
-    get netmask(): number;
-    get subnetAddress(): any;
-}
 export class Host extends Base {
     static prepareData(world: any, data: any): Promise<typeof Host>;
     networkInterfaces: {};
@@ -81,12 +71,10 @@ export class NetworkInterface extends Base {
     get kind(): any;
     #private;
 }
-export class Subnet extends Base {
-    networks: Set<any>;
-    get address(): any;
-}
 import { Owner } from "./owner.mjs";
 import { DNSService } from "./dns.mjs";
+import { Network } from "./owner.mjs";
+import { Subnet } from "./owner.mjs";
 import { Cluster } from "./cluster.mjs";
 import { Service } from "./service.mjs";
 import { Base } from "./base.mjs";

package/types/owner.d.mts

@@ -8,6 +8,7 @@ export class Owner extends Base {
     hosts(): AsyncGenerator<any, void, unknown>;
     addObject(object: any): void;
     addHost(host: any): void;
+    addCluster(cluster: any): void;
     service(filter: any): Promise<any>;
     services(filter: any): AsyncGenerator<any, void, unknown>;
     networkNamed(name: any): any;
@@ -27,5 +28,19 @@ export class Owner extends Base {
     };
     #private;
 }
+export class Network extends Owner {
+    kind: any;
+    scope: any;
+    metric: any;
+    ipv4: any;
+    subnet: any;
+    bridge: any;
+    get netmask(): number;
+    get subnetAddress(): any;
+}
+export class Subnet extends Base {
+    networks: Set<any>;
+    get address(): any;
+}
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";