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

moved login scripts processing into tabby-terminal

Browse Source
This commit is contained in:
Eugene Pankov
2021-07-05 23:56:38 +02:00
parent 461cd2bec7
commit bf762cc4c7
16 changed files with 270 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tabby-telnet/src/components/telnetProfileSettings.component.pug
View File

@@ -1,16 +1,27 @@
.form-group
label Host
input.form-control(
type='text',
[(ngModel)]='profile.options.host',
)
ul.nav-tabs(ngbNav, #nav='ngbNav')
li(ngbNavItem)
a(ngbNavLink) General
ng-template(ngbNavContent)
.form-group
label Host
input.form-control(
type='text',
[(ngModel)]='profile.options.host',
)
.form-group
label Port
input.form-control(
type='number',
placeholder='22',
[(ngModel)]='profile.options.port',
)
.form-group
label Port
input.form-control(
type='number',
placeholder='22',
[(ngModel)]='profile.options.port',
)
stream-processing-settings([options]='profile.options')
stream-processing-settings([options]='profile.options')
li(ngbNavItem)
a(ngbNavLink) Login scripts
ng-template(ngbNavContent)
login-scripts-settings([options]='profile.options')
div([ngbNavOutlet]='nav')

4
tabby-telnet/src/profiles.ts
View File

@@ -20,7 +20,7 @@ export class TelnetProfilesService extends ProfileProvider {
options: {
host: '',
port: 23,
inputMode: 'local-echo',
inputMode: 'readline',
outputMode: null,
inputNewlines: null,
outputNewlines: 'crlf',
@@ -58,7 +58,7 @@ export class TelnetProfilesService extends ProfileProvider {
options: {
host,
port,
inputMode: 'local-echo',
inputMode: 'readline',
outputNewlines: 'crlf',
},
}

13
tabby-telnet/src/session.ts
View File

@@ -2,8 +2,8 @@ import { Socket } from 'net'
import colors from 'ansi-colors'
import stripAnsi from 'strip-ansi'
import { Injector } from '@angular/core'
import { Logger, Profile, LogService } from 'tabby-core'
import { BaseSession, StreamProcessingOptions, TerminalStreamProcessor } from 'tabby-terminal'
import { Profile, LogService } from 'tabby-core'
import { BaseSession, LoginScriptsOptions, StreamProcessingOptions, TerminalStreamProcessor } from 'tabby-terminal'
import { Subject, Observable } from 'rxjs'
@@ -11,13 +11,12 @@ export interface TelnetProfile extends Profile {
options: TelnetProfileOptions
}
export interface TelnetProfileOptions extends StreamProcessingOptions {
export interface TelnetProfileOptions extends StreamProcessingOptions, LoginScriptsOptions {
host: string
port?: number
}
export class TelnetSession extends BaseSession {
logger: Logger
get serviceMessage$ (): Observable<string> { return this.serviceMessage }
private serviceMessage = new Subject<string>()
@@ -28,8 +27,7 @@ export class TelnetSession extends BaseSession {
injector: Injector,
public profile: TelnetProfile,
) {
super()
this.logger = injector.get(LogService).create(`telnet-${profile.options.host}-${profile.options.port}`)
super(injector.get(LogService).create(`telnet-${profile.options.host}-${profile.options.port}`))
this.streamProcessor = new TerminalStreamProcessor(profile.options)
this.streamProcessor.outputToSession$.subscribe(data => {
this.socket.write(data)
@@ -37,6 +35,7 @@ export class TelnetSession extends BaseSession {
this.streamProcessor.outputToTerminal$.subscribe(data => {
this.emitOutput(data)
})
this.setLoginScriptsOptions(profile.options)
}
async start (): Promise<void> {
@@ -57,6 +56,8 @@ export class TelnetSession extends BaseSession {
this.socket.connect(this.profile.options.port ?? 23, this.profile.options.host, () => {
this.emitServiceMessage('Connected')
this.open = true
setTimeout(() => this.streamProcessor.start())
this.loginScriptProcessor?.executeUnconditionalScripts()
resolve()
})
})