pmcf 2.64.6 → 2.65.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.64.6",
+  "version": "2.65.0",
   "publishConfig": {
     "access": "public"
   },
@@ -46,7 +46,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "ip-utilties": "^1.4.6",
+    "ip-utilties": "^1.4.7",
     "npm-pkgbuild": "^18.2.10",
     "pacc": "^3.4.5",
     "pkg-dir": "^8.0.0"

package/src/base.mjs

@@ -300,10 +300,28 @@ export class Base {
     return this.constructor.typeDefinition.name;
   }
 
+  /**
+   * @return {Iterable<Base>}
+   */
   get extends() {
     return [];
   }
 
+  *_extendedPropertyIterator(propertyName, seen) {
+    if (!seen.has(this)) {
+      seen.add(this);
+
+      const value = this[propertyName];
+      if (value !== undefined) {
+        yield value;
+      }
+
+      for (const e of this.extends) {
+        yield* e._extendedPropertyIterator(propertyName, seen);
+      }
+    }
+  }
+
   _extendedProperty(propertyName, seen) {
     if (!seen.has(this)) {
       seen.add(this);

package/src/filter.mjs

@@ -20,10 +20,7 @@ export function* objectFilter(type, objects, filter) {
       };
 
       const filterString = key => {
-        if (filter[key] === undefined) {
-          return true;
-        }
-        if (filter[key] === object[key]) {
+        if (filter[key] === undefined || filter[key] === object[key]) {
           return true;
         }
 
@@ -75,7 +72,14 @@ export function* objectFilter(type, objects, filter) {
               }
               break;
             case "string":
-              if (!filterString(property.name)) {
+              if (property.collection && filter[property.name] !== undefined) {
+                const value = object[property.name];
+
+                if (value instanceof Set && value.has(filter[property.name])) {
+                  break;
+                }
+                continue advance;
+              } else if (!filterString(property.name)) {
                 continue advance;
               }
               break;

package/src/network-interfaces/ethernet.mjs

@@ -26,6 +26,10 @@ export class EthernetNetworkInterface extends NetworkInterface {
     return EthernetNetworkInterfaceTypeDefinition;
   }
 
+  static isCommonName(name) {
+    return name.match(/eth\d+$/);
+  }
+
   constructor(owner, data) {
     super(owner, data);
     this.read(data, EthernetNetworkInterfaceTypeDefinition);

package/src/network-interfaces/loopback.mjs

@@ -28,6 +28,11 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
     return LoopbackNetworkInterfaceTypeDefinition;
   }
 
+  static isCommonName(name)
+  {
+    return name.match(/lo\d+$/);
+  }
+
   constructor(owner, data) {
     super(owner, data);
     this.read(data, NetworkInterfaceTypeDefinition);

package/src/network-interfaces/network-interface.mjs

@@ -16,12 +16,16 @@ export const NetworkInterfaceTypeDefinition = {
   extends: Base.typeDefinition,
   specializations: {},
   factoryFor(owner, value) {
-    const kind = value.kind;
-    const t = NetworkInterfaceTypeDefinition.specializations[kind];
+    let t = NetworkInterfaceTypeDefinition.specializations[value.kind];
+
+    if (!t) {
+      for (t of Object.values(NetworkInterfaceTypeDefinition.specializations)) {
+        if (t.clazz.isCommonName && t.clazz.isCommonName(value.name)) {
+          break;
+        }
+      }
+    }
 
-    /*if (!t) {
-      console.warn("FACTORY", owner.name, value, t?.name);
-    }*/
     if (t) {
       delete value.type;
       delete value.kind;
@@ -53,6 +57,10 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     return NetworkInterfaceTypeDefinition;
   }
 
+  static isCommonName(name) {
+    false;
+  }
+
   _ipAddresses = new Map();
   _scope;
   _metric;

package/src/service.mjs

@@ -63,7 +63,7 @@ const ServiceTypes = {
   }
 };
 
-function serviceTypeEndpoints(type) {
+export function serviceTypeEndpoints(type) {
   let st = ServiceTypes[type];
   if (st) {
     if (st.extends) {
@@ -92,6 +92,7 @@ export const endpointProperties = {
     values: ["tcp", "udp"]
   },
   type: { type: "string", collection: false, writeable: true },
+  types: { type: "string", collection: true, writeable: false },
   tls: {
     type: "boolean",
     collection: false,
@@ -193,6 +194,11 @@ export class Service extends Base {
     return this.host.subnets;
   }
 
+  get serviceTypeEndpoints()
+  {
+      return serviceTypeEndpoints(this.type);
+  }
+
   endpoints(filter) {
     const data = serviceTypeEndpoints(this.type);
 
@@ -264,6 +270,10 @@ export class Service extends Base {
     return this._type ?? this.name;
   }
 
+  get types() {
+    return new Set([...this._extendedPropertyIterator("type", new Set())]);
+  }
+
   get systemdServices() {
     return this.extendedProperty("_systemd");
   }

package/src/services/bind.mjs

@@ -16,7 +16,11 @@ import {
   addresses
 } from "pmcf";
 import { addType } from "../types.mjs";
-import { ServiceTypeDefinition } from "../service.mjs";
+import {
+  ServiceTypeDefinition,
+  Service,
+  serviceTypeEndpoints
+} from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addHook } from "../hooks.mjs";
 
@@ -143,6 +147,7 @@ export class BindService extends ExtraSourceService {
   constructor(owner, data) {
     super(owner, data);
 
+    this._extends.push(new Service(owner, { name: this.name, type: "dns" }));
     this.views = {};
 
     for (const name of ["internal", "protected"]) {
@@ -159,7 +164,11 @@ export class BindService extends ExtraSourceService {
   }
 
   get type() {
-    return "dns";
+    return "bind";
+  }
+
+  get serviceTypeEndpoints() {
+    return serviceTypeEndpoints("dns");
   }
 
   endpoints(filter) {
@@ -247,7 +256,7 @@ export class BindService extends ExtraSourceService {
     };
 
     const forwarders = serviceEndpoints(this.source, {
-      services: { type: "dns", priority: ">=300" },
+      services: { types: "dns", priority: ">=300" },
       select: e => e.address,
       limit: 5
     });
@@ -552,7 +561,7 @@ export class BindService extends ExtraSourceService {
   }
 
   get defaultRecords() {
-    const nameService = this.findService({ type: "dns", priority: ">=300" });
+    const nameService = this.findService({ types: "dns", priority: ">=300" });
 
     const SOARecord = DNSRecord(
       "@",

package/src/services/systemd-resolved.mjs

@@ -39,7 +39,7 @@ export class SystemdResolvedService extends ExtraSourceService {
   systemdConfigs(name) {
     const options = (priority, limit) => {
       return {
-        services: { type: "dns", priority },
+        services: { types: "dns", priority },
         endpoints: e => e.networkInterface.kind !== "loopback",
         select: endpoint => endpoint.address,
         join: " ",

package/types/base.d.mts

@@ -71,7 +71,11 @@ export class Base {
     isNamed(name: any): boolean;
     relativeName(name: any): any;
     get typeName(): any;
-    get extends(): any[];
+    /**
+     * @return {Iterable<Base>}
+     */
+    get extends(): Iterable<Base>;
+    _extendedPropertyIterator(propertyName: any, seen: any): any;
     _extendedProperty(propertyName: any, seen: any): any;
     extendedProperty(propertyName: any): any;
     get root(): any;

package/types/extra-source-service.d.mts

@@ -101,6 +101,11 @@ export class ExtraSourceService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;

package/types/network-interfaces/ethernet.d.mts

@@ -341,6 +341,7 @@ export class EthernetNetworkInterface extends NetworkInterface {
             };
         };
     };
+    static isCommonName(name: any): any;
     arpbridge: any;
     get kind(): string;
 }

package/types/network-interfaces/loopback.d.mts

@@ -321,6 +321,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
         priority: number;
         properties: {};
     };
+    static isCommonName(name: any): any;
     get kind(): string;
     get scope(): string;
     get localDomains(): Set<string>;

package/types/network-interfaces/network-interface.d.mts

@@ -316,6 +316,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
             };
         };
     };
+    static isCommonName(name: any): void;
     _ipAddresses: Map<any, any>;
     _scope: any;
     _metric: any;

package/types/service.d.mts

@@ -1,3 +1,4 @@
+export function serviceTypeEndpoints(type: any): any;
 /**
  *
  * @param {*} sources
@@ -40,13 +41,21 @@ export namespace endpointProperties {
         export { writeable_2 as writeable };
     }
     export { type_2 as type };
-    export namespace tls {
+    export namespace types {
         let type_4: string;
         export { type_4 as type };
         let collection_3: boolean;
         export { collection_3 as collection };
         let writeable_3: boolean;
         export { writeable_3 as writeable };
+    }
+    export namespace tls {
+        let type_5: string;
+        export { type_5 as type };
+        let collection_4: boolean;
+        export { collection_4 as collection };
+        let writeable_4: boolean;
+        export { writeable_4 as writeable };
         let _default: boolean;
         export { _default as default };
     }
@@ -149,6 +158,11 @@ export namespace ServiceTypeDefinition {
             collection: boolean;
             writeable: boolean;
         };
+        types: {
+            type: string;
+            collection: boolean;
+            writeable: boolean;
+        };
         tls: {
             type: string;
             collection: boolean;
@@ -269,6 +283,11 @@ export class Service extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            types: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             tls: {
                 type: string;
                 collection: boolean;
@@ -315,6 +334,7 @@ export class Service extends Base {
     get domainName(): any;
     get networks(): Set<any>;
     get subnets(): Set<any>;
+    get serviceTypeEndpoints(): any;
     endpoints(filter: any): any[];
     endpoint(filter: any): any;
     address(options?: {
@@ -331,6 +351,7 @@ export class Service extends Base {
     get weight(): any;
     set type(value: any);
     get type(): any;
+    get types(): Set<any>;
     get systemdServices(): any;
     dnsRecordsForDomainName(domainName: any, hasSVRRecords: any): {
         type: any;

package/types/services/bind.d.mts

@@ -87,6 +87,11 @@ export class BindService extends ExtraSourceService {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -210,6 +215,11 @@ export class BindService extends ExtraSourceService {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    types: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     tls: {
                         type: string;
                         collection: boolean;

package/types/services/chrony.d.mts

@@ -87,6 +87,11 @@ export class ChronyService extends ExtraSourceService {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -210,6 +215,11 @@ export class ChronyService extends ExtraSourceService {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    types: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     tls: {
                         type: string;
                         collection: boolean;

package/types/services/kea.d.mts

@@ -88,6 +88,11 @@ export class KeaService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -208,6 +213,11 @@ export class KeaService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;

package/types/services/openldap.d.mts

@@ -87,6 +87,11 @@ export class OpenLDAPService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -207,6 +212,11 @@ export class OpenLDAPService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;

package/types/services/systemd-journal-remote.d.mts

@@ -87,6 +87,11 @@ export class SystemdJournalRemoteService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -207,6 +212,11 @@ export class SystemdJournalRemoteService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;

package/types/services/systemd-journal-upload.d.mts

@@ -87,6 +87,11 @@ export class SystemdJournalUploadService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -207,6 +212,11 @@ export class SystemdJournalUploadService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;

package/types/services/systemd-journal.d.mts

@@ -87,6 +87,11 @@ export class SystemdJournalService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -207,6 +212,11 @@ export class SystemdJournalService extends Service {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;

package/types/services/systemd-resolved.d.mts

@@ -87,6 +87,11 @@ export class SystemdResolvedService extends ExtraSourceService {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -207,6 +212,11 @@ export class SystemdResolvedService extends ExtraSourceService {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;

package/types/services/systemd-timesyncd.d.mts

@@ -87,6 +87,11 @@ export class SystemdTimesyncdService extends ExtraSourceService {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;
@@ -207,6 +212,11 @@ export class SystemdTimesyncdService extends ExtraSourceService {
                     collection: boolean;
                     writeable: boolean;
                 };
+                types: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 tls: {
                     type: string;
                     collection: boolean;