@5minds/node-red-contrib-processcube 1.5.8-subscription-logging-7c74e2-m42gyp9r → 1.5.8-subscription-logging-20c391-m42k9luk
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/externaltask-input.js +11 -11
- package/package.json +1 -1
- package/processcube-engine-config.js +0 -12
package/externaltask-input.js
CHANGED
@@ -27,23 +27,21 @@ module.exports = function (RED) {
|
|
27
27
|
|
28
28
|
const engineEventEmitter = engine.eventEmitter;
|
29
29
|
|
30
|
-
node.log(`got event emmiter: ${JSON.stringify(engineEventEmitter)}`);
|
31
|
-
|
32
|
-
engineEventEmitter.on('engine-client-dispose', () => {
|
33
|
-
node.log('rm subsctiption');
|
34
|
-
// engine.engineClient.externalTasks.removeSubscription(subscription, engine.identity);
|
35
|
-
node.log('done rm subscriptions');
|
36
|
-
});
|
37
|
-
|
38
30
|
engineEventEmitter.on('engine-client-changed', () => {
|
39
31
|
node.log('new engineClient received');
|
40
32
|
register();
|
41
33
|
});
|
42
34
|
|
43
35
|
const register = async () => {
|
44
|
-
node.
|
36
|
+
if (node.etw) {
|
37
|
+
try {
|
38
|
+
node.etw.stop();
|
39
|
+
node.log(`old etw closed: ${JSON.stringify(node.etw)}`);
|
40
|
+
} catch (e) {
|
41
|
+
node.log(`cant close etw: ${JSON.stringify(node.etw)}`);
|
42
|
+
}
|
43
|
+
}
|
45
44
|
const client = engine.engineClient;
|
46
|
-
node.log(`subscribing to client: ${JSON.stringify(engine.engineClient)}`);
|
47
45
|
|
48
46
|
if (!client) {
|
49
47
|
node.error('No engine configured.');
|
@@ -133,6 +131,8 @@ module.exports = function (RED) {
|
|
133
131
|
.then(async (externalTaskWorker) => {
|
134
132
|
node.status({ fill: 'blue', shape: 'ring', text: 'subcribed' });
|
135
133
|
|
134
|
+
node.etw = externalTaskWorker;
|
135
|
+
|
136
136
|
externalTaskWorker.identity = engine.identity;
|
137
137
|
engine.registerOnIdentityChanged((identity) => {
|
138
138
|
externalTaskWorker.identity = identity;
|
@@ -167,6 +167,7 @@ module.exports = function (RED) {
|
|
167
167
|
|
168
168
|
try {
|
169
169
|
externalTaskWorker.start();
|
170
|
+
showStatus(node, Object.keys(started_external_tasks).length);
|
170
171
|
} catch (error) {
|
171
172
|
node.error(`Worker start 'externalTaskWorker.start' failed: ${error.message}`);
|
172
173
|
}
|
@@ -185,7 +186,6 @@ module.exports = function (RED) {
|
|
185
186
|
};
|
186
187
|
|
187
188
|
if (engine) {
|
188
|
-
node.log(`initial register: ${engine}`);
|
189
189
|
register();
|
190
190
|
}
|
191
191
|
}
|
package/package.json
CHANGED
@@ -40,7 +40,6 @@ module.exports = function (RED) {
|
|
40
40
|
};
|
41
41
|
|
42
42
|
function periodicallyRefreshEngineClient(node, n, intervalMs) {
|
43
|
-
node.log('starting refresh cycle');
|
44
43
|
function refreshUrl() {
|
45
44
|
const newUrl = RED.util.evaluateNodeProperty(n.url, n.urlType, node);
|
46
45
|
const newClientId = RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node);
|
@@ -51,42 +50,31 @@ module.exports = function (RED) {
|
|
51
50
|
node.credentials.clientId === newClientId &&
|
52
51
|
node.credentials.clientSecret === newClientSecret
|
53
52
|
) {
|
54
|
-
node.log('no new url found');
|
55
53
|
return;
|
56
54
|
}
|
57
55
|
|
58
|
-
node.log(`new url found: ${newUrl}`);
|
59
56
|
node.url = newUrl;
|
60
57
|
node.credentials.clientId = newClientId;
|
61
58
|
node.credentials.clientSecret = newClientSecret;
|
62
59
|
if (node.credentials.clientId && node.credentials.clientSecret) {
|
63
60
|
if (node.engineClient) {
|
64
|
-
node.log('disposing old engine client');
|
65
61
|
node.eventEmitter.emit('engine-client-dispose');
|
66
62
|
node.engineClient.dispose();
|
67
63
|
}
|
68
64
|
|
69
|
-
node.log('creating new engine client (without credentials)');
|
70
|
-
|
71
65
|
node.engineClient = new engine_client.EngineClient(node.url, () =>
|
72
66
|
getFreshIdentity(node.url, node)
|
73
67
|
);
|
74
68
|
|
75
|
-
node.log(`new engine client: ${JSON.stringify(node.engineClient)}`);
|
76
|
-
|
77
69
|
node.eventEmitter.emit('engine-client-changed');
|
78
70
|
} else {
|
79
71
|
if (node.engineClient) {
|
80
|
-
node.log('disposing old engine client (without credentials)');
|
81
72
|
node.eventEmitter.emit('engine-client-dispose');
|
82
73
|
node.engineClient.dispose();
|
83
74
|
}
|
84
75
|
|
85
|
-
node.log('creating new engine client (without credentials)');
|
86
76
|
node.engineClient = new engine_client.EngineClient(node.url);
|
87
77
|
|
88
|
-
node.log(`new engine client (without credentials): ${JSON.stringify(node.engineClient)}`);
|
89
|
-
|
90
78
|
node.eventEmitter.emit('engine-client-changed');
|
91
79
|
}
|
92
80
|
}
|