pmcf 2.31.1 → 2.32.1

package/bin/pmcf-info

@@ -3,17 +3,23 @@ import { prepare } from "../src/cli.mjs";
 const { root, args, options } = await prepare({
   service: {
     type: "string"
+  },
+  address: {
+    type: "string"
   }
 });
 
-const objectName = args[0];
-
-const object = objectName ? root.named(objectName) : root;
-
-if (options.service) {
-  for (const service of root.findServices({ type: options.service })) {
-    console.log(service.toString());
+for (const name of args) {
+  const object = await root.load(name);
+  if (options.service) {
+    for (const service of root.findServices({ type: options.service })) {
+      console.log(service.toString());
+    }
+  } else if (options.address) {
+    for (const na of object.networkAddresses()) {
+      console.log(na.toString());
+    }
+  } else {
+    console.log(object.toJSON());
   }
-} else {
-  console.log(object.toJSON());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.31.1",
+  "version": "2.32.1",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "ip-utilties": "^1.3.0",
+    "ip-utilties": "^1.3.1",
     "npm-pkgbuild": "^18.0.1",
     "pacc": "^3.4.0",
     "pkg-dir": "^8.0.0"

package/src/base.mjs

@@ -75,12 +75,12 @@ export class Base {
   }
 
   ownerFor(property, data) {
-    for (const type of property.type.owners) {
+    for (const type of property.type[0].owners) {
       if (this.typeName === type?.name) {
         return this;
       }
     }
-    for (const type of property.type.owners) {
+    for (const type of property.type[0].owners) {
       const owner = this[type?.name];
       if (owner) {
         return owner;
@@ -133,7 +133,7 @@ export class Base {
     };
 
     const instantiateAndAssign = (property, value) => {
-      if (primitives.has(property.type)) {
+      if (primitives.has(property.type[0])) {
         assign(property, value);
         return;
       }
@@ -151,13 +151,21 @@ export class Base {
         case "string":
           {
             value = this.expand(value);
-            let object = this.typeNamed(property.type.name, value);
+
+            let object;
+
+            for (const type of property.type) {
+              object = this.typeNamed(type.name, value);
+              if (object) {
+                break;
+              }
+            }
 
             if (object) {
               assign(property, object);
             } else {
-              if (property.type.constructWithIdentifierOnly) {
-                object = new property.type.clazz(
+              if (property.type[0].constructWithIdentifierOnly) {
+                object = new property.type[0].clazz(
                   this.ownerFor(property, value),
                   value
                 );
@@ -165,32 +173,36 @@ export class Base {
               } else {
                 this.finalize(() => {
                   value = this.expand(value);
-                  const object =
-                    this.typeNamed(property.type.name, value) ||
-                    this.owner.typeNamed(property.type.name, value) ||
-                    this.root.typeNamed(property.type.name, value); // TODO
-
-                  if (object) {
-                    assign(property, object);
-                  } else {
-                    this.error(
-                      "Not found",
-                      property.name,
-                      property.type.name,
-                      value
-                    );
+
+                  for (const type of property.type) {
+                    const object =
+                      this.typeNamed(type.name, value) ||
+                      this.owner.typeNamed(type.name, value) ||
+                      this.root.typeNamed(type.name, value); // TODO
+
+                    if (object) {
+                      assign(property, object);
+                      return;
+                    }
                   }
+
+                  this.error(
+                    "Not found",
+                    property.name,
+                    property.type.map(t => t.name),
+                    value
+                  );
                 });
               }
             }
           }
           break;
         case "object":
-          if (value instanceof property.type.clazz) {
+          if (value instanceof property.type[0].clazz) {
             assign(property, value);
           } else {
             const factory =
-              property.type.factoryFor?.(this, value) || property.type.clazz;
+              property.type[0].factoryFor?.(this, value) || property.type[0].clazz;
 
             assign(
               property,
@@ -570,7 +582,7 @@ export function extractFrom(
               value = [...value];
             }
 
-            value = extractFrom(value, def.type);
+            value = extractFrom(value, def.type[0]);
             if (value !== undefined) {
               json[name] = value;
             }

package/src/filter.mjs

@@ -52,7 +52,7 @@ export function* objectFilter(type, objects, filter) {
       };
       for (let t = type; t; t = t.extends) {
         for (const property of Object.values(t.properties)) {
-          switch (property.type) {
+          switch (property.type[0]) {
             case "boolean":
               if (
                 filter[property.name] !== undefined &&

package/src/host.mjs

@@ -45,7 +45,20 @@ const HostTypeDefinition = {
       type: "string",
       collection: false,
       writeable: true,
-      values: ["phone", "tablet", "router", "desktop", "server"]
+      values: [
+        "phone",
+        "tablet",
+        "router",
+        "gateway",
+        "desktop",
+        "notebook",
+        "server",
+        "monitor",
+        "camera",
+        "inverter",
+        "battery",
+        "virtual"
+      ]
     },
     architecture: {
       type: "string",
@@ -449,7 +462,7 @@ export class Host extends Base {
 
   *subnets() {
     for (const networkInterface of this.networkInterfaces.values()) {
-      yield* networkInterface.subnets;
+      yield* networkInterface.subnets();
     }
   }
 

package/src/module.mjs

@@ -3,7 +3,6 @@ export * from "./cluster.mjs";
 export * from "./owner.mjs";
 export * from "./location.mjs";
 export * from "./root.mjs";
-export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
 export * from "./network-address.mjs";

package/src/network-address.mjs

@@ -1,8 +1,8 @@
-import { familyIP, formatCIDR } from "ip-utilties";
+import { familyIP, formatCIDR, decodeIP } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 
 /**
- * 
+ *
  */
 export class NetworkAddress {
   /** @type {Subnet} */ subnet;
@@ -26,4 +26,8 @@ export class NetworkAddress {
   get cidrAddress() {
     return formatCIDR(this.address, this.subnet.prefixLength);
   }
+
+  toString() {
+    return `${this.networkInterface.fullName} ${decodeIP(this.address)}`;
+  }
 }

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

@@ -20,9 +20,9 @@ export const NetworkInterfaceTypeDefinition = {
     const kind = value.kind;
     const t = NetworkInterfaceTypeDefinition.specializations[kind];
 
-    if (!t) {
+    /*if (!t) {
       console.warn("FACTORY", owner.name, value, t?.name);
-    }
+    }*/
     if (t) {
       delete value.type;
       delete value.kind;

package/src/network.mjs

@@ -39,6 +39,12 @@ export class Network extends Owner {
     return this;
   }
 
+  get address() {
+    for(const subnet of this.subnets()) {
+      return subnet.address;
+    }
+  }
+
   networkNamed(name) {
     if (this.isNamed(name)) {
       return this;

package/src/owner.mjs

@@ -1,7 +1,7 @@
-import { normalizeCIDR } from "ip-utilties";
+import { normalizeCIDR, familyIP } from "ip-utilties";
 import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
-import { Subnet } from "./subnet.mjs";
+import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { addType, types } from "./types.mjs";
 const OwnerTypeDefinition = {
   name: "owner",
@@ -182,19 +182,25 @@ export class Owner extends Base {
   }
 
   addSubnet(address) {
-    const { cidr } = normalizeCIDR(address);
+    const { cidr, prefixLength } = normalizeCIDR(address);
 
-    if (cidr) {
+    if (cidr && prefixLength !== 0) {
       return this.subnetNamed(cidr) || new Subnet(this, cidr);
     }
 
-    const subnet = this.subnetForAddress(address);
+    let subnet = this.subnetForAddress(address);
+  
     if (!subnet) {
+      subnet =  familyIP(address) === 'IPv4' ?  SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
+
+      /*
       this.error(
         `Address without subnet ${address}`,
         [...this.subnets()].map(s => s.address)
       );
+      */
     }
+  
     return subnet;
   }
 

package/src/service.mjs

@@ -89,11 +89,11 @@ export const EndpointTypeDefinition = {
 
 export const ServiceTypeDefinition = {
   name: "service",
-  owners: ["host", "cluster"],
+  owners: ["host", "cluster", "network_interface"],
   priority: 0.4,
   extends: Base.typeDefinition,
   specializations: {},
-  factoryFor(owner,value) {
+  factoryFor(owner, value) {
     const type = value.type ?? value.name;
     const t = ServiceTypeDefinition.specializations[type];
 
@@ -145,15 +145,15 @@ export class Service extends Base {
   }
 
   get network() {
-    return this.server.network;
+    return this.host.network;
   }
 
-  get server() {
+  get host() {
     return this.owner;
   }
 
   get domainName() {
-    return this.server.domainName;
+    return this.host.domainName;
   }
 
   get ipAddressOrDomainName() {
@@ -165,7 +165,7 @@ export class Service extends Base {
   }
 
   get address() {
-    return this._ipAddresses?.[0] ?? this.server.address;
+    return this._ipAddresses?.[0] ?? this.host.address;
   }
 
   set ipAddresses(value) {
@@ -173,7 +173,7 @@ export class Service extends Base {
   }
 
   get networks() {
-    return this.server.networks;
+    return this.host.networks;
   }
 
   endpoints(filter) {
@@ -188,7 +188,7 @@ export class Service extends Base {
       }
     ];
 
-    const result = [...this.server.networkAddresses()]
+    const result = [...this.host.networkAddresses()]
       .map(na =>
         data.map(
           d =>

package/src/services/dhcp.mjs

@@ -53,7 +53,7 @@ export class DHCPService extends Service {
   endpoints(filter) {
     const endpoints = super.endpoints(filter);
 
-    for (const na of this.server.networkAddresses(
+    for (const na of this.host.networkAddresses(
       na => na.networkInterface.kind === "localhost"
     )) {
       endpoints.push(new Endpoint(this, na, controlAgentEndpoint));
@@ -65,7 +65,7 @@ export class DHCPService extends Service {
 
   async *preparePackages(dir) {
     const network = this.network;
-    const host = this.server;
+    const host = this.host;
     const name = host.name;
 
     console.log("kea", host.name, network.name);

package/src/services/dns.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isLinkLocal, reverseArpa } from "ip-utilties";
+import { isLinkLocal, reverseArpa, decodeIP } from "ip-utilties";
 import { writeLines } from "../utils.mjs";
 import {
   DNSRecord,
@@ -16,9 +16,11 @@ import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition
 } from "../extra-source-service.mjs";
-import { subnets } from "../subnet.mjs";
+import { addresses } from "../network-support.mjs";
 import { addHook } from "../hooks.mjs";
 
+const address_types = ["network", "host", "network_interface"];
+
 const DNSServiceTypeDefinition = {
   name: "dns",
   specializationOf: ServiceTypeDefinition,
@@ -26,9 +28,13 @@ const DNSServiceTypeDefinition = {
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
   properties: {
-    trusted: { type: "network", collection: true, writeable: true },
-    protected: { type: "network", collection: true, writeable: true },
-    open: { type: "network", collection: true, writeable: true },
+    trusted: {
+      type: address_types,
+      collection: true,
+      writeable: true
+    },
+    protected: { type: address_types, collection: true, writeable: true },
+    open: { type: address_types, collection: true, writeable: true },
     hasSVRRecords: {
       type: "boolean",
       collection: false,
@@ -53,7 +59,7 @@ const DNSServiceTypeDefinition = {
       writeable: true
     },
 
-    exclude: { type: "network", collection: true, writeable: true },
+    exclude: { type: address_types, collection: true, writeable: true },
     notify: {
       type: "boolean",
       collection: false,
@@ -87,9 +93,18 @@ const statisticsEndpoint = {
 const DNS_SERVICE_FILTER = { type: DNSServiceTypeDefinition.name };
 
 function addressList(objects) {
-  return Array.from(objects).map(object =>
-    typeof object === "string" ? object : object.name
-  );
+  return Array.from(objects).map(object => {
+    switch (typeof object) {
+      case "string":
+        return object;
+      case "object":
+        if (object.name) {
+          return object.name;
+        }
+
+        return decodeIP(object);
+    }
+  });
 }
 
 function addressesStatement(prefix, objects, generateEmpty = false) {
@@ -141,7 +156,7 @@ export class DNSService extends ExtraSourceService {
   endpoints(filter) {
     const endpoints = super.endpoints(filter);
 
-    for (const na of this.server.networkAddresses(
+    for (const na of this.owner.networkAddresses(
       na => na.networkInterface.kind === "localhost"
     )) {
       endpoints.push(new Endpoint(this, na, rdncEndpoint));
@@ -243,9 +258,9 @@ export class DNSService extends ExtraSourceService {
     }
 
     const acls = [
-      addressesStatement("acl trusted", subnets(this.trusted)),
-      addressesStatement("acl protected", subnets(this.protected)),
-      addressesStatement("acl open", subnets(this.open), true)
+      addressesStatement("acl trusted", addresses(this.trusted)),
+      addressesStatement("acl protected", addresses(this.protected)),
+      addressesStatement("acl open", addresses(this.open), true)
     ].flat();
 
     if (acls.length) {

package/src/services/ntp.mjs

@@ -67,7 +67,7 @@ export class NTPService extends ExtraSourceService {
 
   async *preparePackages(dir) {
     const network = this.network;
-    const host = this.server;
+    const host = this.host;
     const name = host.name;
 
     console.log("chrony", host.name, network.name);

package/src/subnet.mjs

@@ -56,9 +56,8 @@ export class Subnet extends Base {
     try {
       return matchPrefixIP(this.address, this.prefixLength, address);
     } catch (e) {
-      console.error(e, address, this.address, this.prefixLength);
+      console.error(e, this.toString(), address);
     }
-
     return false;
   }
 
@@ -92,6 +91,7 @@ export class Subnet extends Base {
 
 const _owner = { addObject() {} };
 export const SUBNET_GLOBAL_IPV4 = new Subnet(_owner, "0.0.0.0/0");
+export const SUBNET_GLOBAL_IPV6 = new Subnet(_owner, "::0/0");
 export const SUBNET_LOCALHOST_IPV4 = new Subnet(_owner, "127.0.0.1/8");
 export const SUBNET_LOCALHOST_IPV6 = new Subnet(_owner, "::1/128");
 

package/src/types.mjs

@@ -1,9 +1,11 @@
+import { asArray } from "./utils.mjs";
+
 export const types = {};
 
 export function addType(clazz) {
   const type = clazz.typeDefinition;
 
-  if(type.specializationOf) {
+  if (type.specializationOf) {
     type.specializationOf.specializations[type.name] = type;
   }
 
@@ -26,6 +28,32 @@ export function resolveTypeLinks() {
         type.identifier = property;
       }
 
+      const ts = [];
+
+      for (const type of asArray(property.type)) {
+        if (typeof type === "string") {
+          if (primitives.has(type)) {
+            ts.push(type);
+          } else {
+            const t = types[type];
+            if (t) {
+              ts.push(t);
+            } else {
+              console.error(
+                "Unknown type",
+                property.type,
+                type.name,
+                property.name
+              );
+            }
+          }
+        } else {
+          ts.push(type);
+        }
+      }
+      property.type = ts;
+
+      /*
       if (typeof property.type === "string") {
         if (!primitives.has(property.type)) {
           const type = types[property.type];
@@ -41,6 +69,9 @@ export function resolveTypeLinks() {
           }
         }
       }
+
+      property.type = asArray(property.type);
+      */
     }
   }
 

package/types/module.d.mts

@@ -3,7 +3,6 @@ export * from "./cluster.mjs";
 export * from "./owner.mjs";
 export * from "./location.mjs";
 export * from "./root.mjs";
-export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
 export * from "./network-address.mjs";

package/types/network-address.d.mts

@@ -9,5 +9,6 @@ export class NetworkAddress {
     get domainNames(): any;
     get family(): any;
     get cidrAddress(): any;
+    toString(): string;
 }
 import { Subnet } from "./subnet.mjs";

package/types/network.d.mts

@@ -201,6 +201,7 @@ export class Network extends Owner {
     gateway: any;
     _bridge: any;
     get network(): this;
+    get address(): any;
     set bridge(network: any);
     get bridge(): any;
 }

package/types/service.d.mts

@@ -305,7 +305,6 @@ export class Service extends Base {
     _extends: any[];
     set extends(value: any[]);
     get extends(): any[];
-    get server(): any;
     get domainName(): any;
     get ipAddressOrDomainName(): any;
     get addresses(): any;

package/types/services/dns.d.mts

@@ -265,17 +265,17 @@ export class DNSService extends ExtraSourceService {
         priority: number;
         properties: {
             trusted: {
-                type: string;
+                type: string[];
                 collection: boolean;
                 writeable: boolean;
             };
             protected: {
-                type: string;
+                type: string[];
                 collection: boolean;
                 writeable: boolean;
             };
             open: {
-                type: string;
+                type: string[];
                 collection: boolean;
                 writeable: boolean;
             };
@@ -303,7 +303,7 @@ export class DNSService extends ExtraSourceService {
                 writeable: boolean;
             };
             exclude: {
-                type: string;
+                type: string[];
                 collection: boolean;
                 writeable: boolean;
             };

package/types/subnet.d.mts

@@ -38,6 +38,7 @@ export class Subnet extends Base {
     _traverse(...args: any[]): boolean;
 }
 export const SUBNET_GLOBAL_IPV4: Subnet;
+export const SUBNET_GLOBAL_IPV6: Subnet;
 export const SUBNET_LOCALHOST_IPV4: Subnet;
 export const SUBNET_LOCALHOST_IPV6: Subnet;
 import { Base } from "./base.mjs";

package/src/address.mjs

@@ -1,32 +0,0 @@
-import { Base } from "./base.mjs";
-import { addType } from "./types.mjs";
-
-const AddressTypeDefinition = {
-  name: "address",
-  owners: ["location", "owner", "network", "root"],
-  priority: 0.6,
-  constructWithIdentifierOnly: true,
-  properties: {
-    address: {
-      type: "string",
-      collection: false,
-      writeable: false,
-      identifier: true
-    },
-  }
-};
-
-
-export class Address extends Base {
-  static {
-    addType(this);
-  }
-
-  static get typeDefinition() {
-    return AddressTypeDefinition;
-  }
-
-  constructor(owner, address) {
-    super(owner, address);
-  }
-}

package/types/address.d.mts

@@ -1,17 +0,0 @@
-export class Address extends Base {
-    static get typeDefinition(): {
-        name: string;
-        owners: string[];
-        priority: number;
-        constructWithIdentifierOnly: boolean;
-        properties: {
-            address: {
-                type: string;
-                collection: boolean;
-                writeable: boolean;
-                identifier: boolean;
-            };
-        };
-    };
-}
-import { Base } from "./base.mjs";