Merge pull request #9 from steveiliop56/feat/refactor-and-start-stop

a lot of new stuff

migrations/0001_running_status.sql

@@ -0,0 +1 @@
+ALTER TABLE shells ADD `running` text;

migrations/meta/0001_snapshot.json

@@ -0,0 +1,72 @@
+{
+  "version": "5",
+  "dialect": "sqlite",
+  "id": "4e855da6-f319-4b0c-aaf8-9177a674bf7e",
+  "prevId": "8bb98af3-fe24-4378-8a91-f420b7cccf82",
+  "tables": {
+    "shells": {
+      "name": "shells",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "distro": {
+          "name": "distro",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "extraArgs": {
+          "name": "extraArgs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "running": {
+          "name": "running",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}

migrations/meta/_journal.json

@@ -8,6 +8,13 @@
       "when": 1711053809691,
       "tag": "0000_create_shells_table",
       "breakpoints": false
+    },
+    {
+      "idx": 1,
+      "version": "5",
+      "when": 1711990928976,
+      "tag": "0001_running_status",
+      "breakpoints": false
     }
   ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "getashell",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/server/actions/change-password-action.ts → src/app/actions/change-password-action.ts

@@ -1,16 +1,17 @@
 "use server";
 
 import { revalidatePath } from "next/cache";
-import { containerData } from "../types/types";
-import { changeShellPassword } from "../queries/queries";
-import { changePassword } from "../utils/container-helpers";
+import { containerData } from "../../types/types";
+import { changeShellPassword } from "../../server/queries/queries";
+import { containerHelpers } from "../../utils/container-helpers";
 
 export const change = async (shell: containerData, newPassword: string) => {
   shell.password = newPassword;
 
-  const { success, error } = await changePassword(shell);
+  const { success, error } = await new containerHelpers(shell).changePassword();
 
   if (success) {
+    console.log("Password changed!");
     await changeShellPassword(shell);
     revalidatePath("/", "layout");
     return { success: true };

src/server/actions/create-action.ts → src/app/actions/create-action.ts

@@ -5,14 +5,14 @@ import {
   checkIfShellExists,
   getShellIds,
   portAvailable,
-} from "../queries/queries";
-import { createContainer } from "../utils/container-helpers";
+} from "../../server/queries/queries";
+import { containerHelpers } from "../../utils/container-helpers";
 import { revalidatePath } from "next/cache";
 import {
   createRandomPassowrd,
   createRandomPort,
-} from "../utils/random-generator";
-import { availablePortChecker } from "../utils/port-checker";
+} from "../../utils/random-generator";
+import { availablePortChecker } from "../../utils/port-checker";
 
 export async function create(name: string, distro: string, extraArgs: string) {
   console.log(
@@ -37,16 +37,17 @@ export async function create(name: string, distro: string, extraArgs: string) {
     port: port,
     password: createRandomPassowrd(),
     extraArgs: extraArgs,
+    running: true,
   };
 
-  const ok = await createContainer(data);
+  const { success, error } = await new containerHelpers(data).createContainer();
 
-  if (ok?.success) {
+  if (success) {
     console.log("Server ready!");
     await addShell(data);
     revalidatePath("/", "layout");
     return { success: true };
   }
-  console.error(`Failed to bake server: ${ok?.error}`);
+  console.error(`Failed to bake server: ${error}`);
   return { success: false };
 }

src/server/actions/remove-action.ts → src/app/actions/remove-action.ts

@@ -1,21 +1,21 @@
 "use server";
 
-import { getShellFromId, deleteShell } from "../queries/queries";
-import { removeContainer } from "../utils/container-helpers";
+import { getShellFromId, deleteShell } from "../../server/queries/queries";
+import { containerHelpers } from "../../utils/container-helpers";
 import { revalidatePath } from "next/cache";
 
 export async function remove(id: number) {
   const shell = await getShellFromId(id);
-  const remove = await removeContainer(shell);
+  const remove = await new containerHelpers(shell).removeContainer();
 
-  if (remove?.success) {
+  if (remove.success) {
     console.log("Container killed! Removing from db...");
     await deleteShell(id);
     revalidatePath("/", "layout");
     return { success: true };
   }
   console.error(
-    `Cannot remove container, still removing from db, error: ${remove?.error}`,
+    `Cannot remove container, still removing from db, error: ${remove.error}`,
   );
   await deleteShell(id);
   revalidatePath("/", "layout");

src/app/actions/start-action.ts

@@ -0,0 +1,21 @@
+"use server";
+
+import { changeShellRunningStatus } from "@/server/queries/queries";
+import { containerData } from "@/types/types";
+import { containerHelpers } from "@/utils/container-helpers";
+import { revalidatePath } from "next/cache";
+
+export const start = async (shell: containerData) => {
+  shell.running = true;
+  const { success, error } = await new containerHelpers(shell).startContainer();
+
+  if (success) {
+    console.log("Shell started!");
+    revalidatePath("/", "layout");
+    await changeShellRunningStatus(shell);
+    return { success: true };
+  }
+
+  console.error(`Failed to start ${shell.name}! Error: ${error}`);
+  return { success: false };
+};

src/app/actions/stop-action.ts

@@ -0,0 +1,21 @@
+"use server";
+
+import { changeShellRunningStatus } from "@/server/queries/queries";
+import { containerData } from "@/types/types";
+import { containerHelpers } from "@/utils/container-helpers";
+import { revalidatePath } from "next/cache";
+
+export const stop = async (shell: containerData) => {
+  shell.running = false;
+  const { success, error } = await new containerHelpers(shell).stopContainer();
+
+  if (success) {
+    console.log("Shell stopped!");
+    revalidatePath("/", "layout");
+    await changeShellRunningStatus(shell);
+    return { success: true };
+  }
+
+  console.error(`Failed to stop ${shell.name}! Error: ${error}`);
+  return { success: false };
+};

src/app/components/create-shell-form/create-shell-form.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { create } from "@/server/actions/create-action";
+import { create } from "../../actions/create-action";
 import { Button, Flex, Select, TextField } from "@radix-ui/themes";
 import { FormEvent } from "react";
 import { toast } from "react-toastify";

src/app/components/render-shell/render-shell.tsx

@@ -1,21 +1,30 @@
 "use client";
 
-import { remove } from "@/server/actions/remove-action";
-import { containerData } from "@/server/types/types";
+import { containerData } from "@/types/types";
 import { Card, Flex, Text, Button } from "@radix-ui/themes";
+import { SettingsDialog } from "../settings-dialog";
 import { toast } from "react-toastify";
-import { InfoDialog } from "./components/info-dialog";
+import { stop } from "../../actions/stop-action";
+import { start } from "../../actions/start-action";
 
 export const renderShell = (shell: containerData) => {
-  const handleDelete = async (shell: containerData) => {
-    toast.info(`Deleting ${shell.name}...`);
-    const { success } = await remove(shell.id);
-    if (success) {
-      toast.success("Shell deleted!");
+  const handleStopStart = async () => {
+    if (shell.running) {
+      toast.info(`Stopping ${shell.name}...`);
+      const { success } = await stop(shell);
+      if (success) {
+        toast.success("Shell stopped!");
+      } else {
+        toast.error("Error in stopping shell! Please check logs!");
+      }
     } else {
-      toast.error(
-        "Error in deleting shell, please check logs. Still removing from database...",
-      );
+      toast.info(`Starting ${shell.name}...`);
+      const { success } = await start(shell);
+      if (success) {
+        toast.success("Shell starrted");
+      } else {
+        toast.error("Error in starrting shell! Please check logs!");
+      }
     }
   };
 
@@ -26,14 +35,14 @@ export const renderShell = (shell: containerData) => {
           <Text weight="medium">{shell.name}</Text>
         </Flex>
         <Flex className="flex-row gap-1 items-center">
-          <InfoDialog shell={shell} />
-          <Button
-            onClick={() => handleDelete(shell)}
-            color="orange"
-            variant="soft"
-          >
-            Delete
-          </Button>
+          <SettingsDialog shell={shell} />
+          {shell.running ? (
+            <Button onClick={() => handleStopStart()} color="red">
+              Stop
+            </Button>
+          ) : (
+            <Button onClick={() => handleStopStart()}>Start</Button>
+          )}
         </Flex>
       </Flex>
     </Card>

src/app/components/settings-dialog/index.ts

@@ -0,0 +1 @@
+export { SettingsDialog } from "./settings-dialog";