pmcf 2.37.2 → 2.38.1

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.2",
+  "version": "2.38.1",
   "publishConfig": {
     "access": "public"
   },

package/src/cluster.mjs

@@ -2,6 +2,7 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
+import { serviceEndpoints } from "pmcf";
 import { addType } from "./types.mjs";
 import { writeLines } from "./utils.mjs";
 
@@ -139,20 +140,25 @@ export class Cluster extends Host {
         cfg.push("}");
         cfg.push("");
 
-        for (const service of cluster.findServices({ type: "http" })) {
-          cfg.push(`virtual_server ${cluster.address} ${service.port} {`);
+        for (const endpoint of serviceEndpoints(cluster, {
+          services: { type: "http" },
+          endpoints: e => e.networkInterface.kind !== "loopback"
+        })) {
+          cfg.push(`virtual_server ${cluster.address} ${endpoint.port} {`);
           cfg.push(`  delay_loop ${cluster.checkInterval}`);
           cfg.push("  lb_algo wlc");
           cfg.push("  persistence_timeout 600");
-          cfg.push(`  protocol ${service.protocol.toUpperCase()}`);
+          cfg.push(`  protocol ${endpoint.protocol.toUpperCase()}`);
 
           for (const member of this.members) {
-            const memberService = member.findService({ type: service.type }) || member.host.findService({ type: service.type }); // TODO
+            const memberService =
+              member.findService({ type: endpoint.type }) ||
+              member.host.findService({ type: endpoint.type }); // TODO
 
             cfg.push(`  real_server ${member.address} ${memberService.port} {`);
             cfg.push(`    weight ${memberService.weight}`);
 
-            switch (service.type) {
+            switch (endpoint.type) {
               case "dns":
                 cfg.push(`    DNS_CHECK {`);
                 cfg.push("      type A");
@@ -165,7 +171,7 @@ export class Cluster extends Host {
                 break;
 
               default:
-                switch (service.protocol) {
+                switch (endpoint.protocol) {
                   case "tcp":
                     cfg.push(`    TCP_CHECK {`);
                     cfg.push("      connect_timeout 10");

package/src/endpoint.mjs

@@ -1,12 +1,37 @@
-export class Endpoint {
-  constructor(service, networkAddress, data) {
+class _Endpoint {
+  #port;
+  #type;
+  constructor(service, data) {
     this.service = service;
-    this.networkAddress = networkAddress;
+    if (data.port) {
+      this.#port = data.port;
+      delete data.port;
+    }
+
+    if (data.type) {
+      this.#type = data.type;
+      delete data.type;
+    }
     Object.assign(this, data);
   }
 
+  get type() {
+    return this.#type ?? this.service.type;
+  }
+
+  get port() {
+    return this.#port ?? this.service._port;
+  }
+
   toString() {
-    return `${this.address}[${this.port}]`;
+    return `${this.type}/${this.address}[${this.port}]`;
+  }
+}
+
+export class Endpoint extends _Endpoint {
+  constructor(service, networkAddress, data) {
+    super(service, data);
+    this.networkAddress = networkAddress;
   }
 
   get socketAddress() {
@@ -34,11 +59,10 @@ export class Endpoint {
   }
 }
 
-export class DomainNameEndpoint {
+export class DomainNameEndpoint extends _Endpoint {
   constructor(service, domainName, data) {
-    this.service = service;
+    super(service, data);
     this.domainName = domainName;
-    Object.assign(this, data);
   }
 
   get networkInterface() {
@@ -48,17 +72,15 @@ export class DomainNameEndpoint {
   get address() {
     return this.domainName;
   }
-
-  toString() {
-    return `${this.address}[${this.port}]`;
-  }
 }
 
-export class HTTPEndpoint {
+export class HTTPEndpoint extends _Endpoint {
   constructor(service, url, data) {
-    this.service = service;
+    super(service, data);
     this.url = url;
-    Object.assign(this, data);
   }
 
-}
+  get address() {
+    return this.url;
+  }
+}

package/src/owner.mjs

@@ -175,10 +175,6 @@ export class Owner extends Base {
       yield* this.owner.subnets();
     }
     yield* this.typeList("subnet");
-
-    /* for (const network of this.networks()) {
-      yield* network.subnets();
-    }*/
   }
 
   addSubnet(address) {

package/src/service.mjs

@@ -24,7 +24,6 @@ const ServiceTypes = {
   },
   http3: {
     extends: ["https"],
-    type: "https",
     dnsRecord: {
       type: "HTTPS",
       parameters: { "no-default-alpn": undefined, alpn: "h3" }
@@ -48,7 +47,6 @@ const ServiceTypes = {
   "dhcpv6-server": { endpoints: [{ port: 547, tls: false }] },
   smb: { endpoints: [{ protocol: "tcp", port: 445, tls: false }] },
   timemachine: {
-    type: "adisk",
     extends: ["smb"],
     endpoints: [{ protocol: "tcp", port: 445, tls: false }],
     dnsRecord: {
@@ -68,13 +66,19 @@ function serviceTypeEndpoints(type) {
   if (st) {
     if (st.extends) {
       return st.extends.reduce(
-        (a, c) => [...a, ...(ServiceTypes[c]?.endpoints||[])],
+        (a, c) => [...a, ...(ServiceTypes[c]?.endpoints || [])],
         st.endpoints || []
       );
     }
 
     return st.endpoints;
   }
+
+  return [
+    {
+      tls: false
+    }
+  ];
 }
 
 export const endpointProperties = {
@@ -96,7 +100,7 @@ export const endpointProperties = {
 
 export const EndpointTypeDefinition = {
   name: "endpoint",
-  owners: ["service", "network-interface"],
+  owners: ["service", "network_interface"],
   priority: 0.4,
   specializations: {},
   properties: endpointProperties
@@ -149,6 +153,10 @@ export class Service extends Base {
     this.read(data, ServiceTypeDefinition);
   }
 
+  toString() {
+    return `${this.type}`;
+  }
+
   set extends(value) {
     this._extends.push(value);
   }
@@ -184,32 +192,16 @@ export class Service extends Base {
   }
 
   endpoints(filter) {
-    const local =
-      this._port === undefined
-        ? { type: this.type }
-        : { type: this.type, port: this._port };
-
-    const data = serviceTypeEndpoints(this.type) || [
-      {
-        tls: false
-      }
-    ];
+    const data = serviceTypeEndpoints(this.type);
 
+    const l = this._port === undefined ? {} : { port: this._port };
     let result = [...this.host.networkAddresses()]
-      .map(na =>
-        data.map(
-          d =>
-            new Endpoint(this, na, {
-              ...d,
-              ...local
-            })
-        )
-      )
+      .map(na => data.map(d => new Endpoint(this, na, { ...d, ...l })))
       .flat();
 
     if (result.length === 0) {
       result = data.map(
-        d => new DomainNameEndpoint(this, this.domainName, { ...d, ...local })
+        d => new DomainNameEndpoint(this, this.domainName, { ...d, ...l })
       );
     }
 
@@ -229,15 +221,7 @@ export class Service extends Base {
   }
 
   get port() {
-    return this.endpoints()[0].port;
-  }
-
-  get protocol() {
-    return this.endpoints()[0].protocol;
-  }
-
-  get tls() {
-    return this.endpoints()[0].tls;
+    return this._port ?? this.endpoints()[0].port;
   }
 
   set weight(value) {
@@ -272,11 +256,7 @@ export class Service extends Base {
       )) {
         records.push(
           DNSRecord(
-            dnsFullName(
-              `_${ServiceTypes[this.type]?.type ?? this.type}._${
-                ep.protocol
-              }.${domainName}`
-            ),
+            dnsFullName(`_${this.type}._${ep.protocol}.${domainName}`),
             "SRV",
             this.priority ?? 10,
             this.weight,
@@ -313,7 +293,12 @@ export class Service extends Base {
         );
       } else {
         records.push(
-          DNSRecord("@", dnsRecord.type, this.priority ?? 10, dnsFullName(domainName))
+          DNSRecord(
+            "@",
+            dnsRecord.type,
+            this.priority ?? 10,
+            dnsFullName(domainName)
+          )
         );
       }
     }
@@ -325,9 +310,9 @@ export class Service extends Base {
 export const sortByPriority = (a, b) => a.priority - b.priority;
 
 /**
- * 
- * @param {*} sources 
- * @param {Object} [options] 
+ *
+ * @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

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/endpoint.d.mts

@@ -1,8 +1,6 @@
-export class Endpoint {
+export class Endpoint extends _Endpoint {
     constructor(service: any, networkAddress: any, data: any);
-    service: any;
     networkAddress: any;
-    toString(): string;
     get socketAddress(): string;
     get hostName(): any;
     get domainName(): any;
@@ -10,16 +8,23 @@ export class Endpoint {
     get family(): any;
     get networkInterface(): any;
 }
-export class DomainNameEndpoint {
+export class DomainNameEndpoint extends _Endpoint {
     constructor(service: any, domainName: any, data: any);
-    service: any;
     domainName: any;
     get networkInterface(): {};
     get address(): any;
-    toString(): string;
 }
-export class HTTPEndpoint {
+export class HTTPEndpoint extends _Endpoint {
     constructor(service: any, url: any, data: any);
-    service: any;
     url: any;
+    get address(): any;
+}
+declare class _Endpoint {
+    constructor(service: any, data: any);
+    service: any;
+    get type(): any;
+    get port(): any;
+    toString(): string;
+    #private;
 }
+export {};

package/types/service.d.mts

@@ -320,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);