pmcf 6.44.2 → 6.44.4

package/README.md

@@ -82,40 +82,44 @@ 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)
 *   [subnetForAddress](#subnetforaddress)
     *   [Parameters](#parameters-22)
-*   [domainName](#domainname)
+*   [ServiceType](#servicetype)
+    *   [Properties](#properties-2)
+*   [serviceTypeEndpoints](#servicetypeendpoints)
     *   [Parameters](#parameters-23)
-*   [domainFromDominName](#domainfromdominname)
+*   [domainName](#domainname)
     *   [Parameters](#parameters-24)
-*   [sectionLines](#sectionlines)
+*   [domainFromDominName](#domainfromdominname)
     *   [Parameters](#parameters-25)
+*   [sectionLines](#sectionlines)
+    *   [Parameters](#parameters-26)
 
 ## base
 
@@ -308,18 +312,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>
@@ -410,6 +402,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;
@@ -430,6 +434,26 @@ hosts we own direcly.
 
 Returns **Subnet?**&#x20;
 
+## ServiceType
+
+Type: [object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
+
+### Properties
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+*   `services` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
+*   `extends` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[ServiceType](#servicetype)>**&#x20;
+*   `endpoints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
+
+## serviceTypeEndpoints
+
+### Parameters
+
+*   `type` **[ServiceType](#servicetype)**&#x20;
+*   `bundeledToo` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)**&#x20;
+
+Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
+
 ## domainName
 
 Appends default domain if name does not already have a domain.

package/package.json

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

package/src/core-service.mjs

@@ -66,7 +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"},
+    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" }
@@ -119,10 +119,19 @@ export class CoreService extends base {
   endpoints(filter) {
     const data = serviceTypeEndpoints(ServiceTypes[this.type], true);
     const result = [];
+    const domainNames = new Set();
 
-    const domainNames = new Set([undefined]);
+    let type;
+    if (typeof filter === "string") {
+      type = filter;
+      filter = undefined;
+    }
 
     for (const e of data) {
+      if (type && e.type.name !== type) {
+        continue;
+      }
+
       switch (e.family) {
         case FAMILY_UNIX:
           result.push(new unix_endpoint(this, e.path, e));
@@ -158,16 +167,7 @@ export class CoreService extends base {
       }
     }
 
-    switch (typeof filter) {
-      case "string":
-        return result.filter(endpoint => endpoint.type === filter);
-
-      case "undefined":
-        return result;
-
-      default:
-        return result.filter(filter);
-    }
+    return filter ? result.filter(filter) : result;
   }
 
   endpoint(filter) {

package/src/services/chrony.mjs

@@ -3,8 +3,7 @@ import { FAMILY_IPV4, isLinkLocal } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
 import {
   serviceEndpoints,
-  addType,
-  ExtraSourceService,
+  addType,ExtraSourceService,
   FAMILY_UNIX,
   FAMILY_IPV4_IPV6
 } from "pmcf";
@@ -38,7 +37,17 @@ export class chrony extends ExtraSourceService {
 
   async *preparePackages(dir) {
     const packageData = await this.packageData;
-    packageData.sources.push(new FileContentProvider(dir + "/"));
+
+    packageData.sources.push(
+      ...(await Array.fromAsync(this.templateContent()))
+    );
+
+    packageData.sources.push(
+      new FileContentProvider({
+        dir: dir + "/",
+        permissions: this.content?.permissions
+      })
+    );
 
     const subnets = [...new Map(this.subnets).values()]; // TODO should be normal
     const host = this.host;

package/src/services/mosquitto.mjs

@@ -15,6 +15,7 @@ export class mosquitto extends CoreService {
       name: "listener",
       writable: true,
       configurable: true
+      // alias port
       // endpoints[type='mqtt']/port
     },
     persistence_location: {
@@ -42,11 +43,11 @@ export class mosquitto extends CoreService {
   }
 
   set listener(value) {
-    this._listener = value;
+    this.port = value;
   }
 
   get listener() {
-    return this._listener ?? this.endpoint("mqtt").port;
+    return this.port;
   }
 
   async *preparePackages(dir) {