pmcf 1.61.11 → 1.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.61.11",
+  "version": "1.63.0",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "npm-pkgbuild": "^17.2.5",
+    "npm-pkgbuild": "^17.3.0",
     "pacc": "^3.3.0",
     "pkg-dir": "^8.0.0"
   },

package/src/base.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
-import { allOutputs } from "npm-pkgbuild";
+import { createReadStream } from "node:fs";
+import { allOutputs, extractFunctions } from "npm-pkgbuild";
 import { getAttribute } from "pacc";
 import { addType, primitives } from "./types.mjs";
 
@@ -203,20 +204,18 @@ export class Base {
     }
   }
 
-  named(name)
-  {
-  }
+  named(name) {}
 
   typeNamed(typeName, name) {
     if (this.owner) {
       const object = this.owner.typeNamed(typeName, name); // TODO split
-      if(object) {
+      if (object) {
         return object;
       }
     }
 
     const object = this.named(name);
-    if(object?.typeName === typeName) {
+    if (object?.typeName === typeName) {
       return object;
     }
   }
@@ -337,18 +336,25 @@ export class Base {
     return this.#packaging;
   }
 
+  #packageHooks = {};
 
-  #packageHooks = new Map();
+  get packageHooks() {
+    return this.#packageHooks;
+  }
 
-  addPackageHook(name,content)
-  {
-    let hook = this.#packageHooks.get(name);
-    if(hook) {
-      content = hook + content;
+  async loadPackageHooks(file) {
+    for await (const f of extractFunctions(createReadStream(file, "utf8"))) {
+      this.addPackageHook(f.name, f.body);
     }
+  }
 
-    this.#packageHooks.set(name, content);
+  addPackageHook(name, content) {
+    const hook = this.#packageHooks[name];
+    if (hook) {
+      content = hook + "\n" + content;
+    }
 
+    this.#packageHooks[name] = content;
   }
 
   get outputs() {

package/src/cluster.mjs

@@ -51,6 +51,10 @@ export class Cluster extends Host {
     return this.#backups;
   }
 
+  get members() {
+    return this.masters.union(this.backups);
+  }
+
   async *preparePackages(stagingDir) {
     const result = {
       sources: [],
@@ -93,6 +97,31 @@ export class Cluster extends Host {
         cfg.push("  }");
         cfg.push("}");
         cfg.push("");
+
+        for (const service of cluster.findServices({ type: "http" })) {
+          console.log("S",service.host.name,service.name);
+          cfg.push(`virtual_server ${cluster.rawAddress} ${service.port} {`);
+          cfg.push("  delay_loop 6");
+          cfg.push("  lb_algo wlc");
+          cfg.push("  persistence_timeout 600");
+          cfg.push(`  protocol ${service.protocol.toUpperCase()}`);
+
+          for (const member of this.members) {
+            cfg.push(`  real_server ${member.rawAddress} ${service.port} {`);
+            cfg.push("    weight 100");
+
+            if (service.protocol === "tcp") {
+              cfg.push(`    TCP_CHECK {`);
+              cfg.push("      connect_timeout 3");
+              cfg.push("    }");
+            }
+
+            cfg.push("  }");
+          }
+
+          cfg.push("}");
+          cfg.push("");
+        }
       }
 
       await writeLines(

package/src/host.mjs

@@ -254,8 +254,12 @@ export class Host extends Base {
     return this.#services;
   }
 
-  set services(services) {
-    this.#services.push(services);
+  set services(service) {
+    const present = this.#services.find(s => s.name === service.name);
+
+    if (!present) {
+      this.#services.push(service);
+    }
   }
 
   *findServices(filter) {
@@ -346,6 +350,10 @@ export class Host extends Base {
   }
 
   async *preparePackages(stagingDir) {
+    await this.loadPackageHooks(
+      new URL("host.install", import.meta.url).pathname
+    );
+
     for await (const result of super.preparePackages(stagingDir)) {
       await generateNetworkDefs(this, stagingDir);
       await generateMachineInfo(this, stagingDir);
@@ -363,10 +371,7 @@ export class Host extends Base {
       result.properties.provides = [...this.provides];
       result.properties.replaces = [`mf-${this.hostName}`, ...this.replaces];
       result.properties.backup = "root/.ssh/known_hosts";
-      result.properties.hooks = new URL(
-        "host.install",
-        import.meta.url
-      ).pathname;
+      result.properties.hooks = this.packageHooks;
 
       result.sources.push(
         new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()

package/src/location.mjs

@@ -47,6 +47,11 @@ export class Location extends Owner {
   }
 
   async *preparePackages(stagingDir) {
+
+    await this.loadPackageHooks(
+      new URL("location.install", import.meta.url).pathname
+    );
+
     for await (const result of super.preparePackages(stagingDir)) {
       await writeLines(
         join(stagingDir, "etc/systemd/resolved.conf.d"),
@@ -97,10 +102,7 @@ export class Location extends Owner {
         new FileContentProvider(stagingDir + "/")[Symbol.asyncIterator]()
       );
 
-      result.properties.hooks = new URL(
-        "location.install",
-        import.meta.url
-      ).pathname;
+      result.properties.hooks = this.packageHooks;
 
       yield result;
     }

package/types/base.d.mts

@@ -70,6 +70,8 @@ export class Base {
     set packaging(value: Set<any>);
     get packaging(): Set<any>;
     get derivedPackaging(): any;
+    get packageHooks(): {};
+    loadPackageHooks(file: any): Promise<void>;
     addPackageHook(name: any, content: any): void;
     get outputs(): Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
     preparePackages(stagingDir: any): AsyncGenerator<{

package/types/cluster.d.mts

@@ -381,6 +381,7 @@ export class Cluster extends Host {
     get masters(): Set<any>;
     set backups(value: Set<any>);
     get backups(): Set<any>;
+    get members(): Set<any>;
     preparePackages(stagingDir: any): AsyncGenerator<{
         sources: any[];
         properties: {

package/types/host.d.mts

@@ -151,7 +151,7 @@ export class Host extends Base {
     get provides(): Set<any>;
     set replaces(value: Set<any>);
     get replaces(): Set<any>;
-    set services(services: any[]);
+    set services(service: any[]);
     get services(): any[];
     _traverse(...args: any[]): boolean;
     set deployment(value: any);