pmcf 3.20.2 → 3.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.20.2",
+  "version": "3.21.0",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
   "dependencies": {
     "ip-utilties": "^2.0.2",
     "npm-pkgbuild": "^19.1.3",
-    "pacc": "^7.0.0",
+    "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/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)]
     };
   }
 }

package/src/services/systemd-resolved.mjs

@@ -9,9 +9,10 @@ import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition,
   ServiceTypeDefinition,
-  serviceEndpoints
+  serviceEndpoints,
+  addServiceType
 } from "pmcf";
-import { yesno } from "../utils.mjs";
+import { filterConfigurable, yesno } from "../utils.mjs";
 
 const SystemdResolvedServiceTypeDefinition = {
   name: "systemd-resolved",
@@ -20,27 +21,32 @@ const SystemdResolvedServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-    DNS: string_attribute_writable,
-    FallbackDNS: string_attribute_writable,
-    Domains: string_attribute_writable,
-    MulticastDNS: boolean_attribute_writable,
-    Cache: boolean_attribute_writable,
-    CacheFromLocalhost: boolean_attribute_writable,
-    DNSStubListener: boolean_attribute_writable,
-    DNSStubListenerExtra: string_attribute_writable,
-    ReadEtcHosts: boolean_attribute_writable,
-    ResolveUnicastSingleLabel: boolean_attribute_writable,
-    StaleRetentionSec: duration_attribute_writable,
-    RefuseRecordTypes: string_attribute_writable,
-    DNSSEC: yesno_attribute_writable,
-    DNSOverTLS: yesno_attribute_writable,
-    LLMNR: yesno_attribute_writable
-  }
+    DNS: { ...string_attribute_writable, configurable: true },
+    FallbackDNS: { ...string_attribute_writable, configurable: true },
+    Domains: { ...string_attribute_writable, configurable: true },
+    MulticastDNS: { ...boolean_attribute_writable, configurable: true },
+    Cache: { ...boolean_attribute_writable, configurable: true },
+    CacheFromLocalhost: { ...boolean_attribute_writable, configurable: true },
+    DNSStubListener: { ...boolean_attribute_writable, configurable: true },
+    DNSStubListenerExtra: { ...string_attribute_writable, configurable: true },
+    ReadEtcHosts: { ...boolean_attribute_writable, configurable: true },
+    ResolveUnicastSingleLabel: {
+      ...boolean_attribute_writable,
+      configurable: true
+    },
+    StaleRetentionSec: { ...duration_attribute_writable, configurable: true },
+    RefuseRecordTypes: { ...string_attribute_writable, configurable: true },
+    DNSSEC: { ...yesno_attribute_writable, default: false, configurable: true },
+    DNSOverTLS: { ...yesno_attribute_writable, configurable: true },
+    LLMNR: { ...yesno_attribute_writable, configurable: true }
+  },
+  service: {}
 };
 
 export class SystemdResolvedService extends ExtraSourceService {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {
@@ -79,17 +85,7 @@ export class SystemdResolvedService extends ExtraSourceService {
           FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),
           Domains: [...this.localDomains].join(" "),
           MulticastDNS: yesno(this.network.multicastDNS),
-
-          DNSSEC: yesno(this.DNSSEC),
-
-          // TODO extendet properties with getAttribute()
-          ...Object.fromEntries(
-            Object.entries(SystemdResolvedServiceTypeDefinition.attributes)
-              .map(([k, v]) => [k, this.extendedProperty(k)])
-              .filter(([k, v]) => v !== undefined)
-          ),
-          LLMNR: yesno(this.LLMNR),
-
+          ...this.getProperties(filterConfigurable)
         }
       ]
     };

package/src/services/systemd-timesyncd.mjs

@@ -1,21 +1,39 @@
-import { addType } from "pacc";
+import {
+  addType,
+  string_attribute_writable,
+  duration_attribute_writable
+} from "pacc";
 import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition,
   ServiceTypeDefinition,
-  serviceEndpoints
+  serviceEndpoints,
+  addServiceType
 } from "pmcf";
+import { filterConfigurable } from "../utils.mjs";
 
 const SystemdTimesyncdServiceTypeDefinition = {
   name: "systemd-timesyncd",
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
+
+  attributes: {
+    NTP: {...string_attribute_writable, configurable: true },
+    FallbackNTP: {...string_attribute_writable, configurable: true },
+    RootDistanceMaxSec: {...duration_attribute_writable, configurable: true },
+    PollIntervalMinSec: {...duration_attribute_writable, configurable: true },
+    PollIntervalMaxSec: {...duration_attribute_writable, configurable: true },
+    ConnectionRetrySec: {...duration_attribute_writable, configurable: true },
+    SaveIntervalSec: {...duration_attribute_writable, configurable: true }
+  },
+  service: {}
 };
 
 export class SystemdTimesyncdService extends ExtraSourceService {
   static {
     addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
   static get typeDefinition() {
@@ -49,7 +67,8 @@ export class SystemdTimesyncdService extends ExtraSourceService {
         "Time",
         {
           NTP: serviceEndpoints(this, options(300, 399)),
-          FallbackNTP: serviceEndpoints(this, options(100, 199))
+          FallbackNTP: serviceEndpoints(this, options(100, 199)),
+          ...this.getProperties(filterConfigurable)
         }
       ]
     };

package/src/utils.mjs

@@ -107,3 +107,6 @@ export function asIterator(value) {
 
   return asArray(value);
 }
+
+
+export const filterConfigurable = (name, attribute) => !attribute.private & attribute.configurable;

package/types/base.d.mts

@@ -69,6 +69,11 @@ export class Base {
     _extendedPropertyIterator(propertyName: any, seen: any): Generator<any, void, any>;
     _extendedProperty(propertyName: any, seen: any): any;
     extendedProperty(propertyName: any): any;
+    /**
+     * Retrive attribute values from an object.
+     * @return {Object} values
+     */
+    getProperties(filter?: typeof filterPublic): any;
     get root(): any;
     get location(): any;
     get host(): any;
@@ -131,3 +136,4 @@ export class Base {
     toString(): string;
     toJSON(): any;
 }
+import { filterPublic } from "pacc";