pmcf 1.73.0 → 1.73.2

package/package.json

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

package/src/host.mjs

@@ -2,7 +2,7 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { Base } from "./base.mjs";
-import { networkProperties } from "./network-support.mjs";
+import { networkProperties, networkAddressProperties } from "./network-support.mjs";
 import {
   asArray,
   isIPv4Address,
@@ -381,10 +381,10 @@ const NetworkInterfaceTypeDefinition = {
   extends: Base.typeDefinition,
   properties: {
     ...networkProperties,
-    hwaddr: { type: "string", collection: false, writeable: true },
+    ...networkAddressProperties,
     ipAddresses: { type: "string", collection: true, writeable: true },
-    cidrAddresses: { type: "string", collection: true, writeable: false },
-    rawAddresses: { type: "string", collection: true, writeable: false },
+
+    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 }

package/src/network-support.mjs

@@ -7,3 +7,10 @@ export const networkProperties = {
   MTU: { type: "number", collection: false, writeable: true },
   gateway: { type: "host", collection: false, writeable: true }
 };
+
+export const networkAddressProperties = {
+  cidrAddresses: { type: "string", collection: true, writeable: false },
+  cidrAddress: { type: "string", collection: false, writeable: false },
+  rawAddresses: { type: "string", collection: true, writeable: false },
+  rawAddress: { type: "string", collection: false, writeable: false }
+};

package/src/owner.mjs

@@ -128,9 +128,7 @@ export class Owner extends Base {
 
   *findServices(filter) {
     for (const host of this.hosts()) {
-      for (const service of host.findServices(filter)) {
-        yield service;
-      }
+      yield* host.findServices(filter);
     }
   }
 
@@ -143,7 +141,7 @@ export class Owner extends Base {
   }
 
   hostNamed(name) {
-    return this.typeNamed("host", name);
+    return this.typeNamed("host", name) || this.typeNamed("cluster", name);
   }
 
   *hosts() {
@@ -363,5 +361,4 @@ export class Owner extends Base {
       yield location.domain;
     }
   }
-
 }

package/src/service.mjs

@@ -1,6 +1,7 @@
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
+import { networkAddressProperties } from "./network-support.mjs";
 
 const ServiceTypes = {
   dns: { protocol: "udp", port: 53, tls: false },
@@ -22,6 +23,7 @@ const ServiceTypeDefinition = {
   priority: 0.4,
   extends: Base.typeDefinition,
   properties: {
+    ...networkAddressProperties,
     ipAddresses: { type: "string", collection: true, writeable: true },
     port: { type: "number", collection: false, writeable: true },
     protocol: { type: "string", collection: false, writeable: true },
@@ -90,6 +92,10 @@ export class Service extends Base {
     return this.server.domainName;
   }
 
+  get rawAddresses() {
+    return this.#ipAddresses || this.owner.rawAddresses;
+  }
+
   get rawAddress() {
     return this.#ipAddresses?.[0] || this.server.rawAddress;
   }
@@ -98,10 +104,6 @@ export class Service extends Base {
     this.#ipAddresses = value;
   }
 
-  get rawAddresses() {
-    return this.#ipAddresses || this.owner.rawAddresses;
-  }
-
   get addresses() {
     return this.rawAddresses.map(a => `${a}:${this.port}`);
   }

package/types/host.d.mts

@@ -233,37 +233,47 @@ export class NetworkInterface extends Base {
             };
         };
         properties: {
+            ipAddresses: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             hwaddr: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            ipAddresses: {
+            network: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            cidrAddresses: {
+            destination: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            rawAddresses: {
+            arpbridge: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            network: {
+            cidrAddresses: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            destination: {
+            cidrAddress: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            arpbridge: {
+            rawAddresses: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            rawAddress: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;

package/types/network-support.d.mts

@@ -53,3 +53,37 @@ export namespace networkProperties {
         export { writeable_6 as writeable };
     }
 }
+export namespace networkAddressProperties {
+    namespace cidrAddresses {
+        let type_7: string;
+        export { type_7 as type };
+        let collection_7: boolean;
+        export { collection_7 as collection };
+        let writeable_7: boolean;
+        export { writeable_7 as writeable };
+    }
+    namespace cidrAddress {
+        let type_8: string;
+        export { type_8 as type };
+        let collection_8: boolean;
+        export { collection_8 as collection };
+        let writeable_8: boolean;
+        export { writeable_8 as writeable };
+    }
+    namespace rawAddresses {
+        let type_9: string;
+        export { type_9 as type };
+        let collection_9: boolean;
+        export { collection_9 as collection };
+        let writeable_9: boolean;
+        export { writeable_9 as writeable };
+    }
+    namespace rawAddress {
+        let type_10: string;
+        export { type_10 as type };
+        let collection_10: boolean;
+        export { collection_10 as collection };
+        let writeable_10: boolean;
+        export { writeable_10 as writeable };
+    }
+}

package/types/owner.d.mts

@@ -194,7 +194,6 @@ export class Owner extends Base {
     typeList(typeName: any): any;
     addTypeObject(typeName: any, name: any, object: any): void;
     addObject(object: any): void;
-    findServices(filter: any): Generator<any, void, unknown>;
     locationNamed(name: any): any;
     locations(): any;
     hostNamed(name: any): any;

package/types/service.d.mts

@@ -92,14 +92,34 @@ export class Service extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            cidrAddresses: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            cidrAddress: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            rawAddresses: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            rawAddress: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
         };
     };
     alias: any;
     get server(): any;
     get domainName(): any;
+    get rawAddresses(): any;
     get rawAddress(): any;
     set ipAddresses(value: any);
-    get rawAddresses(): any;
     get addresses(): any;
     set port(value: any);
     get port(): any;