npm - n8n-nodes-base - Versions diffs - 0.234.2 → 0.235.0 - Mend

n8n-nodes-base 0.234.2 → 0.235.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (81) hide show

package/dist/credentials/Amqp.credentials.js CHANGED Viewed

@@ -39,7 +39,7 @@ class Amqp {
                 name: 'transportType',
                 type: 'string',
                 default: '',
-                description: 'Optional Transport Type to use',
+                description: 'Optional Transport Type to use. Either tcp or tls.',
             },
         ];
     }

package/dist/credentials/Amqp.credentials.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Amqp.credentials.js","sourceRoot":"","sources":["../../credentials/Amqp.credentials.ts"],"names":[],"mappings":";;;AAEA,MAAa,IAAI;IAAjB;QACC,SAAI,GAAG,MAAM,CAAC;QAEd,gBAAW,GAAG,MAAM,CAAC;QAErB,qBAAgB,GAAG,MAAM,CAAC;QAE1B,eAAU,GAAsB;YAC/B;gBACC,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;aACX;YACD;gBACC,WAAW,EAAE,MAAM;gBACnB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,IAAI;aACb;YACD;gBACC,WAAW,EAAE,MAAM;gBACnB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;aACX;YACD;gBACC,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE;oBACZ,QAAQ,EAAE,IAAI;iBACd;gBACD,OAAO,EAAE,EAAE;aACX;YACD;gBACC,WAAW,EAAE,gBAAgB;gBAC7B,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EAAE,~~gCAAgC~~;~~aAC7C~~;SACD,CAAC;IACH,CAAC;CAAA;AA3CD,oBA2CC"}
1	+ {"version":3,"file":"Amqp.credentials.js","sourceRoot":"","sources":["../../credentials/Amqp.credentials.ts"],"names":[],"mappings":";;;AAEA,MAAa,IAAI;IAAjB;QACC,SAAI,GAAG,MAAM,CAAC;QAEd,gBAAW,GAAG,MAAM,CAAC;QAErB,qBAAgB,GAAG,MAAM,CAAC;QAE1B,eAAU,GAAsB;YAC/B;gBACC,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;aACX;YACD;gBACC,WAAW,EAAE,MAAM;gBACnB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,IAAI;aACb;YACD;gBACC,WAAW,EAAE,MAAM;gBACnB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;aACX;YACD;gBACC,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE;oBACZ,QAAQ,EAAE,IAAI;iBACd;gBACD,OAAO,EAAE,EAAE;aACX;YACD;gBACC,WAAW,EAAE,gBAAgB;gBAC7B,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EAAE,oDAAoD;aACjE;SACD,CAAC;IACH,CAAC;CAAA;AA3CD,oBA2CC"}

package/dist/credentials/ContentfulApi.credentials.js CHANGED Viewed

