pmcf 1.45.0 → 1.45.2

package/bin/pmcf-named-defs

@@ -69,6 +69,7 @@ async function generateNamedDefs(owner, targetDir) {
       rname,
       subnets.map(s => `${s.owner.name}/${s.name}`)
     );
+    const reverseZones = new Map();
 
     const SOARecord = createRecord(
       "@",
@@ -135,28 +136,28 @@ async function generateNamedDefs(owner, targetDir) {
             );
           }
         }
-      }
 
-      let reverseZone = subnet?.reverseZone;
-
-      if (subnet && !reverseZone) {
-        const reverseArpa = reverseArpaAddress(subnet.prefix);
-        reverseZone = {
-          id: reverseArpa,
-          file: `${reverseArpa}.zone`,
-          records: new Set([SOARecord, NSRecord])
-        };
-        zones.push(reverseZone);
-        subnet.reverseZone = reverseZone;
-      }
-      if (reverseZone) {
-        reverseZone.records.add(
-          createRecord(
-            fullName(reverseArpaAddress(address)),
-            "PTR",
-            fullName(networkInterface.host.domainName)
-          )
-        );
+        if (subnet) {
+          let reverseZone = reverseZones.get(subnet.address);
+
+          if (!reverseZone) {
+            const reverseArpa = reverseArpaAddress(subnet.prefix);
+            reverseZone = {
+              id: reverseArpa,
+              file: `${reverseArpa}.zone`,
+              records: new Set([SOARecord, NSRecord])
+            };
+            zones.push(reverseZone);
+            reverseZones.set(subnet.address, reverseZone);
+          }
+          reverseZone.records.add(
+            createRecord(
+              fullName(reverseArpaAddress(address)),
+              "PTR",
+              fullName(host.domainName)
+            )
+          );
+        }
       }
     }
 

package/package.json

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

package/src/base.mjs

