pmcf 1.69.1 → 1.71.0

package/package.json

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

package/src/filter.mjs

@@ -0,0 +1,79 @@
+export function* objectFilter(type, objects, filter) {
+  if (filter) {
+    advance: for (const object of objects) {
+      const filterString = key => {
+        if (filter[key] === undefined) {
+          return true;
+        }
+        if (filter[key] === object[key]) {
+          return true;
+        }
+
+        for (const value of filter[key].split("|")) {
+          if (object[key] === value) {
+            return true;
+          }
+        }
+
+        return false;
+      };
+
+      const filterNumber = key => {
+        switch (typeof filter[key]) {
+          case "undefined":
+            return true;
+          case "number":
+            return filter[key] === object[key];
+          case "string":
+            const m = filter[key].match(/^([=><!]+)(\d+)/);
+            if (m) {
+              const value = parseInt(m[2]);
+              switch (m[1]) {
+                case "=":
+                  return object[key] === value;
+                case "!=":
+                  return object[key] !== value;
+                case "<":
+                  return object[key] < value;
+                case "<=":
+                  return object[key] <= value;
+                case ">":
+                  return object[key] > value;
+                case ">=":
+                  return object[key] >= value;
+              }
+            }
+        }
+        return false;
+      };
+      for (let t = type; t; t = t.extends) {
+        for (const property of Object.values(t.properties)) {
+          switch (property.type) {
+            case "boolean":
+              if (
+                filter[property.name] !== undefined &&
+                filter[property.name] != object[property.name]
+              ) {
+                continue advance;
+              }
+              break;
+
+            case "number":
+              if (!filterNumber(property.name)) {
+                continue advance;
+              }
+              break;
+            case "string":
+              if (!filterString(property.name)) {
+                continue advance;
+              }
+              break;
+          }
+        }
+      }
+      yield object;
+    }
+  } else {
+    yield* objects;
+  }
+}

package/src/host.mjs

@@ -11,7 +11,8 @@ import {
   formatCIDR,
   hasWellKnownSubnet
 } from "./utils.mjs";
-import { addType } from "./types.mjs";
+import { objectFilter } from "./filter.mjs";
+import { addType, types } from "./types.mjs";
 import {
   generateNetworkDefs,
   generateMachineInfo,
@@ -263,63 +264,7 @@ export class Host extends Base {
   }
 
   *findServices(filter) {
-    if (filter) {
-      for (const service of this.#services) {
-        if (
-          (filter.type === undefined || filter.type === service.type) &&
-          (filter.name === undefined || filter.name === service.name)
-        ) {
-          switch (typeof filter.priority) {
-            case "number":
-              if (filter.priority !== service.priority) {
-                continue;
-              }
-              break;
-            case "string":
-              const m = filter.priority.match(/^([=><!]+)(\d+)/);
-              if (m) {
-                const priority = parseInt(m[2]);
-                switch (m[1]) {
-                  case "=":
-                    if (service.priority != priority) {
-                      continue;
-                    }
-                    break;
-                  case "!=":
-                    if (service.priority == priority) {
-                      continue;
-                    }
-                    break;
-                  case "<":
-                    if (service.priority >= priority) {
-                      continue;
-                    }
-                    break;
-                  case "<=":
-                    if (service.priority > priority) {
-                      continue;
-                    }
-                    break;
-                  case ">":
-                    if (service.priority <= priority) {
-                      continue;
-                    }
-                    break;
-                  case ">=":
-                    if (service.priority < priority) {
-                      continue;
-                    }
-                    break;
-                }
-              }
-          }
-
-          yield service;
-        }
-      }
-    } else {
-      yield* this.#services;
-    }
+    yield* objectFilter(types.service, this.#services, filter);
   }
 
   typeNamed(typeName, name) {

package/src/service.mjs

@@ -1,9 +1,6 @@
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 
-
-export const sortByPriority = (a, b) => a.priority - b.priority;
-
 const ServiceTypes = {
   dns: { protocol: "udp", port: 53 },
   ldap: { protocol: "tcp", port: 389 },
@@ -30,7 +27,8 @@ const ServiceTypeDefinition = {
     type: { type: "string", collection: false, writeable: true },
     master: { type: "boolean", collection: false, writeable: true },
     priority: { type: "number", collection: false, writeable: true },
-    weight: { type: "number", collection: false, writeable: true }
+    weight: { type: "number", collection: false, writeable: true },
+    srvPrefix: { type: "string", collection: false, writeable: false }
   }
 };
 
@@ -166,3 +164,5 @@ export class Service extends Base {
     }
   }
 }
+
+export const sortByPriority = (a, b) => a.priority - b.priority;

package/types/filter.d.mts

@@ -0,0 +1 @@
+export function objectFilter(type: any, objects: any, filter: any): Generator<any, void, any>;

package/types/host.d.mts

@@ -175,7 +175,6 @@ export class Host extends Base {
     get hostName(): string;
     get domainName(): string;
     get host(): this;
-    findServices(filter: any): Generator<any, void, unknown>;
     named(name: any): any;
     set networkInterfaces(networkInterface: Map<any, any>);
     get networkInterfaces(): Map<any, any>;

package/types/service.d.mts

@@ -1,4 +1,3 @@
-export function sortByPriority(a: any, b: any): number;
 export class Service extends Base {
     static get typeDefinition(): {
         name: string;
@@ -82,6 +81,11 @@ export class Service extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            srvPrefix: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
         };
     };
     alias: any;
@@ -104,4 +108,5 @@ export class Service extends Base {
     get srvPrefix(): string;
     #private;
 }
+export function sortByPriority(a: any, b: any): number;
 import { Base } from "./base.mjs";