pmcf 1.5.2 → 1.5.3

package/package.json

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

package/src/model.mjs

@@ -113,22 +113,24 @@ export class Base {
   }
 }
 
-export class World {
+export class Owner extends Base {
+  addHost(host) {}
+  addNetwork(network) {}
+  async network(name) {}
+}
+
+export class World extends Owner {
   static get types() {
     return _types;
   }
 
-  directory;
   #byName = new Map();
 
   constructor(directory) {
+    super(undefined, { name: "" });
     this.directory = directory;
   }
 
-  get name() {
-    return "";
-  }
-
   get world() {
     return this;
   }
@@ -216,10 +218,6 @@ export class World {
     return this._loadType(name, Host);
   }
 
-  addHost(host) {}
-  addNetwork(network) {}
-  network(name) {}
-
   async *subnets() {
     for await (const location of this.locations()) {
       yield* location.subnets();
@@ -235,219 +233,7 @@ export class World {
   }
 }
 
-export class Host extends Base {
-  networkInterfaces = {};
-  services = {};
-  postinstall = [];
-  #extends = [];
-  #provides = new Set();
-  #replaces = new Set();
-  #depends = new Set();
-  #master = false;
-  #os;
-  #distribution;
-  #deployment;
-  #location;
-
-  static get typeName() {
-    return "host";
-  }
-
-  static async prepareData(world, data) {
-    if (data.location) {
-      data.location = await world.location(data.location);
-    }
-
-    if (data.extends) {
-      data.extends = await Promise.all(data.extends.map(e => world.host(e)));
-    }
-
-    if (data.name?.indexOf("model/") >= 0) {
-      return Model;
-    }
-
-    return this;
-  }
-
-  constructor(owner, data) {
-    super(owner, data);
-
-    if (data.location !== undefined) {
-      this.#location = data.location;
-      delete data.location;
-    }
-
-    if (data.deployment !== undefined) {
-      this.#deployment = data.deployment;
-      delete data.deployment;
-    }
-    if (data.extends !== undefined) {
-      this.#extends = data.extends;
-      delete data.extends;
-    }
-    if (data.os !== undefined) {
-      this.#os = data.os;
-      delete data.os;
-    }
-    if (data.distribution !== undefined) {
-      this.#distribution = data.distribution;
-      delete data.distribution;
-    }
-    if (data.master !== undefined) {
-      this.#master = data.master;
-      delete data.master;
-    }
-    if (data.depends !== undefined) {
-      this.#depends = new Set(data.depends);
-      delete data.depends;
-    }
-    if (data.replaces !== undefined) {
-      this.#replaces = new Set(data.replaces);
-      delete data.replaces;
-    }
-    if (data.provides !== undefined) {
-      this.#provides = new Set(data.provides);
-      delete data.provides;
-    }
-
-    Object.assign(this, { services: {}, networkInterfaces: {} }, data);
-
-    owner.addHost(this);
-
-    for (const [name, iface] of Object.entries(this.networkInterfaces)) {
-      iface.host = this;
-      iface.name = name;
-      if (iface.network) {
-        iface.network = this.network(iface.network);
-      }
-    }
-
-    for (const [name, data] of Object.entries(
-      Object.assign({}, ...this.extends.map(e => e.services), this.services)
-    )) {
-      data.name = name;
-      this.services[name] = new Service(this, data);
-    }
-  }
-
-  get deployment() {
-    return this.#deployment || this.extends.find(e => e.deployment);
-  }
-
-  get extends() {
-    return this.#extends.map(e => this.expand(e));
-  }
-
-  get location() {
-    return this.#location || super.location;
-  }
-
-  get provides() {
-    let provides = new Set(this.#provides);
-    this.extends.forEach(h => (provides = provides.union(h.provides)));
-    return provides;
-  }
-
-  get replaces() {
-    let replaces = new Set(this.#replaces);
-    this.extends.forEach(h => (replaces = replaces.union(h.replaces)));
-    return replaces;
-  }
-
-  get _depends() {
-    let depends = this.#depends;
-    this.extends.forEach(h => (depends = depends.union(h._depends)));
-    return depends;
-  }
-
-  get depends() {
-    return this.expand(this._depends);
-  }
-
-  get master() {
-    return this.#master || this.extends.find(e => e.master) ? true : false;
-  }
-
-  get os() {
-    return this.#os || this.extends.find(e => e.os);
-  }
-
-  get distribution() {
-    return this.#distribution || this.extends.find(e => e.distribution);
-  }
-
-  get model() {
-    return this.extends.find(h => h instanceof Model);
-  }
-
-  get domain() {
-    return this.location?.domain;
-  }
-
-  get modelName() {
-    return this.model?.hostName;
-  }
-
-  get hostName() {
-    const parts = this.name.split(/\//);
-    return parts[parts.length - 1];
-  }
-
-  get domainName() {
-    return this.hostName + "." + this.domain;
-  }
-
-  *networkAddresses() {
-    for (const [name, networkInterface] of Object.entries(
-      this.networkInterfaces
-    )) {
-      for (const attribute of ["ipv4", "ipv6", "link-local-ipv6"]) {
-        if (networkInterface[attribute]) {
-          yield { address: networkInterface[attribute], networkInterface };
-        }
-      }
-    }
-  }
-
-  get ipAddress() {
-    for (const a of this.networkAddresses()) {
-      return a.address;
-    }
-  }
-
-  async publicKey(type = "ed25519") {
-    return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
-  }
-
-  get propertyNames() {
-    return [
-      ...super.propertyNames,
-      "os",
-      "distribution",
-      "deployment",
-      "master",
-      "location",
-      "model",
-      "replaces",
-      "depends",
-      "networkInterfaces"
-    ];
-  }
-
-  toJSON() {
-    return {
-      ...super.toJSON(),
-      extends: this.extends.map(host => host.name),
-      services: Object.fromEntries(
-        Object.values(this.services).map(s => [s.name, s.toJSON()])
-      )
-    };
-  }
-}
-
-export class Model extends Host {}
-
-export class Location extends Base {
+export class Location extends Owner {
   domain;
   dns;
   #administratorEmail;
@@ -556,7 +342,7 @@ export class Location extends Base {
       return network;
     }
 
-    if(data instanceof Network) {
+    if (data instanceof Network) {
       this.#networks.set(data.name, data);
       return data;
     }
@@ -666,6 +452,219 @@ export class Network extends Base {
   }
 }
 
+export class Host extends Base {
+  networkInterfaces = {};
+  services = {};
+  postinstall = [];
+  #extends = [];
+  #provides = new Set();
+  #replaces = new Set();
+  #depends = new Set();
+  #master = false;
+  #os;
+  #distribution;
+  #deployment;
+  #location;
+
+  static get typeName() {
+    return "host";
+  }
+
+  static async prepareData(world, data) {
+    if (data.location) {
+      data.location = await world.location(data.location);
+    }
+
+    if (data.extends) {
+      data.extends = await Promise.all(data.extends.map(e => world.host(e)));
+    }
+
+    if (data.name?.indexOf("model/") >= 0) {
+      return Model;
+    }
+
+    return this;
+  }
+
+  constructor(owner, data) {
+    super(owner, data);
+
+    if (data.location !== undefined) {
+      this.#location = data.location;
+      delete data.location;
+    }
+
+    if (data.deployment !== undefined) {
+      this.#deployment = data.deployment;
+      delete data.deployment;
+    }
+    if (data.extends !== undefined) {
+      this.#extends = data.extends;
+      delete data.extends;
+    }
+    if (data.os !== undefined) {
+      this.#os = data.os;
+      delete data.os;
+    }
+    if (data.distribution !== undefined) {
+      this.#distribution = data.distribution;
+      delete data.distribution;
+    }
+    if (data.master !== undefined) {
+      this.#master = data.master;
+      delete data.master;
+    }
+    if (data.depends !== undefined) {
+      this.#depends = new Set(data.depends);
+      delete data.depends;
+    }
+    if (data.replaces !== undefined) {
+      this.#replaces = new Set(data.replaces);
+      delete data.replaces;
+    }
+    if (data.provides !== undefined) {
+      this.#provides = new Set(data.provides);
+      delete data.provides;
+    }
+
+    Object.assign(this, { services: {}, networkInterfaces: {} }, data);
+
+    owner.addHost(this);
+
+    for (const [name, iface] of Object.entries(this.networkInterfaces)) {
+      iface.host = this;
+      iface.name = name;
+      if (iface.network) {
+        iface.network = this.network(iface.network);
+      }
+    }
+
+    for (const [name, data] of Object.entries(
+      Object.assign({}, ...this.extends.map(e => e.services), this.services)
+    )) {
+      data.name = name;
+      this.services[name] = new Service(this, data);
+    }
+  }
+
+  get deployment() {
+    return this.#deployment || this.extends.find(e => e.deployment);
+  }
+
+  get extends() {
+    return this.#extends.map(e => this.expand(e));
+  }
+
+  get location() {
+    return this.#location || super.location;
+  }
+
+  get provides() {
+    let provides = new Set(this.#provides);
+    this.extends.forEach(h => (provides = provides.union(h.provides)));
+    return provides;
+  }
+
+  get replaces() {
+    let replaces = new Set(this.#replaces);
+    this.extends.forEach(h => (replaces = replaces.union(h.replaces)));
+    return replaces;
+  }
+
+  get _depends() {
+    let depends = this.#depends;
+    this.extends.forEach(h => (depends = depends.union(h._depends)));
+    return depends;
+  }
+
+  get depends() {
+    return this.expand(this._depends);
+  }
+
+  get master() {
+    return this.#master || this.extends.find(e => e.master) ? true : false;
+  }
+
+  get os() {
+    return this.#os || this.extends.find(e => e.os);
+  }
+
+  get distribution() {
+    return this.#distribution || this.extends.find(e => e.distribution);
+  }
+
+  get model() {
+    return this.extends.find(h => h instanceof Model);
+  }
+
+  get domain() {
+    return this.location?.domain;
+  }
+
+  get modelName() {
+    return this.model?.hostName;
+  }
+
+  get hostName() {
+    const parts = this.name.split(/\//);
+    return parts[parts.length - 1];
+  }
+
+  get domainName() {
+    return this.hostName + "." + this.domain;
+  }
+
+  *networkAddresses() {
+    for (const [name, networkInterface] of Object.entries(
+      this.networkInterfaces
+    )) {
+      for (const attribute of ["ipv4", "ipv6", "link-local-ipv6"]) {
+        if (networkInterface[attribute]) {
+          yield { address: networkInterface[attribute], networkInterface };
+        }
+      }
+    }
+  }
+
+  get ipAddress() {
+    for (const a of this.networkAddresses()) {
+      return a.address;
+    }
+  }
+
+  async publicKey(type = "ed25519") {
+    return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
+  }
+
+  get propertyNames() {
+    return [
+      ...super.propertyNames,
+      "os",
+      "distribution",
+      "deployment",
+      "master",
+      "location",
+      "model",
+      "replaces",
+      "depends",
+      "networkInterfaces"
+    ];
+  }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      extends: this.extends.map(host => host.name),
+      services: Object.fromEntries(
+        Object.values(this.services).map(s => [s.name, s.toJSON()])
+      )
+    };
+  }
+}
+
+export class Model extends Host {}
+
+
 export class Subnet extends Base {
   networks = new Set();
 

package/types/model.d.mts

@@ -23,13 +23,16 @@ export class Base {
     toJSON(): {};
     #private;
 }
-export class World {
+export class Owner extends Base {
+    addHost(host: any): void;
+    addNetwork(network: any): void;
+    network(name: any): Promise<void>;
+}
+export class World extends Owner {
     static get types(): {
         [k: string]: typeof Location | typeof Host | typeof Network | typeof Subnet | typeof Service;
     };
     constructor(directory: any);
-    directory: any;
-    get name(): string;
     get world(): this;
     _loadType(name: any, type: any): Promise<any>;
     load(): Promise<void>;
@@ -39,9 +42,6 @@ export class World {
     domains(): AsyncGenerator<any, void, unknown>;
     location(name: any): Promise<any>;
     host(name: any): Promise<any>;
-    addHost(host: any): void;
-    addNetwork(network: any): void;
-    network(name: any): void;
     subnets(): AsyncGenerator<any, void, unknown>;
     networkAddresses(): AsyncGenerator<{
         address: any;
@@ -49,6 +49,37 @@ export class World {
     }, void, unknown>;
     #private;
 }
+export class Location extends Owner {
+    domain: any;
+    dns: any;
+    hosts(): AsyncGenerator<any, void, unknown>;
+    service(filter: any): Promise<any>;
+    services(filter: any): AsyncGenerator<any, void, unknown>;
+    networkAddresses(): AsyncGenerator<any, void, unknown>;
+    network(name: any): Promise<any>;
+    networks(): AsyncGenerator<any, void, unknown>;
+    subnets(): AsyncGenerator<any, void, unknown>;
+    addNetwork(data: any): any;
+    get dnsAllowedUpdates(): any;
+    get dnsRecordTTL(): any;
+    get administratorEmail(): any;
+    toJSON(): {
+        hosts: any[];
+    };
+    #private;
+}
+export class Network extends Base {
+    kind: any;
+    scope: any;
+    metric: any;
+    ipv4: any;
+    ipv4_netmask: any;
+    subnet: any;
+    get subnetAddress(): any;
+    hosts(): AsyncGenerator<any, void, unknown>;
+    addHost(host: any): void;
+    #private;
+}
 export class Host extends Base {
     static prepareData(world: any, data: any): Promise<typeof Host>;
     networkInterfaces: {};
@@ -82,37 +113,6 @@ export class Host extends Base {
 }
 export class Model extends Host {
 }
-export class Location extends Base {
-    domain: any;
-    dns: any;
-    hosts(): AsyncGenerator<any, void, unknown>;
-    service(filter: any): Promise<any>;
-    services(filter: any): AsyncGenerator<any, void, unknown>;
-    networkAddresses(): AsyncGenerator<any, void, unknown>;
-    networks(): AsyncGenerator<any, void, unknown>;
-    subnets(): AsyncGenerator<any, void, unknown>;
-    addNetwork(data: any): any;
-    addHost(host: any): void;
-    get dnsAllowedUpdates(): any;
-    get dnsRecordTTL(): any;
-    get administratorEmail(): any;
-    toJSON(): {
-        hosts: any[];
-    };
-    #private;
-}
-export class Network extends Base {
-    kind: any;
-    scope: any;
-    metric: any;
-    ipv4: any;
-    ipv4_netmask: any;
-    subnet: any;
-    get subnetAddress(): any;
-    hosts(): AsyncGenerator<any, void, unknown>;
-    addHost(host: any): void;
-    #private;
-}
 export class Subnet extends Base {
     networks: Set<any>;
     get address(): any;