n8n-nodes-base 1.48.1 → 1.50.0

package/dist/nodes/Merge/v3/helpers/utils.js

@@ -0,0 +1,295 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configuredInputs = void 0;
+exports.addSuffixToEntriesKeys = addSuffixToEntriesKeys;
+exports.findMatches = findMatches;
+exports.selectMergeMethod = selectMergeMethod;
+exports.mergeMatched = mergeMatched;
+exports.checkMatchFieldsInput = checkMatchFieldsInput;
+exports.checkInput = checkInput;
+exports.addSourceField = addSourceField;
+exports.getNodeInputsData = getNodeInputsData;
+const n8n_workflow_1 = require("n8n-workflow");
+const assign_1 = __importDefault(require("lodash/assign"));
+const assignWith_1 = __importDefault(require("lodash/assignWith"));
+const get_1 = __importDefault(require("lodash/get"));
+const merge_1 = __importDefault(require("lodash/merge"));
+const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
+const utilities_1 = require("../../../../utils/utilities");
+function addSuffixToEntriesKeys(data, suffix) {
+    return data.map((entry) => {
+        const json = {};
+        Object.keys(entry.json).forEach((key) => {
+            json[`${key}_${suffix}`] = entry.json[key];
+        });
+        return { ...entry, json };
+    });
+}
+function findAllMatches(data, lookup, disableDotNotation, isEntriesEqual) {
+    return data.reduce((acc, entry2, i) => {
+        if (entry2 === undefined)
+            return acc;
+        for (const key of Object.keys(lookup)) {
+            const expectedValue = lookup[key];
+            let entry2FieldValue;
+            if (disableDotNotation) {
+                entry2FieldValue = entry2.json[key];
+            }
+            else {
+                entry2FieldValue = (0, get_1.default)(entry2.json, key);
+            }
+            if (!isEntriesEqual(expectedValue, entry2FieldValue)) {
+                return acc;
+            }
+        }
+        return acc.concat({
+            entry: entry2,
+            index: i,
+        });
+    }, []);
+}
+function findFirstMatch(data, lookup, disableDotNotation, isEntriesEqual) {
+    const index = data.findIndex((entry2) => {
+        if (entry2 === undefined)
+            return false;
+        for (const key of Object.keys(lookup)) {
+            const expectedValue = lookup[key];
+            let entry2FieldValue;
+            if (disableDotNotation) {
+                entry2FieldValue = entry2.json[key];
+            }
+            else {
+                entry2FieldValue = (0, get_1.default)(entry2.json, key);
+            }
+            if (!isEntriesEqual(expectedValue, entry2FieldValue)) {
+                return false;
+            }
+        }
+        return true;
+    });
+    if (index === -1)
+        return [];
+    return [{ entry: data[index], index }];
+}
+function findMatches(input1, input2, fieldsToMatch, options) {
+    const data1 = [...input1];
+    const data2 = [...input2];
+    const isEntriesEqual = (0, utilities_1.fuzzyCompare)(options.fuzzyCompare);
+    const disableDotNotation = options.disableDotNotation || false;
+    const multipleMatches = options.multipleMatches || 'all';
+    const filteredData = {
+        matched: [],
+        matched2: [],
+        unmatched1: [],
+        unmatched2: [],
+    };
+    const matchedInInput2 = new Set();
+    matchesLoop: for (const entry1 of data1) {
+        const lookup = {};
+        fieldsToMatch.forEach((matchCase) => {
+            let valueToCompare;
+            if (disableDotNotation) {
+                valueToCompare = entry1.json[matchCase.field1];
+            }
+            else {
+                valueToCompare = (0, get_1.default)(entry1.json, matchCase.field1);
+            }
+            lookup[matchCase.field2] = valueToCompare;
+        });
+        for (const fieldValue of Object.values(lookup)) {
+            if (fieldValue === undefined) {
+                filteredData.unmatched1.push(entry1);
+                continue matchesLoop;
+            }
+        }
+        const foundedMatches = multipleMatches === 'all'
+            ? findAllMatches(data2, lookup, disableDotNotation, isEntriesEqual)
+            : findFirstMatch(data2, lookup, disableDotNotation, isEntriesEqual);
+        const matches = foundedMatches.map((match) => match.entry);
+        foundedMatches.map((match) => matchedInInput2.add(match.index));
+        if (matches.length) {
+            if (options.outputDataFrom === 'both' ||
+                options.joinMode === 'enrichInput1' ||
+                options.joinMode === 'enrichInput2') {
+                matches.forEach((match) => {
+                    filteredData.matched.push({
+                        entry: entry1,
+                        matches: [match],
+                    });
+                });
+            }
+            else {
+                filteredData.matched.push({
+                    entry: entry1,
+                    matches,
+                });
+            }
+        }
+        else {
+            filteredData.unmatched1.push(entry1);
+        }
+    }
+    data2.forEach((entry, i) => {
+        if (matchedInInput2.has(i)) {
+            filteredData.matched2.push(entry);
+        }
+        else {
+            filteredData.unmatched2.push(entry);
+        }
+    });
+    return filteredData;
+}
+function selectMergeMethod(clashResolveOptions) {
+    const mergeMode = clashResolveOptions.mergeMode;
+    if (clashResolveOptions.overrideEmpty) {
+        function customizer(targetValue, srcValue) {
+            if (srcValue === undefined || srcValue === null || srcValue === '') {
+                return targetValue;
+            }
+        }
+        if (mergeMode === 'deepMerge') {
+            return (target, ...source) => {
+                const targetCopy = Object.assign({}, target);
+                return (0, mergeWith_1.default)(targetCopy, ...source, customizer);
+            };
+        }
+        if (mergeMode === 'shallowMerge') {
+            return (target, ...source) => {
+                const targetCopy = Object.assign({}, target);
+                return (0, assignWith_1.default)(targetCopy, ...source, customizer);
+            };
+        }
+    }
+    else {
+        if (mergeMode === 'deepMerge') {
+            return (target, ...source) => (0, merge_1.default)({}, target, ...source);
+        }
+        if (mergeMode === 'shallowMerge') {
+            return (target, ...source) => (0, assign_1.default)({}, target, ...source);
+        }
+    }
+    return (target, ...source) => (0, merge_1.default)({}, target, ...source);
+}
+function mergeMatched(matched, clashResolveOptions, joinMode) {
+    const returnData = [];
+    let resolveClash = clashResolveOptions.resolveClash;
+    const mergeIntoSingleObject = selectMergeMethod(clashResolveOptions);
+    for (const match of matched) {
+        let { entry, matches } = match;
+        let json = {};
+        let binary = {};
+        let pairedItem = [];
+        if (resolveClash === 'addSuffix') {
+            const suffix1 = '1';
+            const suffix2 = '2';
+            [entry] = addSuffixToEntriesKeys([entry], suffix1);
+            matches = addSuffixToEntriesKeys(matches, suffix2);
+            json = mergeIntoSingleObject({ ...entry.json }, ...matches.map((item) => item.json));
+            binary = mergeIntoSingleObject({ ...entry.binary }, ...matches.map((item) => item.binary));
+            pairedItem = [
+                ...(0, utilities_1.preparePairedItemDataArray)(entry.pairedItem),
+                ...matches.map((item) => (0, utilities_1.preparePairedItemDataArray)(item.pairedItem)).flat(),
+            ];
+        }
+        else {
+            const preferInput1 = 'preferInput1';
+            const preferLast = 'preferLast';
+            if (resolveClash === undefined) {
+                if (joinMode !== 'enrichInput2') {
+                    resolveClash = 'preferLast';
+                }
+                else {
+                    resolveClash = 'preferInput1';
+                }
+            }
+            if (resolveClash === preferInput1) {
+                const [firstMatch, ...restMatches] = matches;
+                json = mergeIntoSingleObject({ ...firstMatch.json }, ...restMatches.map((item) => item.json), entry.json);
+                binary = mergeIntoSingleObject({ ...firstMatch.binary }, ...restMatches.map((item) => item.binary), entry.binary);
+                pairedItem = [
+                    ...(0, utilities_1.preparePairedItemDataArray)(firstMatch.pairedItem),
+                    ...restMatches.map((item) => (0, utilities_1.preparePairedItemDataArray)(item.pairedItem)).flat(),
+                    ...(0, utilities_1.preparePairedItemDataArray)(entry.pairedItem),
+                ];
+            }
+            if (resolveClash === preferLast) {
+                json = mergeIntoSingleObject({ ...entry.json }, ...matches.map((item) => item.json));
+                binary = mergeIntoSingleObject({ ...entry.binary }, ...matches.map((item) => item.binary));
+                pairedItem = [
+                    ...(0, utilities_1.preparePairedItemDataArray)(entry.pairedItem),
+                    ...matches.map((item) => (0, utilities_1.preparePairedItemDataArray)(item.pairedItem)).flat(),
+                ];
+            }
+        }
+        returnData.push({
+            json,
+            binary,
+            pairedItem,
+        });
+    }
+    return returnData;
+}
+function checkMatchFieldsInput(data) {
+    if (data.length === 1 && data[0].field1 === '' && data[0].field2 === '') {
+        throw new n8n_workflow_1.ApplicationError('You need to define at least one pair of fields in "Fields to Match" to match on', { level: 'warning' });
+    }
+    for (const [index, pair] of data.entries()) {
+        if (pair.field1 === '' || pair.field2 === '') {
+            throw new n8n_workflow_1.ApplicationError(`You need to define both fields in "Fields to Match" for pair ${index + 1},
+				 field 1 = '${pair.field1}'
+				 field 2 = '${pair.field2}'`, { level: 'warning' });
+        }
+    }
+    return data;
+}
+function checkInput(input, fields, disableDotNotation, inputLabel) {
+    for (const field of fields) {
+        const isPresent = (input || []).some((entry) => {
+            if (disableDotNotation) {
+                return entry.json.hasOwnProperty(field);
+            }
+            return (0, get_1.default)(entry.json, field, undefined) !== undefined;
+        });
+        if (!isPresent) {
+            throw new n8n_workflow_1.ApplicationError(`Field '${field}' is not present in any of items in '${inputLabel}'`, { level: 'warning' });
+        }
+    }
+    return input;
+}
+function addSourceField(data, sourceField) {
+    return data.map((entry) => {
+        const json = {
+            ...entry.json,
+            _source: sourceField,
+        };
+        return {
+            ...entry,
+            json,
+        };
+    });
+}
+const configuredInputs = (parameters) => {
+    return Array.from({ length: parameters.numberInputs || 2 }, (_, i) => ({
+        type: `${"main"}`,
+        displayName: `Input ${(i + 1).toString()}`,
+    }));
+};
+exports.configuredInputs = configuredInputs;
+function getNodeInputsData() {
+    var _a;
+    const returnData = [];
+    const inputs = n8n_workflow_1.NodeHelpers.getConnectionTypes(this.getNodeInputs()).filter((type) => type === "main");
+    for (let i = 0; i < inputs.length; i++) {
+        try {
+            returnData.push((_a = this.getInputData(i)) !== null && _a !== void 0 ? _a : []);
+        }
+        catch (error) {
+            returnData.push([]);
+        }
+    }
+    return returnData;
+}
+//# sourceMappingURL=utils.js.map

