pmcf 1.23.4 → 1.24.0

package/bin/pmcf-named-defs

@@ -16,8 +16,6 @@ const updates = [
   60000
 ].join(" ");
 
-const NAME_LEN = 35;
-
 await generateNamedDefs(owner, options.output);
 
 console.log("depends", "mf-named");
@@ -35,13 +33,15 @@ async function generateNamedDefs(owner, targetDir) {
     const nameserver = (await owner.service({ type: "dns" }))?.owner;
     const rname = dns.administratorEmail.replace(/@/, ".");
 
+    let maxKeyLength;
+
     const createRecord = (key, type, value) => {
       return {
         key,
         type,
         value,
         toString: () =>
-          `${key.padEnd(NAME_LEN, " ")} ${ttl} IN ${type} ${value}`
+          `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(5, " ")} ${value}`
       };
     };
 
@@ -148,7 +148,7 @@ async function generateNamedDefs(owner, targetDir) {
       if (zone !== catalogZone) {
         const hash = createHmac("md5", zone.id).digest("hex");
         catalogZone.records.add(
-          `${hash}.zones.${domain}. IN PTR   ${zone.id}.`
+          createRecord(`${hash}.zones.${domain}.`, "PTR", `${zone.id}.`)
         );
       }
 
@@ -165,6 +165,13 @@ async function generateNamedDefs(owner, targetDir) {
       zoneConfig.push(`};`);
       zoneConfig.push("");
 
+      maxKeyLength = 0;
+      for (const r of zone.records) {
+        if (r.key.length > maxKeyLength) {
+          maxKeyLength = r.key.length;
+        }
+      }
+
       writeLines(join(targetDir, "var/lib/named"), zone.file, zone.records);
     }
 

package/package.json

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

package/src/model.mjs

@@ -7,6 +7,7 @@ import {
   isIPv6Address
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
+import { Service } from "./service.mjs";
 import { DNSService } from "./dns.mjs";
 
 export class Owner extends Base {
@@ -386,10 +387,10 @@ export class Network extends Owner {
     this.bridge = owner.addBridge(this, bridge);
   }
 
-  get ipv4_netmask() {
+  get netmask() {
     const m = this.ipv4?.match(/\/(\d+)$/);
     if (m) {
-      return m[1];
+      return parseInt(m[1]);
     }
   }
 
@@ -406,6 +407,7 @@ export class Network extends Owner {
       ...super.propertyNames,
       "kind",
       "ipv4",
+      "netmask",
       "scope",
       "metric",
       "bridge"
@@ -764,7 +766,7 @@ export class NetworkInterface extends Base {
 
   get ipAddressesWithNetmask() {
     return this.#ipAddresses.map(a =>
-      isIPv4Address(a) ? `${a}/${this.network.ipv4_netmask}` : a
+      isIPv4Address(a) ? `${a}/${this.network.netmask}` : a
     );
   }
 
@@ -855,137 +857,6 @@ export class Subnet extends Base {
   }
 }
 
-const ServiceTypes = {
-  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: {}
-};
-
-export class Service extends Base {
-  alias;
-  #weight;
-  #priority;
-  #type;
-  #port;
-  #ipAddresses;
-
-  static get typeName() {
-    return "service";
-  }
-
-  constructor(owner, data) {
-    super(owner, data);
-    if (data.weight !== undefined) {
-      this.#weight = data.weight;
-      delete data.weight;
-    }
-    if (data.priority !== undefined) {
-      this.#priority = data.priority;
-      delete data.priority;
-    }
-    if (data.type) {
-      this.#type = data.type;
-      delete data.type;
-    }
-    if (data.port !== undefined) {
-      this.#port = data.port;
-      delete data.port;
-    }
-    if (data.ipAddresses) {
-      this.#ipAddresses = data.ipAddresses;
-      delete data.ipAddresses;
-    }
-
-    Object.assign(this, data);
-
-    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.#ipAddresses) {
-        data.ipAddresses = this.#ipAddresses;
-      }
-      return new this.constructor(owner, data);
-    }
-
-    return this;
-  }
-
-  get protocol() {
-    return ServiceTypes[this.type]?.protocol;
-  }
-
-  get srvPrefix() {
-    const st = ServiceTypes[this.type];
-    if (st) {
-      return `_${this.type}._${st.protocol}`;
-    }
-  }
-
-  get ipAddresses() {
-    return this.#ipAddresses || this.owner.ipAddresses;
-  }
-
-  get addresses() {
-    return this.ipAddresses.map(a => `${a}:${this.port}`);
-  }
-
-  get port() {
-    return this.#port || ServiceTypes[this.type]?.port;
-  }
-
-  get priority() {
-    return this.#priority || this.owner.priority || 99;
-  }
-
-  get weight() {
-    return this.#weight || this.owner.weight || 0;
-  }
-
-  get master() {
-    return this.owner.master;
-  }
-
-  get type() {
-    return this.#type || this.name;
-  }
-
-  get propertyNames() {
-    return [
-      ...super.propertyNames,
-      "ipAddresses",
-      "addresses",
-      "port",
-      "protocol",
-      "alias",
-      "type",
-      "master",
-      "priority",
-      "weight"
-    ];
-  }
-}
 
 const _types = [Location, Network, Subnet, Host, Service, DNSService];
 const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));

package/src/module.mjs

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

package/src/service.mjs

@@ -0,0 +1,133 @@
+import { Base } from "./base.mjs";
+
+const ServiceTypes = {
+  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: {}
+};
+
+export class Service extends Base {
+  alias;
+  #weight;
+  #priority;
+  #type;
+  #port;
+  #ipAddresses;
+
+  static get typeName() {
+    return "service";
+  }
+
+  constructor(owner, data) {
+    super(owner, data);
+    if (data.weight !== undefined) {
+      this.#weight = data.weight;
+      delete data.weight;
+    }
+    if (data.priority !== undefined) {
+      this.#priority = data.priority;
+      delete data.priority;
+    }
+    if (data.type) {
+      this.#type = data.type;
+      delete data.type;
+    }
+    if (data.port !== undefined) {
+      this.#port = data.port;
+      delete data.port;
+    }
+    if (data.ipAddresses) {
+      this.#ipAddresses = data.ipAddresses;
+      delete data.ipAddresses;
+    }
+
+    Object.assign(this, data);
+
+    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.#ipAddresses) {
+        data.ipAddresses = this.#ipAddresses;
+      }
+      return new this.constructor(owner, data);
+    }
+
+    return this;
+  }
+
+  get protocol() {
+    return ServiceTypes[this.type]?.protocol;
+  }
+
+  get srvPrefix() {
+    const st = ServiceTypes[this.type];
+    if (st?.protocol) {
+      return `_${this.type}._${st.protocol}`;
+    }
+  }
+
+  get ipAddresses() {
+    return this.#ipAddresses || this.owner.ipAddresses;
+  }
+
+  get addresses() {
+    return this.ipAddresses.map(a => `${a}:${this.port}`);
+  }
+
+  get port() {
+    return this.#port || ServiceTypes[this.type]?.port;
+  }
+
+  get priority() {
+    return this.#priority || this.owner.priority || 99;
+  }
+
+  get weight() {
+    return this.#weight || this.owner.weight || 0;
+  }
+
+  get master() {
+    return this.owner.master;
+  }
+
+  get type() {
+    return this.#type || this.name;
+  }
+
+  get propertyNames() {
+    return [
+      ...super.propertyNames,
+      "ipAddresses",
+      "addresses",
+      "port",
+      "protocol",
+      "alias",
+      "type",
+      "master",
+      "priority",
+      "weight"
+    ];
+  }
+}

