pmcf 4.25.15 → 4.25.17

package/package.json

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

package/src/network-interfaces/ethernet.mjs

@@ -1,26 +1,21 @@
 import { default_attribute_writable, addType } from "pacc";
-import {
-  NetworkInterface,
-  NetworkInterfaceTypeDefinition
-} from "./network-interface.mjs";
+import { NetworkInterface } from "./network-interface.mjs";
 
-export const EthernetNetworkInterfaceTypeDefinition = {
-  name: "ethernet",
-  extends: NetworkInterfaceTypeDefinition,
-  specializationOf: NetworkInterfaceTypeDefinition,
-  owners: NetworkInterfaceTypeDefinition.owners,
-  key: "name",
-  attributes: {
+export class EthernetNetworkInterface extends NetworkInterface {
+  static name = "ethernet";
+  static extends = NetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = NetworkInterface.owners;
+  static key = "name";
+  static attributes = {
     arpbridge: {
       ...default_attribute_writable,
       type: "network_interface",
       collection: true
     }
-  }
-};
+  };
 
-export class EthernetNetworkInterface extends NetworkInterface {
-  static typeDefinition = EthernetNetworkInterfaceTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);
@@ -33,6 +28,6 @@ export class EthernetNetworkInterface extends NetworkInterface {
   arpbridge;
 
   get kind() {
-    return EthernetNetworkInterfaceTypeDefinition.name;
+    return this.constructor.name;
   }
 }

package/src/network-interfaces/loopback.mjs

@@ -1,7 +1,7 @@
 import { addType } from "pacc";
 import { SUBNET_LOCALHOST_IPV4, SUBNET_LOCALHOST_IPV6 } from "pmcf";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
+import { NetworkInterface } from "./network-interface.mjs";
 
 const _localAddresses = new Map([
   ["127.0.0.1", SUBNET_LOCALHOST_IPV4],
@@ -12,9 +12,9 @@ const _localDomains = new Set(["localhost"]);
 
 export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   static name = "loopback";
-  static extends = NetworkInterfaceTypeDefinition;
-  static specializationOf = NetworkInterfaceTypeDefinition;
-  static owners = NetworkInterfaceTypeDefinition.owners;
+  static extends = NetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = NetworkInterface.owners;
   static key = "name";
 
   static typeDefinition = this;

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

@@ -16,17 +16,17 @@ import { SkeletonNetworkInterface } from "./skeleton.mjs";
 import { Network } from "../network.mjs";
 import { yesno } from "../utils.mjs";
 
-export const NetworkInterfaceTypeDefinition = {
-  name: "network_interface",
-  owners: ["host"],
-  extends: Base.typeDefinition,
-  specializations: {},
-  factoryFor(owner, value) {
-    let t = NetworkInterfaceTypeDefinition.specializations[value.kind];
+export class NetworkInterface extends SkeletonNetworkInterface {
+  static name = "network_interface";
+  static owners = ["host"];
+  static extends = Base;
+  static specializations = {};
+  static factoryFor(owner, value) {
+    let t = this.specializations[value.kind];
 
     //console.log("factoryFor", owner, value);
     if (!t) {
-      for (t of Object.values(NetworkInterfaceTypeDefinition.specializations)) {
+      for (t of Object.values(this.specializations)) {
         if (t.clazz.isCommonName && t.clazz.isCommonName(value.name)) {
           break;
         }
@@ -39,10 +39,10 @@ export const NetworkInterfaceTypeDefinition = {
       return t.clazz;
     }
 
-    return NetworkInterface;
-  },
-  key: "name",
-  attributes: {
+    return this;
+  }
+  static key = "name";
+  static attributes = {
     ...networkAttributes,
     ...networkAddressAttributes,
 
@@ -56,14 +56,12 @@ export const NetworkInterfaceTypeDefinition = {
     hwaddr: string_attribute_writable,
     network: {
       ...default_attribute_writable,
-      type: Network.typeDefinition
+      type: Network
     },
     destination: string_attribute_writable
-  }
-};
+  };
 
-export class NetworkInterface extends SkeletonNetworkInterface {
-  static typeDefinition = NetworkInterfaceTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);
@@ -226,8 +224,8 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     const routeSectionExtra = this.destination
       ? { Destination: this.destination }
       : this.gateway
-      ? { Gateway: this.gatewayAddress }
-      : {};
+        ? { Gateway: this.gatewayAddress }
+        : {};
 
     const networkSectionExtra = this.arpbridge
       ? {

package/src/network-interfaces/tun.mjs

@@ -1,12 +1,11 @@
 import { addType } from "pacc";
 import { NetworkInterface } from "./network-interface.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 
 export class TUNNetworkInterface extends NetworkInterface {
   static name = "tun";
-  static extends = NetworkInterfaceTypeDefinition;
-  static specializationOf = NetworkInterfaceTypeDefinition;
-  static owners = NetworkInterfaceTypeDefinition.owners;
+  static extends = NetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = NetworkInterface.owners;
   static key = "name";
 
   static typeDefinition = this;

package/src/network-interfaces/wireguard.mjs

@@ -1,12 +1,12 @@
 import { addType } from "pacc";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
+import { NetworkInterface } from "./network-interface.mjs";
 
 export class WireguardNetworkInterface extends SkeletonNetworkInterface {
   static name = "wireguard";
-  static extends = NetworkInterfaceTypeDefinition;
-  static specializationOf = NetworkInterfaceTypeDefinition;
-  static owners = NetworkInterfaceTypeDefinition.owners;
+  static extends = NetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = NetworkInterface.owners;
   static key = "name";
 
   static typeDefinition = this;

package/src/network-interfaces/wlan.mjs

@@ -6,17 +6,14 @@ import {
   addType
 } from "pacc";
 import { writeLines, sectionLines } from "../utils.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
-import {
-  EthernetNetworkInterface,
-  EthernetNetworkInterfaceTypeDefinition
-} from "./ethernet.mjs";
+import { NetworkInterface } from "./network-interface.mjs";
+import { EthernetNetworkInterface } from "./ethernet.mjs";
 
 export class WLANNetworkInterface extends EthernetNetworkInterface {
   static name = "wlan";
-  static extends = EthernetNetworkInterfaceTypeDefinition;
-  static specializationOf = NetworkInterfaceTypeDefinition;
-  static owners = EthernetNetworkInterfaceTypeDefinition.owners;
+  static extends = EthernetNetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = EthernetNetworkInterface.owners;
   static key = "name";
   static attributes = {
     ssid: string_attribute_writable,