pmcf 1.10.0 → 1.12.0

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 = [];
@@ -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.10.0",
+  "version": "1.12.0",
   "publishConfig": {
     "access": "public"
   },

package/src/model.mjs

@@ -148,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);
   }
@@ -396,7 +415,11 @@ export class World extends Owner {
 
 class DNSService {
   owner;
+
+  allowedUpdates = [];
+  recordTTL = "1W";
   forwardsTo = [];
+
   constructor(owner, data) {
     this.owner = owner;
     Object.assign(this, data);
@@ -408,9 +431,8 @@ class DNSService {
     yield* this.owner.services(filter);
 
     for (const s of this.forwardsTo) {
-      const host = await this.owner.world.load(s);
-
-      yield* host.services(filter);
+      const owner = await this.owner.world.load(s);
+      yield* owner.services(filter);
     }
   }
 }
@@ -459,24 +481,6 @@ export class Location extends Owner {
     return this.#dns;
   }
 
-  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;
-      }
-    }
-  }
 
   async *networkAddresses() {
     for await (const host of this.hosts()) {
@@ -486,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;
   }
@@ -867,15 +863,15 @@ export class Subnet extends Base {
 }
 
 const ServiceTypes = {
-  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 },
+  dns: { protocol: "udp", port: 53 },
+  ldap: { protocol: "tcp", port: 389 },
+  http: { protocol: "tcp", port: 80 },
+  https: { protocol: "tcp", port: 443 },
+  rtsp: { protocol: "tcp", port: 554 },
+  smtp: { protocol: "tcp", port: 25 },
+  ssh: { protocol: "tcp", port: 22 },
+  imap: { protocol: "tcp", port: 143 },
+  imaps: { protocol: "tcp", port: 993 },
   dhcp: {}
 };
 
@@ -945,8 +941,16 @@ export class Service extends Base {
     return this;
   }
 
+  get protocol()
+  {
+    return ServiceTypes[this.type]?.protocol;
+  }
+  
   get srvPrefix() {
-    return ServiceTypes[this.type]?.srvPrefix;
+    const st = ServiceTypes[this.type];
+    if(st) {
+      return `_${this.type}._${st.protocol}`;
+    }
   }
 
   get ipAddress() {
@@ -977,6 +981,8 @@ export class Service extends Base {
     return [
       ...super.propertyNames,
       "ipAddress",
+      "port",
+      "protocol",
       "alias",
       "type",
       "master",

package/types/model.d.mts

@@ -31,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;
@@ -76,11 +78,7 @@ export class Location extends Owner {
         servers: any[];
     };
     get dns(): DNSService;
-    service(filter: any): Promise<any>;
-    services(filter: any): AsyncGenerator<any, void, unknown>;
     networkAddresses(): AsyncGenerator<any, void, unknown>;
-    get dnsAllowedUpdates(): any;
-    get dnsRecordTTL(): any;
     get administratorEmail(): any;
     #private;
 }
@@ -137,7 +135,8 @@ export class Subnet extends Base {
 }
 export class Service extends Base {
     alias: any;
-    get srvPrefix(): any;
+    get protocol(): any;
+    get srvPrefix(): string;
     get ipAddress(): any;
     get port(): any;
     get priority(): any;
@@ -149,6 +148,8 @@ export class Service extends Base {
 declare class DNSService {
     constructor(owner: any, data: any);
     owner: any;
+    allowedUpdates: any[];
+    recordTTL: string;
     forwardsTo: any[];
     services(): AsyncGenerator<any, void, any>;
 }