@@ -70,15 +70,18 @@ export class Base {
       const slot = data[slotName];
       if (slot) {
         delete data[slotName];
+
+        const type = typeof typeDef.type === "string" ? typesByName[typeDef.type] : typeDef.type;
+
         if (typeDef.collection) {
           if (Array.isArray(slot) || typeof slot === "string") {
             for (const item of asArray(slot)) {
-              new typesByName[typeDef.type](this, item);
+              new type(this, item);
             }
           } else {
             for (const [objectName, objectData] of Object.entries(slot)) {
               objectData.name = objectName;
-              new typesByName[typeDef.type](this, objectData);
+              new type(this, objectData);
             }
           }
         } else {
@@ -92,7 +95,7 @@ export class Base {
               break;
 
             default:
-              this[slotName] = new typesByName[typeDef.type](this, slot);
+              this[slotName] = new type(this, slot);
           }
         }
       }

package/src/host.mjs

@@ -1,5 +1,6 @@
 import { Base } from "./base.mjs";
 import { Network } from "./network.mjs";
+import { Service } from "./service.mjs";
 import {
   asArray,
   isIPv4Address,
@@ -34,14 +35,17 @@ export class Host extends Base {
       extends: Base,
       properties: {
         networkInterfaces: { type: "network_interface", collection: true },
-        services: { type: "service", collection: true },
+        services: { type: Service, collection: true },
         os: { type: "string" },
         distribution: { type: "string" },
         deployment: { type: "string" },
         master: { type: "boolean" },
         model: { type: "string" },
         replaces: { type: "string" },
-        depends: { type: "string" }
+        depends: { type: "string" },
+        cidrAddresses: { type: "string", collection: true, writeable: false },
+        rawAddresses: { type: "string", collection: true, writeable: false },
+        rawAddress: { type: "string", writeable: false }
       }
     };
   }
@@ -305,9 +309,9 @@ export class NetworkInterface extends Base {
         ssid: { type: "string" },
         psk: { type: "string" },
         metric: { type: "number" },
-        cidrAddresses: { type: "string", collection: true },
-        rawAddress: { type: "string"},
-        network: {},
+        cidrAddresses: { type: "string", collection: true, writeable: false },
+        rawAddresses: { type: "string", collection: true, writeable: false },
+        network: { type: "network" },
         gateway: {},
         arpbridge: {}
       }

package/src/location.mjs

@@ -1,4 +1,9 @@
 import { Owner } from "./owner.mjs";
+import { Network } from "./network.mjs";
+import { Subnet } from "./subnet.mjs";
+import { Host } from "./host.mjs";
+import { DNSService } from "./dns.mjs";
+import { Cluster } from "./cluster.mjs";
 import { addType } from "./types.mjs";
 
 export class Location extends Owner {
@@ -11,11 +16,11 @@ export class Location extends Owner {
       name: "location",
       extends: Owner,
       properties: {
-        networks: { type: "network", collection: true },
-        hosts: { type: "host", collection: true },
-        clusters: { type: "cluster", collection: true },
-        subnets: { type: "subnet", collection: true },
-        dns: { type: "dns", collection: false },
+        networks: { type: Network, collection: true },
+        hosts: { type: Host, collection: true },
+        clusters: { type: Cluster, collection: true },
+        subnets: { type: Subnet, collection: true },
+        dns: { type: DNSService },
         country: { type: "string" }
       }
     };

package/src/network.mjs

@@ -1,5 +1,6 @@
 import { Owner } from "./owner.mjs";
 import { Subnet } from "./subnet.mjs";
+import { Host } from "./host.mjs";
 import { addType } from "./types.mjs";
 
 export class Network extends Owner {
@@ -19,12 +20,11 @@ export class Network extends Owner {
       extends: Owner,
       properties: {
         networks: { type: "network", collection: true },
-        hosts: { type: "host", collection: true },
+        hosts: { type: Host, collection: true },
         clusters: { type: "cluster", collection: true },
-        subnets: { type: "subnet", collection: true },
+        subnets: { type: Subnet, collection: true },
         dns: { type: "dns", collection: false },
         //metric: { type: "number" }
-
         /*kind: { type: "string" },
         scope: { type: "string" },
         /*bridge: {},

package/src/owner.mjs

@@ -2,6 +2,7 @@ import { asArray, normalizeCIDR } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet } from "./subnet.mjs";
 import { addType } from "./types.mjs";
+import { DNSService } from "./dns.mjs";
 
 export class Owner extends Base {
   #membersByType = new Map();
@@ -22,8 +23,8 @@ export class Owner extends Base {
         networks: { type: "network", collection: true },
         hosts: { type: "host", collection: true },
         clusters: { type: "cluster", collection: true },
-        subnets: { type: "subnet", collection: true },
-        dns: { type: "dns", collection: false },
+        subnets: { type: Subnet, collection: true },
+        dns: { type: DNSService, collection: false },
         domain: { type: "string" },
         administratorEmail: { type: "string" }
       }

package/src/service.mjs

@@ -31,8 +31,8 @@ export class Service extends Base {
       name: "service",
       extends: Base,
       properties: {
-        ipAddresses: {},
-        addresses: {},
+        ipAddresses: { type: "string", collection: true },
+        addresses: { type: "string", collection: true },
         port: { type: "number" },
         protocol: { type: "string" },
         alias: { type: "string" },

package/types/host.d.mts

@@ -8,7 +8,7 @@ export class Host extends Base {
                 collection: boolean;
             };
             services: {
-                type: string;
+                type: typeof Service;
                 collection: boolean;
             };
             os: {
@@ -32,6 +32,20 @@ export class Host extends Base {
             depends: {
                 type: string;
             };
+            cidrAddresses: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            rawAddresses: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            rawAddress: {
+                type: string;
+                writeable: boolean;
+            };
         };
     };
     static prepareData(root: any, data: any): Promise<typeof Host>;
@@ -97,11 +111,16 @@ export class NetworkInterface extends Base {
             cidrAddresses: {
                 type: string;
                 collection: boolean;
+                writeable: boolean;
             };
-            rawAddress: {
+            rawAddresses: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            network: {
                 type: string;
             };
-            network: {};
             gateway: {};
             arpbridge: {};
         };
@@ -128,3 +147,4 @@ export class NetworkInterface extends Base {
     #private;
 }
 import { Base } from "./base.mjs";
+import { Service } from "./service.mjs";

package/types/location.d.mts

@@ -4,24 +4,23 @@ export class Location extends Owner {
         extends: typeof Owner;
         properties: {
             networks: {
-                type: string;
+                type: typeof Network;
                 collection: boolean;
             };
             hosts: {
-                type: string;
+                type: typeof Host;
                 collection: boolean;
             };
             clusters: {
-                type: string;
+                type: typeof Cluster;
                 collection: boolean;
             };
             subnets: {
-                type: string;
+                type: typeof Subnet;
                 collection: boolean;
             };
             dns: {
-                type: string;
-                collection: boolean;
+                type: typeof DNSService;
             };
             country: {
                 type: string;
@@ -31,3 +30,8 @@ export class Location extends Owner {
     get location(): this;
 }
 import { Owner } from "./owner.mjs";
+import { Network } from "./network.mjs";
+import { Host } from "./host.mjs";
+import { Cluster } from "./cluster.mjs";
+import { Subnet } from "./subnet.mjs";
+import { DNSService } from "./dns.mjs";

package/types/network.d.mts

@@ -8,7 +8,7 @@ export class Network extends Owner {
                 collection: boolean;
             };
             hosts: {
-                type: string;
+                type: typeof Host;
                 collection: boolean;
             };
             clusters: {
@@ -16,7 +16,7 @@ export class Network extends Owner {
                 collection: boolean;
             };
             subnets: {
-                type: string;
+                type: typeof Subnet;
                 collection: boolean;
             };
             dns: {
@@ -36,3 +36,5 @@ export class Network extends Owner {
     #private;
 }
 import { Owner } from "./owner.mjs";
+import { Host } from "./host.mjs";
+import { Subnet } from "./subnet.mjs";

package/types/owner.d.mts

@@ -16,11 +16,11 @@ export class Owner extends Base {
                 collection: boolean;
             };
             subnets: {
-                type: string;
+                type: typeof Subnet;
                 collection: boolean;
             };
             dns: {
-                type: string;
+                type: typeof DNSService;
                 collection: boolean;
             };
             domain: {
@@ -64,3 +64,5 @@ export class Owner extends Base {
     #private;
 }
 import { Base } from "./base.mjs";
+import { Subnet } from "./subnet.mjs";
+import { DNSService } from "./dns.mjs";

package/types/service.d.mts

@@ -3,8 +3,14 @@ export class Service extends Base {
         name: string;
         extends: typeof Base;
         properties: {
-            ipAddresses: {};
-            addresses: {};
+            ipAddresses: {
+                type: string;
+                collection: boolean;
+            };
+            addresses: {
+                type: string;
+                collection: boolean;
+            };
             port: {
                 type: string;
             };