pmcf 1.9.2 → 1.11.0

package/bin/pmcf-location-defs

@@ -21,7 +21,7 @@ console.log("replaces", `mf-location-${location.name}`);
 console.log("description", `location definitions for ${location.name}`);
 
 async function generateLocationDefs(location, dir) {
-  const sl = location.dns_servers;
+  const sl = (await Array.fromAsync(location.dns.services())).map(s=>s.ipAddress);
   const s1 = sl.shift();
 
   await writeLines(
@@ -51,7 +51,7 @@ async function generateLocationDefs(location, dir) {
     join(dir, "etc/systemd/timesyncd.conf.d"),
     `${location.name}.conf`,
     sectionLines("Time", {
-      NTP: location.ntp_servers.join(" "),
+      NTP: location.ntp.servers.join(" "),
       PollIntervalMinSec: 60,
       SaveIntervalSec: 3600
     })

package/bin/pmcf-named-defs

@@ -8,7 +8,6 @@ import { prepare } from "../src/cmd.mjs";
 const { world, args, options } = prepare();
 
 const location = await world.location(args[0] || "SW");
-const ttl = location.dnsRecordTTL;
 const updates = [
   Math.ceil(Date.now() / 1000),
   36000,
@@ -30,7 +29,9 @@ console.log("description", `named defintions for ${location.name}`);
 }*/
 
 async function generateNamedDefs(location, targetDir) {
+  const dns = location.dns;
   const domain = location.domain;
+  const ttl = dns.recordTTL;
 
   if (domain) {
     const zones = [];
@@ -106,7 +107,7 @@ async function generateNamedDefs(location, targetDir) {
         }  ${normalizeIPAddress(address)}`
       );
 
-      for (const service of Object.values(host.services)) {
+      for (const service of host.services()) {
         if (service.master && service.alias) {
           zone.records.add(
             `${service.alias.padEnd(NAME_LEN, " ")} ${ttl} IN CNAME ${
@@ -115,9 +116,9 @@ async function generateNamedDefs(location, targetDir) {
           );
         }
 
-        if (service.prefix) {
+        if (service.srvPrefix) {
           zone.records.add(
-            `${`${service.prefix}.${host.domainName}.`.padEnd(
+            `${`${service.srvPrefix}.${host.domainName}.`.padEnd(
               NAME_LEN,
               " "
             )} ${ttl} IN SRV   ${String(service.priority).padStart(4)} ${String(
@@ -157,9 +158,8 @@ async function generateNamedDefs(location, targetDir) {
       zoneConfig.push(`  type master;`);
       zoneConfig.push(`  file \"${zone.file}\";`);
 
-      const u = location.dnsAllowedUpdates;
       zoneConfig.push(
-        `  allow-update { ${u.length ? u.join(";") : "none"}; };`
+        `  allow-update { ${dns.allowedUpdates.length ? dns.allowedUpdates.join(";") : "none"}; };`
       );
       zoneConfig.push(`  notify yes;`);
       zoneConfig.push(`};`);

package/package.json

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

package/src/model.mjs

@@ -41,6 +41,14 @@ export class Base {
     }
   }
 
+  withOwner(owner) {
+    if (this.owner !== owner) {
+      return new this.constructor(owner, this);
+    }
+
+    return this;
+  }
+
   get typeName() {
     return this.constructor.typeName;
   }
@@ -77,7 +85,7 @@ export class Base {
   }
 
   get fullName() {
-    return join(this.owner.fullName, this.name);
+    return this.owner ? join(this.owner.fullName, this.name) : this.name;
   }
 
   expand(object) {
@@ -140,6 +148,25 @@ export class Owner extends Base {
     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;
+      }
+    }
+  }
+
   network(name) {
     return this.#networks.get(name);
   }
@@ -192,7 +219,7 @@ export class Owner extends Base {
 
   _resolveBridges() {
     for (const bridge of this.#bridges) {
-      console.log(bridgeToJSON(bridge));
+      this.info(bridgeToJSON(bridge));
       for (const network of bridge) {
         if (typeof network === "string") {
           const other = this.network(network);
@@ -201,7 +228,7 @@ export class Owner extends Base {
             bridge.delete(network);
             bridge.add(other);
             other.bridge = bridge;
-            console.log("RESOLVE", network, other, bridgeToJSON(bridge));
+            this.info("RESOLVE", network, other, bridgeToJSON(bridge));
           } else {
             this.error(`Unresolvabale bridge network`, network);
           }
@@ -386,9 +413,34 @@ export class World extends Owner {
   }
 }
 
+class DNSService {
+  owner;
+
+  allowedUpdates = [];
+  recordTTL = "1W";
+  forwardsTo = [];
+
+  constructor(owner, data) {
+    this.owner = owner;
+    Object.assign(this, data);
+  }
+
+  async *services() {
+    const filter = { type: "dns" };
+
+    yield* this.owner.services(filter);
+
+    for (const s of this.forwardsTo) {
+      const owner = await this.owner.world.load(s);
+      yield* owner.services(filter);
+    }
+  }
+}
+
 export class Location extends Owner {
   domain;
-  dns;
+  #dns;
+  ntp = { servers: [] };
   #administratorEmail;
 
   static get typeName() {
@@ -398,6 +450,13 @@ export class Location extends Owner {
   constructor(owner, data) {
     super(owner, data);
 
+    let dns;
+    if (data.dns) {
+      dns = data.dns;
+      delete data.dns;
+    }
+
+    this.#dns = new DNSService(this, dns);
     const networks = data.networks;
     delete data.networks;
     Object.assign(this, data);
@@ -418,31 +477,10 @@ export class Location extends Owner {
     }
   }
 
-  async service(filter) {
-    let best;
-    for await (const service of this.services(filter)) {
-      if (!best || service.priority < best.priority) {
-        best = service;
-      }
-    }
-
-    return best;
+  get dns() {
+    return this.#dns;
   }
 
-  async *services(filter) {
-    for await (const host of this.hosts()) {
-      for (const service of Object.values(host.services)) {
-        if (
-          !filter ||
-          filter.type === "*" ||
-          filter.type === service.type ||
-          filter.name === service.name
-        ) {
-          yield service;
-        }
-      }
-    }
-  }
 
   async *networkAddresses() {
     for await (const host of this.hosts()) {
@@ -452,14 +490,6 @@ export class Location extends Owner {
     }
   }
 
-  get dnsAllowedUpdates() {
-    return this.dns?.allowedUpdates || [];
-  }
-
-  get dnsRecordTTL() {
-    return this.dns?.recordTTL || "1W";
-  }
-
   get administratorEmail() {
     return this.#administratorEmail || "admin@" + this.domain;
   }
@@ -538,9 +568,8 @@ export class Network extends Owner {
 
 export class Host extends Base {
   networkInterfaces = {};
-  services = {};
   postinstall = [];
-  #isModel = false;
+  #services = [];
   #extends = [];
   #provides = new Set();
   #replaces = new Set();
@@ -618,7 +647,21 @@ export class Host extends Base {
       delete data.provides;
     }
 
-    Object.assign(this, { services: {}, networkInterfaces: {} }, data);
+    if (data.services) {
+      for (const [name, sd] of Object.entries(data.services)) {
+        sd.name = name;
+        new Service(this, sd);
+      }
+      delete data.services;
+    }
+
+    for (const host of this.extends) {
+      for (const service of host.services()) {
+        service.withOwner(this);
+      }
+    }
+
+    Object.assign(this, { networkInterfaces: {} }, data);
 
     owner.addHost(this);
 
@@ -626,13 +669,6 @@ export class Host extends Base {
       iface.name = name;
       this.networkInterfaces[name] = new NetworkInterface(this, iface);
     }
-
-    for (const [name, data] of Object.entries(
-      Object.assign({}, ...this.extends.map(e => e.services), this.services)
-    )) {
-      data.name = name;
-      this.services[name] = new Service(this, data);
-    }
   }
 
   get deployment() {
@@ -648,7 +684,7 @@ export class Host extends Base {
   }
 
   get isModel() {
-    return (this.#vendor || this.#chassis) ? true : false;
+    return this.#vendor || this.#chassis ? true : false;
   }
 
   get model() {
@@ -714,6 +750,23 @@ export class Host extends Base {
     return this.hostName + "." + this.domain;
   }
 
+  addService(service) {
+    this.#services.push(service);
+  }
+
+  *services(filter) {
+    for (const service of this.#services) {
+      if (
+        !filter ||
+        filter.type === "*" ||
+        filter.type === service.type ||
+        filter.name === service.name
+      ) {
+        yield service;
+      }
+    }
+  }
+
   *networkAddresses() {
     for (const [name, networkInterface] of Object.entries(
       this.networkInterfaces
@@ -756,7 +809,7 @@ export class Host extends Base {
       ...super.toJSON(),
       extends: this.extends.map(host => host.name),
       services: Object.fromEntries(
-        Object.values(this.services).map(s => [s.name, s.toJSON()])
+        [...this.services()].map(s => [s.name, s.toJSON()])
       )
     };
   }
@@ -810,15 +863,15 @@ export class Subnet extends Base {
 }
 
 const ServiceTypes = {
-  dns: { prefix: "_dns._udp", port: 53 },
-  ldap: { prefix: "_ldap._tcp", port: 389 },
-  http: { prefix: "_http._tcp", port: 80 },
-  https: { prefix: "_http._tcp", port: 443 },
-  rtsp: { prefix: "_rtsp._tcp", port: 554 },
-  smtp: { prefix: "_smtp._tcp", port: 25 },
-  ssh: { prefix: "_ssh._tcp", port: 22 },
-  imap: { prefix: "_imap._tcp", port: 143 },
-  imaps: { prefix: "_imaps._tcp", port: 993 },
+  dns: { srvPrefix: "_dns._udp", port: 53 },
+  ldap: { srvPrefix: "_ldap._tcp", port: 389 },
+  http: { srvPrefix: "_http._tcp", port: 80 },
+  https: { srvPrefix: "_http._tcp", port: 443 },
+  rtsp: { srvPrefix: "_rtsp._tcp", port: 554 },
+  smtp: { srvPrefix: "_smtp._tcp", port: 25 },
+  ssh: { srvPrefix: "_ssh._tcp", port: 22 },
+  imap: { srvPrefix: "_imap._tcp", port: 143 },
+  imaps: { srvPrefix: "_imaps._tcp", port: 993 },
   dhcp: {}
 };
 
@@ -858,11 +911,38 @@ export class Service extends Base {
     }
 
     Object.assign(this, data);
+
     this.owner = owner;
+
+    owner.addService(this);
+  }
+
+  withOwner(owner) {
+    if (this.owner !== owner) {
+      const data = { name: this.name };
+      if (this.alias) {
+        data.alias = this.alias;
+      }
+      if (this.#type) {
+        data.type = this.#type;
+      }
+      if (this.#weight) {
+        data.weight = this.#weight;
+      }
+      if (this.#port) {
+        data.port = this.#port;
+      }
+      if (this.#ipAddress) {
+        data.ipAddress = this.#ipAddress;
+      }
+      return new this.constructor(owner, data);
+    }
+
+    return this;
   }
 
-  get prefix() {
-    return ServiceTypes[this.type]?.prefix;
+  get srvPrefix() {
+    return ServiceTypes[this.type]?.srvPrefix;
   }
 
   get ipAddress() {

package/types/model.d.mts

@@ -10,6 +10,7 @@ export class Base {
     owner: any;
     name: any;
     description: any;
+    withOwner(owner: any): any;
     get typeName(): any;
     get world(): any;
     get location(): any;
@@ -17,7 +18,7 @@ export class Base {
     network(name: any): Promise<any>;
     set directory(directory: any);
     get directory(): any;
-    get fullName(): string;
+    get fullName(): any;
     expand(object: any): any;
     error(...args: any[]): void;
     info(...args: any[]): void;
@@ -30,6 +31,8 @@ export class Owner extends Base {
     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>;
     network(name: any): any;
     networks(): AsyncGenerator<any, void, unknown>;
     addNetwork(network: any): void;
@@ -53,6 +56,7 @@ export class World extends Owner {
         [k: string]: typeof Location | typeof Host | typeof Network | typeof Subnet | typeof Service;
     };
     constructor(directory: any);
+    get fullName(): string;
     get world(): this;
     load(name: any, options: any): any;
     loadAll(): Promise<void>;
@@ -70,12 +74,11 @@ export class World extends Owner {
 }
 export class Location extends Owner {
     domain: any;
-    dns: any;
-    service(filter: any): Promise<any>;
-    services(filter: any): AsyncGenerator<any, void, unknown>;
+    ntp: {
+        servers: any[];
+    };
+    get dns(): DNSService;
     networkAddresses(): AsyncGenerator<any, void, unknown>;
-    get dnsAllowedUpdates(): any;
-    get dnsRecordTTL(): any;
     get administratorEmail(): any;
     #private;
 }
@@ -92,7 +95,6 @@ export class Network extends Owner {
 export class Host extends Base {
     static prepareData(world: any, data: any): Promise<typeof Host>;
     networkInterfaces: {};
-    services: {};
     postinstall: any[];
     get deployment(): any;
     get chassis(): any;
@@ -111,6 +113,8 @@ export class Host extends Base {
     get modelName(): any;
     get hostName(): any;
     get domainName(): string;
+    addService(service: any): void;
+    services(filter: any): Generator<any, void, unknown>;
     networkAddresses(): Generator<{
         address: any;
         networkInterface: any;
@@ -131,7 +135,7 @@ export class Subnet extends Base {
 }
 export class Service extends Base {
     alias: any;
-    get prefix(): any;
+    get srvPrefix(): any;
     get ipAddress(): any;
     get port(): any;
     get priority(): any;
@@ -140,3 +144,12 @@ export class Service extends Base {
     get type(): any;
     #private;
 }
+declare class DNSService {
+    constructor(owner: any, data: any);
+    owner: any;
+    allowedUpdates: any[];
+    recordTTL: string;
+    forwardsTo: any[];
+    services(): AsyncGenerator<any, void, any>;
+}
+export {};