n8n-nodes-base 0.228.1 → 0.228.2
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/nodes/Code/JavaScriptSandbox.d.ts +1 -0
- package/dist/nodes/Code/JavaScriptSandbox.js +12 -5
- package/dist/nodes/Code/JavaScriptSandbox.js.map +1 -1
- package/dist/nodes/Function/Function.node.js +2 -13
- package/dist/nodes/Function/Function.node.js.map +1 -1
- package/dist/nodes/FunctionItem/FunctionItem.node.js +2 -14
- package/dist/nodes/FunctionItem/FunctionItem.node.js.map +1 -1
- package/dist/package.json +3 -2
- package/dist/types/nodes.json +1 -1
- package/package.json +3 -2
|
@@ -2,6 +2,7 @@ import { NodeVM } from 'vm2';
|
|
|
2
2
|
import type { IExecuteFunctions, INodeExecutionData, WorkflowExecuteMode } from 'n8n-workflow';
|
|
3
3
|
import type { SandboxContext } from './Sandbox';
|
|
4
4
|
import { Sandbox } from './Sandbox';
|
|
5
|
+
export declare const vmResolver: import("vm2").Resolver;
|
|
5
6
|
export declare class JavaScriptSandbox extends Sandbox {
|
|
6
7
|
private jsCode;
|
|
7
8
|
readonly vm: NodeVM;
|
|
@@ -1,18 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.JavaScriptSandbox = void 0;
|
|
4
|
+
exports.JavaScriptSandbox = exports.vmResolver = void 0;
|
|
4
5
|
const vm2_1 = require("vm2");
|
|
5
6
|
const ValidationError_1 = require("./ValidationError");
|
|
6
7
|
const ExecutionError_1 = require("./ExecutionError");
|
|
7
8
|
const Sandbox_1 = require("./Sandbox");
|
|
8
9
|
const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } = process.env;
|
|
10
|
+
exports.vmResolver = (0, vm2_1.makeResolverFromLegacyOptions)({
|
|
11
|
+
external: external
|
|
12
|
+
? {
|
|
13
|
+
modules: external.split(','),
|
|
14
|
+
transitive: false,
|
|
15
|
+
}
|
|
16
|
+
: false,
|
|
17
|
+
builtin: (_a = builtIn === null || builtIn === void 0 ? void 0 : builtIn.split(',')) !== null && _a !== void 0 ? _a : [],
|
|
18
|
+
});
|
|
9
19
|
const getSandboxOptions = (context, workflowMode) => ({
|
|
10
20
|
console: workflowMode === 'manual' ? 'redirect' : 'inherit',
|
|
11
21
|
sandbox: context,
|
|
12
|
-
require:
|
|
13
|
-
builtin: builtIn ? builtIn.split(',') : [],
|
|
14
|
-
external: external ? { modules: external.split(','), transitive: false } : false,
|
|
15
|
-
},
|
|
22
|
+
require: exports.vmResolver,
|
|
16
23
|
});
|
|
17
24
|
class JavaScriptSandbox extends Sandbox_1.Sandbox {
|
|
18
25
|
constructor(context, jsCode, itemIndex, workflowMode, helpers) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JavaScriptSandbox.js","sourceRoot":"","sources":["../../../nodes/Code/JavaScriptSandbox.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"JavaScriptSandbox.js","sourceRoot":"","sources":["../../../nodes/Code/JavaScriptSandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Function = void 0;
|
|
4
4
|
const vm2_1 = require("vm2");
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
|
+
const JavaScriptSandbox_1 = require("../Code/JavaScriptSandbox");
|
|
6
7
|
class Function {
|
|
7
8
|
constructor() {
|
|
8
9
|
this.description = {
|
|
@@ -108,20 +109,8 @@ return items;`,
|
|
|
108
109
|
const options = {
|
|
109
110
|
console: mode === 'manual' ? 'redirect' : 'inherit',
|
|
110
111
|
sandbox,
|
|
111
|
-
require:
|
|
112
|
-
external: false,
|
|
113
|
-
builtin: [],
|
|
114
|
-
},
|
|
112
|
+
require: JavaScriptSandbox_1.vmResolver,
|
|
115
113
|
};
|
|
116
|
-
if (process.env.NODE_FUNCTION_ALLOW_BUILTIN && typeof options.require === 'object') {
|
|
117
|
-
options.require.builtin = process.env.NODE_FUNCTION_ALLOW_BUILTIN.split(',');
|
|
118
|
-
}
|
|
119
|
-
if (process.env.NODE_FUNCTION_ALLOW_EXTERNAL && typeof options.require === 'object') {
|
|
120
|
-
options.require.external = {
|
|
121
|
-
modules: process.env.NODE_FUNCTION_ALLOW_EXTERNAL.split(','),
|
|
122
|
-
transitive: false,
|
|
123
|
-
};
|
|
124
|
-
}
|
|
125
114
|
const vm = new vm2_1.NodeVM(options);
|
|
126
115
|
if (mode === 'manual') {
|
|
127
116
|
vm.on('console.log', this.sendMessageToUI);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Function.node.js","sourceRoot":"","sources":["../../../nodes/Function/Function.node.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAS7B,+CAA4D;
|
|
1
|
+
{"version":3,"file":"Function.node.js","sourceRoot":"","sources":["../../../nodes/Function/Function.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FunctionItem = void 0;
|
|
4
4
|
const vm2_1 = require("vm2");
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
|
+
const JavaScriptSandbox_1 = require("../Code/JavaScriptSandbox");
|
|
6
7
|
class FunctionItem {
|
|
7
8
|
constructor() {
|
|
8
9
|
this.description = {
|
|
@@ -119,21 +120,8 @@ return item;`,
|
|
|
119
120
|
const options = {
|
|
120
121
|
console: mode === 'manual' ? 'redirect' : 'inherit',
|
|
121
122
|
sandbox,
|
|
122
|
-
require:
|
|
123
|
-
external: false,
|
|
124
|
-
builtin: [],
|
|
125
|
-
},
|
|
123
|
+
require: JavaScriptSandbox_1.vmResolver,
|
|
126
124
|
};
|
|
127
|
-
const vmRequire = options.require;
|
|
128
|
-
if (process.env.NODE_FUNCTION_ALLOW_BUILTIN) {
|
|
129
|
-
vmRequire.builtin = process.env.NODE_FUNCTION_ALLOW_BUILTIN.split(',');
|
|
130
|
-
}
|
|
131
|
-
if (process.env.NODE_FUNCTION_ALLOW_EXTERNAL) {
|
|
132
|
-
vmRequire.external = {
|
|
133
|
-
modules: process.env.NODE_FUNCTION_ALLOW_EXTERNAL.split(','),
|
|
134
|
-
transitive: false,
|
|
135
|
-
};
|
|
136
|
-
}
|
|
137
125
|
const vm = new vm2_1.NodeVM(options);
|
|
138
126
|
if (mode === 'manual') {
|
|
139
127
|
vm.on('console.log', this.sendMessageToUI);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionItem.node.js","sourceRoot":"","sources":["../../../nodes/FunctionItem/FunctionItem.node.ts"],"names":[],"mappings":";;;AAEA,6BAA6B;AAS7B,+CAA4D;
|
|
1
|
+
{"version":3,"file":"FunctionItem.node.js","sourceRoot":"","sources":["../../../nodes/FunctionItem/FunctionItem.node.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n-nodes-base",
|
|
3
|
-
"version": "0.228.
|
|
3
|
+
"version": "0.228.2",
|
|
4
4
|
"description": "Base nodes of n8n",
|
|
5
5
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
6
6
|
"homepage": "https://n8n.io",
|
|
@@ -840,6 +840,7 @@
|
|
|
840
840
|
"js-nacl": "^1.4.0",
|
|
841
841
|
"jsonwebtoken": "^9.0.0",
|
|
842
842
|
"kafkajs": "^1.14.0",
|
|
843
|
+
"ldapts": "^4.2.6",
|
|
843
844
|
"lodash.assign": "^4",
|
|
844
845
|
"lodash.assignwith": "^4",
|
|
845
846
|
"lodash.clone": "^4",
|
|
@@ -911,7 +912,7 @@
|
|
|
911
912
|
"ssh2-sftp-client": "^7.0.0",
|
|
912
913
|
"tmp-promise": "^3.0.2",
|
|
913
914
|
"uuid": "^8.3.2",
|
|
914
|
-
"vm2": "
|
|
915
|
+
"vm2": "^3.9.19",
|
|
915
916
|
"xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz",
|
|
916
917
|
"xml2js": "^0.5.0"
|
|
917
918
|
}
|