pmcf 6.26.5 → 6.27.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.26.5",
+  "version": "6.27.1",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.12.0",
     "npm-pkgbuild": "^20.8.13",
-    "pacc": "^11.1.3",
+    "pacc": "^11.2.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/endpoint.mjs

@@ -1,4 +1,4 @@
-import { getAttribute, string_attribute } from "pacc";
+import { getAttribute, string_attribute, url_attribute } from "pacc";
 import { FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "pmcf";
 import { endpointAttributes, CoreService } from "./core-service.mjs";
@@ -134,6 +134,15 @@ export class Endpoint extends PortEndpoint {
 }
 
 export class DomainNameEndpoint extends PortEndpoint {
+  static name = "domain_endpoint";
+  static attributes = {
+    domainName: { ...string_attribute, name: "domainName" }
+  };
+
+  static {
+    addType(this);
+  }
+
   constructor(service, domainName, data) {
     super(service, data);
     this.domainName = domainName;
@@ -160,6 +169,15 @@ export class DomainNameEndpoint extends PortEndpoint {
  * Endpoint based on http
  */
 export class HTTPEndpoint extends BaseEndpoint {
+  static name = "url_endpoint";
+  static attributes = {
+    url: url_attribute
+  };
+
+  static {
+    addType(this);
+  }
+
   /**
    *
    * @param {Service} service
@@ -223,6 +241,15 @@ export class HTTPEndpoint extends BaseEndpoint {
 }
 
 export class UnixEndpoint extends BaseEndpoint {
+  static name = "unix_endpoint";
+  static attributes = {
+    url: url_attribute
+  };
+
+  static {
+    addType(this);
+  }
+
   constructor(service, path, data) {
     super(service, data);
     this.path = path;

package/src/services/bind.mjs

@@ -20,12 +20,11 @@ import {
 } from "pacc";
 import {
   Base,
-  ExtraSourceService,
-  serviceEndpoints,
+  CoreService,
+  Endpoint,
   addresses,
   networkAddressType,
-  addType,
-  FAMILY_DNS
+  addType
 } from "pmcf";
 import { yesno, writeLines, asArray } from "../utils.mjs";
 import {
@@ -572,11 +571,13 @@ function addressesStatement(prefix, objects, empty = false, indent = "") {
   return [];
 }
 
-export class bind extends ExtraSourceService {
+export class bind extends CoreService {
   static attributes = {
     forwarders: {
-      ...default_collection_attribute,
-      name: "forwarders"
+      ...default_collection_attribute_writable,
+      type: Endpoint,
+      name: "forwarders",
+      deferredExpression: true
     },
     groups: {
       ...default_collection_attribute_writable,
@@ -640,21 +641,18 @@ export class bind extends ExtraSourceService {
     return this.primaries ? "secondary" : "primary";
   }
 
-  get forwarders() {
-    const forwarders = serviceEndpoints(this.source, {
-      services: "services[types[dns] && priority>=100 && priority<200]",
-      endpoints: endpoint => endpoint.family !== FAMILY_DNS,
-      select: e => e.address,
-      limit: 5
-    });
-
-    return forwarders;
-  }
-
   async writeForwarders(outputControl) {
-    const forwarders = this.forwarders;
+    // TODO formulate everything as pacc expression
+    const forwarders = [...this.forwarders]
+      .map(e => e.endpoints())
+      .flat()
+      .filter(e => e.networkAddress)
+      .map(e => e.networkAddress?.address);
 
     if (forwarders.length) {
+      if (forwarders.length > 5) {
+        forwarders.length = 5;
+      }
       await writeLines(
         join(outputControl.dir, "etc/named/options"),
         `forwarders.conf`,

package/src/type.mjs

@@ -39,9 +39,13 @@ export function assign(attribute, object, value) {
     }
 
     if (attribute.deferredExpression) {
-      Object.defineProperty(object, attribute.name, {
-        get: () => object.expression(value)
-      });
+      if (object.hasOwnProperty(attribute.name)) {
+        error(`attribute ${attribute.name} of ${object.fullName} already defined`, attribute );
+      } else {
+        Object.defineProperty(object, attribute.name, {
+          get: () => object.expression(value)
+        });
+      }
       return value;
     }