@metric-im/administrate 1.0.1 → 1.0.3

package/multisite.mjs

@@ -19,6 +19,7 @@ export class MultiSite {
         this.usedPorts = new Set();
         this.healthCheckIntervals = new Map();
         this.isShuttingDown = false;
+        this.errorLogTracker = new Map(); // Track error frequency for rate limiting
         this.setupCleanup();
     }
     get spawnPort() {
@@ -176,9 +177,41 @@ export class MultiSite {
             }
         });
     }
+
+    // Rate limit error logging to prevent spam
+    shouldLogError(target, clientIP) {
+        const key = `${clientIP}:${target}`;
+        const now = Date.now();
+        const logEntry = this.errorLogTracker.get(key);
+        
+        if (!logEntry) {
+            this.errorLogTracker.set(key, { count: 1, firstSeen: now, lastLogged: now });
+            return true;
+        }
+        
+        logEntry.count++;
+        
+        // Reset counter if it's been more than 5 minutes since first error
+        if (now - logEntry.firstSeen > 300000) {
+            logEntry.count = 1;
+            logEntry.firstSeen = now;
+            logEntry.lastLogged = now;
+            return true;
+        }
+        
+        // Log first error, then every 10th error, but not more than once per minute
+        if (logEntry.count === 1 || 
+            (logEntry.count % 10 === 0 && now - logEntry.lastLogged > 60000)) {
+            logEntry.lastLogged = now;
+            return true;
+        }
+        
+        return false;
+    }
     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)=>{
@@ -194,6 +227,7 @@ export class MultiSite {
         app.use('/',instance.routes());
         return instance;
     }
+    
     routes() {
         const router = express.Router();
 
@@ -205,6 +239,7 @@ export class MultiSite {
                 const method = req.method;
                 const isBodyMethod = ['POST', 'PUT', 'PATCH'].includes(method);
                 const payload = isBodyMethod ? req.body : null;
+                const clientIP = req.ip || req.connection.remoteAddress || req.headers['x-forwarded-for'];
 
                 // Debug logging for POST requests
                 if (method === 'POST') {
@@ -230,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'
@@ -252,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'
@@ -267,7 +302,15 @@ export class MultiSite {
                         res.status(response.status).set(cleanHeaders).send(response.data);
                     }
                 } catch (error) {
-                    console.error(`[Proxy] Error connecting to ${target}:`, error.message);
+                    // Rate limit error logging to prevent spam
+                    if (this.shouldLogError(target, clientIP)) {
+                        const logEntry = this.errorLogTracker.get(`${clientIP}:${target}`);
+                        if (logEntry && logEntry.count > 1) {
+                            console.error(`${clientIP}:E: [Proxy] Error connecting to ${target}: ${error.message} (${logEntry.count} times)`);
+                        } else {
+                            console.error(`${clientIP}:E: [Proxy] Error connecting to ${target}: ${error.message}`);
+                        }
+                    }
 
                     // // Clean up dead processes
                     // this.removeDeadSites();
@@ -297,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.1",
+  "version": "1.0.3",
   "description": "Tools for site administration",
   "homepage": "https://github.com/metric-im/administrate#readme",
   "bugs": {

package/.claude/settings.local.json

@@ -1,10 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Read(//home/msprague/workspace/sitewell/**)",
-      "Read(//home/msprague/workspace/rootz/data-wallet-demos/**)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}