pmcf 3.16.5 → 3.17.0

package/package.json

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

package/src/network-interfaces/network-interface.mjs

@@ -14,6 +14,7 @@ import {
 import { asArray, writeLines, sectionLines } from "../utils.mjs";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
 import { Network } from "../network.mjs";
+import { yesno } from "../utils.mjs";
 
 export const NetworkInterfaceTypeDefinition = {
   name: "network_interface",
@@ -243,7 +244,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
         ...networkSectionExtra,
         DHCP: "no",
         DHCPServer: "no",
-        MulticastDNS: this.network.multicastDNS ? "yes" : "no",
+        MulticastDNS: yesno(this.network.multicastDNS),
         LinkLocalAddressing: "ipv6",
         IPv6LinkLocalAddressGenerationMode: "stable-privacy"
       }),

package/src/services/bind.mjs

@@ -4,7 +4,6 @@ import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal, reverseArpa } from "ip-utilties";
 import {
   addType,
-  oneOfType,
   default_attribute_writable,
   string_attribute_writable,
   boolean_attribute_writable_true,
@@ -13,7 +12,7 @@ import {
   string_collection_attribute_writable,
   name_attribute_writable
 } from "pacc";
-import { writeLines, asArray } from "../utils.mjs";
+import { yesno, writeLines, asArray } from "../utils.mjs";
 import {
   DNSRecord,
   dnsFullName,
@@ -619,7 +618,7 @@ export class BindService extends ExtraSourceService {
                 : "none"
             }; };`
           );
-          content.push(`  notify ${this.notify ? "yes" : "no"};`);
+          content.push(`  notify ${yesno(this.notify)};`);
         }
         content.push(`};`, "");
 

package/src/services/systemd-resolved.mjs

@@ -1,17 +1,21 @@
-import { addType } from "pacc";
+import { addType, boolean_attribute_writable } from "pacc";
 import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition,
   ServiceTypeDefinition,
   serviceEndpoints,
 } from "pmcf";
+import { yesno } from "../utils.mjs";
 
 const SystemdResolvedServiceTypeDefinition = {
   name: "systemd-resolved",
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  key: "name"
+  key: "name",
+  attributes: {
+    llmnr: boolean_attribute_writable
+  }
 };
 
 export class SystemdResolvedService extends ExtraSourceService {
@@ -28,7 +32,7 @@ export class SystemdResolvedService extends ExtraSourceService {
   }
 
   get systemdServices() {
-    return SystemdResolvedServiceTypeDefinition.name;
+    return this.type;
   }
 
   systemdConfigs(name) {
@@ -55,8 +59,8 @@ export class SystemdResolvedService extends ExtraSourceService {
           FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),
           Domains: [...this.localDomains].join(" "),
           DNSSEC: "no",
-          MulticastDNS: this.network.multicastDNS ? "yes" : "no",
-          LLMNR: "no"
+          MulticastDNS: yesno(this.network.multicastDNS),
+          LLMNR: yesno(this.llmnr)
         }
       ]
     };

package/src/utils.mjs

@@ -1,6 +1,10 @@
 import { writeFile, mkdir } from "node:fs/promises";
 import { join, dirname, basename } from "node:path";
 
+export function yesno(flag) {
+  return flag ? "yes" : "no";
+}
+
 export function domainName(name, defaultDomain) {
   const dcs = name.split(".");
   return defaultDomain === undefined || dcs.length > 1

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

@@ -1084,6 +1084,9 @@ export class SystemdResolvedService extends ExtraSourceService {
             };
         })[];
         key: string;
+        attributes: {
+            llmnr: import("pacc").AttributeDefinition;
+        };
     };
     get systemdServices(): string;
     systemdConfigs(name: any): {

package/types/utils.d.mts

@@ -1,3 +1,4 @@
+export function yesno(flag: any): "yes" | "no";
 export function domainName(name: any, defaultDomain: any): any;
 export function domainFromDominName(domainName: any, defaultDomain: any): any;
 export function writeLines(dir: any, name: any, lines: any): Promise<void>;