@cloudconvert/n8n-nodes-cloudconvert 1.0.0 → 1.0.1
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/README.md +1 -1
- package/dist/nodes/CloudConvert/CloudConvert.node.js +2 -6
- package/dist/nodes/CloudConvert/CloudConvert.node.js.map +1 -1
- package/dist/nodes/CloudConvert/Utils.d.ts +1 -0
- package/dist/nodes/CloudConvert/Utils.js +31 -18
- package/dist/nodes/CloudConvert/Utils.js.map +1 -1
- package/dist/nodes/CloudConvert/operations/capture-website/execute.js +6 -9
- package/dist/nodes/CloudConvert/operations/capture-website/execute.js.map +1 -1
- package/dist/nodes/CloudConvert/operations/convert/execute.js +8 -11
- package/dist/nodes/CloudConvert/operations/convert/execute.js.map +1 -1
- package/dist/nodes/CloudConvert/operations/optimize/execute.js +8 -11
- package/dist/nodes/CloudConvert/operations/optimize/execute.js.map +1 -1
- package/dist/nodes/CloudConvert/operations/thumbnail/execute.js +8 -11
- package/dist/nodes/CloudConvert/operations/thumbnail/execute.js.map +1 -1
- package/dist/nodes/CloudConvert/operations/watermark/execute.js +8 -11
- package/dist/nodes/CloudConvert/operations/watermark/execute.js.map +1 -1
- package/dist/package.json +2 -10
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -10
- package/dist/credentials/ExampleCredentialsApi.credentials.d.ts +0 -8
- package/dist/credentials/ExampleCredentialsApi.credentials.js +0 -46
- package/dist/credentials/ExampleCredentialsApi.credentials.js.map +0 -1
- package/dist/credentials/HttpBinApi.credentials.d.ts +0 -9
- package/dist/credentials/HttpBinApi.credentials.js +0 -40
- package/dist/credentials/HttpBinApi.credentials.js.map +0 -1
- package/dist/nodes/CloudConvert/convert/execute.d.ts +0 -2
- package/dist/nodes/CloudConvert/convert/execute.js +0 -64
- package/dist/nodes/CloudConvert/convert/execute.js.map +0 -1
- package/dist/nodes/CloudConvert/operations/execute.d.ts +0 -2
- package/dist/nodes/CloudConvert/operations/execute.js +0 -7
- package/dist/nodes/CloudConvert/operations/execute.js.map +0 -1
- package/dist/nodes/CloudConvert/operations/thumbnail/description.d.ts +0 -2
- package/dist/nodes/CloudConvert/operations/thumbnail/description.js +0 -58
- package/dist/nodes/CloudConvert/operations/thumbnail/description.js.map +0 -1
- package/dist/nodes/CloudConvert/test/CloudConvert.node.test.d.ts +0 -1
- package/dist/nodes/CloudConvert/test/CloudConvert.node.test.js +0 -103
- package/dist/nodes/CloudConvert/test/CloudConvert.node.test.js.map +0 -1
- package/dist/nodes/CloudConvert/test/CloudConvert.workflow.test.json +0 -354
- package/dist/nodes/CloudConvert/test/ExecuteWorkflow.d.ts +0 -7
- package/dist/nodes/CloudConvert/test/ExecuteWorkflow.js +0 -48
- package/dist/nodes/CloudConvert/test/ExecuteWorkflow.js.map +0 -1
- package/dist/nodes/CloudConvert/test/FakeCredentialsMap.d.ts +0 -8
- package/dist/nodes/CloudConvert/test/FakeCredentialsMap.js +0 -12
- package/dist/nodes/CloudConvert/test/FakeCredentialsMap.js.map +0 -1
- package/dist/nodes/CloudConvert/test/Helpers.d.ts +0 -32
- package/dist/nodes/CloudConvert/test/Helpers.js +0 -240
- package/dist/nodes/CloudConvert/test/Helpers.js.map +0 -1
- package/dist/nodes/CloudConvert/test/types.d.ts +0 -16
- package/dist/nodes/CloudConvert/test/types.js +0 -3
- package/dist/nodes/CloudConvert/test/types.js.map +0 -1
package/README.md
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.CloudConvert = void 0;
|
|
7
|
-
const lodash_keys_1 = __importDefault(require("lodash.keys"));
|
|
8
|
-
const lodash_keyby_1 = __importDefault(require("lodash.keyby"));
|
|
9
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
10
5
|
const fields_1 = require("./operations/thumbnail/fields");
|
|
11
6
|
const execute_1 = require("./operations/thumbnail/execute");
|
|
@@ -269,7 +264,8 @@ class CloudConvert {
|
|
|
269
264
|
json: true,
|
|
270
265
|
url: `https://api.cloudconvert.com/v2/operations?filter[operation]=${operation}`,
|
|
271
266
|
});
|
|
272
|
-
|
|
267
|
+
const uniqueFormats = Array.from(new Set(data.map((item) => item.output_format || '')));
|
|
268
|
+
for (const outputFormat of uniqueFormats) {
|
|
273
269
|
returnData.push({
|
|
274
270
|
name: outputFormat,
|
|
275
271
|
value: outputFormat,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudConvert.node.js","sourceRoot":"","sources":["../../../nodes/CloudConvert/CloudConvert.node.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CloudConvert.node.js","sourceRoot":"","sources":["../../../nodes/CloudConvert/CloudConvert.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,3 +7,4 @@ export declare function waitForJob(this: IExecuteFunctions, id: string): Promise
|
|
|
7
7
|
export declare function downloadOutputFile(this: IExecuteFunctions, exportUrl: TaskResultFile): Promise<import("n8n-workflow").IBinaryData>;
|
|
8
8
|
export declare function getJobUploadTask(job: Job, index?: number): Task | null;
|
|
9
9
|
export declare function getJobExportUrls(job: Job): TaskResultFile[];
|
|
10
|
+
export declare function mergeObjects<T extends Record<string, any>, U extends Record<string, any>>(target: T, source: U): T & U;
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getJobExportUrls = exports.getJobUploadTask = exports.downloadOutputFile = exports.waitForJob = exports.getJobErrorMessage = exports.uploadInputFile = exports.createJob = void 0;
|
|
3
|
+
exports.mergeObjects = exports.getJobExportUrls = exports.getJobUploadTask = exports.downloadOutputFile = exports.waitForJob = exports.getJobErrorMessage = exports.uploadInputFile = exports.createJob = void 0;
|
|
7
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
-
const form_data_1 = __importDefault(require("form-data"));
|
|
9
5
|
async function createJob(tasks) {
|
|
10
6
|
var _a, _b;
|
|
11
7
|
const credentialsType = this.getNodeParameter('authentication', 0) === 'oAuth2'
|
|
@@ -34,8 +30,10 @@ async function createJob(tasks) {
|
|
|
34
30
|
exports.createJob = createJob;
|
|
35
31
|
async function uploadInputFile(uploadTask, itemIndex = 0) {
|
|
36
32
|
var _a, _b;
|
|
37
|
-
const
|
|
38
|
-
|
|
33
|
+
const FormDataCtor = globalThis.FormData;
|
|
34
|
+
const BlobCtor = globalThis.Blob;
|
|
35
|
+
const formData = new FormDataCtor();
|
|
36
|
+
for (const parameter in ((_b = (_a = uploadTask.result) === null || _a === void 0 ? void 0 : _a.form) === null || _b === void 0 ? void 0 : _b.parameters) || {}) {
|
|
39
37
|
formData.append(parameter, uploadTask.result.form.parameters[parameter]);
|
|
40
38
|
}
|
|
41
39
|
if (this.getNodeParameter('inputBinaryData', itemIndex)) {
|
|
@@ -44,24 +42,19 @@ async function uploadInputFile(uploadTask, itemIndex = 0) {
|
|
|
44
42
|
const buffer = await this.helpers.getBinaryDataBuffer(itemIndex, binaryPropertyName);
|
|
45
43
|
if (!binaryData.fileName)
|
|
46
44
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'No file name given for input file.');
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
filename: binaryData.fileName,
|
|
50
|
-
});
|
|
45
|
+
const blob = new BlobCtor([buffer], { type: binaryData.mimeType || undefined });
|
|
46
|
+
formData.append('file', blob, binaryData.fileName);
|
|
51
47
|
}
|
|
52
48
|
else {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
49
|
+
const content = this.getNodeParameter('inputFileContent', itemIndex);
|
|
50
|
+
const filename = this.getNodeParameter('inputFilename', itemIndex);
|
|
51
|
+
const blob = new BlobCtor([content], { type: 'text/plain' });
|
|
52
|
+
formData.append('file', blob, filename);
|
|
57
53
|
}
|
|
58
54
|
await this.helpers.httpRequest({
|
|
59
55
|
method: 'POST',
|
|
60
56
|
url: uploadTask.result.form.url,
|
|
61
57
|
body: formData,
|
|
62
|
-
headers: {
|
|
63
|
-
...formData.getHeaders(),
|
|
64
|
-
},
|
|
65
58
|
});
|
|
66
59
|
}
|
|
67
60
|
exports.uploadInputFile = uploadInputFile;
|
|
@@ -114,4 +107,24 @@ function getJobExportUrls(job) {
|
|
|
114
107
|
.flatMap((task) => { var _a, _b; return (_b = (_a = task.result) === null || _a === void 0 ? void 0 : _a.files) !== null && _b !== void 0 ? _b : []; });
|
|
115
108
|
}
|
|
116
109
|
exports.getJobExportUrls = getJobExportUrls;
|
|
110
|
+
function mergeObjects(target, source) {
|
|
111
|
+
const output = { ...target };
|
|
112
|
+
for (const key of Object.keys(source)) {
|
|
113
|
+
const sourceValue = source[key];
|
|
114
|
+
const targetValue = output[key];
|
|
115
|
+
if (sourceValue &&
|
|
116
|
+
typeof sourceValue === 'object' &&
|
|
117
|
+
!Array.isArray(sourceValue) &&
|
|
118
|
+
targetValue &&
|
|
119
|
+
typeof targetValue === 'object' &&
|
|
120
|
+
!Array.isArray(targetValue)) {
|
|
121
|
+
output[key] = mergeObjects(targetValue, sourceValue);
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
output[key] = sourceValue;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
return output;
|
|
128
|
+
}
|
|
129
|
+
exports.mergeObjects = mergeObjects;
|
|
117
130
|
//# sourceMappingURL=Utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../nodes/CloudConvert/Utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../nodes/CloudConvert/Utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.executeCaptureWebsite = void 0;
|
|
7
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
-
const lodash_merge_1 = __importDefault(require("lodash.merge"));
|
|
9
5
|
const Utils_1 = require("../../Utils");
|
|
6
|
+
const Utils_2 = require("../../Utils");
|
|
10
7
|
async function executeCaptureWebsite() {
|
|
11
8
|
const items = this.getInputData();
|
|
12
9
|
const returnData = [];
|
|
@@ -30,16 +27,16 @@ async function executeCaptureWebsite() {
|
|
|
30
27
|
catch (exception) {
|
|
31
28
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Additional Options must be a valid JSON');
|
|
32
29
|
}
|
|
33
|
-
tasks['n8n-process'] = (0,
|
|
30
|
+
tasks['n8n-process'] = (0, Utils_1.mergeObjects)(tasks['n8n-process'], additionalOptions);
|
|
34
31
|
}
|
|
35
|
-
const createdJob = await
|
|
36
|
-
const completedJob = await
|
|
37
|
-
const exportUrls = (0,
|
|
32
|
+
const createdJob = await Utils_2.createJob.call(this, tasks);
|
|
33
|
+
const completedJob = await Utils_2.waitForJob.call(this, createdJob.id);
|
|
34
|
+
const exportUrls = (0, Utils_2.getJobExportUrls)(completedJob);
|
|
38
35
|
for (const exportUrl of exportUrls) {
|
|
39
36
|
returnData.push({
|
|
40
37
|
json: {},
|
|
41
38
|
binary: {
|
|
42
|
-
data: await
|
|
39
|
+
data: await Utils_2.downloadOutputFile.call(this, exportUrl),
|
|
43
40
|
},
|
|
44
41
|
pairedItem: {
|
|
45
42
|
item: i,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/capture-website/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/capture-website/execute.ts"],"names":[],"mappings":";;;AACA,+CAAkD;AAElD,uCAA2C;AAC3C,uCAA0F;AAEnF,KAAK,UAAU,qBAAqB;IAG1C,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,KAAK,GAAuB;YACjC,aAAa,EAAE;gBACd,SAAS,EAAE,iBAAiB;gBAC5B,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC;gBACpC,aAAa,EAAE,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAC;aACvD;YACD,YAAY,EAAE;gBACb,KAAK,EAAE,aAAa;gBACpB,SAAS,EAAE,YAAY;aACvB;SACD,CAAC;QAEF,IAAI,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;YACxD,IAAI,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,CAAW,CAAC;YAChF,IAAI;gBACH,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;aAClD;YAAC,OAAO,SAAS,EAAE;gBACnB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,yCAAyC,CAAC,CAAC;aACxF;YACD,KAAK,CAAC,aAAa,CAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,aAAa,CAAC,EAAE,iBAAwB,CAAC,CAAC;SACpF;QAED,MAAM,UAAU,GAAG,MAAM,iBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,YAAY,GAAG,MAAM,kBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAIhE,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,YAAY,CAAC,CAAC;QAElD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,UAAU,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,EAAE;gBACR,MAAM,EAAE;oBACP,IAAI,EAAE,MAAM,0BAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;iBACpD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE,CAAC;iBACP;aACD,CAAC,CAAC;SACH;KACD;IAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC;AAnDD,sDAmDC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.executeConvert = void 0;
|
|
7
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
-
const lodash_merge_1 = __importDefault(require("lodash.merge"));
|
|
9
5
|
const Utils_1 = require("../../Utils");
|
|
6
|
+
const Utils_2 = require("../../Utils");
|
|
10
7
|
async function executeConvert() {
|
|
11
8
|
const items = this.getInputData();
|
|
12
9
|
const returnData = [];
|
|
@@ -33,20 +30,20 @@ async function executeConvert() {
|
|
|
33
30
|
catch (exception) {
|
|
34
31
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Additional Options must be a valid JSON');
|
|
35
32
|
}
|
|
36
|
-
tasks['n8n-process'] = (0,
|
|
33
|
+
tasks['n8n-process'] = (0, Utils_1.mergeObjects)(tasks['n8n-process'], additionalOptions);
|
|
37
34
|
}
|
|
38
|
-
const createdJob = await
|
|
39
|
-
const uploadTask = (0,
|
|
35
|
+
const createdJob = await Utils_2.createJob.call(this, tasks);
|
|
36
|
+
const uploadTask = (0, Utils_2.getJobUploadTask)(createdJob);
|
|
40
37
|
if (uploadTask) {
|
|
41
|
-
await
|
|
38
|
+
await Utils_2.uploadInputFile.call(this, uploadTask, i);
|
|
42
39
|
}
|
|
43
|
-
const completedJob = await
|
|
44
|
-
const exportUrls = (0,
|
|
40
|
+
const completedJob = await Utils_2.waitForJob.call(this, createdJob.id);
|
|
41
|
+
const exportUrls = (0, Utils_2.getJobExportUrls)(completedJob);
|
|
45
42
|
for (const exportUrl of exportUrls) {
|
|
46
43
|
returnData.push({
|
|
47
44
|
json: {},
|
|
48
45
|
binary: {
|
|
49
|
-
data: await
|
|
46
|
+
data: await Utils_2.downloadOutputFile.call(this, exportUrl),
|
|
50
47
|
},
|
|
51
48
|
pairedItem: {
|
|
52
49
|
item: i,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/convert/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/convert/execute.ts"],"names":[],"mappings":";;;AACA,+CAAkD;AAElD,uCAA2C;AAC3C,uCAOqB;AAEd,KAAK,UAAU,cAAc;IACnC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,KAAK,GAAuB;YACjC,YAAY,EAAE;gBACb,SAAS,EAAE,eAAe;aAC1B;YACD,aAAa,EAAE;gBACd,KAAK,EAAE,YAAY;gBACnB,SAAS,EAAE,SAAS;gBACpB,aAAa,EAAE,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAC;aACvD;YACD,YAAY,EAAE;gBACb,KAAK,EAAE,aAAa;gBACpB,SAAS,EAAE,YAAY;aACvB;SACD,CAAC;QAEF,IAAI,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;YACxD,IAAI,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,CAAW,CAAC;YAChF,IAAI;gBACH,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;aAClD;YAAC,OAAO,SAAS,EAAE;gBACnB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,yCAAyC,CAAC,CAAC;aACxF;YACD,KAAK,CAAC,aAAa,CAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,aAAa,CAAC,EAAE,iBAAwB,CAAC,CAAC;SACpF;QAED,MAAM,UAAU,GAAG,MAAM,iBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,UAAU,EAAE;YACf,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;SAChD;QAED,MAAM,YAAY,GAAG,MAAM,kBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAIhE,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,YAAY,CAAC,CAAC;QAElD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,UAAU,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,EAAE;gBACR,MAAM,EAAE;oBACP,IAAI,EAAE,MAAM,0BAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;iBACpD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE,CAAC;iBACP;aACD,CAAC,CAAC;SACH;KACD;IAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC;AA1DD,wCA0DC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.executeOptimize = void 0;
|
|
7
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
-
const lodash_merge_1 = __importDefault(require("lodash.merge"));
|
|
9
5
|
const Utils_1 = require("../../Utils");
|
|
6
|
+
const Utils_2 = require("../../Utils");
|
|
10
7
|
async function executeOptimize() {
|
|
11
8
|
const items = this.getInputData();
|
|
12
9
|
const returnData = [];
|
|
@@ -32,20 +29,20 @@ async function executeOptimize() {
|
|
|
32
29
|
catch (exception) {
|
|
33
30
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Additional Options must be a valid JSON');
|
|
34
31
|
}
|
|
35
|
-
tasks['n8n-process'] = (0,
|
|
32
|
+
tasks['n8n-process'] = (0, Utils_1.mergeObjects)(tasks['n8n-process'], additionalOptions);
|
|
36
33
|
}
|
|
37
|
-
const createdJob = await
|
|
38
|
-
const uploadTask = (0,
|
|
34
|
+
const createdJob = await Utils_2.createJob.call(this, tasks);
|
|
35
|
+
const uploadTask = (0, Utils_2.getJobUploadTask)(createdJob);
|
|
39
36
|
if (uploadTask) {
|
|
40
|
-
await
|
|
37
|
+
await Utils_2.uploadInputFile.call(this, uploadTask, i);
|
|
41
38
|
}
|
|
42
|
-
const completedJob = await
|
|
43
|
-
const exportUrls = (0,
|
|
39
|
+
const completedJob = await Utils_2.waitForJob.call(this, createdJob.id);
|
|
40
|
+
const exportUrls = (0, Utils_2.getJobExportUrls)(completedJob);
|
|
44
41
|
for (const exportUrl of exportUrls) {
|
|
45
42
|
returnData.push({
|
|
46
43
|
json: {},
|
|
47
44
|
binary: {
|
|
48
|
-
data: await
|
|
45
|
+
data: await Utils_2.downloadOutputFile.call(this, exportUrl),
|
|
49
46
|
},
|
|
50
47
|
pairedItem: {
|
|
51
48
|
item: i,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/optimize/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/optimize/execute.ts"],"names":[],"mappings":";;;AACA,+CAAkD;AAElD,uCAA2C;AAC3C,uCAOqB;AAEd,KAAK,UAAU,eAAe;IACpC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,KAAK,GAAuB;YACjC,YAAY,EAAE;gBACb,SAAS,EAAE,eAAe;aAC1B;YACD,aAAa,EAAE;gBACd,KAAK,EAAE,YAAY;gBACnB,SAAS,EAAE,UAAU;aACrB;YACD,YAAY,EAAE;gBACb,KAAK,EAAE,aAAa;gBACpB,SAAS,EAAE,YAAY;aACvB;SACD,CAAC;QAEF,IAAI,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;YACxD,IAAI,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,CAAW,CAAC;YAChF,IAAI;gBACH,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;aAClD;YAAC,OAAO,SAAS,EAAE;gBACnB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,yCAAyC,CAAC,CAAC;aACxF;YACD,KAAK,CAAC,aAAa,CAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,aAAa,CAAC,EAAE,iBAAwB,CAAC,CAAC;SACpF;QAED,MAAM,UAAU,GAAG,MAAM,iBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,UAAU,EAAE;YACf,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;SAChD;QAED,MAAM,YAAY,GAAG,MAAM,kBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAEhE,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,YAAY,CAAC,CAAC;QAElD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,UAAU,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,EAAE;gBACR,MAAM,EAAE;oBACP,IAAI,EAAE,MAAM,0BAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;iBACpD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE,CAAC;iBACP;aACD,CAAC,CAAC;SACH;KACD;IAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC;AAvDD,0CAuDC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.executeThumbnail = void 0;
|
|
7
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
-
const lodash_merge_1 = __importDefault(require("lodash.merge"));
|
|
9
5
|
const Utils_1 = require("../../Utils");
|
|
6
|
+
const Utils_2 = require("../../Utils");
|
|
10
7
|
async function executeThumbnail() {
|
|
11
8
|
const items = this.getInputData();
|
|
12
9
|
const returnData = [];
|
|
@@ -38,20 +35,20 @@ async function executeThumbnail() {
|
|
|
38
35
|
catch (exception) {
|
|
39
36
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Additional Options must be a valid JSON');
|
|
40
37
|
}
|
|
41
|
-
tasks['n8n-process'] = (0,
|
|
38
|
+
tasks['n8n-process'] = (0, Utils_1.mergeObjects)(tasks['n8n-process'], additionalOptions);
|
|
42
39
|
}
|
|
43
|
-
const createdJob = await
|
|
44
|
-
const uploadTask = (0,
|
|
40
|
+
const createdJob = await Utils_2.createJob.call(this, tasks);
|
|
41
|
+
const uploadTask = (0, Utils_2.getJobUploadTask)(createdJob);
|
|
45
42
|
if (uploadTask) {
|
|
46
|
-
await
|
|
43
|
+
await Utils_2.uploadInputFile.call(this, uploadTask, i);
|
|
47
44
|
}
|
|
48
|
-
const completedJob = await
|
|
49
|
-
const exportUrls = (0,
|
|
45
|
+
const completedJob = await Utils_2.waitForJob.call(this, createdJob.id);
|
|
46
|
+
const exportUrls = (0, Utils_2.getJobExportUrls)(completedJob);
|
|
50
47
|
for (const exportUrl of exportUrls) {
|
|
51
48
|
returnData.push({
|
|
52
49
|
json: {},
|
|
53
50
|
binary: {
|
|
54
|
-
data: await
|
|
51
|
+
data: await Utils_2.downloadOutputFile.call(this, exportUrl),
|
|
55
52
|
},
|
|
56
53
|
pairedItem: {
|
|
57
54
|
item: i,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/thumbnail/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/thumbnail/execute.ts"],"names":[],"mappings":";;;AACA,+CAAkD;AAElD,uCAA2C;AAC3C,uCAOqB;AAEd,KAAK,UAAU,gBAAgB;IACrC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,KAAK,GAAuB;YACjC,YAAY,EAAE;gBACb,SAAS,EAAE,eAAe;aAC1B;YACD,aAAa,EAAE;gBACd,KAAK,EAAE,YAAY;gBACnB,SAAS,EAAE,WAAW;gBACtB,aAAa,EAAE,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAC;aACvD;YACD,YAAY,EAAE;gBACb,KAAK,EAAE,aAAa;gBACpB,SAAS,EAAE,YAAY;aACvB;SACD,CAAC;QAEF,KAAK,MAAM,MAAM,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE;YAChD,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;gBAC3C,KAAK,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aAChE;SACD;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;YACxD,IAAI,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,CAAW,CAAC;YAChF,IAAI;gBACH,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;aAClD;YAAC,OAAO,SAAS,EAAE;gBACnB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,yCAAyC,CAAC,CAAC;aACxF;YACD,KAAK,CAAC,aAAa,CAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,aAAa,CAAC,EAAE,iBAAwB,CAAC,CAAC;SACpF;QAED,MAAM,UAAU,GAAG,MAAM,iBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,UAAU,EAAE;YACf,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;SAChD;QAED,MAAM,YAAY,GAAG,MAAM,kBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAIhE,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,YAAY,CAAC,CAAC;QAElD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,UAAU,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,EAAE;gBACR,MAAM,EAAE;oBACP,IAAI,EAAE,MAAM,0BAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;iBACpD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE,CAAC;iBACP;aACD,CAAC,CAAC;SACH;KACD;IAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC;AAhED,4CAgEC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.executeWatermark = void 0;
|
|
7
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
-
const lodash_merge_1 = __importDefault(require("lodash.merge"));
|
|
9
5
|
const Utils_1 = require("../../Utils");
|
|
6
|
+
const Utils_2 = require("../../Utils");
|
|
10
7
|
async function executeWatermark() {
|
|
11
8
|
const items = this.getInputData();
|
|
12
9
|
const returnData = [];
|
|
@@ -53,20 +50,20 @@ async function executeWatermark() {
|
|
|
53
50
|
catch (exception) {
|
|
54
51
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Additional Options must be a valid JSON');
|
|
55
52
|
}
|
|
56
|
-
tasks['n8n-process'] = (0,
|
|
53
|
+
tasks['n8n-process'] = (0, Utils_1.mergeObjects)(tasks['n8n-process'], additionalOptions);
|
|
57
54
|
}
|
|
58
|
-
const createdJob = await
|
|
59
|
-
const uploadTask = (0,
|
|
55
|
+
const createdJob = await Utils_2.createJob.call(this, tasks);
|
|
56
|
+
const uploadTask = (0, Utils_2.getJobUploadTask)(createdJob);
|
|
60
57
|
if (uploadTask) {
|
|
61
|
-
await
|
|
58
|
+
await Utils_2.uploadInputFile.call(this, uploadTask, i);
|
|
62
59
|
}
|
|
63
|
-
const completedJob = await
|
|
64
|
-
const exportUrls = (0,
|
|
60
|
+
const completedJob = await Utils_2.waitForJob.call(this, createdJob.id);
|
|
61
|
+
const exportUrls = (0, Utils_2.getJobExportUrls)(completedJob);
|
|
65
62
|
for (const exportUrl of exportUrls) {
|
|
66
63
|
returnData.push({
|
|
67
64
|
json: {},
|
|
68
65
|
binary: {
|
|
69
|
-
data: await
|
|
66
|
+
data: await Utils_2.downloadOutputFile.call(this, exportUrl),
|
|
70
67
|
},
|
|
71
68
|
pairedItem: {
|
|
72
69
|
item: i,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/watermark/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../nodes/CloudConvert/operations/watermark/execute.ts"],"names":[],"mappings":";;;AACA,+CAAkD;AAElD,uCAA2C;AAC3C,uCAOqB;AAEd,KAAK,UAAU,gBAAgB;IACrC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,KAAK,GAAuB;YACjC,YAAY,EAAE;gBACb,SAAS,EAAE,eAAe;aAC1B;YACD,aAAa,EAAE;gBACd,KAAK,EAAE,YAAY;gBACnB,SAAS,EAAE,WAAW;aACtB;YACD,YAAY,EAAE;gBACb,KAAK,EAAE,aAAa;gBACpB,SAAS,EAAE,YAAY;aACvB;SACD,CAAC;QAEF,IAAI,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE;YACzD,KAAK,CAAC,qBAAqB,CAAC,GAAG;gBAC9B,SAAS,EAAE,YAAY;gBACvB,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,CAAC;aACzC,CAAC;YACF,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,GAAG,qBAAqB,CAAC;SACnD;QACD,KAAK,MAAM,MAAM,IAAI;YACpB,MAAM;YACN,WAAW;YACX,YAAY;YACZ,mBAAmB;YACnB,qBAAqB;YACrB,iBAAiB;YACjB,mBAAmB;YACnB,SAAS;SACT,EAAE;YACF,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;gBAC3C,KAAK,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aAChE;SACD;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;YACxD,IAAI,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,CAAC,CAAW,CAAC;YAChF,IAAI;gBACH,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;aAClD;YAAC,OAAO,SAAS,EAAE;gBACnB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,yCAAyC,CAAC,CAAC;aACxF;YACD,KAAK,CAAC,aAAa,CAAC,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,aAAa,CAAC,EAAE,iBAAwB,CAAC,CAAC;SACpF;QAED,MAAM,UAAU,GAAG,MAAM,iBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,UAAU,EAAE;YACf,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;SAChD;QAED,MAAM,YAAY,GAAG,MAAM,kBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAIhE,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,YAAY,CAAC,CAAC;QAElD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,UAAU,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,EAAE;gBACR,MAAM,EAAE;oBACP,IAAI,EAAE,MAAM,0BAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC;iBACpD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE,CAAC;iBACP;aACD,CAAC,CAAC;SACH;KACD;IAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC;AA/ED,4CA+EC"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudconvert/n8n-nodes-cloudconvert",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.1",
|
|
4
4
|
"description": "n8n node for CloudConvert - an online file conversion and processing API which allows to convert files, create thumbnails, merge files, add watermarks and more!",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"n8n-community-node-package"
|
|
@@ -41,13 +41,10 @@
|
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/express": "^4.17.6",
|
|
43
43
|
"@types/jest": "^29.5.1",
|
|
44
|
-
"@types/lodash.keyby": "^4.6.7",
|
|
45
|
-
"@types/lodash.keys": "^4.2.7",
|
|
46
|
-
"@types/lodash.merge": "^4.6.7",
|
|
47
44
|
"@types/nock": "^11.1.0",
|
|
48
45
|
"@types/request-promise-native": "~1.0.15",
|
|
49
46
|
"@typescript-eslint/parser": "~5.45",
|
|
50
|
-
"eslint-plugin-n8n-nodes-base": "^1.
|
|
47
|
+
"eslint-plugin-n8n-nodes-base": "^1.16.3",
|
|
51
48
|
"gulp": "^4.0.2",
|
|
52
49
|
"jest": "^29.5.0",
|
|
53
50
|
"jest-expect-message": "^1.1.3",
|
|
@@ -58,10 +55,5 @@
|
|
|
58
55
|
"prettier": "^2.7.1",
|
|
59
56
|
"ts-jest": "^29.1.0",
|
|
60
57
|
"typescript": "~4.8.4"
|
|
61
|
-
},
|
|
62
|
-
"dependencies": {
|
|
63
|
-
"lodash.keyby": "^4.6.0",
|
|
64
|
-
"lodash.keys": "^4.2.0",
|
|
65
|
-
"lodash.merge": "^4.6.2"
|
|
66
58
|
}
|
|
67
59
|
}
|