package/dist/nodes/Merge/v3/helpers/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../nodes/Merge/v3/helpers/utils.ts"],"names":[],"mappings":"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"}

package/dist/nodes/Merge/v3/methods/index.d.ts

@@ -0,0 +1 @@
+export * as loadOptions from './loadOptions';

package/dist/nodes/Merge/v3/methods/index.js

@@ -0,0 +1,28 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadOptions = void 0;
+exports.loadOptions = __importStar(require("./loadOptions"));
+//# sourceMappingURL=index.js.map

package/dist/nodes/Merge/v3/methods/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../nodes/Merge/v3/methods/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA6C"}

package/dist/nodes/Merge/v3/methods/loadOptions.d.ts

@@ -0,0 +1,3 @@
+import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+export declare function getResolveClashOptions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]>;
+export declare function getInputs(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]>;

package/dist/nodes/Merge/v3/methods/loadOptions.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getResolveClashOptions = getResolveClashOptions;
+exports.getInputs = getInputs;
+async function getResolveClashOptions() {
+    const numberOfInputs = this.getNodeParameter('numberInputs', 2);
+    if (numberOfInputs <= 2) {
+        return [
+            {
+                name: 'Always Add Input Number to Field Names',
+                value: 'addSuffix',
+            },
+            {
+                name: 'Prefer Input 1 Version',
+                value: 'preferInput1',
+            },
+            {
+                name: 'Prefer Input 2 Version',
+                value: 'preferLast',
+            },
+        ];
+    }
+    else {
+        return [
+            {
+                name: 'Always Add Input Number to Field Names',
+                value: 'addSuffix',
+            },
+            {
+                name: 'Use Earliest Version',
+                value: 'preferInput1',
+            },
+        ];
+    }
+}
+async function getInputs() {
+    const numberOfInputs = this.getNodeParameter('numberInputs', 2);
+    const returnData = [];
+    for (let i = 0; i < numberOfInputs; i++) {
+        returnData.push({
+            name: `${i + 1}`,
+            value: i + 1,
+        });
+    }
+    return returnData;
+}
+//# sourceMappingURL=loadOptions.js.map

