@steedos/objectql 2.7.11-beta.2 → 2.7.11-beta.3
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/lib/triggers/trigger.js +60 -11
- package/lib/triggers/trigger.js.map +1 -1
- package/package.json +15 -14
package/lib/triggers/trigger.js
CHANGED
|
@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runTriggerFunction = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var NodeVM = require('vm2').NodeVM;
|
|
6
|
+
var _ = require('lodash');
|
|
6
7
|
var mongodb_1 = require("mongodb");
|
|
8
|
+
var axios_1 = require("axios");
|
|
7
9
|
function str2function(contents) {
|
|
8
10
|
var args = [];
|
|
9
11
|
for (var _i = 1; _i < arguments.length; _i++) {
|
|
@@ -18,16 +20,63 @@ function str2function(contents) {
|
|
|
18
20
|
return null;
|
|
19
21
|
}
|
|
20
22
|
}
|
|
23
|
+
var sendPost = function (url, body, options) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
24
|
+
var error_1;
|
|
25
|
+
return tslib_1.__generator(this, function (_a) {
|
|
26
|
+
switch (_a.label) {
|
|
27
|
+
case 0:
|
|
28
|
+
_a.trys.push([0, 2, , 3]);
|
|
29
|
+
return [4, axios_1.default.post(url, body, options)];
|
|
30
|
+
case 1: return [2, _a.sent()];
|
|
31
|
+
case 2:
|
|
32
|
+
error_1 = _a.sent();
|
|
33
|
+
throw new Error("\u8BF7\u6C42\u5931\u8D25(".concat(error_1.message, "): ").concat(url));
|
|
34
|
+
case 3: return [2];
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}); };
|
|
38
|
+
var runUrlTrigger = function (trigger, thisArg, args) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
39
|
+
var headers, _a, rsBody, httpStatus, error, data;
|
|
40
|
+
return tslib_1.__generator(this, function (_b) {
|
|
41
|
+
switch (_b.label) {
|
|
42
|
+
case 0:
|
|
43
|
+
if (!trigger.url) {
|
|
44
|
+
throw new Error("\u89E6\u53D1\u5668\u300C".concat(trigger.name, "\u300D\u7F3A\u5C11URL"));
|
|
45
|
+
}
|
|
46
|
+
headers = {
|
|
47
|
+
'Content-Type': 'application/json',
|
|
48
|
+
};
|
|
49
|
+
if (trigger.authentication_type == 'header') {
|
|
50
|
+
headers[trigger.authentication_header_key] = trigger.authentication_header_value;
|
|
51
|
+
}
|
|
52
|
+
return [4, sendPost(trigger.url, args && args.length > 0 ? args[0].params : {}, { headers: headers })];
|
|
53
|
+
case 1:
|
|
54
|
+
_a = _b.sent(), rsBody = _a.data, httpStatus = _a.status;
|
|
55
|
+
if (httpStatus !== 200) {
|
|
56
|
+
throw new Error("\u8BF7\u6C42\u5931\u8D25: ".concat(trigger.url));
|
|
57
|
+
}
|
|
58
|
+
error = rsBody.error, data = rsBody.data;
|
|
59
|
+
if (error && error.message) {
|
|
60
|
+
throw new Error(error.message);
|
|
61
|
+
}
|
|
62
|
+
return [2, data];
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
}); };
|
|
21
66
|
var runTriggerFunction = function (trigger, thisArg) {
|
|
22
67
|
var args = [];
|
|
23
68
|
for (var _i = 2; _i < arguments.length; _i++) {
|
|
24
69
|
args[_i - 2] = arguments[_i];
|
|
25
70
|
}
|
|
26
71
|
return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
27
|
-
var vm, triggerFileName, triggerInSandbox, runTrigger, res,
|
|
72
|
+
var vm, triggerFileName, triggerInSandbox, runTrigger, res, error_2, source, errorStack, newError;
|
|
28
73
|
return tslib_1.__generator(this, function (_a) {
|
|
29
74
|
switch (_a.label) {
|
|
30
75
|
case 0:
|
|
76
|
+
if (!(trigger.type === 'url')) return [3, 2];
|
|
77
|
+
return [4, runUrlTrigger(trigger, thisArg, args)];
|
|
78
|
+
case 1: return [2, _a.sent()];
|
|
79
|
+
case 2:
|
|
31
80
|
vm = new NodeVM({
|
|
32
81
|
sandbox: {
|
|
33
82
|
str2function: str2function,
|
|
@@ -52,9 +101,9 @@ var runTriggerFunction = function (trigger, thisArg) {
|
|
|
52
101
|
});
|
|
53
102
|
triggerFileName = "".concat(trigger.listenTo, ".").concat(trigger.name, ".trigger.js");
|
|
54
103
|
triggerInSandbox = vm.run("module.exports = async function(ctx){".concat(trigger.handler, "};"), triggerFileName);
|
|
55
|
-
_a.label =
|
|
56
|
-
case
|
|
57
|
-
_a.trys.push([
|
|
104
|
+
_a.label = 3;
|
|
105
|
+
case 3:
|
|
106
|
+
_a.trys.push([3, 5, , 6]);
|
|
58
107
|
runTrigger = function () {
|
|
59
108
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
60
109
|
return tslib_1.__generator(this, function (_a) {
|
|
@@ -69,20 +118,20 @@ var runTriggerFunction = function (trigger, thisArg) {
|
|
|
69
118
|
});
|
|
70
119
|
};
|
|
71
120
|
return [4, runTrigger()];
|
|
72
|
-
case
|
|
121
|
+
case 4:
|
|
73
122
|
res = _a.sent();
|
|
74
123
|
return [2, res];
|
|
75
|
-
case
|
|
76
|
-
|
|
77
|
-
source =
|
|
124
|
+
case 5:
|
|
125
|
+
error_2 = _a.sent();
|
|
126
|
+
source = error_2.stack;
|
|
78
127
|
errorStack = source.substring(source.indexOf("(") + 1, source.indexOf(")")).replace(triggerFileName, "对象「" + trigger.listenTo + "」的「" + trigger.name + "」触发器").replace(":", " 行 ").replace(":", " 列 ");
|
|
79
|
-
newError = new Error(
|
|
80
|
-
newError.stack = "Object Trigger Error: ".concat(
|
|
128
|
+
newError = new Error(error_2.message);
|
|
129
|
+
newError.stack = "Object Trigger Error: ".concat(error_2.message, "\n at ").concat(errorStack);
|
|
81
130
|
if (process.env.NODE_ENV === 'development') {
|
|
82
131
|
newError.message = newError.stack;
|
|
83
132
|
}
|
|
84
133
|
throw newError;
|
|
85
|
-
case
|
|
134
|
+
case 6: return [2];
|
|
86
135
|
}
|
|
87
136
|
});
|
|
88
137
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../src/triggers/trigger.ts"],"names":[],"mappings":";;;;AAOQ,IAAA,MAAM,GAAK,OAAO,CAAC,KAAK,CAAC,OAAnB,CAAoB;AAClC,mCAAmC;
|
|
1
|
+
{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../src/triggers/trigger.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/objectql",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.7.11-beta.
|
|
4
|
+
"version": "2.7.11-beta.3",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"scripts": {
|
|
@@ -16,19 +16,20 @@
|
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@salesforce/kit": "1.0.4",
|
|
18
18
|
"@salesforce/ts-types": "1.1.1",
|
|
19
|
-
"@steedos/cachers": "2.7.11-beta.
|
|
20
|
-
"@steedos/filters": "2.7.11-beta.
|
|
21
|
-
"@steedos/formula": "2.7.11-beta.
|
|
22
|
-
"@steedos/i18n": "2.7.11-beta.
|
|
23
|
-
"@steedos/metadata-core": "2.7.11-beta.
|
|
24
|
-
"@steedos/metadata-registrar": "2.7.11-beta.
|
|
25
|
-
"@steedos/odata-v4-mongodb": "2.7.11-beta.
|
|
26
|
-
"@steedos/odata-v4-sql": "2.7.11-beta.
|
|
27
|
-
"@steedos/odata-v4-typeorm": "2.7.11-beta.
|
|
28
|
-
"@steedos/schemas": "2.7.11-beta.
|
|
29
|
-
"@steedos/standard-objects": "2.7.11-beta.
|
|
19
|
+
"@steedos/cachers": "2.7.11-beta.3",
|
|
20
|
+
"@steedos/filters": "2.7.11-beta.3",
|
|
21
|
+
"@steedos/formula": "2.7.11-beta.3",
|
|
22
|
+
"@steedos/i18n": "2.7.11-beta.3",
|
|
23
|
+
"@steedos/metadata-core": "2.7.11-beta.3",
|
|
24
|
+
"@steedos/metadata-registrar": "2.7.11-beta.3",
|
|
25
|
+
"@steedos/odata-v4-mongodb": "2.7.11-beta.3",
|
|
26
|
+
"@steedos/odata-v4-sql": "2.7.11-beta.3",
|
|
27
|
+
"@steedos/odata-v4-typeorm": "2.7.11-beta.3",
|
|
28
|
+
"@steedos/schemas": "2.7.11-beta.3",
|
|
29
|
+
"@steedos/standard-objects": "2.7.11-beta.3",
|
|
30
30
|
"amis-formula": "~6.3.0",
|
|
31
31
|
"app-root-path": "^2.2.1",
|
|
32
|
+
"axios": "^0.21.1",
|
|
32
33
|
"body-parser": "^1.18.1",
|
|
33
34
|
"bunyan-sfdx-no-dtrace": "^1.8.2",
|
|
34
35
|
"clone": "^2.1.2",
|
|
@@ -56,7 +57,7 @@
|
|
|
56
57
|
"vm2": "^3.9.17"
|
|
57
58
|
},
|
|
58
59
|
"devDependencies": {
|
|
59
|
-
"@steedos/meteor-bundle-runner": "2.7.11-beta.
|
|
60
|
+
"@steedos/meteor-bundle-runner": "2.7.11-beta.3",
|
|
60
61
|
"@types/express": "^4.16.1",
|
|
61
62
|
"@types/node": "^11.10.4",
|
|
62
63
|
"@types/underscore": "^1.8.13",
|
|
@@ -66,5 +67,5 @@
|
|
|
66
67
|
"publishConfig": {
|
|
67
68
|
"access": "public"
|
|
68
69
|
},
|
|
69
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "5c2a07d7c33ca991a5264bffe2ef160cc57614b2"
|
|
70
71
|
}
|