pmcf 3.20.3 → 3.21.1

package/src/services/systemd-resolved.mjs

@@ -1,6 +1,5 @@
 import {
   addType,
-  toExternal,
   duration_attribute_writable,
   string_attribute_writable,
   boolean_attribute_writable,
@@ -10,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",
@@ -21,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, default: false },
-    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() {
@@ -80,13 +85,7 @@ export class SystemdResolvedService extends ExtraSourceService {
           FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),
           Domains: [...this.localDomains].join(" "),
           MulticastDNS: yesno(this.network.multicastDNS),
-
-          // TODO extendet properties with getAttribute()
-          ...Object.fromEntries(
-            Object.entries(SystemdResolvedServiceTypeDefinition.attributes)
-              .map(([k, v]) => [k, toExternal(this.extendedProperty(k), v)])
-              .filter(([k, v]) => v !== undefined)
-          )
+          ...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";

package/types/services/systemd-journal-remote.d.mts

@@ -748,6 +748,7 @@ export class SystemdJournalRemoteService extends Service {
         key: string;
         attributes: {
             Seal: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -770,6 +771,7 @@ export class SystemdJournalRemoteService extends Service {
             };
             SplitMode: {
                 values: (string | boolean)[];
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -790,6 +792,7 @@ export class SystemdJournalRemoteService extends Service {
                 additionalValues?: object;
             };
             ServerKeyFile: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -811,6 +814,7 @@ export class SystemdJournalRemoteService extends Service {
                 additionalValues?: object;
             };
             ServerCertificateFile: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -832,6 +836,7 @@ export class SystemdJournalRemoteService extends Service {
                 additionalValues?: object;
             };
             TrustedCertificateFile: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -853,6 +858,7 @@ export class SystemdJournalRemoteService extends Service {
                 additionalValues?: object;
             };
             MaxUse: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -874,6 +880,7 @@ export class SystemdJournalRemoteService extends Service {
                 additionalValues?: object;
             };
             KeepFree: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -895,6 +902,7 @@ export class SystemdJournalRemoteService extends Service {
                 additionalValues?: object;
             };
             MaxFileSize: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -916,6 +924,7 @@ export class SystemdJournalRemoteService extends Service {
                 additionalValues?: object;
             };
             MaxFiles: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -937,6 +946,7 @@ export class SystemdJournalRemoteService extends Service {
                 additionalValues?: object;
             };
             Compression: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -959,14 +969,12 @@ export class SystemdJournalRemoteService extends Service {
             };
         };
         service: {
-            services: {
-                endpoints: {
-                    family: string;
-                    port: number;
-                    protocol: string;
-                    tls: boolean;
-                }[];
-            };
+            endpoints: {
+                family: string;
+                port: number;
+                protocol: string;
+                tls: boolean;
+            }[];
         };
     };
     get type(): string;

package/types/services/systemd-journal-upload.d.mts

@@ -748,8 +748,30 @@ export class SystemdJournalUploadService extends Service {
         })[];
         key: string;
         attributes: {
-            URL: import("pacc").AttributeDefinition;
+            URL: {
+                configurable: boolean;
+                type: object;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                private?: boolean;
+                credential?: boolean;
+                persistent?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                toInternal?: Function;
+                toExternal?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
+            };
             ServerKeyFile: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -771,6 +793,7 @@ export class SystemdJournalUploadService extends Service {
                 additionalValues?: object;
             };
             ServerCertificateFile: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -792,6 +815,7 @@ export class SystemdJournalUploadService extends Service {
                 additionalValues?: object;
             };
             TrustedCertificateFile: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -813,6 +837,7 @@ export class SystemdJournalUploadService extends Service {
                 additionalValues?: object;
             };
             Compression: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -834,6 +859,7 @@ export class SystemdJournalUploadService extends Service {
                 additionalValues?: object;
             };
             ForceCompression: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -855,6 +881,7 @@ export class SystemdJournalUploadService extends Service {
                 additionalValues?: object;
             };
         };
+        service: {};
     };
     get type(): string;
     get systemdServices(): string;

package/types/services/systemd-journal.d.mts

@@ -744,6 +744,7 @@ export class SystemdJournalService extends Service {
         key: string;
         attributes: {
             Storage: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -765,6 +766,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             Seal: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -786,6 +788,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             SplitMode: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -807,6 +810,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             SyncIntervalSec: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -828,6 +832,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             RateLimitIntervalSec: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -849,6 +854,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             RateLimitBurst: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -870,6 +876,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             SystemMaxUse: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -891,6 +898,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             SystemKeepFree: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -912,6 +920,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             SystemMaxFileSize: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -933,6 +942,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             SystemMaxFiles: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -954,6 +964,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             RuntimeMaxUse: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -975,6 +986,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             RuntimeKeepFree: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -996,6 +1008,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             RuntimeMaxFileSize: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1017,6 +1030,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             RuntimeMaxFiles: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1038,6 +1052,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             MaxRetentionSec: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1059,6 +1074,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             MaxFileSec: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1080,6 +1096,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             ForwardToSyslog: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1101,6 +1118,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             ForwardToKMsg: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1122,6 +1140,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             ForwardToConsole: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1143,6 +1162,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             ForwardToWall: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1164,6 +1184,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             TTYPath: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1185,6 +1206,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             MaxLevelStore: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1206,6 +1228,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
             Compress: {
+                configurable: boolean;
                 type: object;
                 isKey: boolean;
                 writable: boolean;
@@ -1227,6 +1250,7 @@ export class SystemdJournalService extends Service {
                 additionalValues?: object;
             };
         };
+        service: {};
     };
     get type(): string;
     get systemdServices(): string;