package/dist/nodes/Merge/v3/methods/loadOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadOptions.js","sourceRoot":"","sources":["../../../../../nodes/Merge/v3/methods/loadOptions.ts"],"names":[],"mappings":";;AAEA,wDAgCC;AACD,8BAaC;AA9CM,KAAK,UAAU,sBAAsB;IAG3C,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAW,CAAC;IAE1E,IAAI,cAAc,IAAI,CAAC,EAAE,CAAC;QACzB,OAAO;YACN;gBACC,IAAI,EAAE,wCAAwC;gBAC9C,KAAK,EAAE,WAAW;aAClB;YACD;gBACC,IAAI,EAAE,wBAAwB;gBAC9B,KAAK,EAAE,cAAc;aACrB;YACD;gBACC,IAAI,EAAE,wBAAwB;gBAC9B,KAAK,EAAE,YAAY;aACnB;SACD,CAAC;IACH,CAAC;SAAM,CAAC;QACP,OAAO;YACN;gBACC,IAAI,EAAE,wCAAwC;gBAC9C,KAAK,EAAE,WAAW;aAClB;YACD;gBACC,IAAI,EAAE,sBAAsB;gBAC5B,KAAK,EAAE,cAAc;aACrB;SACD,CAAC;IACH,CAAC;AACF,CAAC;AACM,KAAK,UAAU,SAAS;IAC9B,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAW,CAAC;IAE1E,MAAM,UAAU,GAA2B,EAAE,CAAC;IAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,UAAU,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE;YAChB,KAAK,EAAE,CAAC,GAAG,CAAC;SACZ,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC;AACnB,CAAC"}

