@metric-im/administrate 1.1.7 → 1.1.9

package/.claude/settings.local.json

@@ -1,10 +1,16 @@
 {
   "permissions": {
     "allow": [
-      "Read(//home/msprague/workspace/sitewell/**)",
-      "Read(//home/msprague/workspace/rootz/data-wallet-demos/**)"
+      "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/**)",
+      "Read(//home/msprague/workspace/metric-im/account-control/**)",
+      "Bash(sed:*)",
+      "Bash(git checkout:*)"
     ],
     "deny": [],
     "ask": []
   }
-}
+}

package/multisite.mjs

@@ -15,6 +15,7 @@ export class MultiSite {
         this.app = app;
         this.options = options || {};
         this.sites = {};
+        this.spawning = new Set(); // Track domains currently being spawned
         this._spawnPort = (parseInt(this.options.spawnPort||0) || 53874);
         this.usedPorts = new Set();
         this.healthCheckIntervals = new Map();
@@ -325,11 +326,25 @@ export class MultiSite {
                     res.status(502).send('Bad Gateway. Try reloading.');
                 }
             } else {
-                this.sites[domain] = Site.Clone(domain,this);
-                // Retry the request after spawning
-                setTimeout(() => {
-                    res.redirect(`//${req.hostname}${req.url}`);
-                }, 2000);
+                // Check if already spawning to prevent race condition
+                if (this.spawning.has(domain)) {
+                    // Site is already being spawned, wait for it
+                    setTimeout(() => {
+                        res.redirect(`//${req.hostname}${req.url}`);
+                    }, 2000);
+                } else {
+                    // Mark as spawning
+                    this.spawning.add(domain);
+                    this.sites[domain] = Site.Clone(domain,this);
+                    // Remove from spawning set after spawn completes
+                    setTimeout(() => {
+                        this.spawning.delete(domain);
+                    }, 3000);
+                    // Retry the request after spawning
+                    setTimeout(() => {
+                        res.redirect(`//${req.hostname}${req.url}`);
+                    }, 2000);
+                }
             }
         });
         return router;
@@ -341,7 +356,7 @@ export class Site {
         this.options = options;
         this.parent = parent;
         try {
-            const envars = JSON.parse(process.env.SITE_ENV||{});
+            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}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metric-im/administrate",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Tools for site administration",
   "homepage": "https://github.com/metric-im/administrate#readme",
   "bugs": {
@@ -21,7 +21,7 @@
     "@metric-im/componentry": "^1.4.4",
     "acme-client": "^5.4.0",
     "axios": "^1.7.0",
-    "epistery": "^1.1.0",
+    "epistery": "^1.1.4",
     "express": "^5.1.0",
     "moment": "^2.30.1"
   }