pmcf 3.10.26 → 3.11.0

package/bin/pmcf-info

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { prepare } from "../src/cli.mjs";
+
 const { root, args, options } = await prepare({
   service: {
     type: "string"
@@ -12,7 +13,7 @@ const { root, args, options } = await prepare({
 for (const name of args) {
   const object = await root.load(name);
   if (options.service) {
-    for (const service of root.findServices({ type: options.service })) {
+    for (const service of root.findServices(`type="${options.service}"`)) {
       console.log(service.toString());
     }
   } else if (options.address) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.10.26",
+  "version": "3.11.0",
   "publishConfig": {
     "access": "public"
   },
@@ -52,8 +52,8 @@
   },
   "dependencies": {
     "ip-utilties": "^1.4.9",
-    "npm-pkgbuild": "^18.3.0",
-    "pacc": "^4.29.0",
+    "npm-pkgbuild": "^18.3.7",
+    "pacc": "^4.37.7",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {
@@ -61,11 +61,11 @@
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.8",
+    "semantic-release": "^24.2.9",
     "typescript": "^5.9.2"
   },
   "engines": {
-    "node": ">=22.19.0"
+    "node": ">=22.20.0"
   },
   "repository": {
     "type": "git",

package/src/base.mjs

@@ -3,7 +3,6 @@ import { allOutputs } from "npm-pkgbuild";
 import {
   parse,
   expand,
-  baseTypes,
   attributeIterator,
   name_attribute_writable,
   string_attribute,
@@ -18,7 +17,7 @@ import { asArray } from "./utils.mjs";
 
 const BaseTypeDefinition = {
   name: "base",
-  owners: [],
+  key: "name",
   attributes: {
     owner: { type: "base", collection: false, writable: false },
     type: string_attribute,
@@ -77,19 +76,21 @@ export class Base {
     }
   }
 
-  ownerFor(property, data) {
-    for (const type of property.type[0].owners) {
-      if (this.typeName === type?.name) {
-        return this;
+  ownerFor(attribute, data) {
+    const owners = attribute.type.owners;
+    if (owners) {
+      for (const type of owners) {
+        if (this.typeName === type?.name) {
+          return this;
+        }
       }
-    }
-    for (const type of property.type[0].owners) {
-      const owner = this[type?.name];
-      if (owner) {
-        return owner;
+      for (const type of owners) {
+        const owner = this[type?.name];
+        if (owner) {
+          return owner;
+        }
       }
     }
-
     return this;
   }
 
@@ -145,7 +146,7 @@ export class Base {
     };
 
     const instantiateAndAssign = (name, attribute, value) => {
-      if (baseTypes.has(attribute.type[0])) {
+      if (attribute.type.primitive) {
         assign(name, attribute, value);
         return;
       }
@@ -164,7 +165,7 @@ export class Base {
           {
             let object;
 
-            for (const type of attribute.type) {
+            for (const type of attribute.type.members || [attribute.type]) {
               object = this.typeNamed(type.name, value);
               if (object) {
                 break;
@@ -174,8 +175,8 @@ export class Base {
             if (object) {
               assign(name, attribute, object);
             } else {
-              if (attribute.type[0].constructWithIdentifierOnly) {
-                object = new attribute.type[0].clazz(
+              if (attribute.type.constructWithIdentifierOnly) {
+                object = new attribute.type.clazz(
                   this.ownerFor(attribute, value),
                   value
                 );
@@ -185,7 +186,9 @@ export class Base {
                 this.finalize(() => {
                   value = this.expand(value);
 
-                  for (const type of attribute.type) {
+                  for (const type of attribute.type.members || [
+                    attribute.type
+                  ]) {
                     const object =
                       this.typeNamed(type.name, value) ||
                       this.owner.typeNamed(type.name, value) ||
@@ -209,14 +212,14 @@ export class Base {
           }
           break;
         case "object":
-          if (value instanceof attribute.type[0].clazz) {
+          if (attribute.type.clazz && value instanceof attribute.type.clazz) {
             assign(name, attribute, value);
           } else {
             assign(
               name,
               attribute,
               typeFactory(
-                attribute.type[0],
+                attribute.type,
                 this.ownerFor(attribute, value),
                 value
               )
@@ -247,7 +250,8 @@ export class Base {
               } else {
                 for (const [objectName, objectData] of Object.entries(value)) {
                   if (typeof objectData === "object") {
-                    objectData[type.identifier.name] = objectName;
+                    //console.log("KEY", objectName, type.name, type.key);
+                    objectData[attribute.type.key] = objectName;
                   }
                   instantiateAndAssign(name, attribute, objectData);
                 }
@@ -404,7 +408,7 @@ export class Base {
   }
 
   get smtp() {
-    return this.findService({ type: "smtp" });
+    return this.findService('type="smtp"');
   }
 
   expression(expression) {
@@ -428,9 +432,7 @@ export class Base {
   }
 
   *findServices(filter) {
-    if (this.owner) {
-      yield* this.owner.findServices(filter);
-    }
+    yield* this.owner?.findServices(filter);
   }
 
   set directory(directory) {
@@ -587,12 +589,12 @@ export function extractFrom(
       return undefined;
     }
 
-    if (typeDefinition?.identifier) {
+    if (typeDefinition?.key) {
       return Object.fromEntries(
         object.map(o => {
           o = extractFrom(o);
-          const name = o[typeDefinition.identifier.name];
-          delete o[typeDefinition.identifier.name];
+          const name = o[typeDefinition.key];
+          delete o[typeDefinition.key];
           return [name, o];
         })
       );
@@ -604,7 +606,8 @@ export function extractFrom(
   const json = {};
 
   do {
-    for (const [name, def] of Object.entries(typeDefinition.attributes)) {
+    for (const [path, def] of attributeIterator(typeDefinition.attributes)) {
+      const name = path.join(".");
       let value = object[name];
 
       switch (typeof value) {
@@ -616,7 +619,7 @@ export function extractFrom(
               value = [...value];
             }
 
-            value = extractFrom(value, def.type[0]);
+            value = extractFrom(value, def.type);
             if (value !== undefined) {
               json[name] = value;
             }

package/src/cluster.mjs

@@ -12,6 +12,7 @@ const ClusterTypeDefinition = {
   owners: [Owner.typeDefinition, "network", "location", "root"],
   priority: 0.7,
   extends: Host.typeDefinition,
+  key: "name",
   attributes: {
     routerId: number_attribute_writable,
     masters: { type: "network_interface", collection: true, writable: true },
@@ -155,8 +156,8 @@ export class Cluster extends Host {
 
           for (const member of this.members) {
             const memberService =
-              member.findService({ type: endpoint.type }) ||
-              member.host.findService({ type: endpoint.type }); // TODO
+              member.findService(`type="${endpoint.type}"`) ||
+              member.host.findService(`type="${endpoint.type}"`); // TODO
 
             cfg.push(`  real_server ${member.address} ${memberService.port} {`);
             cfg.push(`    weight ${memberService.weight}`);

package/src/host.mjs

@@ -6,7 +6,8 @@ import {
   string_attribute_writable,
   string_collection_attribute_writable,
   number_attribute_writable,
-  boolean_attribute_false
+  boolean_attribute_false,
+  name_attribute
 } from "pacc";
 import { ServiceOwner, Base, addresses } from "pmcf";
 import { networkAddressAttributes } from "./network-support.mjs";
@@ -28,6 +29,7 @@ const HostTypeDefinition = {
   priority: 0.5,
   owners: ["owner", "network", "root"],
   extends: Base.typeDefinition,
+  key: "name",
   attributes: {
     ...networkAddressAttributes,
     networkInterfaces: {
@@ -457,10 +459,6 @@ export class Host extends ServiceOwner {
           { base: this.directory, pattern: "*_key" },
           { destination: "/etc/ssh/", mode: 0o600 }
         ),
-        new FileContentProvider(
-          { base: this.directory, pattern: "credential.secret" },
-          { destination: "/var/lib/systemd/", mode: 0o400 }
-        ),
         new FileContentProvider(dir + "/")
       ],
       outputs: this.outputs,

package/src/location.mjs

@@ -9,6 +9,7 @@ const LocationTypeDefinition = {
   owners: [Owner.typeDefinition, "location", "root"],
   priority: 1.0,
   extends: Owner.typeDefinition,
+  key: "name",
   attributes: {
     locales: string_collection_attribute_writable
   }

package/src/network-interfaces/ethernet.mjs

@@ -10,6 +10,7 @@ export const EthernetNetworkInterfaceTypeDefinition = {
   owners: NetworkInterfaceTypeDefinition.owners,
   extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
+  key: "name",
   attributes: {
     arpbridge: { type: "network_interface", collection: true, writable: true }
   }

package/src/network-interfaces/loopback.mjs

@@ -9,7 +9,7 @@ const LoopbackNetworkInterfaceTypeDefinition = {
   owners: NetworkInterfaceTypeDefinition.owners,
   extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
-  attributes: {}
+  key: "name"
 };
 
 const _localAddresses = new Map([
@@ -28,8 +28,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
     return LoopbackNetworkInterfaceTypeDefinition;
   }
 
-  static isCommonName(name)
-  {
+  static isCommonName(name) {
     return name.match(/lo\d+$/);
   }
 
@@ -58,10 +57,9 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
     return _localAddresses;
   }
 
-    set mtu(v) {}
+  set mtu(v) {}
 
-  get mtu()
-  {
+  get mtu() {
     return 16436;
   }
 }

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

@@ -9,6 +9,7 @@ import {
 import { asArray, writeLines, sectionLines } from "../utils.mjs";
 import { addType } from "../types.mjs";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
+import { Network } from "../network.mjs";
 
 export const NetworkInterfaceTypeDefinition = {
   name: "network_interface",
@@ -19,6 +20,7 @@ export const NetworkInterfaceTypeDefinition = {
   factoryFor(owner, value) {
     let t = NetworkInterfaceTypeDefinition.specializations[value.kind];
 
+    //console.log("factoryFor", owner, value);
     if (!t) {
       for (t of Object.values(NetworkInterfaceTypeDefinition.specializations)) {
         if (t.clazz.isCommonName && t.clazz.isCommonName(value.name)) {
@@ -35,6 +37,7 @@ export const NetworkInterfaceTypeDefinition = {
 
     return NetworkInterface;
   },
+  key: "name",
   attributes: {
     ...networkAttributes,
     ...networkAddressAttributes,
@@ -43,7 +46,11 @@ export const NetworkInterfaceTypeDefinition = {
     hostName: { ...hostname_attribute, writable: true },
     ipAddresses: { ...string_attribute_writable },
     hwaddr: { ...string_attribute_writable },
-    network: { type: "network", collection: false, writable: true },
+    network: {
+      type: Network.typeDefinition,
+      collection: false,
+      writable: true
+    },
     destination: { ...string_attribute_writable }
   }
 };
@@ -211,7 +218,9 @@ export class NetworkInterface extends SkeletonNetworkInterface {
 
     const routeSectionExtra = this.destination
       ? { Destination: this.destination }
-      : this.gateway ? { Gateway: this.gatewayAddress } : {};
+      : this.gateway
+      ? { Gateway: this.gatewayAddress }
+      : {};
 
     const networkSectionExtra = this.arpbridge
       ? {

package/src/network-interfaces/tun.mjs

@@ -8,7 +8,7 @@ const TUNdNetworkInterfaceTypeDefinition = {
   owners: NetworkInterfaceTypeDefinition.owners,
   extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
-  attributes: {}
+  key: "name"
 };
 
 export class TUNNetworkInterface extends NetworkInterface {

package/src/network-interfaces/wireguard.mjs

@@ -8,7 +8,7 @@ const WireguardNetworkInterfaceTypeDefinition = {
   owners: NetworkInterfaceTypeDefinition.owners,
   extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
-  attributes: {}
+  key: "name"
 };
 
 export class WireguardNetworkInterface extends SkeletonNetworkInterface {

package/src/network-interfaces/wlan.mjs

@@ -15,6 +15,7 @@ const WLANNetworkInterfaceTypeDefinition = {
   owners: EthernetNetworkInterfaceTypeDefinition.owners,
   extends: EthernetNetworkInterfaceTypeDefinition,
   priority: 0.1,
+  key: "name",
   attributes: {
     ssid: string_attribute_writable,
     psk: { ...secret_attribute, writable: true },

package/src/network-support.mjs

@@ -1,4 +1,6 @@
 import {
+  oneOfType,
+  default_attribute_writable,
   string_collection_attribute_writable,
   string_attribute_writable,
   number_attribute_writable,
@@ -6,7 +8,10 @@ import {
   boolean_attribute_writable
 } from "pacc";
 
-export const networkAddressType = ["network", "host", "network_interface"];
+export const networkAddressType = oneOfType("network|host|network_interface");
+//export const networkAddressType = oneOfType([NetworkTypeDefinition,"host","network_interface"]);
+
+export const networks_attribute = { ...default_attribute_writable, type: "network", collection: true };
 
 export const networkAttributes = {
   scope: {
@@ -27,13 +32,13 @@ export const networkAttributes = {
   secretName: string_attribute_writable,
   metric: { ...number_attribute_writable /*default: 1004*/ },
   mtu: { ...number_attribute_writable, default: 1500 },
-  gateway: { type: "host", collection: false, writable: true },
+  gateway: { ...default_attribute_writable, type: "host" },
   multicastDNS: boolean_attribute_writable
 };
 
 export const networkAddressAttributes = {
   hostName: { ...hostname_attribute, writable: true },
-  cidrAddresses: string_collection_attribute_writable ,
+  cidrAddresses: string_collection_attribute_writable,
   cidrAddress: string_attribute_writable,
   addresses: string_collection_attribute_writable,
   address: string_attribute_writable

package/src/network.mjs

@@ -4,11 +4,12 @@ import { Subnet } from "./subnet.mjs";
 import { addType } from "./types.mjs";
 import { networkAttributes } from "./network-support.mjs";
 
-const NetworkTypeDefinition = {
+export const NetworkTypeDefinition = {
   name: "network",
   owners: ["location", "owner", "root"],
   priority: 0.8,
   extends: Owner.typeDefinition,
+  key: "name",
   attributes: {
     ...networkAttributes,
     bridge: {

package/src/owner.mjs

@@ -8,14 +8,16 @@ import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { addType, types } from "./types.mjs";
+import { networks_attribute } from "./network-support.mjs";
 
 const OwnerTypeDefinition = {
   name: "owner",
   owners: ["location", "owner", "root"],
   priority: 0.9,
   extends: Base.typeDefinition,
+  key: "name",
   attributes: {
-    networks: { type: "network", collection: true, writable: true },
+    networks: networks_attribute,
     hosts: { type: "host", collection: true, writable: true },
     clusters: { type: "cluster", collection: true, writable: true },
     subnets: { type: Subnet.typeDefinition, collection: true, writable: true },

package/src/root.mjs

@@ -5,10 +5,8 @@ import { addType, types, resolveTypeLinks, typeFactory } from "./types.mjs";
 
 const RootTypeDefinition = {
   name: "root",
-  owners: [],
   priority: 1000,
-  extends: Location.typeDefinition,
-  attributes: {}
+  extends: Location.typeDefinition
 };
 
 export class Root extends Location {

package/src/service-owner.mjs

@@ -1,6 +1,4 @@
 import { Base } from "pmcf";
-import { objectFilter } from "./filter.mjs";
-import { types } from "./types.mjs";
 
 export class ServiceOwner extends Base {
   _services = [];
@@ -18,7 +16,13 @@ export class ServiceOwner extends Base {
   }
 
   *findServices(filter) {
-    yield* objectFilter(types.service, this._services, filter);
+    const services = filter
+      ? this.expression(`services[${filter}]`)
+      : this.services;
+
+    for (const service of services) {
+      yield service;
+    }
   }
 
   _traverse(...args) {
@@ -40,6 +44,10 @@ export class ServiceOwner extends Base {
       }
     }
 
+    if (typeName === "number") {
+      throw new Error("invalidType");
+    }
+    //console.log("TN***",typeName, name);
     return super.typeNamed(typeName, name);
   }
 

package/src/service.mjs

@@ -41,12 +41,13 @@ export const EndpointTypeDefinition = {
   owners: ["service", "network_interface"],
   priority: 0.4,
   specializations: {},
+  key: "type",
   attributes: endpointAttributes
 };
 
 export const ServiceTypeDefinition = {
   name: "service",
-  owners: ["host", "cluster", "network_interface"],
+  owners: [Host.typeDefinition, "cluster", "network_interface"],
   priority: 0.4,
   extends: Base.typeDefinition,
   specializations: {},
@@ -61,6 +62,7 @@ export const ServiceTypeDefinition = {
 
     return Service;
   },
+  key: "name",
   attributes: {
     ...networkAddressAttributes,
     ...endpointAttributes,
@@ -193,7 +195,7 @@ export class Service extends Base {
 
   address(
     options = {
-      endpoints: e => e.networkInterface?.kind !== "loopbak",
+      endpoints: e => e.networkInterface && e.networkInterface.kind !== "loopbak",
       select: e => e.domainName || e.address,
       limit: 1,
       join: ""

package/src/services/bind.mjs

@@ -3,6 +3,7 @@ import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal, reverseArpa } from "ip-utilties";
 import {
+  oneOfType,
   string_attribute_writable,
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
@@ -33,9 +34,10 @@ const BindServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
+  key: "name",
   attributes: {
     zones: {
-      type: [...networkAddressType, "location", "owner"],
+      type: oneOfType([networkAddressType, "location", "owner"]),
       collection: true,
       writable: true
     },
@@ -226,7 +228,8 @@ export class BindService extends ExtraSourceService {
     };
 
     const forwarders = serviceEndpoints(this.source, {
-      services: { types: "dns", priority: ">=300" },
+      services: 'type="dns" && priority>=100 && priority<200',
+      endpoints: endpoint => endpoint.family !== "dns",
       select: e => e.address,
       limit: 5
     });
@@ -540,7 +543,7 @@ export class BindService extends ExtraSourceService {
   }
 
   get defaultRecords() {
-    const nameService = this.findService({ types: "dns", priority: ">=300" });
+    const nameService = this.findService('(type="dns" || type="bind") && priority>=300'); // TODO bind = dns ?
 
     const SOARecord = DNSRecord(
       "@",

package/src/services/chrony.mjs

@@ -19,7 +19,7 @@ const ChronyServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  attributes: {},
+  key: "name",
   service: {
     extends: ["ntp"],
     services: {
@@ -87,15 +87,13 @@ export class ChronyService extends ExtraSourceService {
 
     const lines = [
       ...serviceEndpoints(this, {
-        services: {
-          types: "ntp",
-          priority: ">=100"
-        },
+        services: 'type="ntp" && priority>=100',
         endpoints: e =>
           e.type === "ntp" &&
           !isLinkLocal(e.address) &&
           e.service.host !== host &&
-          e.networkInterface?.kind !== "loopback",
+          e.networkInterface &&
+          e.networkInterface.kind !== "loopback",
 
         select: endpoint => {
           const options = [

package/src/services/headscale.mjs

@@ -11,7 +11,7 @@ const HeadscaleServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  attributes: {},
+  key: "name",
   service: {
     endpoints: [
       {

package/src/services/influxdb.mjs

@@ -11,6 +11,7 @@ const InfluxdbServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
+  key: "name",
   attributes: {
     "metrics-disabled": {
       ...boolean_attribute_writable_true,