package/dist/nodes/MySql/v2/actions/router.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.router = router;
 const n8n_workflow_1 = require("n8n-workflow");
-const ssh2_1 = require("ssh2");
 const transport_1 = require("../transport");
 const utils_1 = require("../helpers/utils");
 const database = __importStar(require("./database/Database.resource"));
@@ -35,12 +34,8 @@ async function router() {
     const operation = this.getNodeParameter('operation', 0);
     const nodeOptions = this.getNodeParameter('options', 0);
     nodeOptions.nodeVersion = this.getNode().typeVersion;
-    const credentials = await this.getCredentials('mySql');
-    let sshClient = undefined;
-    if (credentials.sshTunnel) {
-        sshClient = new ssh2_1.Client();
-    }
-    const pool = await (0, transport_1.createPool)(credentials, nodeOptions, sshClient);
+    const credentials = (await this.getCredentials('mySql'));
+    const pool = await transport_1.createPool.call(this, credentials, nodeOptions);
     const runQueries = utils_1.configureQueryRunner.call(this, nodeOptions, pool);
     const mysqlNodeData = {
         resource,
@@ -56,13 +51,7 @@ async function router() {
                 throw new n8n_workflow_1.NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
         }
     }
-    catch (error) {
-        throw error;
-    }
     finally {
-        if (sshClient) {
-            sshClient.end();
-        }
         await pool.end();
     }
     return [returnData];

package/dist/nodes/MySql/v2/actions/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../../nodes/MySql/v2/actions/router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAYA,wBAqDC;AAhED,+CAAkD;AAElD,+BAA8B;AAI9B,4CAA0C;AAC1C,4CAAwD;AACxD,uEAAyD;AAGlD,KAAK,UAAU,MAAM;IAC3B,IAAI,UAAU,GAAyB,EAAE,CAAC;IAE1C,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAY,UAAU,EAAE,CAAC,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAExD,WAAW,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IAErD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAEvD,IAAI,SAAS,GAAuB,SAAS,CAAC;IAE9C,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3B,SAAS,GAAG,IAAI,aAAM,EAAE,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAU,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IAEnE,MAAM,UAAU,GAAgB,4BAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAEnF,MAAM,aAAa,GAAG;QACrB,QAAQ;QACR,SAAS;KACI,CAAC;IAEf,IAAI,CAAC;QACJ,QAAQ,aAAa,CAAC,QAAQ,EAAE,CAAC;YAChC,KAAK,UAAU;gBACd,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;gBAElC,UAAU,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAChE,IAAI,EACJ,KAAK,EACL,UAAU,EACV,WAAW,CACX,CAAC;gBACF,MAAM;YACP;gBACC,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,kBAAkB,SAAS,qBAAqB,CAChD,CAAC;QACJ,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,KAAK,CAAC;IACb,CAAC;YAAS,CAAC;QACV,IAAI,SAAS,EAAE,CAAC;YACf,SAAS,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,UAAU,CAAC,CAAC;AACrB,CAAC"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../../nodes/MySql/v2/actions/router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AASA,wBA2CC;AAnDD,+CAAkD;AAElD,4CAA0C;AAE1C,4CAAwD;AACxD,uEAAyD;AAGlD,KAAK,UAAU,MAAM;IAC3B,IAAI,UAAU,GAAyB,EAAE,CAAC;IAE1C,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAY,UAAU,EAAE,CAAC,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAExD,WAAW,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IAErD,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAyB,CAAC;IAEjF,MAAM,IAAI,GAAG,MAAM,sBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAEnE,MAAM,UAAU,GAAgB,4BAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAEnF,MAAM,aAAa,GAAG;QACrB,QAAQ;QACR,SAAS;KACI,CAAC;IAEf,IAAI,CAAC;QACJ,QAAQ,aAAa,CAAC,QAAQ,EAAE,CAAC;YAChC,KAAK,UAAU;gBACd,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;gBAElC,UAAU,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAChE,IAAI,EACJ,KAAK,EACL,UAAU,EACV,WAAW,CACX,CAAC;gBACF,MAAM;YACP;gBACC,MAAM,IAAI,iCAAkB,CAC3B,IAAI,CAAC,OAAO,EAAE,EACd,kBAAkB,SAAS,qBAAqB,CAChD,CAAC;QACJ,CAAC;IACF,CAAC;YAAS,CAAC;QACV,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,UAAU,CAAC,CAAC;AACrB,CAAC"}

