fix: write echo start on starting

This commit is contained in:
Justin Lin committed 2025-05-05 19:55:40 +08:00
1 parent 156abc044a
commit 2f7845e63e
3 files changed
+14 -9

No files matched your search

+3 -3
View File
@@ -53,10 +53,10 @@ const useSession = defineStore('session', {
containerName: session.containerName || '',
}
term.reset()
term.connect(
await socket.connect(this.session)
await term.connect(
`/terminal/${session.containerName}/ws?token=${session.token}`
)
await socket.connect(this.session)
term.focus()
},
async createSession() {
@@ -64,7 +64,7 @@ const useSession = defineStore('session', {
questId: this.questId,
})
await this.setSession(session)
socket.emit('terminal', 'echo start\n')
term.send('echo start\n')
},
async getActiveSession() {
const session = await trpc.session.getActiveSession.query({
+1 -3
View File
@@ -23,11 +23,9 @@ class SocketWrapper {
this.socket.on('connect', () => {
console.log('Socket connected to session', session._id)
})
this.socket.once('terminal', () => {
resolve()
})
this.socket.on('connect_error', reject)
this.bindListeners()
})
+10 -3
View File
@@ -28,17 +28,20 @@ class SocketTerminal {
})
}
connect(url: string): void {
connect(url: string): Promise<void> {
return new Promise((resolve, reject) => {
console.log('Connecting to terminal', url)
this.socket = new ReconnectingWebSocket(url)
this.socket.onopen = () => {
console.log('Connected to terminal')
this.term.write('\r\n\x1B[1;32mConnected to terminal\x1B[0m\r\n')
resolve()
}
this.socket.onclose = () => {
console.log('Disconnected from terminal')
this.term.write('\r\n\x1B[1;31mDisconnected from terminal\x1B[0m\r\n')
reject(new Error('Disconnected from terminal'))
}
this.socket.onerror = (error) => {
@@ -46,6 +49,7 @@ class SocketTerminal {
this.term.write(
`\r\n\x1B[1;31mWebSocket error: ${'message' in error ? error.message : ''}\x1B[0m\r\n`
)
reject(error)
}
this.socket.onmessage = (event) => {
console.log('Received message from terminal')
@@ -55,6 +59,7 @@ class SocketTerminal {
: new TextDecoder().decode(event.data)
this.term.write(data)
}
})
}
resizeScreen(): void {
@@ -70,8 +75,10 @@ class SocketTerminal {
this.resizeScreen()
}
write(message: string): void {
this.term.write(message)
send(message: string): void {
if (this.socket) {
this.socket.send(message)
}
}
focus(): void {