Merge branch 'main' into demo

Author: manojown

server/app/utils/requestHelper.go

@@ -21,17 +21,18 @@ func RunExecutor(ctx context.Context, request models.Request) error {
 	var client httpRequest.HttpClient
 	executor := executor.NewExecutor(request.ID, "")
 	ctx, cancelCtx := context.WithCancel(ctx)
-	go func() {
-		<-time.After(time.Duration(request.Time) * time.Second)
-		cancelCtx()
-	}()
 
 	err := utils.RunWorker(request)
 	if err != nil {
 		log.Errorf("Error while sending request to Worker", err.Error())
 		return err
 	}
 
+	go func() {
+		<-time.After(time.Duration(request.Time) * time.Second)
+		cancelCtx()
+	}()
+
 	go executor.Run(ctx, request)
 	client, err = httpRequest.Initializer(request)
 	if err != nil {

server/pkg/configs/fiber.go

@@ -17,6 +17,6 @@ func FiberConfig() fiber.Config {
 	// Return Fiber configuration.
 	return fiber.Config{
 		ReadTimeout: time.Second * time.Duration(readTimeoutSecondsCount),
-		// Prefork:     true,
+		Prefork:     true,
 	}
 }

server/pkg/utils/request.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"context"
 	"encoding/json"
+	"net/http"
 	"strings"
 	"time"
 
@@ -30,28 +31,30 @@ func RunWorker(request models.Request) error {
 	}
 
 	for _, element := range listServer {
-		url := element.IP
-		worker := GetWorkerLoad(request)
-		request.ServerId = element.ID
-		body, _ := json.Marshal(request)
-
-		if url != "" {
-			worker.ServerId = element.ID
-			url = strings.TrimSpace(strings.TrimSpace(url) + "/worker/request")
-			headers := map[string]string{
-				"Content-Type": "application/json",
-			}
-			res, err := Do("POST", url, body, headers)
-
-			if err != nil {
-				worker.Status = true
-				// worker.ServerId = element.ID
-				worker.Error = err.Error()
-				db.Provider.AddWorker(ctx, worker)
-			} else if res.StatusCode == statusOK {
-				worker.Status = false
-				// worker.ServerId = element.ID
-				db.Provider.AddWorker(ctx, worker)
+		if element.Enabled {
+			url := element.IP
+			worker := GetWorkerLoad(request)
+			request.ServerId = element.ID
+			body, _ := json.Marshal(request)
+
+			if url != "" {
+				worker.ServerId = element.ID
+				url = strings.TrimSpace(strings.TrimSpace(url) + "/worker/request")
+				headers := map[string]string{
+					"Content-Type": "application/json",
+				}
+				res, err := Do(http.MethodPost, url, body, headers)
+
+				if err != nil {
+					worker.Status = true
+					// worker.ServerId = element.ID
+					worker.Error = err.Error()
+					db.Provider.AddWorker(ctx, worker)
+				} else if res.StatusCode == statusOK {
+					worker.Status = false
+					// worker.ServerId = element.ID
+					db.Provider.AddWorker(ctx, worker)
+				}
 			}
 		}
 	}

ui/src/assets/pause.svg

@@ -19,7 +19,12 @@ export function OtherOption() {
   const [open, setOpen] = useState(false);
   return (
     <Box>
-      <Button colorScheme="tomato" size="md" onClick={() => setOpen(true)}>
+      <Button
+        colorScheme="primary"
+        variant="outline"
+        size="md"
+        onClick={() => setOpen(true)}
+      >
         Options
       </Button>
       <CustomModal onClose={() => setOpen(false)} isOpen={open}>

ui/src/assets/play.svg

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { ReactNode, useEffect, useState } from "react";
 import {
   Box,
   Divider,
@@ -33,7 +33,13 @@ import { InputWrap } from "./InputArea/inputWrap";
 import Method from "./method";
 import { OtherOption } from "./OtherOptions";
 
-function CustomizeToolTipInfo({ text }: { text: string }) {
+export function CustomizeToolTipInfo({
+  text,
+  children,
+}: {
+  text: string;
+  children?: ReactNode;
+}) {
   return (
     <Tooltip
       hasArrow
@@ -43,7 +49,7 @@ function CustomizeToolTipInfo({ text }: { text: string }) {
       padding="10px"
       fontWeight="500"
     >
-      <InfoOutlineIcon boxSize={3} cursor="pointer" margin={2} />
+      {children || <InfoOutlineIcon boxSize={3} cursor="pointer" margin={2} />}
     </Tooltip>
   );
 }

ui/src/pages/Dashboard/AddEditRequest/OtherOptions/index.tsx

@@ -15,6 +15,14 @@ function PreviewHtml(props: { html: string }) {
     <iframe title="Response" srcDoc={DOMPurify.sanitize(html)} height={300} />
   );
 }
+const parsed = (data: any) => {
+  try {
+    const parsedBody = JSON.parse(data);
+    return parsedBody;
+  } catch {
+    return null;
+  }
+};
 
 function RequestBody({
   body = "",
@@ -32,37 +40,39 @@ function RequestBody({
       />
     );
   if (contentType.includes("application/json")) {
-    const parsedBody = JSON.parse(body);
-    return (
-      <JSONInput
-        id="a_unique_id"
-        placeholder={parsedBody || {}}
-        theme="light_mitsuketa_tribute"
-        onKeyPressUpdate
-        waitAfterKeyPress={1000}
-        height="200px"
-        width="100%"
-        colors={{
-          default: "black",
-          background: "#edf2f7",
-          string: "blue",
-          keys: "#800000",
-          error: "red",
-        }}
-        style={{
-          body: {
-            display: "flex",
-            overflowX: "auto",
-          },
-          outerBox: {
-            border: "1px solid #e2e8f0",
-          },
-          contentBox: {
-            flex: "0 0 auto",
-          },
-        }}
-      />
-    );
+    const parsedBody = parsed(body);
+    if (parsedBody) {
+      return (
+        <JSONInput
+          id="a_unique_id"
+          placeholder={parsedBody || {}}
+          theme="light_mitsuketa_tribute"
+          onKeyPressUpdate
+          waitAfterKeyPress={1000}
+          height="200px"
+          width="100%"
+          colors={{
+            default: "black",
+            background: "#edf2f7",
+            string: "blue",
+            keys: "#800000",
+            error: "red",
+          }}
+          style={{
+            body: {
+              display: "flex",
+              overflowX: "auto",
+            },
+            outerBox: {
+              border: "1px solid #e2e8f0",
+            },
+            contentBox: {
+              flex: "0 0 auto",
+            },
+          }}
+        />
+      );
+    }
   }
   return (
     <Card p={2}>

ui/src/pages/Dashboard/AddEditRequest/selectedRequest.tsx

@@ -13,23 +13,33 @@ import {
   Text,
   Badge,
   Spinner as SP,
+  Image,
 } from "@chakra-ui/react";
 import { format } from "date-fns";
 import { useDispatch, useSelector } from "react-redux";
 import { useEffect, useState } from "react";
 import { CheckIcon, CopyIcon, DeleteIcon, EditIcon } from "@chakra-ui/icons";
-import { motion } from "framer-motion";
 import {
   addOrEditServer,
+  editServerAction,
   getAllServerAction,
   selectDeleteRequest,
 } from "../../store/stress/server/actions";
-import { Server } from "../../store/stress/server/types";
+import {
+  AddServerRequestPayload,
+  Server,
+} from "../../store/stress/server/types";
+import Play from "../../assets/play.svg";
+import Pause from "../../assets/pause.svg";
 
-import { getServerList } from "../../store/stress/server/selectors";
+import {
+  getAddServerState,
+  getServerList,
+} from "../../store/stress/server/selectors";
 import Spinner from "../../components/Spinner";
 import { DeleteDialog } from "./DeleteRequest";
 import AddOrEditComp from "./AddEdit";
+import { CustomizeToolTipInfo } from "../Dashboard/AddEditRequest/selectedRequest";
 
 const pagination = {
   limit: 10,
@@ -63,8 +73,11 @@ function TableBody({
     active,
     port,
     token,
+    enabled,
   } = server;
   const dispatch = useDispatch();
+  const [selectedServer, setSelected] = useState<Server | null>(null);
+  const { loading } = useSelector(getAddServerState);
   const onEdit = (action: "ADD" | "EDIT", serverDetails?: Server) => {
     dispatch(
       addOrEditServer({
@@ -74,8 +87,23 @@ function TableBody({
     );
   };
 
+  useEffect(() => {
+    if (!loading && selectedServer) {
+      setSelected(null);
+    }
+  }, [loading]);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const changeServerState = (serverState: Server) => {
+    const payload = {
+      ...serverState,
+      enabled: !server.enabled,
+    };
+    setSelected(serverState);
+    dispatch(editServerAction(payload as AddServerRequestPayload));
+  };
+
   return (
-    <motion.tr key={id} layout transition={{ duration: 0.5 }}>
+    <Tr key={id}>
       <Td>{alias}</Td>
       <Td>{description}</Td>
 
@@ -99,14 +127,30 @@ function TableBody({
       </Td>
       <Td>
         <Stack direction="row" display="flex" alignContent="center">
+          {loading && selectedServer?.id === id ? (
+            <SP />
+          ) : (
+            <CustomizeToolTipInfo
+              text={enabled ? "Status: Running" : "Status: Stopped"}
+            >
+              <Image
+                width="18px"
+                height="18px"
+                src={enabled ? Pause : Play}
+                alt="loadster"
+                cursor="pointer"
+                onClick={() => changeServerState(server)}
+              />
+            </CustomizeToolTipInfo>
+          )}
+          <EditIcon cursor="pointer" onClick={() => onEdit("EDIT", server)} />
           <DeleteIcon
             cursor="pointer"
             onClick={() => dispatch(selectDeleteRequest(server))}
           />
-          <EditIcon cursor="pointer" onClick={() => onEdit("EDIT", server)} />
         </Stack>
       </Td>
-    </motion.tr>
+    </Tr>
   );
 }
 
@@ -125,7 +169,9 @@ export default function ServerBoard() {
   };
 
   useEffect(() => {
-    dispatch(getAllServerAction(pagination));
+    if (!data && !loading) {
+      dispatch(getAllServerAction(pagination));
+    }
   }, []);
 
   const onCopy = (text) => {

ui/src/pages/Dashboard/LoadRequest/RequestRespons/childComponent.tsx

@@ -40,6 +40,7 @@ export interface Server {
   description: string;
   ip?: string;
   port?: number;
+  enabled: boolean;
   active?: boolean;
   created_at: number;
   updated_at: number;
@@ -60,6 +61,7 @@ export interface AddServerRequestPayload {
   description: string;
   ip?: string;
   port?: number;
+  enabled?: boolean;
 }
 
 export interface AddServerRequestResponse {