GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-16 01:19:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref(connectable tab) on session destroyed

Browse Source
This commit is contained in:
Clem Fern 2023-05-12 19:39:44 +02:00
parent 2b5976f202
commit 312b365851
5 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tabby-serial/src/components/serialTab.component.ts
View File

@ -83,21 +83,18 @@ export class SerialTabComponent extends ConnectableTerminalTabComponent<SerialPr
this.write(`\r\n${colors.black.bgWhite(' Serial ')} ${msg}\r\n`) this.write(`\r\n${colors.black.bgWhite(' Serial ')} ${msg}\r\n`)
this.session?.resize(this.size.columns, this.size.rows) this.session?.resize(this.size.columns, this.size.rows)
}) })
this.attachSessionHandler(this.session!.destroyed$, () => {
if (this.frontend) {
// Session was closed abruptly
this.write('\r\n' + colors.black.bgWhite(' SERIAL ') + ` session closed\r\n`)
if (this.profile.behaviorOnSessionEnd === 'reconnect') {
this.reconnect()
} else if (this.profile.behaviorOnSessionEnd === 'keep' || this.profile.behaviorOnSessionEnd === 'auto' && !this.isSessionExplicitlyTerminated()) {
this.offerReconnection()
}
}
})
super.attachSessionHandlers() super.attachSessionHandlers()
} }
protected onSessionDestroyed() {
if (this.frontend) {
// Session was closed abruptly
this.write('\r\n' + colors.black.bgWhite(' SERIAL ') + ` session closed\r\n`)
super.onSessionDestroyed()
}
}
async getRecoveryToken (options?: GetRecoveryTokenOptions): Promise<any> { async getRecoveryToken (options?: GetRecoveryTokenOptions): Promise<any> {
return { return {
type: 'app:serial-tab', type: 'app:serial-tab',

20
tabby-ssh/src/components/sshTab.component.ts
View File

@ -148,21 +148,13 @@ export class SSHTabComponent extends ConnectableTerminalTabComponent<SSHProfile>
return session return session
} }
protected attachSessionHandlers (): void { protected onSessionDestroyed() {
const session = this.session! if (this.frontend) {
this.attachSessionHandler(session.destroyed$, () => { // Session was closed abruptly
if (this.frontend) { this.write('\r\n' + colors.black.bgWhite(' SSH ') + ` ${this.sshSession?.profile.options.host}: session closed\r\n`)
// Session was closed abruptly
this.write('\r\n' + colors.black.bgWhite(' SSH ') + ` ${this.sshSession?.profile.options.host}: session closed\r\n`)
if (this.profile.behaviorOnSessionEnd === 'reconnect') { super.onSessionDestroyed()
this.reconnect() }
} else if (this.profile.behaviorOnSessionEnd === 'keep' || this.profile.behaviorOnSessionEnd === 'auto' && !this.isSessionExplicitlyTerminated()) {
this.offerReconnection()
}
}
})
super.attachSessionHandlers()
} }
private async initializeSessionMaybeMultiplex (multiplex = true): Promise<void> { private async initializeSessionMaybeMultiplex (multiplex = true): Promise<void> {

20
tabby-telnet/src/components/telnetTab.component.ts
View File

@ -42,21 +42,13 @@ export class TelnetTabComponent extends ConnectableTerminalTabComponent<TelnetPr
super.onFrontendReady() super.onFrontendReady()
} }
protected attachSessionHandlers (): void { protected onSessionDestroyed() {
const session = this.session! if (this.frontend) {
this.attachSessionHandler(session.destroyed$, () => { // Session was closed abruptly
if (this.frontend) { this.write('\r\n' + colors.black.bgWhite(' TELNET ') + ` ${this.session?.profile.options.host}: session closed\r\n`)
// Session was closed abruptly
this.write('\r\n' + colors.black.bgWhite(' TELNET ') + ` ${this.session?.profile.options.host}: session closed\r\n`)
if (this.profile.behaviorOnSessionEnd === 'reconnect') { super.onSessionDestroyed()
this.reconnect() }
} else if (this.profile.behaviorOnSessionEnd === 'keep' || this.profile.behaviorOnSessionEnd === 'auto' && !this.isSessionExplicitlyTerminated()) {
this.offerReconnection()
}
}
})
super.attachSessionHandlers()
} }
async initializeSession (): Promise<void> { async initializeSession (): Promise<void> {

9
tabby-terminal/src/api/baseTerminalTab.component.ts
View File

@ -784,7 +784,7 @@ export class BaseTerminalTabComponent<P extends BaseTerminalProfile> extends Bas
}) })
this.attachSessionHandler(this.session.destroyed$, () => { this.attachSessionHandler(this.session.destroyed$, () => {
this.setSession(null) this.onSessionDestroyed()
}) })
this.attachSessionHandler(this.session.oscProcessor.copyRequested$, content => { this.attachSessionHandler(this.session.oscProcessor.copyRequested$, content => {
@ -793,6 +793,13 @@ export class BaseTerminalTabComponent<P extends BaseTerminalProfile> extends Bas
}) })
} }
/**
* Method called when session is destroyed. Set the session to null
*/
protected onSessionDestroyed() {
this.setSession(null)
}
protected detachSessionHandlers (): void { protected detachSessionHandlers (): void {
this.sessionHandlers.cancelAll() this.sessionHandlers.cancelAll()
} }

15
tabby-terminal/src/api/connectableTerminalTab.component.ts
View File

@ -32,6 +32,21 @@ export abstract class ConnectableTerminalTabComponent<P extends BaseTerminalProf
async initializeSession (): Promise<void> { async initializeSession (): Promise<void> {
this.reconnectOffered = false this.reconnectOffered = false
} }
/**
* Method called when session is destroyed. Handle the tab behavior on session end for connectable tab
*/
protected onSessionDestroyed() {
super.onSessionDestroyed()
if (this.frontend) {
if (this.profile.behaviorOnSessionEnd === 'reconnect') {
this.reconnect()
} else if (this.profile.behaviorOnSessionEnd === 'keep' || this.profile.behaviorOnSessionEnd === 'auto' && !this.isSessionExplicitlyTerminated()) {
this.offerReconnection()
}
}
}
/** /**
* Offering reconnection to the user if it hasn't been done yet. * Offering reconnection to the user if it hasn't been done yet.