pmcf 6.41.3 → 6.41.5

package/README.md

@@ -82,29 +82,29 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -309,18 +309,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## 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;
-
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -411,6 +399,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;
+
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/bin/pmcf-info

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 import { extendingAttributeIterator } from "pacc";
+import { AggregatedMap } from "aggregated-map";
+
 import { prepare } from "../src/cli.mjs";
 
 const { root, args, options } = await prepare({
@@ -34,6 +36,13 @@ function show(value, indent, options) {
       return;
   }
 
+  if (value instanceof AggregatedMap || value instanceof Map) {
+    for (const v of value.values()) {
+      show(v, indent + 1, options);
+    }
+    return;
+  }
+
   if (value instanceof Iterator || Array.isArray(value)) {
     for (const v of value) {
       show(v, indent + 1, options);
@@ -114,8 +123,8 @@ function show(value, indent, options) {
           } else {
             if (typeof v.get === "function") {
               console.log(name(attribute));
-              for(const [k,o] of v) {
-                show(o,indent + 2, options);
+              for (const [k, o] of v) {
+                show(o, indent + 2, options);
               }
             } else {
               try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.41.3",
+  "version": "6.41.5",
   "publishConfig": {
     "access": "public"
   },

package/src/common-attributes.mjs

@@ -158,7 +158,7 @@ export const endpointAttributes = {
     name: "protocol",
     values: new Set(["tcp", "udp", "quic"])
   },
-  types: { ...string_set_attribute_writable, name: "types" },
+  type: { ...string_attribute, name: "type" },
   tls: { ...boolean_attribute_false, name: "tls" },
   address: { ...string_attribute, name: "address" }
 };

package/src/core-service.mjs

@@ -6,6 +6,7 @@ import {
 } from "ip-utilties";
 import {
   string_attribute_writable,
+  string_set_attribute_writable,
   number_attribute_writable,
   priority_attribute,
   asArray
@@ -65,6 +66,7 @@ export class CoreService extends base {
     },
     priority: priority_attribute,
     weight: { ...number_attribute_writable, name: "weight" /*default: 1*/ },
+    types: { ...string_set_attribute_writable, name: "types"},
     systemdService: { ...string_attribute_writable, name: "systemdService" },
     systemUserName: { ...string_attribute_writable, name: "systemUserName" },
     systemGroupName: { ...string_attribute_writable, name: "systemGroupName" }