@@ -4,7 +4,7 @@ exports.ContentfulApi = void 0;
 class ContentfulApi {
     constructor() {
         this.name = 'contentfulApi';
-        this.displayName = 'Contenful API';
+        this.displayName = 'Contentful API';
         this.documentationUrl = 'contentful';
         this.properties = [
             {

package/dist/credentials/ContentfulApi.credentials.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ContentfulApi.credentials.js","sourceRoot":"","sources":["../../credentials/ContentfulApi.credentials.ts"],"names":[],"mappings":";;;AAGA,MAAa,aAAa;IAA1B;QACC,SAAI,GAAG,eAAe,CAAC;QAEvB,gBAAW,GAAG,~~eAAe~~,CAAC;~~QAE9B~~,qBAAgB,GAAG,YAAY,CAAC;QAEhC,eAAU,GAAsB;YAC/B;gBACC,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,iCAAiC;aAC9C;YACD;gBACC,WAAW,EAAE,mCAAmC;gBAChD,IAAI,EAAE,4BAA4B;gBAClC,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EACV,mGAAmG;aACpG;YACD;gBACC,WAAW,EAAE,kCAAkC;gBAC/C,IAAI,EAAE,2BAA2B;gBACjC,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EACV,kGAAkG;aACnG;SACD,CAAC;IACH,CAAC;CAAA;AAjCD,sCAiCC"}
1	+ {"version":3,"file":"ContentfulApi.credentials.js","sourceRoot":"","sources":["../../credentials/ContentfulApi.credentials.ts"],"names":[],"mappings":";;;AAGA,MAAa,aAAa;IAA1B;QACC,SAAI,GAAG,eAAe,CAAC;QAEvB,gBAAW,GAAG,gBAAgB,CAAC;QAE/B,qBAAgB,GAAG,YAAY,CAAC;QAEhC,eAAU,GAAsB;YAC/B;gBACC,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,iCAAiC;aAC9C;YACD;gBACC,WAAW,EAAE,mCAAmC;gBAChD,IAAI,EAAE,4BAA4B;gBAClC,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EACV,mGAAmG;aACpG;YACD;gBACC,WAAW,EAAE,kCAAkC;gBAC/C,IAAI,EAAE,2BAA2B;gBACjC,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EACV,kGAAkG;aACnG;SACD,CAAC;IACH,CAAC;CAAA;AAjCD,sCAiCC"}

package/dist/nodes/Amqp/Amqp.node.d.ts CHANGED Viewed

@@ -1,5 +1,10 @@
-import type { IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescription, ICredentialTestFunctions, INodeCredentialTestResult, ICredentialsDecrypted } from 'n8n-workflow';
 export declare class Amqp implements INodeType {
     description: INodeTypeDescription;
+    methods: {
+        credentialTest: {
+            amqpConnectionTest(this: ICredentialTestFunctions, credential: ICredentialsDecrypted): Promise<INodeCredentialTestResult>;
+        };
+    };
     execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
 }

package/dist/nodes/Amqp/Amqp.node.js CHANGED Viewed

@@ -21,6 +21,7 @@ class Amqp {
                 {
                     name: 'amqp',
                     required: true,
+                    testedBy: 'amqpConnectionTest',
                 },
             ],
             properties: [
@@ -85,6 +86,50 @@ class Amqp {
                 },
             ],
         };
+        this.methods = {
+            credentialTest: {
+                async amqpConnectionTest(credential) {
+                    const credentials = credential.data;
+                    const connectOptions = {
+                        reconnect: false,
+                        host: credentials.hostname,
+                        hostname: credentials.hostname,
+                        port: credentials.port,
+                        username: credentials.username ? credentials.username : undefined,
+                        password: credentials.password ? credentials.password : undefined,
+                        transport: credentials.transportType ? credentials.transportType : undefined,
+                    };
+                    let conn = undefined;
+                    try {
+                        const container = (0, rhea_1.create_container)();
+                        await new Promise((resolve, reject) => {
+                            container.on('connection_open', function (_contex) {
+                                resolve();
+                            });
+                            container.on('disconnected', function (context) {
+                                var _a;
+                                reject((_a = context.error) !== null && _a !== void 0 ? _a : new Error('unknown error'));
+                            });
+                            conn = container.connect(connectOptions);
+                        });
+                    }
+                    catch (error) {
+                        return {
+                            status: 'Error',
+                            message: error.message,
+                        };
+                    }
+                    finally {
+                        if (conn)
+                            conn.close();
+                    }
+                    return {
+                        status: 'OK',
+                        message: 'Connection successful!',
+                    };
+                },
+            },
+        };
     }
     async execute() {
         try {

package/dist/nodes/Amqp/Amqp.node.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Amqp.node.js","sourceRoot":"","sources":["../../../nodes/Amqp/Amqp.node.ts"],"names":[],"mappings":";;;AACA,+BAAwC;~~AASxC~~,+CAAkD;AAElD,MAAa,IAAI;IAAjB;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,aAAa;YAC1B,IAAI,EAAE,MAAM;YAEZ,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,0DAA0D;YACvE,QAAQ,EAAE;gBACT,IAAI,EAAE,aAAa;aACnB;YACD,MAAM,EAAE,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE;gBACZ;oBACC,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI;~~iBACd~~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~~AA7KD~~,~~oBA6KC~~"}
1	+ {"version":3,"file":"Amqp.node.js","sourceRoot":"","sources":["../../../nodes/Amqp/Amqp.node.ts"],"names":[],"mappings":"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"}

package/dist/nodes/Amqp/AmqpTrigger.node.js CHANGED Viewed

@@ -90,6 +90,13 @@ class AmqpTrigger {
                             default: false,
                             description: 'Whether to return only the body property',
                         },
+                        {
+                            displayName: 'Parallel Processing',
+                            name: 'parallelProcessing',
+                            type: 'boolean',
+                            default: true,
+                            description: 'Whether to process messages in parallel',
+                        },
                         {
                             displayName: 'Reconnect',
                             name: 'reconnect',
@@ -122,6 +129,7 @@ class AmqpTrigger {
         const clientname = this.getNodeParameter('clientname', '');
         const subscription = this.getNodeParameter('subscription', '');
         const options = this.getNodeParameter('options', {});
+        const parallelProcessing = this.getNodeParameter('options.parallelProcessing', true);
         const pullMessagesNumber = options.pullMessagesNumber || 100;
         const containerId = options.containerId;
         const containerReconnect = options.reconnect || true;
@@ -139,7 +147,7 @@ class AmqpTrigger {
             var _a;
             (_a = context.receiver) === null || _a === void 0 ? void 0 : _a.add_credit(pullMessagesNumber);
         });
-        container.on('message', (context) => {
+        container.on('message', async (context) => {
             var _a;
             if (!context.message) {
                 return;
@@ -167,7 +175,17 @@ class AmqpTrigger {
             if (options.onlyBody === true) {
                 data = data.body;
             }
-            this.emit([this.helpers.returnJsonArray([data])]);
+            let responsePromise = undefined;
+            if (!parallelProcessing) {
+                responsePromise = await this.helpers.createDeferredPromise();
+            }
+            if (responsePromise) {
+                this.emit([this.helpers.returnJsonArray([data])], undefined, responsePromise);
+                await responsePromise.promise();
+            }
+            else {
+                this.emit([this.helpers.returnJsonArray([data])]);
+            }
             if (!((_a = context.receiver) === null || _a === void 0 ? void 0 : _a.has_credit())) {
                 setTimeout(() => {
                     var _a;

package/dist/nodes/Amqp/AmqpTrigger.node.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AmqpTrigger.node.js","sourceRoot":"","sources":["../../../nodes/Amqp/AmqpTrigger.node.ts"],"names":[],"mappings":";;;AACA,+BAAwC;~~AASxC~~,+CAAuE;AAEvE,MAAa,WAAW;IAAxB;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,cAAc;YAC3B,IAAI,EAAE,aAAa;YAEnB,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,CAAC,SAAS,CAAC;YAClB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,8BAA8B;YAC3C,QAAQ,EAAE;gBACT,IAAI,EAAE,cAAc;aACpB;YACD,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,CAAC,MAAM,CAAC;YACjB,WAAW,EAAE;gBACZ;oBACC,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI;iBACd;aACD;YACD,UAAU,EAAE;gBAGX;oBACC,WAAW,EAAE,eAAe;oBAC5B,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,EAAE;oBACX,WAAW,EAAE,8BAA8B;oBAC3C,WAAW,EAAE,yCAAyC;iBACtD;gBACD;oBACC,WAAW,EAAE,YAAY;oBACzB,IAAI,EAAE,YAAY;oBAClB,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,EAAE;oBACX,WAAW,EAAE,4DAA4D;oBACzE,WAAW,EAAE,2DAA2D;iBACxE;gBACD;oBACC,WAAW,EAAE,cAAc;oBAC3B,IAAI,EAAE,cAAc;oBACpB,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,EAAE;oBACX,WAAW,EAAE,qEAAqE;oBAClF,WAAW,EAAE,2DAA2D;iBACxE;gBACD;oBACC,WAAW,EAAE,SAAS;oBACtB,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,YAAY;oBAClB,WAAW,EAAE,YAAY;oBACzB,OAAO,EAAE,EAAE;oBACX,OAAO,EAAE;wBACR;4BACC,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,aAAa;4BACnB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,EAAE;4BACX,WAAW,EAAE,0DAA0D;yBACvE;wBACD;4BACC,WAAW,EAAE,wBAAwB;4BACrC,IAAI,EAAE,8BAA8B;4BACpC,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,KAAK;4BACd,WAAW,EACV,qHAAqH;yBACtH;wBACD;4BACC,WAAW,EAAE,iBAAiB;4BAC9B,IAAI,EAAE,eAAe;4BACrB,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,KAAK;4BACd,WAAW,EAAE,wCAAwC;yBACrD;wBACD;4BACC,WAAW,EAAE,oBAAoB;4BACjC,IAAI,EAAE,oBAAoB;4BAC1B,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,GAAG;4BACZ,WAAW,EAAE,yDAAyD;yBACtE;wBACD;4BACC,WAAW,EAAE,WAAW;4BACxB,IAAI,EAAE,UAAU;4BAChB,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,KAAK;4BACd,WAAW,EAAE,0CAA0C;yBACvD;wBACD;4BACC,WAAW,EAAE,WAAW;4BACxB,IAAI,EAAE,WAAW;4BACjB,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,IAAI;4BACb,WAAW,EAAE,oDAAoD;yBACjE;wBACD;4BACC,WAAW,EAAE,iBAAiB;4BAC9B,IAAI,EAAE,gBAAgB;4BACtB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,EAAE;4BACX,WAAW,EAAE,sCAAsC;yBACnD;wBACD;4BACC,WAAW,EAAE,YAAY;4BACzB,IAAI,EAAE,WAAW;4BACjB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,EAAE;4BACX,WAAW,EAAE,yCAAyC;yBACtD;qBACD;iBACD;aACD;SACD,CAAC;~~IAuJH~~,CAAC;~~IArJA~~,KAAK,CAAC,OAAO;QACZ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAW,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,EAAE,CAAW,CAAC;QACrE,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,EAAE,CAAW,CAAC;QACzE,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAgB,CAAC;QACpE,MAAM,kBAAkB,GAAI,OAAO,CAAC,kBAA6B,IAAI,GAAG,CAAC;QACzE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAqB,CAAC;QAClD,MAAM,kBAAkB,GAAI,OAAO,CAAC,SAAqB,IAAI,IAAI,CAAC;QAClE,MAAM,uBAAuB,GAAI,OAAO,CAAC,cAAyB,IAAI,EAAE,CAAC;QAEzE,IAAI,IAAI,KAAK,EAAE,EAAE;YAChB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC;SACzE;QAED,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,YAAY,IAAI,UAAU,EAAE;YAC/B,OAAO,GAAG,IAAI,CAAC;SACf;QAED,MAAM,SAAS,GAAG,IAAA,uBAAgB,GAAE,CAAC;QAErC,IAAI,SAAS,GAAyC,SAAS,CAAC;QAEhE,SAAS,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,OAAqB,EAAE,EAAE;;YACvD,MAAA,OAAO,CAAC,QAAQ,0CAAE,UAAU,CAAC,kBAAkB,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,~~CAAC~~,OAAqB,EAAE,EAAE;;~~YAEjD~~,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACrB,OAAO;aACP;YAGD,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE;gBAC3E,OAAO;aACP;YACD,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;YAEvC,IAAI,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;YAE3B,IAAI,OAAO,CAAC,4BAA4B,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAErF,MAAM,IAAI,GAAG,IAAA,uBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,IAAgB,CAAC,CAAC;aACnE;YAED,IAAI,OAAO,CAAC,4BAA4B,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAErF,MAAM,IAAI,GAAG,IAAA,uBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,IAAgB,CAAC,CAAC;aACnE;YAED,IAAI,OAAO,CAAC,4BAA4B,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAErF,MAAM,OAAO,GAAG,IAAA,uBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5C,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,IAAgB,CAAC,CAAC;aACtE;YAED,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,EAAE;gBACnC,IAAI,CAAC,IAAI,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,IAAc,CAAC,CAAC;aAC3C;YACD,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE;gBAC9B,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;aACjB;YAED,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,IAAW,CAAC,CAAC,CAAC,CAAC,CAAC;~~YAEzD~~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~~AAzQD~~,~~kCAyQC~~"}
1	+ {"version":3,"file":"AmqpTrigger.node.js","sourceRoot":"","sources":["../../../nodes/Amqp/AmqpTrigger.node.ts"],"names":[],"mappings":"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"}

package/dist/nodes/Aws/S3/V2/AwsS3V2.node.js CHANGED Viewed

@@ -143,6 +143,8 @@ class AwsS3V2 {
                     }
                     if (operation === 'search') {
                         const bucketName = this.getNodeParameter('bucketName', i);
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
                         const returnAll = this.getNodeParameter('returnAll', 0);
                         const additionalFields = this.getNodeParameter('additionalFields', 0);
                         if (additionalFields.prefix) {
@@ -164,16 +166,16 @@ class AwsS3V2 {
                             qs['x-amz-request-payer'] = 'requester';
                         }
                         qs['list-type'] = 2;
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         const region = responseData.LocationConstraint._;
                         if (returnAll) {
-                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', `${bucketName}.s3`, 'GET', '', '', qs, {}, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
                         }
                         else {
                             qs['max-keys'] = this.getNodeParameter('limit', 0);
-                            responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', qs, {}, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', qs, {}, {}, region);
                             responseData = responseData.ListBucketResult.Contents;
                         }
                         const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), { itemData: { item: i } });
@@ -183,9 +185,11 @@ class AwsS3V2 {
                 if (resource === 'folder') {
                     if (operation === 'create') {
                         const bucketName = this.getNodeParameter('bucketName', i);
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
                         const folderName = this.getNodeParameter('folderName', i);
                         const additionalFields = this.getNodeParameter('additionalFields', i);
-                        let path = `/${folderName}/`;
+                        let path = `${basePath}/${folderName}/`;
                         if (additionalFields.requesterPays) {
                             headers['x-amz-request-payer'] = 'requester';
                         }
@@ -195,24 +199,26 @@ class AwsS3V2 {
                         if (additionalFields.storageClass) {
                             headers['x-amz-storage-class'] = (0, change_case_1.snakeCase)(additionalFields.storageClass).toUpperCase();
                         }
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         const region = responseData.LocationConstraint._;
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'PUT', path, '', qs, headers, {}, region);
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', path, '', qs, headers, {}, region);
                         const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray({ success: true }), { itemData: { item: i } });
                         returnData.push(...executionData);
                     }
                     if (operation === 'delete') {
                         const bucketName = this.getNodeParameter('bucketName', i);
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
                         const folderKey = this.getNodeParameter('folderKey', i);
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         const region = responseData.LocationConstraint._;
-                        responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', `${bucketName}.s3`, 'GET', '/', '', { 'list-type': 2, prefix: folderKey }, {}, {}, region);
+                        responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', { 'list-type': 2, prefix: folderKey }, {}, {}, region);
                         if (responseData.length === 0) {
-                            responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'DELETE', `/${folderKey}`, '', qs, {}, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'DELETE', `${basePath}/${folderKey}`, '', qs, {}, {}, region);
                             responseData = { deleted: [{ Key: folderKey }] };
                         }
                         else {
@@ -233,7 +239,7 @@ class AwsS3V2 {
                             const data = builder.buildObject(body);
                             headers['Content-MD5'] = (0, crypto_1.createHash)('md5').update(data).digest('base64');
                             headers['Content-Type'] = 'application/xml';
-                            responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'POST', '/', data, { delete: '' }, headers, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'POST', `${basePath}/`, data, { delete: '' }, headers, {}, region);
                             responseData = { deleted: responseData.DeleteResult.Deleted };
                         }
                         const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), { itemData: { item: i } });
@@ -241,6 +247,8 @@ class AwsS3V2 {
                     }
                     if (operation === 'getAll') {
                         const bucketName = this.getNodeParameter('bucketName', i);
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
                         const returnAll = this.getNodeParameter('returnAll', 0);
                         const options = this.getNodeParameter('options', 0);
                         if (options.folderKey) {
@@ -250,16 +258,16 @@ class AwsS3V2 {
                             qs['fetch-owner'] = options.fetchOwner;
                         }
                         qs['list-type'] = 2;
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         const region = responseData.LocationConstraint._;
                         if (returnAll) {
-                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', `${bucketName}.s3`, 'GET', '', '', qs, {}, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
                         }
                         else {
                             qs.limit = this.getNodeParameter('limit', 0);
-                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', `${bucketName}.s3`, 'GET', '', '', qs, {}, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
                         }
                         if (Array.isArray(responseData)) {
                             responseData = responseData.filter((e) => e.Key.endsWith('/') && e.Size === '0' && e.Key !== options.folderKey);
@@ -342,27 +350,31 @@ class AwsS3V2 {
                         }
                         const destinationParts = destinationPath.split('/');
                         const bucketName = destinationParts[1];
-                        const destination = `/${destinationParts.slice(2, destinationParts.length).join('/')}`;
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
+                        const destination = `${basePath}/${destinationParts.slice(2, destinationParts.length).join('/')}`;
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         const region = responseData.LocationConstraint._;
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'PUT', destination, '', qs, headers, {}, region);
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', destination, '', qs, headers, {}, region);
                         const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData.CopyObjectResult), { itemData: { item: i } });
                         returnData.push(...executionData);
                     }
                     if (operation === 'download') {
                         const bucketName = this.getNodeParameter('bucketName', i);
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
                         const fileKey = this.getNodeParameter('fileKey', i);
                         const fileName = fileKey.split('/')[fileKey.split('/').length - 1];
                         if (fileKey.substring(fileKey.length - 1) === '/') {
                             throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Downloading a whole directory is not yet supported, please provide a file key');
                         }
-                        let region = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        let region = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         region = region.LocationConstraint._;
-                        const response = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', `/${fileKey}`, '', qs, {}, { encoding: null, resolveWithFullResponse: true }, region);
+                        const response = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', `${basePath}/${fileKey}`, '', qs, {}, { encoding: null, resolveWithFullResponse: true }, region);
                         let mimeType;
                         if (response.headers['content-type']) {
                             mimeType = response.headers['content-type'];
@@ -381,21 +393,25 @@ class AwsS3V2 {
                     }
                     if (operation === 'delete') {
                         const bucketName = this.getNodeParameter('bucketName', i);
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
                         const fileKey = this.getNodeParameter('fileKey', i);
                         const options = this.getNodeParameter('options', i);
                         if (options.versionId) {
                             qs.versionId = options.versionId;
                         }
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         const region = responseData.LocationConstraint._;
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'DELETE', `/${fileKey}`, '', qs, {}, {}, region);
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'DELETE', `${basePath}/${fileKey}`, '', qs, {}, {}, region);
                         const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray({ success: true }), { itemData: { item: i } });
                         returnData.push(...executionData);
                     }
                     if (operation === 'getAll') {
                         const bucketName = this.getNodeParameter('bucketName', i);
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
                         const returnAll = this.getNodeParameter('returnAll', 0);
                         const options = this.getNodeParameter('options', 0);
                         if (options.folderKey) {
@@ -406,16 +422,16 @@ class AwsS3V2 {
                         }
                         qs.delimiter = '/';
                         qs['list-type'] = 2;
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         const region = responseData.LocationConstraint._;
                         if (returnAll) {
-                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', `${bucketName}.s3`, 'GET', '', '', qs, {}, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
                         }
                         else {
                             qs.limit = this.getNodeParameter('limit', 0);
-                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', `${bucketName}.s3`, 'GET', '', '', qs, {}, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
                             responseData = responseData.splice(0, qs.limit);
                         }
                         if (Array.isArray(responseData)) {
@@ -429,12 +445,14 @@ class AwsS3V2 {
                     }
                     if (operation === 'upload') {
                         const bucketName = this.getNodeParameter('bucketName', i);
+                        const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+                        const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
                         const fileName = this.getNodeParameter('fileName', i);
                         const isBinaryData = this.getNodeParameter('binaryData', i);
                         const additionalFields = this.getNodeParameter('additionalFields', i);
                         const tagsValues = this.getNodeParameter('tagsUi', i)
                             .tagsValues;
-                        let path = '';
+                        let path = `${basePath}/`;
                         let body;
                         const multipartHeaders = {};
                         const neededHeaders = {};
@@ -507,7 +525,7 @@ class AwsS3V2 {
                             });
                             multipartHeaders['x-amz-tagging'] = tags.join('&');
                         }
-                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+                        responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
                             location: '',
                         });
                         const region = responseData.LocationConstraint._;
@@ -518,7 +536,7 @@ class AwsS3V2 {
                             multipartHeaders['Content-Type'] = binaryPropertyData.mimeType;
                             if (binaryPropertyData.id) {
                                 uploadData = this.helpers.getBinaryStream(binaryPropertyData.id, UPLOAD_CHUNK_SIZE);
-                                const createMultiPartUpload = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'POST', `/${path}?uploads`, body, qs, { ...neededHeaders, ...multipartHeaders }, {}, region);
+                                const createMultiPartUpload = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'POST', `/${path}?uploads`, body, qs, { ...neededHeaders, ...multipartHeaders }, {}, region);
                                 const uploadId = createMultiPartUpload.InitiateMultipartUploadResult.UploadId;
                                 let part = 1;
                                 for await (const chunk of uploadData) {
@@ -529,12 +547,12 @@ class AwsS3V2 {
                                         ...neededHeaders,
                                     };
                                     try {
-                                        await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'PUT', `/${path}?partNumber=${part}&uploadId=${uploadId}`, chunk, qs, listHeaders, {}, region);
+                                        await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', `/${path}?partNumber=${part}&uploadId=${uploadId}`, chunk, qs, listHeaders, {}, region);
                                         part++;
                                     }
                                     catch (error) {
                                         try {
-                                            await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'DELETE', `/${path}?uploadId=${uploadId}`);
+                                            await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'DELETE', `/${path}?uploadId=${uploadId}`);
                                         }
                                         catch (err) {
                                             throw new n8n_workflow_1.NodeOperationError(this.getNode(), err);
@@ -543,7 +561,7 @@ class AwsS3V2 {
                                             throw error;
                                     }
                                 }
-                                const listParts = (await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', `/${path}?max-parts=${900}&part-number-marker=0&uploadId=${uploadId}`, '', qs, { ...neededHeaders }, {}, region));
+                                const listParts = (await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', `/${path}?max-parts=${900}&part-number-marker=0&uploadId=${uploadId}`, '', qs, { ...neededHeaders }, {}, region));
                                 if (!Array.isArray(listParts.ListPartsResult.Part)) {
                                     body = {
                                         CompleteMultipartUpload: {
@@ -574,7 +592,7 @@ class AwsS3V2 {
                                 }
                                 const builder = new xml2js_1.Builder();
                                 const data = builder.buildObject(body);
-                                const completeUpload = (await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'POST', `/${path}?uploadId=${uploadId}`, data, qs, {
+                                const completeUpload = (await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'POST', `/${path}?uploadId=${uploadId}`, data, qs, {
                                     ...neededHeaders,
                                     'Content-MD5': (0, crypto_1.createHash)('md5').update(data).digest('base64'),
                                     'Content-Type': 'application/xml',
@@ -589,7 +607,7 @@ class AwsS3V2 {
                                 headers = { ...neededHeaders, ...multipartHeaders };
                                 headers['Content-Type'] = binaryPropertyData.mimeType;
                                 headers['Content-MD5'] = (0, crypto_1.createHash)('md5').update(body).digest('base64');
-                                responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'PUT', `/${path || binaryPropertyData.fileName}`, body, qs, headers, {}, region);
+                                responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', `/${path || binaryPropertyData.fileName}`, body, qs, headers, {}, region);
                             }
                             const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), { itemData: { item: i } });
                             returnData.push(...executionData);
@@ -600,7 +618,7 @@ class AwsS3V2 {
                             headers = { ...neededHeaders, ...multipartHeaders };
                             headers['Content-Type'] = 'text/html';
                             headers['Content-MD5'] = (0, crypto_1.createHash)('md5').update(fileContent).digest('base64');
-                            responseData = await GenericFunctions_1.awsApiRequestREST.call(this, `${bucketName}.s3`, 'PUT', `/${path}`, body, qs, { ...headers }, {}, region);
+                            responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', `/${path}`, body, qs, { ...headers }, {}, region);
                             const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray({ success: true }), { itemData: { item: i } });
                             returnData.push(...executionData);
                         }