mirror of
https://github.com/linux-odyssey/linux-odyssey.git
synced 2026-11-05 19:20:12 +08:00
fix: write echo start on starting
This commit is contained in:
1 parent
156abc044a
commit
2f7845e63e
3 files changed
+38
-33
No files matched your search
@@ -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({
|
||||
|
||||
@@ -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()
|
||||
})
|
||||
|
||||
+34
-27
@@ -28,33 +28,38 @@ class SocketTerminal {
|
||||
})
|
||||
}
|
||||
|
||||
connect(url: string): void {
|
||||
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')
|
||||
}
|
||||
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')
|
||||
}
|
||||
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) => {
|
||||
console.error('WebSocket error:', error)
|
||||
this.term.write(
|
||||
`\r\n\x1B[1;31mWebSocket error: ${'message' in error ? error.message : ''}\x1B[0m\r\n`
|
||||
)
|
||||
}
|
||||
this.socket.onmessage = (event) => {
|
||||
console.log('Received message from terminal')
|
||||
const data =
|
||||
typeof event.data === 'string'
|
||||
? event.data
|
||||
: new TextDecoder().decode(event.data)
|
||||
this.term.write(data)
|
||||
}
|
||||
this.socket.onerror = (error) => {
|
||||
console.error('WebSocket error:', error)
|
||||
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')
|
||||
const data =
|
||||
typeof event.data === 'string'
|
||||
? event.data
|
||||
: 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 {
|
||||
|
||||
Reference in new issue
Block a user