pmcf 6.44.0 → 6.44.2

package/package.json

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

package/src/cluster.mjs

@@ -63,7 +63,7 @@ export class Cluster extends Host {
       const packageData = await host.packageData;
 
       packageData.sources.push(
-        await Array.fromAsync(this.templateContent()),
+        ...(await Array.fromAsync(this.templateContent())),
         new FileContentProvider({
           dir: packageStagingDir,
           pattern: "**/*",

package/src/service-types.mjs

@@ -2,6 +2,17 @@ import { asArray } from "pacc";
 import { FAMILY_IPV6 } from "ip-utilties";
 import { FAMILY_UNIX, FAMILY_IPV4_IPV6 } from "./endpoint.mjs";
 
+const TCP = "tcp";
+const UDP = "udp";
+
+/**
+ * @typedef {object} ServiceType
+ * @property {string} name
+ * @property {Array<Object>} services
+ * @property {Array<ServiceType>} extends
+ * @property {Array<object>} endpoints
+ * 
+ */
 export const ServiceTypes = {
   "alpm-repo": {
     extends: ["https"]
@@ -13,13 +24,13 @@ export const ServiceTypes = {
   syslog: {
     endpoints: [
       {
-        protocol: "udp",
+        protocol: UDP,
         family: FAMILY_IPV4_IPV6,
         port: 514,
         tls: false
       },
       {
-        protocol: "tcp",
+        protocol: TCP,
         family: FAMILY_IPV4_IPV6,
         port: 514,
         tls: false
@@ -28,33 +39,33 @@ export const ServiceTypes = {
   },
   mqtt: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 1883, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 1883, tls: false }
     ]
   },
   "secure-mqtt": {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 8883, tls: true }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 8883, tls: true }
     ]
   },
   ntp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 123, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 123, tls: false }
     ]
   },
   dns: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 53, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 53, tls: false }
     ]
   },
   mdns: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 5353, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 5353, tls: false }
     ]
   },
   llmnr: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 5355, tls: false },
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 5355, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 5355, tls: false },
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 5355, tls: false }
     ]
   },
   ldap: {
@@ -62,7 +73,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "ldap",
-        protocol: "tcp",
+        protocol: TCP,
         port: 389,
         tls: false
       }
@@ -73,7 +84,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "ldaps",
-        protocol: "tcp",
+        protocol: TCP,
         port: 636,
         tls: true
       }
@@ -87,7 +98,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "http",
-        protocol: "tcp",
+        protocol: TCP,
         port: 80,
         tls: false
       }
@@ -98,7 +109,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "https",
-        protocol: "tcp",
+        protocol: TCP,
         port: 443,
         tls: true
       }
@@ -110,7 +121,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "https",
-        protocol: "udp",
+        protocol: UDP,
         port: 443,
         tls: true
       }
@@ -122,54 +133,54 @@ export const ServiceTypes = {
   },
   rtsp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 554, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 554, tls: false }
     ]
   },
   smtp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 25, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 25, tls: false }
     ],
     dnsRecord: { type: "MX" }
   },
   smtps: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 465, tls: true }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 465, tls: true }
     ],
     dnsRecord: { type: "MX" }
   },
   submission: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 587, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 587, tls: false }
     ]
   },
   lmtp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 24, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 24, tls: false }
     ]
   },
   ssh: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 22, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 22, tls: false }
     ]
   },
   imap: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 143, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 143, tls: false }
     ]
   },
   imaps: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 993, tls: true }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 993, tls: true }
     ]
   },
   dhcp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 547, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 547, tls: false }
     ]
   },
   "dhcpv6-client": {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 546, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 546, tls: false }
     ]
   },
   "dhcpv6-server": {
@@ -177,7 +188,7 @@ export const ServiceTypes = {
   },
   smb: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "tcp", port: 445, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 445, tls: false }
     ]
   },
   nginx: {
@@ -198,13 +209,13 @@ export const ServiceTypes = {
   pcp: {
     // rfc6887
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 5351, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 5351, tls: false }
     ]
   },
   "pcp-multicast": {
     // rfc6887
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: "udp", port: 5350, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 5350, tls: false }
     ]
   }
 };
@@ -258,6 +269,12 @@ export function serviceTypes(type) {
   return new Set();
 }
 
+/**
+ * 
+ * @param {ServiceType} type 
+ * @param {boolean} bundeledToo 
+ * @returns {Array<Object>}
+ */
 export function serviceTypeEndpoints(type, bundeledToo) {
   if (type) {
     const aggregator = (acc, type) => {

package/src/services/mosquitto.mjs

@@ -15,6 +15,7 @@ export class mosquitto extends CoreService {
       name: "listener",
       writable: true,
       configurable: true
+      // endpoints[type='mqtt']/port
     },
     persistence_location: {
       ...string_attribute_writable,
@@ -40,29 +41,25 @@ export class mosquitto extends CoreService {
     addType(this);
   }
 
+  set listener(value) {
+    this._listener = value;
+  }
+
   get listener() {
-    return this.endpoint("mqtt").port;
+    return this._listener ?? this.endpoint("mqtt").port;
   }
 
   async *preparePackages(dir) {
-    /*
-    const pm = this.root.named("/services/primary-SW/mosquitto");
-    const wd = [...this.walkDirections(["this", "extends"])];
-
-    console.log(
-      "MOSQUITTO",
-      this.fullName,
-      [...this.extends].map(n => n.fullName),
-      pm.fullName,
-      [...pm.extends].map(n => n.fullName),
-      wd.map(n => [n.fullName, n.directory])
-    );*/
-
     const packageData = await this.packageData;
 
-    packageData.sources = await Array.fromAsync(this.templateContent());
-
-    packageData.sources.push(new FileContentProvider({ dir: dir + "/" }));
+    packageData.sources.push(
+      ...(await Array.fromAsync(this.templateContent())),
+      new FileContentProvider({
+        dir,
+        pattern: ["**/*"],
+        permissions: this.content.permissions
+      })
+    );
 
     await writeLines(
       join(dir, "etc", "mosquitto"),