From 9b4335a6282abac128eb084e75de313977ba61b5 Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Tue, 1 Aug 2023 23:23:05 +0800
Subject: [PATCH 01/17] changed WidgetTerminal to TerminalPart, add xterm
 attach but seemed not fit to use on http://localhost:3000

---
 app/package.json                    |   5 +-
 app/src/App.vue                     |   1 +
 app/src/components/TerminalPart.vue | 109 +++++++++++++++++++++++++++-
 yarn.lock                           |  15 ++++
 4 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/app/package.json b/app/package.json
index 8cc8dbe..1ffe2ca 100644
--- a/app/package.json
+++ b/app/package.json
@@ -15,7 +15,10 @@
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/vue-fontawesome": "^3.0.3",
     "axios": "^1.4.0",
-    "vue": "^3.3.4"
+    "vue": "^3.3.4",
+    "xterm": "^5.2.1",
+    "xterm-addon-attach": "^0.8.0",
+    "xterm-addon-fit": "^0.7.0"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
diff --git a/app/src/App.vue b/app/src/App.vue
index c0fcaaf..12a0ac6 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -73,3 +73,4 @@ import VisualizationPart from './components/VisualizationPart.vue'
     </div>
   </div>
 </template>
+<script></script>
diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 9ee24ee..9a1f340 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -3,9 +3,112 @@
 <template>
   <font-awesome-icon :icon="['fas', 'terminal']" class="text-text p-1" />
   <button class="text-text h-[5%]">Terminal</button>
-  <div class="bg-background-secondary h-[calc(100%-5%)] p-4">
-    <p class="text-text-primary">
+  <div
+    id="terminal"
+    ref="terminal"
+    class="bg-background-secondary h-[calc(100%-5%)] p-0.5"
+  >
+    <!-- <p class="text-text-primary">
       zeko@first-command<span class="text-text">:~$</span>
-    </p>
+    </p> -->
   </div>
 </template>
+<script>
+import { Terminal } from 'xterm'
+import { FitAddon } from 'xterm-addon-fit'
+import { AttachAddon } from 'xterm-addon-attach'
+import 'xterm/css/xterm.css'
+// import connect from 'server/src/client'
+
+export default {
+  name: 'TerminalPart',
+  data() {
+    return {
+      term: '', // 保存terminal实例
+      rows: 40,
+      cols: 100,
+    }
+  },
+  mounted() {
+    this.initXterm()
+  },
+  methods: {
+    initXterm() {
+      const xthis = this
+      const term = new Terminal({
+        rendererType: 'canvas', // 渲染类型
+        rows: xthis.rows, // 行数
+        cols: xthis.cols, // 不指定行数，自动回车后光标从下一行开始
+        convertEol: true, // 启用时，光标将设置为下一行的开头
+        // scrollback: 50, //终端中的回滚量
+        disableStdin: false, // 是否应禁用输入
+        // cursorStyle: "underline", //光标样式
+        cursorBlink: true, // 光标闪烁
+        theme: {
+          foreground: '#ECECEC', // 字体
+          background: '#000000', // 背景色
+          cursor: 'help', // 设置光标
+          lineHeight: 20,
+        },
+      })
+      const socket = new WebSocket('http://localhost:3000')
+      const attachAddon = new AttachAddon(socket)
+      // 创建terminal实例
+      term.loadAddon(attachAddon)
+      term.open(this.$refs.terminal)
+      // 换行并输入起始符 $
+      term.prompt = () => {
+        term.write('\r\n\x1b[33mLinux Odyssey$\x1b[0m ')
+      }
+      term.prompt()
+      // canvas背景全屏
+      const fitAddon = new FitAddon()
+      term.loadAddon(fitAddon)
+      fitAddon.fit()
+      function resizeScreen() {
+        try {
+          // 窗口大小改变时，触发xterm的resize方法使自适应
+          fitAddon.fit()
+        } catch (e) {
+          console.log('e', e.message)
+        }
+      }
+      window.addEventListener('resize', resizeScreen)
+      xthis.term = term
+      xthis.runFakeTerminal()
+    },
+    runFakeTerminal() {
+      const xthis = this
+      const { term } = xthis
+      if (term.xinitialized) return
+      // 初始化
+      term.xinitialized = true
+      term.writeln('Welcome to \x1b[1;32mLinux Odyssey\x1b[0m!')
+      term.prompt()
+      // 添加事件监听器，支持输入方法
+      term.onKey((e) => {
+        const printable =
+          !e.domEvent.altKey &&
+          !e.domEvent.altGraphKey &&
+          !e.domEvent.ctrlKey &&
+          !e.domEvent.metaKey
+        if (e.domEvent.keyCode === 13) {
+          term.prompt()
+        } else if (e.domEvent.keyCode === 8) {
+          // back 删除的情况
+          if (term.xcore.buffer.x > 2) {
+            term.write('\b \b')
+          }
+        } else if (printable) {
+          term.write(e.key)
+        }
+        console.log(1, 'print', e.key)
+      })
+      term.onData((key) => {
+        // 粘贴的情况
+        if (key.length > 1) term.write(key)
+      })
+    },
+  },
+}
+</script>
diff --git a/yarn.lock b/yarn.lock
index 2a3ac1c..47e89d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4887,6 +4887,21 @@ xmlhttprequest-ssl@~2.0.0:
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
   integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
 
+xterm-addon-attach@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-attach/-/xterm-addon-attach-0.8.0.tgz#86e0ed08460efffb7d4bad74a57b600226594def"
+  integrity sha512-k8N5boSYn6rMJTTNCgFpiSTZ26qnYJf3v/nJJYexNO2sdAHDN3m1ivVQWVZ8CHJKKnZQw1rc44YP2NtgalWHfQ==
+
+xterm-addon-fit@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.7.0.tgz#b8ade6d96e63b47443862088f6670b49fb752c6a"
+  integrity sha512-tQgHGoHqRTgeROPnvmtEJywLKoC/V9eNs4bLLz7iyJr1aW/QFzRwfd3MGiJ6odJd9xEfxcW36/xRU47JkD5NKQ==
+
+xterm@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.1.tgz#b3fea7bdb55b9be1d4b31f4cd1091f26ac42afb8"
+  integrity sha512-cs5Y1fFevgcdoh2hJROMVIWwoBHD80P1fIP79gopLHJIE4kTzzblanoivxTiQ4+92YM9IxS36H1q0MxIJXQBcA==
+
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"

From 0195305d0e97dd6758179cd5dc640b5fe7411f7e Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Thu, 3 Aug 2023 00:04:36 +0800
Subject: [PATCH 02/17] tried several container id

---
 app/package.json                    |  1 +
 app/src/components/TerminalPart.vue | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index 1ffe2ca..de08c19 100644
--- a/app/package.json
+++ b/app/package.json
@@ -15,6 +15,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/vue-fontawesome": "^3.0.3",
     "axios": "^1.4.0",
+    "socket.io-client": "^4.7.1",
     "vue": "^3.3.4",
     "xterm": "^5.2.1",
     "xterm-addon-attach": "^0.8.0",
diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 9a1f340..4bd0997 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -51,7 +51,15 @@ export default {
           lineHeight: 20,
         },
       })
-      const socket = new WebSocket('http://localhost:3000')
+      const wsHost = 'odyssey.wancat.cc'
+      // const wsHost = 'localhost:3000'
+      // const container = 'quest-helloworld-defaultUser-1690375754669'
+      // const container = '1690375754669'
+      const container = '64c1164a5b34af580963da6b'
+      // const container = '423ba17d5863'
+      // const container = 'dcb865c0e5a5 '
+      const ws = `wss://${wsHost}/containers/${container}/attach/ws?stream=true`
+      const socket = new WebSocket(ws)
       const attachAddon = new AttachAddon(socket)
       // 创建terminal实例
       term.loadAddon(attachAddon)

From 577352e51d6d179fba8eac65c94e946265da3606 Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Thu, 3 Aug 2023 20:46:09 +0800
Subject: [PATCH 03/17] connect to docker, trying to emit message

---
 app/src/components/TerminalPart.vue | 42 ++++++++++++++++++++---------
 cleanup.sh                          |  0
 2 files changed, 30 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 cleanup.sh

diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 4bd0997..34709af 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -16,8 +16,10 @@
 <script>
 import { Terminal } from 'xterm'
 import { FitAddon } from 'xterm-addon-fit'
-import { AttachAddon } from 'xterm-addon-attach'
+// import { AttachAddon } from 'xterm-addon-attach'
+import { stdin, stdout, exit } from 'process'
 import 'xterm/css/xterm.css'
