@weave-js/core 0.11.1 → 0.13.0
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/.eslintrc.js +1 -1
- package/jest.config.js +1 -1
- package/lib/ExtendableError.js +8 -8
- package/lib/broker/context.js +49 -49
- package/lib/broker/defaultOptions.js +8 -9
- package/lib/broker/index.js +160 -164
- package/lib/buildRuntime.js +34 -34
- package/lib/cache/adapters/base.js +50 -74
- package/lib/cache/adapters/inMemory.js +58 -58
- package/lib/cache/adapters/inMemoryLru.js +57 -57
- package/lib/cache/adapters/index.js +3 -39
- package/lib/cache/getCacheKeyByObject.js +31 -0
- package/lib/cache/getPropertyFromDataOrMetadata.js +20 -0
- package/lib/cache/lock.js +30 -24
- package/lib/constants.js +5 -5
- package/lib/errorHandler.js +8 -8
- package/lib/errors.js +64 -54
- package/lib/helper/defineAction.js +2 -2
- package/lib/helper/defineBrokerOptions.js +2 -2
- package/lib/helper/defineService.js +2 -2
- package/lib/index.js +21 -21
- package/lib/logger/base.js +38 -29
- package/lib/logger/format/asHumanReadable.js +15 -15
- package/lib/logger/format/asJson.js +10 -10
- package/lib/logger/format/index.js +3 -3
- package/lib/logger/index.js +24 -24
- package/lib/logger/levels.js +21 -21
- package/lib/logger/tools.js +15 -15
- package/lib/logger/utils/colorize.js +23 -23
- package/lib/logger/utils/format.js +75 -65
- package/lib/metrics/common.js +47 -47
- package/lib/metrics/constants.js +44 -44
- package/lib/metrics/exporter/base.js +8 -8
- package/lib/metrics/exporter/event.js +20 -20
- package/lib/metrics/exporter/index.js +15 -15
- package/lib/metrics/index.js +2 -2
- package/lib/metrics/types/base.js +20 -20
- package/lib/metrics/types/counter.js +6 -6
- package/lib/metrics/types/gauge.js +24 -24
- package/lib/metrics/types/histogram.js +26 -26
- package/lib/metrics/types/index.js +6 -6
- package/lib/metrics/types/info.js +17 -17
- package/lib/middlewares/action-hooks/index.js +38 -38
- package/lib/middlewares/bulkhead/index.js +34 -34
- package/lib/middlewares/cache/index.js +37 -37
- package/lib/middlewares/circuit-breaker/index.js +62 -62
- package/lib/middlewares/context-tracker/index.js +39 -39
- package/lib/middlewares/error-handler/index.js +47 -15
- package/lib/middlewares/index.js +2 -2
- package/lib/middlewares/metrics/getMiddlewareWrapper.js +17 -17
- package/lib/middlewares/metrics/index.js +29 -29
- package/lib/middlewares/retry/index.js +15 -15
- package/lib/middlewares/timeout/index.js +16 -16
- package/lib/middlewares/tracing/index.js +37 -37
- package/lib/middlewares/tracing/tags.js +6 -6
- package/lib/middlewares/validator/index.js +31 -31
- package/lib/registry/actionEndpoint.js +8 -8
- package/lib/registry/collections/actionCollection.js +39 -35
- package/lib/registry/collections/endpointCollection.js +63 -63
- package/lib/registry/collections/eventCollection.js +62 -62
- package/lib/registry/collections/nodeCollection.js +45 -45
- package/lib/registry/collections/serviceCollection.js +61 -55
- package/lib/registry/eventEndpoint.js +14 -14
- package/lib/registry/load-balancer/base.js +3 -3
- package/lib/registry/load-balancer/index.js +7 -7
- package/lib/registry/node.js +27 -27
- package/lib/registry/registry.js +139 -136
- package/lib/registry/service/parseAction.js +16 -16
- package/lib/registry/service/parseEvent.js +18 -18
- package/lib/registry/service/reduceMixins.js +10 -10
- package/lib/registry/service/service.js +72 -72
- package/lib/registry/serviceItem.js +21 -21
- package/lib/runtime/initActionInvoker.js +21 -21
- package/lib/runtime/initCache.js +7 -7
- package/lib/runtime/initContextFactory.js +22 -22
- package/lib/runtime/initEventbus.js +49 -49
- package/lib/runtime/initLogger.js +11 -11
- package/lib/runtime/initMetrics.js +54 -54
- package/lib/runtime/initMiddlewareManager.js +21 -21
- package/lib/runtime/initRegistry.js +6 -6
- package/lib/runtime/initServiceManager.js +90 -68
- package/lib/runtime/initTracing.js +23 -23
- package/lib/runtime/initTransport.js +5 -5
- package/lib/runtime/initUuidFactory.js +4 -4
- package/lib/runtime/initValidator.js +5 -5
- package/lib/tracing/collectors/base.js +22 -22
- package/lib/tracing/collectors/event.js +33 -33
- package/lib/tracing/collectors/index.js +15 -15
- package/lib/tracing/span.js +26 -26
- package/lib/tracing/time.js +8 -8
- package/lib/transport/InboundTransformStream.js +26 -26
- package/lib/transport/adapters/adapteBase.js +30 -30
- package/lib/transport/adapters/adapters.js +4 -4
- package/lib/transport/adapters/dummy/index.js +18 -18
- package/lib/transport/adapters/fromURI.js +13 -13
- package/lib/transport/adapters/getAdapterByName.js +5 -5
- package/lib/transport/adapters/index.js +12 -12
- package/lib/transport/adapters/tcp/discovery/codec.js +4 -4
- package/lib/transport/adapters/tcp/discovery/index.js +62 -62
- package/lib/transport/adapters/tcp/index.js +169 -171
- package/lib/transport/adapters/tcp/tcp-messagetypes.js +7 -7
- package/lib/transport/adapters/tcp/tcpReader.js +39 -39
- package/lib/transport/adapters/tcp/tcpWriteStream.js +26 -26
- package/lib/transport/adapters/tcp/tcpWriter.js +57 -57
- package/lib/transport/adapters/tcp/utils.js +12 -12
- package/lib/transport/createMessage.js +4 -4
- package/lib/transport/createTransport.js +254 -254
- package/lib/transport/errorPayloadFactory.js +13 -17
- package/lib/transport/messageHandlers.js +199 -206
- package/lib/transport/messageTypes.js +19 -19
- package/lib/types.js +28 -15
- package/lib/utils/index.js +1 -1
- package/lib/utils/options.js +44 -44
- package/lib/utils/restoreError.js +58 -6
- package/package.json +4 -4
- package/lib/cache/base.js +0 -136
|
@@ -1,45 +1,45 @@
|
|
|
1
|
-
const { isFunction, clone, wrapHandler, isObject, promisify } = require('@weave-js/utils')
|
|
2
|
-
const { WeaveError } = require('../../errors')
|
|
1
|
+
const { isFunction, clone, wrapHandler, isObject, promisify } = require('@weave-js/utils');
|
|
2
|
+
const { WeaveError } = require('../../errors');
|
|
3
3
|
|
|
4
4
|
module.exports.parseEvent = (runtime, service, eventDefinition, name) => {
|
|
5
|
-
let event
|
|
5
|
+
let event;
|
|
6
6
|
|
|
7
7
|
// if the handler is a method (short form), we wrap the method in our handler object.
|
|
8
8
|
if (isFunction(eventDefinition)) {
|
|
9
|
-
event = wrapHandler(eventDefinition)
|
|
9
|
+
event = wrapHandler(eventDefinition);
|
|
10
10
|
} else if (isObject(eventDefinition)) {
|
|
11
|
-
event = clone(eventDefinition)
|
|
11
|
+
event = clone(eventDefinition);
|
|
12
12
|
} else {
|
|
13
|
-
runtime.handleError(new WeaveError(`Invalid event definition "${name}" on service "${service.name}".`))
|
|
13
|
+
runtime.handleError(new WeaveError(`Invalid event definition "${name}" on service "${service.name}".`));
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
// Event handler has to be a function
|
|
17
17
|
if (!isFunction(event.handler) && !Array.isArray(event.handler)) {
|
|
18
|
-
runtime.handleError(new WeaveError(`Missing event handler for "${name}" on service "${service.name}".`))
|
|
18
|
+
runtime.handleError(new WeaveError(`Missing event handler for "${name}" on service "${service.name}".`));
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
event.service = service
|
|
21
|
+
event.service = service;
|
|
22
22
|
|
|
23
|
-
let handler
|
|
23
|
+
let handler;
|
|
24
24
|
if (isFunction(event.handler)) {
|
|
25
|
-
handler = promisify(event.handler.bind(service))
|
|
25
|
+
handler = promisify(event.handler.bind(service));
|
|
26
26
|
} else if (Array.isArray(event.handler)) {
|
|
27
27
|
handler = event.handler.map(h => {
|
|
28
|
-
return promisify(h.bind(service))
|
|
29
|
-
})
|
|
28
|
+
return promisify(h.bind(service));
|
|
29
|
+
});
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
if (!event.name) {
|
|
33
|
-
event.name = name
|
|
33
|
+
event.name = name;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
if (isFunction(handler)) {
|
|
37
|
-
event.handler = (context) => handler(context)
|
|
37
|
+
event.handler = (context) => handler(context);
|
|
38
38
|
} else if (Array.isArray(handler)) {
|
|
39
|
-
event.handler = (context) => Promise.all(handler.map(h => h(context)))
|
|
39
|
+
event.handler = (context) => Promise.all(handler.map(h => h(context)));
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
event.service = service
|
|
42
|
+
event.service = service;
|
|
43
43
|
|
|
44
|
-
return event
|
|
45
|
-
}
|
|
44
|
+
return event;
|
|
45
|
+
};
|
|
@@ -1,23 +1,23 @@
|
|
|
1
|
-
const { mergeSchemas } = require('../../utils/options')
|
|
2
|
-
const { wrapInArray } = require('@weave-js/utils')
|
|
1
|
+
const { mergeSchemas } = require('../../utils/options');
|
|
2
|
+
const { wrapInArray } = require('@weave-js/utils');
|
|
3
3
|
|
|
4
4
|
const reduceMixins = (service, schema) => {
|
|
5
|
-
const mixins = wrapInArray(schema.mixins)
|
|
5
|
+
const mixins = wrapInArray(schema.mixins);
|
|
6
6
|
if (mixins.length > 0) {
|
|
7
7
|
const mixedSchema = Array
|
|
8
8
|
.from(mixins)
|
|
9
9
|
.reverse()
|
|
10
10
|
.reduce((s, mixin) => {
|
|
11
11
|
if (mixin.mixins) {
|
|
12
|
-
mixin = reduceMixins(service, mixin)
|
|
12
|
+
mixin = reduceMixins(service, mixin);
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
return s ? mergeSchemas(s, mixin) : mixin
|
|
16
|
-
}, null)
|
|
17
|
-
return mergeSchemas(mixedSchema, schema)
|
|
15
|
+
return s ? mergeSchemas(s, mixin) : mixin;
|
|
16
|
+
}, null);
|
|
17
|
+
return mergeSchemas(mixedSchema, schema);
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
return schema
|
|
21
|
-
}
|
|
20
|
+
return schema;
|
|
21
|
+
};
|
|
22
22
|
|
|
23
|
-
exports.reduceMixins = reduceMixins
|
|
23
|
+
exports.reduceMixins = reduceMixins;
|
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
* @typedef {import("../../types").Service} Service
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
const { isFunction, clone, isObject, promisify } = require('@weave-js/utils')
|
|
8
|
-
const { WeaveError } = require('../../errors')
|
|
9
|
-
const { parseAction } = require('./parseAction')
|
|
10
|
-
const { parseEvent } = require('./parseEvent')
|
|
11
|
-
const { reduceMixins } = require('./reduceMixins')
|
|
12
|
-
const { createEventEndpoint } = require('../eventEndpoint')
|
|
7
|
+
const { isFunction, clone, isObject, promisify } = require('@weave-js/utils');
|
|
8
|
+
const { WeaveError } = require('../../errors');
|
|
9
|
+
const { parseAction } = require('./parseAction');
|
|
10
|
+
const { parseEvent } = require('./parseEvent');
|
|
11
|
+
const { reduceMixins } = require('./reduceMixins');
|
|
12
|
+
const { createEventEndpoint } = require('../eventEndpoint');
|
|
13
13
|
/**
|
|
14
14
|
* Service factory
|
|
15
15
|
* @param {Runtime} runtime Broker instance
|
|
@@ -19,69 +19,69 @@ const { createEventEndpoint } = require('../eventEndpoint')
|
|
|
19
19
|
exports.createServiceFromSchema = (runtime, schema) => {
|
|
20
20
|
// Check if a schema is given
|
|
21
21
|
if (!schema) {
|
|
22
|
-
runtime.handleError(new WeaveError('Schema is missing!'))
|
|
22
|
+
runtime.handleError(new WeaveError('Schema is missing!'));
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
26
|
* @type {Service}
|
|
27
27
|
*/
|
|
28
|
-
const service = Object.create(null)
|
|
28
|
+
const service = Object.create(null);
|
|
29
29
|
|
|
30
30
|
// Set reference to the runtime.
|
|
31
|
-
service.runtime = runtime
|
|
31
|
+
service.runtime = runtime;
|
|
32
32
|
|
|
33
33
|
// Set reference to the broker instance.
|
|
34
|
-
service.broker = runtime.broker
|
|
34
|
+
service.broker = runtime.broker;
|
|
35
35
|
|
|
36
|
-
// Apply all mixins (including
|
|
36
|
+
// Apply all mixins (including children)
|
|
37
37
|
if (schema.mixins) {
|
|
38
|
-
schema = reduceMixins(service, schema)
|
|
38
|
+
schema = reduceMixins(service, schema);
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
// Call "afterSchemasMerged" service
|
|
41
|
+
// Call "afterSchemasMerged" service lifecycle hook(s)
|
|
42
42
|
if (schema.afterSchemasMerged) {
|
|
43
43
|
if (isFunction(schema.afterSchemasMerged)) {
|
|
44
|
-
schema.afterSchemasMerged.call(service, schema)
|
|
44
|
+
schema.afterSchemasMerged.call(service, schema);
|
|
45
45
|
} else if (Array.isArray(schema.afterSchemasMerged)) {
|
|
46
|
-
Promise.all(schema.afterSchemasMerged.map(afterSchemasMerged => afterSchemasMerged.call(service, schema)))
|
|
46
|
+
Promise.all(schema.afterSchemasMerged.map(afterSchemasMerged => afterSchemasMerged.call(service, schema)));
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
// Call "serviceCreating" middleware hook
|
|
51
|
-
runtime.middlewareHandler.callHandlersSync('serviceCreating', [service, schema])
|
|
51
|
+
runtime.middlewareHandler.callHandlersSync('serviceCreating', [service, schema]);
|
|
52
52
|
|
|
53
53
|
// validate name
|
|
54
54
|
if (!schema.name) {
|
|
55
|
-
runtime.handleError(new WeaveError('Service name is missing!'))
|
|
55
|
+
runtime.handleError(new WeaveError('Service name is missing!'));
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
// Set name
|
|
59
|
-
service.name = schema.name
|
|
59
|
+
service.name = schema.name;
|
|
60
60
|
|
|
61
61
|
// Set service version
|
|
62
|
-
service.version = schema.version
|
|
62
|
+
service.version = schema.version;
|
|
63
63
|
|
|
64
64
|
// Create a full qualified name, including version if set.
|
|
65
|
-
service.fullyQualifiedName = service.version ? `${service.name}.${service.version}` : service.name
|
|
65
|
+
service.fullyQualifiedName = service.version ? `${service.name}.${service.version}` : service.name;
|
|
66
66
|
|
|
67
67
|
// Set a reference to the base schema
|
|
68
|
-
service.schema = schema
|
|
68
|
+
service.schema = schema;
|
|
69
69
|
|
|
70
70
|
// Set the service settings
|
|
71
|
-
service.settings = schema.settings || {}
|
|
71
|
+
service.settings = schema.settings || {};
|
|
72
72
|
|
|
73
73
|
// Set the service meta data
|
|
74
|
-
service.meta = schema.meta || {}
|
|
74
|
+
service.meta = schema.meta || {};
|
|
75
75
|
|
|
76
76
|
// Create a separate protocol instance for the service.
|
|
77
77
|
service.log = runtime.createLogger(`${service.name}-service`, {
|
|
78
78
|
svc: service.name,
|
|
79
79
|
version: service.version
|
|
80
|
-
})
|
|
80
|
+
});
|
|
81
81
|
|
|
82
82
|
// Action object
|
|
83
|
-
service.actions = {}
|
|
84
|
-
service.events = {}
|
|
83
|
+
service.actions = {};
|
|
84
|
+
service.events = {};
|
|
85
85
|
|
|
86
86
|
// Create the service registry item
|
|
87
87
|
const serviceSpecification = {
|
|
@@ -92,89 +92,89 @@ exports.createServiceFromSchema = (runtime, schema) => {
|
|
|
92
92
|
version: service.version,
|
|
93
93
|
actions: {},
|
|
94
94
|
events: {}
|
|
95
|
-
}
|
|
95
|
+
};
|
|
96
96
|
|
|
97
97
|
// Bind service methods to context
|
|
98
98
|
if (isObject(schema.methods)) {
|
|
99
99
|
Object.keys(schema.methods).map(name => {
|
|
100
|
-
const method = schema.methods[name]
|
|
100
|
+
const method = schema.methods[name];
|
|
101
101
|
|
|
102
102
|
// Reserved property names
|
|
103
103
|
if (['log', 'actions', 'meta', 'events', 'settings', 'methods', 'dependencies', 'version', 'dependencies', 'broker', 'runtime', 'afterSchemasMerged', 'created', 'started', 'stopped'].includes(name)) {
|
|
104
|
-
runtime.handleError(new WeaveError(`Invalid method name ${name} in service ${service.name}.`))
|
|
104
|
+
runtime.handleError(new WeaveError(`Invalid method name ${name} in service ${service.name}.`));
|
|
105
105
|
}
|
|
106
106
|
|
|
107
|
-
service[name] = method.bind(service)
|
|
108
|
-
})
|
|
107
|
+
service[name] = method.bind(service);
|
|
108
|
+
});
|
|
109
109
|
}
|
|
110
110
|
|
|
111
111
|
// Bind and register service actions
|
|
112
112
|
if (isObject(schema.actions)) {
|
|
113
113
|
Object.keys(schema.actions).map(name => {
|
|
114
|
-
const actionDefinition = schema.actions[name]
|
|
114
|
+
const actionDefinition = schema.actions[name];
|
|
115
115
|
|
|
116
116
|
// skip actions that are set to false
|
|
117
|
-
if (actionDefinition === false) return
|
|
117
|
+
if (actionDefinition === false) return;
|
|
118
118
|
|
|
119
|
-
const innerAction = parseAction(runtime, service, clone(actionDefinition), name)
|
|
120
|
-
serviceSpecification.actions[innerAction.name] = innerAction
|
|
119
|
+
const innerAction = parseAction(runtime, service, clone(actionDefinition), name);
|
|
120
|
+
serviceSpecification.actions[innerAction.name] = innerAction;
|
|
121
121
|
|
|
122
|
-
const wrappedAction = runtime.middlewareHandler.wrapHandler('localAction', innerAction.handler, innerAction)
|
|
122
|
+
const wrappedAction = runtime.middlewareHandler.wrapHandler('localAction', innerAction.handler, innerAction);
|
|
123
123
|
|
|
124
124
|
// Make the action accessable via this.actions["actionName"]
|
|
125
125
|
service.actions[name] = (data, options) => {
|
|
126
|
-
let context
|
|
126
|
+
let context;
|
|
127
127
|
// reuse context
|
|
128
128
|
if (options && options.context) {
|
|
129
|
-
context = options.context
|
|
129
|
+
context = options.context;
|
|
130
130
|
} else {
|
|
131
|
-
const endpoint = runtime.registry.createPrivateActionEndpoint(innerAction)
|
|
131
|
+
const endpoint = runtime.registry.createPrivateActionEndpoint(innerAction);
|
|
132
132
|
// create a new context
|
|
133
|
-
context = runtime.contextFactory.create(endpoint, data, options || {})
|
|
133
|
+
context = runtime.contextFactory.create(endpoint, data, options || {});
|
|
134
134
|
}
|
|
135
135
|
|
|
136
|
-
return wrappedAction(context, { service, runtime, errors: {}})
|
|
137
|
-
}
|
|
138
|
-
})
|
|
136
|
+
return wrappedAction(context, { service, runtime, errors: {}});
|
|
137
|
+
};
|
|
138
|
+
});
|
|
139
139
|
}
|
|
140
140
|
|
|
141
141
|
// Bind and register service events
|
|
142
142
|
if (isObject(schema.events)) {
|
|
143
143
|
Object.keys(schema.events).map(name => {
|
|
144
|
-
const eventDefinition = schema.events[name]
|
|
145
|
-
const innerEvent = parseEvent(runtime, service, clone(eventDefinition), name)
|
|
144
|
+
const eventDefinition = schema.events[name];
|
|
145
|
+
const innerEvent = parseEvent(runtime, service, clone(eventDefinition), name);
|
|
146
146
|
|
|
147
|
-
serviceSpecification.events[name] = innerEvent
|
|
147
|
+
serviceSpecification.events[name] = innerEvent;
|
|
148
148
|
|
|
149
149
|
// wrap event
|
|
150
|
-
const wrappedEvent = runtime.middlewareHandler.wrapHandler('localEvent', innerEvent.handler, innerEvent)
|
|
150
|
+
const wrappedEvent = runtime.middlewareHandler.wrapHandler('localEvent', innerEvent.handler, innerEvent);
|
|
151
151
|
|
|
152
152
|
// Add local event handler
|
|
153
153
|
service.events[name] = (data, options) => {
|
|
154
|
-
let context
|
|
154
|
+
let context;
|
|
155
155
|
if (options && options.context) {
|
|
156
|
-
context = options.context
|
|
156
|
+
context = options.context;
|
|
157
157
|
} else {
|
|
158
158
|
// create a local endpoint for the event
|
|
159
|
-
const endpoint = createEventEndpoint(runtime, runtime.registry.nodeCollection.localNode, innerEvent.service, innerEvent)
|
|
159
|
+
const endpoint = createEventEndpoint(runtime, runtime.registry.nodeCollection.localNode, innerEvent.service, innerEvent);
|
|
160
160
|
|
|
161
161
|
// create a new context
|
|
162
|
-
context = runtime.contextFactory.create(endpoint, data, options || {})
|
|
162
|
+
context = runtime.contextFactory.create(endpoint, data, options || {});
|
|
163
163
|
}
|
|
164
164
|
|
|
165
|
-
return wrappedEvent(context)
|
|
166
|
-
}
|
|
167
|
-
})
|
|
165
|
+
return wrappedEvent(context);
|
|
166
|
+
};
|
|
167
|
+
});
|
|
168
168
|
}
|
|
169
169
|
|
|
170
|
-
// Call "created" service
|
|
170
|
+
// Call "created" service lifecycle hook(s)
|
|
171
171
|
if (schema.created) {
|
|
172
172
|
if (isFunction(schema.created)) {
|
|
173
|
-
schema.created.call(service)
|
|
173
|
+
schema.created.call(service);
|
|
174
174
|
}
|
|
175
175
|
|
|
176
176
|
if (Array.isArray(schema.created)) {
|
|
177
|
-
Promise.all(schema.created.map(createdHook => createdHook.call(service)))
|
|
177
|
+
Promise.all(schema.created.map(createdHook => createdHook.call(service)));
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
180
|
|
|
@@ -189,49 +189,49 @@ exports.createServiceFromSchema = (runtime, schema) => {
|
|
|
189
189
|
.then(() => runtime.middlewareHandler.callHandlersAsync('serviceStarting', [service]))
|
|
190
190
|
.then(() => {
|
|
191
191
|
if (schema.dependencies) {
|
|
192
|
-
return runtime.services.waitForServices(schema.dependencies, service.settings.$dependencyTimeout || 0)
|
|
192
|
+
return runtime.services.waitForServices(schema.dependencies, service.settings.$dependencyTimeout || 0);
|
|
193
193
|
}
|
|
194
194
|
}).then(() => {
|
|
195
195
|
if (isFunction(schema.started)) {
|
|
196
|
-
return promisify(schema.started.bind(service))()
|
|
196
|
+
return promisify(schema.started.bind(service))();
|
|
197
197
|
}
|
|
198
198
|
|
|
199
199
|
if (Array.isArray(schema.started)) {
|
|
200
200
|
return schema.started
|
|
201
201
|
.map(hook => promisify(hook.bind(service)))
|
|
202
|
-
.reduce((p, hook) => p.then(hook), Promise.resolve())
|
|
202
|
+
.reduce((p, hook) => p.then(hook), Promise.resolve());
|
|
203
203
|
}
|
|
204
204
|
})
|
|
205
205
|
.then(() => runtime.registry.registerLocalService(serviceSpecification))
|
|
206
|
-
.then(() => runtime.middlewareHandler.callHandlersAsync('serviceStarted', [service]))
|
|
207
|
-
}
|
|
206
|
+
.then(() => runtime.middlewareHandler.callHandlersAsync('serviceStarted', [service]));
|
|
207
|
+
};
|
|
208
208
|
|
|
209
209
|
// stop method for service
|
|
210
210
|
service.stop = () => {
|
|
211
|
-
service.log.info(`Stopping service "${service.fullyQualifiedName}"...`)
|
|
211
|
+
service.log.info(`Stopping service "${service.fullyQualifiedName}"...`);
|
|
212
212
|
return Promise.resolve()
|
|
213
213
|
.then(() => {
|
|
214
|
-
return runtime.middlewareHandler.callHandlersAsync('serviceStopping', [service])
|
|
214
|
+
return runtime.middlewareHandler.callHandlersAsync('serviceStopping', [service]);
|
|
215
215
|
})
|
|
216
216
|
.then(() => {
|
|
217
217
|
if (isFunction(schema.stopped)) {
|
|
218
|
-
return promisify(schema.stopped.bind(service))()
|
|
218
|
+
return promisify(schema.stopped.bind(service))();
|
|
219
219
|
}
|
|
220
220
|
|
|
221
221
|
if (Array.isArray(schema.stopped)) {
|
|
222
222
|
return schema.stopped
|
|
223
223
|
.map(hook => promisify(hook.bind(service)))
|
|
224
|
-
.reduce((p, hook) => p.then(hook), Promise.resolve())
|
|
224
|
+
.reduce((p, hook) => p.then(hook), Promise.resolve());
|
|
225
225
|
}
|
|
226
226
|
})
|
|
227
227
|
.then(() => runtime.middlewareHandler.callHandlersAsync('serviceStopped', [service], { reverse: true }))
|
|
228
|
-
.then(() => service.log.info(`Service "${service.name}" stopped`))
|
|
229
|
-
}
|
|
228
|
+
.then(() => service.log.info(`Service "${service.name}" stopped`));
|
|
229
|
+
};
|
|
230
230
|
|
|
231
|
-
runtime.middlewareHandler.callHandlersSync('serviceCreated', [service, schema])
|
|
231
|
+
runtime.middlewareHandler.callHandlersSync('serviceCreated', [service, schema]);
|
|
232
232
|
|
|
233
233
|
// Add service to brokers local map
|
|
234
|
-
runtime.services.serviceList.push(service)
|
|
234
|
+
runtime.services.serviceList.push(service);
|
|
235
235
|
|
|
236
|
-
return service
|
|
237
|
-
}
|
|
236
|
+
return service;
|
|
237
|
+
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* Author: Kevin Ries (kevin@
|
|
2
|
+
* Author: Kevin Ries (kevin.ries@fachwerk.io)
|
|
3
3
|
* -----
|
|
4
4
|
* Copyright 2021 Fachwerk
|
|
5
5
|
*/
|
|
6
|
-
'use strict'
|
|
6
|
+
'use strict';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* @typedef {import("../types").ServiceItem} ServiceItem
|
|
@@ -23,32 +23,32 @@ exports.createServiceItem = (node, name, version, settings, isLocal) => {
|
|
|
23
23
|
/**
|
|
24
24
|
* @type {ServiceItem}
|
|
25
25
|
*/
|
|
26
|
-
const serviceItem = Object.create(null)
|
|
26
|
+
const serviceItem = Object.create(null);
|
|
27
27
|
|
|
28
|
-
serviceItem.name = name
|
|
29
|
-
serviceItem.node = node
|
|
30
|
-
serviceItem.settings = settings || {}
|
|
31
|
-
serviceItem.version = version
|
|
32
|
-
serviceItem.actions = {}
|
|
33
|
-
serviceItem.events = {}
|
|
34
|
-
serviceItem.isLocal = isLocal
|
|
28
|
+
serviceItem.name = name;
|
|
29
|
+
serviceItem.node = node;
|
|
30
|
+
serviceItem.settings = settings || {};
|
|
31
|
+
serviceItem.version = version;
|
|
32
|
+
serviceItem.actions = {};
|
|
33
|
+
serviceItem.events = {};
|
|
34
|
+
serviceItem.isLocal = isLocal;
|
|
35
35
|
|
|
36
36
|
serviceItem.addAction = (action) => {
|
|
37
|
-
serviceItem.actions[action.name] = action
|
|
38
|
-
}
|
|
37
|
+
serviceItem.actions[action.name] = action;
|
|
38
|
+
};
|
|
39
39
|
|
|
40
40
|
serviceItem.addEvent = (event) => {
|
|
41
|
-
serviceItem.events[event.name] = event
|
|
42
|
-
}
|
|
41
|
+
serviceItem.events[event.name] = event;
|
|
42
|
+
};
|
|
43
43
|
|
|
44
44
|
serviceItem.equals = (name, version, nodeId) => {
|
|
45
|
-
return serviceItem.name === name && serviceItem.version === version && (nodeId == null || serviceItem.node.id === nodeId)
|
|
46
|
-
}
|
|
45
|
+
return serviceItem.name === name && serviceItem.version === version && (nodeId == null || serviceItem.node.id === nodeId);
|
|
46
|
+
};
|
|
47
47
|
|
|
48
48
|
serviceItem.update = (service) => {
|
|
49
|
-
serviceItem.settings = service.settings
|
|
50
|
-
serviceItem.version = service.version
|
|
51
|
-
}
|
|
49
|
+
serviceItem.settings = service.settings;
|
|
50
|
+
serviceItem.version = service.version;
|
|
51
|
+
};
|
|
52
52
|
|
|
53
|
-
return serviceItem
|
|
54
|
-
}
|
|
53
|
+
return serviceItem;
|
|
54
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
const errors = require('../errors')
|
|
1
|
+
const errors = require('../errors');
|
|
2
2
|
|
|
3
3
|
exports.initActionInvoker = (runtime) => {
|
|
4
|
-
const { registry, contextFactory, log, handleError } = runtime
|
|
4
|
+
const { registry, contextFactory, log, handleError } = runtime;
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
7
|
* Call a action.
|
|
@@ -11,36 +11,36 @@ exports.initActionInvoker = (runtime) => {
|
|
|
11
11
|
* @returns {Promise} Promise
|
|
12
12
|
*/
|
|
13
13
|
const call = (actionName, data, opts = {}) => {
|
|
14
|
-
const endpoint = registry.getNextAvailableActionEndpoint(actionName, opts)
|
|
14
|
+
const endpoint = registry.getNextAvailableActionEndpoint(actionName, opts);
|
|
15
15
|
|
|
16
16
|
if (endpoint instanceof Error) {
|
|
17
17
|
return Promise.reject(endpoint)
|
|
18
|
-
.catch(error => handleError(error))
|
|
18
|
+
.catch(error => handleError(error));
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
const action = endpoint.action
|
|
22
|
-
const nodeId = endpoint.node.id
|
|
23
|
-
let context
|
|
21
|
+
const action = endpoint.action;
|
|
22
|
+
const nodeId = endpoint.node.id;
|
|
23
|
+
let context;
|
|
24
24
|
|
|
25
25
|
// If a context is passed, we use this
|
|
26
26
|
if (opts.context !== undefined) {
|
|
27
|
-
context = opts.context
|
|
28
|
-
context.nodeId = nodeId
|
|
27
|
+
context = opts.context;
|
|
28
|
+
context.nodeId = nodeId;
|
|
29
29
|
} else {
|
|
30
|
-
context = contextFactory.create(endpoint, data, opts)
|
|
30
|
+
context = contextFactory.create(endpoint, data, opts);
|
|
31
31
|
}
|
|
32
32
|
|
|
33
33
|
if (endpoint.isLocal) {
|
|
34
|
-
log.debug({ action: context.action.name, requestId: context.requestId }, 'Call action local.')
|
|
34
|
+
log.debug({ action: context.action.name, requestId: context.requestId }, 'Call action local.');
|
|
35
35
|
} else {
|
|
36
|
-
log.debug({ action: context.action.name, nodeId, requestId: context.requestId }, 'Call action on remote node.')
|
|
36
|
+
log.debug({ action: context.action.name, nodeId, requestId: context.requestId }, 'Call action on remote node.');
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
const p = action.handler(context, { service: context.action.service, runtime, errors })
|
|
40
|
-
p.context = context
|
|
39
|
+
const p = action.handler(context, { service: context.action.service, runtime, errors });
|
|
40
|
+
p.context = context;
|
|
41
41
|
|
|
42
|
-
return p
|
|
43
|
-
}
|
|
42
|
+
return p;
|
|
43
|
+
};
|
|
44
44
|
|
|
45
45
|
/**
|
|
46
46
|
* Call multiple actions.
|
|
@@ -49,16 +49,16 @@ exports.initActionInvoker = (runtime) => {
|
|
|
49
49
|
*/
|
|
50
50
|
const multiCall = (actions) => {
|
|
51
51
|
if (Array.isArray(actions)) {
|
|
52
|
-
return Promise.all(actions.map(item => call(item.actionName, item.params, item.options)))
|
|
52
|
+
return Promise.all(actions.map(item => call(item.actionName, item.params, item.options)));
|
|
53
53
|
} else {
|
|
54
|
-
return Promise.reject(new errors.WeaveError('Actions need to be an Array'))
|
|
54
|
+
return Promise.reject(new errors.WeaveError('Actions need to be an Array'));
|
|
55
55
|
}
|
|
56
|
-
}
|
|
56
|
+
};
|
|
57
57
|
|
|
58
58
|
Object.defineProperty(runtime, 'actionInvoker', {
|
|
59
59
|
value: {
|
|
60
60
|
call,
|
|
61
61
|
multiCall
|
|
62
62
|
}
|
|
63
|
-
})
|
|
64
|
-
}
|
|
63
|
+
});
|
|
64
|
+
};
|
package/lib/runtime/initCache.js
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
const { isFunction } = require('@weave-js/utils')
|
|
2
|
-
const { WeaveError } = require('../errors')
|
|
1
|
+
const { isFunction } = require('@weave-js/utils');
|
|
2
|
+
const { WeaveError } = require('../errors');
|
|
3
3
|
|
|
4
4
|
exports.initCache = (runtime) => {
|
|
5
5
|
if (runtime.options.cache && runtime.options.cache.enabled) {
|
|
6
6
|
if (!isFunction(runtime.options.cache.adapter)) {
|
|
7
|
-
throw new WeaveError('Invalid cache adapter.')
|
|
7
|
+
throw new WeaveError('Invalid cache adapter.');
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
// Init cache adapter
|
|
11
|
-
const cache = runtime.options.cache.adapter(runtime, runtime.options.cache)
|
|
11
|
+
const cache = runtime.options.cache.adapter(runtime, runtime.options.cache);
|
|
12
12
|
|
|
13
|
-
runtime.log.info(`Cache: ${cache.name}`)
|
|
13
|
+
runtime.log.info(`Cache: ${cache.name}`);
|
|
14
14
|
|
|
15
15
|
Object.defineProperty(runtime, 'cache', {
|
|
16
16
|
value: cache
|
|
17
|
-
})
|
|
17
|
+
});
|
|
18
18
|
}
|
|
19
|
-
}
|
|
19
|
+
};
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* Author: Kevin Ries (kevin@
|
|
2
|
+
* Author: Kevin Ries (kevin.ries@fachwerk.io)
|
|
3
3
|
* -----
|
|
4
4
|
* Copyright 2021 Fachwerk
|
|
5
5
|
*/
|
|
6
|
-
'use strict'
|
|
6
|
+
'use strict';
|
|
7
7
|
|
|
8
|
-
const { createContext } = require('../broker/context')
|
|
8
|
+
const { createContext } = require('../broker/context');
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
11
|
* @typedef {import('../types').Runtime} Runtime
|
|
@@ -30,54 +30,54 @@ exports.initContextFactory = (runtime) => {
|
|
|
30
30
|
* @returns {Context} Context
|
|
31
31
|
*/
|
|
32
32
|
create (endpoint, data, opts) {
|
|
33
|
-
const context = createContext(runtime)
|
|
33
|
+
const context = createContext(runtime);
|
|
34
34
|
|
|
35
|
-
opts = opts || {}
|
|
36
|
-
context.setData(data)
|
|
35
|
+
opts = opts || {};
|
|
36
|
+
context.setData(data);
|
|
37
37
|
// context.timeout = opts.timeout || 0
|
|
38
|
-
context.retryCount = opts.retryCount
|
|
39
|
-
context.options = opts
|
|
38
|
+
context.retryCount = opts.retryCount;
|
|
39
|
+
context.options = opts;
|
|
40
40
|
|
|
41
41
|
// get external request id from options
|
|
42
42
|
if (opts.requestId) {
|
|
43
|
-
context.requestId = opts.requestId
|
|
43
|
+
context.requestId = opts.requestId;
|
|
44
44
|
} else if (opts.parentContext && opts.parentContext.requestId) {
|
|
45
|
-
context.requestId = opts.parentContext.requestId
|
|
45
|
+
context.requestId = opts.parentContext.requestId;
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
// meta data
|
|
49
49
|
if (opts.parentContext && opts.parentContext.meta !== null) {
|
|
50
|
-
context.meta = Object.assign({}, opts.parentContext.meta, opts.meta)
|
|
50
|
+
context.meta = Object.assign({}, opts.parentContext.meta, opts.meta);
|
|
51
51
|
} else if (opts.meta) {
|
|
52
|
-
context.meta = opts.meta
|
|
52
|
+
context.meta = opts.meta;
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
// Parent context
|
|
56
56
|
if (opts.parentContext != null) {
|
|
57
|
-
context.parentId = opts.parentContext.id
|
|
58
|
-
context.level = opts.parentContext.level + 1
|
|
59
|
-
context.tracing = opts.parentContext.tracing
|
|
60
|
-
context.span = opts.parentContext.span
|
|
57
|
+
context.parentId = opts.parentContext.id;
|
|
58
|
+
context.level = opts.parentContext.level + 1;
|
|
59
|
+
context.tracing = opts.parentContext.tracing;
|
|
60
|
+
context.span = opts.parentContext.span;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
// handle local streams
|
|
64
64
|
if (opts.stream) {
|
|
65
|
-
context.setStream(opts.stream)
|
|
65
|
+
context.setStream(opts.stream);
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
// set request ID for metrics
|
|
69
69
|
if (context.metrics || context.nodeId !== runtime.nodeId) {
|
|
70
70
|
if (!context.requestId) {
|
|
71
|
-
context.requestId = context.id
|
|
71
|
+
context.requestId = context.id;
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
if (endpoint) {
|
|
76
|
-
context.setEndpoint(endpoint)
|
|
76
|
+
context.setEndpoint(endpoint);
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
-
return context
|
|
79
|
+
return context;
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
})
|
|
83
|
-
}
|
|
82
|
+
});
|
|
83
|
+
};
|