From 0e37b13d99bdaab2dc75641d7c50425a3a55de48 Mon Sep 17 00:00:00 2001
From: Justin Lin <wancat@wancat.cc>
Date: Tue, 11 Mar 2025 19:56:56 +0800
Subject: [PATCH] wip: not working yet...

---
 quests/.includes/zshrc                        | 34 ++++++++++++-------
 .../src/api/controllers/commandController.ts  |  1 +
 server/src/containers/docker.ts               |  3 ++
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/quests/.includes/zshrc b/quests/.includes/zshrc
index 89e81f7..a6fca06 100644
--- a/quests/.includes/zshrc
+++ b/quests/.includes/zshrc
@@ -8,27 +8,33 @@ set +o prompt_cr
 preexec() {
     export CMD_START_TIME=$(date +%s%N)      # capture start time
     export CMD_NAME="$1"                   # capture command
+    export CMD_PID=$$
 
     # # A list of interactive commands
     # readlink /proc/$PPID/exe
-    exec >&1 >/tmp/cmd.out 2>&2 2>/tmp/cmd.error
-    # interactive_commands=("vim" "nano" "top" "ssh" "less" "zsh" "bash" "script")
+    interactive_commands=("vim" "nano" "top" "ssh" "less" "zsh" "bash" "script" "exec")
     # # if [[ $CMD_EXECUTED = 1 ]]; then
     # #     export CMD_EXECUTED=0
     # #     return
     # # fi
 
     # # Check if the command is in the list of interactive commands
-    # if [[ " ${interactive_commands[@]} " =~ " $1 " ]]; then
-    #     # If it is, just execute it normally
-    #     # exec
-    #     return
-    # else
-    #     # If it's not, execute it and redirect its output to a file
-    #     # exec > >(tee /tmp/cmd.out) 2> >(tee /tmp/cmd.error >&2)
-    #     export CMD_EXECUTED=1
-    #     script -O /tmp/cmd.out -c "$*"
-    # fi
+    if [[ " ${interactive_commands[@]} " =~ " $1 " ]]; then
+        # If it is, just execute it normally
+        # exec
+        # echo IF
+        return
+    else
+        # If it's not, execute it and redirect its output to a file
+        # exec > >(tee /tmp/cmd.out) 2> >(tee /tmp/cmd.error >&2)
+        # echo ELSE
+        # export CMD_EXECUTED=1
+        # eval >&1 >/tmp/cmd.out 
+        # exec >&1
+        # exec
+        script --quiet -O /tmp/cmd.out -c "$CMD_NAME"
+        return 1
+    fi
 }
 
 precmd() {
@@ -39,6 +45,10 @@ precmd() {
 
     # Now run your Node.js script with the result as an argument
     node /usr/local/lib/container/cli.js
+    if [[ -n $CMD_PID ]]; then
+        # echo $CMD_PID
+        # kill $CMD_PID
+    fi
     # rm /tmp/cmd.out /tmp/cmd.error 2>/dev/null
 
     # Reset variables
diff --git a/server/src/api/controllers/commandController.ts b/server/src/api/controllers/commandController.ts
index f72761b..173bdb6 100644
--- a/server/src/api/controllers/commandController.ts
+++ b/server/src/api/controllers/commandController.ts
@@ -8,6 +8,7 @@ import { asyncHandler } from '../../middleware/error.js'
 
 export const newCommand = asyncHandler(async (req: Request, res: Response) => {
   const { command, pwd, output, error, params } = matchedData(req)
+  console.log(command, output, error)
 
   const { sessionId } = req.user as any
   const session = await Session.findById(sessionId)
diff --git a/server/src/containers/docker.ts b/server/src/containers/docker.ts
index 0d488eb..5313cdd 100644
--- a/server/src/containers/docker.ts
+++ b/server/src/containers/docker.ts
@@ -33,6 +33,9 @@ export async function createContainer(
   imageId: string
 ): Promise<Docker.Container> {
   let binds: string[] = []
+  binds.push(
+    `${config.docker.hostProjectRoot}/quests/.includes/zshrc:/etc/zsh/zshrc`
+  )
   if (await questHomeExists(questId)) {
     logger.info('Mounting quest home', questId)
     binds.push(