+import { io } from 'socket.io-client'
 // import connect from 'server/src/client'
 
 export default {
@@ -51,18 +53,33 @@ export default {
           lineHeight: 20,
         },
       })
-      const wsHost = 'odyssey.wancat.cc'
-      // const wsHost = 'localhost:3000'
-      // const container = 'quest-helloworld-defaultUser-1690375754669'
-      // const container = '1690375754669'
-      const container = '64c1164a5b34af580963da6b'
-      // const container = '423ba17d5863'
-      // const container = 'dcb865c0e5a5 '
-      const ws = `wss://${wsHost}/containers/${container}/attach/ws?stream=true`
-      const socket = new WebSocket(ws)
-      const attachAddon = new AttachAddon(socket)
+      const ws = 'wss://odyssey.wancat.cc'
+      // const ws = 'ws://localhost:3000'
+      const socket = io(ws, {
+        query: {
+          // session_id: sessionId,
+          session_id: '64cb80132077b982b86bdc4f',
+        },
+      })
+      socket.on('message', function incoming(data) {
+        console.log(data)
+      })
+      socket.on('open', function open() {
+        console.log('Connected to the server.')
+      })
+      // socket.on('message', function incoming(data) {
+      //   stdout.write(data)
+      // })
+      socket.on('close', function close() {
+        console.log('Disconnected from the server.')
+        exit()
+      })
+      socket.on('message', (message) => {
+        term.onData(socket.emit('input', message))
+      })
+      // const attachAddon = new AttachAddon(socket)
       // 创建terminal实例
-      term.loadAddon(attachAddon)
+      // term.loadAddon(attachAddon)
       term.open(this.$refs.terminal)
       // 换行并输入起始符 $
       term.prompt = () => {
@@ -83,6 +100,7 @@ export default {
       }
       window.addEventListener('resize', resizeScreen)
       xthis.term = term
+      xthis.socket = socket
       xthis.runFakeTerminal()
     },
     runFakeTerminal() {
diff --git a/cleanup.sh b/cleanup.sh
old mode 100644
new mode 100755

From a74233d7f913aced34fd3ba2eea690115fa1979d Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Mon, 7 Aug 2023 21:15:29 +0800
Subject: [PATCH 04/17] feat: connect to localhost

---
 app/src/components/TerminalPart.vue | 180 ++++++++++------------------
 app/vite.config.js                  |   8 ++
 server/package.json                 |   1 +
 server/src/api/socket.js            |   6 +-
 server/src/index.js                 |   6 +
 yarn.lock                           |   2 +-
 6 files changed, 82 insertions(+), 121 deletions(-)

diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 34709af..98baa6f 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -1,5 +1,3 @@
-<script setup></script>
-
 <template>
   <font-awesome-icon :icon="['fas', 'terminal']" class="text-text p-1" />
   <button class="text-text h-[5%]">Terminal</button>
@@ -13,128 +11,72 @@
     </p> -->
   </div>
 </template>
-<script>
+<script setup>
 import { Terminal } from 'xterm'
 import { FitAddon } from 'xterm-addon-fit'
-// import { AttachAddon } from 'xterm-addon-attach'
-import { stdin, stdout, exit } from 'process'
+import { AttachAddon } from 'xterm-addon-attach'
 import 'xterm/css/xterm.css'
 import { io } from 'socket.io-client'
 // import connect from 'server/src/client'
 
-export default {
-  name: 'TerminalPart',
-  data() {
-    return {
-      term: '', // 保存terminal实例
-      rows: 40,
-      cols: 100,
-    }
-  },
-  mounted() {
-    this.initXterm()
-  },
-  methods: {
-    initXterm() {
-      const xthis = this
-      const term = new Terminal({
-        rendererType: 'canvas', // 渲染类型
-        rows: xthis.rows, // 行数
-        cols: xthis.cols, // 不指定行数，自动回车后光标从下一行开始
-        convertEol: true, // 启用时，光标将设置为下一行的开头
-        // scrollback: 50, //终端中的回滚量
-        disableStdin: false, // 是否应禁用输入
-        // cursorStyle: "underline", //光标样式
-        cursorBlink: true, // 光标闪烁
-        theme: {
-          foreground: '#ECECEC', // 字体
-          background: '#000000', // 背景色
-          cursor: 'help', // 设置光标
-          lineHeight: 20,
-        },
-      })
-      const ws = 'wss://odyssey.wancat.cc'
-      // const ws = 'ws://localhost:3000'
-      const socket = io(ws, {
-        query: {
-          // session_id: sessionId,
-          session_id: '64cb80132077b982b86bdc4f',
-        },
-      })
-      socket.on('message', function incoming(data) {
-        console.log(data)
-      })
-      socket.on('open', function open() {
-        console.log('Connected to the server.')
-      })
-      // socket.on('message', function incoming(data) {
-      //   stdout.write(data)
-      // })
-      socket.on('close', function close() {
-        console.log('Disconnected from the server.')
-        exit()
-      })
-      socket.on('message', (message) => {
-        term.onData(socket.emit('input', message))
-      })
-      // const attachAddon = new AttachAddon(socket)
-      // 创建terminal实例
-      // term.loadAddon(attachAddon)
-      term.open(this.$refs.terminal)
-      // 换行并输入起始符 $
-      term.prompt = () => {
-        term.write('\r\n\x1b[33mLinux Odyssey$\x1b[0m ')
-      }
-      term.prompt()
-      // canvas背景全屏
-      const fitAddon = new FitAddon()
-      term.loadAddon(fitAddon)
+import { onMounted, ref } from 'vue'
+
+const rows = ref(40)
+const cols = ref(100)
+const terminal = ref(null)
+
+onMounted(() => {
+  const term = new Terminal({
+    rendererType: 'canvas', // 渲染类型
+    rows: rows.value, // 行数
+    cols: cols.value, // 不指定行数，自动回车后光标从下一行开始
+    convertEol: true, // 启用时，光标将设置为下一行的开头
+    // scrollback: 50, //终端中的回滚量
+    disableStdin: false, // 是否应禁用输入
+    // cursorStyle: "underline", //光标样式
+    cursorBlink: true, // 光标闪烁
+    theme: {
+      foreground: '#ECECEC', // 字体
+      background: '#000000', // 背景色
+      cursor: 'help', // 设置光标
+      lineHeight: 20,
+    },
+  })
+  // const host = 'wss://odyssey.wancat.cc'
+  const host = 'ws://localhost:3000'
+  const socket = io(host, {
+    query: {
+      // session_id: sessionId,
+      session_id: '64d0de0367459c13004bc83f',
+    },
+  })
+  socket.on('connect', function open() {
+    console.log('Connected to the server.')
+  })
+  socket.on('disconnect', function close() {
+    console.log('Disconnected from the server.')
+  })
+  socket.on('message', (message) => {
+    console.log(message)
+    term.write(message)
+  })
+  term.onData((key) => {
+    console.log(key)
+    socket.send(key)
+  })
+  term.open(terminal.value)
+
+  const fitAddon = new FitAddon()
+  term.loadAddon(fitAddon)
+  fitAddon.fit()
+  function resizeScreen() {
+    try {
+      // 窗口大小改变时，触发xterm的resize方法使自适应
       fitAddon.fit()
-      function resizeScreen() {
-        try {
-          // 窗口大小改变时，触发xterm的resize方法使自适应
-          fitAddon.fit()
-        } catch (e) {
-          console.log('e', e.message)
-        }
-      }
-      window.addEventListener('resize', resizeScreen)
-      xthis.term = term
-      xthis.socket = socket
-      xthis.runFakeTerminal()
-    },
-    runFakeTerminal() {
-      const xthis = this
-      const { term } = xthis
-      if (term.xinitialized) return
-      // 初始化
-      term.xinitialized = true
-      term.writeln('Welcome to \x1b[1;32mLinux Odyssey\x1b[0m!')
-      term.prompt()
-      // 添加事件监听器，支持输入方法
-      term.onKey((e) => {
-        const printable =
-          !e.domEvent.altKey &&
-          !e.domEvent.altGraphKey &&
-          !e.domEvent.ctrlKey &&
-          !e.domEvent.metaKey
-        if (e.domEvent.keyCode === 13) {
-          term.prompt()
-        } else if (e.domEvent.keyCode === 8) {
-          // back 删除的情况
-          if (term.xcore.buffer.x > 2) {
-            term.write('\b \b')
-          }
-        } else if (printable) {
-          term.write(e.key)
-        }
-        console.log(1, 'print', e.key)
-      })
-      term.onData((key) => {
-        // 粘贴的情况
-        if (key.length > 1) term.write(key)
-      })
-    },
-  },
-}
+    } catch (e) {
+      console.log('e', e.message)
+    }
+  }
+  window.addEventListener('resize', resizeScreen)
+})
 </script>
diff --git a/app/vite.config.js b/app/vite.config.js
index 05c1740..1f7dfa2 100644
--- a/app/vite.config.js
+++ b/app/vite.config.js
@@ -4,4 +4,12 @@ import vue from '@vitejs/plugin-vue'
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
+  server: {
+    proxy: {
+      '/api': {
+        target: 'http://localhost:3000', // the server url
+        ws: true,
+      },
+    },
+  },
 })
