pmcf 6.44.6 → 6.44.8

package/README.md

@@ -82,29 +82,29 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-16)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-18)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-19)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-19)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-20)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-21)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -293,7 +293,7 @@ Endpoint based on http
 ### Parameters
 
 *   `service` **Service** 
-*   `address` **any** 
+*   `address` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [URL](https://developer.mozilla.org/docs/Web/API/URL/URL))** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
 ### port
@@ -312,6 +312,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -402,18 +414,6 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

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

package/src/common-attributes.mjs

@@ -15,7 +15,7 @@ import {
 
 export const networkAddressType = "network|host|network_interface";
 
-export const extends_attribute = {  
+export const extends_attribute = {
   ...default_collection_attribute_writable,
   name: "extends"
 };
@@ -78,6 +78,21 @@ export const clusters_attribute = {
   backpointer: owner_attribute
 };
 
+export const address_attribute = {
+  ...string_attribute_writable,
+  name: "address"
+};
+
+export const cidr_address_attribute = {
+  ...string_attribute_writable,
+  name: "cidrAddress"
+};
+
+export const cidr_addresses_attribute = {
+  ...string_collection_attribute_writable,
+  name: "cidrAddresses"
+};
+
 export const subnets_attribute = {
   ...default_collection_attribute_writable,
   name: "subnets",
@@ -140,15 +155,13 @@ export const networkAttributes = {
   multicastDNS: { ...boolean_attribute_writable, name: "multicastDNS" }
 };
 
+
 export const networkAddressAttributes = {
   hostName: hostname_attribute,
-  cidrAddresses: {
-    ...string_collection_attribute_writable,
-    name: "cidrAddresses"
-  },
-  cidrAddress: { ...string_attribute_writable, name: "cidrAddress" },
+  cidrAddresses: cidr_addresses_attribute,
+  cidrAddress: cidr_address_attribute,
   addresses: { ...string_collection_attribute_writable, name: "addresses" },
-  address: { ...string_attribute_writable, name: "address" }
+  address: address_attribute
 };
 
 export const endpointAttributes = {
@@ -162,4 +175,3 @@ export const endpointAttributes = {
   tls: { ...boolean_attribute_false, name: "tls" },
   address: { ...string_attribute, name: "address" }
 };
-

package/src/network-address.mjs

@@ -9,7 +9,7 @@ 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 } from "./common-attributes.mjs";
+import { family_attribute, subnet_attribute, address_attribute, cidr_address_attribute } from "./common-attributes.mjs";
 /**
  *
  */
@@ -18,9 +18,9 @@ export class NetworkAddress {
   static priority = 1;
   static key = "address";
   static attributes = {
-    address: { ...string_attribute, name: "address" },
+    address: address_attribute,
     type: type_attribute,
-    cidrAddress: { ...string_attribute, name: "cidrAddress" },
+    cidrAddress: cidr_address_attribute,
     networkInterface: {
       ...default_attribute,
       name: "networkInterface",

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

@@ -53,9 +53,9 @@ export class NetworkInterface extends SkeletonNetworkInterface {
       private: true
     },
     hwaddr: { ...string_attribute_writable, name: "hwaddr" },
-    destination: { ...string_attribute_writable, name: "destination" },
+    destination: { ...string_attribute_writable, name: "destination" }
 
-/*
+    /*
     InitialCongestionWindow: { ...number_attribute_writable, name: "InitialCongestionWindow", default: 10, configurable: true },
     InitialAdvertisedReceiveWindow: { ...number_attribute_writable, name: "InitialAdvertisedReceiveWindow", default: 10, configurable: true },
     */
@@ -73,6 +73,14 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   _hwaddr;
   _class;
 
+  get cidrAddresses() {
+    return cidrAddresses(this.networkAddresses());
+  }
+  
+  get cidrAddress() {
+    return cidrAddresses(this.networkAddresses())[0];
+  }
+
   addSubnet(address) {
     if (this.network) {
       return this.network.addSubnet(address);
@@ -113,7 +121,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   set hostName(value) {
     this._hostName = value;
   }
-  
+
   get domains() {
     if (!this.host) {
       return new Set();

package/src/network-support.mjs

@@ -1,62 +0,0 @@
-import {
-  default_attribute_writable,
-  string_collection_attribute_writable,
-  string_attribute_writable,
-  integer_attribute_writable,
-  hostname_attribute as hostname_attribute_base,
-  boolean_attribute_writable
-} from "pacc";
-
-export const networkAddressType = "network|host|network_interface";
-
-export const networks_attribute = {
-  ...default_attribute_writable,
-  name: "networks",
-  type: "network",
-  collection: true
-};
-
-export const psk_attribute = { ...string_attribute_writable, name: "psk" };
-export const ssid_attribute = { ...string_attribute_writable, name: "ssid" };
-export const hostname_attribute = {
-  ...hostname_attribute_base,
-  name: "hostName",
-  writable: true
-};
-
-export const networkAttributes = {
-  scope: {
-    ...string_attribute_writable,
-    name: "scope",
-    values: ["global", "site", "link", "host"]
-    //  default: "global"
-  },
-  class: {
-    ...string_attribute_writable,
-    name: "class",
-    values: ["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"]
-  },
-  kind: {
-    ...string_attribute_writable,
-    name: "kind",
-    values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
-  },
-  ssid: ssid_attribute,
-  psk: psk_attribute,
-  secretName: { ...string_attribute_writable, name: "secretName" },
-  metric: { ...integer_attribute_writable, name: "metric" /*default: 1004*/ },
-  mtu: { ...integer_attribute_writable, name: "mtu", default: 1500 },
-  gateway: { ...default_attribute_writable, name: "gateway", type: "host" },
-  multicastDNS: { ...boolean_attribute_writable, name: "multicastDNS" }
-};
-
-export const networkAddressAttributes = {
-  hostName: hostname_attribute,
-  cidrAddresses: {
-    ...string_collection_attribute_writable,
-    name: "cidrAddresses"
-  },
-  cidrAddress: { ...string_attribute_writable, name: "cidrAddress" },
-  addresses: { ...string_collection_attribute_writable, name: "addresses" },
-  address: { ...string_attribute_writable, name: "address" }
-};