containerized and tested working

Author: wanwiset25

container-manager/docker-compose.yml

@@ -13,26 +13,20 @@ app.get("/", (req, res) => {
 });
 
 app.get("/test", async (req, res) => {
+  console.log("/test called");
   const response = await state.checkMining();
   console.log(response);
   res.setHeader("Content-Type", "application/json");
   res.send(JSON.stringify(response, null, 2));
 });
 
 app.get("/state", async (req, res) => {
-  // const response = await state.getContainersState()
+  console.log("/state called");
   const response = await state.getSubnetContainers();
   res.setHeader("Content-Type", "application/json");
   res.send(JSON.stringify(response, null, 2));
 });
 
-app.get("/start_subnet", async (req, res) => {
-  await exec.startComposeProfile("machine1");
-  const response = await docker.getContainersState();
-  res.setHeader("Content-Type", "application/json");
-  res.send(JSON.stringify(response, null, 2));
-});
-
 app.get("/events", (req, res) => {
   res.setHeader("Content-Type", "text/event-stream");
   res.setHeader("Cache-Control", "no-cache");
@@ -60,26 +54,42 @@ app.get("/stream", async (req, res) => {
   res.setHeader("Content-Type", "text/event-stream");
   res.setHeader("Cache-Control", "no-cache");
   res.setHeader("Connection", "keep-alive");
-  await exec.executeTest(
-    "",
-    (data) => {
-      res.write(`data:${data}\n\n`);
-    },
-    () => {
-      res.write("event: close\ndata: Connection closed by server\n\n");
-      res.end();
-    }
-  );
+  const dataCallback = (data) => {
+    res.write(`data:${data}\n\n`);
+  };
+
+  const doneCallback = () => {
+    res.write("event: close\ndata: Connection closed by server\n\n");
+    res.end();
+  };
+  await exec.executeTest("", dataCallback, doneCallback);
+  // await exec.executeTest(
+  //   "",
+  //   (data) => {
+  //     res.write(`data:${data}\n\n`);
+  //   },
+  //   () => {
+  //     res.write("event: close\ndata: Connection closed by server\n\n");
+  //     res.end();
+  //   }
+  // );
 
   // Handle client disconnect
   req.on("close", () => {
     res.end();
   });
 });
 
+app.get("/start_subnet", async (req, res) => {
+  console.log("/start_subnet called");
+  const response = await exec.startComposeProfile("machine1");
+  res.setHeader("Content-Type", "application/json");
+  res.send(JSON.stringify(response, null, 2));
+});
+
 app.get("/deploy_csc", async (req, res) => {
-  exec.deployContract("csc");
-  const response = await docker.getContainersState();
+  console.log("/deploy_csc called");
+  const response = await exec.deployContract("csc");
   res.setHeader("Content-Type", "application/json");
   res.send(JSON.stringify(response, null, 2));
 });

container-manager/src/express.js

@@ -3,10 +3,10 @@ const fs = require("fs");
 const yaml = require("js-yaml");
 const path = require("path");
 const mountPath = path.join(__dirname, "../../mount/generated/");
-console.log(mountPath);
-
 const config = {};
 
+module.exports = config;
+
 initModule();
 
 function initModule() {
@@ -15,6 +15,11 @@ function initModule() {
     throw Error(`Incomplete mount, did not find: ${name}`);
   }
   config["compose"] = getComposeCommand();
+
+  config["hostPath"] = process.env.HOSTPWD || "";
+  if (config["hostPath"] === "") {
+    throw Error("Incomplete container start, did not find env: HOSTPWD");
+  }
 }
 
 function checkFiles() {

container-manager/src/libs/config.js

@@ -10,72 +10,91 @@ module.exports = {
   executeTest,
 };
 
-function startComposeProfile(profile) {
-  const compose = config.compose;
-  executeCommandSync(`${compose} --profile ${profile} pull`);
-  executeCommandSync(`${compose} --profile ${profile} up -d`);
+const streamExecOutput = (data) => {
+  console.log(data);
+};
+
+const doneExec = () => {
+  console.log("Execute Done!!");
+};
+
+async function startComposeProfile(profile) {
+  await execute(
+    `${config.compose} --profile ${profile} pull`,
+    streamExecOutput,
+    doneExec
+  );
+  await execute(
+    `${config.compose} --profile ${profile} up -d`,
+    streamExecOutput,
+    doneExec
+  );
+  return {};
 }
 
-function stopComposeProfile(profile) {
-  const compose = config.compose;
-  executeCommandSync(`${compose} --profile ${profile} down`);
+async function stopComposeProfile(profile) {
+  await execute(
+    `${config.compose} --profile ${profile} down`,
+    streamExecOutput,
+    doneExec
+  );
+  return {};
 }
 
-function deployContract() {
+async function deployContract() {
   // docker pull xinfinorg/csc:feature-v0.3.0
   // docker run -v ${PWD}/:/app/cicd/mnt/ --network generated_docker_net xinfinorg/csc:feature-v0.3.0 full
   // need to figure what to use instead of ${PWD}, probably need host full path
 
-  executeCommandSync(`docker pull xinfinorg/csc:feature-v0.3.0`);
-  executeCommandSync(
-    `docker run -v /Users/wp/Git/Subnet-Deployment/container-manager/mount/generated/:/app/cicd/mount/ --network generated_docker_net xinfinorg/csc:feature-v0.3.0 full`
-  );
+  await execute(
+    `docker pull xinfinorg/csc:feature-v0.3.0`,
+    streamExecOutput,
+    doneExec
+  ); //TODO: pass version from some global conf or env
+  await execute(
+    `docker run -v ${config.hostPath}/generated/:/app/cicd/mount/ --network docker_net xinfinorg/csc:feature-v0.3.0 full`,
+    streamExecOutput,
+    doneExec
+  ); //TODO: use detected network name
+  return {};
 }
 
-// function executeCommandSync(command) {
-//   const pathCommand = 'cd '+mountPath+';'+'export PWD=/Users/wp/Git/Subnet-Deployment/container-manager/mount/generated;'+command
-//   const output = execSync(pathCommand).toString();
-//   console.log(`Command output: ${output}`);
-//   return output;
-// // // Example usage:
-// // try {
-// //     const output = executeCommandSync('ls -l');
-// //     console.log('Command output:', output);
-// // } catch (error) {
-// //     console.error('Error:', error);
-// // }
-// }
-
-//test command
-// executeTest('echo a; sleep 1; echo b; sleep 1; echo c; sleep 1; skdjf;asjdkfasjdflsa; sleep 1; exit 1; sleep 1; echo f')
 async function executeTest(command, outputHandler, doneHandler) {
   command =
     "echo $RANDOM; sleep 1; echo $RANDOM; sleep 1; echo a; sleep 1; echo b; sleep 1; echo c; sleep 1; echo d; sleep 1; echo e; sleep 1; echo f";
+  execute(command, outputHandler, doneHandler);
+}
+
+async function execute(command, outputHandler, doneHandler) {
+  console.log("executing", command);
   const pathCommand =
     "cd " +
     mountPath +
     ";" +
     "export PWD=/Users/wp/Git/Subnet-Deployment/container-manager/mount/generated;" +
     command;
-  execProcess = exec(pathCommand);
-
-  execProcess.stdout.on("data", (data) => {
-    process.stdout.write(data.toString());
-    outputHandler(data.toString());
-  });
-
-  execProcess.stderr.on("data", (data) => {
-    console.error(data.toString());
-    outputHandler(data.toString());
-  });
 
-  execProcess.on("error", (err) => {
-    console.error("Failed to start exec process:", err.message);
-    doneHandler();
+  const prom = new Promise((resolve, reject) => {
+    const execProcess = exec(pathCommand);
+    execProcess.stdout.on("data", (data) => {
+      outputHandler(data.toString());
+      // process.stdout.write(data.toString());
+    });
+    execProcess.stderr.on("data", (data) => {
+      console.error(data.toString());
+      outputHandler(data.toString());
+    });
+    execProcess.on("error", (err) => {
+      console.error("Failed to start exec process:", err.message);
+      doneHandler();
+      reject(err); // Reject the Promise on error
+    });
+    execProcess.on("close", (code) => {
+      console.log(`Exec process exited with code ${code}`);
+      doneHandler();
+      resolve(code); // Resolve the Promise on close
+    });
   });
 
-  execProcess.on("close", (code) => {
-    console.log(`Exec process exited with code ${code}`);
-    doneHandler();
-  });
+  return prom;
 }

container-manager/src/libs/exec.js

@@ -19,16 +19,20 @@ async function getSubnetContainers() {
   const filtered = [];
   for (let i = 0; i < containers.length; i++) {
     if (containers[i].Names[0].includes("generated")) {
-      const networkName = containers[i].HostConfig.NetworkMode;
       const c = {
         name: containers[i].Names[0].substring(1),
         image: containers[i].Image,
         state: containers[i].State,
         status: containers[i].Status,
-        network: networkName,
-        ip: containers[i].NetworkSettings.Networks[networkName].IPAMConfig
-          .IPv4Address,
       };
+      const networkName = containers[i].HostConfig.NetworkMode;
+      const ip =
+        containers[i].NetworkSettings.Networks[networkName].IPAMConfig
+          .IPv4Address;
+      const rpcPort = extractRPCPort(c.name);
+      c.network = networkName;
+      c.ip = ip;
+      c.rpcPort = rpcPort;
       filtered.push(c);
     }
   }
@@ -61,8 +65,8 @@ async function checkMining() {
   for (let i = 0; i < containers.length; i++) {
     const c = containers[i];
     if (c.name.includes("subnet") && c.state == "running") {
-      blockHeights.push(await checkBlock(c.ip));
-      peerCounts.push(await checkPeers(c.ip));
+      blockHeights.push(await checkBlock(c.ip, c.rpcPort));
+      peerCounts.push(await checkPeers(c.ip, c.rpcPort));
     }
   }
   return {
@@ -71,9 +75,8 @@ async function checkMining() {
   };
 }
 
-async function checkBlock(containerIP) {
-  // const url = `http://${containerIP}:8545`;
-  const url = `http://localhost:8545`; //local testing
+async function checkBlock(containerIP, containerPort) {
+  let url = `http://${containerIP}:${containerPort}`;
   const data = {
     jsonrpc: "2.0",
     method: "XDPoS_getV2BlockByNumber",
@@ -85,18 +88,23 @@ async function checkBlock(containerIP) {
   };
 
   try {
-    const response = await axios.post(url, data, { headers });
+    let response;
+    try {
+      response = await axios.post(url, data, { headers, timeout: 2000 });
+    } catch (error) {
+      url = `http://localhost:${containerPort}`; //fallback for local testing
+      response = await axios.post(url, data, { headers, timeout: 2000 });
+    }
     let block = response.data.result.Number;
     if (block == null) block = 0;
     return block;
   } catch (error) {
-    console.error(error);
+    console.log(error);
   }
 }
 
-async function checkPeers(containerIP) {
-  // const url = `http://${containerIP}:8545`;
-  const url = `http://localhost:8545`; //local testing
+async function checkPeers(containerIP, containerPort) {
+  let url = `http://${containerIP}:${containerPort}`;
   const data = {
     jsonrpc: "2.0",
     method: "net_peerCount",
@@ -107,7 +115,13 @@ async function checkPeers(containerIP) {
   };
 
   try {
-    const response = await axios.post(url, data, { headers });
+    let response;
+    try {
+      response = await axios.post(url, data, { headers, timeout: 2000 });
+    } catch (error) {
+      url = `http://localhost:${containerPort}`; //fallback for local testing
+      response = await axios.post(url, data, { headers, timeout: 2000 });
+    }
     const peerHex = response.data.result;
     const peerCount = parseInt(peerHex, 16);
     return peerCount;
@@ -133,3 +147,12 @@ function isSubnetContainer(container) {
   }
   return [isSubnet, name];
 }
+
+function extractRPCPort(name) {
+  const shortName = name.split("-")[1];
+  nodeNum = parseInt(shortName.replace("subnet", ""));
+  // if (nodeNum === null) {
+  //   return 9999;
+  // }
+  return 8545 + nodeNum - 1;
+}

container-manager/src/libs/state.js

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+current_dir="$(cd "$(dirname "$0")" && pwd)"
+network_name="docker_net"
+
+mkdir -p generated/scripts
+
+if ! docker network inspect "$network_name" > /dev/null 2>&1; then
+  echo "Network '$network_name' does not exist. Creating it..."
+  docker network create --subnet 192.168.25.0/24 "$network_name"
+else
+  echo "Joining existing network '$network_name'"
+fi
+
+docker run -d                                             \
+  --network "docker_net" --ip=192.168.25.111    \
+  -p 3000:3000                                            \
+  -v /var/run/docker.sock:/var/run/docker.sock            \
+  -v $current_dir/generated:/mount/generated                \
+  -e HOSTPWD=/Users/wp/Git/Subnet-Deployment/container-manager/mount                             \
+  api-test
+
+
+# services:
+#   docker-tester:
+#     image: api-test
+#     volumes:
+#       - /var/run/docker.sock:/var/run/docker.sock
+#       - ${PWD}/mount/generated/:/mount/generated/
+#     ports:
+#       - 3000:3000