@steedos/service-package-loader 2.2.23 → 2.2.26
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
CHANGED
|
@@ -111,7 +111,7 @@ module.exports = {
|
|
|
111
111
|
const matchedPaths = globby.sync(filePatten);
|
|
112
112
|
for await (const serviceFilePath of matchedPaths) {
|
|
113
113
|
try {
|
|
114
|
-
const service = this.broker
|
|
114
|
+
const service = objectql.loadService(this.broker, serviceFilePath);
|
|
115
115
|
this.packageServices.push(service);
|
|
116
116
|
if (!this.broker.started) {
|
|
117
117
|
this.broker._restartService(service)
|
|
@@ -217,6 +217,9 @@ module.exports = {
|
|
|
217
217
|
nodeID: this.broker.nodeID,
|
|
218
218
|
instanceID: this.broker.instanceID
|
|
219
219
|
}] }); //${this.broker.nodeID}.${this.name}
|
|
220
|
+
|
|
221
|
+
this.broker.broadcastLocal("@steedos/service-packages.offline", {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
|
|
222
|
+
|
|
220
223
|
console.log(`service ${this.name} stopped`);
|
|
221
224
|
}
|
|
222
225
|
};
|
|
@@ -12,7 +12,7 @@ function load(broker, packagePath, packageServiceName) {
|
|
|
12
12
|
let actions = {};
|
|
13
13
|
let serviceName = `~triggers-${packageServiceName}`;
|
|
14
14
|
let filePath = path.join(packagePath, "**");
|
|
15
|
-
let objTriggers = objectql.loadObjectTriggers(filePath);
|
|
15
|
+
let objTriggers = objectql.loadObjectTriggers(filePath, packageServiceName);
|
|
16
16
|
if (_.isEmpty(objTriggers)) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":";;;;AAAA,gCAAgC;AAChC,6BAA6B;AAC7B,8CAA8C;AAC9C,gDAA0D;AAI1D,MAAM,SAAS,GAAG,CAAC,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;AAE1N,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,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;
|
|
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.2.
|
|
3
|
+
"version": "2.2.26",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -11,9 +11,9 @@
|
|
|
11
11
|
"author": "",
|
|
12
12
|
"license": "MIT",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@steedos/core": "2.2.
|
|
15
|
-
"@steedos/metadata-core": "2.2.
|
|
16
|
-
"@steedos/objectql": "2.2.
|
|
14
|
+
"@steedos/core": "2.2.26",
|
|
15
|
+
"@steedos/metadata-core": "2.2.26",
|
|
16
|
+
"@steedos/objectql": "2.2.26",
|
|
17
17
|
"clone": "^2.1.2",
|
|
18
18
|
"globby": "^9.1.0",
|
|
19
19
|
"moleculer": "^0.14.12",
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"publishConfig": {
|
|
34
34
|
"access": "public"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "77fa3c2b6bdfebaccb4b7f0886f32eb347cbdd35"
|
|
37
37
|
}
|
|
@@ -11,7 +11,7 @@ export async function load(broker: any, packagePath: string, packageServiceName:
|
|
|
11
11
|
let actions = {};
|
|
12
12
|
let serviceName = `~triggers-${packageServiceName}`;
|
|
13
13
|
let filePath = path.join(packagePath, "**");
|
|
14
|
-
let objTriggers = objectql.loadObjectTriggers(filePath);
|
|
14
|
+
let objTriggers = objectql.loadObjectTriggers(filePath, packageServiceName);
|
|
15
15
|
if (_.isEmpty(objTriggers)) {
|
|
16
16
|
return;
|
|
17
17
|
}
|