feat:took care of merge conflicts

Author: MS-githubaccnt

docker/named_pipe/listen.sh

@@ -1,3 +1,11 @@
 #!/bin/sh
-
-while true; do eval "$(cat pipe)"; done
+while true; do
+  raw=$(cat pipe)
+  
+  if echo "$raw" | grep -q "^RESPOND::"; then
+    cmd="${raw##RESPOND::}"
+    eval "$cmd" > output_pipe 2>&1
+  else
+    eval "$raw" &
+  fi
+done

docs/admin/README.md

@@ -47,6 +47,7 @@ docker compose up --build -d
 ### 4. Setup Named Pipes
 
 Create a pipe in the `docker/named_pipe` directory by executing `mkfifo docker/named_pipe/pipe`.
+Create another one by executing `mkfifo docker/named_pipe/output_pipe`. 
 Navigate to the `docker/named_pipe` directory and execute the `listen.sh` script to allow the application to run commands on the host.
 ```bash
 cd docker/named_pipe

src/backend/main.ts

@@ -3,7 +3,7 @@ import { addScript, deleteScript } from "./scripts.ts";
 import { checkJWT } from "./utils/jwt.ts";
 import { addMaps, deleteMaps, getMaps, getDeploymentsByRepo, getUserToken } from "./db.ts";
 import { encryptEnv, decryptEnv } from "./utils/crypto.ts";
-
+import { canAllocateStorage } from "./utils/container-storage.ts";
 // ... skipping to githubWebhook
 
 
@@ -57,6 +57,19 @@ async function addSubdomain(ctx: Context) {
   }
 
   // We keep deployment config (port, stack, etc.) in the document to store them in DB for webhook usage
+  if(copy.volume_needed=="Yes"){const storageCheck=await canAllocateStorage(100);
+  if(!storageCheck.can_allocate){
+    ctx.response.status=400;
+    ctx.response.body = {
+    status: "failed",
+    error: "INSUFFICIENT_STORAGE",
+    message: storageCheck.reason || "Not enough disk space",
+    available_mb: storageCheck.available_mb,
+    requested_mb: storageCheck.requested_mb,
+    };
+    console.log(storageCheck.available_mb);
+  return;
+  }}
   const success: boolean = await addMaps(document);
 
 
@@ -146,7 +159,7 @@ async function addSubdomain(ctx: Context) {
     ctx.response.body = { "status": "failed" };
   }
 }
-//!add volume removal logic on deleting the subdomain
+
 async function deleteSubdomain(ctx: Context) {
   if (!ctx.request.hasBody) {
     ctx.throw(415);

src/backend/scripts.ts

@@ -26,7 +26,7 @@ async function safeExec(command: string): Promise<void> {
     throw error;
   }
 }
-//! what if it is url or port
+
 async function addScript(
   document: DfContentMap,
   env_content: string,
@@ -43,7 +43,7 @@ async function addScript(
   const memLimit = shellEscape(MEMORY_LIMIT || "512m", "MEMORY_LIMIT");
   volume_needed=(volume_needed=="Yes").toString();
   const volumeNeeded=shellEscape(volume_needed,"false");
-  
+  console.log(`volume neeeded is ${volumeNeeded}`);
   if (document.resource_type === "URL") {
     await safeExec(
       `bash -c "echo 'bash ../../src/backend/shell_scripts/automate.sh -u ${resource} ${subdomain}' > /hostpipe/pipe"`,

src/backend/shell_scripts/container.sh

@@ -12,6 +12,8 @@ STORAGE_ROOT="/mnt/storage"
 PROJECT_STORAGE="$STORAGE_ROOT/$name"
 PROJECT_IMG="$STORAGE_ROOT/$name.img"
 SIZE_MB=100
+sudo mkdir -p $STORAGE_ROOT
+sudo chmod 755 $STORAGE_ROOT
 for ((port=PORT_MIN; port<=PORT_MAX; port++)); do
     if ! ss -ln src :$port | grep -q "\<$port\>"; then
         available_ports+=($port)

src/backend/utils/container-storage.ts

@@ -0,0 +1,37 @@
+import {exec } from "../dependencies.ts";
+export async function canAllocateStorage(requestedMb: number) {
+  const STORAGE_PATH = "/mnt/storage";
+  const SAFETY_BUFFER_MB = 200; // keep buffer for system + docker
+
+  try {
+    const responseProcess = new Deno.Command("sh", {
+      args: ["-c", "cat /hostpipe/output_pipe"],
+    }).output(); // don't await yet, just start it
+    await exec(`bash -c "echo 'RESPOND::df ${STORAGE_PATH} --output=avail' > /hostpipe/pipe"`);
+    const response=await responseProcess;
+    const output = new TextDecoder().decode(response.stdout).trim().split("\n");
+    const availableKb = parseInt(output[1].trim());
+    if (isNaN(availableKb)) {
+      throw new Error(`Unexpected df output: ${output}`);
+    }
+    const availableMb = Math.floor(availableKb / 1024);
+    const usableMb = availableMb - SAFETY_BUFFER_MB;
+    const canAllocate = usableMb >= requestedMb;
+    console.log(`can allocate ${canAllocate} memory`);
+    console.log(`Available memory is ${availableMb} requested is ${requestedMb}`);
+    return {
+      can_allocate: canAllocate,
+      available_mb: usableMb,
+      requested_mb: requestedMb,
+      reason: canAllocate ? null : "Not enough disk space",
+    };
+  } catch (err) {
+    console.log(`Error during memory check volume`);
+    return {
+      can_allocate: false,
+      available_mb: 0,
+      requested_mb: requestedMb,
+      reason: "Failed to check disk space",
+    };
+  }
+}

src/cli/features/createDomain.ts

@@ -85,6 +85,7 @@ export async function createDomain(userApiKey: string, user: string, provider: s
     if (response.data.status === 'success') {
       console.log(`✅ Domain '${subdomain}.${domain}' created successfully!`);
     } else {
+      if(response.error=="INSUFFICIENT_STORAGE")console.log("INSUFFICIENT_STORAGE")
       console.log('❌ Domain creation failed!');
       console.log("Either the domain exist or the domain is not created");
     }

src/frontend/src/components/modal.vue

@@ -91,7 +91,8 @@ export default {
             this.closeModalAndReload();
           } else {
             this.closeModal();
-            alert('Failed to create subdomain');
+            if(res=="insufficient_storage")alert("Insufficient storage to mount a volume");
+            else alert('Failed to create subdomain');
             setTimeout(() => {
               window.location.reload();
             }, 1000);

src/frontend/src/utils/create.ts

@@ -108,8 +108,11 @@ export async function create(
     body: JSON.stringify(body),
   });
   const data = await resp.json();
-  if (data.status === "failed") {
-    return "Failed";
+  if(data.error=="INSUFFICIENT_STORAGE"){
+    return "insufficient_storage";
+  }
+  else if (data.status === "failed") {
+    return "failed";
   }
   return "Submitted";
 }