1. commands left to be fixed dynamically. 2. assuming that cleanup ti…

…me is returned as response header
DiceDB · Oct 11, 2024 · 268adb2 · 268adb2
1 parent 1feedd2
commit 268adb2
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 35 deletions.
diff --git a/apps/playground-web/components/CLI/CLI.tsx b/apps/playground-web/components/CLI/CLI.tsx
@@ -5,18 +5,18 @@
 import { useCli } from './hooks/useCli';
 
 interface CliProps {
-  decreaseCommandsLeft: () => void;
+  onCommandExecuted: (commandsLeft: number, cleanupTimeLeft: number) => void;
 }
 
-export default function Cli({ decreaseCommandsLeft }: CliProps) {
+export default function Cli({ onCommandExecuted }: CliProps) {
   const {
     handleInputChange,
     handleKeyDown,
     terminalRef,
     inputRef,
     output,
     command,
-  } = useCli(decreaseCommandsLeft);
+  } = useCli(onCommandExecuted);
   return (
     <div
       ref={terminalRef}

diff --git a/apps/playground-web/components/CLI/hooks/useCli.tsx b/apps/playground-web/components/CLI/hooks/useCli.tsx
@@ -5,7 +5,7 @@ import { useState, useEffect, useRef, KeyboardEvent, ChangeEvent } from 'react';
 import { handleCommand } from '@/shared/utils/cliUtils';
 import blocklistedCommands from '@/shared/utils/blocklist'; // Assuming you added blocklist here
 
-export const useCli = (decreaseCommandsLeft: () => void) => {
+export const useCli = (onCommandExecuted: (commandsLeft: number, cleanupTimeLeft: number) => void) => {
   // states
   const [command, setCommand] = useState('');
   const [output, setOutput] = useState<string[]>([]);
@@ -27,11 +27,10 @@ export const useCli = (decreaseCommandsLeft: () => void) => {
         `(error) ERR unknown command '${commandName}'`,
       ]);
     } else {
-      handleCommand({ command, setOutput }); // Execute if not blocklisted
+      handleCommand({ command, setOutput, onCommandExecuted }); // Execute if not blocklisted
     }
 
     setCommand(''); // Clear input
-    decreaseCommandsLeft(); // Call to update remaining commands
   };
 
   useEffect(() => {

diff --git a/apps/playground-web/components/Playground/TerminalUI.tsx b/apps/playground-web/components/Playground/TerminalUI.tsx
@@ -6,9 +6,12 @@ import { useState } from 'react';
 import Tooltip from '../Overlays/Tooltip';
 export function TerminalUI() {
   const [commandsLeft, setCommandsLeft] = useState(1000);
-  const decreaseCommandsLeft = () => {
-    setCommandsLeft((prev) => (prev > 0 ? prev - 1 : 0));
+  const [cleanupTimeLeft, setCleanupTimeLeft] = useState(15*60);
+  const handleCommandExecuted = (commands: number, cleanup: number) => {
+    setCommandsLeft(commands);
+    setCleanupTimeLeft(cleanup);
   };
+
   return (
     <>
       <div className="bg-gray-900 rounded-lg">
@@ -20,22 +23,21 @@ export function TerminalUI() {
           </div>
         </div>
         <div className="h-64 md:h-[30rem] bg-gray-100 rounded-lg overflow-hidden shadow-md">
-          <Shell decreaseCommandsLeft={decreaseCommandsLeft} />
+          <Shell onCommandExecuted={handleCommandExecuted} />
         </div>
       </div>
-      <TerminalCounter commandsLeft={commandsLeft} />
+      <TerminalCounter commandsLeft={commandsLeft} cleanupTimeLeft={cleanupTimeLeft} />
     </>
   );
 }
 
-function TerminalCounter({ commandsLeft }: { commandsLeft: number }) {
-  const { timeLeft } = useTimer(15 * 60);
+function TerminalCounter({ commandsLeft, cleanupTimeLeft }: { commandsLeft: number; cleanupTimeLeft: number }) {
   return (
     <div className="flex flex-col">
       <div className="flex flex-row justify-between text-gray-900 mt-4">
         <div className="flex flex-row items-center space-x-2">
           <div className="flex items-center justify-between border border-gray-400 text-sm bg-transparent p-3 rounded-lg">
-            <span>Cleanup in: {formatTime(timeLeft)} mins</span>
+            <span>Cleanup in: {formatTime(cleanupTimeLeft)} mins</span>
           </div>
           <Tooltip message="The time remaining until cleanup is initiated." />
         </div>
@@ -56,4 +58,4 @@ function TerminalCounter({ commandsLeft }: { commandsLeft: number }) {
       </div>
     </div>
   );
-}
+}
diff --git a/apps/playground-web/components/Shell/Shell.tsx b/apps/playground-web/components/Shell/Shell.tsx
@@ -5,18 +5,18 @@
 import { useShell } from './hooks/useShell';
 
 interface ShellProps {
-  decreaseCommandsLeft: () => void;
+  onCommandExecuted: (commandsLeft: number, cleanupTimeLeft: number) => void;
 }
 
-export default function Shell({ decreaseCommandsLeft }: ShellProps) {
+export default function Shell({ onCommandExecuted }: ShellProps) {
   const {
     handleInputChange,
     handleKeyDown,
     terminalRef,
     inputRef,
     output,
     command,
-  } = useShell(decreaseCommandsLeft);
+  } = useShell(onCommandExecuted);
   return (
     <div
       ref={terminalRef}

diff --git a/apps/playground-web/components/Shell/hooks/useShell.tsx b/apps/playground-web/components/Shell/hooks/useShell.tsx
@@ -5,7 +5,7 @@ import { useState, useEffect, useRef, KeyboardEvent, ChangeEvent } from 'react';
 import { handleCommand } from '@/shared/utils/shellUtils';
 import blocklistedCommands from '@/shared/utils/blocklist';
 
-export const useShell = (decreaseCommandsLeft: () => void) => {
+export const useShell = (onCommandExecuted: (commandsLeft: number, cleanupTimeLeft: number) => void) => {
   // states
   const [command, setCommand] = useState('');
   const [output, setOutput] = useState<string[]>([]);
@@ -32,11 +32,10 @@ export const useShell = (decreaseCommandsLeft: () => void) => {
         `(error) ERR unknown command '${commandName}'`,
       ]);
     } else {
-      handleCommand({ command, setOutput }); // Execute if not blocklisted
+      handleCommand({ command, setOutput, onCommandExecuted }); // Execute if not blocklisted
     }
 
     setCommand(''); // Clear input
-    decreaseCommandsLeft(); // Call to update remaining commands
   };
 
   useEffect(() => {

diff --git a/apps/playground-web/lib/api.ts b/apps/playground-web/lib/api.ts
@@ -11,10 +11,10 @@ export const executeShellCommandOnServer = async (
     const response = await WebService.post(cmdExecURL, cmdOptions);
 
     // Check if the response contains data or if it's an error response
-    if (response?.data) {
-      return response.data;
-    } else if (response?.error) {
-      return response.error;
+    if (response?.body?.data) {
+      return response;
+    } else if (response?.body.error) {
+      return response;
     } else {
       throw new Error('Unexpected response structure');
     }

diff --git a/apps/playground-web/services/webServices.ts b/apps/playground-web/services/webServices.ts
@@ -51,9 +51,15 @@ export const WebService = {
         }
       }
 
+      const headers = {};
+      response.headers.forEach((value, key) => {
+          headers[key] = value;
+      });
+      headers['x-ratelimit-remaining'] = 101; 
+
       // Parse the result as JSON
-      const result = await response.json();
-      return result;
+      const body = await response.json();
+      return { headers: headers, body: body };
     } catch (error) {
       if (error instanceof Error) {
         console.error(`Error with ${method} request: ${error.message}`);

diff --git a/apps/playground-web/shared/utils/cliUtils.ts b/apps/playground-web/shared/utils/cliUtils.ts
@@ -3,9 +3,9 @@
 import { executeShellCommandOnServer } from '@/lib/api';
 import { CommandHandler } from '@/types';
 
-export const handleCommand = async ({ command, setOutput }: CommandHandler) => {
+export const handleCommand = async ({ command, setOutput, onCommandExecuted }: CommandHandler) => {
   const newOutput = `dice > ${command}`;
-  let result: string;
+  let result: any;
 
   const [cmd, ...args] = command.split(' ');
   if (!cmd) {
@@ -26,7 +26,10 @@ export const handleCommand = async ({ command, setOutput }: CommandHandler) => {
         const [key] = args;
         const cmdOptions = { key: key };
         result = await executeShellCommandOnServer(cmd, cmdOptions);
-        setOutput((prevOutput) => [...prevOutput, newOutput, result]);
+        setOutput((prevOutput) => [...prevOutput, newOutput, result?.body?.data]);
+        const commandsLeft = result.headers['x-ratelimit-remaining'];
+        const cleanupTimeLeft = 10;
+        onCommandExecuted(commandsLeft, cleanupTimeLeft);
       } catch (error: unknown) {
         console.error('Error executing command:', error);
         result = 'Error executing command';
@@ -40,7 +43,10 @@ export const handleCommand = async ({ command, setOutput }: CommandHandler) => {
         try {
           const cmdOptions = { key: key, value: value };
           result = await executeShellCommandOnServer(cmd, cmdOptions);
-          setOutput((prevOutput) => [...prevOutput, newOutput, result]);
+          setOutput((prevOutput) => [...prevOutput, newOutput, result?.body?.data]);
+          const commandsLeft = result.headers['x-ratelimit-remaining'];
+          const cleanupTimeLeft = 10;
+          onCommandExecuted(commandsLeft, cleanupTimeLeft);
         } catch (error: unknown) {
           console.error('Error executing command:', error);
           result = 'Error executing command';
@@ -59,7 +65,10 @@ export const handleCommand = async ({ command, setOutput }: CommandHandler) => {
         try {
           const cmdOptions = { keys: [keys] };
           result = await executeShellCommandOnServer(cmd, cmdOptions);
-          setOutput((prevOutput) => [...prevOutput, newOutput, result]);
+          setOutput((prevOutput) => [...prevOutput, newOutput, result?.body?.data]);
+          const commandsLeft = result.headers['x-ratelimit-remaining'];
+          const cleanupTimeLeft = 10;
+          onCommandExecuted(commandsLeft, cleanupTimeLeft);
         } catch (error: unknown) {
           console.error('Error executing command:', error);
           result = 'Error executing command';

diff --git a/apps/playground-web/shared/utils/commonUtils.ts b/apps/playground-web/shared/utils/commonUtils.ts
@@ -2,4 +2,4 @@ export const formatTime = (seconds: number): string => {
   const minutes = Math.floor(seconds / 60);
   const remainingSeconds = seconds % 60;
   return `${minutes}:${remainingSeconds < 10 ? '0' : ''}${remainingSeconds}`;
-};
+};
diff --git a/apps/playground-web/shared/utils/shellUtils.ts b/apps/playground-web/shared/utils/shellUtils.ts
@@ -3,9 +3,9 @@
 import { executeShellCommandOnServer } from '@/lib/api';
 import { CommandHandler } from '@/types';
 
-export const handleCommand = async ({ command, setOutput }: CommandHandler) => {
+export const handleCommand = async ({ command, setOutput, onCommandExecuted }: CommandHandler) => {
   const newOutput = `dice > ${command}`;
-  let result: string;
+  let result: any;
 
   const [cmd, ...args] = command.split(' ');
 
@@ -14,7 +14,10 @@ export const handleCommand = async ({ command, setOutput }: CommandHandler) => {
   }
   try {
     result = await executeShellCommandOnServer(cmd, args);
-    setOutput((prevOutput) => [...prevOutput, newOutput, result]);
+    setOutput((prevOutput) => [...prevOutput, newOutput, result?.body?.data]);
+    const commandsLeft = result.headers['x-ratelimit-remaining'];
+    const cleanupTimeLeft = 10;
+    onCommandExecuted(commandsLeft, cleanupTimeLeft);
   } catch (error: unknown) {
     console.error('Error executing command:', error);
     result = 'Error executing command';

diff --git a/apps/playground-web/types/index.d.ts b/apps/playground-web/types/index.d.ts
@@ -3,4 +3,5 @@ import * as React from 'react';
 export interface CommandHandler {
   command: string;
   setOutput: React.Dispatch<React.SetStateAction<string[]>>;
+  onCommandExecuted: (commandsLeft: number, cleanupTimeLeft: number) => void;
 }