Updates

src/components/pages/admin/shell/(partials)/shell-view.tsx

@@ -77,9 +77,12 @@ export default function RelayShellView({ paradigm }: Props) {
         if (ttyd) return;
 
         if (
-            (data?.event == "server:relay-shell" ||
-                data?.event == "server:relay-pm2-logs") &&
-            data?.ttyd
+            (paradigm == "shell" &&
+                data?.event == "server:relay-shell" &&
+                data?.ttyd) ||
+            (paradigm == "pm2-logs" &&
+                data?.event == "server:relay-pm2-logs" &&
+                data?.ttyd)
         ) {
             setTimeout(() => {
                 setTtyd(
@@ -94,13 +97,15 @@ export default function RelayShellView({ paradigm }: Props) {
         }
     }, [data]);
 
+    const title = paradigm == "pm2-logs" ? `Admin Logs` : `Relay Shell`;
+
     return (
         <Stack className="gap-0 w-full">
             {ttyd?.url && ttyd.port ? (
                 <Stack className="gap-0">
                     <TtydIframe
                         url={ttyd?.url}
-                        title={`Relay Shell`}
+                        title={title}
                         wrapperProps={{
                             className: "border-none",
                         }}

src/functions/ttyd/grab-ttyd-info.ts

@@ -2,7 +2,7 @@ import {
     NSQLITE_TURBOCI_ADMIN_USERS_PORTS,
     NSQLiteTables,
 } from "@/src/db/types";
-import { TtydInfoObject, User } from "@/src/types";
+import { TtydInfoObject, TtydParams, User } from "@/src/types";
 import getNextAvailablePort from "@/src/utils/grab-next-available-port";
 import grabTtydCmd from "@/src/utils/grab-ttyd-cmd";
 import grabConnectedWebsocketUserdata from "@/src/websocket/(utils)/grab-connected-websocket-user-data";
@@ -12,11 +12,13 @@ import { exec } from "child_process";
 type Params = {
     user: User;
     cmd: string;
+    ttyd_options?: Omit<TtydParams, "cmd" | "port">;
 };
 
 export default async function grabTtydInfo({
     user,
     cmd,
+    ttyd_options,
 }: Params): Promise<TtydInfoObject> {
     const available_port = await getNextAvailablePort();
 
@@ -25,6 +27,7 @@ export default async function grabTtydInfo({
     const ttyd_cmd = grabTtydCmd({
         cmd,
         port: available_port,
+        ...ttyd_options,
     });
 
     const ttyd_exec = exec(ttyd_cmd.cmd);

src/types/index.ts

@@ -151,3 +151,10 @@ export const ServerTerminalTargets = [
     { name: "logs" },
     { name: "shell" },
 ] as const;
+
+export type TtydParams = {
+    cmd: string;
+    cwd?: string;
+    flags?: string[];
+    port: number;
+};

src/utils/grab-ttyd-cmd.ts

@@ -1,18 +1,12 @@
 import { AppData } from "../data/app-data";
-
-type Params = {
-    cmd: string;
-    cwd?: string;
-    flags?: string[];
-    port: number;
-};
+import { TtydParams } from "../types";
 
 export default function grabTtydCmd({
     cmd: ttydCmd,
     cwd,
     flags,
     port,
-}: Params) {
+}: TtydParams) {
     let cmd = ``;
     cmd += `${AppData["TerminalBinName"]}`;
     cmd += ` --writable`;

src/websocket/events/client-relay-pm2-logs.ts

@@ -10,7 +10,10 @@ export default async function socketClientRelayPm2Logs({
     try {
         const user = ws.data.user;
 
-        const ttyd = await grabTtydInfo({ cmd: `pm2 logs`, user });
+        const ttyd = await grabTtydInfo({
+            cmd: `pm2 logs`,
+            user,
+        });
 
         sendData(ws, {
             event: "server:relay-pm2-logs",

src/websocket/events/client-relay-shell.ts

@@ -15,7 +15,13 @@ export default async function socketClientRelayShell({
             throw new Error(`No Command Passed`);
         }
 
-        const ttyd = await grabTtydInfo({ cmd, user });
+        const ttyd = await grabTtydInfo({
+            cmd,
+            user,
+            ttyd_options: {
+                cwd: user.super_admin ? "/root" : `/home/${user.username}`,
+            },
+        });
 
         sendData(ws, {
             event: "server:relay-shell",