pmcf 2.19.3 → 2.19.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.19.3",
+  "version": "2.19.5",
   "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.0.6",
+    "ip-utilties": "^1.1.0",
     "npm-pkgbuild": "^18.0.1",
     "pacc": "^3.3.0",
     "pkg-dir": "^8.0.0"

package/src/host.mjs

@@ -1,19 +1,10 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import {
-  isIPv4,
-  isIPv6,
-  formatCIDR,
-  hasWellKnownSubnet,
-  normalizeIP
-} from "ip-utilties";
+import { formatCIDR } from "ip-utilties";
 import { Base } from "./base.mjs";
-import {
-  networkProperties,
-  networkAddressProperties
-} from "./network-support.mjs";
-import { asArray, domainFromDominName, domainName } from "./utils.mjs";
+import { networkAddressProperties } from "./network-support.mjs";
+import { domainFromDominName, domainName } from "./utils.mjs";
 import { objectFilter } from "./filter.mjs";
 import { addType, types } from "./types.mjs";
 import { loadHooks } from "./hooks.mjs";
@@ -22,6 +13,7 @@ import {
   generateMachineInfo,
   generateKnownHosts
 } from "./host-utils.mjs";
+import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 
 const HostTypeDefinition = {
   name: "host",
@@ -456,7 +448,7 @@ export class Host extends Base {
 
   get cidrAddresses() {
     return [...this.networkAddresses()].map(({ address, subnet }) =>
-      formatCIDR(address, subnet)
+      formatCIDR(address, subnet.prefixLength)
     );
   }
 
@@ -504,312 +496,3 @@ export class Host extends Base {
     yield packageData;
   }
 }
-
-class SkeletonNetworkInterface extends Base {
-  _extends = [];
-  _network;
-
-  set extends(value) {
-    this._extends.push(value);
-  }
-
-  get extends() {
-    return this._extends;
-  }
-
-  get isTemplate() {
-    return this.name.indexOf("*") >= 0;
-  }
-
-  get host() {
-    return this.owner;
-  }
-
-  get network_interface() {
-    return this;
-  }
-
-  get domainNames() {
-    return new Set();
-  }
-
-  matches(other) {
-    if (this.isTemplate) {
-      const name = this.name.replace("*", "");
-      return name.length === 0 || other.name.indexOf(name) >= 0;
-    }
-
-    return false;
-  }
-
-  get network() {
-    return this.extendedProperty("_network") ?? this.host.network;
-  }
-
-  set network(network) {
-    this._network = network;
-  }
-
-  get rawAddress() {
-    return this.rawAddresses[0];
-  }
-
-  get rawIPv4Address() {
-    return this.rawAddresses.filter(a => isIPv4(a))[0];
-  }
-
-  get rawIPv6Address() {
-    return this.rawAddresses.filter(a => isIPv6(a))[0];
-  }
-
-  get cidrAddress() {
-    return this.cidrAddresses[0];
-  }
-}
-
-const NetworkInterfaceTypeDefinition = {
-  name: "network_interface",
-  priority: 0.4,
-  owners: ["host"],
-  extends: Base.typeDefinition,
-  specializations: {},
-  factoryFor(value) {
-    const kind = value.kind;
-    const t = NetworkInterfaceTypeDefinition.specializations[kind];
-
-    if (t) {
-      delete value.type;
-      return t.clazz;
-    }
-
-    return NetworkInterface;
-  },
-  properties: {
-    ...networkProperties,
-    ...networkAddressProperties,
-    hostName: { type: "string", collection: false, writeable: true },
-    ipAddresses: { type: "string", collection: true, writeable: true },
-
-    hwaddr: { type: "string", collection: false, writeable: true },
-    network: { type: "network", collection: false, writeable: true },
-    destination: { type: "string", collection: false, writeable: true },
-    arpbridge: { type: "network_interface", collection: true, writeable: true }
-  }
-};
-
-export class NetworkInterface extends SkeletonNetworkInterface {
-  static {
-    addType(this);
-  }
-
-  static get typeDefinition() {
-    return NetworkInterfaceTypeDefinition;
-  }
-
-  _ipAddresses = new Map();
-  _scope;
-  _metric;
-  _ssid;
-  _psk;
-  _kind;
-  _hostName;
-  _hwaddr;
-  _class;
-  arpbridge;
-
-  constructor(owner, data) {
-    super(owner, data);
-    this.read(data, NetworkInterfaceTypeDefinition);
-  }
-
-  addSubnet(address) {
-    if (!this.network) {
-      if (!hasWellKnownSubnet(address)) {
-        this.error("Missing network", address);
-      }
-    } else {
-      return this.network.addSubnet(address);
-    }
-  }
-
-  get ipAddresses() {
-    return this._ipAddresses;
-  }
-
-  set ipAddresses(value) {
-    for (const address of asArray(value)) {
-      this._ipAddresses.set(normalizeIP(address), this.addSubnet(address));
-    }
-  }
-
-  get rawAddresses() {
-    return [...this._ipAddresses].map(([address]) => address);
-  }
-
-  get cidrAddresses() {
-    return [...this._ipAddresses].map(([address, subnet]) =>
-      formatCIDR(address, subnet)
-    );
-  }
-
-  get rawIPv4Addresses() {
-    return [...this.ipAddresses]
-      .filter(([address]) => isIPv4(address))
-      .map(([address]) => address);
-  }
-
-  get rawIPv6Addresses() {
-    return [...this.ipAddresses]
-      .filter(([address]) => isIPv6(address))
-      .map(([address]) => address);
-  }
-
-  subnetForAddress(address) {
-    return (
-      this.network?.subnetForAddress(address) ||
-      this.host.owner.subnetForAddress(address)
-    );
-  }
-
-  get gateway() {
-    return this.network?.gateway;
-  }
-
-  get gatewayAddress() {
-    for (const a of this.gateway.networkAddresses()) {
-      if (a.networkInterface.network === this.network) {
-        return a.address;
-      }
-    }
-  }
-
-  get hostName() {
-    return this.extendedProperty("_hostName") ?? this.host.hostName;
-  }
-
-  set hostName(value) {
-    this._hostName = value;
-  }
-
-  get domainNames() {
-    return this.hostName
-      ? new Set([[this.hostName, this.host.domain].join(".")])
-      : this.host.directDomainNames;
-  }
-
-  set scope(value) {
-    this._scope = value;
-  }
-
-  get scope() {
-    return (
-      this.extendedProperty("_scope") ??
-      this.network?.scope ??
-      networkProperties.scope.default
-    );
-  }
-
-  set hwaddr(value) {
-    this._hwaddr = value;
-  }
-
-  get hwaddr() {
-    return this.extendedProperty("_hwaddr");
-  }
-
-  set metric(value) {
-    this._metric = value;
-  }
-
-  get metric() {
-    return (
-      this.extendedProperty("_metric") ??
-      this.network?.metric ??
-      networkProperties.metric.default
-    );
-  }
-
-  set MTU(value) {
-    this._MTU = value;
-  }
-
-  get MTU() {
-    return this.extendedProperty("_MTU") ?? networkProperties.MTU.default;
-  }
-
-  set class(value) {
-    this._class = value;
-  }
-
-  get class() {
-    return this.extendedProperty("_class") ?? this.network?.class;
-  }
-
-  set ssid(value) {
-    this._ssid = value;
-  }
-
-  get ssid() {
-    return this.extendedProperty("_ssid") ?? this.network?.ssid;
-  }
-
-  set psk(value) {
-    this._psk = value;
-  }
-
-  get psk() {
-    return this.extendedProperty("_psk") ?? this.network?.psk;
-  }
-
-  set kind(value) {
-    this._kind = value;
-  }
-
-  get kind() {
-    return this.extendedProperty("_kind") ?? this.network?.kind;
-  }
-}
-
-const LoopbackNetworkInterfaceTypeDefinition = {
-  name: "loopback",
-  specializationOf: NetworkInterfaceTypeDefinition,
-  owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
-  priority: 0.1,
-  properties: {}
-};
-
-const _localAddresses = new Map([
-  ["127.0.0.1", { prefix: "127.0.0", prefixLength: 8 }], // TODO
-  ["::1", { prefix: "", prefixLength: 128 }]
-]);
-
-export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
-  static {
-    addType(this);
-  }
-
-  static get typeDefinition() {
-    return LoopbackNetworkInterfaceTypeDefinition;
-  }
-
-  get kind() {
-    return "loopback";
-  }
-
-  get scope() {
-    return "host";
-  }
-
-  get hostName() {
-    return "localhost";
-  }
-
-  get ipAddresses() {
-    return _localAddresses;
-  }
-
-  get cidrAddresses() {
-    return ["127.0.0.1/8", "::1/128"];
-  }
-}

