pmcf 3.1.2 → 3.2.0

package/package.json

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

package/src/services/influxdb.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
+import { boolean_attribute_writeable_true } from "pacc";
 import { writeLines } from "../utils.mjs";
 import { addType } from "../types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
@@ -10,7 +11,12 @@ const InfluxdbServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  properties: {
+    "metrics-disabled": {
+      ...boolean_attribute_writeable_true,
+      isCommonOption: true
+    }
+  },
   service: {
     endpoints: [
       {
@@ -64,7 +70,12 @@ export class InfluxdbService extends Service {
       }
     };
 
-    const lines = ["metrics-disabled: true"];
+    const lines = Object.entries(InfluxdbServiceTypeDefinition.properties)
+      .filter(
+        ([key, attribute]) =>
+          attribute.isCommonOption && this[key] !== undefined
+      )
+      .map(([key]) => `${key}: ${this[key]}`);
 
     await writeLines(join(dir, "etc", "influxdb"), "config.yml", lines);
 

package/src/services/mosquitto.mjs

@@ -1,5 +1,10 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
+import {
+  boolean_attribute_writeable_true,
+  boolean_attribute_writeable_false
+} from "pacc";
+
 import { writeLines } from "../utils.mjs";
 import { addType } from "../types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
@@ -10,7 +15,16 @@ const MosquittoServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  properties: {
+    log_timestamp: {
+      ...boolean_attribute_writeable_false,
+      isCommonOption: true
+    },
+    allow_anonymous: {
+      ...boolean_attribute_writeable_false,
+      isCommonOption: true
+    }
+  },
   service: {
     extends: ["mqtt"]
   }
@@ -51,16 +65,21 @@ export class MosquittoService extends Service {
       }
     };
 
+    const lines = Object.entries(MosquittoServiceTypeDefinition.properties)
+      .filter(
+        ([key, attribute]) =>
+          attribute.isCommonOption && this[key] !== undefined
+      )
+      .map(([key]) => `${key}: ${this[key]}`);
+
     const endpoint = this.endpoint("mqtt");
 
-    const lines = [
+    lines.push(
       `listener ${endpoint.port}`,
-      "log_timestamp false",
-      "allow_anonymous true",
       "persistence_location /var/lib/mosquitto",
       "password_file /etc/mosquitto/passwd",
       "acl_file /etc/mosquitto/acl"
-    ];
+    );
 
     await writeLines(join(dir, "etc", "mosquitto"), "mosquitto.conf", lines);
 

package/types/services/influxdb.d.mts

@@ -537,7 +537,23 @@ export class InfluxdbService extends Service {
             };
         };
         priority: number;
-        properties: {};
+        properties: {
+            "metrics-disabled": {
+                isCommonOption: boolean;
+                type: string;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
+            };
+        };
         service: {
             endpoints: {
                 family: string;

package/types/services/mosquitto.d.mts

@@ -537,7 +537,38 @@ export class MosquittoService extends Service {
             };
         };
         priority: number;
-        properties: {};
+        properties: {
+            log_timestamp: {
+                isCommonOption: boolean;
+                type: string;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
+            };
+            allow_anonymous: {
+                isCommonOption: boolean;
+                type: string;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                env?: string[] | string;
+            };
+        };
         service: {
             extends: string[];
         };