@metric-im/administrate 1.0.2 → 1.1.0

package/.claude/settings.local.json

@@ -0,0 +1,13 @@
+{
+  "permissions": {
+    "allow": [
+      "Read(//home/msprague/workspace/rootz/epistery/docs/**)",
+      "Read(//home/msprague/workspace/rootz/epistery/src/**)",
+      "Read(//home/msprague/workspace/rootz/epistery/**)",
+      "Read(//home/msprague/workspace/rootz/rhonda/node_modules/epistery/**)",
+      "Read(//home/msprague/workspace/rootz/rhonda/**)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

package/certify.mjs

@@ -1,7 +1,7 @@
 import express from 'express';
 import Acme from 'acme-client';
 import tls from 'tls';
-import { Config } from './config.mjs';
+import { Config } from 'epistery';
 import moment from 'moment';
 
 const MAX_AGE = 75; // days
@@ -17,9 +17,13 @@ export class Certify {
     }
     static async attach(app,options) {
         const instance = new Certify(app,options);
-        instance.config = new Config();
-        if (!instance.config.data.ssl) instance.config.data.ssl = {};
-        instance.contactEmail = instance.config.profile?.email || instance.options.contactEmail;
+        instance.config = new Config(); // Uses default 'epistery' root
+
+        // Load root config to get contact email
+        instance.config.setPath('/');
+        instance.config.load();
+        instance.contactEmail = instance.options.contactEmail || instance.config.data.ssl?.email || instance.config.data.profile?.email;
+
         instance.acme = new Acme.Client({
             directoryUrl: Acme.directory.letsencrypt[process.env.PROFILE==='DEV'?'staging':'production'],
             accountKey: await Acme.crypto.createPrivateKey(),
@@ -71,9 +75,13 @@ export class Certify {
       if (sitename === 'localhost' || sitename.includes('.local') || sitename.match(/^\d+\.\d+\.\d+\.\d+$/)) {
         return null; // Use default certificate
       }
-      
-      const site = this.config.data.ssl ? this.config.data.ssl[sitename] : undefined;
-      if (!site?.certified || moment().isAfter(moment(site.certified).add(MAX_AGE, 'days'))) {
+
+      // Load domain-specific config to check SSL section
+      this.config.setPath(`/${sitename}`);
+      this.config.load();
+      const sslConfig = this.config.data.ssl;
+
+      if (!sslConfig?.certified || moment().isAfter(moment(sslConfig.certified).add(MAX_AGE, 'days'))) {
         if (!this.pending[sitename] || moment().isAfter(moment(this.pending[sitename]).add(MAX_WAIT_TIME, 'seconds'))) {
           try {
             this.pending[sitename] = moment();
@@ -91,27 +99,31 @@ export class Certify {
           }
         }
       }
-      if (site) {
-        const key = this.config.readFile(site.key).toString();
-        const cert = this.config.readFile(site.cert).toString();
+      if (sslConfig?.key && sslConfig?.cert) {
+        const key = this.config.readFile(sslConfig.key).toString();
+        const cert = this.config.readFile(sslConfig.cert).toString();
         return {key: key, cert: cert};
       } else {
         return null;
       }
     }
     async renewCert(sitename) {
-      const site = this.config.data.ssl ? this.config.data.ssl[sitename] : undefined;
-      if (site?.certified && moment().isBefore(moment(site.certified).add(MAX_AGE, 'days'))) {
+      // Load domain config to check SSL certification date
+      this.config.setPath(`/${sitename}`);
+      this.config.load();
+      const sslConfig = this.config.data.ssl;
+
+      if (sslConfig?.certified && moment().isBefore(moment(sslConfig.certified).add(MAX_AGE, 'days'))) {
         return;
       } else {
         if (!this.contactEmail) throw new Error(`cannot request certificate without CONTACT_EMAIL set`);
         this.pending[sitename] = true;
-        
+
         try {
           // Add timeout wrapper for the entire certificate renewal process
           await Promise.race([
             this.doRenewCert(sitename),
-            new Promise((_, reject) => 
+            new Promise((_, reject) =>
               setTimeout(() => reject(new Error(`Certificate renewal timeout for ${sitename}`)), 120000) // 2 minute timeout
             )
           ]);
@@ -128,7 +140,7 @@ export class Certify {
       const [key, csr] = await Acme.crypto.createCsr({
         altNames: [sitename],
       });
-      
+
       // order certificate with timeout
       const cert = await this.acme.auto({
         csr,
@@ -142,14 +154,22 @@ export class Certify {
           delete this.challenges[challenge.token];
         },
       });
-      
-      // save certificate
-      this.config.writeFile(sitename+'.cert', cert);
-      this.config.writeFile(sitename+'.key', key.toString());
-      this.config.data.ssl[sitename] = {key:sitename+'.key', cert:sitename+'.cert',certified:moment().format("YYYY-MM-DD")};
+
+      // Set path to domain directory and save certificate files there
+      this.config.setPath(`/${sitename}`);
+      this.config.writeFile('ssl_cert.pem', cert);
+      this.config.writeFile('ssl_key.pem', key.toString());
+
+      // Load existing config and add/update [ssl] section
+      this.config.load();
+      if (!this.config.data.ssl) this.config.data.ssl = {};
+      this.config.data.ssl.key = 'ssl_key.pem';
+      this.config.data.ssl.cert = 'ssl_cert.pem';
+      this.config.data.ssl.certified = moment().format("YYYY-MM-DD");
+
       delete this.pending[sitename];
       this.config.save();
-      
+
       console.log(`Certificate successfully renewed for ${sitename}`);
     }
 }

package/index.mjs

@@ -1,4 +1,3 @@
 export { Certify } from './certify.mjs';
-export { Config, DomainConfig } from './config.mjs';
 export { Synchronize } from './synchronize.mjs';
 export { MultiSite, Site } from './multisite.mjs';

package/multisite.mjs

@@ -1,6 +1,6 @@
 import express from 'express';
 import tls from 'tls';
-import { Config } from './config.mjs';
+import { Config } from 'epistery';
 import moment from 'moment';
 import fs from "fs";
 import {resolve} from "path";
@@ -211,6 +211,7 @@ export class MultiSite {
     static async attach(app,options) {
         const instance = new MultiSite(app,options);
         instance.config = new Config();
+
         // spawn declared sites
         if (fs.existsSync(resolve('./sites'))) {
             instance.sites = (fs.readdirSync(resolve('./sites'))).reduce((result,hostName)=>{
@@ -226,6 +227,7 @@ export class MultiSite {
         app.use('/',instance.routes());
         return instance;
     }
+    
     routes() {
         const router = express.Router();
 
@@ -263,7 +265,7 @@ export class MultiSite {
                             url: target,
                             headers: headersToForward,
                             data: payload,
-                            params: req.query,
+                            // Don't pass params - req.url already contains query string
                             validateStatus: () => true,
                             timeout: 30000,
                             responseType: 'stream'
@@ -285,7 +287,7 @@ export class MultiSite {
                             url: target,
                             headers: headersToForward,
                             data: payload,
-                            params: req.query,
+                            // Don't pass params - req.url already contains query string
                             validateStatus: () => true,
                             timeout: 30000,
                             responseType: 'text'
@@ -338,6 +340,12 @@ export class Site {
         this.name = name;
         this.options = options;
         this.parent = parent;
+        try {
+            const envars = JSON.parse(process.env.SITE_ENV||{});
+            Object.assign(this.options.env,envars[this.name]||{});
+        } catch(e) {
+            console.log(`Unable to parse SITE_ENV... continuing: ${e.message}`);
+        }
     }
     static Spawn(name, options, parent) {
         const instance = new Site(name, options, parent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metric-im/administrate",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Tools for site administration",
   "homepage": "https://github.com/metric-im/administrate#readme",
   "bugs": {
@@ -22,7 +22,9 @@
     "acme-client": "^5.4.0",
     "axios": "^1.7.0",
     "express": "^5.1.0",
-    "ini": "^5.0.0",
     "moment": "^2.30.1"
+  },
+  "peerDependencies": {
+    "epistery": "^1.0.0"
   }
 }

package/config.mjs

@@ -1,95 +0,0 @@
-import fs from 'fs';
-import ini from 'ini';
-import {dirname, join, resolve} from "path";
-import * as domain from "node:domain";
-
-export class Config {
-    constructor(rootName) {
-        this.rootName = rootName || 'metric-im';
-        this.homeDir = (process.platform === 'win32' ? process.env.USERPROFILE : process.env.HOME);
-        this.configDir = join(this.homeDir, '.' + this.rootName);
-        this.configFile = join(this.configDir, 'config.ini');
-        if (!fs.existsSync(this.configFile)) {
-            this.initialize();
-        } else {
-            this.load();
-        }
-    }
-
-    initialize() {
-        this.data = ini.decode("");
-        if (!fs.existsSync(this.configDir)) {
-            fs.mkdirSync(this.configDir);
-        }
-        this.save()
-    }
-
-    load() {
-        let fileData = fs.readFileSync(this.configFile);
-        this.data = ini.decode(fileData.toString());
-    }
-
-    save() {
-        let text = ini.stringify(this.data, {});
-        fs.writeFileSync(this.configFile, text);
-    }
-
-    readFile(filename) {
-        return fs.readFileSync(join(this.configDir, filename));
-    }
-
-    writeFile(filename, data) {
-        fs.writeFileSync(join(this.configDir, filename), data);
-    }
-}
-
-export class DomainConfig extends Config {
-  constructor(rootName,domain) {
-    super(rootName);
-    this.domain = domain;
-    this.domainData = {};
-  }
-
-  setDomain(domain) {
-    this.domain = domain;
-    this.domainConfigDir = join(this.configDir, domain);
-    this.domainConfigFile = join(this.domainConfigDir, 'config.ini');
-    if (!fs.existsSync(this.domainConfigDir)) {
-      fs.mkdirSync(this.domainConfigDir);
-      fs.writeFileSync(this.domainConfigFile,`name=${domain}`);
-    }
-    this.load();
-  }
-  getDomain(domain) {
-    let filename = join(this.configDir, domain, 'config.ini');
-    if (fs.existsSync(filename)) {
-      const text = fs.readFileSync(filename);
-      return ini.decode(text.toString());
-    } else {
-      return null;
-    }
-  }
-  load() {
-    if (this.domain) {
-      const text = fs.readFileSync(this.domainConfigFile);
-      this.domainData = ini.decode(text.toString());
-    }
-    super.load();
-  }
-  save() {
-    if (this.domain) {
-      const text = ini.stringify(this.domainData);
-      fs.writeFileSync(this.domainConfigFile, text);
-    }
-    super.save();
-  }
-  readFile(filename) {
-    if (this.domain) return fs.readFileSync(join(this.domainConfigDir, filename));
-    else return super.readFile(filename);
-  }
-
-  writeFile(filename, data) {
-    if (this.domain) fs.writeFileSync(join(this.domainConfigDir, filename), data);
-    else return super.writeFile(filename);
-  }
-}