pmcf 2.37.1 → 2.38.0

package/README.md

@@ -27,6 +27,8 @@
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
+*   [serviceEndpoints](#serviceendpoints)
+    *   [Parameters](#parameters-2)
 
 ## networkAddresses
 
@@ -56,6 +58,21 @@ Type: NetworkInterface
 
 Type: ([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Uint8Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array) | [Uint16Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint16Array))
 
+## serviceEndpoints
+
+### Parameters
+
+*   `sources` **any** 
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**  (optional, default `{}`)
+
+    *   `options.services` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** filter for services
+    *   `options.endpoints` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** filter for endpoints
+    *   `options.select` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** mapper from Endpoint into result
+    *   `options.limit` **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** upper limit of # result items
+    *   `options.join` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** jount result into a string
+
+Returns **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | any)** 
+
 # install
 
 With [npm](http://npmjs.org) do:

package/package.json

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

package/src/service.mjs

@@ -232,14 +232,6 @@ export class Service extends Base {
     return this.endpoints()[0].port;
   }
 
-  get protocol() {
-    return this.endpoints()[0].protocol;
-  }
-
-  get tls() {
-    return this.endpoints()[0].tls;
-  }
-
   set weight(value) {
     this._weight = value;
   }
@@ -313,7 +305,7 @@ export class Service extends Base {
         );
       } else {
         records.push(
-          DNSRecord("@", dnsRecord.type, this.priority, dnsFullName(domainName))
+          DNSRecord("@", dnsRecord.type, this.priority ?? 10, dnsFullName(domainName))
         );
       }
     }
@@ -324,6 +316,17 @@ export class Service extends Base {
 
 export const sortByPriority = (a, b) => a.priority - b.priority;
 
+/**
+ * 
+ * @param {*} sources 
+ * @param {Object} [options] 
+ * @param {Function} [options.services] filter for services
+ * @param {Function} [options.endpoints] filter for endpoints
+ * @param {Function} [options.select] mapper from Endpoint into result
+ * @param {number} [options.limit] upper limit of # result items
+ * @param {string} [options.join] jount result into a string
+ * @returns {string|any}
+ */
 export function serviceEndpoints(sources, options = {}) {
   const all = asArray(sources)
     .map(ft => Array.from(ft.findServices(options.services)))

package/src/services/dns.mjs

@@ -335,11 +335,10 @@ async function generateZoneDefs(dns, location, packageData) {
     addHook(
       packageData.properties.hooks,
       "post_upgrade",
-      //  `rm -f ${foreignZones.map(zone => `/var/lib/named/${zone.file}.jnl`)}\n` +
-      //    "systemctl try-reload-or-restart named\n" +
-      `/usr/bin/named-hostname-info ${foreignZones
-        .map(zone => zone.id)
-        .join(" ")}|/usr/bin/named-hostname-update`
+      `rm -f ${foreignZones.map(zone => `/var/lib/named/${zone.file}.jnl`)}\n` +
+        `/usr/bin/named-hostname-info ${foreignZones
+          .map(zone => zone.id)
+          .join(" ")}|/usr/bin/named-hostname-update`
     );
   }
 

package/types/service.d.mts

@@ -1,4 +1,21 @@
-export function serviceEndpoints(sources: any, options?: {}): string | any[];
+/**
+ *
+ * @param {*} sources
+ * @param {Object} [options]
+ * @param {Function} [options.services] filter for services
+ * @param {Function} [options.endpoints] filter for endpoints
+ * @param {Function} [options.select] mapper from Endpoint into result
+ * @param {number} [options.limit] upper limit of # result items
+ * @param {string} [options.join] jount result into a string
+ * @returns {string|any}
+ */
+export function serviceEndpoints(sources: any, options?: {
+    services?: Function;
+    endpoints?: Function;
+    select?: Function;
+    limit?: number;
+    join?: string;
+}): string | any;
 export namespace endpointProperties {
     export namespace port {
         let type: string;
@@ -303,8 +320,6 @@ export class Service extends Base {
     get alias(): any;
     set port(value: any);
     get port(): any;
-    get protocol(): any;
-    get tls(): any;
     set weight(value: any);
     get weight(): any;
     set type(value: any);

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

@@ -247,8 +247,8 @@ export class SystemdResolvedService extends ExtraSourceService {
     systemdConfig(name: any): {
         name: string;
         content: (string | {
-            DNS: string | any[];
-            FallbackDNS: string | any[];
+            DNS: any;
+            FallbackDNS: any;
             Domains: string;
             DNSSEC: string;
             MulticastDNS: string;

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

@@ -247,7 +247,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     systemdConfig(name: any): {
         name: string;
         content: (string | {
-            NTP: string | any[];
+            NTP: any;
         })[];
     };
 }