pmcf 1.27.1 → 1.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.27.1",
+  "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

@@ -0,0 +1,13 @@
+import { Owner } from "./owner.mjs";
+
+export class Cluster extends Owner {
+  static get typeName() {
+    return "cluster";
+  }
+
+  constructor(owner, data) {
+    super(owner, data);
+
+    owner.addCluster(this);
+  }
+}

package/src/model.mjs

@@ -2,210 +2,16 @@ import { readFile, glob } from "node:fs/promises";
 import { join } from "node:path";
 import {
   asArray,
-  bridgeToJSON,
   isIPv4Address,
   isIPv6Address,
   normalizeIPAddress
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
+import { Owner, Network, Subnet } from "./owner.mjs";
 import { Service } from "./service.mjs";
+import { Cluster } from "./cluster.mjs";
 import { DNSService } from "./dns.mjs";
 
-export class Owner extends Base {
-  #hosts = new Map();
-  #networks = new Map();
-  #subnets = new Map();
-  #bridges = new Set();
-  #dns;
-  #administratorEmail;
-  domain;
-  ntp = { servers: [] };
-
-  constructor(owner, data) {
-    super(owner, data);
-
-    let dns;
-    if (data?.dns) {
-      dns = data.dns;
-      delete data.dns;
-    }
-
-    this.#dns = new DNSService(this, dns);
-
-    if (data?.networks) {
-      const networks = data.networks;
-      delete data.networks;
-
-      for (const [name, data] of Object.entries(networks)) {
-        data.name = name;
-        new Network(this, data);
-      }
-    }
-    Object.assign(this, data);
-  }
-
-  _traverse(...args) {
-    if (super._traverse(...args)) {
-      for (const network of this.#networks.values()) {
-        network._traverse(...args);
-      }
-
-      for (const host of this.#hosts.values()) {
-        host._traverse(...args);
-      }
-
-      return true;
-    }
-
-    return false;
-  }
-
-  get dns() {
-    return this.#dns;
-  }
-
-  async *hosts() {
-    for (const host of this.#hosts.values()) {
-      yield host;
-    }
-  }
-
-  addObject(object) {
-    this.world.addObject(object);
-  }
-
-  addHost(host) {
-    this.#hosts.set(host.name, host);
-    this.addObject(host);
-  }
-
-  async service(filter) {
-    let best;
-    for await (const service of this.services(filter)) {
-      if (!best || service.priority < best.priority) {
-        best = service;
-      }
-    }
-
-    return best;
-  }
-
-  async *services(filter) {
-    for await (const host of this.hosts()) {
-      for await (const service of host.services(filter)) {
-        yield service;
-      }
-    }
-  }
-
-  networkNamed(name) {
-    return this.#networks.get(name);
-  }
-
-  async *networks() {
-    for (const network of this.#networks.values()) {
-      yield network;
-    }
-  }
-
-  addNetwork(network) {
-    this.#networks.set(network.fullName, network);
-  }
-
-  addBridge(network, destinationNetworks) {
-    if (destinationNetworks) {
-      let bridge;
-
-      for (bridge of this.#bridges) {
-        if (bridge.has(network.name)) {
-          bridge.delete(network.name);
-          bridge.add(network);
-          break;
-        }
-
-        if (bridge.has(network)) {
-          break;
-        }
-      }
-
-      if (!bridge) {
-        bridge = new Set([network]);
-        this.#bridges.add(bridge);
-      }
-
-      for (const name of asArray(destinationNetworks)) {
-        const other = this.networkNamed(name);
-        if (other) {
-          bridge.add(other);
-          other.bridge = bridge;
-        } else {
-          bridge.add(name);
-          this.finalize(() => this._resolveBridges());
-        }
-      }
-
-      return bridge;
-    }
-  }
-
-  _resolveBridges() {
-    for (const bridge of this.#bridges) {
-      this.info(bridgeToJSON(bridge));
-      for (const network of bridge) {
-        if (typeof network === "string") {
-          const other = this.networkNamed(network);
-
-          if (other) {
-            bridge.delete(network);
-            bridge.add(other);
-            other.bridge = bridge;
-          } else {
-            this.error(`Unresolvabale bridge network`, network);
-          }
-        }
-      }
-    }
-  }
-
-  async *networkAddresses() {
-    for await (const host of this.hosts()) {
-      for (const networkAddresses of host.networkAddresses()) {
-        yield networkAddresses;
-      }
-    }
-  }
-
-  addSubnet(subnet) {
-    this.#subnets.set(subnet.name, subnet);
-  }
-
-  subnet(name) {
-    return this.#subnets.get(name);
-  }
-
-  subnets() {
-    return this.#subnets.values();
-  }
-
-  get administratorEmail() {
-    return this.#administratorEmail || "admin@" + this.domain;
-  }
-
-  get propertyNames() {
-    return [...super.propertyNames, "domain", "administratorEmail", "dns"];
-  }
-
-  toJSON() {
-    return {
-      ...super.toJSON(),
-      networks: [...this.#networks.keys()].sort(),
-      subnets: [...this.#subnets.keys()].sort(),
-      bridges: [...this.#bridges].map(b => bridgeToJSON(b)),
-      hosts: [...this.#hosts.keys()].sort()
-    };
-  }
-}
-
 export class World extends Owner {
   static get types() {
     return _typesByName;
@@ -363,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 = {};
@@ -849,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, Service, DNSService];
+const _types = [Location, Network, Subnet, Host, Cluster, Service, DNSService];
 const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));

package/src/module.mjs

@@ -1,4 +1,6 @@
 export * from "./base.mjs";
 export * from "./service.mjs";
 export * from "./dns.mjs";
+export * from "./cluster.mjs";
+export * from "./owner.mjs";
 export * from "./model.mjs";

package/src/owner.mjs

@@ -0,0 +1,298 @@
+import { asArray, bridgeToJSON } from "./utils.mjs";
+
+import { Base } from "./base.mjs";
+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();
+  #dns;
+  #administratorEmail;
+  domain;
+  ntp = { servers: [] };
+
+  constructor(owner, data) {
+    super(owner, data);
+
+    let dns;
+    if (data?.dns) {
+      dns = data.dns;
+      delete data.dns;
+    }
+
+    this.#dns = new DNSService(this, dns);
+
+    if (data?.networks) {
+      const networks = data.networks;
+      delete data.networks;
+
+      for (const [name, data] of Object.entries(networks)) {
+        data.name = name;
+        new Network(this, data);
+      }
+    }
+    Object.assign(this, data);
+  }
+
+  _traverse(...args) {
+    if (super._traverse(...args)) {
+      for (const network of this.#networks.values()) {
+        network._traverse(...args);
+      }
+
+      for (const host of this.#hosts.values()) {
+        host._traverse(...args);
+      }
+
+      for (const cluster of this.#clusters.values()) {
+        cluster._traverse(...args);
+      }
+
+      return true;
+    }
+
+    return false;
+  }
+
+  get dns() {
+    return this.#dns;
+  }
+
+  async *hosts() {
+    for (const host of this.#hosts.values()) {
+      yield host;
+    }
+  }
+
+  addObject(object) {
+    this.world.addObject(object);
+  }
+
+  addHost(host) {
+    this.#hosts.set(host.name, host);
+    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)) {
+      if (!best || service.priority < best.priority) {
+        best = service;
+      }
+    }
+
+    return best;
+  }
+
+  async *services(filter) {
+    for await (const host of this.hosts()) {
+      for await (const service of host.services(filter)) {
+        yield service;
+      }
+    }
+  }
+
+  networkNamed(name) {
+    //console.log(this.toString(), name, this.#networks.keys());
+    return this.#networks.get(name);
+  }
+
+  async *networks() {
+    for (const network of this.#networks.values()) {
+      yield network;
+    }
+  }
+
+  addNetwork(network) {
+    this.#networks.set(network.fullName, network);
+  }
+
+  addBridge(network, destinationNetworks) {
+    if (destinationNetworks) {
+      let bridge;
+
+      for (bridge of this.#bridges) {
+        if (bridge.has(network.name)) {
+          bridge.delete(network.name);
+          bridge.add(network);
+          break;
+        }
+
+        if (bridge.has(network)) {
+          break;
+        }
+      }
+
+      if (!bridge) {
+        bridge = new Set([network]);
+        this.#bridges.add(bridge);
+      }
+
+      for (const name of asArray(destinationNetworks)) {
+        const other = this.networkNamed(name);
+        if (other) {
+          bridge.add(other);
+          other.bridge = bridge;
+        } else {
+          bridge.add(name);
+          this.finalize(() => this._resolveBridges());
+        }
+      }
+
+      return bridge;
+    }
+  }
+
+  _resolveBridges() {
+    for (const bridge of this.#bridges) {
+      this.info(bridgeToJSON(bridge));
+      for (const network of bridge) {
+        if (typeof network === "string") {
+          const other = this.networkNamed(network);
+
+          if (other) {
+            bridge.delete(network);
+            bridge.add(other);
+            other.bridge = bridge;
+          } else {
+            this.error(`Unresolvabale bridge network`, network);
+          }
+        }
+      }
+    }
+  }
+
+  async *networkAddresses() {
+    for await (const host of this.hosts()) {
+      for (const networkAddresses of host.networkAddresses()) {
+        yield networkAddresses;
+      }
+    }
+  }
+
+  addSubnet(subnet) {
+    this.#subnets.set(subnet.name, subnet);
+  }
+
+  subnet(name) {
+    return this.#subnets.get(name);
+  }
+
+  subnets() {
+    return this.#subnets.values();
+  }
+
+  get administratorEmail() {
+    return this.#administratorEmail || "admin@" + this.domain;
+  }
+
+  get propertyNames() {
+    return [...super.propertyNames, "domain", "administratorEmail", "dns"];
+  }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      networks: [...this.#networks.keys()].sort(),
+      subnets: [...this.#subnets.keys()].sort(),
+      bridges: [...this.#bridges].map(b => bridgeToJSON(b)),
+      hosts: [...this.#hosts.keys()].sort()
+    };
+  }
+}
+
+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/cluster.d.mts

@@ -0,0 +1,3 @@
+export class Cluster extends Owner {
+}
+import { Owner } from "./owner.mjs";

package/types/model.d.mts

@@ -1,35 +1,6 @@
-export class Owner extends Base {
-    domain: any;
-    ntp: {
-        servers: any[];
-    };
-    _traverse(...args: any[]): boolean;
-    get dns(): DNSService;
-    hosts(): AsyncGenerator<any, void, unknown>;
-    addObject(object: any): void;
-    addHost(host: any): void;
-    service(filter: any): Promise<any>;
-    services(filter: any): AsyncGenerator<any, void, unknown>;
-    networkNamed(name: any): any;
-    networks(): AsyncGenerator<any, void, unknown>;
-    addNetwork(network: any): void;
-    addBridge(network: any, destinationNetworks: any): any;
-    _resolveBridges(): void;
-    networkAddresses(): AsyncGenerator<any, void, unknown>;
-    addSubnet(subnet: any): void;
-    subnet(name: any): any;
-    subnets(): MapIterator<any>;
-    toJSON(): {
-        networks: any[];
-        subnets: any[];
-        bridges: any[][];
-        hosts: any[];
-    };
-    #private;
-}
 export class World extends Owner {
     static get types(): {
-        [k: string]: typeof Service | typeof DNSService | typeof Network | typeof Host | typeof Location | typeof Subnet;
+        [k: string]: typeof DNSService | typeof Network | typeof Subnet | typeof Cluster | typeof Service | typeof Host;
     };
     constructor(directory: any);
     get fullName(): string;
@@ -45,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: {};
@@ -110,10 +71,10 @@ export class NetworkInterface extends Base {
     get kind(): any;
     #private;
 }
-export class Subnet extends Base {
-    networks: Set<any>;
-    get address(): any;
-}
-import { Base } from "./base.mjs";
+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/module.d.mts

@@ -1,4 +1,6 @@
 export * from "./base.mjs";
 export * from "./service.mjs";
 export * from "./dns.mjs";
+export * from "./cluster.mjs";
+export * from "./owner.mjs";
 export * from "./model.mjs";

package/types/owner.d.mts

@@ -0,0 +1,46 @@
+export class Owner extends Base {
+    domain: any;
+    ntp: {
+        servers: any[];
+    };
+    _traverse(...args: any[]): boolean;
+    get dns(): DNSService;
+    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;
+    networks(): AsyncGenerator<any, void, unknown>;
+    addNetwork(network: any): void;
+    addBridge(network: any, destinationNetworks: any): any;
+    _resolveBridges(): void;
+    networkAddresses(): AsyncGenerator<any, void, unknown>;
+    addSubnet(subnet: any): void;
+    subnet(name: any): any;
+    subnets(): MapIterator<any>;
+    toJSON(): {
+        networks: any[];
+        subnets: any[];
+        bridges: any[][];
+        hosts: any[];
+    };
+    #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";