pmcf 1.79.2 → 1.79.4

package/package.json

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

package/src/dns-utils.mjs

@@ -1,3 +1,5 @@
+import { asArray, asIterator } from "./utils.mjs";
+
 export function dnsFullName(name) {
   return name.endsWith(".") ? name : name + ".";
 }
@@ -17,6 +19,24 @@ export function DNSRecord(key, type, ...values) {
 
 export function dnsFormatParameters(parameters) {
   return Object.entries(parameters)
-    .map(([name, value]) => (value !== undefined ? `${name}="${value}"` : name))
+    .map(([name, value]) =>
+      value !== undefined && [...asIterator(value)].length > 0
+        ? `${name}="${[...asIterator(value)].join(",")}"`
+        : name
+    )
     .join(" ");
 }
+
+export function dnsMergeParameters(a, b) {
+  return Object.fromEntries(
+    [...new Set([...Object.keys(a), ...Object.keys(b)])].map(key => [
+      key,
+      new Set(asIterator(a[key])).union(new Set(asIterator(b[key])))
+    ])
+  );
+}
+/*
+console.log(
+  dnsFormatParameters(dnsMergeParameters({ alpn: "h2" }, { alpn: "h3" }))
+);
+*/

package/src/host.mjs

@@ -38,7 +38,6 @@ const HostTypeDefinition = {
     },
     services: { type: "service", collection: true, writeable: true },
     aliases: { type: "string", collection: true, writeable: true },
-
     os: { type: "string", collection: false, writeable: true },
     "machine-id": { type: "string", collection: false, writeable: true },
     distribution: { type: "string", collection: false, writeable: true },

package/src/location.mjs

@@ -11,7 +11,6 @@ const LocationTypeDefinition = {
   priority: 1.0,
   extends: Owner.typeDefinition,
   properties: {
-    country: { type: "string", writeable: true },
     locales: { type: "string", collection: true, writeable: true }
   }
 };

package/src/service.mjs

@@ -2,7 +2,12 @@ import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 import { networkAddressProperties } from "./network-support.mjs";
-import { DNSRecord, dnsFullName, dnsFormatParameters } from "./dns-utils.mjs";
+import {
+  DNSRecord,
+  dnsFullName,
+  dnsFormatParameters,
+  dnsMergeParameters
+} from "./dns-utils.mjs";
 
 const ServiceTypes = {
   dns: { protocol: "udp", port: 53, tls: false },
@@ -213,13 +218,25 @@ export class Service extends Base {
 
     const dnsRecord = ServiceTypes[this.type]?.dnsRecord;
     if (dnsRecord) {
+      let parameters = dnsRecord.parameters;
+
+      for (const service of this.findServices()) {
+        if (service !== this) {
+          const r = ServiceTypes[service.type]?.dnsRecord;
+
+          if (r?.type === dnsRecord.type) {
+            parameters = dnsMergeParameters(parameters, r.parameters);
+          }
+        }
+      }
+
       records.push(
         DNSRecord(
           dnsFullName(domainName),
           dnsRecord.type,
           this.priority,
           ".",
-          dnsFormatParameters(dnsRecord.parameters)
+          dnsFormatParameters(parameters)
         )
       );
     }
@@ -228,7 +245,6 @@ export class Service extends Base {
   }
 }
 
-
 export const sortByPriority = (a, b) => a.priority - b.priority;
 
 export function serviceAddresses(

package/src/utils.mjs

@@ -55,8 +55,11 @@ export function asArray(value) {
 }
 
 export function asIterator(value) {
-  if (value === undefined) {
-    return [];
+  switch (typeof value) {
+    case "undefined":
+      return [];
+    case "string":
+      return [value];
   }
 
   if (typeof value[Symbol.iterator] === "function") {

package/types/dns-utils.d.mts

@@ -4,3 +4,6 @@ export function DNSRecord(key: any, type: any, ...values: any[]): {
     toString: (maxKeyLength: any, ttl: any) => string;
 };
 export function dnsFormatParameters(parameters: any): string;
+export function dnsMergeParameters(a: any, b: any): {
+    [k: string]: Set<any>;
+};

package/types/location.d.mts

@@ -401,10 +401,6 @@ export class Location extends Owner {
             };
         };
         properties: {
-            country: {
-                type: string;
-                writeable: boolean;
-            };
             locales: {
                 type: string;
                 collection: boolean;

package/types/root.d.mts

@@ -405,10 +405,6 @@ export class Root extends Location {
                 };
             };
             properties: {
-                country: {
-                    type: string;
-                    writeable: boolean;
-                };
                 locales: {
                     type: string;
                     collection: boolean;