pmcf 6.8.2 → 6.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.8.2",
+  "version": "6.8.4",
   "publishConfig": {
     "access": "public"
   },
@@ -52,7 +52,7 @@
   "dependencies": {
     "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.7.0",
+    "ip-utilties": "^3.7.1",
     "npm-pkgbuild": "^20.8.2",
     "pacc": "^10.4.1",
     "package-directory": "^8.2.0",

package/src/dns-utils.mjs

@@ -1,4 +1,4 @@
-import { decodeIPv4, decodeIPv6 } from "ip-utilties";
+import { decodeIPv4, decodeIPv6, FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { asIterator } from "./utils.mjs";
 
 const typeOrder = {

package/src/network-interfaces/network-interface.mjs

@@ -109,6 +109,10 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get domainNames() {
+    if(!this.host) {
+      //console.log("NO HOST",this.fullName);
+      return new Set();
+    }
     return this.hostName
       ? this.host.directDomainNames.union(
           new Set([[this.hostName, this.host.domain].join(".")])

package/src/services/bind.mjs

@@ -156,20 +156,12 @@ class bind_group extends Base {
   }
 
   async packageContent(outputControl) {
-    let hasContent = false;
-
-    if (this.access.length) {
-      hasContent ||= await this.generateACLs(outputControl);
-    }
-
-    if (this.entries.length) {
-      hasContent ||= await this.generateZoneDefs(outputControl, this.entries);
-    }
-
-    return hasContent;
+    return await this.generateACLs(outputControl) && await this.generateZoneDefs(outputControl, this.entries);
   }
 
   async generateACLs(outputControl) {
+    console.log("generateACLs", this.name);
+
     const acls = addressesStatement(
       `acl ${this.name}`,
       addresses(this.access, { aggregate: true })
@@ -181,12 +173,16 @@ class bind_group extends Base {
         `0-acl-${this.name}.conf`,
         acls
       );
+
+      return true;
     }
 
-    return acls.length > 0;
+    return false;
   }
 
   async generateZoneDefs(outputControl, sources) {
+    console.log("generateZoneDefs", this.name);
+
     for (const source of sources) {
       console.log(
         "ZONE",
@@ -195,7 +191,7 @@ class bind_group extends Base {
       );
 
       for (const domain of source.localDomains) {
-        const locationName = source.owner.name;
+        const locationName = source.name;
         const reverseZones = new Map();
 
         const config = {
@@ -504,18 +500,16 @@ export class bind extends ExtraSourceService {
   }
 
   async *preparePackages(dir) {
-    const basePackageDir = dir;
     const packageData = this.packageData;
-    packageData.sources.push(new FileContentProvider(basePackageDir));
+    packageData.sources.push(new FileContentProvider(dir));
 
-    const outputControl = newOutputControl(packageData, basePackageDir);
+    const outputControl = newOutputControl(packageData, dir);
 
     let hasContent = false;
 
-    console.log("BIND GROUPS", [...this.groups.keys()]);
-
     for (const group of this.groups.values()) {
-      hasContent ||= await group.packageContent(outputControl);
+      const present = await group.packageContent(outputControl);
+      hasContent ||= present;
     }
 
     hasContent ||= await this.writeForwarders(outputControl);

package/src/services/chrony.mjs

@@ -40,7 +40,7 @@ export class chrony extends ExtraSourceService {
     const packageData = this.packageData;
     packageData.sources.push(new FileContentProvider(dir + "/"));
 
-    const subnets = [...new Set([...this.subnets.values()])]; // TODO should be normal
+    const subnets = [...new Map(this.subnets).values()]; // TODO should be normal
     const host = this.host;
 
     const lines = [

package/src/services/kea.mjs

@@ -147,13 +147,13 @@ export class kea extends CoreService {
     const source = host.owner;
     const name = host.name;
 
-    const subnets = [
-      ...new Set(
-        [...this.subnets.values()].filter(
-          s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
-        )
-      )
-    ]; // TODO should be normal
+    const subnets = [...new Map(this.subnets).values()].filter(
+      s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
+    ); // TODO should be normal
+    /*console.log(
+      "SUBNETS",
+      subnets.map(s => s.fullName)
+    );*/
 
     //console.log(source.fullName, [...source.hosts.keys()]);
 

package/src/services/mosquitto.mjs

@@ -45,6 +45,7 @@ export class mosquitto extends CoreService {
   }
 
   async *preparePackages(dir) {
+    /*
     const pm = this.root.named("/services/primary-SW/mosquitto");
     const wd = [...this.walkDirections(["this", "extends"])];
 
@@ -55,7 +56,7 @@ export class mosquitto extends CoreService {
       pm.fullName,
       [...pm.extends].map(n => n.fullName),
       wd.map(n => [n.fullName, n.directory])
-    );
+    );*/
 
     const permissions = this.packageContentPermissions;
     const packageData = this.packageData;