package/dist/nodes/MySql/v2/helpers/interfaces.d.ts

@@ -1,5 +1,5 @@
 import type mysql2 from 'mysql2/promise';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IDataObject, INodeExecutionData, SSHCredentials } from 'n8n-workflow';
 export type Mysql2Connection = mysql2.Connection;
 export type Mysql2Pool = mysql2.Pool;
 export type Mysql2OkPacket = mysql2.OkPacket;
@@ -32,4 +32,25 @@ export declare const BATCH_MODE: {
     INDEPENDENTLY: string;
 };
 export type QueryMode = typeof SINGLE | typeof TRANSACTION | typeof INDEPENDENTLY;
+type WithSSL = {
+    ssl: false;
+} | {
+    ssl: true;
+    caCertificate: string;
+    clientCertificate: string;
+    clientPrivateKey: string;
+};
+type WithSSHTunnel = {
+    sshTunnel: false;
+} | ({
+    sshTunnel: true;
+} & SSHCredentials);
+export type MysqlNodeCredentials = {
+    host: string;
+    port: number;
+    database: string;
+    user: string;
+    password: string;
+    connectTimeout: number;
+} & WithSSL & WithSSHTunnel;
 export {};

package/dist/nodes/MySql/v2/methods/credentialTest.js

@@ -1,15 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mysqlConnectionTest = mysqlConnectionTest;
-const ssh2_1 = require("ssh2");
 const transport_1 = require("../transport");
 async function mysqlConnectionTest(credential) {
     const credentials = credential.data;
-    let sshClient = undefined;
-    if (credentials.sshTunnel) {
-        sshClient = new ssh2_1.Client();
-    }
-    const pool = await (0, transport_1.createPool)(credentials, {}, sshClient);
+    const pool = await transport_1.createPool.call(this, credentials);
     try {
         const connection = await pool.getConnection();
         connection.release();
@@ -21,9 +16,6 @@ async function mysqlConnectionTest(credential) {
         };
     }
     finally {
-        if (sshClient) {
-            sshClient.end();
-        }
         await pool.end();
     }
     return {

package/dist/nodes/MySql/v2/methods/credentialTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentialTest.js","sourceRoot":"","sources":["../../../../../nodes/MySql/v2/methods/credentialTest.ts"],"names":[],"mappings":";;AAUA,kDAgCC;AAnCD,+BAA8B;AAC9B,4CAA0C;AAEnC,KAAK,UAAU,mBAAmB,CAExC,UAAiC;IAEjC,MAAM,WAAW,GAAG,UAAU,CAAC,IAAsC,CAAC;IAEtE,IAAI,SAAS,GAAuB,SAAS,CAAC;IAE9C,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3B,SAAS,GAAG,IAAI,aAAM,EAAE,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAU,EAAC,WAAW,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAE1D,IAAI,CAAC;QACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,UAAU,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO;YACN,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,KAAK,CAAC,OAAO;SACtB,CAAC;IACH,CAAC;YAAS,CAAC;QACV,IAAI,SAAS,EAAE,CAAC;YACf,SAAS,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,OAAO;QACN,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,wBAAwB;KACjC,CAAC;AACH,CAAC"}
+{"version":3,"file":"credentialTest.js","sourceRoot":"","sources":["../../../../../nodes/MySql/v2/methods/credentialTest.ts"],"names":[],"mappings":";;AASA,kDAwBC;AA3BD,4CAA0C;AAGnC,KAAK,UAAU,mBAAmB,CAExC,UAAiC;IAEjC,MAAM,WAAW,GAAG,UAAU,CAAC,IAA4B,CAAC;IAE5D,MAAM,IAAI,GAAG,MAAM,sBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEtD,IAAI,CAAC;QACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,UAAU,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO;YACN,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,KAAK,CAAC,OAAO;SACtB,CAAC;IACH,CAAC;YAAS,CAAC;QACV,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,OAAO;QACN,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,wBAAwB;KACjC,CAAC;AACH,CAAC"}

package/dist/nodes/MySql/v2/methods/listSearch.js

@@ -1,16 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchTables = searchTables;
-const ssh2_1 = require("ssh2");
 const transport_1 = require("../transport");
 async function searchTables() {
-    const credentials = await this.getCredentials('mySql');
+    const credentials = (await this.getCredentials('mySql'));
     const nodeOptions = this.getNodeParameter('options', 0);
-    let sshClient = undefined;
-    if (credentials.sshTunnel) {
-        sshClient = new ssh2_1.Client();
-    }
-    const pool = await (0, transport_1.createPool)(credentials, nodeOptions, sshClient);
+    const pool = await transport_1.createPool.call(this, credentials, nodeOptions);
     try {
         const connection = await pool.getConnection();
         const query = 'SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE table_schema = ?';
@@ -24,13 +19,7 @@ async function searchTables() {
         }));
         return { results };
     }
-    catch (error) {
-        throw error;
-    }
     finally {
-        if (sshClient) {
-            sshClient.end();
-        }
         await pool.end();
     }
 }

