pmcf 1.7.0 → 1.8.1

package/package.json

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

package/src/model.mjs

@@ -79,7 +79,7 @@ export class Base {
   }
 
   get directory() {
-    return this.#directory || this.name;
+    return this.#directory || join(this.owner.directory, this.name);
   }
 
   expand(object) {
@@ -104,6 +104,10 @@ export class Base {
     console.error(`${this.toString()}:`, ...args);
   }
 
+  info(...args) {
+    console.info(`${this.toString()}:`, ...args);
+  }
+
   toString() {
     return this.typeName + ":" + (this.owner?.name || "") + "/" + this.name;
   }
@@ -169,13 +173,52 @@ export class Owner extends Base {
       }
 
       for (const name of asArray(destinationNetworks)) {
-        bridge.add(this.network(name) || name);
+        const other = this.network(name);
+        if (other) {
+          bridge.add(other);
+          other.bridge = bridge;
+        } else {
+          bridge.add(name);
+          this.resolveLater(() => this._resolveBridges());
+        }
       }
 
       return bridge;
     }
   }
 
+  _resolveBridges() {
+    for (const bridge of this.#bridges) {
+      console.log(bridgeToJSON(bridge));
+      for (const network of bridge) {
+        if (typeof network === "string") {
+          const other = this.network(network);
+
+          if (other) {
+            bridge.delete(network);
+            bridge.add(other);
+            other.bridge = bridge;
+            console.log("RESOLVE", network, other, bridgeToJSON(bridge));
+          } else {
+            this.error(`Unresolvabale bridge network`, network);
+          }
+        }
+      }
+    }
+  }
+
+  #resolveActions = [];
+
+  resolveLater(action) {
+    this.#resolveActions.push(action);
+  }
+
+  resolve() {
+    for (const action of this.#resolveActions) {
+      action();
+    }
+  }
+
   addSubnet(subnet) {
     this.#subnets.set(subnet.name, subnet);
   }
@@ -649,6 +692,8 @@ export class Host extends Base {
   }
 
   async publicKey(type = "ed25519") {
+    console.log("DIR", join(this.directory, `ssh_host_${type}_key.pub`));
+
     return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
   }
 

package/types/model.d.mts

@@ -19,6 +19,7 @@ export class Base {
     get directory(): any;
     expand(object: any): any;
     error(...args: any[]): void;
+    info(...args: any[]): void;
     toString(): string;
     get propertyNames(): string[];
     toJSON(): {};
@@ -31,6 +32,9 @@ export class Owner extends Base {
     networks(): AsyncGenerator<any, void, unknown>;
     addNetwork(network: any): void;
     addBridge(network: any, destinationNetworks: any): any;
+    _resolveBridges(): void;
+    resolveLater(action: any): void;
+    resolve(): void;
     addSubnet(subnet: any): void;
     subnet(name: any): any;
     subnets(): MapIterator<any>;