package/types/model.d.mts

@@ -28,7 +28,7 @@ export class Owner extends Base {
 }
 export class World extends Owner {
     static get types(): {
-        [k: string]: typeof DNSService | typeof Network | typeof Host | typeof Location | typeof Subnet | typeof Service;
+        [k: string]: typeof Service | typeof DNSService | typeof Network | typeof Host | typeof Location | typeof Subnet;
     };
     constructor(directory: any);
     get fullName(): string;
@@ -51,7 +51,7 @@ export class Network extends Owner {
     ipv4: any;
     subnet: any;
     bridge: any;
-    get ipv4_netmask(): any;
+    get netmask(): number;
     get subnetAddress(): any;
 }
 export class Host extends Base {
@@ -112,18 +112,6 @@ export class Subnet extends Base {
     networks: Set<any>;
     get address(): any;
 }
-export class Service extends Base {
-    alias: any;
-    get protocol(): any;
-    get srvPrefix(): string;
-    get ipAddresses(): any;
-    get addresses(): any;
-    get port(): any;
-    get priority(): any;
-    get weight(): any;
-    get master(): any;
-    get type(): any;
-    #private;
-}
 import { Base } from "./base.mjs";
 import { DNSService } from "./dns.mjs";
+import { Service } from "./service.mjs";

package/types/module.d.mts

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

package/types/service.d.mts

@@ -0,0 +1,14 @@
+export class Service extends Base {
+    alias: any;
+    get protocol(): any;
+    get srvPrefix(): string;
+    get ipAddresses(): any;
+    get addresses(): any;
+    get port(): any;
+    get priority(): any;
+    get weight(): any;
+    get master(): any;
+    get type(): any;
+    #private;
+}
+import { Base } from "./base.mjs";