pmcf 1.59.0 → 1.59.2

package/package.json

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

package/src/base.mjs

@@ -203,8 +203,22 @@ export class Base {
     }
   }
 
+  named(name)
+  {
+  }
+
   typeNamed(typeName, name) {
-    return this.owner?.typeNamed(typeName, name);
+    if (this.owner) {
+      const object = this.owner.typeNamed(typeName, name); // TODO split
+      if(object) {
+        return object;
+      }
+    }
+
+    const object = this.named(name);
+    if(object?.typeName === typeName) {
+      return object;
+    }
   }
 
   addObject(object) {

package/src/cluster.mjs

@@ -15,8 +15,8 @@ const ClusterTypeDefinition = {
 };
 
 export class Cluster extends Owner {
-  masters = new Set();
-  backups = new Set();
+  #masters = new Set();
+  #backups = new Set();
 
   static {
     addType(this);
@@ -31,6 +31,26 @@ export class Cluster extends Owner {
     this.read(data, ClusterTypeDefinition);
   }
 
+  set masters(value)
+  {
+    this.#masters.add(value);
+  }
+
+  get masters()
+  {
+    return this.#masters;
+  }
+
+  set backups(value)
+  {
+    this.#backups.add(value);
+  }
+
+  get backups()
+  {
+    return this.#backups;
+  }
+
   get packageName() {
     return `${this.constructor.typeDefinition.name}-${this.owner.name}-${this.name}`;
   }
@@ -51,7 +71,7 @@ export class Cluster extends Owner {
           "    auth_pass pass1234",
           "  }",
           "  virtual_ipaddress {",
-          "    192.168.1.250",
+          `    ${ni.rawAddress}`,
           "  }",
           "}"
         ];

package/src/host.mjs

@@ -431,6 +431,10 @@ export class NetworkInterface extends Base {
     }
   }
 
+  get rawAddress() {
+    return this.rawAddresses[0];
+  }
+
   get rawAddresses() {
     return [...this.#ipAddresses].map(([address]) => address);
   }

package/src/owner.mjs

@@ -1,4 +1,4 @@
-import { asArray, normalizeCIDR } from "./utils.mjs";
+import { asIterator, normalizeCIDR } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet } from "./subnet.mjs";
 import { addType } from "./types.mjs";
@@ -90,17 +90,17 @@ export class Owner extends Base {
   }
 
   typeNamed(typeName, name) {
-    const localName = name[0] === "/" ? name.substring(this.fullName.length + 1) : name;
-
     const typeSlot = this.#membersByType.get(typeName);
     if (typeSlot) {
-      const object = typeSlot.get(localName);
+      const object = typeSlot.get(
+        name[0] === "/" ? name.substring(this.fullName.length + 1) : name
+      );
       if (object) {
         return object;
       }
     }
 
-    return super.typeNamed(typeName, localName); // TODO use name
+    return super.typeNamed(typeName, name);
   }
 
   typeObject(typeName) {
@@ -223,13 +223,15 @@ export class Owner extends Base {
         this.#bridges.add(bridge);
       }
 
-      for (const name of asArray(destinationNetworks)) {
-        const other = this.networkNamed(name);
+      for (const nameOrNetwork of asIterator(destinationNetworks)) {
+        const other = nameOrNetwork instanceof Owner ? nameOrNetwork : this.networkNamed(nameOrNetwork);
         if (other) {
-          bridge.add(other);
-          other.bridge = bridge;
+          if (!bridge.has(other)) {
+            bridge.add(other);
+            other.bridge = bridge;
+          }
         } else {
-          bridge.add(name);
+          bridge.add(nameOrNetwork);
           this.finalize(() => this._resolveBridges());
         }
       }

package/src/utils.mjs

@@ -33,6 +33,17 @@ export function asArray(value) {
   return Array.isArray(value) ? value : value === undefined ? [] : [value];
 }
 
+export function asIterator(value)
+{
+  if(value === undefined) { return []; }
+
+  if(typeof value[Symbol.iterator] === 'function') {
+    return value;
+  }
+
+  return asArray(value);
+}
+
 export function isIPv4Address(address) {
   return address.indexOf(".") >= 0;
 }

package/types/base.d.mts

@@ -46,6 +46,7 @@ export class Base {
     name: string;
     ownerFor(property: any, data: any): any;
     read(data: any, type: any): void;
+    named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;
     forOwner(owner: any): any;

package/types/cluster.d.mts

@@ -371,7 +371,10 @@ export class Cluster extends Owner {
             };
         };
     };
-    masters: Set<any>;
-    backups: Set<any>;
+    set masters(value: Set<any>);
+    get masters(): Set<any>;
+    set backups(value: Set<any>);
+    get backups(): Set<any>;
+    #private;
 }
 import { Owner } from "./owner.mjs";

package/types/host.d.mts

@@ -310,6 +310,7 @@ export class NetworkInterface extends Base {
     addSubnet(address: any): any;
     set ipAddresses(value: Map<any, any>);
     get ipAddresses(): Map<any, any>;
+    get rawAddress(): any;
     get rawAddresses(): any[];
     get cidrAddresses(): any[];
     get rawIPv4Addresses(): any[];

package/types/utils.d.mts

@@ -2,6 +2,7 @@ export function writeLines(dir: any, name: any, lines: any): Promise<void>;
 export function sectionLines(sectionName: any, values: any): string[];
 export function bridgeToJSON(bridge: any): any[];
 export function asArray(value: any): any[];
+export function asIterator(value: any): any;
 export function isIPv4Address(address: any): boolean;
 export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): any;