querysub 0.205.0 → 0.207.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.205.0",
+  "version": "0.207.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/applyAlwaysUpMain.js

@@ -70,9 +70,8 @@ async function main() {
         } catch {}
         await fs.promises.unlink(prevPath);
     }
-    await fs.promises.writeFile(prevPath, process.pid);
+    await fs.promises.writeFile(prevPath, process.pid + "");
 
-    console.log(`Always up pid: ${process.pid}`);
     while (true) {
         try {
             await runCommandWithLogging(`yarn machine ${process.pid}`);

package/src/deployManager/machineApplyMainCode.ts

@@ -40,7 +40,7 @@ const getLiveMachineInfo = measureWrap(async function getLiveMachineInfo() {
 
 const SCREEN_SUFFIX = "-dply";
 function getScreenName(config: { serviceKey: string; index: number }): string {
-    return `${config.serviceKey}-${config.index}${SCREEN_SUFFIX}`.replace(/[^a-zA-Z0-9]/g, "_");
+    return `${config.serviceKey}-${config.index}${SCREEN_SUFFIX}`.replace(/[^a-zA-Z0-9\-_]/g, "_");
 }
 
 

package/src/deployManager/setupMachineMain.ts

@@ -163,6 +163,52 @@ async function main() {
     // Test command to verify ssh credentials work
     await runPromise(`ssh ${sshRemote} whoami`);
 
+    // Setup swap space if not already configured
+    console.log("Checking swap configuration...");
+    const swapInfo = await runPromise(`ssh ${sshRemote} "free -m | grep Swap"`);
+    const swapTotal = parseInt(swapInfo.split(/\s+/)[1]);
+
+    // Get RAM amount to calculate appropriate swap size
+    const memInfo = await runPromise(`ssh ${sshRemote} "free -m | grep Mem"`);
+    const ramMB = parseInt(memInfo.split(/\s+/)[1]);
+    if (swapTotal > 0) {
+        console.log(`✅ Swap already configured: ${swapTotal}MB SWAP vs ${ramMB}MB REAL MEMORY`);
+    } else {
+        // Calculate swap size based on RAM:
+        // < 2GB RAM: 2x RAM
+        // 2-8GB RAM: 1x RAM  
+        // > 8GB RAM: 0.5x RAM (minimum 4GB)
+        let swapSizeMB: number;
+        if (ramMB < 2048) {
+            swapSizeMB = ramMB * 2;
+        } else if (ramMB <= 8192) {
+            swapSizeMB = ramMB;
+        } else {
+            swapSizeMB = Math.max(Math.floor(ramMB * 0.5), 4096);
+        }
+
+        console.log(`Setting up swap space (${Math.round(swapSizeMB / 1024 * 10) / 10}GB for ${Math.round(ramMB / 1024 * 10) / 10}GB RAM)...`);
+
+        // Create swap file with calculated size
+        await runPromise(`ssh ${sshRemote} "sudo fallocate -l ${swapSizeMB}M /swapfile"`);
+
+        // Set correct permissions
+        await runPromise(`ssh ${sshRemote} "sudo chmod 600 /swapfile"`);
+
+        // Set up the swap area
+        await runPromise(`ssh ${sshRemote} "sudo mkswap /swapfile"`);
+
+        // Enable the swap file
+        await runPromise(`ssh ${sshRemote} "sudo swapon /swapfile"`);
+
+        // Make swap persistent across reboots
+        await runPromise(`ssh ${sshRemote} "echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab"`);
+
+        // Verify swap is working
+        const swapCheck = await runPromise(`ssh ${sshRemote} "free -m | grep Swap"`);
+        console.log(`✅ Swap configured: ${swapCheck.split(/\s+/)[1]}MB total vs ${ramMB}MB REAL MEMORY`);
+    }
+
     let backblazePath = getBackblazePath();
 
     console.log("Setting up machine:", sshRemote);