@forestadmin/datasource-sql 1.6.10 → 1.7.0

package/dist/connection/connection-options.d.ts

@@ -1,6 +1,6 @@
 import { Logger } from '@forestadmin/datasource-toolkit';
 import { Dialect, Options as SequelizeOptions } from 'sequelize';
-import { PlainConnectionOptions, PlainConnectionOptionsOrUri, ProxyOptions } from '../types';
+import { PlainConnectionOptions, PlainConnectionOptionsOrUri, ProxyOptions, SshOptions } from '../types';
 /**
  * Connection options.
  * This wrapper is constructed from a plain object or a URI string.
@@ -13,6 +13,8 @@ import { PlainConnectionOptions, PlainConnectionOptionsOrUri, ProxyOptions } fro
  */
 export default class ConnectionOptions {
     proxyOptions?: ProxyOptions;
+    sshOptions?: SshOptions;
+    connectionTimeoutInMs?: number;
     private initialHost;
     private initialPort;
     private logger?;
@@ -24,8 +26,6 @@ export default class ConnectionOptions {
      * Ensure that this is never substituted by the proxy, nor that it includes credentials.
      */
     get debugDatabaseUri(): string;
-    /** Proxy URI without credentials, which can be used in error messages INTERNALLY */
-    get debugProxyUri(): string;
     get dialect(): Dialect;
     get host(): string;
     get port(): number;

package/dist/connection/connection-options.js

@@ -28,10 +28,6 @@ class ConnectionOptions {
             ? this.uri?.href ?? `sqlite:${this.sequelizeOptions.storage}`
             : `${dialect}://${this.initialHost}:${port}/${database}`;
     }
-    /** Proxy URI without credentials, which can be used in error messages INTERNALLY */
-    get debugProxyUri() {
-        return this.proxyOptions ? `tcp://${this.proxyOptions.host}:${this.proxyOptions.port}` : 'none';
-    }
     get dialect() {
         let dialect = this.uri?.protocol?.slice(0, -1) || this.sequelizeOptions.dialect;
         if (dialect === 'mysql2')
@@ -67,6 +63,10 @@ class ConnectionOptions {
             options.uri = this.uri.toString();
         if (this.proxyOptions)
             options.proxySocks = this.proxyOptions;
+        if (this.sshOptions)
+            options.ssh = this.sshOptions;
+        if (this.connectionTimeoutInMs)
+            options.connectionTimeoutInMs = this.connectionTimeoutInMs;
         options.dialect = this.dialect;
         options.sslMode = this.sslMode;
         return options;
@@ -78,8 +78,10 @@ class ConnectionOptions {
             this.sequelizeOptions = {};
         }
         else {
-            const { uri, sslMode, proxySocks, ...sequelizeOptions } = options;
+            const { uri, sslMode, proxySocks, ssh, connectionTimeoutInMs, ...sequelizeOptions } = options;
             this.proxyOptions = proxySocks;
+            this.sshOptions = ssh;
+            this.connectionTimeoutInMs = connectionTimeoutInMs;
             this.sequelizeOptions = sequelizeOptions;
             this.sslMode = sslMode ?? 'manual';
             this.uri = uri ? this.parseDatabaseUri(uri) : null;
@@ -229,4 +231,4 @@ class ConnectionOptions {
     }
 }
 exports.default = ConnectionOptions;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-options.js","sourceRoot":"","sources":["../../src/connection/connection-options.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-options.js","sourceRoot":"","sources":["../../src/connection/connection-options.ts"],"names":[],"mappings":"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"}

package/dist/connection/connection-tester.d.ts

@@ -1,3 +1,4 @@
 import { Sequelize } from 'sequelize';
+/** Test connection. If this doesn't resolve after 10s, throw a timeout error */
 export default function testConnectionWithTimeOut(sequelize: Sequelize, databaseUri: string, timeout?: number): Promise<void>;
 //# sourceMappingURL=connection-tester.d.ts.map

package/dist/connection/connection-tester.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const errors_1 = require("./errors");
+/** Test connection. If this doesn't resolve after 10s, throw a timeout error */
 async function testConnectionWithTimeOut(sequelize, databaseUri, timeout = 10000) {
-    // Test connection. If this doesn't resolve after 10s, throw a timeout error
-    const timeoutPromise = new Promise(resolve => {
-        setTimeout(resolve, timeout);
-    }).then(() => Promise.reject(new errors_1.DatabaseConnectError('Connection to database timed out', databaseUri)));
-    await Promise.race([sequelize.authenticate(), timeoutPromise]);
+    let timeoutId;
+    const timeoutPromise = new Promise((resolve, reject) => {
+        timeoutId = setTimeout(() => {
+            reject(new errors_1.DatabaseConnectError('Connection to database timed out', databaseUri));
+        }, timeout);
+    });
+    await Promise.race([
+        sequelize.authenticate()?.finally(() => {
+            clearTimeout(timeoutId);
+        }),
+        timeoutPromise,
+    ]);
 }
 exports.default = testConnectionWithTimeOut;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi10ZXN0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29ubmVjdGlvbi9jb25uZWN0aW9uLXRlc3Rlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLHFDQUFnRDtBQUVqQyxLQUFLLFVBQVUseUJBQXlCLENBQ3JELFNBQW9CLEVBQ3BCLFdBQW1CLEVBQ25CLE9BQU8sR0FBRyxLQUFLO0lBRWYsNEVBQTRFO0lBQzVFLE1BQU0sY0FBYyxHQUFHLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQzNDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDL0IsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUNYLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSw2QkFBb0IsQ0FBQyxrQ0FBa0MsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUMxRixDQUFDO0lBRUYsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsU0FBUyxDQUFDLFlBQVksRUFBRSxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUM7QUFDakUsQ0FBQztBQWJELDRDQWFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi10ZXN0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29ubmVjdGlvbi9jb25uZWN0aW9uLXRlc3Rlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLHFDQUFnRDtBQUVoRCxnRkFBZ0Y7QUFDakUsS0FBSyxVQUFVLHlCQUF5QixDQUNyRCxTQUFvQixFQUNwQixXQUFtQixFQUNuQixPQUFPLEdBQUcsS0FBSztJQUVmLElBQUksU0FBUyxDQUFDO0lBRWQsTUFBTSxjQUFjLEdBQUcsSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDckQsU0FBUyxHQUFHLFVBQVUsQ0FBQyxHQUFHLEVBQUU7WUFDMUIsTUFBTSxDQUFDLElBQUksNkJBQW9CLENBQUMsa0NBQWtDLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQztRQUNwRixDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDZCxDQUFDLENBQUMsQ0FBQztJQUVILE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQztRQUNqQixTQUFTLENBQUMsWUFBWSxFQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNyQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDMUIsQ0FBQyxDQUFDO1FBQ0YsY0FBYztLQUNmLENBQUMsQ0FBQztBQUNMLENBQUM7QUFuQkQsNENBbUJDIn0=

package/dist/connection/errors.d.ts

@@ -1,9 +1,9 @@
-export type ErrorSource = 'Proxy' | 'Database';
+export type ErrorSource = 'Proxy' | 'Database' | 'Ssh';
 declare abstract class BaseError extends Error {
     abstract readonly source: ErrorSource;
-    readonly uri: string;
+    readonly debugUri: string;
     readonly details: string;
-    constructor(message: string, uri: string, details?: string);
+    protected constructor(message: string, debugUri: string, details?: string);
 }
 export declare class DatabaseConnectError extends BaseError {
     readonly source: ErrorSource;
@@ -13,5 +13,17 @@ export declare class ProxyConnectError extends BaseError {
     readonly source = "Proxy";
     constructor(message: string, debugProxyUri: string);
 }
+export declare class ProxyForwardError extends BaseError {
+    readonly source = "Proxy";
+    constructor(message: string, debugForwardedUri: string);
+}
+export declare class SshConnectError extends BaseError {
+    readonly source: ErrorSource;
+    constructor(message: string, debugSshUri: string, source?: ErrorSource);
+}
+export declare class SshForwardError extends BaseError {
+    readonly source = "Ssh";
+    constructor(message: string, debugForwardedUri: string);
+}
 export {};
 //# sourceMappingURL=errors.d.ts.map

package/dist/connection/errors.js

@@ -1,29 +1,53 @@
 "use strict";
 /* eslint-disable max-classes-per-file */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProxyConnectError = exports.DatabaseConnectError = void 0;
+exports.SshForwardError = exports.SshConnectError = exports.ProxyForwardError = exports.ProxyConnectError = exports.DatabaseConnectError = void 0;
 class BaseError extends Error {
-    constructor(message, uri, details) {
+    constructor(message, debugUri, details) {
         super(details ? `${message}\n${details}` : message);
         this.name = this.constructor.name;
         this.details = details;
-        this.uri = uri;
+        this.debugUri = debugUri;
     }
 }
 class DatabaseConnectError extends BaseError {
     constructor(message, debugDatabaseUri, source = 'Database') {
-        super(`Unable to connect to the given uri: ${debugDatabaseUri}.`, debugDatabaseUri, message);
+        // remove tcp protocol because its not added by the user
+        const sanitizedUri = debugDatabaseUri.replace('tcp://', '');
+        super(`Unable to connect to the given uri: ${sanitizedUri}.`, sanitizedUri, message);
         this.source = source;
     }
 }
 exports.DatabaseConnectError = DatabaseConnectError;
 class ProxyConnectError extends BaseError {
     constructor(message, debugProxyUri) {
-        // remove tcp protocol because its not added by the user
-        const sanitizedUri = debugProxyUri.replace('tcp://', '');
-        super(`Your proxy has encountered an error. Unable to connect to the given uri: ${sanitizedUri}.`, sanitizedUri, message);
+        super(`Your proxy has encountered an error. Unable to connect to the given uri: ${debugProxyUri}.`, debugProxyUri, message);
         this.source = 'Proxy';
     }
 }
 exports.ProxyConnectError = ProxyConnectError;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Nvbm5lY3Rpb24vZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx5Q0FBeUM7OztBQUl6QyxNQUFlLFNBQVUsU0FBUSxLQUFLO0lBS3BDLFlBQVksT0FBZSxFQUFFLEdBQVcsRUFBRSxPQUFnQjtRQUN4RCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sS0FBSyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7UUFFcEQsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztRQUNsQyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN2QixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztJQUNqQixDQUFDO0NBQ0Y7QUFFRCxNQUFhLG9CQUFxQixTQUFRLFNBQVM7SUFHakQsWUFBWSxPQUFlLEVBQUUsZ0JBQXdCLEVBQUUsU0FBc0IsVUFBVTtRQUNyRixLQUFLLENBQUMsdUNBQXVDLGdCQUFnQixHQUFHLEVBQUUsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFN0YsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztDQUNGO0FBUkQsb0RBUUM7QUFFRCxNQUFhLGlCQUFrQixTQUFRLFNBQVM7SUFHOUMsWUFBWSxPQUFlLEVBQUUsYUFBcUI7UUFDaEQsd0RBQXdEO1FBQ3hELE1BQU0sWUFBWSxHQUFHLGFBQWEsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRXpELEtBQUssQ0FDSCw0RUFBNEUsWUFBWSxHQUFHLEVBQzNGLFlBQVksRUFDWixPQUFPLENBQ1IsQ0FBQztRQVZLLFdBQU0sR0FBRyxPQUFPLENBQUM7SUFXMUIsQ0FBQztDQUNGO0FBYkQsOENBYUMifQ==
+class ProxyForwardError extends BaseError {
+    constructor(message, debugForwardedUri) {
+        super(`Your proxy forwarded connection has encountered an error.` +
+            `Unable to connect to the given uri: ${debugForwardedUri}.`, debugForwardedUri, message);
+        this.source = 'Proxy';
+    }
+}
+exports.ProxyForwardError = ProxyForwardError;
+class SshConnectError extends BaseError {
+    constructor(message, debugSshUri, source = 'Ssh') {
+        super(`Your ssh connection has encountered an error. ` +
+            `Unable to connect to the given ssh uri: ${debugSshUri}`, debugSshUri, message);
+        this.source = source;
+    }
+}
+exports.SshConnectError = SshConnectError;
+class SshForwardError extends BaseError {
+    constructor(message, debugForwardedUri) {
+        super(`Your ssh forward connection has encountered an error. ` +
+            `Unable to connect to the given ssh uri: ${debugForwardedUri}`, debugForwardedUri, message);
+        this.source = 'Ssh';
+    }
+}
+exports.SshForwardError = SshForwardError;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Nvbm5lY3Rpb24vZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx5Q0FBeUM7OztBQUl6QyxNQUFlLFNBQVUsU0FBUSxLQUFLO0lBS3BDLFlBQXNCLE9BQWUsRUFBRSxRQUFnQixFQUFFLE9BQWdCO1FBQ3ZFLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEdBQUcsT0FBTyxLQUFLLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUVwRCxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO0lBQzNCLENBQUM7Q0FDRjtBQUVELE1BQWEsb0JBQXFCLFNBQVEsU0FBUztJQUdqRCxZQUFZLE9BQWUsRUFBRSxnQkFBd0IsRUFBRSxTQUFzQixVQUFVO1FBQ3JGLHdEQUF3RDtRQUN4RCxNQUFNLFlBQVksR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQzVELEtBQUssQ0FBQyx1Q0FBdUMsWUFBWSxHQUFHLEVBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBRXJGLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7Q0FDRjtBQVZELG9EQVVDO0FBRUQsTUFBYSxpQkFBa0IsU0FBUSxTQUFTO0lBRzlDLFlBQVksT0FBZSxFQUFFLGFBQXFCO1FBQ2hELEtBQUssQ0FDSCw0RUFBNEUsYUFBYSxHQUFHLEVBQzVGLGFBQWEsRUFDYixPQUFPLENBQ1IsQ0FBQztRQVBLLFdBQU0sR0FBRyxPQUFPLENBQUM7SUFRMUIsQ0FBQztDQUNGO0FBVkQsOENBVUM7QUFFRCxNQUFhLGlCQUFrQixTQUFRLFNBQVM7SUFHOUMsWUFBWSxPQUFlLEVBQUUsaUJBQXlCO1FBQ3BELEtBQUssQ0FDSCwyREFBMkQ7WUFDekQsdUNBQXVDLGlCQUFpQixHQUFHLEVBQzdELGlCQUFpQixFQUNqQixPQUFPLENBQ1IsQ0FBQztRQVJLLFdBQU0sR0FBRyxPQUFPLENBQUM7SUFTMUIsQ0FBQztDQUNGO0FBWEQsOENBV0M7QUFFRCxNQUFhLGVBQWdCLFNBQVEsU0FBUztJQUc1QyxZQUFZLE9BQWUsRUFBRSxXQUFtQixFQUFFLFNBQXNCLEtBQUs7UUFDM0UsS0FBSyxDQUNILGdEQUFnRDtZQUM5QywyQ0FBMkMsV0FBVyxFQUFFLEVBQzFELFdBQVcsRUFDWCxPQUFPLENBQ1IsQ0FBQztRQUNGLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7Q0FDRjtBQVpELDBDQVlDO0FBRUQsTUFBYSxlQUFnQixTQUFRLFNBQVM7SUFHNUMsWUFBWSxPQUFlLEVBQUUsaUJBQXlCO1FBQ3BELEtBQUssQ0FDSCx3REFBd0Q7WUFDdEQsMkNBQTJDLGlCQUFpQixFQUFFLEVBQ2hFLGlCQUFpQixFQUNqQixPQUFPLENBQ1IsQ0FBQztRQVJLLFdBQU0sR0FBRyxLQUFLLENBQUM7SUFTeEIsQ0FBQztDQUNGO0FBWEQsMENBV0MifQ==

package/dist/connection/handle-errors.js

@@ -2,27 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const sequelize_1 = require("sequelize");
 const errors_1 = require("./errors");
-function handleProxyErrors(error, options) {
-    /** @see https://github.com/JoshGlazebrook/socks/blob/76d013/src/common/constants.ts#L10 */
-    if (error.message.includes('Socket closed') ||
-        error.message.includes('Socks5 proxy rejected connection')) {
-        throw new errors_1.DatabaseConnectError(null, options.debugDatabaseUri, 'Proxy');
-    }
-    throw new errors_1.ProxyConnectError(error.message, options.debugProxyUri);
-}
-function handleSequelizeError(error, options) {
-    const nameWithoutSequelize = error.name.replace('Sequelize', '');
-    const nameWithSpaces = nameWithoutSequelize.replace(/([a-z])([A-Z])/g, (_, m1, m2) => `${m1} ${m2.toLowerCase()}`);
-    throw new errors_1.DatabaseConnectError(`${nameWithSpaces}: ${error.message}`, options.debugDatabaseUri);
-}
 function handleErrors(error, options) {
-    if (error?.stack?.includes('SocksClient')) {
-        handleProxyErrors(error, options);
+    if (error instanceof errors_1.ProxyForwardError) {
+        // means that the ssh is not reachable
+        if (options.sshOptions) {
+            throw new errors_1.SshConnectError(null, error.debugUri, 'Proxy');
+        }
+        else {
+            // if there is no sshOptions, then the database is the destination and
+            // it means that the database is not reachable
+            throw new errors_1.DatabaseConnectError(null, error.debugUri, 'Proxy');
+        }
+    }
+    // it means that the database is not reachable
+    if (error instanceof errors_1.SshForwardError) {
+        throw new errors_1.DatabaseConnectError(null, error.debugUri, 'Ssh');
     }
     if (error instanceof sequelize_1.BaseError) {
-        handleSequelizeError(error, options);
+        const nameWithoutSequelize = error.name.replace('Sequelize', '');
+        const nameWithSpaces = nameWithoutSequelize.replace(/([a-z])([A-Z])/g, (_, m1, m2) => `${m1} ${m2.toLowerCase()}`);
+        throw new errors_1.DatabaseConnectError(`${nameWithSpaces}: ${error.message}`, options.debugDatabaseUri);
     }
     throw error;
 }
 exports.default = handleErrors;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlLWVycm9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25uZWN0aW9uL2hhbmRsZS1lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBd0Q7QUFHeEQscUNBQW1FO0FBRW5FLFNBQVMsaUJBQWlCLENBQUMsS0FBWSxFQUFFLE9BQTBCO0lBQ2pFLDJGQUEyRjtJQUMzRixJQUNFLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQztRQUN2QyxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxrQ0FBa0MsQ0FBQyxFQUMxRDtRQUNBLE1BQU0sSUFBSSw2QkFBb0IsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxDQUFDO0tBQ3pFO0lBRUQsTUFBTSxJQUFJLDBCQUFpQixDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBQ3BFLENBQUM7QUFFRCxTQUFTLG9CQUFvQixDQUFDLEtBQXFCLEVBQUUsT0FBMEI7SUFDN0UsTUFBTSxvQkFBb0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDakUsTUFBTSxjQUFjLEdBQUcsb0JBQW9CLENBQUMsT0FBTyxDQUNqRCxpQkFBaUIsRUFDakIsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQzNDLENBQUM7SUFFRixNQUFNLElBQUksNkJBQW9CLENBQUMsR0FBRyxjQUFjLEtBQUssS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBQ2xHLENBQUM7QUFFRCxTQUF3QixZQUFZLENBQUMsS0FBWSxFQUFFLE9BQTBCO0lBQzNFLElBQUksS0FBSyxFQUFFLEtBQUssRUFBRSxRQUFRLENBQUMsYUFBYSxDQUFDLEVBQUU7UUFDekMsaUJBQWlCLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0tBQ25DO0lBRUQsSUFBSSxLQUFLLFlBQVkscUJBQWMsRUFBRTtRQUNuQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUM7S0FDdEM7SUFFRCxNQUFNLEtBQUssQ0FBQztBQUNkLENBQUM7QUFWRCwrQkFVQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlLWVycm9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25uZWN0aW9uL2hhbmRsZS1lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBd0Q7QUFHeEQscUNBS2tCO0FBRWxCLFNBQXdCLFlBQVksQ0FBQyxLQUFZLEVBQUUsT0FBMEI7SUFDM0UsSUFBSSxLQUFLLFlBQVksMEJBQWlCLEVBQUU7UUFDdEMsc0NBQXNDO1FBQ3RDLElBQUksT0FBTyxDQUFDLFVBQVUsRUFBRTtZQUN0QixNQUFNLElBQUksd0JBQWUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztTQUMxRDthQUFNO1lBQ0wsc0VBQXNFO1lBQ3RFLDhDQUE4QztZQUM5QyxNQUFNLElBQUksNkJBQW9CLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUM7U0FDL0Q7S0FDRjtJQUVELDhDQUE4QztJQUM5QyxJQUFJLEtBQUssWUFBWSx3QkFBZSxFQUFFO1FBQ3BDLE1BQU0sSUFBSSw2QkFBb0IsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztLQUM3RDtJQUVELElBQUksS0FBSyxZQUFZLHFCQUFjLEVBQUU7UUFDbkMsTUFBTSxvQkFBb0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakUsTUFBTSxjQUFjLEdBQUcsb0JBQW9CLENBQUMsT0FBTyxDQUNqRCxpQkFBaUIsRUFDakIsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQzNDLENBQUM7UUFFRixNQUFNLElBQUksNkJBQW9CLENBQUMsR0FBRyxjQUFjLEtBQUssS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0tBQ2pHO0lBRUQsTUFBTSxLQUFLLENBQUM7QUFDZCxDQUFDO0FBNUJELCtCQTRCQyJ9

package/dist/connection/index.js

@@ -5,36 +5,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const connection_tester_1 = __importDefault(require("./connection-tester"));
 const handle_errors_1 = __importDefault(require("./handle-errors"));
+const sequelize_factory_1 = __importDefault(require("./sequelize-factory"));
 const reverse_proxy_1 = __importDefault(require("./services/reverse-proxy"));
-const sequelize_factory_1 = __importDefault(require("./services/sequelize-factory"));
-const tcp_server_1 = __importDefault(require("./services/tcp-server"));
+const socks_proxy_1 = __importDefault(require("./services/socks-proxy"));
+const ssh_tunnel_1 = __importDefault(require("./services/ssh-tunnel"));
 /** Attempt to connect to the database */
 async function connect(options) {
-    let proxy;
-    let tcpServer;
+    let socksProxy;
+    let sshTunnel;
+    let reverseProxy;
     let sequelize;
     try {
+        if (options.proxyOptions || options.sshOptions) {
+            reverseProxy = new reverse_proxy_1.default();
+            await reverseProxy.start();
+        }
         if (options.proxyOptions) {
-            tcpServer = new tcp_server_1.default();
-            await tcpServer.start();
-            proxy = new reverse_proxy_1.default(options.proxyOptions, options.host, options.port);
-            tcpServer.onConnect(proxy.connectListener.bind(proxy));
-            tcpServer.onClose(proxy.closeListener.bind(proxy));
-            // swap database host and port with the ones from the proxy.
-            options.changeHostAndPort(tcpServer.host, tcpServer.port);
+            // destination is the ssh server or the database
+            const { host, port } = options.sshOptions ?? options;
+            socksProxy = new socks_proxy_1.default(options.proxyOptions, host, port);
+            reverseProxy.link(socksProxy);
+        }
+        if (options.sshOptions) {
+            const { host, port, sshOptions } = options;
+            // database is the destination
+            sshTunnel = new ssh_tunnel_1.default(sshOptions, host, port);
+            // if socksProxy is defined, it means that we are using a proxy
+            // so we need to link to the socksProxy otherwise to the reverseProxy
+            (socksProxy ?? reverseProxy).link(sshTunnel);
         }
-        const sequelizeFactory = new sequelize_factory_1.default();
-        if (tcpServer)
-            sequelizeFactory.onClose(tcpServer.closeListener.bind(tcpServer));
-        sequelize = sequelizeFactory.build(await options.buildSequelizeCtorOptions());
-        await (0, connection_tester_1.default)(sequelize, options.debugDatabaseUri);
+        // change the host and port of the sequelize options to point to the reverse proxy
+        if (reverseProxy)
+            options.changeHostAndPort(reverseProxy.host, reverseProxy.port);
+        sequelize = sequelize_factory_1.default.build(await options.buildSequelizeCtorOptions(), 
+        // stop the reverse proxy when the sequelize connection is closed
+        reverseProxy?.stop.bind(reverseProxy));
+        await (0, connection_tester_1.default)(sequelize, options.debugDatabaseUri, options.connectionTimeoutInMs);
         return sequelize;
     }
     catch (e) {
         await sequelize?.close();
-        // if proxy encountered an error, we want to throw it instead of the sequelize error
-        (0, handle_errors_1.default)(proxy?.error ?? e, options);
+        // if ssh or socksProxy or reverseProxy encountered an error,
+        // we want to throw it instead of the sequelize error
+        (0, handle_errors_1.default)(sshTunnel?.error ?? socksProxy?.error ?? reverseProxy?.error ?? e, options);
     }
 }
 exports.default = connect;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29ubmVjdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUdBLDRFQUE0RDtBQUM1RCxvRUFBMkM7QUFDM0MsNkVBQW9EO0FBQ3BELHFGQUE0RDtBQUM1RCx1RUFBOEM7QUFFOUMseUNBQXlDO0FBQzFCLEtBQUssVUFBVSxPQUFPLENBQUMsT0FBMEI7SUFDOUQsSUFBSSxLQUFtQixDQUFDO0lBQ3hCLElBQUksU0FBb0IsQ0FBQztJQUN6QixJQUFJLFNBQW9CLENBQUM7SUFFekIsSUFBSTtRQUNGLElBQUksT0FBTyxDQUFDLFlBQVksRUFBRTtZQUN4QixTQUFTLEdBQUcsSUFBSSxvQkFBUyxFQUFFLENBQUM7WUFDNUIsTUFBTSxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDeEIsS0FBSyxHQUFHLElBQUksdUJBQVksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzNFLFNBQVMsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztZQUN2RCxTQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDbkQsNERBQTREO1lBQzVELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUMzRDtRQUVELE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSwyQkFBZ0IsRUFBRSxDQUFDO1FBQ2hELElBQUksU0FBUztZQUFFLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBRWpGLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsTUFBTSxPQUFPLENBQUMseUJBQXlCLEVBQUUsQ0FBQyxDQUFDO1FBRTlFLE1BQU0sSUFBQSwyQkFBeUIsRUFBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFFckUsT0FBTyxTQUFTLENBQUM7S0FDbEI7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNWLE1BQU0sU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3pCLG9GQUFvRjtRQUNwRixJQUFBLHVCQUFZLEVBQUMsS0FBSyxFQUFFLEtBQUssSUFBSSxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUM7S0FDMUM7QUFDSCxDQUFDO0FBN0JELDBCQTZCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29ubmVjdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUdBLDRFQUE0RDtBQUM1RCxvRUFBMkM7QUFDM0MsNEVBQW1EO0FBQ25ELDZFQUFvRDtBQUNwRCx5RUFBZ0Q7QUFDaEQsdUVBQThDO0FBRTlDLHlDQUF5QztBQUMxQixLQUFLLFVBQVUsT0FBTyxDQUFDLE9BQTBCO0lBQzlELElBQUksVUFBc0IsQ0FBQztJQUMzQixJQUFJLFNBQW9CLENBQUM7SUFDekIsSUFBSSxZQUEwQixDQUFDO0lBQy9CLElBQUksU0FBb0IsQ0FBQztJQUV6QixJQUFJO1FBQ0YsSUFBSSxPQUFPLENBQUMsWUFBWSxJQUFJLE9BQU8sQ0FBQyxVQUFVLEVBQUU7WUFDOUMsWUFBWSxHQUFHLElBQUksdUJBQVksRUFBRSxDQUFDO1lBQ2xDLE1BQU0sWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1NBQzVCO1FBRUQsSUFBSSxPQUFPLENBQUMsWUFBWSxFQUFFO1lBQ3hCLGdEQUFnRDtZQUNoRCxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxHQUFHLE9BQU8sQ0FBQyxVQUFVLElBQUksT0FBTyxDQUFDO1lBQ3JELFVBQVUsR0FBRyxJQUFJLHFCQUFVLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDOUQsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztTQUMvQjtRQUVELElBQUksT0FBTyxDQUFDLFVBQVUsRUFBRTtZQUN0QixNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsR0FBRyxPQUFPLENBQUM7WUFDM0MsOEJBQThCO1lBQzlCLFNBQVMsR0FBRyxJQUFJLG9CQUFTLENBQUMsVUFBVSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUNsRCwrREFBK0Q7WUFDL0QscUVBQXFFO1lBQ3JFLENBQUMsVUFBVSxJQUFJLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztTQUM5QztRQUVELGtGQUFrRjtRQUNsRixJQUFJLFlBQVk7WUFBRSxPQUFPLENBQUMsaUJBQWlCLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFbEYsU0FBUyxHQUFHLDJCQUFnQixDQUFDLEtBQUssQ0FDaEMsTUFBTSxPQUFPLENBQUMseUJBQXlCLEVBQUU7UUFDekMsaUVBQWlFO1FBQ2pFLFlBQVksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUN0QyxDQUFDO1FBRUYsTUFBTSxJQUFBLDJCQUF5QixFQUM3QixTQUFTLEVBQ1QsT0FBTyxDQUFDLGdCQUFnQixFQUN4QixPQUFPLENBQUMscUJBQXFCLENBQzlCLENBQUM7UUFFRixPQUFPLFNBQVMsQ0FBQztLQUNsQjtJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1YsTUFBTSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDekIsNkRBQTZEO1FBQzdELHFEQUFxRDtRQUNyRCxJQUFBLHVCQUFZLEVBQUMsU0FBUyxFQUFFLEtBQUssSUFBSSxVQUFVLEVBQUUsS0FBSyxJQUFJLFlBQVksRUFBRSxLQUFLLElBQUksQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0tBQzFGO0FBQ0gsQ0FBQztBQWxERCwwQkFrREMifQ==

package/dist/connection/sequelize-factory.d.ts

@@ -0,0 +1,8 @@
+import { Sequelize } from 'sequelize';
+import { Options as SequelizeOptions } from 'sequelize/types/sequelize';
+import Service from './services/service';
+export default class SequelizeFactory {
+    static build(sequelizeCtorOptions: [SequelizeOptions] | [string, SequelizeOptions], stopCallback?: Service['stop']): Sequelize;
+    private static overrideCloseMethod;
+}
+//# sourceMappingURL=sequelize-factory.d.ts.map

package/dist/connection/sequelize-factory.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const sequelize_1 = require("sequelize");
+class SequelizeFactory {
+    static build(sequelizeCtorOptions, stopCallback) {
+        const sequelize = sequelizeCtorOptions.length === 1
+            ? new sequelize_1.Sequelize(sequelizeCtorOptions[0])
+            : new sequelize_1.Sequelize(sequelizeCtorOptions[0], sequelizeCtorOptions[1]);
+        this.overrideCloseMethod(sequelize, stopCallback);
+        return sequelize;
+    }
+    static overrideCloseMethod(sequelize, stopCallback) {
+        // override close method to ensure to execute the stop
+        sequelize.close = async function close() {
+            try {
+                await sequelize_1.Sequelize.prototype.close.call(this);
+            }
+            finally {
+                if (stopCallback)
+                    await stopCallback();
+            }
+        };
+    }
+}
+exports.default = SequelizeFactory;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVsaXplLWZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29ubmVjdGlvbi9zZXF1ZWxpemUtZmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUFzQztBQUt0QyxNQUFxQixnQkFBZ0I7SUFDbkMsTUFBTSxDQUFDLEtBQUssQ0FDVixvQkFBcUUsRUFDckUsWUFBOEI7UUFFOUIsTUFBTSxTQUFTLEdBQ2Isb0JBQW9CLENBQUMsTUFBTSxLQUFLLENBQUM7WUFDL0IsQ0FBQyxDQUFDLElBQUkscUJBQVMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN4QyxDQUFDLENBQUMsSUFBSSxxQkFBUyxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQyxFQUFFLG9CQUFvQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFdEUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUVsRCxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0lBRU8sTUFBTSxDQUFDLG1CQUFtQixDQUFDLFNBQW9CLEVBQUUsWUFBOEI7UUFDckYsc0RBQXNEO1FBQ3RELFNBQVMsQ0FBQyxLQUFLLEdBQUcsS0FBSyxVQUFVLEtBQUs7WUFDcEMsSUFBSTtnQkFDRixNQUFNLHFCQUFTLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDNUM7b0JBQVM7Z0JBQ1IsSUFBSSxZQUFZO29CQUFFLE1BQU0sWUFBWSxFQUFFLENBQUM7YUFDeEM7UUFDSCxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUF6QkQsbUNBeUJDIn0=

package/dist/connection/services/reverse-proxy.d.ts

@@ -1,16 +1,21 @@
 /// <reference types="node" />
 import net from 'net';
 import Service from './service';
-import { ProxyOptions } from '../../types';
+/**
+ * ReverseProxy is used to redirect all the database requests.
+ * Sequelize does not take a socket as an argument,
+ * so we need to redirect all the traffic to a new socket.
+ * This is done by creating a server that will listen on a random port.
+ * We change the host and port of the Sequelize options to point to the reverse proxy.
+ * The reverse proxy will then redirect all the traffic to the database through the tunnel.
+ */
 export default class ReverseProxy extends Service {
-    private readonly errors;
-    private readonly connectedClients;
-    private readonly options;
-    private readonly targetHost;
-    private readonly targetPort;
-    get error(): Error | null;
-    constructor(proxyOptions: ProxyOptions, targetHost: string, targetPort: number);
-    closeListener(): Promise<void>;
-    connectListener(socket: net.Socket): Promise<void>;
+    private readonly server;
+    get host(): string;
+    get port(): number;
+    constructor();
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    protected connect(socket: net.Socket): Promise<net.Socket>;
 }
 //# sourceMappingURL=reverse-proxy.d.ts.map

package/dist/connection/services/reverse-proxy.js

@@ -3,61 +3,66 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const socks_1 = require("socks");
+const net_1 = __importDefault(require("net"));
 const service_1 = __importDefault(require("./service"));
+/**
+ * ReverseProxy is used to redirect all the database requests.
+ * Sequelize does not take a socket as an argument,
+ * so we need to redirect all the traffic to a new socket.
+ * This is done by creating a server that will listen on a random port.
+ * We change the host and port of the Sequelize options to point to the reverse proxy.
+ * The reverse proxy will then redirect all the traffic to the database through the tunnel.
+ */
 class ReverseProxy extends service_1.default {
-    get error() {
-        return this.errors.length > 0 ? this.errors[0] : null;
+    get host() {
+        return this.server.address().address;
     }
-    constructor(proxyOptions, targetHost, targetPort) {
-        super();
-        this.errors = [];
-        this.connectedClients = new Set();
-        this.options = proxyOptions;
-        this.targetHost = targetHost;
-        this.targetPort = targetPort;
-        if (!this.targetHost)
-            throw new Error('Host is required');
-        if (!this.targetPort)
-            throw new Error('Port is required');
+    get port() {
+        return this.server.address().port;
     }
-    async closeListener() {
-        await super.closeListener();
-        this.connectedClients.forEach(client => client.destroy());
+    constructor() {
+        super(null, null, null, null);
+        this.server = net_1.default.createServer(this.connect.bind(this));
     }
-    async connectListener(socket) {
-        let socks5Proxy;
-        this.connectedClients.add(socket);
-        socket.on('error', error => {
-            this.errors.push(error);
-            if (!socket.closed)
-                socket.destroy(error);
-        });
-        socket.on('close', () => {
-            this.connectedClients.delete(socket);
-            if (!socks5Proxy?.socket.closed)
-                socks5Proxy?.socket.destroy();
+    start() {
+        return new Promise((resolve, reject) => {
+            this.server.on('error', reject);
+            // By using port 0, the operating system
+            // will assign an available port for the server to listen on.
+            this.server.listen(0, '127.0.0.1', resolve);
         });
+    }
+    async stop() {
         try {
-            socks5Proxy = await socks_1.SocksClient.createConnection({
-                proxy: { ...this.options, type: 5 },
-                command: 'connect',
-                destination: { host: this.targetHost, port: this.targetPort },
-                timeout: 4000,
-            });
-            socks5Proxy.socket.on('close', () => {
-                this.connectedClients.delete(socks5Proxy.socket);
-                if (!socket.closed)
-                    socket.destroy();
+            // close all the connected clients before closing the server
+            await super.stop();
+        }
+        finally {
+            await new Promise((resolve, reject) => {
+                this.server.close(e => {
+                    if (e)
+                        reject(e);
+                    else
+                        resolve();
+                });
             });
-            socks5Proxy.socket.on('error', socket.destroy);
-            socks5Proxy.socket.pipe(socket).pipe(socks5Proxy.socket);
-            await super.connectListener(socks5Proxy.socket);
         }
-        catch (err) {
-            socket.destroy(err);
+    }
+    async connect(socket) {
+        try {
+            this.addConnectedClient(socket);
+            socket.on('close', () => this.destroySocketIfUnclosedAndSaveError(socket));
+            socket.on('error', error => this.destroySocketIfUnclosedAndSaveError(socket, error));
+            const tunnel = await super.connect();
+            if (tunnel)
+                tunnel.pipe(socket).pipe(tunnel);
+            return tunnel;
+        }
+        catch (error) {
+            this.destroySocketIfUnclosedAndSaveError(socket, error);
+            // don't throw the error to avoid crashing the server because the error is already handled
         }
     }
 }
 exports.default = ReverseProxy;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV2ZXJzZS1wcm94eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25uZWN0aW9uL3NlcnZpY2VzL3JldmVyc2UtcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSxpQ0FBb0M7QUFHcEMsd0RBQWdDO0FBR2hDLE1BQXFCLFlBQWEsU0FBUSxpQkFBTztJQU8vQyxJQUFJLEtBQUs7UUFDUCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0lBQ3hELENBQUM7SUFFRCxZQUFZLFlBQTBCLEVBQUUsVUFBa0IsRUFBRSxVQUFrQjtRQUM1RSxLQUFLLEVBQUUsQ0FBQztRQVhPLFdBQU0sR0FBWSxFQUFFLENBQUM7UUFDckIscUJBQWdCLEdBQW9CLElBQUksR0FBRyxFQUFFLENBQUM7UUFXN0QsSUFBSSxDQUFDLE9BQU8sR0FBRyxZQUFZLENBQUM7UUFDNUIsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7UUFDN0IsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7UUFDN0IsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVO1lBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQzFELElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVTtZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRVEsS0FBSyxDQUFDLGFBQWE7UUFDMUIsTUFBTSxLQUFLLENBQUMsYUFBYSxFQUFFLENBQUM7UUFDNUIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFUSxLQUFLLENBQUMsZUFBZSxDQUFDLE1BQWtCO1FBQy9DLElBQUksV0FBd0MsQ0FBQztRQUM3QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRWxDLE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxFQUFFO1lBQ3pCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3hCLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTTtnQkFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVDLENBQUMsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFO1lBQ3RCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDckMsSUFBSSxDQUFDLFdBQVcsRUFBRSxNQUFNLENBQUMsTUFBTTtnQkFBRSxXQUFXLEVBQUUsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2pFLENBQUMsQ0FBQyxDQUFDO1FBRUgsSUFBSTtZQUNGLFdBQVcsR0FBRyxNQUFNLG1CQUFXLENBQUMsZ0JBQWdCLENBQUM7Z0JBQy9DLEtBQUssRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFO2dCQUNuQyxPQUFPLEVBQUUsU0FBUztnQkFDbEIsV0FBVyxFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUU7Z0JBQzdELE9BQU8sRUFBRSxJQUFJO2FBQ2QsQ0FBQyxDQUFDO1lBRUgsV0FBVyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTtnQkFDbEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ2pELElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTTtvQkFBRSxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDdkMsQ0FBQyxDQUFDLENBQUM7WUFDSCxXQUFXLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQy9DLFdBQVcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFekQsTUFBTSxLQUFLLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUNqRDtRQUFDLE9BQU8sR0FBRyxFQUFFO1lBQ1osTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFZLENBQUMsQ0FBQztTQUM5QjtJQUNILENBQUM7Q0FDRjtBQTFERCwrQkEwREMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV2ZXJzZS1wcm94eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25uZWN0aW9uL3NlcnZpY2VzL3JldmVyc2UtcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw4Q0FBc0I7QUFFdEIsd0RBQWdDO0FBRWhDOzs7Ozs7O0dBT0c7QUFDSCxNQUFxQixZQUFhLFNBQVEsaUJBQU87SUFHL0MsSUFBSSxJQUFJO1FBQ04sT0FBUSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBc0IsQ0FBQyxPQUFPLENBQUM7SUFDNUQsQ0FBQztJQUVELElBQUksSUFBSTtRQUNOLE9BQVEsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQXNCLENBQUMsSUFBSSxDQUFDO0lBQ3pELENBQUM7SUFFRDtRQUNFLEtBQUssQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUM5QixJQUFJLENBQUMsTUFBTSxHQUFHLGFBQUcsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUMxRCxDQUFDO0lBRUQsS0FBSztRQUNILE9BQU8sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDM0MsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1lBQ2hDLHdDQUF3QztZQUN4Qyw2REFBNkQ7WUFDN0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUM5QyxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFUSxLQUFLLENBQUMsSUFBSTtRQUNqQixJQUFJO1lBQ0YsNERBQTREO1lBQzVELE1BQU0sS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDO1NBQ3BCO2dCQUFTO1lBQ1IsTUFBTSxJQUFJLE9BQU8sQ0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtnQkFDMUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUU7b0JBQ3BCLElBQUksQ0FBQzt3QkFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7O3dCQUNaLE9BQU8sRUFBRSxDQUFDO2dCQUNqQixDQUFDLENBQUMsQ0FBQztZQUNMLENBQUMsQ0FBQyxDQUFDO1NBQ0o7SUFDSCxDQUFDO0lBRWtCLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBa0I7UUFDakQsSUFBSTtZQUNGLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNoQyxNQUFNLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsbUNBQW1DLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztZQUMzRSxNQUFNLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztZQUVyRixNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNyQyxJQUFJLE1BQU07Z0JBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFN0MsT0FBTyxNQUFNLENBQUM7U0FDZjtRQUFDLE9BQU8sS0FBSyxFQUFFO1lBQ2QsSUFBSSxDQUFDLG1DQUFtQyxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN4RCwwRkFBMEY7U0FDM0Y7SUFDSCxDQUFDO0NBQ0Y7QUF0REQsK0JBc0RDIn0=

package/dist/connection/services/service.d.ts

@@ -1,17 +1,28 @@
 /// <reference types="node" />
 import net from 'net';
-export type ConnectionCallback = (socket: net.Socket) => Promise<void>;
-export type CloseCallback = () => Promise<void>;
+export type ConnectionCallback = (socket: net.Socket) => Promise<net.Socket>;
+export type StopCallback = () => Promise<void>;
 export default abstract class Service {
-    private connectionCallback;
-    private closeCallback;
-    /** attach a callback when there is a new connection on the service. */
-    onConnect(callback: ConnectionCallback): void;
-    /** callback to execute when there is a new connection. */
-    connectListener(socket: net.Socket): Promise<void>;
-    /** attach a callback when a service is closing. */
-    onClose(callback: CloseCallback): void;
-    /** callback to execute when the service is closing. */
-    closeListener(): Promise<void>;
+    private linkedService;
+    private readonly connectedClients;
+    protected readonly errors: Error[];
+    protected readonly sourceHost: string;
+    protected readonly sourcePort: number;
+    protected readonly targetHost: string;
+    protected readonly targetPort: number;
+    get error(): Error | null;
+    protected get debugUri(): string;
+    protected get debugForwardUri(): string;
+    constructor(sourceHost: string, sourcePort: number, targetHost: string, targetPort: number);
+    /** link a service */
+    link(service: Service): void;
+    /** stop the service by stopping the linked service and destroying all its clients. */
+    stop(): Promise<void>;
+    /** call the linked service connection callback */
+    protected connect(socket?: net.Socket): Promise<net.Socket>;
+    /** destroy the given socket if it is not closed and save the error */
+    protected destroySocketIfUnclosedAndSaveError(socket?: net.Socket, error?: Error): void;
+    /** register a socket as a client to be destroyed when the service is stopped */
+    protected addConnectedClient(client: net.Socket): void;
 }
 //# sourceMappingURL=service.d.ts.map

package/dist/connection/services/service.js

@@ -1,22 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class Service {
-    /** attach a callback when there is a new connection on the service. */
-    onConnect(callback) {
-        this.connectionCallback = callback;
+    get error() {
+        return this.errors.length > 0 ? this.errors[0] : null;
     }
-    /** callback to execute when there is a new connection. */
-    async connectListener(socket) {
-        await this.connectionCallback?.(socket);
+    get debugUri() {
+        return `${this.sourceHost}:${this.sourcePort}`;
     }
-    /** attach a callback when a service is closing. */
-    onClose(callback) {
-        this.closeCallback = callback;
+    get debugForwardUri() {
+        return `${this.targetHost}:${this.targetPort}`;
     }
-    /** callback to execute when the service is closing. */
-    async closeListener() {
-        await this.closeCallback?.();
+    constructor(sourceHost, sourcePort, targetHost, targetPort) {
+        this.connectedClients = new Set();
+        this.errors = [];
+        this.sourceHost = sourceHost;
+        this.sourcePort = sourcePort;
+        this.targetHost = targetHost;
+        this.targetPort = targetPort;
+    }
+    /** link a service */
+    link(service) {
+        this.linkedService = service;
+    }
+    /** stop the service by stopping the linked service and destroying all its clients. */
+    async stop() {
+        try {
+            await this.linkedService?.stop();
+        }
+        finally {
+            this.connectedClients.forEach(client => client.destroy());
+        }
+    }
+    /** call the linked service connection callback */
+    async connect(socket) {
+        return (await this.linkedService?.connect(socket)) || socket;
+    }
+    /** destroy the given socket if it is not closed and save the error */
+    destroySocketIfUnclosedAndSaveError(socket, error) {
+        if (error)
+            this.errors.push(error);
+        if (socket) {
+            if (!socket.closed)
+                socket.destroy();
+            this.connectedClients.delete(socket);
+        }
+    }
+    /** register a socket as a client to be destroyed when the service is stopped */
+    addConnectedClient(client) {
+        this.connectedClients.add(client);
     }
 }
 exports.default = Service;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25uZWN0aW9uL3NlcnZpY2VzL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFLQSxNQUE4QixPQUFPO0lBSW5DLHVFQUF1RTtJQUN2RSxTQUFTLENBQUMsUUFBNEI7UUFDcEMsSUFBSSxDQUFDLGtCQUFrQixHQUFHLFFBQVEsQ0FBQztJQUNyQyxDQUFDO0lBRUQsMERBQTBEO0lBQzFELEtBQUssQ0FBQyxlQUFlLENBQUMsTUFBa0I7UUFDdEMsTUFBTSxJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBRUQsbURBQW1EO0lBQ25ELE9BQU8sQ0FBQyxRQUF1QjtRQUM3QixJQUFJLENBQUMsYUFBYSxHQUFHLFFBQVEsQ0FBQztJQUNoQyxDQUFDO0lBRUQsdURBQXVEO0lBQ3ZELEtBQUssQ0FBQyxhQUFhO1FBQ2pCLE1BQU0sSUFBSSxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUM7SUFDL0IsQ0FBQztDQUNGO0FBdkJELDBCQXVCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25uZWN0aW9uL3NlcnZpY2VzL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFLQSxNQUE4QixPQUFPO0lBU25DLElBQUksS0FBSztRQUNQLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7SUFDeEQsQ0FBQztJQUVELElBQWMsUUFBUTtRQUNwQixPQUFPLEdBQUcsSUFBSSxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDakQsQ0FBQztJQUVELElBQWMsZUFBZTtRQUMzQixPQUFPLEdBQUcsSUFBSSxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDakQsQ0FBQztJQUVELFlBQVksVUFBa0IsRUFBRSxVQUFrQixFQUFFLFVBQWtCLEVBQUUsVUFBa0I7UUFuQnpFLHFCQUFnQixHQUFvQixJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQzVDLFdBQU0sR0FBWSxFQUFFLENBQUM7UUFtQnRDLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBQzdCLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBQzdCLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBQzdCLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO0lBQy9CLENBQUM7SUFFRCxxQkFBcUI7SUFDckIsSUFBSSxDQUFDLE9BQWdCO1FBQ25CLElBQUksQ0FBQyxhQUFhLEdBQUcsT0FBTyxDQUFDO0lBQy9CLENBQUM7SUFFRCxzRkFBc0Y7SUFDdEYsS0FBSyxDQUFDLElBQUk7UUFDUixJQUFJO1lBQ0YsTUFBTSxJQUFJLENBQUMsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDO1NBQ2xDO2dCQUFTO1lBQ1IsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1NBQzNEO0lBQ0gsQ0FBQztJQUVELGtEQUFrRDtJQUN4QyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQW1CO1FBQ3pDLE9BQU8sQ0FBQyxNQUFNLElBQUksQ0FBQyxhQUFhLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksTUFBTSxDQUFDO0lBQy9ELENBQUM7SUFFRCxzRUFBc0U7SUFDNUQsbUNBQW1DLENBQUMsTUFBbUIsRUFBRSxLQUFhO1FBQzlFLElBQUksS0FBSztZQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5DLElBQUksTUFBTSxFQUFFO1lBQ1YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNO2dCQUFFLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNyQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1NBQ3RDO0lBQ0gsQ0FBQztJQUVELGdGQUFnRjtJQUN0RSxrQkFBa0IsQ0FBQyxNQUFrQjtRQUM3QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3BDLENBQUM7Q0FDRjtBQTdERCwwQkE2REMifQ==

package/dist/connection/services/socks-proxy.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="node" />
+import net from 'net';
+import Service from './service';
+import { ProxyOptions } from '../../types';
+export default class SocksProxy extends Service {
+    private readonly options;
+    constructor(proxyOptions: ProxyOptions, targetHost: string, targetPort: number);
+    protected connect(): Promise<net.Socket>;
+}
+//# sourceMappingURL=socks-proxy.d.ts.map

package/dist/connection/services/socks-proxy.js

@@ -0,0 +1,47 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const socks_1 = require("socks");
+const service_1 = __importDefault(require("./service"));
+const errors_1 = require("../errors");
+class SocksProxy extends service_1.default {
+    constructor(proxyOptions, targetHost, targetPort) {
+        super(proxyOptions.host, proxyOptions.port, targetHost, targetPort);
+        this.options = proxyOptions;
+    }
+    async connect() {
+        let socks5Client;
+        try {
+            socks5Client = await socks_1.SocksClient.createConnection({
+                proxy: { ...this.options, type: 5 },
+                command: 'connect',
+                destination: { host: this.targetHost, port: this.targetPort },
+                timeout: 4000,
+            });
+            this.addConnectedClient(socks5Client.socket);
+            socks5Client.socket.on('close', () => this.destroySocketIfUnclosedAndSaveError(socks5Client.socket));
+            socks5Client.socket.on('error', error => this.destroySocketIfUnclosedAndSaveError(socks5Client.socket, new errors_1.ProxyConnectError(error.message, this.debugUri)));
+            const tunnel = await super.connect(socks5Client.socket);
+            if (tunnel) {
+                // destroy the proxy socket when the tunnel is closed or an error occurs
+                // this is very important to avoid unclose database connections
+                tunnel.on('close', () => this.destroySocketIfUnclosedAndSaveError(socks5Client.socket));
+                tunnel.on('error', error => this.destroySocketIfUnclosedAndSaveError(socks5Client.socket, new errors_1.ProxyConnectError(error.message, this.debugUri)));
+            }
+            return tunnel;
+        }
+        catch (error) {
+            let serviceError = new errors_1.ProxyConnectError(error.message, this.debugUri);
+            if (error.message.includes('Socket closed') ||
+                error.message.includes('Socks5 proxy rejected connection')) {
+                serviceError = new errors_1.ProxyForwardError(error.message, this.debugForwardUri);
+            }
+            this.destroySocketIfUnclosedAndSaveError(socks5Client?.socket, serviceError);
+            throw serviceError;
+        }
+    }
+}
+exports.default = SocksProxy;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja3MtcHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29ubmVjdGlvbi9zZXJ2aWNlcy9zb2Nrcy1wcm94eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLGlDQUFvQztBQUdwQyx3REFBZ0M7QUFFaEMsc0NBQWlFO0FBRWpFLE1BQXFCLFVBQVcsU0FBUSxpQkFBTztJQUc3QyxZQUFZLFlBQTBCLEVBQUUsVUFBa0IsRUFBRSxVQUFrQjtRQUM1RSxLQUFLLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxZQUFZLENBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQztRQUNwRSxJQUFJLENBQUMsT0FBTyxHQUFHLFlBQVksQ0FBQztJQUM5QixDQUFDO0lBRWtCLEtBQUssQ0FBQyxPQUFPO1FBQzlCLElBQUksWUFBeUMsQ0FBQztRQUU5QyxJQUFJO1lBQ0YsWUFBWSxHQUFHLE1BQU0sbUJBQVcsQ0FBQyxnQkFBZ0IsQ0FBQztnQkFDaEQsS0FBSyxFQUFFLEVBQUUsR0FBRyxJQUFJLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUU7Z0JBQ25DLE9BQU8sRUFBRSxTQUFTO2dCQUNsQixXQUFXLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRTtnQkFDN0QsT0FBTyxFQUFFLElBQUk7YUFDZCxDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsa0JBQWtCLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzdDLFlBQVksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FDbkMsSUFBSSxDQUFDLG1DQUFtQyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FDOUQsQ0FBQztZQUNGLFlBQVksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsRUFBRSxDQUN0QyxJQUFJLENBQUMsbUNBQW1DLENBQ3RDLFlBQVksQ0FBQyxNQUFNLEVBQ25CLElBQUksMEJBQWlCLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQ3BELENBQ0YsQ0FBQztZQUVGLE1BQU0sTUFBTSxHQUFHLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUM7WUFFeEQsSUFBSSxNQUFNLEVBQUU7Z0JBQ1Ysd0VBQXdFO2dCQUN4RSwrREFBK0Q7Z0JBQy9ELE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDeEYsTUFBTSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLEVBQUUsQ0FDekIsSUFBSSxDQUFDLG1DQUFtQyxDQUN0QyxZQUFZLENBQUMsTUFBTSxFQUNuQixJQUFJLDBCQUFpQixDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUNwRCxDQUNGLENBQUM7YUFDSDtZQUVELE9BQU8sTUFBTSxDQUFDO1NBQ2Y7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNkLElBQUksWUFBWSxHQUFHLElBQUksMEJBQWlCLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7WUFFdkUsSUFDRSxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUM7Z0JBQ3ZDLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLGtDQUFrQyxDQUFDLEVBQzFEO2dCQUNBLFlBQVksR0FBRyxJQUFJLDBCQUFpQixDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDO2FBQzNFO1lBRUQsSUFBSSxDQUFDLG1DQUFtQyxDQUFDLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxDQUFDLENBQUM7WUFDN0UsTUFBTSxZQUFZLENBQUM7U0FDcEI7SUFDSCxDQUFDO0NBQ0Y7QUExREQsNkJBMERDIn0=

package/dist/connection/services/ssh-tunnel.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import net from 'net';
+import Service from './service';
+import { SshOptions } from '../../types';
+export default class SshTunnel extends Service {
+    private readonly options;
+    private readonly clients;
+    constructor(options: SshOptions, targetHost: string, targetPort: number);
+    stop(): Promise<void>;
+    connect(socket?: net.Socket): Promise<net.Socket>;
+    private buildTunnel;
+    private endClient;
+}
+//# sourceMappingURL=ssh-tunnel.d.ts.map

package/dist/connection/services/ssh-tunnel.js

@@ -0,0 +1,73 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ssh2_1 = require("ssh2");
+const service_1 = __importDefault(require("./service"));
+const errors_1 = require("../errors");
+class SshTunnel extends service_1.default {
+    constructor(options, targetHost, targetPort) {
+        super(options.host, options.port, targetHost, targetPort);
+        this.clients = new Set();
+        this.options = options;
+    }
+    async stop() {
+        try {
+            await super.stop();
+        }
+        finally {
+            this.clients.forEach(client => this.endClient(client));
+        }
+    }
+    async connect(socket) {
+        const client = new ssh2_1.Client();
+        // list all the clients to be able to close them all when the service is stopped
+        this.clients.add(client);
+        try {
+            return await new Promise((resolve, reject) => {
+                client.on('error', e => reject(new errors_1.SshConnectError(e.message, this.debugUri)));
+                client.on('ready', async () => {
+                    try {
+                        resolve(await this.buildTunnel(client));
+                    }
+                    catch (error) {
+                        reject(error);
+                    }
+                });
+                // connect to the SSH server
+                // will trigger the 'ready' event if the connection is successful
+                // if the connection fails, the 'error' event will be triggered
+                client.connect({ ...this.options, sock: socket });
+            });
+        }
+        catch (error) {
+            this.endClient(client);
+            this.errors.push(error);
+            throw error;
+        }
+    }
+    async buildTunnel(client) {
+        // tell to the SSH server to forward all the traffic to the target host and port
+        return new Promise((resolve, reject) => {
+            // source host and port are not used by the SSH server
+            client.forwardOut('', 0, this.targetHost, this.targetPort, async (error, stream) => {
+                if (error)
+                    return reject(new errors_1.SshForwardError(error.message, this.debugForwardUri));
+                this.addConnectedClient(stream);
+                stream.on('error', e => this.destroySocketIfUnclosedAndSaveError(stream, new errors_1.SshConnectError(e.message, this.debugUri)));
+                stream.on('close', () => {
+                    this.destroySocketIfUnclosedAndSaveError(stream);
+                    this.endClient(client);
+                });
+                return resolve(await super.connect(stream));
+            });
+        });
+    }
+    endClient(client) {
+        client.end();
+        this.clients.delete(client);
+    }
+}
+exports.default = SshTunnel;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NoLXR1bm5lbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25uZWN0aW9uL3NlcnZpY2VzL3NzaC10dW5uZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSwrQkFBOEI7QUFFOUIsd0RBQWdDO0FBRWhDLHNDQUE2RDtBQUU3RCxNQUFxQixTQUFVLFNBQVEsaUJBQU87SUFJNUMsWUFBWSxPQUFtQixFQUFFLFVBQWtCLEVBQUUsVUFBa0I7UUFDckUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFIM0MsWUFBTyxHQUFHLElBQUksR0FBRyxFQUFVLENBQUM7UUFJM0MsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDekIsQ0FBQztJQUVRLEtBQUssQ0FBQyxJQUFJO1FBQ2pCLElBQUk7WUFDRixNQUFNLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztTQUNwQjtnQkFBUztZQUNSLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1NBQ3hEO0lBQ0gsQ0FBQztJQUVRLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBbUI7UUFDeEMsTUFBTSxNQUFNLEdBQUcsSUFBSSxhQUFNLEVBQUUsQ0FBQztRQUM1QixnRkFBZ0Y7UUFDaEYsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFekIsSUFBSTtZQUNGLE9BQU8sTUFBTSxJQUFJLE9BQU8sQ0FBYSxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtnQkFDdkQsTUFBTSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSx3QkFBZSxDQUFDLENBQUMsQ0FBQyxP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

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 import { Options } from 'sequelize/types';
+import { ConnectConfig } from 'ssh2';
 type SupportedSequelizeOptions = Pick<Options, 'database' | 'dialect' | 'dialectModule' | 'dialectModulePath' | 'dialectOptions' | 'host' | 'minifyAliases' | 'native' | 'password' | 'pool' | 'port' | 'protocol' | 'replication' | 'schema' | 'ssl' | 'storage' | 'username'>;
 export type ProxyOptions = {
     userId?: string;
@@ -8,10 +9,13 @@ export type ProxyOptions = {
     version?: 5;
     command?: 'connect';
 };
+export type SshOptions = Omit<ConnectConfig, 'sock'>;
 export type PlainConnectionOptions = SupportedSequelizeOptions & {
     uri?: string;
     sslMode?: SslMode;
     proxySocks?: ProxyOptions;
+    ssh?: SshOptions;
+    connectionTimeoutInMs?: number;
 };
 export type PlainConnectionOptionsOrUri = PlainConnectionOptions | string;
 export type SslMode = 'preferred' | 'disabled' | 'required' | 'verify' | 'manual';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/datasource-sql",
-  "version": "1.6.10",
+  "version": "1.7.0",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -16,7 +16,9 @@
     "@forestadmin/datasource-toolkit": "1.5.0",
     "pluralize": "^8.0.0",
     "sequelize": "^6.28.0",
-    "socks": "^2.7.1"
+    "socks": "^2.7.1",
+    "ssh2": "^1.14.0",
+    "@types/ssh2": "^1.11.11"
   },
   "files": [
     "dist/**/*.js",

package/dist/connection/services/sequelize-factory.d.ts

@@ -1,8 +0,0 @@
-import { Sequelize } from 'sequelize';
-import { Options as SequelizeOptions } from 'sequelize/types/sequelize';
-import Service from './service';
-export default class SequelizeFactory extends Service {
-    build(sequelizeCtorOptions: [SequelizeOptions] | [string, SequelizeOptions]): Sequelize;
-    private overrideCloseMethod;
-}
-//# sourceMappingURL=sequelize-factory.d.ts.map

package/dist/connection/services/sequelize-factory.js

@@ -1,30 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const sequelize_1 = require("sequelize");
-const service_1 = __importDefault(require("./service"));
-class SequelizeFactory extends service_1.default {
-    build(sequelizeCtorOptions) {
-        const sequelize = sequelizeCtorOptions.length === 1
-            ? new sequelize_1.Sequelize(sequelizeCtorOptions[0])
-            : new sequelize_1.Sequelize(sequelizeCtorOptions[0], sequelizeCtorOptions[1]);
-        this.overrideCloseMethod(sequelize);
-        return sequelize;
-    }
-    overrideCloseMethod(sequelize) {
-        const closeListener = this.closeListener.bind(this);
-        // override close method to ensure to execute the closeListener
-        sequelize.close = async function close() {
-            try {
-                await sequelize_1.Sequelize.prototype.close.call(this);
-            }
-            finally {
-                await closeListener();
-            }
-        };
-    }
-}
-exports.default = SequelizeFactory;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVsaXplLWZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29ubmVjdGlvbi9zZXJ2aWNlcy9zZXF1ZWxpemUtZmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHlDQUFzQztBQUd0Qyx3REFBZ0M7QUFFaEMsTUFBcUIsZ0JBQWlCLFNBQVEsaUJBQU87SUFDbkQsS0FBSyxDQUFDLG9CQUFxRTtRQUN6RSxNQUFNLFNBQVMsR0FDYixvQkFBb0IsQ0FBQyxNQUFNLEtBQUssQ0FBQztZQUMvQixDQUFDLENBQUMsSUFBSSxxQkFBUyxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3hDLENBQUMsQ0FBQyxJQUFJLHFCQUFTLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUV0RSxJQUFJLENBQUMsbUJBQW1CLENBQUMsU0FBUyxDQUFDLENBQUM7UUFFcEMsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVPLG1CQUFtQixDQUFDLFNBQW9CO1FBQzlDLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRXBELCtEQUErRDtRQUMvRCxTQUFTLENBQUMsS0FBSyxHQUFHLEtBQUssVUFBVSxLQUFLO1lBQ3BDLElBQUk7Z0JBQ0YsTUFBTSxxQkFBUyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQzVDO29CQUFTO2dCQUNSLE1BQU0sYUFBYSxFQUFFLENBQUM7YUFDdkI7UUFDSCxDQUFDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUF4QkQsbUNBd0JDIn0=

package/dist/connection/services/tcp-server.d.ts

@@ -1,12 +0,0 @@
-import Service from './service';
-/** TcpServer is used as proxy to redirect all the database requests */
-export default class TcpServer extends Service {
-    private readonly server;
-    get host(): string;
-    get port(): number;
-    constructor();
-    start(): Promise<void>;
-    stop(): Promise<void>;
-    closeListener(): Promise<void>;
-}
-//# sourceMappingURL=tcp-server.d.ts.map

package/dist/connection/services/tcp-server.js

@@ -1,48 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const net_1 = __importDefault(require("net"));
-const service_1 = __importDefault(require("./service"));
-/** TcpServer is used as proxy to redirect all the database requests */
-class TcpServer extends service_1.default {
-    get host() {
-        return this.server.address().address;
-    }
-    get port() {
-        return this.server.address().port;
-    }
-    constructor() {
-        super();
-        this.server = net_1.default.createServer(this.connectListener.bind(this));
-    }
-    start() {
-        return new Promise((resolve, reject) => {
-            this.server.on('error', reject);
-            // By using port 0, the operating system
-            // will assign an available port for the server to listen on.
-            this.server.listen(0, '127.0.0.1', resolve);
-        });
-    }
-    async stop() {
-        try {
-            await super.closeListener();
-        }
-        finally {
-            await new Promise((resolve, reject) => {
-                this.server.close(e => {
-                    if (e)
-                        reject(e);
-                    else
-                        resolve();
-                });
-            });
-        }
-    }
-    async closeListener() {
-        await this.stop();
-    }
-}
-exports.default = TcpServer;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGNwLXNlcnZlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25uZWN0aW9uL3NlcnZpY2VzL3RjcC1zZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw4Q0FBc0I7QUFFdEIsd0RBQWdDO0FBRWhDLHVFQUF1RTtBQUN2RSxNQUFxQixTQUFVLFNBQVEsaUJBQU87SUFHNUMsSUFBSSxJQUFJO1FBQ04sT0FBUSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBc0IsQ0FBQyxPQUFPLENBQUM7SUFDNUQsQ0FBQztJQUVELElBQUksSUFBSTtRQUNOLE9BQVEsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQXNCLENBQUMsSUFBSSxDQUFDO0lBQ3pELENBQUM7SUFFRDtRQUNFLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLE1BQU0sR0FBRyxhQUFHLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUVELEtBQUs7UUFDSCxPQUFPLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQzNDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztZQUNoQyx3Q0FBd0M7WUFDeEMsNkRBQTZEO1lBQzdELElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDOUMsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQUk7UUFDUixJQUFJO1lBQ0YsTUFBTSxLQUFLLENBQUMsYUFBYSxFQUFFLENBQUM7U0FDN0I7Z0JBQVM7WUFDUixNQUFNLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO2dCQUMxQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRTtvQkFDcEIsSUFBSSxDQUFDO3dCQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQzs7d0JBQ1osT0FBTyxFQUFFLENBQUM7Z0JBQ2pCLENBQUMsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7U0FDSjtJQUNILENBQUM7SUFFUSxLQUFLLENBQUMsYUFBYTtRQUMxQixNQUFNLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUF6Q0QsNEJBeUNDIn0=