package/src/module.mjs

@@ -10,5 +10,6 @@ export * from "./root.mjs";
 export * from "./address.mjs";
 export * from "./subnet.mjs";
 export * from "./network.mjs";
+export * from "./network-interface.mjs";
 export * from "./host.mjs";
 export * from "./types.mjs";

package/src/network-interface.mjs

@@ -0,0 +1,323 @@
+import {
+  isIPv4,
+  isIPv6,
+  formatCIDR,
+  hasWellKnownSubnet,
+  normalizeIP
+} from "ip-utilties";
+import { Base } from "./base.mjs";
+import {
+  networkProperties,
+  networkAddressProperties
+} from "./network-support.mjs";
+import { asArray } from "./utils.mjs";
+import { addType } from "./types.mjs";
+
+class SkeletonNetworkInterface extends Base {
+  _extends = [];
+  _network;
+
+  set extends(value) {
+    this._extends.push(value);
+  }
+
+  get extends() {
+    return this._extends;
+  }
+
+  get isTemplate() {
+    return this.name.indexOf("*") >= 0;
+  }
+
+  get host() {
+    return this.owner;
+  }
+
+  get network_interface() {
+    return this;
+  }
+
+  get domainNames() {
+    return new Set();
+  }
+
+  matches(other) {
+    if (this.isTemplate) {
+      const name = this.name.replace("*", "");
+      return name.length === 0 || other.name.indexOf(name) >= 0;
+    }
+
+    return false;
+  }
+
+  get network() {
+    return this.extendedProperty("_network") ?? this.host.network;
+  }
+
+  set network(network) {
+    this._network = network;
+  }
+
+  get rawAddress() {
+    return this.rawAddresses[0];
+  }
+
+  get rawIPv4Address() {
+    return this.rawAddresses.filter(a => isIPv4(a))[0];
+  }
+
+  get rawIPv6Address() {
+    return this.rawAddresses.filter(a => isIPv6(a))[0];
+  }
+
+  get cidrAddress() {
+    return this.cidrAddresses[0];
+  }
+
+  get ipAddresses() {
+    return new Map();
+  }
+
+  get rawAddresses() {
+    return [...this.ipAddresses].map(([address]) => address);
+  }
+
+  get rawIPv4Addresses() {
+    return [...this.ipAddresses]
+      .filter(([address]) => isIPv4(address))
+      .map(([address]) => address);
+  }
+
+  get rawIPv6Addresses() {
+    return [...this.ipAddresses]
+      .filter(([address]) => isIPv6(address))
+      .map(([address]) => address);
+  }
+
+  get cidrAddresses() {
+    return [...this.ipAddresses].map(([address, subnet]) =>
+      formatCIDR(address, subnet.prefixLength)
+    );
+  }
+}
+
+export const NetworkInterfaceTypeDefinition = {
+  name: "network_interface",
+  priority: 0.4,
+  owners: ["host"],
+  extends: Base.typeDefinition,
+  specializations: {},
+  factoryFor(value) {
+    const kind = value.kind;
+    const t = NetworkInterfaceTypeDefinition.specializations[kind];
+
+    if (t) {
+      delete value.type;
+      return t.clazz;
+    }
+
+    return NetworkInterface;
+  },
+  properties: {
+    ...networkProperties,
+    ...networkAddressProperties,
+    hostName: { type: "string", collection: false, writeable: true },
+    ipAddresses: { type: "string", collection: true, writeable: true },
+
+    hwaddr: { type: "string", collection: false, writeable: true },
+    network: { type: "network", collection: false, writeable: true },
+    destination: { type: "string", collection: false, writeable: true },
+    arpbridge: { type: "network_interface", collection: true, writeable: true }
+  }
+};
+
+export class NetworkInterface extends SkeletonNetworkInterface {
+  static {
+    addType(this);
+  }
+
+  static get typeDefinition() {
+    return NetworkInterfaceTypeDefinition;
+  }
+
+  _ipAddresses = new Map();
+  _scope;
+  _metric;
+  _ssid;
+  _psk;
+  _kind;
+  _hostName;
+  _hwaddr;
+  _class;
+  arpbridge;
+
+  constructor(owner, data) {
+    super(owner, data);
+    this.read(data, NetworkInterfaceTypeDefinition);
+  }
+
+  addSubnet(address) {
+    if (!this.network) {
+      if (!hasWellKnownSubnet(address)) {
+        this.error("Missing network", address);
+      }
+    } else {
+      return this.network.addSubnet(address);
+    }
+  }
+
+  get ipAddresses() {
+    return this._ipAddresses;
+  }
+
+  set ipAddresses(value) {
+    for (const address of asArray(value)) {
+      this._ipAddresses.set(normalizeIP(address), this.addSubnet(address));
+    }
+  }
+
+  subnetForAddress(address) {
+    return (
+      this.network?.subnetForAddress(address) ||
+      this.host.owner.subnetForAddress(address)
+    );
+  }
+
+  get gateway() {
+    return this.network?.gateway;
+  }
+
+  get gatewayAddress() {
+    for (const a of this.gateway.networkAddresses()) {
+      if (a.networkInterface.network === this.network) {
+        return a.address;
+      }
+    }
+  }
+
+  get hostName() {
+    return this.extendedProperty("_hostName") ?? this.host.hostName;
+  }
+
+  set hostName(value) {
+    this._hostName = value;
+  }
+
+  get domainNames() {
+    return this.hostName
+      ? new Set([[this.hostName, this.host.domain].join(".")])
+      : this.host.directDomainNames;
+  }
+
+  set scope(value) {
+    this._scope = value;
+  }
+
+  get scope() {
+    return (
+      this.extendedProperty("_scope") ??
+      this.network?.scope ??
+      networkProperties.scope.default
+    );
+  }
+
+  set hwaddr(value) {
+    this._hwaddr = value;
+  }
+
+  get hwaddr() {
+    return this.extendedProperty("_hwaddr");
+  }
+
+  set metric(value) {
+    this._metric = value;
+  }
+
+  get metric() {
+    return (
+      this.extendedProperty("_metric") ??
+      this.network?.metric ??
+      networkProperties.metric.default
+    );
+  }
+
+  set MTU(value) {
+    this._MTU = value;
+  }
+
+  get MTU() {
+    return this.extendedProperty("_MTU") ?? networkProperties.MTU.default;
+  }
+
+  set class(value) {
+    this._class = value;
+  }
+
+  get class() {
+    return this.extendedProperty("_class") ?? this.network?.class;
+  }
+
+  set ssid(value) {
+    this._ssid = value;
+  }
+
+  get ssid() {
+    return this.extendedProperty("_ssid") ?? this.network?.ssid;
+  }
+
+  set psk(value) {
+    this._psk = value;
+  }
+
+  get psk() {
+    return this.extendedProperty("_psk") ?? this.network?.psk;
+  }
+
+  set kind(value) {
+    this._kind = value;
+  }
+
+  get kind() {
+    return this.extendedProperty("_kind") ?? this.network?.kind;
+  }
+}
+
+const LoopbackNetworkInterfaceTypeDefinition = {
+  name: "loopback",
+  specializationOf: NetworkInterfaceTypeDefinition,
+  owners: NetworkInterfaceTypeDefinition.owners,
+  extends: NetworkInterfaceTypeDefinition,
+  priority: 0.1,
+  properties: {}
+};
+
+const _localAddresses = new Map([
+  ["127.0.0.1", { address: "127.0.0/8", prefix: "127.0.0", prefixLength: 8 }], // TODO
+  ["::1", { address: "::1/128", prefix: "::1", prefixLength: 128 }]
+]);
+
+export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
+  static {
+    addType(this);
+  }
+
+  static get typeDefinition() {
+    return LoopbackNetworkInterfaceTypeDefinition;
+  }
+
+  get kind() {
+    return "loopback";
+  }
+
+  get scope() {
+    return "host";
+  }
+
+  get hostName() {
+    return "localhost";
+  }
+
+  get ipAddresses() {
+    return _localAddresses;
+  }
+}