GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-08-20 08:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

delay loading SSH importers until all plugins are ready

Browse Source
This commit is contained in:
Eugene Pankov
2023-01-29 13:17:30 +01:00
parent 2f5c6fafa9
commit 6ccb48fc62
1 changed files with 5 additions and 4 deletions

9
tabby-ssh/src/profiles.ts

@@ -1,4 +1,4 @@
import { Inject, Injectable, Optional } from '@angular/core' import { Injectable, InjectFlags, Injector } from '@angular/core'
import { ProfileProvider, NewTabParameters, PartialProfile, TranslateService } from 'tabby-core' import { ProfileProvider, NewTabParameters, PartialProfile, TranslateService } from 'tabby-core'
import * as ALGORITHMS from 'ssh2/lib/protocol/constants' import * as ALGORITHMS from 'ssh2/lib/protocol/constants'
import { SSHProfileSettingsComponent } from './components/sshProfileSettings.component' import { SSHProfileSettingsComponent } from './components/sshProfileSettings.component'
@@ -49,7 +49,7 @@ export class SSHProfilesService extends ProfileProvider<SSHProfile> {
constructor ( constructor (
private passwordStorage: PasswordStorageService, private passwordStorage: PasswordStorageService,
private translate: TranslateService, private translate: TranslateService,
@Inject(SSHProfileImporter) @Optional() private importers: SSHProfileImporter[]|null, private injector: Injector,
) { ) {
super() super()
for (const k of Object.values(SSHAlgorithmType)) { for (const k of Object.values(SSHAlgorithmType)) {
@@ -65,12 +65,13 @@ export class SSHProfilesService extends ProfileProvider<SSHProfile> {
} }
async getBuiltinProfiles (): Promise<PartialProfile<SSHProfile>[]> { async getBuiltinProfiles (): Promise<PartialProfile<SSHProfile>[]> {
const importers = this.injector.get<SSHProfileImporter[]>(SSHProfileImporter as any, [], InjectFlags.Optional)
let imported: PartialProfile<SSHProfile>[] = [] let imported: PartialProfile<SSHProfile>[] = []
for (const importer of this.importers ?? []) { for (const importer of importers) {
try { try {
imported = imported.concat(await importer.getProfiles()) imported = imported.concat(await importer.getProfiles())
} catch (e) { } catch (e) {
console.warn('Could not parse OpenSSH config:', e) console.warn('Could not import SSH profiles:', e)
} }
} }
return [ return [