pmcf 1.69.1 → 1.70.0

package/package.json

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

package/src/host.mjs

@@ -11,6 +11,7 @@ import {
   formatCIDR,
   hasWellKnownSubnet
 } from "./utils.mjs";
+import { serviceFilter } from "./service.mjs";
 import { addType } from "./types.mjs";
 import {
   generateNetworkDefs,
@@ -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* serviceFilter(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 },
@@ -166,3 +163,69 @@ export class Service extends Base {
     }
   }
 }
+
+export const sortByPriority = (a, b) => a.priority - b.priority;
+
+export function* serviceFilter(services, filter) {
+  if (filter) {
+    for (const service of services) {
+      const filterString = key => {
+        if (filter[key] === undefined) {
+          return true;
+        }
+        if (filter[key] === service[key]) {
+          return true;
+        }
+
+        for(const value of filter[key].split('|')) {
+          if(service[key] === value) { return true; }
+        }
+
+        return false;
+      };
+
+      const filterNumber = key => {
+        switch (typeof filter[key]) {
+          case "undefined":
+            return true;
+          case "number":
+            return filter[key] === service[key];
+          case "string":
+            const m = filter[key].match(/^([=><!]+)(\d+)/);
+            if (m) {
+              const value = parseInt(m[2]);
+              switch (m[1]) {
+                case "=":
+                  return service[key] === value;
+                case "!=":
+                  return service[key] !== value;
+                case "<":
+                  return service[key] < value;
+                case "<=":
+                  return service[key] <= value;
+                case ">":
+                  return service[key] > value;
+                case ">=":
+                  return service[key] >= value;
+              }
+            }
+        }
+        return false;
+      };
+
+      if (
+        filterString("type") &&
+        filterString("name") &&
+        filterString("protocol") &&
+        filterString("alias") &&
+        filterNumber("priority") &&
+        filterNumber("weight") &&
+        filterNumber("port")
+      ) {
+        yield service;
+      }
+    }
+  } else {
+    yield* services;
+  }
+}

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,4 @@
-export function sortByPriority(a: any, b: any): number;
+export function serviceFilter(services: any, filter: any): Generator<any, void, any>;
 export class Service extends Base {
     static get typeDefinition(): {
         name: string;
@@ -104,4 +104,5 @@ export class Service extends Base {
     get srvPrefix(): string;
     #private;
 }
+export function sortByPriority(a: any, b: any): number;
 import { Base } from "./base.mjs";