pmcf 1.39.0 → 1.41.0

package/bin/pmcf-named-defs

@@ -58,7 +58,17 @@ async function generateNamedDefs(owner, targetDir) {
       );
     }
 
-    console.log(owner.name, domain, nameserver?.hostName, rname);
+    const subnets = [
+      ...new Set([...owner.networks()].map(n => [...n.subnets()]).flat())
+    ];
+
+    console.log(
+      owner.fullName,
+      domain,
+      nameserver?.hostName,
+      rname,
+      subnets.map(s => `${s.owner.name}/${s.name}`)
+    );
 
     const SOARecord = createRecord(
       "@",
@@ -87,7 +97,7 @@ async function generateNamedDefs(owner, targetDir) {
     };
     zones.push(zone);
 
-    for (const subnet of owner.subnets()) {
+    for (const subnet of subnets) {
       if (!subnet.isLinkLocal && subnet.prefix) {
         const reverseArpa = reverseArpaAddress(subnet.prefix);
         const reverseZone = {

package/package.json

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

package/src/cluster.mjs

@@ -1,6 +1,11 @@
 import { Owner } from "./owner.mjs";
+import { addType } from "./types.mjs";
 
 export class Cluster extends Owner {
+  static {
+    addType(this);
+  }
+
   static get typeName() {
     return "cluster";
   }

package/src/cmd.mjs

@@ -1,6 +1,6 @@
 import { parseArgs } from "node:util";
 import { argv, cwd, env } from "node:process";
-import { Root } from "./model.mjs";
+import { Root } from "./module.mjs";
 
 export async function prepare() {  
   const { values, positionals } = parseArgs({

package/src/dns.mjs

@@ -1,5 +1,6 @@
 import { Base } from "./base.mjs";
 import { asArray } from "./utils.mjs";
+import { addType } from "./types.mjs";
 
 export class DNSService extends Base {
   allowedUpdates = [];
@@ -10,6 +11,10 @@ export class DNSService extends Base {
 
   forwardsTo = [];
 
+  static {
+    addType(this);
+  }
+
   static get typeName() {
     return "dns";
   }

package/src/{model.mjs → host.mjs}

@@ -1,132 +1,13 @@
-import { readFile, glob } from "node:fs/promises";
-import { join } from "node:path";
+import { Base } from "./base.mjs";
+import { Network } from "./network.mjs";
+import { Service } from "./service.mjs";
 import {
   asArray,
   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 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;
-  }
-
-  static get typeName() {
-    return "root";
-  }
-
-  constructor(directory) {
-    super(undefined, { name: "" });
-    this.directory = directory;
-    this.addObject(this);
-  }
-
-  get types() {
-    return this.constructor.types;
-  }
-
-  get fullName() {
-    return "";
-  }
-
-  get root() {
-    return this;
-  }
-
-  async load(name, options) {
-    const fullName = Base.normalizeName(name);
-    let object = this.named(fullName);
-    if (object) {
-      return object;
-    }
-
-    //console.log("LOAD", fullName);
-
-    let path = fullName.split("/");
-    path.pop();
-
-    let data;
-    let type = options?.type;
-    if (type) {
-      data = JSON.parse(
-        await readFile(
-          join(this.directory, fullName, type.typeFileName),
-          "utf8"
-        )
-      );
-    } else {
-      for (type of _types) {
-        try {
-          data = JSON.parse(
-            await readFile(
-              join(this.directory, fullName, type.typeFileName),
-              "utf8"
-            )
-          );
-          break;
-        } catch {}
-      }
-
-      if (!data) {
-        return this.load(path.join("/"), options);
-      }
-    }
-
-    const owner = await this.load(path.join("/"));
-
-    const length = owner.fullName.length;
-    const n = fullName[length] === "/" ? length + 1 : length;
-    data.name = fullName.substring(n);
-
-    type = await type.prepareData(this, data);
-
-    object = new type(owner, data);
-
-    this._addObject(type.typeName, fullName, object);
-
-    return object;
-  }
-
-  async loadAll() {
-    for (let type of Object.values(Root.types)) {
-      for await (const name of glob(type.fileNameGlob, {
-        cwd: this.directory
-      })) {
-        await this.load(name, { type });
-      }
-    }
-
-    this.execFinalize();
-  }
-}
+import { addType } from "./types.mjs";
 
 export class Host extends Base {
   postinstall = [];
@@ -143,6 +24,10 @@ export class Host extends Base {
   #chassis;
   #vendor;
 
+  static {
+    addType(this);
+  }
+
   static get typeName() {
     return "host";
   }
@@ -422,6 +307,10 @@ export class Host extends Base {
 }
 
 export class NetworkInterface extends Base {
+  static {
+    addType(this);
+  }
+
   static get typeName() {
     return "network_interface";
   }
@@ -603,16 +492,3 @@ export class NetworkInterface extends Base {
     ];
   }
 }
-
-const _types = [
-  Owner,
-  Location,
-  Network,
-  Subnet,
-  Host,
-  Cluster,
-  Service,
-  DNSService,
-  NetworkInterface
-];
-const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));

package/src/location.mjs

@@ -0,0 +1,39 @@
+import { Owner } from "./owner.mjs";
+import { addType } from "./types.mjs";
+
+export class Location extends Owner {
+  static {
+    addType(this);
+  }
+
+  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;
+  }
+
+  /*
+  *subnets() {
+   // yield* super.subnets();
+    
+    for(const network of this.networks()) {
+     // console.log(network.toString());
+      yield* network.typeList("subnet");
+    }
+  }
+  */
+}

package/src/module.mjs

@@ -3,4 +3,9 @@ export * from "./service.mjs";
 export * from "./dns.mjs";
 export * from "./cluster.mjs";
 export * from "./owner.mjs";
-export * from "./model.mjs";
+export * from "./location.mjs";
+export * from "./root.mjs";
+export * from "./subnet.mjs";
+export * from "./network.mjs";
+export * from "./host.mjs";
+export * from "./types.mjs";

package/src/network.mjs

@@ -0,0 +1,102 @@
+import { Owner } from "./owner.mjs";
+import { asArray } from "./utils.mjs";
+import { addType } from "./types.mjs";
+
+export class Network extends Owner {
+  kind;
+  scope;
+  metric;
+  gateway;
+  #bridge;
+
+  static {
+    addType(this);
+  }
+
+  static get typeName() {
+    return "network";
+  }
+
+  constructor(owner, data) {
+    super(owner, data);
+
+    if (data.subnets) {
+      this.addSubnets(data.subnets);
+      delete data.subnets;
+    }
+
+    if (data.bridge) {
+      this.bridge = owner.addBridge(this, data.bridge);
+      delete data.bridge;
+    }
+
+    Object.assign(this, data);
+
+    if (typeof this.gateway === "string") {
+      this.finalize(() => (this.gateway = this.owner.hostNamed(this.gateway)));
+    }
+  }
+
+  get network() {
+    return this;
+  }
+
+  networkNamed(name) {
+    if (this.fullName === name) {
+      return this;
+    }
+    return super.networkNamed(name);
+  }
+
+  addSubnets(value) {
+    for (const address of asArray(value)) {
+      const subnet = this.addSubnet(address);
+      subnet.networks.add(this);
+    }
+  }
+
+  get bridge() {
+    return this.#bridge;
+  }
+
+  set bridge(bridge) {
+    for (const network of bridge) {
+      if (network instanceof Network && network !== this) {
+        for (const subnet of this.subnets()) {
+          for (const otherSubnet of network.subnets()) {
+            if (
+              subnet !== otherSubnet &&
+              subnet.address === otherSubnet.address
+            ) {
+              /*console.log(
+                "SHARE SUBNETS",
+                subnet.owner.toString(),
+                otherSubnet.owner.toString()
+              );*/
+
+              otherSubnet.owner.addObject(subnet);
+              for (const n of otherSubnet.networks) {
+                subnet.networks.add(n);
+              }
+
+              //console.log(subnet.toString(),[...subnet.networks].map(n=>n.toString()));
+            }
+          }
+        }
+      }
+    }
+
+    this.#bridge = bridge;
+  }
+
+  get propertyNames() {
+    return [
+      ...super.propertyNames,
+      "kind",
+      "scope",
+      "metric",
+      "bridge",
+      "gateway"
+    ];
+  }
+}

package/src/owner.mjs

@@ -1,6 +1,8 @@
-import { asArray, normalizeCIDR, isLinkLocal } from "./utils.mjs";
+import { asArray, normalizeCIDR } from "./utils.mjs";
 import { Base } from "./base.mjs";
+import { Subnet } from "./subnet.mjs";
 import { DNSService } from "./dns.mjs";
+import { addType, typesByName } from "./types.mjs";
 
 export class Owner extends Base {
   #membersByType = new Map();
@@ -10,6 +12,10 @@ export class Owner extends Base {
   domain;
   ntp = { servers: [] };
 
+  static {
+    addType(this);
+  }
+
   static get typeName() {
     return "owner";
   }
@@ -46,7 +52,7 @@ export class Owner extends Base {
 
       for (const [name, data] of Object.entries(networks)) {
         data.name = name;
-        new Network(this, data);
+        new typesByName.network(this, data);
       }
     }
 
@@ -279,136 +285,3 @@ export class Owner extends Base {
     return json;
   }
 }
-
-export class Network extends Owner {
-  kind;
-  scope;
-  metric;
-  bridge;
-  gateway;
-
-  static get typeName() {
-    return "network";
-  }
-
-  constructor(owner, data) {
-    super(owner, data);
-
-    if (data.subnets) {
-      this.addSubnets(data.subnets);
-      delete data.subnets;
-    }
-
-    let bridge;
-    if (data.bridge) {
-      bridge = data.bridge;
-      delete data.bridge;
-    }
-
-    Object.assign(this, data);
-
-    if (typeof this.gateway === "string") {
-      this.finalize(() => (this.gateway = this.owner.hostNamed(this.gateway)));
-    }
-
-    this.bridge = owner.addBridge(this, bridge);
-  }
-
-  get network() {
-    return this;
-  }
-
-  networkNamed(name) {
-    if (this.fullName === name) {
-      return this;
-    }
-    return super.networkNamed(name);
-  }
-
-  addSubnets(value) {
-    for (const address of asArray(value)) {
-      const subnet = this.addSubnet(address);
-      subnet.networks.add(this);
-    }
-  }
-
-  get propertyNames() {
-    return [
-      ...super.propertyNames,
-      "kind",
-      "scope",
-      "metric",
-      "bridge",
-      "gateway"
-    ];
-  }
-}
-
-export class Subnet extends Base {
-  networks = new Set();
-
-  static get typeName() {
-    return "subnet";
-  }
-
-  constructor(owner, data) {
-    const { cidr } = normalizeCIDR(data.name);
-
-    if (!cidr) {
-      const error = Error(`Invalid address`);
-      error.address = data.name;
-      throw error;
-    }
-
-    data.name = cidr;
-
-    super(owner, data);
-
-    Object.assign(this, data);
-
-    owner.addObject(this);
-  }
-
-  get fullName() {
-    return this.name;
-  }
-
-  matchesAddress(address) {
-    return address.startsWith(this.prefix);
-  }
-
-  get isLinkLocal() {
-    return isLinkLocal(this.address);
-  }
-
-  get prefix() {
-    const [prefix] = this.name.split("/");
-    return prefix;
-  }
-
-  get prefixLength() {
-    const m = this.name.match(/\/(\d+)$/);
-    if (m) {
-      return parseInt(m[1]);
-    }
-  }
-
-  get address() {
-    return this.name;
-  }
-
-  get propertyNames() {
-    return [...super.propertyNames, "networks", "prefixLength"];
-  }
-
-  _traverse(...args) {
-    if (super._traverse(...args)) {
-      for (const network of this.networks) {
-        network._traverse(...args);
-      }
-      return true;
-    }
-
-    return false;
-  }
-}

package/src/root.mjs

@@ -0,0 +1,96 @@
+import { readFile, glob } from "node:fs/promises";
+import { join } from "node:path";
+import { Base } from "./base.mjs";
+import { Location } from "./location.mjs";
+import { addType, types } from "./types.mjs";
+
+export class Root extends Location {
+
+  static {
+    addType(this);
+  }
+
+  static get typeName() {
+    return "root";
+  }
+
+  constructor(directory) {
+    super(undefined, { name: "" });
+    this.directory = directory;
+    this.addObject(this);
+  }
+
+  get fullName() {
+    return "";
+  }
+
+  get root() {
+    return this;
+  }
+
+  async load(name, options) {
+    const fullName = Base.normalizeName(name);
+    let object = this.named(fullName);
+    if (object) {
+      return object;
+    }
+
+    //console.log("LOAD", fullName);
+
+    let path = fullName.split("/");
+    path.pop();
+
+    let data;
+    let type = options?.type;
+    if (type) {
+      data = JSON.parse(
+        await readFile(
+          join(this.directory, fullName, type.typeFileName),
+          "utf8"
+        )
+      );
+    } else {
+      for (type of types) {
+        try {
+          data = JSON.parse(
+            await readFile(
+              join(this.directory, fullName, type.typeFileName),
+              "utf8"
+            )
+          );
+          break;
+        } catch {}
+      }
+
+      if (!data) {
+        return this.load(path.join("/"), options);
+      }
+    }
+
+    const owner = await this.load(path.join("/"));
+
+    const length = owner.fullName.length;
+    const n = fullName[length] === "/" ? length + 1 : length;
+    data.name = fullName.substring(n);
+
+    type = await type.prepareData(this, data);
+
+    object = new type(owner, data);
+
+    this._addObject(type.typeName, fullName, object);
+
+    return object;
+  }
+
+  async loadAll() {
+    for (let type of types) {
+      for await (const name of glob(type.fileNameGlob, {
+        cwd: this.directory
+      })) {
+        await this.load(name, { type });
+      }
+    }
+
+    this.execFinalize();
+  }
+}

package/src/service.mjs

@@ -1,4 +1,5 @@
 import { Base } from "./base.mjs";
+import { addType } from "./types.mjs";
 
 const ServiceTypes = {
   dns: { protocol: "udp", port: 53 },
@@ -21,6 +22,10 @@ export class Service extends Base {
   #port;
   #ipAddresses;
 
+  static {
+    addType(this);
+  }
+
   static get typeName() {
     return "service";
   }

package/src/subnet.mjs

@@ -0,0 +1,76 @@
+import { normalizeCIDR, isLinkLocal } from "./utils.mjs";
+import { Base } from "./base.mjs";
+import { addType } from "./types.mjs";
+
+export class Subnet extends Base {
+  networks = new Set();
+
+  static {
+    addType(this);
+  }
+
+  static get typeName() {
+    return "subnet";
+  }
+
+  constructor(owner, data) {
+    const { cidr } = normalizeCIDR(data.name);
+
+    if (!cidr) {
+      const error = Error(`Invalid address`);
+      error.address = data.name;
+      throw error;
+    }
+
+    data.name = cidr;
+
+    super(owner, data);
+
+    Object.assign(this, data);
+
+    owner.addObject(this);
+  }
+
+  get fullName() {
+    return this.name;
+  }
+
+  matchesAddress(address) {
+    return address.startsWith(this.prefix);
+  }
+
+  get isLinkLocal() {
+    return isLinkLocal(this.address);
+  }
+
+  get prefix() {
+    const [prefix] = this.name.split("/");
+    return prefix;
+  }
+
+  get prefixLength() {
+    const m = this.name.match(/\/(\d+)$/);
+    if (m) {
+      return parseInt(m[1]);
+    }
+  }
+
+  get address() {
+    return this.name;
+  }
+
+  get propertyNames() {
+    return [...super.propertyNames, "networks", "prefixLength"];
+  }
+
+  _traverse(...args) {
+    if (super._traverse(...args)) {
+      for (const network of this.networks) {
+        network._traverse(...args);
+      }
+      return true;
+    }
+
+    return false;
+  }
+}

package/src/types.mjs

@@ -0,0 +1,7 @@
+export function addType(clazz) {
+  types.push(clazz);
+  typesByName[clazz.typeName] = clazz;
+}
+
+export const types = [];
+export const typesByName = {};

package/types/cmd.d.mts

@@ -6,4 +6,4 @@ export function prepare(): Promise<{
     };
     args: string[];
 }>;
-import { Root } from "./model.mjs";
+import { Root } from "./module.mjs";

package/types/{model.d.mts → host.d.mts}

@@ -1,17 +1,3 @@
-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;
-    };
-    constructor(directory: any);
-    get types(): any;
-    get fullName(): string;
-    get root(): this;
-    load(name: any, options: any): any;
-    loadAll(): Promise<void>;
-}
 export class Host extends Base {
     static prepareData(root: any, data: any): Promise<typeof Host>;
     postinstall: any[];
@@ -47,7 +33,7 @@ export class Host extends Base {
     get ipAddresses(): any[];
     get ipAddressesWithPrefixLength(): any[];
     get ipAddress(): any;
-    publicKey(type?: string): Promise<string>;
+    publicKey(type?: string): Promise<any>;
     toJSON(): {
         extends: any[];
         networkInterfaces: any;
@@ -78,8 +64,4 @@ export class NetworkInterface extends Base {
     get kind(): any;
     #private;
 }
-import { Owner } from "./owner.mjs";
-import { DNSService } from "./dns.mjs";
-import { Subnet } from "./owner.mjs";
-import { Service } from "./service.mjs";
 import { Base } from "./base.mjs";

package/types/location.d.mts

@@ -0,0 +1,4 @@
+export class Location extends Owner {
+    get location(): this;
+}
+import { Owner } from "./owner.mjs";

package/types/module.d.mts

@@ -3,4 +3,9 @@ export * from "./service.mjs";
 export * from "./dns.mjs";
 export * from "./cluster.mjs";
 export * from "./owner.mjs";
-export * from "./model.mjs";
+export * from "./location.mjs";
+export * from "./root.mjs";
+export * from "./subnet.mjs";
+export * from "./network.mjs";
+export * from "./host.mjs";
+export * from "./types.mjs";

package/types/network.d.mts

@@ -0,0 +1,13 @@
+export class Network extends Owner {
+    constructor(owner: any, data: any);
+    kind: any;
+    scope: any;
+    metric: any;
+    gateway: any;
+    set bridge(bridge: any);
+    get bridge(): any;
+    get network(): this;
+    addSubnets(value: any): void;
+    #private;
+}
+import { Owner } from "./owner.mjs";

package/types/owner.d.mts

@@ -31,24 +31,5 @@ export class Owner extends Base {
     domains(): Generator<any, void, unknown>;
     #private;
 }
-export class Network extends Owner {
-    constructor(owner: any, data: any);
-    kind: any;
-    scope: any;
-    metric: any;
-    bridge: any;
-    gateway: any;
-    get network(): this;
-    addSubnets(value: any): void;
-}
-export class Subnet extends Base {
-    networks: Set<any>;
-    matchesAddress(address: any): any;
-    get isLinkLocal(): any;
-    get prefix(): any;
-    get prefixLength(): number;
-    get address(): any;
-    _traverse(...args: any[]): boolean;
-}
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";

package/types/root.d.mts

@@ -0,0 +1,8 @@
+export class Root extends Location {
+    constructor(directory: any);
+    get fullName(): string;
+    get root(): this;
+    load(name: any, options: any): any;
+    loadAll(): Promise<void>;
+}
+import { Location } from "./location.mjs";

package/types/subnet.d.mts

@@ -0,0 +1,10 @@
+export class Subnet extends Base {
+    networks: Set<any>;
+    matchesAddress(address: any): any;
+    get isLinkLocal(): any;
+    get prefix(): any;
+    get prefixLength(): number;
+    get address(): any;
+    _traverse(...args: any[]): boolean;
+}
+import { Base } from "./base.mjs";

package/types/types.d.mts

@@ -0,0 +1,3 @@
+export function addType(clazz: any): void;
+export const types: any[];
+export const typesByName: {};