n8n-nodes-base 0.234.1 → 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.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/credentials/Amqp.credentials.js +1 -1
- package/dist/credentials/Amqp.credentials.js.map +1 -1
- package/dist/credentials/ContentfulApi.credentials.js +1 -1
- package/dist/credentials/ContentfulApi.credentials.js.map +1 -1
- package/dist/nodes/Amqp/Amqp.node.d.ts +6 -1
- package/dist/nodes/Amqp/Amqp.node.js +45 -0
- package/dist/nodes/Amqp/Amqp.node.js.map +1 -1
- package/dist/nodes/Amqp/AmqpTrigger.node.js +20 -2
- package/dist/nodes/Amqp/AmqpTrigger.node.js.map +1 -1
- package/dist/nodes/Aws/S3/V2/AwsS3V2.node.js +50 -32
- package/dist/nodes/Aws/S3/V2/AwsS3V2.node.js.map +1 -1
- package/dist/nodes/Contentful/Contentful.node.js +4 -4
- package/dist/nodes/Contentful/Contentful.node.js.map +1 -1
- package/dist/nodes/Contentful/GenericFunctions.d.ts +1 -1
- package/dist/nodes/Contentful/GenericFunctions.js +3 -3
- package/dist/nodes/Contentful/GenericFunctions.js.map +1 -1
- package/dist/nodes/EmailReadImap/v1/EmailReadImapV1.node.js +4 -4
- package/dist/nodes/EmailReadImap/v1/EmailReadImapV1.node.js.map +1 -1
- package/dist/nodes/EmailReadImap/v2/EmailReadImapV2.node.js +49 -33
- package/dist/nodes/EmailReadImap/v2/EmailReadImapV2.node.js.map +1 -1
- package/dist/nodes/FileMaker/FileMaker.node.js +4 -4
- package/dist/nodes/FileMaker/FileMaker.node.js.map +1 -1
- package/dist/nodes/FileMaker/GenericFunctions.js +14 -16
- package/dist/nodes/FileMaker/GenericFunctions.js.map +1 -1
- package/dist/nodes/FileMaker/filemaker.png +0 -0
- package/dist/nodes/Ftp/Ftp.node.js +38 -16
- package/dist/nodes/Ftp/Ftp.node.js.map +1 -1
- package/dist/nodes/Gitlab/GitlabTrigger.node.js +1 -1
- package/dist/nodes/Gitlab/GitlabTrigger.node.js.map +1 -1
- package/dist/nodes/GoToWebinar/descriptions/WebinarDescription.js +0 -1
- package/dist/nodes/GoToWebinar/descriptions/WebinarDescription.js.map +1 -1
- package/dist/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.js +9 -5
- package/dist/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.js.map +1 -1
- package/dist/nodes/Google/GenericFunctions.js +2 -1
- package/dist/nodes/Google/GenericFunctions.js.map +1 -1
- package/dist/nodes/Google/Gmail/GmailTrigger.node.js +7 -2
- package/dist/nodes/Google/Gmail/GmailTrigger.node.js.map +1 -1
- package/dist/nodes/HttpRequest/HttpRequest.node.json +1 -1
- package/dist/nodes/Lemlist/GenericFunctions.d.ts +1 -1
- package/dist/nodes/Lemlist/GenericFunctions.js +1 -2
- package/dist/nodes/Lemlist/GenericFunctions.js.map +1 -1
- package/dist/nodes/Lemlist/Lemlist.node.js +16 -10
- package/dist/nodes/Lemlist/Lemlist.node.js.map +1 -1
- package/dist/nodes/MQTT/Mqtt.node.js +31 -10
- package/dist/nodes/MQTT/Mqtt.node.js.map +1 -1
- package/dist/nodes/MQTT/MqttTrigger.node.js +50 -14
- package/dist/nodes/MQTT/MqttTrigger.node.js.map +1 -1
- package/dist/nodes/Microsoft/Outlook/MicrosoftOutlook.node.js +1 -1
- package/dist/nodes/Microsoft/Outlook/MicrosoftOutlook.node.js.map +1 -1
- package/dist/nodes/MySql/v2/transport/index.js +8 -16
- package/dist/nodes/MySql/v2/transport/index.js.map +1 -1
- package/dist/nodes/Netlify/netlify.svg +15 -8
- package/dist/nodes/Postgres/v2/transport/index.js +5 -11
- package/dist/nodes/Postgres/v2/transport/index.js.map +1 -1
- package/dist/nodes/RabbitMQ/GenericFunctions.js +11 -3
- package/dist/nodes/RabbitMQ/GenericFunctions.js.map +1 -1
- package/dist/nodes/RabbitMQ/RabbitMQ.node.js +10 -3
- package/dist/nodes/RabbitMQ/RabbitMQ.node.js.map +1 -1
- package/dist/nodes/ReadBinaryFile/ReadBinaryFile.node.js.map +1 -1
- package/dist/nodes/ReadBinaryFiles/ReadBinaryFiles.node.js.map +1 -1
- package/dist/nodes/Salesforce/Salesforce.node.js +2 -2
- package/dist/nodes/Salesforce/Salesforce.node.js.map +1 -1
- package/dist/nodes/ServiceNow/IncidentDescription.js +1 -1
- package/dist/nodes/ServiceNow/IncidentDescription.js.map +1 -1
- package/dist/nodes/Ssh/Ssh.node.js +3 -14
- package/dist/nodes/Ssh/Ssh.node.js.map +1 -1
- package/dist/nodes/Taiga/descriptions/EpicDescription.js +1 -1
- package/dist/nodes/Taiga/descriptions/EpicDescription.js.map +1 -1
- package/dist/nodes/Taiga/descriptions/IssueDescription.js +3 -3
- package/dist/nodes/Taiga/descriptions/IssueDescription.js.map +1 -1
- package/dist/nodes/Taiga/descriptions/TaskDescription.js +3 -3
- package/dist/nodes/Taiga/descriptions/TaskDescription.js.map +1 -1
- package/dist/nodes/Taiga/descriptions/UserStoryDescription.js +3 -3
- package/dist/nodes/Taiga/descriptions/UserStoryDescription.js.map +1 -1
- package/dist/nodes/Telegram/TelegramTrigger.node.js +1 -1
- package/dist/nodes/Telegram/TelegramTrigger.node.js.map +1 -1
- package/dist/nodes/TimescaleDb/timescale.svg +31 -1
- package/dist/nodes/Todoist/v2/OperationHandler.js +3 -0
- package/dist/nodes/Todoist/v2/OperationHandler.js.map +1 -1
- package/dist/nodes/WriteBinaryFile/WriteBinaryFile.node.js +1 -2
- package/dist/nodes/WriteBinaryFile/WriteBinaryFile.node.js.map +1 -1
- package/dist/package.json +5 -3
- package/dist/types/credentials.json +2 -2
- package/dist/types/nodes.json +10 -10
- package/dist/utils/utilities.d.ts +3 -2
- package/dist/utils/utilities.js +27 -2
- package/dist/utils/utilities.js.map +1 -1
- package/package.json +7 -5
|
@@ -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,
|
|
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"}
|
|
@@ -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,
|
|
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"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
-
import type { IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
|
|
1
|
+
import type { IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescription, ICredentialTestFunctions, INodeCredentialTestResult, ICredentialsDecrypted } from 'n8n-workflow';
|
|
2
2
|
export declare class Amqp implements INodeType {
|
|
3
3
|
description: INodeTypeDescription;
|
|
4
|
+
methods: {
|
|
5
|
+
credentialTest: {
|
|
6
|
+
amqpConnectionTest(this: ICredentialTestFunctions, credential: ICredentialsDecrypted): Promise<INodeCredentialTestResult>;
|
|
7
|
+
};
|
|
8
|
+
};
|
|
4
9
|
execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
|
|
5
10
|
}
|
|
@@ -21,6 +21,7 @@ class Amqp {
|
|
|
21
21
|
{
|
|
22
22
|
name: 'amqp',
|
|
23
23
|
required: true,
|
|
24
|
+
testedBy: 'amqpConnectionTest',
|
|
24
25
|
},
|
|
25
26
|
],
|
|
26
27
|
properties: [
|
|
@@ -85,6 +86,50 @@ class Amqp {
|
|
|
85
86
|
},
|
|
86
87
|
],
|
|
87
88
|
};
|
|
89
|
+
this.methods = {
|
|
90
|
+
credentialTest: {
|
|
91
|
+
async amqpConnectionTest(credential) {
|
|
92
|
+
const credentials = credential.data;
|
|
93
|
+
const connectOptions = {
|
|
94
|
+
reconnect: false,
|
|
95
|
+
host: credentials.hostname,
|
|
96
|
+
hostname: credentials.hostname,
|
|
97
|
+
port: credentials.port,
|
|
98
|
+
username: credentials.username ? credentials.username : undefined,
|
|
99
|
+
password: credentials.password ? credentials.password : undefined,
|
|
100
|
+
transport: credentials.transportType ? credentials.transportType : undefined,
|
|
101
|
+
};
|
|
102
|
+
let conn = undefined;
|
|
103
|
+
try {
|
|
104
|
+
const container = (0, rhea_1.create_container)();
|
|
105
|
+
await new Promise((resolve, reject) => {
|
|
106
|
+
container.on('connection_open', function (_contex) {
|
|
107
|
+
resolve();
|
|
108
|
+
});
|
|
109
|
+
container.on('disconnected', function (context) {
|
|
110
|
+
var _a;
|
|
111
|
+
reject((_a = context.error) !== null && _a !== void 0 ? _a : new Error('unknown error'));
|
|
112
|
+
});
|
|
113
|
+
conn = container.connect(connectOptions);
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
return {
|
|
118
|
+
status: 'Error',
|
|
119
|
+
message: error.message,
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
finally {
|
|
123
|
+
if (conn)
|
|
124
|
+
conn.close();
|
|
125
|
+
}
|
|
126
|
+
return {
|
|
127
|
+
status: 'OK',
|
|
128
|
+
message: 'Connection successful!',
|
|
129
|
+
};
|
|
130
|
+
},
|
|
131
|
+
},
|
|
132
|
+
};
|
|
88
133
|
}
|
|
89
134
|
async execute() {
|
|
90
135
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Amqp.node.js","sourceRoot":"","sources":["../../../nodes/Amqp/Amqp.node.ts"],"names":[],"mappings":";;;AACA,+BAAwC;
|
|
1
|
+
{"version":3,"file":"Amqp.node.js","sourceRoot":"","sources":["../../../nodes/Amqp/Amqp.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,6 +90,13 @@ class AmqpTrigger {
|
|
|
90
90
|
default: false,
|
|
91
91
|
description: 'Whether to return only the body property',
|
|
92
92
|
},
|
|
93
|
+
{
|
|
94
|
+
displayName: 'Parallel Processing',
|
|
95
|
+
name: 'parallelProcessing',
|
|
96
|
+
type: 'boolean',
|
|
97
|
+
default: true,
|
|
98
|
+
description: 'Whether to process messages in parallel',
|
|
99
|
+
},
|
|
93
100
|
{
|
|
94
101
|
displayName: 'Reconnect',
|
|
95
102
|
name: 'reconnect',
|
|
@@ -122,6 +129,7 @@ class AmqpTrigger {
|
|
|
122
129
|
const clientname = this.getNodeParameter('clientname', '');
|
|
123
130
|
const subscription = this.getNodeParameter('subscription', '');
|
|
124
131
|
const options = this.getNodeParameter('options', {});
|
|
132
|
+
const parallelProcessing = this.getNodeParameter('options.parallelProcessing', true);
|
|
125
133
|
const pullMessagesNumber = options.pullMessagesNumber || 100;
|
|
126
134
|
const containerId = options.containerId;
|
|
127
135
|
const containerReconnect = options.reconnect || true;
|
|
@@ -139,7 +147,7 @@ class AmqpTrigger {
|
|
|
139
147
|
var _a;
|
|
140
148
|
(_a = context.receiver) === null || _a === void 0 ? void 0 : _a.add_credit(pullMessagesNumber);
|
|
141
149
|
});
|
|
142
|
-
container.on('message', (context) => {
|
|
150
|
+
container.on('message', async (context) => {
|
|
143
151
|
var _a;
|
|
144
152
|
if (!context.message) {
|
|
145
153
|
return;
|
|
@@ -167,7 +175,17 @@ class AmqpTrigger {
|
|
|
167
175
|
if (options.onlyBody === true) {
|
|
168
176
|
data = data.body;
|
|
169
177
|
}
|
|
170
|
-
|
|
178
|
+
let responsePromise = undefined;
|
|
179
|
+
if (!parallelProcessing) {
|
|
180
|
+
responsePromise = await this.helpers.createDeferredPromise();
|
|
181
|
+
}
|
|
182
|
+
if (responsePromise) {
|
|
183
|
+
this.emit([this.helpers.returnJsonArray([data])], undefined, responsePromise);
|
|
184
|
+
await responsePromise.promise();
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
this.emit([this.helpers.returnJsonArray([data])]);
|
|
188
|
+
}
|
|
171
189
|
if (!((_a = context.receiver) === null || _a === void 0 ? void 0 : _a.has_credit())) {
|
|
172
190
|
setTimeout(() => {
|
|
173
191
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AmqpTrigger.node.js","sourceRoot":"","sources":["../../../nodes/Amqp/AmqpTrigger.node.ts"],"names":[],"mappings":";;;AACA,+BAAwC;
|
|
1
|
+
{"version":3,"file":"AmqpTrigger.node.js","sourceRoot":"","sources":["../../../nodes/Amqp/AmqpTrigger.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -143,6 +143,8 @@ class AwsS3V2 {
|
|
|
143
143
|
}
|
|
144
144
|
if (operation === 'search') {
|
|
145
145
|
const bucketName = this.getNodeParameter('bucketName', i);
|
|
146
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
147
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
146
148
|
const returnAll = this.getNodeParameter('returnAll', 0);
|
|
147
149
|
const additionalFields = this.getNodeParameter('additionalFields', 0);
|
|
148
150
|
if (additionalFields.prefix) {
|
|
@@ -164,16 +166,16 @@ class AwsS3V2 {
|
|
|
164
166
|
qs['x-amz-request-payer'] = 'requester';
|
|
165
167
|
}
|
|
166
168
|
qs['list-type'] = 2;
|
|
167
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
169
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
168
170
|
location: '',
|
|
169
171
|
});
|
|
170
172
|
const region = responseData.LocationConstraint._;
|
|
171
173
|
if (returnAll) {
|
|
172
|
-
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents',
|
|
174
|
+
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
|
|
173
175
|
}
|
|
174
176
|
else {
|
|
175
177
|
qs['max-keys'] = this.getNodeParameter('limit', 0);
|
|
176
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
178
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', qs, {}, {}, region);
|
|
177
179
|
responseData = responseData.ListBucketResult.Contents;
|
|
178
180
|
}
|
|
179
181
|
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), { itemData: { item: i } });
|
|
@@ -183,9 +185,11 @@ class AwsS3V2 {
|
|
|
183
185
|
if (resource === 'folder') {
|
|
184
186
|
if (operation === 'create') {
|
|
185
187
|
const bucketName = this.getNodeParameter('bucketName', i);
|
|
188
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
189
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
186
190
|
const folderName = this.getNodeParameter('folderName', i);
|
|
187
191
|
const additionalFields = this.getNodeParameter('additionalFields', i);
|
|
188
|
-
let path =
|
|
192
|
+
let path = `${basePath}/${folderName}/`;
|
|
189
193
|
if (additionalFields.requesterPays) {
|
|
190
194
|
headers['x-amz-request-payer'] = 'requester';
|
|
191
195
|
}
|
|
@@ -195,24 +199,26 @@ class AwsS3V2 {
|
|
|
195
199
|
if (additionalFields.storageClass) {
|
|
196
200
|
headers['x-amz-storage-class'] = (0, change_case_1.snakeCase)(additionalFields.storageClass).toUpperCase();
|
|
197
201
|
}
|
|
198
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
202
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
199
203
|
location: '',
|
|
200
204
|
});
|
|
201
205
|
const region = responseData.LocationConstraint._;
|
|
202
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
206
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', path, '', qs, headers, {}, region);
|
|
203
207
|
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray({ success: true }), { itemData: { item: i } });
|
|
204
208
|
returnData.push(...executionData);
|
|
205
209
|
}
|
|
206
210
|
if (operation === 'delete') {
|
|
207
211
|
const bucketName = this.getNodeParameter('bucketName', i);
|
|
212
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
213
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
208
214
|
const folderKey = this.getNodeParameter('folderKey', i);
|
|
209
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
215
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
210
216
|
location: '',
|
|
211
217
|
});
|
|
212
218
|
const region = responseData.LocationConstraint._;
|
|
213
|
-
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents',
|
|
219
|
+
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', { 'list-type': 2, prefix: folderKey }, {}, {}, region);
|
|
214
220
|
if (responseData.length === 0) {
|
|
215
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
221
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'DELETE', `${basePath}/${folderKey}`, '', qs, {}, {}, region);
|
|
216
222
|
responseData = { deleted: [{ Key: folderKey }] };
|
|
217
223
|
}
|
|
218
224
|
else {
|
|
@@ -233,7 +239,7 @@ class AwsS3V2 {
|
|
|
233
239
|
const data = builder.buildObject(body);
|
|
234
240
|
headers['Content-MD5'] = (0, crypto_1.createHash)('md5').update(data).digest('base64');
|
|
235
241
|
headers['Content-Type'] = 'application/xml';
|
|
236
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
242
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'POST', `${basePath}/`, data, { delete: '' }, headers, {}, region);
|
|
237
243
|
responseData = { deleted: responseData.DeleteResult.Deleted };
|
|
238
244
|
}
|
|
239
245
|
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), { itemData: { item: i } });
|
|
@@ -241,6 +247,8 @@ class AwsS3V2 {
|
|
|
241
247
|
}
|
|
242
248
|
if (operation === 'getAll') {
|
|
243
249
|
const bucketName = this.getNodeParameter('bucketName', i);
|
|
250
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
251
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
244
252
|
const returnAll = this.getNodeParameter('returnAll', 0);
|
|
245
253
|
const options = this.getNodeParameter('options', 0);
|
|
246
254
|
if (options.folderKey) {
|
|
@@ -250,16 +258,16 @@ class AwsS3V2 {
|
|
|
250
258
|
qs['fetch-owner'] = options.fetchOwner;
|
|
251
259
|
}
|
|
252
260
|
qs['list-type'] = 2;
|
|
253
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
261
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
254
262
|
location: '',
|
|
255
263
|
});
|
|
256
264
|
const region = responseData.LocationConstraint._;
|
|
257
265
|
if (returnAll) {
|
|
258
|
-
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents',
|
|
266
|
+
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
|
|
259
267
|
}
|
|
260
268
|
else {
|
|
261
269
|
qs.limit = this.getNodeParameter('limit', 0);
|
|
262
|
-
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents',
|
|
270
|
+
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
|
|
263
271
|
}
|
|
264
272
|
if (Array.isArray(responseData)) {
|
|
265
273
|
responseData = responseData.filter((e) => e.Key.endsWith('/') && e.Size === '0' && e.Key !== options.folderKey);
|
|
@@ -342,27 +350,31 @@ class AwsS3V2 {
|
|
|
342
350
|
}
|
|
343
351
|
const destinationParts = destinationPath.split('/');
|
|
344
352
|
const bucketName = destinationParts[1];
|
|
345
|
-
const
|
|
346
|
-
|
|
353
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
354
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
355
|
+
const destination = `${basePath}/${destinationParts.slice(2, destinationParts.length).join('/')}`;
|
|
356
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
347
357
|
location: '',
|
|
348
358
|
});
|
|
349
359
|
const region = responseData.LocationConstraint._;
|
|
350
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
360
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', destination, '', qs, headers, {}, region);
|
|
351
361
|
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData.CopyObjectResult), { itemData: { item: i } });
|
|
352
362
|
returnData.push(...executionData);
|
|
353
363
|
}
|
|
354
364
|
if (operation === 'download') {
|
|
355
365
|
const bucketName = this.getNodeParameter('bucketName', i);
|
|
366
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
367
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
356
368
|
const fileKey = this.getNodeParameter('fileKey', i);
|
|
357
369
|
const fileName = fileKey.split('/')[fileKey.split('/').length - 1];
|
|
358
370
|
if (fileKey.substring(fileKey.length - 1) === '/') {
|
|
359
371
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Downloading a whole directory is not yet supported, please provide a file key');
|
|
360
372
|
}
|
|
361
|
-
let region = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
373
|
+
let region = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
362
374
|
location: '',
|
|
363
375
|
});
|
|
364
376
|
region = region.LocationConstraint._;
|
|
365
|
-
const response = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
377
|
+
const response = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', `${basePath}/${fileKey}`, '', qs, {}, { encoding: null, resolveWithFullResponse: true }, region);
|
|
366
378
|
let mimeType;
|
|
367
379
|
if (response.headers['content-type']) {
|
|
368
380
|
mimeType = response.headers['content-type'];
|
|
@@ -381,21 +393,25 @@ class AwsS3V2 {
|
|
|
381
393
|
}
|
|
382
394
|
if (operation === 'delete') {
|
|
383
395
|
const bucketName = this.getNodeParameter('bucketName', i);
|
|
396
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
397
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
384
398
|
const fileKey = this.getNodeParameter('fileKey', i);
|
|
385
399
|
const options = this.getNodeParameter('options', i);
|
|
386
400
|
if (options.versionId) {
|
|
387
401
|
qs.versionId = options.versionId;
|
|
388
402
|
}
|
|
389
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
403
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
390
404
|
location: '',
|
|
391
405
|
});
|
|
392
406
|
const region = responseData.LocationConstraint._;
|
|
393
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
407
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'DELETE', `${basePath}/${fileKey}`, '', qs, {}, {}, region);
|
|
394
408
|
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray({ success: true }), { itemData: { item: i } });
|
|
395
409
|
returnData.push(...executionData);
|
|
396
410
|
}
|
|
397
411
|
if (operation === 'getAll') {
|
|
398
412
|
const bucketName = this.getNodeParameter('bucketName', i);
|
|
413
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
414
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
399
415
|
const returnAll = this.getNodeParameter('returnAll', 0);
|
|
400
416
|
const options = this.getNodeParameter('options', 0);
|
|
401
417
|
if (options.folderKey) {
|
|
@@ -406,16 +422,16 @@ class AwsS3V2 {
|
|
|
406
422
|
}
|
|
407
423
|
qs.delimiter = '/';
|
|
408
424
|
qs['list-type'] = 2;
|
|
409
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
425
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
410
426
|
location: '',
|
|
411
427
|
});
|
|
412
428
|
const region = responseData.LocationConstraint._;
|
|
413
429
|
if (returnAll) {
|
|
414
|
-
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents',
|
|
430
|
+
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
|
|
415
431
|
}
|
|
416
432
|
else {
|
|
417
433
|
qs.limit = this.getNodeParameter('limit', 0);
|
|
418
|
-
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents',
|
|
434
|
+
responseData = await GenericFunctions_1.awsApiRequestRESTAllItems.call(this, 'ListBucketResult.Contents', servicePath, 'GET', basePath, '', qs, {}, {}, region);
|
|
419
435
|
responseData = responseData.splice(0, qs.limit);
|
|
420
436
|
}
|
|
421
437
|
if (Array.isArray(responseData)) {
|
|
@@ -429,12 +445,14 @@ class AwsS3V2 {
|
|
|
429
445
|
}
|
|
430
446
|
if (operation === 'upload') {
|
|
431
447
|
const bucketName = this.getNodeParameter('bucketName', i);
|
|
448
|
+
const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
|
|
449
|
+
const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
|
|
432
450
|
const fileName = this.getNodeParameter('fileName', i);
|
|
433
451
|
const isBinaryData = this.getNodeParameter('binaryData', i);
|
|
434
452
|
const additionalFields = this.getNodeParameter('additionalFields', i);
|
|
435
453
|
const tagsValues = this.getNodeParameter('tagsUi', i)
|
|
436
454
|
.tagsValues;
|
|
437
|
-
let path =
|
|
455
|
+
let path = `${basePath}/`;
|
|
438
456
|
let body;
|
|
439
457
|
const multipartHeaders = {};
|
|
440
458
|
const neededHeaders = {};
|
|
@@ -507,7 +525,7 @@ class AwsS3V2 {
|
|
|
507
525
|
});
|
|
508
526
|
multipartHeaders['x-amz-tagging'] = tags.join('&');
|
|
509
527
|
}
|
|
510
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
528
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
|
|
511
529
|
location: '',
|
|
512
530
|
});
|
|
513
531
|
const region = responseData.LocationConstraint._;
|
|
@@ -518,7 +536,7 @@ class AwsS3V2 {
|
|
|
518
536
|
multipartHeaders['Content-Type'] = binaryPropertyData.mimeType;
|
|
519
537
|
if (binaryPropertyData.id) {
|
|
520
538
|
uploadData = this.helpers.getBinaryStream(binaryPropertyData.id, UPLOAD_CHUNK_SIZE);
|
|
521
|
-
const createMultiPartUpload = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
539
|
+
const createMultiPartUpload = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'POST', `/${path}?uploads`, body, qs, { ...neededHeaders, ...multipartHeaders }, {}, region);
|
|
522
540
|
const uploadId = createMultiPartUpload.InitiateMultipartUploadResult.UploadId;
|
|
523
541
|
let part = 1;
|
|
524
542
|
for await (const chunk of uploadData) {
|
|
@@ -529,12 +547,12 @@ class AwsS3V2 {
|
|
|
529
547
|
...neededHeaders,
|
|
530
548
|
};
|
|
531
549
|
try {
|
|
532
|
-
await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
550
|
+
await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', `/${path}?partNumber=${part}&uploadId=${uploadId}`, chunk, qs, listHeaders, {}, region);
|
|
533
551
|
part++;
|
|
534
552
|
}
|
|
535
553
|
catch (error) {
|
|
536
554
|
try {
|
|
537
|
-
await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
555
|
+
await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'DELETE', `/${path}?uploadId=${uploadId}`);
|
|
538
556
|
}
|
|
539
557
|
catch (err) {
|
|
540
558
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), err);
|
|
@@ -543,7 +561,7 @@ class AwsS3V2 {
|
|
|
543
561
|
throw error;
|
|
544
562
|
}
|
|
545
563
|
}
|
|
546
|
-
const listParts = (await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
564
|
+
const listParts = (await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'GET', `/${path}?max-parts=${900}&part-number-marker=0&uploadId=${uploadId}`, '', qs, { ...neededHeaders }, {}, region));
|
|
547
565
|
if (!Array.isArray(listParts.ListPartsResult.Part)) {
|
|
548
566
|
body = {
|
|
549
567
|
CompleteMultipartUpload: {
|
|
@@ -574,7 +592,7 @@ class AwsS3V2 {
|
|
|
574
592
|
}
|
|
575
593
|
const builder = new xml2js_1.Builder();
|
|
576
594
|
const data = builder.buildObject(body);
|
|
577
|
-
const completeUpload = (await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
595
|
+
const completeUpload = (await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'POST', `/${path}?uploadId=${uploadId}`, data, qs, {
|
|
578
596
|
...neededHeaders,
|
|
579
597
|
'Content-MD5': (0, crypto_1.createHash)('md5').update(data).digest('base64'),
|
|
580
598
|
'Content-Type': 'application/xml',
|
|
@@ -589,7 +607,7 @@ class AwsS3V2 {
|
|
|
589
607
|
headers = { ...neededHeaders, ...multipartHeaders };
|
|
590
608
|
headers['Content-Type'] = binaryPropertyData.mimeType;
|
|
591
609
|
headers['Content-MD5'] = (0, crypto_1.createHash)('md5').update(body).digest('base64');
|
|
592
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
610
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', `/${path || binaryPropertyData.fileName}`, body, qs, headers, {}, region);
|
|
593
611
|
}
|
|
594
612
|
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), { itemData: { item: i } });
|
|
595
613
|
returnData.push(...executionData);
|
|
@@ -600,7 +618,7 @@ class AwsS3V2 {
|
|
|
600
618
|
headers = { ...neededHeaders, ...multipartHeaders };
|
|
601
619
|
headers['Content-Type'] = 'text/html';
|
|
602
620
|
headers['Content-MD5'] = (0, crypto_1.createHash)('md5').update(fileContent).digest('base64');
|
|
603
|
-
responseData = await GenericFunctions_1.awsApiRequestREST.call(this,
|
|
621
|
+
responseData = await GenericFunctions_1.awsApiRequestREST.call(this, servicePath, 'PUT', `/${path}`, body, qs, { ...headers }, {}, region);
|
|
604
622
|
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray({ success: true }), { itemData: { item: i } });
|
|
605
623
|
returnData.push(...executionData);
|
|
606
624
|
}
|