pmcf 4.5.3 → 4.5.5

package/package.json

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

package/src/hooks.mjs

@@ -1,21 +1,21 @@
 import { createReadStream } from "node:fs";
 import { extractFunctions } from "npm-pkgbuild";
 
-export async function loadHooks(hooks, file) {
+export async function loadHooks(packageData, file) {
   for await (const f of extractFunctions(createReadStream(file, "utf8"))) {
-    addHook(hooks, f.name, f.body);
+    addHook(packageData, f.name, f.body);
   }
-
-  return hooks;
 }
 
-export function addHook(hooks, name, content) {
-  const hook = hooks[name];
+export function addHook(packageData, name, content) {
+  packageData.properties.hooks ||= {};
+
+  const hook = packageData.properties.hooks[name];
   if (hook) {
     content = hook + "\n" + content;
   }
 
-  hooks[name] = content;
+  packageData.properties.hooks[name] = content;
 
-  return hooks;
+  return packageData.properties.hooks;
 }

package/src/host.mjs

@@ -17,7 +17,6 @@ import {
   domainFromDominName,
   domainName,
   writeLines,
-  sectionLines,
   asArray
 } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";
@@ -451,14 +450,15 @@ export class Host extends ServiceOwner {
         provides: [...this.provides],
         replaces: [...this.replaces],
         requires: [],
-        backup: "root/.ssh/known_hosts",
-        hooks: await loadHooks(
-          {},
-          new URL("host.install", import.meta.url).pathname
-        )
+        backup: "root/.ssh/known_hosts"
       }
     };
 
+    await loadHooks(
+      packageData,
+      new URL("host.install", import.meta.url).pathname
+    );
+
     for (const ni of this.networkInterfaces.values()) {
       await ni.systemdDefinitions(packageData);
     }
@@ -478,7 +478,7 @@ export class Host extends ServiceOwner {
           await writeLines(dir, configFileName, content);
 
           addHook(
-            packageData.properties.hooks,
+            packageData,
             "post_install",
             `systemctl enable ${serviceName}`
           );

package/src/location.mjs

@@ -55,14 +55,15 @@ export class Location extends Owner {
         access: "private",
         dependencies: { jq: ">=1.8" },
         provides: ["location", "mf-location"],
-        replaces: [`mf-location-${this.name}`],
-        hooks: await loadHooks(
-          {},
-          new URL("location.install", import.meta.url).pathname
-        )
+        replaces: [`mf-location-${this.name}`]
       }
     };
 
+    await loadHooks(
+      packageData,
+      new URL("location.install", import.meta.url).pathname
+    );
+
     yield packageData;
   }
 }

package/src/services/openldap.mjs

@@ -98,6 +98,25 @@ export class OpenLDAPService extends Service {
     this._uri = value;
   }
 
+  templateContent(entryProperties, directoryProperties) {
+    const transformers = [
+      createExpressionTransformer(e => true, {
+        base: this.baseDN,
+        uri: this.uri
+      })
+    ];
+
+    return [...this.allExtends(), this].map(e => {
+      const dir = join(e.directory, "content") + "/";
+      console.log("DIR", dir);
+
+      return transform(
+        new FileContentProvider(dir, entryProperties, directoryProperties),
+        transformers
+      );
+    });
+  }
+
   async *preparePackages(dir) {
     const host = this.host;
     const name = host.name;
@@ -114,33 +133,11 @@ export class OpenLDAPService extends Service {
       owner,
       group
     };
-    const transformers = [
-      createExpressionTransformer(e => true, {
-        base: this.baseDN,
-        uri: this.uri
-      })
-    ];
-
-    const templateDirs = [];
-    for (const e of [...this.allExtends(), this]) {
-      const dir = join(e.directory, "content") + "/";
-      console.log("DIR", dir);
-      templateDirs.push(
-        transform(
-          new FileContentProvider(
-            { transformers, dir },
-            entryProperties,
-            directoryProperties
-          ),
-          transformers
-        )
-      );
-    }
 
     const packageData = {
       dir,
       sources: [
-        ...templateDirs,
+        ...this.templateContent(entryProperties, directoryProperties),
         new FileContentProvider(dir + "/", entryProperties, directoryProperties)
       ],
       outputs: this.outputs,
@@ -148,19 +145,18 @@ export class OpenLDAPService extends Service {
         name: `${this.typeName}-${this.location.name}-${name}`,
         description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
-        dependencies: ["openldap>=2.6.10"],
-        hooks: {}
+        dependencies: ["openldap>=2.6.10"]
       }
     };
 
     addHook(
-      packageData.properties.hooks,
+      packageData,
       "post_upgrade",
       `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
     );
 
     addHook(
-      packageData.properties.hooks,
+      packageData,
       "post_install",
       `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
     );

package/types/hooks.d.mts

@@ -1,2 +1,2 @@
-export function loadHooks(hooks: any, file: any): Promise<any>;
-export function addHook(hooks: any, name: any, content: any): any;
+export function loadHooks(packageData: any, file: any): Promise<void>;
+export function addHook(packageData: any, name: any, content: any): any;

package/types/host.d.mts

@@ -265,7 +265,6 @@ export class Host extends ServiceOwner {
             replaces: any[];
             requires: any[];
             backup: string;
-            hooks: any;
         };
     }, void, unknown>;
 }

package/types/location.d.mts

@@ -362,7 +362,6 @@ export class Location extends Owner {
             };
             provides: string[];
             replaces: string[];
-            hooks: any;
         };
     }, void, unknown>;
 }

package/types/services/openldap.d.mts

@@ -874,6 +874,7 @@ export class OpenLDAPService extends Service {
     set uri(value: any);
     get uri(): any;
     _uri: any;
+    templateContent(entryProperties: any, directoryProperties: any): any[];
     preparePackages(dir: any): AsyncGenerator<{
         dir: any;
         sources: any[];
@@ -883,7 +884,6 @@ export class OpenLDAPService extends Service {
             description: string;
             access: string;
             dependencies: string[];
-            hooks: {};
         };
     }, void, unknown>;
 }