pmcf 3.20.3 → 3.21.1

package/README.md

@@ -42,23 +42,22 @@ generates config packages for:
 
 *   [Base](#base)
     *   [Parameters](#parameters)
+    *   [getProperties](#getproperties)
+        *   [Parameters](#parameters-1)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-1)
-    *   [findService](#findservice)
         *   [Parameters](#parameters-2)
-    *   [expand](#expand)
+    *   [findService](#findservice)
         *   [Parameters](#parameters-3)
+    *   [expand](#expand)
+        *   [Parameters](#parameters-4)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-5)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-6)
     *   [port](#port-1)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-6)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -76,23 +75,26 @@ generates config packages for:
     *   [Parameters](#parameters-10)
 *   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-11)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-12)
 *   [isTemplate](#istemplate)
 *   [services](#services)
-    *   [Parameters](#parameters-12)
-*   [named](#named)
     *   [Parameters](#parameters-13)
-*   [serviceEndpoints](#serviceendpoints)
+*   [named](#named)
     *   [Parameters](#parameters-14)
-*   [domainName](#domainname)
+*   [serviceEndpoints](#serviceendpoints)
     *   [Parameters](#parameters-15)
-*   [domainFromDominName](#domainfromdominname)
+*   [domainName](#domainname)
     *   [Parameters](#parameters-16)
-*   [sectionLines](#sectionlines)
+*   [domainFromDominName](#domainfromdominname)
     *   [Parameters](#parameters-17)
-*   [asArray](#asarray)
+*   [sectionLines](#sectionlines)
     *   [Parameters](#parameters-18)
-*   [asIterator](#asiterator)
+*   [asArray](#asarray)
     *   [Parameters](#parameters-19)
+*   [asIterator](#asiterator)
+    *   [Parameters](#parameters-20)
 
 ## Base
 
@@ -101,6 +103,16 @@ generates config packages for:
 *   `owner` **[Base](#base)** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
 
+### getProperties
+
+Retrive attribute values from an object.
+
+#### Parameters
+
+*   `filter`   (optional, default `filterPublic`)
+
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** values
+
 ### priority
 
 Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** 
@@ -165,18 +177,6 @@ Endpoint based on http
 
 Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** 
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## SystemdJournalRemoteService
 
 **Extends Service**
@@ -252,6 +252,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## isTemplate
 
 Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.20.3",
+  "version": "3.21.1",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
   "dependencies": {
     "ip-utilties": "^2.0.2",
     "npm-pkgbuild": "^19.1.3",
-    "pacc": "^7.0.3",
+    "pacc": "^7.1.0",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -6,6 +6,8 @@ import {
   parse,
   globals,
   expand,
+  toExternal,
+  filterPublic,
   attributeIterator,
   default_attribute,
   name_attribute_writable,
@@ -16,6 +18,7 @@ import {
   description_attribute_writable,
   boolean_attribute_writable
 } from "pacc";
+
 import { asArray } from "./utils.mjs";
 
 /**
@@ -282,8 +285,7 @@ export class Base {
     }*/
   }
 
-  _applyExtends() {
-  }
+  _applyExtends() {}
 
   set extends(value) {
     this._extends.push(value);
@@ -376,6 +378,35 @@ export class Base {
     return this._extendedProperty(propertyName, new Set());
   }
 
+  /**
+   * Retrive attribute values from an object.
+   * @return {Object} values
+   */
+  getProperties(filter = filterPublic) {
+    const result = {};
+
+    for (
+      let typeDefinition = this.constructor.typeDefinition;
+      typeDefinition;
+      typeDefinition = typeDefinition.extends
+    ) {
+      for (const [path, def] of attributeIterator(
+        typeDefinition.attributes,
+        filter
+      )) {
+        const name = path.join(".");
+
+        let value = this.extendedProperty(name);
+
+        if (value !== undefined) {
+          result[def.externalName ?? name] = toExternal(value, def);
+        }
+      }
+    }
+
+    return result;
+  }
+
   get root() {
     return this.owner.root;
   }
@@ -516,7 +547,7 @@ export class Base {
   }
 
   get isTemplate() {
-    return  this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false;
+    return this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false;
   }
 
   get properties() {
@@ -654,10 +685,10 @@ export function extractFrom(
   const json = {};
 
   do {
-    for (const [path, def] of attributeIterator(typeDefinition.attributes)) {
-      if (def.private) {
-        continue;
-      }
+    for (const [path, def] of attributeIterator(
+      typeDefinition.attributes,
+      filterPublic
+    )) {
       const name = path.join(".");
       let value = object[name];
 

package/src/host.mjs

@@ -119,15 +119,12 @@ export class Host extends ServiceOwner {
   _applyExtends(host) {
     super._applyExtends(host);
     for (const [name, ni] of host.networkInterfaces) {
-      if (!ni.isTemplate) {
-        let present = this._networkInterfaces.get(name);
-
-        if (!present) {
-          present = ni.forOwner(this);
-          this._networkInterfaces.set(name, present);
-        }
+      const present = this._networkInterfaces.get(name);
 
+      if (present) {
         present.extends.push(ni);
+      } else {
+        this._networkInterfaces.set(name, ni.forOwner(this));
       }
     }
   }

package/src/services/systemd-journal-remote.mjs

@@ -1,10 +1,10 @@
 import {
-  getAttributesJSON,
   addType,
   string_attribute_writable,
   boolean_attribute_writable
 } from "pacc";
 import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
+import { filterConfigurable } from "../utils.mjs";
 
 const SystemdJournalRemoteServiceTypeDefinition = {
   name: "systemd-journal-remote",
@@ -14,59 +14,66 @@ const SystemdJournalRemoteServiceTypeDefinition = {
   key: "name",
   attributes: {
     Seal: {
-      ...boolean_attribute_writable
+      ...boolean_attribute_writable,
+      configurable: true
     },
     SplitMode: {
       ...string_attribute_writable,
-      values: [false, "host"]
+      values: [false, "host"],
+      configurable: true
     },
     ServerKeyFile: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
       //   default: "/etc/ssl/private/journal-upload.pem"
     },
     ServerCertificateFile: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
       //   default: "/etc/ssl/certs/journal-upload.pem"
     },
     TrustedCertificateFile: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
       //  default: "/etc/ssl/ca/trusted.pem"
     },
     MaxUse: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     KeepFree: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     MaxFileSize: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     MaxFiles: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     Compression: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
       //   default: "zstd lz4 xz"
     }
   },
-
   service: {
-    services: {
-      endpoints: [
-        {
-          family: "IPv4",
-          port: 19532,
-          protocol: "tcp",
-          tls: false
-        },
-        {
-          family: "IPv6",
-          port: 19532,
-          protocol: "tcp",
-          tls: false
-        }
-      ]
-    }
+    endpoints: [
+      {
+        family: "IPv4",
+        port: 19532,
+        protocol: "tcp",
+        tls: false
+      },
+      {
+        family: "IPv6",
+        port: 19532,
+        protocol: "tcp",
+        tls: false
+      }
+    ]
   }
 };
 
@@ -102,23 +109,7 @@ export class SystemdJournalRemoteService extends Service {
       {
         serviceName: "systemd-journal-remote.service",
         configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
-        content: [
-          "Remote",
-          {
-            ...getAttributesJSON(
-              this,
-              SystemdJournalRemoteServiceTypeDefinition.attributes
-            ),
-            // TODO extendet properties with getAttribute()
-            ...Object.fromEntries(
-              Object.entries(
-                SystemdJournalRemoteServiceTypeDefinition.attributes
-              )
-                .map(([k, v]) => [k, this.extendedProperty(k)])
-                .filter(([k, v]) => v !== undefined)
-            )
-          }
-        ]
+        content: ["Remote", this.getProperties(filterConfigurable)]
       }
     ];
   }

package/src/services/systemd-journal-upload.mjs

@@ -1,10 +1,10 @@
 import {
   string_attribute_writable,
   boolean_attribute_writable,
-  addType,
-  getAttributesJSON
+  addType
 } from "pacc";
 import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
+import { filterConfigurable } from "../utils.mjs";
 
 const SystemdJournalUploadServiceTypeDefinition = {
   name: "systemd-journal-upload",
@@ -13,28 +13,34 @@ const SystemdJournalUploadServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-    URL: string_attribute_writable,
+    URL: { ...string_attribute_writable, configurable: true },
     ServerKeyFile: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
       //   default: "/etc/ssl/private/journal-upload.pem"
     },
     ServerCertificateFile: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
       //   default: "/etc/ssl/certs/journal-upload.pem"
     },
     TrustedCertificateFile: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
       //  default: "/etc/ssl/ca/trusted.pem"
     },
     Compression: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
       //   default: "zstd lz4 xz"
     },
     ForceCompression: {
-      ...boolean_attribute_writable
+      ...boolean_attribute_writable,
+      configurable: true
       //   default: false
     }
-  }
+  },
+  service: {}
 };
 
 /**
@@ -69,21 +75,7 @@ export class SystemdJournalUploadService extends Service {
     return {
       serviceName: "systemd-journal-upload.service",
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,
-      content: [
-        "Upload",
-        {
-          ...getAttributesJSON(
-            this,
-            SystemdJournalUploadServiceTypeDefinition.attributes
-          ),
-          // TODO extendet properties with getAttribute()
-          ...Object.fromEntries(
-            Object.entries(SystemdJournalUploadServiceTypeDefinition.attributes)
-              .map(([k, v]) => [k, this.extendedProperty(k)])
-              .filter(([k, v]) => v !== undefined)
-          )
-        }
-      ]
+      content: ["Upload", this.getProperties(filterConfigurable)]
     };
   }
 }

package/src/services/systemd-journal.mjs

@@ -1,10 +1,10 @@
 import {
   addType,
-  getAttributesJSON,
   string_attribute_writable,
   duration_attribute_writable
 } from "pacc";
-import { Service, ServiceTypeDefinition } from "pmcf";
+import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
+import { filterConfigurable } from "../utils.mjs";
 
 const SystemdJournalServiceTypeDefinition = {
   name: "systemd-journal",
@@ -14,80 +14,105 @@ const SystemdJournalServiceTypeDefinition = {
   key: "name",
   attributes: {
     Storage: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     Seal: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     SplitMode: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     SyncIntervalSec: {
-      ...duration_attribute_writable
+      ...duration_attribute_writable,
+      configurable: true
     },
     RateLimitIntervalSec: {
-      ...duration_attribute_writable
+      ...duration_attribute_writable,
+      configurable: true
     },
     RateLimitBurst: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     SystemMaxUse: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     SystemKeepFree: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     SystemMaxFileSize: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     SystemMaxFiles: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     RuntimeMaxUse: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     RuntimeKeepFree: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     RuntimeMaxFileSize: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     RuntimeMaxFiles: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     MaxRetentionSec: {
-      ...duration_attribute_writable
+      ...duration_attribute_writable,
+      configurable: true
     },
     MaxFileSec: {
-      ...duration_attribute_writable
+      ...duration_attribute_writable,
+      configurable: true
     },
     ForwardToSyslog: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     ForwardToKMsg: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     ForwardToConsole: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     ForwardToWall: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     TTYPath: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     MaxLevelStore: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     },
     Compress: {
-      ...string_attribute_writable
+      ...string_attribute_writable,
+      configurable: true
     }
-  }
+  },
+  service: {}
 };
 
 export class SystemdJournalService extends Service {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {
@@ -104,22 +129,9 @@ export class SystemdJournalService extends Service {
 
   systemdConfigs(name) {
     return {
-      serviceName: "systemd-journald",
+      serviceName: "systemd-journald.service",
       configFileName: `etc/systemd/journal.conf.d/${name}.conf`,
-      content: [
-        "Journal",
-        {
-          ...getAttributesJSON(
-            this,
-            SystemdJournalServiceTypeDefinition.attributes
-          ),
-          ...Object.fromEntries(
-            Object.entries(SystemdJournalServiceTypeDefinition.attributes)
-              .map(([k, v]) => [k, this.extendedProperty(k)])
-              .filter(([k, v]) => v !== undefined)
-          )
-        }
-      ]
+      content: ["Journal", this.getProperties(filterConfigurable)]
     };
   }
 }