pmcf 2.54.0 → 2.55.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.54.0",
+  "version": "2.55.0",
   "publishConfig": {
     "access": "public"
   },
@@ -47,7 +47,7 @@
   "dependencies": {
     "ip-utilties": "^1.3.3",
     "npm-pkgbuild": "^18.2.8",
-    "pacc": "^3.4.2",
+    "pacc": "^3.4.3",
     "pkg-dir": "^8.0.0"
   },
   "devDependencies": {
@@ -55,7 +55,7 @@
     "ava": "^6.3.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.4",
+    "semantic-release": "^24.2.5",
     "typescript": "^5.8.3"
   },
   "engines": {

package/src/endpoint.mjs

@@ -62,7 +62,7 @@ export class Endpoint extends PortEndpoint {
   }
 
   get address() {
-    return this.networkAddress?.address;
+    return this.networkAddress.address;
   }
 
   get family() {
@@ -87,6 +87,11 @@ export class DomainNameEndpoint extends PortEndpoint {
   get address() {
     return this.domainName;
   }
+
+  get isPool()
+  {
+    return this.domainName.indexOf('pool') >= 0; // TODO
+  }
 }
 
 export class HTTPEndpoint extends BaseEndpoint {

package/src/host.mjs

@@ -453,15 +453,15 @@ export class Host extends ServiceOwner {
   }
 
   get subnets() {
-    const sn = new Set();
+    const sn = new Map();
 
     for (const networkInterface of this.networkInterfaces.values()) {
       for (const s of networkInterface.subnets()) {
-        sn.add(s);
+        sn.set(s.address,s);
       }
     }
 
-    return sn;
+    return new Set(sn.values());
   }
 
   async publicKey(type = "ed25519") {

package/src/services/chrony.mjs

@@ -14,14 +14,7 @@ const ChronyServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  properties: {
-    isPool: {
-      type: "boolean",
-      collection: false,
-      writeable: true,
-      default: false
-    }
-  }
+  properties: {}
 };
 
 export class ChronyService extends ExtraSourceService {
@@ -69,24 +62,25 @@ export class ChronyService extends ExtraSourceService {
         },
         endpoints: e =>
           e.service.host !== host &&
-          e.family === "IPv4" &&
+          //e.family === "IPv4" &&
           e.networkInterface.kind !== "loopback",
 
         select: endpoint =>
-          `${endpoint.service.isPool ? "pool" : "server"} ${
-            endpoint.domainName
-          } iburst`
+          `${endpoint.isPool ? "pool" : "server"} ${endpoint.domainName} iburst`
       }),
       `mailonchange ${this.administratorEmail} 0.5`,
       "local stratum 10",
       "leapsectz right/UTC",
       "makestep 1.0 3",
       "ratelimit interval 3 burst 8",
-      "cmdratelimit interval -4 burst 16",
       "driftfile /var/lib/chrony/drift",
       "ntsdumpdir /var/lib/chrony",
       "dumpdir /var/lib/chrony",
-      "pidfile /run/chrony/chronyd.pid"
+      "pidfile /run/chrony/chronyd.pid",
+      [...this.subnets].map(s => `allow ${s.address}`),
+      "cmdratelimit interval -4 burst 16",
+      [...this.subnets].map(s => `cmdallow ${s.address}`)
+      //this.endpoints(e=>e.type === "ntp" && e.networkInterface.kind=='loopback').map(endpoint=>`alllow ${endpoint.address}`)
     ];
 
     await writeLines(join(dir, "etc"), "chrony.conf", lines);

package/types/endpoint.d.mts

@@ -13,6 +13,7 @@ export class DomainNameEndpoint extends PortEndpoint {
     domainName: any;
     get networkInterface(): {};
     get address(): any;
+    get isPool(): boolean;
 }
 export class HTTPEndpoint extends BaseEndpoint {
     constructor(service: any, address: any, data: any);

package/types/services/chrony.d.mts

@@ -253,14 +253,7 @@ export class ChronyService extends ExtraSourceService {
             };
         };
         priority: number;
-        properties: {
-            isPool: {
-                type: string;
-                collection: boolean;
-                writeable: boolean;
-                default: boolean;
-            };
-        };
+        properties: {};
     };
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;