@steedos/service-package-loader 2.5.0-beta.30 → 2.5.0-beta.33
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/index.js +1 -1
- package/lib/loader/triggerYmlLoader.js +27 -0
- package/lib/loader/triggerYmlLoader.js.map +1 -1
- package/lib/triggerLoader/index.js +3 -0
- package/lib/triggerLoader/index.js.map +1 -1
- package/package.json +6 -6
- package/src/loader/triggerYmlLoader.ts +24 -2
- package/src/triggerLoader/index.ts +4 -0
package/index.js
CHANGED
|
@@ -359,7 +359,7 @@ module.exports = {
|
|
|
359
359
|
nodeID: this.broker.nodeID,
|
|
360
360
|
instanceID: this.broker.instanceID
|
|
361
361
|
}] }); //${this.broker.nodeID}.${this.name}
|
|
362
|
-
|
|
362
|
+
this.broker.broadcast('metadata.object_triggers.change', {})
|
|
363
363
|
this.broker.broadcastLocal("@steedos/service-packages.offline", {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
|
|
364
364
|
|
|
365
365
|
console.log(`service ${this.name} stopped`);
|
|
@@ -6,6 +6,30 @@ const metadata_core_1 = require("@steedos/metadata-core");
|
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const _ = require("lodash");
|
|
8
8
|
const loadTriggerFile = new metadata_core_1.LoadTriggerFile();
|
|
9
|
+
function isPatternTrigger(data) {
|
|
10
|
+
const { listenTo } = data;
|
|
11
|
+
if (listenTo === '*') {
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
14
|
+
else if (_.isArray(listenTo)) {
|
|
15
|
+
return true;
|
|
16
|
+
}
|
|
17
|
+
else if (_.isRegExp(listenTo)) {
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
else if (_.isString(listenTo) && listenTo.startsWith("/")) {
|
|
21
|
+
try {
|
|
22
|
+
if (_.isRegExp(eval(listenTo))) {
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
catch (error) {
|
|
27
|
+
return false;
|
|
28
|
+
}
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
9
33
|
function load(broker, packagePath, packageServiceName) {
|
|
10
34
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
35
|
let filePath = path.join(packagePath, "**");
|
|
@@ -15,6 +39,9 @@ function load(broker, packagePath, packageServiceName) {
|
|
|
15
39
|
}
|
|
16
40
|
for (const apiName in triggers) {
|
|
17
41
|
const trigger = triggers[apiName];
|
|
42
|
+
if (isPatternTrigger(trigger)) {
|
|
43
|
+
trigger.isPattern = true;
|
|
44
|
+
}
|
|
18
45
|
yield broker.call(`object_triggers.add`, { apiName: `${trigger.listenTo}.${trigger.name}`, data: trigger }, {
|
|
19
46
|
meta: {
|
|
20
47
|
metadataServiceName: packageServiceName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triggerYmlLoader.js","sourceRoot":"","sources":["../../src/loader/triggerYmlLoader.ts"],"names":[],"mappings":";;;;AAQA,0DAAwD;AACxD,6BAA8B;AAC9B,4BAA6B;AAE7B,MAAM,eAAe,GAAG,IAAI,+BAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"triggerYmlLoader.js","sourceRoot":"","sources":["../../src/loader/triggerYmlLoader.ts"],"names":[],"mappings":";;;;AAQA,0DAAwD;AACxD,6BAA8B;AAC9B,4BAA6B;AAE7B,MAAM,eAAe,GAAG,IAAI,+BAAe,EAAE,CAAC;AAC9C,SAAS,gBAAgB,CAAC,IAAI;IAC1B,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC;IACxB,IAAG,QAAQ,KAAK,GAAG,EAAC;QAChB,OAAO,IAAI,CAAC;KACf;SAAK,IAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC;QACzB,OAAO,IAAI,CAAC;KACf;SAAK,IAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAC;QAC1B,OAAO,IAAI,CAAC;KACf;SAAK,IAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC;QACtD,IAAI;YACA,IAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAC;gBAC1B,OAAO,IAAI,CAAC;aACf;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,KAAK,CAAA;SACf;QACD,OAAO,KAAK,CAAC;KAChB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AACD,SAAsB,IAAI,CAAC,MAAW,EAAE,WAAmB,EAAE,kBAA0B;;QACnF,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,QAAQ,GAAQ,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACrB,OAAO;SACV;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAClC,IAAG,gBAAgB,CAAC,OAAO,CAAC,EAAC;gBACzB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAA;aAC3B;YACD,MAAM,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;gBACxG,IAAI,EAAE;oBACN,mBAAmB,EAAE,kBAAkB;oBACvC,MAAM,EAAE;wBACJ,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,OAAO,EAAE;4BACL,IAAI,EAAE,kBAAkB;yBAC3B;qBACJ;iBACJ;aAAC,CAAC,CAAC;YACJ,MAAM,CAAC,SAAS,CAAC,iCAAiC,EAAE,EAAC,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAC,CAAC,CAAA;SACpI;IACL,CAAC;CAAA;AAvBD,oBAuBC"}
|
|
@@ -18,6 +18,9 @@ function load(broker, packagePath, packageServiceName) {
|
|
|
18
18
|
for (const trigger of objTriggers) {
|
|
19
19
|
const actionTriggerName = (0, objectql_1.getMD5)((0, objectql_1.JSONStringify)(trigger));
|
|
20
20
|
actions[actionTriggerName] = generateActionTrigger(trigger);
|
|
21
|
+
broker.emit('trigger.loaded', {
|
|
22
|
+
objectName: trigger['listenTo']
|
|
23
|
+
});
|
|
21
24
|
}
|
|
22
25
|
let serviceConfig = {
|
|
23
26
|
name: serviceName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":";;;;AAOA,gCAAgC;AAChC,6BAA6B;AAC7B,gDAA2I;AAE3I,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;AAE1K,SAAsB,IAAI,CAAC,MAAW,EAAE,WAAmB,EAAE,kBAA0B;;QACnF,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,WAAW,GAAG,aAAa,kBAAkB,EAAE,CAAC;QACpD,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,WAAW,GAAG,IAAA,6BAAkB,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACnE,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACxB,OAAO;SACV;QAeD,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;YAa/B,MAAM,iBAAiB,GAAG,IAAA,iBAAM,EAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,iBAAiB,CAAC,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/service-package-loader",
|
|
3
|
-
"version": "2.5.0-beta.
|
|
3
|
+
"version": "2.5.0-beta.33",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -10,10 +10,10 @@
|
|
|
10
10
|
"author": "",
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@steedos/core": "2.5.0-beta.
|
|
14
|
-
"@steedos/metadata-core": "2.5.0-beta.
|
|
15
|
-
"@steedos/objectql": "2.5.0-beta.
|
|
16
|
-
"@steedos/router": "2.5.0-beta.
|
|
13
|
+
"@steedos/core": "2.5.0-beta.33",
|
|
14
|
+
"@steedos/metadata-core": "2.5.0-beta.33",
|
|
15
|
+
"@steedos/objectql": "2.5.0-beta.33",
|
|
16
|
+
"@steedos/router": "2.5.0-beta.33",
|
|
17
17
|
"clone": "^2.1.2",
|
|
18
18
|
"moleculer": "^0.14.25",
|
|
19
19
|
"underscore": "^1.12.0"
|
|
@@ -25,5 +25,5 @@
|
|
|
25
25
|
"publishConfig": {
|
|
26
26
|
"access": "public"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "370c9eaa707a6932f3eb12fb3d711e679bcd2484"
|
|
29
29
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: baozhoutao@steedos.com
|
|
3
3
|
* @Date: 2023-04-25 16:52:28
|
|
4
4
|
* @LastEditors: baozhoutao@steedos.com
|
|
5
|
-
* @LastEditTime: 2023-
|
|
5
|
+
* @LastEditTime: 2023-05-18 09:27:20
|
|
6
6
|
* @Description:
|
|
7
7
|
*/
|
|
8
8
|
|
|
@@ -11,7 +11,26 @@ import path = require('path');
|
|
|
11
11
|
import _ = require('lodash');
|
|
12
12
|
|
|
13
13
|
const loadTriggerFile = new LoadTriggerFile();
|
|
14
|
-
|
|
14
|
+
function isPatternTrigger(data){
|
|
15
|
+
const {listenTo} = data;
|
|
16
|
+
if(listenTo === '*'){
|
|
17
|
+
return true;
|
|
18
|
+
}else if(_.isArray(listenTo)){
|
|
19
|
+
return true;
|
|
20
|
+
}else if(_.isRegExp(listenTo)){
|
|
21
|
+
return true;
|
|
22
|
+
}else if(_.isString(listenTo) && listenTo.startsWith("/")){
|
|
23
|
+
try {
|
|
24
|
+
if(_.isRegExp(eval(listenTo))){
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
} catch (error) {
|
|
28
|
+
return false
|
|
29
|
+
}
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
15
34
|
export async function load(broker: any, packagePath: string, packageServiceName: string) {
|
|
16
35
|
let filePath = path.join(packagePath, "**");
|
|
17
36
|
let triggers: any = loadTriggerFile.load(filePath);
|
|
@@ -20,6 +39,9 @@ export async function load(broker: any, packagePath: string, packageServiceName:
|
|
|
20
39
|
}
|
|
21
40
|
for (const apiName in triggers) {
|
|
22
41
|
const trigger = triggers[apiName];
|
|
42
|
+
if(isPatternTrigger(trigger)){
|
|
43
|
+
trigger.isPattern = true
|
|
44
|
+
}
|
|
23
45
|
await broker.call(`object_triggers.add`, { apiName: `${trigger.listenTo}.${trigger.name}`, data: trigger }, {
|
|
24
46
|
meta: {
|
|
25
47
|
metadataServiceName: packageServiceName,
|
|
@@ -48,6 +48,10 @@ export async function load(broker: any, packagePath: string, packageServiceName:
|
|
|
48
48
|
*/
|
|
49
49
|
const actionTriggerName = getMD5(JSONStringify(trigger));
|
|
50
50
|
actions[actionTriggerName] = generateActionTrigger(trigger)
|
|
51
|
+
|
|
52
|
+
broker.emit('trigger.loaded', {
|
|
53
|
+
objectName: trigger['listenTo']
|
|
54
|
+
})
|
|
51
55
|
}
|
|
52
56
|
|
|
53
57
|
let serviceConfig = {
|