pmcf 3.11.2 → 3.11.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.11.2",
+  "version": "3.11.4",
   "publishConfig": {
     "access": "public"
   },
@@ -53,7 +53,7 @@
   "dependencies": {
     "ip-utilties": "^1.4.9",
     "npm-pkgbuild": "^18.3.7",
-    "pacc": "^4.37.7",
+    "pacc": "^4.39.0",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -4,12 +4,13 @@ import {
   parse,
   expand,
   attributeIterator,
+  default_attribute,
   name_attribute_writable,
   string_attribute,
   string_attribute_writable,
   string_collection_attribute_writable,
   number_attribute_writable,
-  description_attribute,
+  description_attribute_writable,
   boolean_attribute_writable
 } from "pacc";
 import { addType, typeFactory } from "./types.mjs";
@@ -19,10 +20,10 @@ const BaseTypeDefinition = {
   name: "base",
   key: "name",
   attributes: {
-    owner: { type: "base", collection: false, writable: false },
+    owner: { ...default_attribute, type: "base" },
     type: string_attribute,
     name: name_attribute_writable,
-    description: { ...description_attribute, writable: true },
+    description: description_attribute_writable,
     priority: number_attribute_writable,
     directory: string_attribute_writable,
     packaging: string_attribute_writable,

package/src/cluster.mjs

@@ -1,6 +1,10 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { number_attribute_writable } from "pacc";
+import {
+  default_attribute_writable,
+  default_attribute,
+  number_attribute_writable
+} from "pacc";
 import { Owner } from "./owner.mjs";
 import { Host } from "./host.mjs";
 import { serviceEndpoints } from "pmcf";
@@ -15,9 +19,21 @@ const ClusterTypeDefinition = {
   key: "name",
   attributes: {
     routerId: number_attribute_writable,
-    masters: { type: "network_interface", collection: true, writable: true },
-    backups: { type: "network_interface", collection: true, writable: true },
-    members: { type: "network_interface", collection: true, writable: false },
+    masters: {
+      ...default_attribute_writable,
+      type: "network_interface",
+      collection: true
+    },
+    backups: {
+      ...default_attribute_writable,
+      type: "network_interface",
+      collection: true
+    },
+    members: {
+      ...default_attribute,
+      type: "network_interface",
+      collection: true
+    },
     checkInterval: number_attribute_writable
   }
 };
@@ -146,7 +162,8 @@ export class Cluster extends Host {
 
         for (const endpoint of serviceEndpoints(cluster, {
           services: 'type="http"',
-          endpoints: e => e.networkInterface && e.networkInterface.kind !== "loopback"
+          endpoints: e =>
+            e.networkInterface && e.networkInterface.kind !== "loopback"
         })) {
           cfg.push(`virtual_server ${cluster.address} ${endpoint.port} {`);
           cfg.push(`  delay_loop ${cluster.checkInterval}`);

package/src/extra-source-service.mjs

@@ -1,3 +1,4 @@
+import { default_attribute_writable } from "pacc";
 import { addType } from "./types.mjs";
 import { Service, ServiceTypeDefinition } from "./service.mjs";
 import { networkAddressType } from "pmcf";
@@ -8,7 +9,11 @@ export const ExtraSourceServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   priority: 0.1,
   attributes: {
-    source: { type: networkAddressType, collection: true, writable: true }
+    source: {
+      ...default_attribute_writable,
+      type: networkAddressType,
+      collection: true
+    }
   }
 };
 

package/src/host.mjs

@@ -2,12 +2,12 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import {
+  default_attribute_writable,
   string_attribute,
   string_attribute_writable,
   string_collection_attribute_writable,
   number_attribute_writable,
-  boolean_attribute_false,
-  name_attribute
+  boolean_attribute_false
 } from "pacc";
 import { ServiceOwner, Base, addresses } from "pmcf";
 import { networkAddressAttributes } from "./network-support.mjs";
@@ -33,11 +33,15 @@ const HostTypeDefinition = {
   attributes: {
     ...networkAddressAttributes,
     networkInterfaces: {
+      ...default_attribute_writable,
       type: "network_interface",
-      collection: true,
-      writable: true
+      collection: true
+    },
+    services: {
+      ...default_attribute_writable,
+      type: "service",
+      collection: true
     },
-    services: { type: "service", collection: true, writable: true },
     aliases: string_collection_attribute_writable,
     os: {
       ...string_attribute_writable,
@@ -78,7 +82,7 @@ const HostTypeDefinition = {
     replaces: string_collection_attribute_writable,
     depends: string_collection_attribute_writable,
     provides: string_collection_attribute_writable,
-    extends: { type: "host", collection: true, writable: true },
+    extends: { ...default_attribute_writable, type: "host", collection: true },
     model: string_attribute,
     isModel: boolean_attribute_false
   }

package/src/network-interfaces/ethernet.mjs

@@ -1,3 +1,4 @@
+import { default_attribute_writable } from "pacc";
 import { addType } from "../types.mjs";
 import {
   NetworkInterface,
@@ -12,7 +13,11 @@ export const EthernetNetworkInterfaceTypeDefinition = {
   priority: 0.1,
   key: "name",
   attributes: {
-    arpbridge: { type: "network_interface", collection: true, writable: true }
+    arpbridge: {
+      ...default_attribute_writable,
+      type: "network_interface",
+      collection: true
+    }
   }
 };
 

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

@@ -1,6 +1,10 @@
 import { join } from "node:path";
 import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
-import { string_attribute_writable, hostname_attribute } from "pacc";
+import {
+  default_attribute_writable,
+  string_attribute_writable,
+  hostname_attribute
+} from "pacc";
 import { Base, cidrAddresses } from "pmcf";
 import {
   networkAttributes,
@@ -42,16 +46,19 @@ export const NetworkInterfaceTypeDefinition = {
     ...networkAttributes,
     ...networkAddressAttributes,
 
-    services: { type: "service", collection: true, writable: true },
+    services: {
+      ...default_attribute_writable,
+      collection: true,
+      type: "service"
+    },
     hostName: { ...hostname_attribute, writable: true },
-    ipAddresses: { ...string_attribute_writable },
-    hwaddr: { ...string_attribute_writable },
+    ipAddresses: string_attribute_writable,
+    hwaddr: string_attribute_writable,
     network: {
-      type: Network.typeDefinition,
-      collection: false,
-      writable: true
+      ...default_attribute_writable,
+      type: Network.typeDefinition
     },
-    destination: { ...string_attribute_writable }
+    destination: string_attribute_writable
   }
 };
 

package/src/owner.mjs

@@ -1,5 +1,6 @@
 import { normalizeCIDR, familyIP } from "ip-utilties";
 import {
+  default_attribute_writable,
   string_collection_attribute_writable,
   string_attribute_writable,
   email_attribute
@@ -18,9 +19,17 @@ const OwnerTypeDefinition = {
   key: "name",
   attributes: {
     networks: networks_attribute,
-    hosts: { type: "host", collection: true, writable: true },
-    clusters: { type: "cluster", collection: true, writable: true },
-    subnets: { type: Subnet.typeDefinition, collection: true, writable: true },
+    hosts: { ...default_attribute_writable, type: "host", collection: true },
+    clusters: {
+      ...default_attribute_writable,
+      type: "cluster",
+      collection: true
+    },
+    subnets: {
+      ...default_attribute_writable,
+      type: Subnet.typeDefinition,
+      collection: true
+    },
     country: string_attribute_writable,
     domain: string_attribute_writable,
     domains: string_collection_attribute_writable,

package/src/services/bind.mjs

@@ -4,6 +4,7 @@ import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal, reverseArpa } from "ip-utilties";
 import {
   oneOfType,
+  default_attribute_writable,
   string_attribute_writable,
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
@@ -46,14 +47,26 @@ const BindServiceTypeDefinition = {
       collection: true,
       writable: true
     },
-    protected: { type: networkAddressType, collection: true, writable: true },
-    internal: { type: networkAddressType, collection: true, writable: true },
+    protected: {
+      ...default_attribute_writable,
+      type: networkAddressType,
+      collection: true
+    },
+    internal: {
+      ...default_attribute_writable,
+      type: networkAddressType,
+      collection: true
+    },
     hasSVRRecords: boolean_attribute_writable_false,
     hasCatalog: boolean_attribute_writable_true,
     hasLinkLocalAdresses: boolean_attribute_writable_false,
     hasLocationRecord: boolean_attribute_writable_true,
     excludeInterfaceKinds: string_collection_attribute_writable,
-    exclude: { type: networkAddressType, collection: true, writable: true },
+    exclude: {
+      ...default_attribute_writable,
+      type: networkAddressType,
+      collection: true
+    },
     notify: boolean_attribute_writable_false,
     recordTTL: string_attribute_writable,
     serial: number_attribute_writable,
@@ -543,7 +556,9 @@ export class BindService extends ExtraSourceService {
   }
 
   get defaultRecords() {
-    const nameService = this.findService('(type="dns" || type="bind") && priority>=300'); // TODO bind = dns ?
+    const nameService = this.findService(
+      '(type="dns" || type="bind") && priority>=300'
+    ); // TODO bind = dns ?
 
     const SOARecord = DNSRecord(
       "@",

package/src/services/chrony.mjs

@@ -87,7 +87,7 @@ export class ChronyService extends ExtraSourceService {
 
     const lines = [
       ...serviceEndpoints(this, {
-        services: 'type="ntp" && priority>=100',
+        services: '(type="ntp" || type="chrony") && priority>=100',
         endpoints: e =>
           e.type === "ntp" &&
           !isLinkLocal(e.address) &&

package/types/base.d.mts

@@ -10,15 +10,8 @@ export class Base {
         attributes: {
             owner: {
                 type: string;
-                collection: boolean;
-                writable: boolean;
-            };
-            type: import("pacc").AttributeDefinition;
-            name: import("pacc").AttributeDefinition;
-            description: {
-                writable: boolean;
-                type: object;
                 isKey: boolean;
+                writable: boolean;
                 mandatory: boolean;
                 collection: boolean;
                 private?: boolean;
@@ -33,6 +26,9 @@ export class Base {
                 env?: string[] | string;
                 additionalValues?: object;
             };
+            type: import("pacc").AttributeDefinition;
+            name: import("pacc").AttributeDefinition;
+            description: import("pacc").AttributeDefinition;
             priority: import("pacc").AttributeDefinition;
             directory: import("pacc").AttributeDefinition;
             packaging: import("pacc").AttributeDefinition;

package/types/cluster.d.mts

@@ -11,15 +11,8 @@ export class Cluster extends Host {
                 attributes: {
                     owner: {
                         type: string;
-                        collection: boolean;
-                        writable: boolean;
-                    };
-                    type: import("pacc").AttributeDefinition;
-                    name: import("pacc").AttributeDefinition;
-                    description: {
-                        writable: boolean;
-                        type: object;
                         isKey: boolean;
+                        writable: boolean;
                         mandatory: boolean;
                         collection: boolean;
                         private?: boolean;
@@ -34,6 +27,9 @@ export class Cluster extends Host {
                         env?: string[] | string;
                         additionalValues?: object;
                     };
+                    type: import("pacc").AttributeDefinition;
+                    name: import("pacc").AttributeDefinition;
+                    description: import("pacc").AttributeDefinition;
                     priority: import("pacc").AttributeDefinition;
                     directory: import("pacc").AttributeDefinition;
                     packaging: import("pacc").AttributeDefinition;
@@ -64,12 +60,38 @@ export class Cluster extends Host {
                 hosts: {
                     type: string;
                     collection: boolean;
+                    isKey: boolean;
                     writable: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
                 };
                 clusters: {
                     type: string;
                     collection: boolean;
+                    isKey: boolean;
                     writable: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
                 };
                 subnets: {
                     type: {
@@ -103,7 +125,20 @@ export class Cluster extends Host {
                         };
                     };
                     collection: boolean;
+                    isKey: boolean;
                     writable: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
                 };
                 country: import("pacc").AttributeDefinition;
                 domain: import("pacc").AttributeDefinition;
@@ -142,15 +177,8 @@ export class Cluster extends Host {
                 attributes: {
                     owner: {
                         type: string;
-                        collection: boolean;
-                        writable: boolean;
-                    };
-                    type: import("pacc").AttributeDefinition;
-                    name: import("pacc").AttributeDefinition;
-                    description: {
-                        writable: boolean;
-                        type: object;
                         isKey: boolean;
+                        writable: boolean;
                         mandatory: boolean;
                         collection: boolean;
                         private?: boolean;
@@ -165,6 +193,9 @@ export class Cluster extends Host {
                         env?: string[] | string;
                         additionalValues?: object;
                     };
+                    type: import("pacc").AttributeDefinition;
+                    name: import("pacc").AttributeDefinition;
+                    description: import("pacc").AttributeDefinition;
                     priority: import("pacc").AttributeDefinition;
                     directory: import("pacc").AttributeDefinition;
                     packaging: import("pacc").AttributeDefinition;
@@ -177,12 +208,38 @@ export class Cluster extends Host {
                 networkInterfaces: {
                     type: string;
                     collection: boolean;
+                    isKey: boolean;
                     writable: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
                 };
                 services: {
                     type: string;
                     collection: boolean;
+                    isKey: boolean;
                     writable: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
                 };
                 aliases: import("pacc").AttributeDefinition;
                 os: {
@@ -269,7 +326,20 @@ export class Cluster extends Host {
                 extends: {
                     type: string;
                     collection: boolean;
+                    isKey: boolean;
                     writable: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
                 };
                 model: import("pacc").AttributeDefinition;
                 isModel: import("pacc").AttributeDefinition;
@@ -303,17 +373,56 @@ export class Cluster extends Host {
             masters: {
                 type: string;
                 collection: boolean;
+                isKey: boolean;
                 writable: boolean;
+                mandatory: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                prepareValue?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
             };
             backups: {
                 type: string;
                 collection: boolean;
+                isKey: boolean;
                 writable: boolean;
+                mandatory: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                prepareValue?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
             };
             members: {
                 type: string;
                 collection: boolean;
+                isKey: boolean;
                 writable: boolean;
+                mandatory: boolean;
+                private?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                prepareValue?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
             };
             checkInterval: import("pacc").AttributeDefinition;
         };