pmcf 6.48.3 → 6.49.1

package/package.json

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

package/src/interfaces/interface.mjs

@@ -0,0 +1,66 @@
+import { AggregatedMap } from "aggregated-map";
+import { asArray } from "pacc";
+import { host } from "../host.mjs";
+import { addType } from "../type.mjs";
+import { ServiceOwner } from "../service-owner.mjs";
+
+/**
+ *
+ */
+export class Interface extends ServiceOwner {
+  static get typeName() {
+    return "interface";
+  }
+
+  static commonNamePattern = new RegExp(`^${this.name}\d+$`);
+
+  static isCommonName(name) {
+    return this.commonNamePattern.test(name);
+  }
+
+  static {
+    addType(this);
+  }
+
+  get typeName() {
+    const type = this.constructor;
+    return type.specializationOf?.name || type.name;
+  }
+
+  get kind() {
+    return this.constructor.name;
+  }
+
+  get host() {
+    if (this.owner instanceof host) {
+      return this.owner;
+    }
+  }
+
+  get hosts() {
+    return asArray(this.host);
+  }
+
+  get domainName() {
+    return this.host?.domainName;
+  }
+
+  get domainNames() {
+    return new Set();
+  }
+
+  get services() {
+    return this.owner
+      ? new AggregatedMap([super.services, this.owner._services])
+      : super.services;
+  }
+
+  matches(other) {
+    if (this.isTemplate) {
+      const name = this.name.replaceAll("*", "");
+      return name.length === 0 || other.name.indexOf(name) >= 0;
+    }
+
+    return false;
+  }
+}

package/src/{network-interfaces → interfaces}/loopback.mjs

@@ -1,6 +1,6 @@
-import { addType } from "pacc";
 import { SUBNET_LOCALHOST_IPV4, SUBNET_LOCALHOST_IPV6 } from "pmcf";
-import { SkeletonNetworkInterface } from "./skeleton.mjs";
+import { addType } from "../type.mjs";
+import { SkeletonNetworkInterface } from "./skeleton-network-interface.mjs";
 import { NetworkInterface } from "./network-interface.mjs";
 
 const _localAddresses = new Map([

package/src/interfaces/modbus.mjs

@@ -0,0 +1,15 @@
+import { number_attribute_writable } from "pacc";
+import { addType } from "../type.mjs";
+import { Interface } from "./interface.mjs";
+
+export class modbus extends Interface {
+  static attributes = {
+    address: { number_attribute_writable, name: "address" }
+  };
+
+  static commonNamePattern = /^modbus\d*$/;
+
+  static {
+    addType(this);
+  }
+}

package/src/{network-interfaces → interfaces}/network-interface.mjs

@@ -4,7 +4,8 @@ import {
   default_collection_attribute_writable
 } from "pacc";
 import { network_attribute } from "../common-attributes.mjs";
-import { host, cidrAddresses, addType } from "pmcf";
+import { host, cidrAddresses } from "pmcf";
+import { addType } from "../type.mjs";
 import {
   networkAttributes,
   networkAddressAttributes,
@@ -12,7 +13,7 @@ import {
   cluster_attribute
 } from "../common-attributes.mjs";
 import { writeLines, sectionLines } from "../utils.mjs";
-import { SkeletonNetworkInterface } from "./skeleton.mjs";
+import { SkeletonNetworkInterface } from "./skeleton-network-interface.mjs";
 import { yesno } from "../utils.mjs";
 
 export class NetworkInterface extends SkeletonNetworkInterface {

package/src/{network-interfaces/skeleton.mjs → interfaces/skeleton-network-interface.mjs}

@@ -1,72 +1,23 @@
 import { join } from "node:path";
-import { AggregatedMap } from "aggregated-map";
-import { addType, asArray } from "pacc";
 import { writeLines, sectionLines } from "../utils.mjs";
-import { NetworkAddress, host, cidrAddresses } from "pmcf";
-import { ServiceOwner } from "../service-owner.mjs";
+import { addType } from "../type.mjs";
+import { NetworkAddress, cidrAddresses } from "pmcf";
+import { Interface } from "./interface.mjs";
 
 /**
  *
  */
-export class SkeletonNetworkInterface extends ServiceOwner {
+export class SkeletonNetworkInterface extends Interface {
   static get typeName() {
     return "network_interface";
   }
 
-  static commonNamePattern = new RegExp(`^${this.name}\d+$`);
-
-  static isCommonName(name) {
-    return this.commonNamePattern.test(name);
-  }
-
   static {
     addType(this);
   }
 
   _network;
 
-  get typeName() {
-    const type = this.constructor;
-    return type.specializationOf?.name || type.name;
-  }
-
-  get kind() {
-    return this.constructor.name;
-  }
-
-  get host() {
-    if (this.owner instanceof host) {
-      return this.owner;
-    }
-  }
-
-  get services() {
-    return this.owner
-      ? new AggregatedMap([super.services, this.owner._services])
-      : super.services;
-  }
-
-  get hosts() {
-    return asArray(this.host);
-  }
-
-  get domainName() {
-    return this.host?.domainName;
-  }
-
-  get domainNames() {
-    return new Set();
-  }
-
-  matches(other) {
-    if (this.isTemplate) {
-      const name = this.name.replaceAll("*", "");
-      return name.length === 0 || other.name.indexOf(name) >= 0;
-    }
-
-    return false;
-  }
-
   get network() {
     return this.attribute("_network") ?? this.host?.network;
   }

package/src/{network-interfaces → interfaces}/wireguard.mjs

@@ -1,5 +1,5 @@
 import { addType } from "pacc";
-import { SkeletonNetworkInterface } from "./skeleton.mjs";
+import { SkeletonNetworkInterface } from "./skeleton-network-interface.mjs";
 import { NetworkInterface } from "./network-interface.mjs";
 
 export class wireguard extends SkeletonNetworkInterface {

package/src/module.mjs

@@ -13,12 +13,13 @@ export * from "./network-address.mjs";
 export * from "./common-attributes.mjs";
 export * from "./content.mjs";
 export * from "./host.mjs";
-export * from "./network-interfaces/network-interface.mjs";
-export * from "./network-interfaces/loopback.mjs";
-export * from "./network-interfaces/ethernet.mjs";
-export * from "./network-interfaces/wlan.mjs";
-export * from "./network-interfaces/wireguard.mjs";
-export * from "./network-interfaces/tun.mjs";
+export * from "./interfaces/network-interface.mjs";
+export * from "./interfaces/loopback.mjs";
+export * from "./interfaces/ethernet.mjs";
+export * from "./interfaces/wlan.mjs";
+export * from "./interfaces/wireguard.mjs";
+export * from "./interfaces/tun.mjs";
+export * from "./interfaces/modbus.mjs";
 export * from "./service-types.mjs";
 export * from "./core-service.mjs";
 export * from "./service.mjs";

package/src/network-address.mjs

@@ -1,15 +1,14 @@
-import {
-  default_attribute,
-  string_attribute,
-  type_attribute,
-  getAttribute,
-  asArray
-} from "pacc";
+import { default_attribute, type_attribute, getAttribute, asArray } from "pacc";
 import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 import { Owner, addType } from "pmcf";
-import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
-import { family_attribute, subnet_attribute, address_attribute, cidr_address_attribute } from "./common-attributes.mjs";
+import { NetworkInterface } from "./interfaces/network-interface.mjs";
+import {
+  family_attribute,
+  subnet_attribute,
+  address_attribute,
+  cidr_address_attribute
+} from "./common-attributes.mjs";
 /**
  *
  */