package/dist/nodes/MySql/v2/methods/listSearch.js.map

@@ -1 +1 @@
-{"version":3,"file":"listSearch.js","sourceRoot":"","sources":["../../../../../nodes/MySql/v2/methods/listSearch.ts"],"names":[],"mappings":";;AAIA,oCAsCC;AAzCD,+BAA8B;AAC9B,4CAA0C;AAEnC,KAAK,UAAU,YAAY;IACjC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAgB,CAAC;IAEvE,IAAI,SAAS,GAAuB,SAAS,CAAC;IAE9C,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3B,SAAS,GAAG,IAAI,aAAM,EAAE,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAU,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IAEnE,IAAI,CAAC;QACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,MAAM,KAAK,GAAG,yEAAyE,CAAC;QACxF,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,QAAkB,CAAC,CAAC;QAEhD,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEvD,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5D,UAAU,CAAC,OAAO,EAAE,CAAC;QAErB,MAAM,OAAO,GAAI,QAA0B,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3D,IAAI,EAAG,KAAK,CAAC,UAAqB,IAAK,KAAK,CAAC,UAAqB;YAClE,KAAK,EAAG,KAAK,CAAC,UAAqB,IAAK,KAAK,CAAC,UAAqB;SACnE,CAAC,CAAC,CAAC;QAEJ,OAAO,EAAE,OAAO,EAAE,CAAC;IACpB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,KAAK,CAAC;IACb,CAAC;YAAS,CAAC;QACV,IAAI,SAAS,EAAE,CAAC;YACf,SAAS,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;AACF,CAAC"}
+{"version":3,"file":"listSearch.js","sourceRoot":"","sources":["../../../../../nodes/MySql/v2/methods/listSearch.ts"],"names":[],"mappings":";;AAIA,oCA4BC;AA/BD,4CAA0C;AAGnC,KAAK,UAAU,YAAY;IACjC,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAyB,CAAC;IAEjF,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAgB,CAAC;IAEvE,MAAM,IAAI,GAAG,MAAM,sBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAEnE,IAAI,CAAC;QACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,MAAM,KAAK,GAAG,yEAAyE,CAAC;QACxF,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,QAAkB,CAAC,CAAC;QAEhD,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEvD,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5D,UAAU,CAAC,OAAO,EAAE,CAAC;QAErB,MAAM,OAAO,GAAI,QAA0B,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3D,IAAI,EAAG,KAAK,CAAC,UAAqB,IAAK,KAAK,CAAC,UAAqB;YAClE,KAAK,EAAG,KAAK,CAAC,UAAqB,IAAK,KAAK,CAAC,UAAqB;SACnE,CAAC,CAAC,CAAC;QAEJ,OAAO,EAAE,OAAO,EAAE,CAAC;IACpB,CAAC;YAAS,CAAC;QACV,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;AACF,CAAC"}