diff --git a/server/package.json b/server/package.json
index 6a40895..5d5bab5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "commander": "^11.0.0",
+    "cors": "^2.8.5",
     "dockerode": "^3.3.5",
     "express": "^4.18.2",
     "jsonwebtoken": "^9.0.1",
diff --git a/server/src/api/socket.js b/server/src/api/socket.js
index d1f33e5..a7df255 100644
--- a/server/src/api/socket.js
+++ b/server/src/api/socket.js
@@ -4,7 +4,11 @@ import Session from '../models/session.js'
 import { defaultUser, genSessionJWT } from '../utils/auth.js'
 
 export default (server) => {
-  const io = new Server(server)
+  const io = new Server(server, {
+    cors: {
+      origin: '*',
+    },
+  })
 
   io.use(async (socket, next) => {
     console.log('Authenticating...')
diff --git a/server/src/index.js b/server/src/index.js
index 4b5ad47..b63400d 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -3,6 +3,7 @@ import express from 'express'
 import http from 'http'
 import YAML from 'yaml'
 import swaggerUI from 'swagger-ui-express'
+import cors from 'cors'
 
 import socketServer from './api/socket.js'
 import connectDB from './db.js'
@@ -22,6 +23,11 @@ async function main() {
   const swaggerDocument = YAML.parse(file)
   app.use('/api-docs', swaggerUI.serve, swaggerUI.setup(swaggerDocument))
   app.use(express.json())
+  app.use(
+    cors({
+      origin: '*',
+    })
+  )
 
   app.get('/', (req, res) => {
     res.send('Hello World!')
diff --git a/yarn.lock b/yarn.lock
index 47e89d5..e7d8450 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1602,7 +1602,7 @@ cookie@~0.4.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
-cors@~2.8.5:
+cors@^2.8.5, cors@~2.8.5:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
   integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==

From 19303aad9054fde5e441a72e680951cbc438278e Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Tue, 8 Aug 2023 21:14:16 +0800
Subject: [PATCH 05/17] fix

---
 app/src/components/TerminalPart.vue | 136 ++++++++++++++++++----------
 server/src/api/socket.js            |  19 ++--
 2 files changed, 99 insertions(+), 56 deletions(-)

diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 98baa6f..8064827 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -13,65 +13,101 @@
 </template>
 <script setup>
 import { Terminal } from 'xterm'
+import { onMounted, ref } from 'vue'
 import { FitAddon } from 'xterm-addon-fit'
 import { AttachAddon } from 'xterm-addon-attach'
+import { stdin, stdout, exit } from 'process'
 import 'xterm/css/xterm.css'
 import { io } from 'socket.io-client'
 // import connect from 'server/src/client'
 
-import { onMounted, ref } from 'vue'
-
 const rows = ref(40)
 const cols = ref(100)
 const terminal = ref(null)
-
-onMounted(() => {
-  const term = new Terminal({
-    rendererType: 'canvas', // 渲染类型
-    rows: rows.value, // 行数
-    cols: cols.value, // 不指定行数，自动回车后光标从下一行开始
-    convertEol: true, // 启用时，光标将设置为下一行的开头
-    // scrollback: 50, //终端中的回滚量
-    disableStdin: false, // 是否应禁用输入
-    // cursorStyle: "underline", //光标样式
-    cursorBlink: true, // 光标闪烁
-    theme: {
-      foreground: '#ECECEC', // 字体
-      background: '#000000', // 背景色
-      cursor: 'help', // 设置光标
-      lineHeight: 20,
-    },
-  })
-  // const host = 'wss://odyssey.wancat.cc'
-  const host = 'ws://localhost:3000'
-  const socket = io(host, {
-    query: {
-      // session_id: sessionId,
-      session_id: '64d0de0367459c13004bc83f',
-    },
-  })
-  socket.on('connect', function open() {
-    console.log('Connected to the server.')
-  })
-  socket.on('disconnect', function close() {
-    console.log('Disconnected from the server.')
-  })
-  socket.on('message', (message) => {
-    console.log(message)
-    term.write(message)
-  })
-  term.onData((key) => {
-    console.log(key)
-    socket.send(key)
-  })
-  term.open(terminal.value)
-
-  const fitAddon = new FitAddon()
-  term.loadAddon(fitAddon)
-  fitAddon.fit()
-  function resizeScreen() {
-    try {
-      // 窗口大小改变时，触发xterm的resize方法使自适应
+export default {
+  name: 'TerminalPart',
+  data() {
+    return {
+      term: '', // 保存terminal实例
+      rows: 40,
+      cols: 100,
+    }
+  },
+  mounted() {
+    this.initXterm()
+  },
+  methods: {
+    initXterm() {
+      const xthis = this
+      const term = new Terminal({
+        rendererType: 'canvas', // 渲染类型
+        rows: xthis.rows, // 行数
+        cols: xthis.cols, // 不指定行数，自动回车后光标从下一行开始
+        convertEol: true, // 启用时，光标将设置为下一行的开头
+        // scrollback: 50, //终端中的回滚量
+        disableStdin: false, // 是否应禁用输入
+        // cursorStyle: "underline", //光标样式
+        cursorBlink: true, // 光标闪烁
+        theme: {
+          foreground: '#ECECEC', // 字体
+          background: '#000000', // 背景色
+          cursor: 'help', // 设置光标
+          lineHeight: 20,
+        },
+      })
+      const ws = 'wss://odyssey.wancat.cc'
+      // const ws = 'ws://localhost:3000'
+      const socket = io(ws, {
+        query: {
+          // session_id: sessionId,
+          session_id: '64cb80132077b982b86bdc4f',
+        },
+      })
+      socket.on('message', function incoming(data) {
+        console.log(data)
+        term.write(data)
+      })
+      socket.on('connect', function open() {
+        console.log('Connected to the server.')
+      })
+      // socket.on('message', function incoming(data) {
+      //   stdout.write(data)
+      // })
+      socket.on('disconnect', function close() {
+        console.log('Disconnected from the server.')
+        exit()
+      })
+      socket.on('message', (message) => {
+        console.log(message)
+        term.write(message)
+      })
+      term.onData((data) => {
+        // xthis.socket.emit('data', new TextEncoder().encode(`\x00${data}`))
+        // socket.send('data', new TextEncoder().encode(`\x00${data}`))
+        console.log(data)
+        socket.send(data)
+      })
+      // term.onData(function (key) {
+      //     let order = {
+      //       Data: key,
+      //       Op: "stdin"
+      //     };
+      //     xthis.onSend(order);
+      //   });
+      //   xthis.term = term;
+      // }
+      // const attachAddon = new AttachAddon(socket)
+      // 创建terminal实例
+      // term.loadAddon(attachAddon)
+      term.open(this.$refs.terminal)
+      // 换行并输入起始符 $
+      term.prompt = () => {
+        term.write('\r\n\x1b[33mLinux Odyssey$\x1b[0m ')
+      }
+      term.prompt()
+      // canvas背景全屏
+      const fitAddon = new FitAddon()
+      term.loadAddon(fitAddon)
       fitAddon.fit()
     } catch (e) {
       console.log('e', e.message)
diff --git a/server/src/api/socket.js b/server/src/api/socket.js
index a7df255..f5ea960 100644
--- a/server/src/api/socket.js
+++ b/server/src/api/socket.js
@@ -4,12 +4,19 @@ import Session from '../models/session.js'
 import { defaultUser, genSessionJWT } from '../utils/auth.js'
 
 export default (server) => {
-  const io = new Server(server, {
-    cors: {
-      origin: '*',
+  const io = new Server(
+    server,
+    {
+      cors: {
+        origin: '*',
+      },
     },
-  })
-
+    {
+      cors: {
+        origin: '*',
+      },
+    }
+  )
   io.use(async (socket, next) => {
     console.log('Authenticating...')
     try {
@@ -54,7 +61,7 @@ export default (server) => {
     const stream = await attachContainer(container, { token })
 
     stream.on('data', (chunk) => {
-      socket.send(chunk.toString())
+      socket.send(chunk.toString().toString())
     })
 
     socket.on('message', function incoming(message) {

From dee7e6975ebfefa59289ae441e27690a470375d0 Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Tue, 8 Aug 2023 23:56:48 +0800
Subject: [PATCH 06/17] fix

---
 app/src/components/TerminalPart.vue | 136 ++++++++++------------------
 1 file changed, 50 insertions(+), 86 deletions(-)

diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 8064827..98baa6f 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -13,101 +13,65 @@
 </template>
 <script setup>
 import { Terminal } from 'xterm'
-import { onMounted, ref } from 'vue'
 import { FitAddon } from 'xterm-addon-fit'
 import { AttachAddon } from 'xterm-addon-attach'
-import { stdin, stdout, exit } from 'process'
 import 'xterm/css/xterm.css'
 import { io } from 'socket.io-client'
 // import connect from 'server/src/client'
 
+import { onMounted, ref } from 'vue'
+
 const rows = ref(40)
 const cols = ref(100)
 const terminal = ref(null)
-export default {
-  name: 'TerminalPart',
-  data() {
-    return {
-      term: '', // 保存terminal实例
-      rows: 40,
-      cols: 100,
-    }
-  },
-  mounted() {
-    this.initXterm()
-  },
-  methods: {
-    initXterm() {
-      const xthis = this
-      const term = new Terminal({
-        rendererType: 'canvas', // 渲染类型
-        rows: xthis.rows, // 行数
-        cols: xthis.cols, // 不指定行数，自动回车后光标从下一行开始
-        convertEol: true, // 启用时，光标将设置为下一行的开头
-        // scrollback: 50, //终端中的回滚量
-        disableStdin: false, // 是否应禁用输入
-        // cursorStyle: "underline", //光标样式
-        cursorBlink: true, // 光标闪烁
-        theme: {
-          foreground: '#ECECEC', // 字体
-          background: '#000000', // 背景色
-          cursor: 'help', // 设置光标
-          lineHeight: 20,
-        },
-      })
-      const ws = 'wss://odyssey.wancat.cc'
-      // const ws = 'ws://localhost:3000'
-      const socket = io(ws, {
-        query: {
-          // session_id: sessionId,
-          session_id: '64cb80132077b982b86bdc4f',
-        },
-      })
-      socket.on('message', function incoming(data) {
-        console.log(data)
-        term.write(data)
-      })
-      socket.on('connect', function open() {
-        console.log('Connected to the server.')
-      })
-      // socket.on('message', function incoming(data) {
-      //   stdout.write(data)
-      // })
-      socket.on('disconnect', function close() {
-        console.log('Disconnected from the server.')
-        exit()
-      })
-      socket.on('message', (message) => {
-        console.log(message)
-        term.write(message)
-      })
-      term.onData((data) => {
-        // xthis.socket.emit('data', new TextEncoder().encode(`\x00${data}`))
-        // socket.send('data', new TextEncoder().encode(`\x00${data}`))
-        console.log(data)
-        socket.send(data)
-      })
-      // term.onData(function (key) {
-      //     let order = {
-      //       Data: key,
-      //       Op: "stdin"
-      //     };
-      //     xthis.onSend(order);
-      //   });
-      //   xthis.term = term;
-      // }
-      // const attachAddon = new AttachAddon(socket)
-      // 创建terminal实例
-      // term.loadAddon(attachAddon)
-      term.open(this.$refs.terminal)
-      // 换行并输入起始符 $
-      term.prompt = () => {
-        term.write('\r\n\x1b[33mLinux Odyssey$\x1b[0m ')
-      }
-      term.prompt()
-      // canvas背景全屏
-      const fitAddon = new FitAddon()
-      term.loadAddon(fitAddon)
+
+onMounted(() => {
+  const term = new Terminal({
+    rendererType: 'canvas', // 渲染类型
+    rows: rows.value, // 行数
+    cols: cols.value, // 不指定行数，自动回车后光标从下一行开始
+    convertEol: true, // 启用时，光标将设置为下一行的开头
+    // scrollback: 50, //终端中的回滚量
+    disableStdin: false, // 是否应禁用输入
+    // cursorStyle: "underline", //光标样式
+    cursorBlink: true, // 光标闪烁
+    theme: {
+      foreground: '#ECECEC', // 字体
+      background: '#000000', // 背景色
+      cursor: 'help', // 设置光标
+      lineHeight: 20,
+    },
+  })
+  // const host = 'wss://odyssey.wancat.cc'
+  const host = 'ws://localhost:3000'
+  const socket = io(host, {
+    query: {
+      // session_id: sessionId,
+      session_id: '64d0de0367459c13004bc83f',
+    },
+  })
+  socket.on('connect', function open() {
+    console.log('Connected to the server.')
+  })
+  socket.on('disconnect', function close() {
+    console.log('Disconnected from the server.')
+  })
+  socket.on('message', (message) => {
+    console.log(message)
+    term.write(message)
+  })
+  term.onData((key) => {
+    console.log(key)
+    socket.send(key)
+  })
+  term.open(terminal.value)
+
+  const fitAddon = new FitAddon()
+  term.loadAddon(fitAddon)
+  fitAddon.fit()
+  function resizeScreen() {
+    try {
+      // 窗口大小改变时，触发xterm的resize方法使自适应
       fitAddon.fit()
     } catch (e) {
       console.log('e', e.message)

From 6e0682881b0310cd1cf696831dc43614587d102e Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Wed, 9 Aug 2023 00:00:34 +0800
Subject: [PATCH 07/17] fix

---
 server/src/api/socket.js | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/server/src/api/socket.js b/server/src/api/socket.js
index f5ea960..a7df255 100644
--- a/server/src/api/socket.js
+++ b/server/src/api/socket.js
@@ -4,19 +4,12 @@ import Session from '../models/session.js'
 import { defaultUser, genSessionJWT } from '../utils/auth.js'
 
 export default (server) => {
-  const io = new Server(
-    server,
-    {
-      cors: {
-        origin: '*',
-      },
+  const io = new Server(server, {
+    cors: {
+      origin: '*',
     },
-    {
-      cors: {
-        origin: '*',
-      },
-    }
-  )
+  })
+
   io.use(async (socket, next) => {
     console.log('Authenticating...')
     try {
@@ -61,7 +54,7 @@ export default (server) => {
     const stream = await attachContainer(container, { token })
 
     stream.on('data', (chunk) => {
-      socket.send(chunk.toString().toString())
+      socket.send(chunk.toString())
     })
 
     socket.on('message', function incoming(message) {

From b66baa2070c8f49c20f5cc036c37a15cebc7fd40 Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Wed, 9 Aug 2023 00:53:37 +0800
Subject: [PATCH 08/17] try to merge from origin but seemed not working
 properly, it couldn't display message given from backend, and only able to
 connect to session while odyssey.wancat.cc

---
 app/src/components/TerminalPart.vue | 33 +++++++++++++++++++++++++----
 app/vite.config.js                  |  3 ++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 98baa6f..8971612 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -42,12 +42,15 @@ onMounted(() => {
       lineHeight: 20,
     },
   })
-  // const host = 'wss://odyssey.wancat.cc'
-  const host = 'ws://localhost:3000'
+  const host = 'wss://odyssey.wancat.cc'
+  // const host = 'ws://localhost:3000'
   const socket = io(host, {
     query: {
       // session_id: sessionId,
-      session_id: '64d0de0367459c13004bc83f',
+      session_id: '64d26a8cffab987b2bb0de38',
+      // odyssey
+      // session_id: '64d271ce784daf755387ff4f',
+      // localhost
     },
   })
   socket.on('connect', function open() {
@@ -63,12 +66,34 @@ onMounted(() => {
   term.onData((key) => {
     console.log(key)
     socket.send(key)
+    if (key.length > 1) term.write(key)
+    if (key == '\r') {
+      // term.write('\n')
+      term.write('\r\n\x1b[33mLinux Odyssey$\x1b[0m ')
+    }
   })
   term.open(terminal.value)
-
   const fitAddon = new FitAddon()
   term.loadAddon(fitAddon)
   fitAddon.fit()
+  term.writeln('Welcome to \x1b[1;32mLinux Odyssey\x1b[0m!')
+  term.onKey((e) => {
+    const printable =
+      !e.domEvent.altKey &&
+      !e.domEvent.altGraphKey &&
+      !e.domEvent.ctrlKey &&
+      !e.domEvent.metaKeys
+    if (e.domEvent.keyCode === 8) {
+      // back 删除的情况
+      if (term.xcore.buffer.x > 2) {
+        term.write('\b \b')
+      }
+    } else if (printable) {
+      term.write(e.key)
+    }
+    console.log(1, 'print', e.key)
+  })
+
   function resizeScreen() {
     try {
       // 窗口大小改变时，触发xterm的resize方法使自适应
diff --git a/app/vite.config.js b/app/vite.config.js
index 1f7dfa2..cf94bdc 100644
--- a/app/vite.config.js
+++ b/app/vite.config.js
@@ -7,7 +7,8 @@ export default defineConfig({
   server: {
     proxy: {
       '/api': {
-        target: 'http://localhost:3000', // the server url
+        // target: 'http://localhost:3000', // the server url
+        target: 'http://odyssey.wancat.cc ',
         ws: true,
       },
     },

From 211b4e08e8b93b9a3ae457bcb408a5f70c75e005 Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Wed, 9 Aug 2023 21:10:49 +0800
Subject: [PATCH 09/17] delete useless code

---
 app/src/components/TerminalPart.vue | 32 ++---------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 8971612..33f1ef9 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -5,20 +5,14 @@
     id="terminal"
     ref="terminal"
     class="bg-background-secondary h-[calc(100%-5%)] p-0.5"
-  >
-    <!-- <p class="text-text-primary">
-      zeko@first-command<span class="text-text">:~$</span>
-    </p> -->
-  </div>
+  ></div>
 </template>
 <script setup>
 import { Terminal } from 'xterm'
 import { FitAddon } from 'xterm-addon-fit'
-import { AttachAddon } from 'xterm-addon-attach'
+// import { AttachAddon } from 'xterm-addon-attach'
 import 'xterm/css/xterm.css'
 import { io } from 'socket.io-client'
-// import connect from 'server/src/client'
-
 import { onMounted, ref } from 'vue'
 
 const rows = ref(40)
@@ -66,34 +60,12 @@ onMounted(() => {
   term.onData((key) => {
     console.log(key)
     socket.send(key)
-    if (key.length > 1) term.write(key)
-    if (key == '\r') {
-      // term.write('\n')
-      term.write('\r\n\x1b[33mLinux Odyssey$\x1b[0m ')
-    }
   })
   term.open(terminal.value)
   const fitAddon = new FitAddon()
   term.loadAddon(fitAddon)
   fitAddon.fit()
   term.writeln('Welcome to \x1b[1;32mLinux Odyssey\x1b[0m!')
-  term.onKey((e) => {
-    const printable =
-      !e.domEvent.altKey &&
-      !e.domEvent.altGraphKey &&
-      !e.domEvent.ctrlKey &&
-      !e.domEvent.metaKeys
-    if (e.domEvent.keyCode === 8) {
-      // back 删除的情况
-      if (term.xcore.buffer.x > 2) {
-        term.write('\b \b')
-      }
-    } else if (printable) {
-      term.write(e.key)
-    }
-    console.log(1, 'print', e.key)
-  })
-
   function resizeScreen() {
     try {
       // 窗口大小改变时，触发xterm的resize方法使自适应

From 7fa5ab5bc6b4a8c564198552fd6a256bb7438dc9 Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Thu, 3 Aug 2023 18:04:22 +0800
Subject: [PATCH 10/17] Create a pty cli, not useful

---
 packages/cli/index.js | 50 +++++++++++++++++++++++++++++++++++++++++++
 yarn.lock             |  7 ++++++
 2 files changed, 57 insertions(+)
 create mode 100644 packages/cli/index.js

diff --git a/packages/cli/index.js b/packages/cli/index.js
new file mode 100644
index 0000000..1e87ff1
--- /dev/null
+++ b/packages/cli/index.js
@@ -0,0 +1,50 @@
+import { stdin, stdout, exit } from 'process'
+import os from 'os'
+import pty from 'node-pty'
+
+stdin.setRawMode(true)
+stdin.resume()
+stdin.setEncoding('utf8')
+
+// Create a new pseudoterminal
+const shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash'
+const ptyProcess = pty.spawn(shell, [], {
+  name: 'xterm-color',
+  cols: 80,
+  rows: 30,
+  cwd: process.env.HOME,
+  env: process.env,
+})
+
+// Listen for output data
+ptyProcess.on('data', function (data) {
+  // Intercept and process the output here
+  stdout.write(data)
+})
+
+// Write a command to the pseudoterminal
+ptyProcess.write('ls\r')
+
+let commandBuffer = ''
+
+stdin.on('data', (key) => {
+  if (key === '\u0004') {
+    exit()
+  } else if (key === '\r') {
+    // User pressed enter, log and execute the command
+    console.log('User command: ', commandBuffer)
+    commandBuffer = ''
+  } else if (key === '\u007F') {
+    // User pressed backspace, remove the last character from the buffer
+    commandBuffer = commandBuffer.slice(0, -1)
+  } else {
+    // Add the typed character to the command buffer
+    commandBuffer += key
+  }
+  ptyProcess.write(key)
+})
+
+// Listen for exit event
+ptyProcess.on('exit', function (exitCode) {
+  console.log('Process exited with code: ', exitCode)
+})
diff --git a/yarn.lock b/yarn.lock
index e7d8450..9f1b4b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3612,6 +3612,13 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
+node-pty@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.0.0.tgz#7daafc0aca1c4ca3de15c61330373af4af5861fd"
+  integrity sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==
+  dependencies:
+    nan "^2.17.0"
+
 node-releases@^2.0.12:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"

From 9b5b5571ef0f3c7a7b2aac29f687babb7ef37e47 Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Mon, 14 Aug 2023 20:40:30 +0800
Subject: [PATCH 11/17] try to manage session

---
 app/src/components/TerminalPart.vue | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 33f1ef9..b25ded3 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -14,6 +14,7 @@ import { FitAddon } from 'xterm-addon-fit'
 import 'xterm/css/xterm.css'
 import { io } from 'socket.io-client'
 import { onMounted, ref } from 'vue'
+import api from '../utils/api'
 
 const rows = ref(40)
 const cols = ref(100)
@@ -37,13 +38,14 @@ onMounted(() => {
     },
   })
   const host = 'wss://odyssey.wancat.cc'
+  const sessionhost = 'http://odyssey.wancat.cc'
   // const host = 'ws://localhost:3000'
   const socket = io(host, {
     query: {
       // session_id: sessionId,
-      session_id: '64d26a8cffab987b2bb0de38',
+      // session_id: '64d26a8cffab987b2bb0de38',
       // odyssey
-      // session_id: '64d271ce784daf755387ff4f',
+      session_id: '64d271ce784daf755387ff4f',
       // localhost
     },
   })
@@ -56,6 +58,27 @@ onMounted(() => {
   socket.on('message', (message) => {
     console.log(message)
     term.write(message)
+    const session =
+    // api.get('') ||
+    // (program.opts().create ? (await createdSession())._id : null) ||
+    // (await lastSession())._id
+    // if (message == 'Session not found.') {
+    //   term.write('\nSession undefined')
+    //   console.log('Creating a new session...')
+    //   const res = fetch(`${sessionhost}/api/v1/sessions`, {
+    //     method: 'POST',
+    //     headers: {
+    //       'Content-Type': 'application/json',
+    //     },
+    //     body: JSON.stringify({
+    //       questid: 'helloworld',
+    //     }),
+      // })
+      // const data = res.json()
+      console.log(res)
+      // console.log(data)
+      // console.log('Created Session ID:', data.id)
+    }
   })
   term.onData((key) => {
     console.log(key)

From 5326fb30b4132850f2ad258af1280f1cd006b7c7 Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Wed, 16 Aug 2023 20:47:50 +0800
Subject: [PATCH 12/17] try: manage session

---
 app/src/components/TerminalPart.vue | 52 ++++++++++++++---------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index b25ded3..9187d7a 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -10,11 +10,10 @@
 <script setup>
 import { Terminal } from 'xterm'
 import { FitAddon } from 'xterm-addon-fit'
-// import { AttachAddon } from 'xterm-addon-attach'
 import 'xterm/css/xterm.css'
 import { io } from 'socket.io-client'
 import { onMounted, ref } from 'vue'
-import api from '../utils/api'
+// import api from '../utils/api'
 
 const rows = ref(40)
 const cols = ref(100)
@@ -40,15 +39,35 @@ onMounted(() => {
   const host = 'wss://odyssey.wancat.cc'
   const sessionhost = 'http://odyssey.wancat.cc'
   // const host = 'ws://localhost:3000'
+  // const sessions = async () => {
+  //   await api.get(`/sessions`).json()
+  // }
+  // console.log(sessions)
+  const res = async () => {
+    await fetch(`${sessionhost}/api/v1/sessions`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        quest_id: 'helloworld',
+      }),
+    })
+  }
+  const data = async () => {
+    await res.json()
+  }
+  const sessionId = data._id
+  // async () => {}
+  // console.log(api.get('/quests/helloworld').session)
+  // console.log(await sessions[sessions.length - 1].id)
   const socket = io(host, {
     query: {
-      // session_id: sessionId,
-      // session_id: '64d26a8cffab987b2bb0de38',
-      // odyssey
-      session_id: '64d271ce784daf755387ff4f',
-      // localhost
+      session_id: sessionId,
+      // session_id: '64c1164a5b34af580963da6b',
     },
   })
+  // console.log(sessionId)
   socket.on('connect', function open() {
     console.log('Connected to the server.')
   })
@@ -58,27 +77,8 @@ onMounted(() => {
   socket.on('message', (message) => {
     console.log(message)
     term.write(message)
-    const session =
-    // api.get('') ||
     // (program.opts().create ? (await createdSession())._id : null) ||
     // (await lastSession())._id
-    // if (message == 'Session not found.') {
-    //   term.write('\nSession undefined')
-    //   console.log('Creating a new session...')
-    //   const res = fetch(`${sessionhost}/api/v1/sessions`, {
-    //     method: 'POST',
-    //     headers: {
-    //       'Content-Type': 'application/json',
-    //     },
-    //     body: JSON.stringify({
-    //       questid: 'helloworld',
-    //     }),
-      // })
-      // const data = res.json()
-      console.log(res)
-      // console.log(data)
-      // console.log('Created Session ID:', data.id)
-    }
   })
   term.onData((key) => {
     console.log(key)

From e122800c81e2cd1b5f6203826c7a2978ff7d5a46 Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Thu, 17 Aug 2023 20:21:32 +0800
Subject: [PATCH 13/17] feat: add sessionManagerto connect session

---
 .eslintrc.js                        |  1 +
 app/src/components/TerminalPart.vue | 36 +++++----------------
 app/src/utils/session.js            | 43 +++++++++++++++++++++++++
 packages/cli/index.js               | 50 -----------------------------
 yarn.lock                           |  7 ----
 5 files changed, 52 insertions(+), 85 deletions(-)
 create mode 100644 app/src/utils/session.js
 delete mode 100644 packages/cli/index.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 7d9e2c6..f438449 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -21,5 +21,6 @@ module.exports = {
     'import/extensions': 'off',
     camelcase: ['error', { properties: 'never', ignoreDestructuring: true }],
     'no-param-reassign': ['error', { props: false }],
+    'no-underscore-dangle': ['error', { allow: ['_id'] }],
   },
 }
diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 9187d7a..9b92dc6 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -13,13 +13,13 @@ import { FitAddon } from 'xterm-addon-fit'
 import 'xterm/css/xterm.css'
 import { io } from 'socket.io-client'
 import { onMounted, ref } from 'vue'
-// import api from '../utils/api'
+import sessionManager from '../utils/session'
 
 const rows = ref(40)
 const cols = ref(100)
 const terminal = ref(null)
 
-onMounted(() => {
+onMounted(async () => {
   const term = new Terminal({
     rendererType: 'canvas', // 渲染类型
     rows: rows.value, // 行数
@@ -36,35 +36,15 @@ onMounted(() => {
       lineHeight: 20,
     },
   })
+
+  const session = await sessionManager.latestOrCreate()
   const host = 'wss://odyssey.wancat.cc'
-  const sessionhost = 'http://odyssey.wancat.cc'
-  // const host = 'ws://localhost:3000'
-  // const sessions = async () => {
-  //   await api.get(`/sessions`).json()
-  // }
-  // console.log(sessions)
-  const res = async () => {
-    await fetch(`${sessionhost}/api/v1/sessions`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        quest_id: 'helloworld',
-      }),
-    })
-  }
-  const data = async () => {
-    await res.json()
-  }
-  const sessionId = data._id
-  // async () => {}
-  // console.log(api.get('/quests/helloworld').session)
-  // console.log(await sessions[sessions.length - 1].id)
+
+  console.log(session)
+
   const socket = io(host, {
     query: {
-      session_id: sessionId,
-      // session_id: '64c1164a5b34af580963da6b',
+      session_id: session._id,
     },
   })
   // console.log(sessionId)
diff --git a/app/src/utils/session.js b/app/src/utils/session.js
new file mode 100644
index 0000000..73200e2
--- /dev/null
+++ b/app/src/utils/session.js
@@ -0,0 +1,43 @@
+import api from './api'
+
+class SessionManager {
+  constructor(questId) {
+    this.questId = questId
+  }
+
+  async createdSession() {
+    console.log('Creating a new session...')
+    const res = await api.post('/sessions', { quest_id: this.questId })
+    const { data } = res
+    console.log('Created Session ID:', data._id)
+    return data
+  }
+
+  async getSessionList() {
+    const res = await api.get('/sessions', {
+      params: { quest_id: this.questId },
+    })
+    const { data } = res
+    return data
+  }
+
+  async lastSession() {
+    const sessions = await this.getSessionList()
+    if (sessions.length === 0) {
+      return null
+    }
+    const session = sessions[sessions.length - 1]
+    console.log(
+      `Last Session ID: ${session._id}, Quest: ${session.quest}, Created At: ${session.createdAt}`
+    )
+    return session
+  }
+
+  async latestOrCreate() {
+    return (await this.lastSession()) || this.createdSession()
+  }
+}
+
+const sessionManager = new SessionManager('helloworld')
+
+export default sessionManager
diff --git a/packages/cli/index.js b/packages/cli/index.js
deleted file mode 100644
index 1e87ff1..0000000
--- a/packages/cli/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { stdin, stdout, exit } from 'process'
-import os from 'os'
-import pty from 'node-pty'
-
-stdin.setRawMode(true)
-stdin.resume()
-stdin.setEncoding('utf8')
-
-// Create a new pseudoterminal
-const shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash'
-const ptyProcess = pty.spawn(shell, [], {
-  name: 'xterm-color',
-  cols: 80,
-  rows: 30,
-  cwd: process.env.HOME,
-  env: process.env,
-})
-
-// Listen for output data
-ptyProcess.on('data', function (data) {
-  // Intercept and process the output here
-  stdout.write(data)
-})
-
-// Write a command to the pseudoterminal
-ptyProcess.write('ls\r')
-
-let commandBuffer = ''
-
-stdin.on('data', (key) => {
-  if (key === '\u0004') {
-    exit()
-  } else if (key === '\r') {
-    // User pressed enter, log and execute the command
-    console.log('User command: ', commandBuffer)
-    commandBuffer = ''
-  } else if (key === '\u007F') {
-    // User pressed backspace, remove the last character from the buffer
-    commandBuffer = commandBuffer.slice(0, -1)
-  } else {
-    // Add the typed character to the command buffer
-    commandBuffer += key
-  }
-  ptyProcess.write(key)
-})
-
-// Listen for exit event
-ptyProcess.on('exit', function (exitCode) {
-  console.log('Process exited with code: ', exitCode)
-})
diff --git a/yarn.lock b/yarn.lock
index 9f1b4b7..e7d8450 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3612,13 +3612,6 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-pty@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.0.0.tgz#7daafc0aca1c4ca3de15c61330373af4af5861fd"
-  integrity sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==
-  dependencies:
-    nan "^2.17.0"
-
 node-releases@^2.0.12:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"

From 313d30edda4ee7f3f75b3a24adf5609e1ce13062 Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Thu, 17 Aug 2023 21:17:48 +0800
Subject: [PATCH 14/17] feat: add reset function

---
 app/src/App.vue                       | 27 +--------
 app/src/components/ControlPalette.vue | 38 ++++++++++++
 app/src/components/TerminalPart.vue   | 85 ++++++++++++++++-----------
 app/src/utils/session.js              | 24 ++++++--
 4 files changed, 108 insertions(+), 66 deletions(-)
 create mode 100644 app/src/components/ControlPalette.vue

diff --git a/app/src/App.vue b/app/src/App.vue
index 12a0ac6..f577126 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -6,6 +6,7 @@ import HintPart from './components/HintPart.vue'
 import QuestPart from './components/QuestPart.vue'
 import TerminalPart from './components/TerminalPart.vue'
 import VisualizationPart from './components/VisualizationPart.vue'
+import ControlPalette from './components/ControlPalette.vue'
 </script>
 
 <template>
@@ -44,31 +45,7 @@ import VisualizationPart from './components/VisualizationPart.vue'
             </section>
           </div>
         </div>
-        <section
-          class="h-[10%] p-3 grid grid-cols-3 gap-4 place-content-between"
-        >
-          <button id="solution" class="bg-background-secondary rounded-lg p-2">
-            <font-awesome-icon
-              :icon="['far', 'circle-question']"
-              class="text-text-primary"
-            />
-            <p class="text-text-primary inline">Solution</p>
-          </button>
-          <button id="reset" class="bg-background-secondary rounded-lg p-2">
-            <font-awesome-icon
-              :icon="['fas', 'arrow-rotate-left']"
-              class="text-text-primary"
-            />
-            <p class="text-text-primary inline">Reset</p>
-          </button>
-          <button id="continue" class="bg-disabled-background rounded-lg p-2">
-            <font-awesome-icon
-              :icon="['far', 'circle-right']"
-              class="text-disabled-text"
-            />
-            <p class="text-disabled-text inline">Continue</p>
-          </button>
-        </section>
+        <ControlPalette />
       </div>
     </div>
   </div>
diff --git a/app/src/components/ControlPalette.vue b/app/src/components/ControlPalette.vue
new file mode 100644
index 0000000..018c258
--- /dev/null
+++ b/app/src/components/ControlPalette.vue
@@ -0,0 +1,38 @@
+<template>
+  <section class="h-[10%] p-3 grid grid-cols-3 gap-4 place-content-between">
+    <button id="solution" class="bg-background-secondary rounded-lg p-2">
+      <font-awesome-icon
+        :icon="['far', 'circle-question']"
+        class="text-text-primary"
+      />
+      <p class="text-text-primary inline">Solution</p>
+    </button>
+    <button
+      id="reset"
+      class="bg-background-secondary rounded-lg p-2"
+      @click="reset"
+    >
+      <font-awesome-icon
+        :icon="['fas', 'arrow-rotate-left']"
+        class="text-text-primary"
+      />
+      <p class="text-text-primary inline">Reset</p>
+    </button>
+    <button id="continue" class="bg-disabled-background rounded-lg p-2">
+      <font-awesome-icon
+        :icon="['far', 'circle-right']"
+        class="text-disabled-text"
+      />
+      <p class="text-disabled-text inline">Continue</p>
+    </button>
+  </section>
+</template>
+
+<script setup>
+import sessionManager from '../utils/session'
+
+const reset = async () => {
+  console.log('resetting...')
+  await sessionManager.createSession()
+}
+</script>
diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 9b92dc6..6107495 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -12,32 +12,62 @@ import { Terminal } from 'xterm'
 import { FitAddon } from 'xterm-addon-fit'
 import 'xterm/css/xterm.css'
 import { io } from 'socket.io-client'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import sessionManager from '../utils/session'
 
 const rows = ref(40)
 const cols = ref(100)
 const terminal = ref(null)
 
-onMounted(async () => {
-  const term = new Terminal({
-    rendererType: 'canvas', // 渲染类型
-    rows: rows.value, // 行数
-    cols: cols.value, // 不指定行数，自动回车后光标从下一行开始
-    convertEol: true, // 启用时，光标将设置为下一行的开头
-    // scrollback: 50, //终端中的回滚量
-    disableStdin: false, // 是否应禁用输入
-    // cursorStyle: "underline", //光标样式
-    cursorBlink: true, // 光标闪烁
-    theme: {
-      foreground: '#ECECEC', // 字体
-      background: '#000000', // 背景色
-      cursor: 'help', // 设置光标
-      lineHeight: 20,
-    },
-  })
+const term = new Terminal({
+  rendererType: 'canvas', // 渲染类型
+  rows: rows.value, // 行数
+  cols: cols.value, // 不指定行数，自动回车后光标从下一行开始
+  convertEol: true, // 启用时，光标将设置为下一行的开头
+  // scrollback: 50, //终端中的回滚量
+  disableStdin: false, // 是否应禁用输入
+  // cursorStyle: "underline", //光标样式
+  cursorBlink: true, // 光标闪烁
+  theme: {
+    foreground: '#ECECEC', // 字体
+    background: '#000000', // 背景色
+    cursor: 'help', // 设置光标
+    lineHeight: 20,
+  },
+})
 
-  const session = await sessionManager.latestOrCreate()
+const fitAddon = new FitAddon()
+term.loadAddon(fitAddon)
+fitAddon.fit()
+term.writeln('Welcome to \x1b[1;32mLinux Odyssey\x1b[0m!')
+
+function resizeScreen() {
+  try {
+    // 窗口大小改变时，触发xterm的resize方法使自适应
+    fitAddon.fit()
+  } catch (e) {
+    console.log('e', e.message)
+  }
+}
+window.addEventListener('resize', resizeScreen)
+
+onMounted(() => {
+  term.open(terminal.value)
+  term.focus()
+  resizeScreen()
+})
+
+let currentSocket = null
+
+watch(sessionManager.session, async (session) => {
+  if (!session) {
+    return
+  }
+  if (currentSocket) {
+    term.clear()
+    currentSocket.disconnect()
+    currentSocket.off()
+  }
   const host = 'wss://odyssey.wancat.cc'
 
   console.log(session)
@@ -47,6 +77,7 @@ onMounted(async () => {
       session_id: session._id,
     },
   })
+  currentSocket = socket
   // console.log(sessionId)
   socket.on('connect', function open() {
     console.log('Connected to the server.')
@@ -55,28 +86,12 @@ onMounted(async () => {
     console.log('Disconnected from the server.')
   })
   socket.on('message', (message) => {
-    console.log(message)
     term.write(message)
     // (program.opts().create ? (await createdSession())._id : null) ||
     // (await lastSession())._id
   })
   term.onData((key) => {
-    console.log(key)
     socket.send(key)
   })
-  term.open(terminal.value)
-  const fitAddon = new FitAddon()
-  term.loadAddon(fitAddon)
-  fitAddon.fit()
-  term.writeln('Welcome to \x1b[1;32mLinux Odyssey\x1b[0m!')
-  function resizeScreen() {
-    try {
-      // 窗口大小改变时，触发xterm的resize方法使自适应
-      fitAddon.fit()
-    } catch (e) {
-      console.log('e', e.message)
-    }
-  }
-  window.addEventListener('resize', resizeScreen)
 })
 </script>
diff --git a/app/src/utils/session.js b/app/src/utils/session.js
index 73200e2..0f28d45 100644
--- a/app/src/utils/session.js
+++ b/app/src/utils/session.js
@@ -1,16 +1,23 @@
+import { ref } from 'vue'
 import api from './api'
 
 class SessionManager {
   constructor(questId) {
     this.questId = questId
+    this.session = ref(null)
   }
 
-  async createdSession() {
+  setSession(session) {
+    console.log('Update session:', session)
+    this.session.value = session
+  }
+
+  async createSession() {
     console.log('Creating a new session...')
     const res = await api.post('/sessions', { quest_id: this.questId })
     const { data } = res
     console.log('Created Session ID:', data._id)
-    return data
+    this.setSession(data)
   }
 
   async getSessionList() {
@@ -24,20 +31,25 @@ class SessionManager {
   async lastSession() {
     const sessions = await this.getSessionList()
     if (sessions.length === 0) {
-      return null
+      return
     }
     const session = sessions[sessions.length - 1]
     console.log(
       `Last Session ID: ${session._id}, Quest: ${session.quest}, Created At: ${session.createdAt}`
     )
-    return session
+    this.setSession(session)
   }
 
-  async latestOrCreate() {
-    return (await this.lastSession()) || this.createdSession()
+  async lastOrCreate() {
+    await this.lastSession()
+    if (!this.session.value) {
+      await this.createSession()
+    }
   }
 }
 
 const sessionManager = new SessionManager('helloworld')
 
+sessionManager.lastOrCreate().catch(console.error)
+
 export default sessionManager

From 5d9951a3a2a81cb1471164b8bc7ac1200cb7e520 Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Fri, 18 Aug 2023 21:14:31 +0800
Subject: [PATCH 15/17] refactor: use SocketWrapper to wrap the instance

---
 app/src/App.vue                       | 15 +++++++-
 app/src/components/ControlPalette.vue |  2 ++
 app/src/components/TerminalPart.vue   | 38 ++------------------
 app/src/utils/session.js              |  6 ++--
 app/src/utils/socket.js               | 52 +++++++++++++++++++++++++++
 5 files changed, 75 insertions(+), 38 deletions(-)
 create mode 100644 app/src/utils/socket.js

diff --git a/app/src/App.vue b/app/src/App.vue
index f577126..58f4090 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -1,5 +1,5 @@
 <script setup>
-// Import components
+import { onMounted } from 'vue'
 import CommandlistPart from './components/CommandlistPart.vue'
 import HeaderPart from './components/HeaderPart.vue'
 import HintPart from './components/HintPart.vue'
@@ -7,6 +7,19 @@ import QuestPart from './components/QuestPart.vue'
 import TerminalPart from './components/TerminalPart.vue'
 import VisualizationPart from './components/VisualizationPart.vue'
 import ControlPalette from './components/ControlPalette.vue'
+import socket from './utils/socket'
+import sessionManager from './utils/session'
+
+onMounted(async () => {
+  await sessionManager.lastOrCreate()
+  socket.connect(sessionManager.getSession())
+  socket.on('connect', function open() {
+    console.log('Connected to the server.')
+  })
+  socket.on('disconnect', function close() {
+    console.log('Disconnected from the server.')
+  })
+})
 </script>
 
 <template>
diff --git a/app/src/components/ControlPalette.vue b/app/src/components/ControlPalette.vue
index 018c258..0894bad 100644
--- a/app/src/components/ControlPalette.vue
+++ b/app/src/components/ControlPalette.vue
@@ -30,9 +30,11 @@
 
 <script setup>
 import sessionManager from '../utils/session'
+import socket from '../utils/socket'
 
 const reset = async () => {
   console.log('resetting...')
   await sessionManager.createSession()
+  socket.connect(sessionManager.getSession())
 }
 </script>
diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 6107495..2b61bf5 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -7,13 +7,13 @@
     class="bg-background-secondary h-[calc(100%-5%)] p-0.5"
   ></div>
 </template>
+
 <script setup>
 import { Terminal } from 'xterm'
 import { FitAddon } from 'xterm-addon-fit'
 import 'xterm/css/xterm.css'
-import { io } from 'socket.io-client'
-import { onMounted, ref, watch } from 'vue'
-import sessionManager from '../utils/session'
+import { onMounted, ref } from 'vue'
+import socket from '../utils/socket'
 
 const rows = ref(40)
 const cols = ref(100)
@@ -55,40 +55,8 @@ onMounted(() => {
   term.open(terminal.value)
   term.focus()
   resizeScreen()
-})
-
-let currentSocket = null
-
-watch(sessionManager.session, async (session) => {
-  if (!session) {
-    return
-  }
-  if (currentSocket) {
-    term.clear()
-    currentSocket.disconnect()
-    currentSocket.off()
-  }
-  const host = 'wss://odyssey.wancat.cc'
-
-  console.log(session)
-
-  const socket = io(host, {
-    query: {
-      session_id: session._id,
-    },
-  })
-  currentSocket = socket
-  // console.log(sessionId)
-  socket.on('connect', function open() {
-    console.log('Connected to the server.')
-  })
-  socket.on('disconnect', function close() {
-    console.log('Disconnected from the server.')
-  })
   socket.on('message', (message) => {
     term.write(message)
-    // (program.opts().create ? (await createdSession())._id : null) ||
-    // (await lastSession())._id
   })
   term.onData((key) => {
     socket.send(key)
diff --git a/app/src/utils/session.js b/app/src/utils/session.js
index 0f28d45..80ab25c 100644
--- a/app/src/utils/session.js
+++ b/app/src/utils/session.js
@@ -7,6 +7,10 @@ class SessionManager {
     this.session = ref(null)
   }
 
+  getSession() {
+    return this.session.value
+  }
+
   setSession(session) {
     console.log('Update session:', session)
     this.session.value = session
@@ -50,6 +54,4 @@ class SessionManager {
 
 const sessionManager = new SessionManager('helloworld')
 
-sessionManager.lastOrCreate().catch(console.error)
-
 export default sessionManager
diff --git a/app/src/utils/socket.js b/app/src/utils/socket.js
new file mode 100644
index 0000000..5dc446c
--- /dev/null
+++ b/app/src/utils/socket.js
@@ -0,0 +1,52 @@
+import io from 'socket.io-client'
+
+const host = 'wss://odyssey.wancat.cc'
+
+class SocketWrapper {
+  constructor() {
+    this.socket = null
+    this.listeners = []
+  }
+
+  connect(session) {
+    if (this.socket) {
+      this.socket.off()
+      this.socket.disconnect()
+    }
+
+    this.socket = io(host, {
+      query: {
+        session_id: session._id,
+      },
+    })
+
+    this.socket.on('connect', () => {
+      console.log('Socket connected to session', session._id)
+    })
+
+    this.reconnect()
+  }
+
+  on(event, callback) {
+    this.listeners.push({ event, callback })
+    if (this.socket) {
+      this.socket.on(event, callback)
+    }
+  }
+
+  reconnect() {
+    this.listeners.forEach(({ event, callback }) => {
+      this.socket.on(event, callback)
+    })
+  }
+
+  send(data) {
+    this.socket.send(data)
+  }
+
+  emit(event, data) {
+    this.socket.emit(event, data)
+  }
+}
+
+export default new SocketWrapper()

From 4efce2c6b82350bf4f753a57477c440f1135b6c6 Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Mon, 21 Aug 2023 20:27:44 +0800
Subject: [PATCH 16/17] fix: remove cors

---
 server/package.json      | 1 -
 server/src/api/socket.js | 6 +-----
 server/src/index.js      | 6 ------
 yarn.lock                | 2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/server/package.json b/server/package.json
index 5d5bab5..6a40895 100644
--- a/server/package.json
+++ b/server/package.json
@@ -11,7 +11,6 @@
   },
   "dependencies": {
     "commander": "^11.0.0",
-    "cors": "^2.8.5",
     "dockerode": "^3.3.5",
     "express": "^4.18.2",
     "jsonwebtoken": "^9.0.1",
diff --git a/server/src/api/socket.js b/server/src/api/socket.js
index a7df255..d1f33e5 100644
--- a/server/src/api/socket.js
+++ b/server/src/api/socket.js
@@ -4,11 +4,7 @@ import Session from '../models/session.js'
 import { defaultUser, genSessionJWT } from '../utils/auth.js'
 
 export default (server) => {
-  const io = new Server(server, {
-    cors: {
-      origin: '*',
-    },
-  })
+  const io = new Server(server)
 
   io.use(async (socket, next) => {
     console.log('Authenticating...')
diff --git a/server/src/index.js b/server/src/index.js
index b63400d..4b5ad47 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -3,7 +3,6 @@ import express from 'express'
 import http from 'http'
 import YAML from 'yaml'
 import swaggerUI from 'swagger-ui-express'
-import cors from 'cors'
 
 import socketServer from './api/socket.js'
 import connectDB from './db.js'
@@ -23,11 +22,6 @@ async function main() {
   const swaggerDocument = YAML.parse(file)
   app.use('/api-docs', swaggerUI.serve, swaggerUI.setup(swaggerDocument))
   app.use(express.json())
-  app.use(
-    cors({
-      origin: '*',
-    })
-  )
 
   app.get('/', (req, res) => {
     res.send('Hello World!')
diff --git a/yarn.lock b/yarn.lock
index e7d8450..47e89d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1602,7 +1602,7 @@ cookie@~0.4.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
-cors@^2.8.5, cors@~2.8.5:
+cors@~2.8.5:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
   integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==

From ed9b584093b1cf5da2882e3b9e72e3fe0670af84 Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Mon, 21 Aug 2023 20:34:41 +0800
Subject: [PATCH 17/17] fix: rename "reconnect" to "bindListeners"

---
 app/src/utils/socket.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/utils/socket.js b/app/src/utils/socket.js
index 5dc446c..96c66e3 100644
--- a/app/src/utils/socket.js
+++ b/app/src/utils/socket.js
@@ -24,7 +24,7 @@ class SocketWrapper {
       console.log('Socket connected to session', session._id)
     })
 
-    this.reconnect()
+    this.bindListeners()
   }
 
   on(event, callback) {
@@ -34,7 +34,7 @@ class SocketWrapper {
     }
   }
 
-  reconnect() {
+  bindListeners() {
     this.listeners.forEach(({ event, callback }) => {
       this.socket.on(event, callback)
     })