Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/sftp/async-types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { DynamicModule, FactoryProvider, ValueProvider } from '@nestjs/common';
import { ConnectConfig } from 'ssh2';

export interface ImportableFactoryProvider<T>
extends Omit<FactoryProvider<T>, 'provide'>,
Expand All @@ -7,3 +8,7 @@ export interface ImportableFactoryProvider<T>
export type AsyncProvider<T> =
| ImportableFactoryProvider<T>
| Omit<ValueProvider<T>, 'provide'>;

export type ConnectConfigExt = ConnectConfig & {
delayConnection?: boolean;
};
21 changes: 13 additions & 8 deletions src/sftp/sftp.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { AsyncProvider, ImportableFactoryProvider } from './async-types';
import {
AsyncProvider,
ConnectConfigExt,
ImportableFactoryProvider,
} from './async-types';
import { DynamicModule, Global, Module } from '@nestjs/common';

import { ConnectConfig } from 'ssh2';
import { SftpClientService } from './sftp-client/sftp-client.service';

import * as SftpClient from 'ssh2-sftp-client';
Expand All @@ -13,7 +16,7 @@ import * as SftpClient from 'ssh2-sftp-client';
})
export class SftpModule {
static forRoot(
config: ConnectConfig,
config: ConnectConfigExt,
delayConnection = false,
): DynamicModule {
return {
Expand All @@ -23,8 +26,9 @@ export class SftpModule {
{
provide: SftpClient,
useFactory: async () => {
const delay = config?.delayConnection ?? delayConnection;
const client = new SftpClient();
if (!delayConnection) {
if (!delay) {
await client.connect(config);
}
return client;
Expand All @@ -36,7 +40,7 @@ export class SftpModule {
}

static forRootAsync(
config: AsyncProvider<ConnectConfig | Promise<ConnectConfig>>,
config: AsyncProvider<ConnectConfigExt | Promise<ConnectConfigExt>>,
delayConnection = false,
): DynamicModule {
const configToken = 'CONNECT_CONFIG';
Expand All @@ -48,9 +52,10 @@ export class SftpModule {
SftpClientService,
{
provide: SftpClient,
useFactory: async (connectConfig: ConnectConfig) => {
useFactory: async (connectConfig: ConnectConfigExt) => {
const delay = connectConfig?.delayConnection ?? delayConnection;
const client = new SftpClient();
if (!delayConnection) {
if (!delay) {
await client.connect(connectConfig);
}
return client;
Expand All @@ -61,7 +66,7 @@ export class SftpModule {
exports: [SftpClientService],
};

this.addAsyncProvider<ConnectConfig>(module, configToken, config, false);
this.addAsyncProvider<ConnectConfigExt>(module, configToken, config, false);
return module;
}

Expand Down