package/dist/nodes/MySql/v2/methods/loadOptions.js

@@ -3,17 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getColumns = getColumns;
 exports.getColumnsMultiOptions = getColumnsMultiOptions;
 exports.getColumnsWithoutColumnToMatchOn = getColumnsWithoutColumnToMatchOn;
-const ssh2_1 = require("ssh2");
 const transport_1 = require("../transport");
 const utils_1 = require("../helpers/utils");
 async function getColumns() {
-    const credentials = await this.getCredentials('mySql');
+    const credentials = (await this.getCredentials('mySql'));
     const nodeOptions = this.getNodeParameter('options', 0);
-    let sshClient = undefined;
-    if (credentials.sshTunnel) {
-        sshClient = new ssh2_1.Client();
-    }
-    const pool = await (0, transport_1.createPool)(credentials, nodeOptions, sshClient);
+    const pool = await transport_1.createPool.call(this, credentials, nodeOptions);
     try {
         const connection = await pool.getConnection();
         const table = this.getNodeParameter('table', 0, {
@@ -27,13 +22,7 @@ async function getColumns() {
             description: `type: ${column.Type.toUpperCase()}, nullable: ${column.Null}`,
         }));
     }
-    catch (error) {
-        throw error;
-    }
     finally {
-        if (sshClient) {
-            sshClient.end();
-        }
         await pool.end();
     }
 }

