pmcf 2.44.0 → 2.46.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.44.0",
+  "version": "2.46.0",
   "publishConfig": {
     "access": "public"
   },
@@ -35,14 +35,14 @@
   },
   "scripts": {
     "prepare": "node --run prepare:typescript",
-    "prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
+    "prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
     "test": "node --run test:ava",
     "test:ava": "ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs",
     "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
     "docs": "documentation readme --section=API ./src**/*.mjs",
     "lint": "node --run lint:docs && node --run lint:typescript",
     "lint:docs": "documentation lint ./src**/*.mjs",
-    "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
+    "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
     "ip-utilties": "^1.3.1",

package/src/host.mjs

@@ -47,6 +47,7 @@ const HostTypeDefinition = {
     weight: { type: "number", collection: false, writeable: true },
     serial: { type: "string", collection: false, writeable: true },
     vendor: { type: "string", collection: false, writeable: true },
+    keymap: { type: "string", collection: false, writeable: true },
     chassis: {
       type: "string",
       collection: false,
@@ -95,6 +96,7 @@ export class Host extends ServiceOwner {
   _vendor;
   _architecture;
   _serial;
+  _keymap;
 
   static {
     addType(this);
@@ -187,6 +189,14 @@ export class Host extends ServiceOwner {
     return this.extendedProperty("_vendor");
   }
 
+  set keymap(value) {
+    this._keymap = value;
+  }
+
+  get keymap() {
+    return this.extendedProperty("_keymap");
+  }
+
   set architecture(value) {
     this._architecture = value;
   }
@@ -490,6 +500,10 @@ export class Host extends ServiceOwner {
       await ni.systemdDefinitions(packageData);
     }
 
+    if (this.keymap) {
+      await writeLines(dir, "etc/vconsole.conf", `KEYMAP=${this.keymap}`);
+    }
+
     await generateMachineInfo(this, packageData);
     await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
 

package/src/service.mjs

@@ -184,10 +184,6 @@ export class Service extends Base {
     return this.host.domainName;
   }
 
-  get ipAddressOrDomainName() {
-    return this.address ?? this.domainName;
-  }
-
   get networks() {
     return this.host.networks;
   }
@@ -209,7 +205,14 @@ export class Service extends Base {
     return filter ? result.filter(filter) : result;
   }
 
-  address(options = { select: e => e.address, limit: 1 }) {
+  address(
+    options = {
+      endpoints: e => e.networkInterface?.kind !== "loopbak",
+      select: e => e.domainName||e.address,
+      limit: 1,
+      join: ""
+    }
+  ) {
     const all = this.endpoints(options.endpoints);
     const res = [...new Set(options.select ? all.map(options.select) : all)];
 
@@ -217,7 +220,7 @@ export class Service extends Base {
       res.length = options.limit;
     }
 
-    return options.join ? res.join(options.join) : res;
+    return options.join !== undefined ? res.join(options.join) : res;
   }
 
   set alias(value) {

package/src/services/bind.mjs

@@ -527,20 +527,19 @@ export class BINDService extends ExtraSourceService {
 
   get defaultRecords() {
     const nameService = this.findService({ type: "dns", priority: "<10" });
-    const rname = this.administratorEmail.replace(/@/, ".");
 
     const SOARecord = DNSRecord(
       "@",
       "SOA",
       dnsFullName(nameService.domainName),
-      dnsFullName(rname),
+      dnsFullName(this.administratorEmail.replace(/@/, ".")),
       `(${[...this.soaUpdates].join(" ")})`
     );
 
     const NSRecord = DNSRecord(
       "@",
       "NS",
-      dnsFullName(nameService.ipAddressOrDomainName)
+      dnsFullName(nameService.address())
     );
 
     return [SOARecord, NSRecord];

package/types/cluster.d.mts

@@ -238,6 +238,11 @@ export class Cluster extends Host {
                     collection: boolean;
                     writeable: boolean;
                 };
+                keymap: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 chassis: {
                     type: string;
                     collection: boolean;

package/types/host.d.mts

@@ -103,6 +103,11 @@ export class Host extends ServiceOwner {
                 collection: boolean;
                 writeable: boolean;
             };
+            keymap: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             chassis: {
                 type: string;
                 collection: boolean;
@@ -185,6 +190,7 @@ export class Host extends ServiceOwner {
     _vendor: any;
     _architecture: any;
     _serial: any;
+    _keymap: any;
     extra: any;
     _applyExtends(host: any): void;
     set serial(value: any);
@@ -195,6 +201,8 @@ export class Host extends ServiceOwner {
     get chassis(): any;
     set vendor(value: any);
     get vendor(): any;
+    set keymap(value: any);
+    get keymap(): any;
     set architecture(value: any);
     get architecture(): any;
     get isTemplate(): true | RegExpMatchArray;

package/types/service.d.mts

@@ -313,12 +313,13 @@ export class Service extends Base {
     get host(): Host;
     hosts(): Generator<any, void, any>;
     get domainName(): any;
-    get ipAddressOrDomainName(): any;
     get networks(): Set<any>;
     endpoints(filter: any): any[];
     address(options?: {
+        endpoints: (e: any) => boolean;
         select: (e: any) => any;
         limit: number;
+        join: string;
     }): string | any[];
     set alias(value: any);
     get alias(): any;