package/dist/nodes/MySql/v2/methods/loadOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadOptions.js","sourceRoot":"","sources":["../../../../../nodes/MySql/v2/methods/loadOptions.ts"],"names":[],"mappings":";;AAKA,gCA4CC;AAED,wDAMC;AAED,4EAMC;AAhED,+BAA8B;AAC9B,4CAA0C;AAC1C,4CAAuD;AAEhD,KAAK,UAAU,UAAU;IAC/B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAgB,CAAC;IAEvE,IAAI,SAAS,GAAuB,SAAS,CAAC;IAE9C,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3B,SAAS,GAAG,IAAI,aAAM,EAAE,CAAC;IAC1B,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAU,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IAEnE,IAAI,CAAC;QACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE;YAC/C,YAAY,EAAE,IAAI;SAClB,CAAW,CAAC;QAEb,MAAM,OAAO,GAAG,CACf,MAAM,UAAU,CAAC,KAAK,CACrB,qBAAqB,IAAA,2BAAmB,EAAC,KAAK,CAAC,SAAS,IAAA,2BAAmB,EAC1E,WAAW,CAAC,QAAkB,CAC9B,EAAE,CACH,CACD,CAAC,CAAC,CAAkB,CAAC;QAEtB,UAAU,CAAC,OAAO,EAAE,CAAC;QAErB,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAmB,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI,EAAE,MAAM,CAAC,KAAe;YAC5B,KAAK,EAAE,MAAM,CAAC,KAAe;YAE7B,WAAW,EAAE,SAAU,MAAM,CAAC,IAAe,CAAC,WAAW,EAAE,eAC1D,MAAM,CAAC,IACR,EAAE;SACF,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,KAAK,CAAC;IACb,CAAC;YAAS,CAAC;QACV,IAAI,SAAS,EAAE,CAAC;YACf,SAAS,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;AACF,CAAC;AAEM,KAAK,UAAU,sBAAsB;IAG3C,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IACxE,OAAO,CAAC,SAAS,EAAE,GAAG,UAAU,CAAC,CAAC;AACnC,CAAC;AAEM,KAAK,UAAU,gCAAgC;IAGrD,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAW,CAAC;IAC3E,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,eAAe,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"file":"loadOptions.js","sourceRoot":"","sources":["../../../../../nodes/MySql/v2/methods/loadOptions.ts"],"names":[],"mappings":";;AAKA,gCAkCC;AAED,wDAMC;AAED,4EAMC;AAtDD,4CAA0C;AAC1C,4CAAuD;AAGhD,KAAK,UAAU,UAAU;IAC/B,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAyB,CAAC;IACjF,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAgB,CAAC;IAEvE,MAAM,IAAI,GAAG,MAAM,sBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAEnE,IAAI,CAAC;QACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE;YAC/C,YAAY,EAAE,IAAI;SAClB,CAAW,CAAC;QAEb,MAAM,OAAO,GAAG,CACf,MAAM,UAAU,CAAC,KAAK,CACrB,qBAAqB,IAAA,2BAAmB,EAAC,KAAK,CAAC,SAAS,IAAA,2BAAmB,EAC1E,WAAW,CAAC,QAAkB,CAC9B,EAAE,CACH,CACD,CAAC,CAAC,CAAkB,CAAC;QAEtB,UAAU,CAAC,OAAO,EAAE,CAAC;QAErB,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAmB,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI,EAAE,MAAM,CAAC,KAAe;YAC5B,KAAK,EAAE,MAAM,CAAC,KAAe;YAE7B,WAAW,EAAE,SAAU,MAAM,CAAC,IAAe,CAAC,WAAW,EAAE,eAC1D,MAAM,CAAC,IACR,EAAE;SACF,CAAC,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACV,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;AACF,CAAC;AAEM,KAAK,UAAU,sBAAsB;IAG3C,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IACxE,OAAO,CAAC,SAAS,EAAE,GAAG,UAAU,CAAC,CAAC;AACnC,CAAC;AAEM,KAAK,UAAU,gCAAgC;IAGrD,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAW,CAAC;IAC3E,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,eAAe,CAAC,CAAC;AACxE,CAAC"}

package/dist/nodes/MySql/v2/transport/index.d.ts

@@ -1,4 +1,3 @@
-import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
-import type { Client } from 'ssh2';
-import type { Mysql2Pool } from '../helpers/interfaces';
-export declare function createPool(credentials: ICredentialDataDecryptedObject, options?: IDataObject, sshClient?: Client): Promise<Mysql2Pool>;
+import type { ICredentialTestFunctions, IDataObject, IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { Mysql2Pool, MysqlNodeCredentials } from '../helpers/interfaces';
+export declare function createPool(this: IExecuteFunctions | ICredentialTestFunctions | ILoadOptionsFunctions, credentials: MysqlNodeCredentials, options?: IDataObject): Promise<Mysql2Pool>;