kuzzle 2.19.2 → 2.19.5
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/api/controllers/adminController.js +94 -80
- package/lib/api/controllers/authController.js +239 -212
- package/lib/api/controllers/baseController.js +89 -51
- package/lib/api/controllers/bulkController.js +62 -49
- package/lib/api/controllers/clusterController.js +6 -8
- package/lib/api/controllers/collectionController.js +140 -129
- package/lib/api/controllers/debugController.d.ts +2 -2
- package/lib/api/controllers/debugController.js +33 -31
- package/lib/api/controllers/documentController.js +365 -274
- package/lib/api/controllers/index.js +13 -13
- package/lib/api/controllers/indexController.js +46 -50
- package/lib/api/controllers/memoryStorageController.js +410 -360
- package/lib/api/controllers/realtimeController.js +37 -36
- package/lib/api/controllers/securityController.js +553 -412
- package/lib/api/controllers/serverController.js +111 -104
- package/lib/api/documentExtractor.js +75 -68
- package/lib/api/funnel.js +411 -312
- package/lib/api/httpRoutes.js +1493 -324
- package/lib/api/openapi/OpenApiManager.d.ts +1 -1
- package/lib/api/openapi/OpenApiManager.js +22 -22
- package/lib/api/openapi/components/document/count.yaml +1 -1
- package/lib/api/openapi/components/document/create.yaml +2 -2
- package/lib/api/openapi/components/document/delete.yaml +1 -1
- package/lib/api/openapi/components/document/deleteByQuery.yaml +1 -1
- package/lib/api/openapi/components/document/exists.yaml +1 -1
- package/lib/api/openapi/components/document/get.yaml +2 -2
- package/lib/api/openapi/components/document/index.js +12 -12
- package/lib/api/openapi/components/document/replace.yaml +1 -1
- package/lib/api/openapi/components/document/scroll.yaml +1 -1
- package/lib/api/openapi/components/document/validate.yaml +1 -1
- package/lib/api/openapi/components/index.d.ts +2 -2
- package/lib/api/openapi/components/index.js +1 -1
- package/lib/api/openapi/components/security/index.js +1 -1
- package/lib/api/openapi/components/security/upsertUser.yaml +2 -3
- package/lib/api/openapi/index.d.ts +1 -1
- package/lib/api/openapi/openApiGenerator.d.ts +1 -1
- package/lib/api/openapi/openApiGenerator.js +7 -7
- package/lib/api/rateLimiter.js +12 -13
- package/lib/api/request/index.d.ts +4 -4
- package/lib/api/request/kuzzleRequest.d.ts +9 -9
- package/lib/api/request/kuzzleRequest.js +91 -90
- package/lib/api/request/requestContext.d.ts +2 -2
- package/lib/api/request/requestContext.js +17 -17
- package/lib/api/request/requestInput.d.ts +1 -1
- package/lib/api/request/requestInput.js +19 -19
- package/lib/api/request/requestResponse.d.ts +4 -4
- package/lib/api/request/requestResponse.js +31 -33
- package/lib/cluster/command.js +48 -44
- package/lib/cluster/idCardHandler.d.ts +1 -1
- package/lib/cluster/idCardHandler.js +15 -15
- package/lib/cluster/index.js +2 -2
- package/lib/cluster/node.js +301 -269
- package/lib/cluster/publisher.js +45 -46
- package/lib/cluster/state.d.ts +5 -5
- package/lib/cluster/state.js +8 -8
- package/lib/cluster/subscriber.js +163 -113
- package/lib/cluster/workers/IDCardRenewer.js +33 -32
- package/lib/config/default.config.d.ts +1 -1
- package/lib/config/default.config.js +212 -171
- package/lib/config/documentEventAliases.js +6 -6
- package/lib/config/index.js +161 -98
- package/lib/config/sdkCompatibility.json +8 -8
- package/lib/core/auth/formatProcessing.js +7 -7
- package/lib/core/auth/passportResponse.js +7 -7
- package/lib/core/auth/passportWrapper.js +34 -30
- package/lib/core/auth/tokenManager.d.ts +2 -2
- package/lib/core/auth/tokenManager.js +11 -10
- package/lib/core/backend/applicationManager.d.ts +1 -1
- package/lib/core/backend/applicationManager.js +2 -2
- package/lib/core/backend/backend.d.ts +4 -4
- package/lib/core/backend/backend.js +34 -31
- package/lib/core/backend/backendCluster.d.ts +8 -9
- package/lib/core/backend/backendCluster.js +8 -8
- package/lib/core/backend/backendConfig.d.ts +2 -2
- package/lib/core/backend/backendConfig.js +3 -3
- package/lib/core/backend/backendController.d.ts +2 -2
- package/lib/core/backend/backendController.js +9 -10
- package/lib/core/backend/backendErrors.d.ts +3 -3
- package/lib/core/backend/backendErrors.js +2 -1
- package/lib/core/backend/backendHook.d.ts +3 -3
- package/lib/core/backend/backendHook.js +5 -5
- package/lib/core/backend/backendImport.d.ts +3 -3
- package/lib/core/backend/backendImport.js +23 -23
- package/lib/core/backend/backendOpenApi.d.ts +2 -2
- package/lib/core/backend/backendOpenApi.js +16 -16
- package/lib/core/backend/backendPipe.d.ts +3 -3
- package/lib/core/backend/backendPipe.js +6 -6
- package/lib/core/backend/backendPlugin.d.ts +4 -4
- package/lib/core/backend/backendPlugin.js +14 -14
- package/lib/core/backend/backendStorage.d.ts +2 -2
- package/lib/core/backend/backendStorage.js +1 -2
- package/lib/core/backend/backendVault.d.ts +2 -2
- package/lib/core/backend/backendVault.js +3 -3
- package/lib/core/backend/index.d.ts +14 -14
- package/lib/core/backend/internalLogger.d.ts +1 -1
- package/lib/core/backend/internalLogger.js +5 -5
- package/lib/core/cache/cacheDbEnum.js +4 -4
- package/lib/core/cache/cacheEngine.js +79 -85
- package/lib/core/network/accessLogger.js +126 -120
- package/lib/core/network/clientConnection.js +5 -5
- package/lib/core/network/context.js +8 -8
- package/lib/core/network/entryPoint.js +100 -85
- package/lib/core/network/httpRouter/index.js +63 -60
- package/lib/core/network/httpRouter/routeHandler.js +18 -19
- package/lib/core/network/httpRouter/routePart.js +23 -19
- package/lib/core/network/protocolManifest.js +3 -3
- package/lib/core/network/protocols/httpMessage.js +8 -10
- package/lib/core/network/protocols/httpwsProtocol.js +305 -250
- package/lib/core/network/protocols/internalProtocol.js +27 -24
- package/lib/core/network/protocols/mqttProtocol.js +106 -96
- package/lib/core/network/protocols/protocol.js +20 -17
- package/lib/core/network/router.js +56 -46
- package/lib/core/plugin/plugin.js +151 -120
- package/lib/core/plugin/pluginContext.d.ts +7 -7
- package/lib/core/plugin/pluginContext.js +48 -44
- package/lib/core/plugin/pluginManifest.js +13 -12
- package/lib/core/plugin/pluginRepository.js +26 -27
- package/lib/core/plugin/pluginsManager.js +425 -304
- package/lib/core/plugin/privilegedContext.js +3 -3
- package/lib/core/realtime/actionEnum.js +1 -1
- package/lib/core/realtime/channel.d.ts +1 -1
- package/lib/core/realtime/channel.js +22 -22
- package/lib/core/realtime/connectionRooms.d.ts +1 -1
- package/lib/core/realtime/hotelClerk.d.ts +2 -2
- package/lib/core/realtime/hotelClerk.js +53 -50
- package/lib/core/realtime/index.js +5 -5
- package/lib/core/realtime/notification/document.js +25 -25
- package/lib/core/realtime/notification/index.js +4 -4
- package/lib/core/realtime/notification/server.js +3 -3
- package/lib/core/realtime/notification/user.js +4 -4
- package/lib/core/realtime/notifier.js +113 -75
- package/lib/core/realtime/room.d.ts +1 -1
- package/lib/core/realtime/subscription.d.ts +1 -1
- package/lib/core/realtime/subscription.js +1 -1
- package/lib/core/security/index.js +8 -8
- package/lib/core/security/profileRepository.d.ts +6 -6
- package/lib/core/security/profileRepository.js +48 -45
- package/lib/core/security/roleRepository.js +127 -115
- package/lib/core/security/securityLoader.js +70 -63
- package/lib/core/security/tokenRepository.js +132 -118
- package/lib/core/security/userRepository.js +104 -88
- package/lib/core/shared/KoncordeWrapper.d.ts +1 -1
- package/lib/core/shared/KoncordeWrapper.js +3 -1
- package/lib/core/shared/abstractManifest.js +22 -23
- package/lib/core/shared/repository.js +69 -67
- package/lib/core/shared/sdk/embeddedSdk.d.ts +2 -2
- package/lib/core/shared/sdk/embeddedSdk.js +36 -32
- package/lib/core/shared/sdk/funnelProtocol.d.ts +1 -1
- package/lib/core/shared/sdk/funnelProtocol.js +11 -11
- package/lib/core/shared/sdk/impersonatedSdk.js +19 -18
- package/lib/core/shared/store.js +127 -32
- package/lib/core/statistics/index.js +2 -2
- package/lib/core/statistics/statistics.js +99 -85
- package/lib/core/storage/clientAdapter.js +219 -136
- package/lib/core/storage/indexCache.js +3 -3
- package/lib/core/storage/storageEngine.js +10 -13
- package/lib/core/storage/storeScopeEnum.js +3 -3
- package/lib/core/validation/baseType.js +12 -10
- package/lib/core/validation/index.js +2 -2
- package/lib/core/validation/types/anything.js +4 -4
- package/lib/core/validation/types/boolean.js +7 -7
- package/lib/core/validation/types/date.js +165 -131
- package/lib/core/validation/types/email.js +18 -21
- package/lib/core/validation/types/enum.js +34 -21
- package/lib/core/validation/types/geoPoint.js +7 -7
- package/lib/core/validation/types/geoShape.js +148 -125
- package/lib/core/validation/types/integer.js +9 -9
- package/lib/core/validation/types/ipAddress.js +17 -19
- package/lib/core/validation/types/numeric.js +36 -29
- package/lib/core/validation/types/object.js +19 -19
- package/lib/core/validation/types/string.js +36 -29
- package/lib/core/validation/types/url.js +17 -19
- package/lib/core/validation/validation.js +422 -378
- package/lib/kerror/codes/1-services.json +7 -1
- package/lib/kerror/codes/4-plugin.json +2 -2
- package/lib/kerror/codes/index.js +85 -63
- package/lib/kerror/errors/badRequestError.d.ts +1 -1
- package/lib/kerror/errors/externalServiceError.d.ts +1 -1
- package/lib/kerror/errors/forbiddenError.d.ts +1 -1
- package/lib/kerror/errors/gatewayTimeoutError.d.ts +1 -1
- package/lib/kerror/errors/index.d.ts +15 -15
- package/lib/kerror/errors/internalError.d.ts +1 -1
- package/lib/kerror/errors/kuzzleError.d.ts +1 -1
- package/lib/kerror/errors/multipleErrorsError.d.ts +1 -1
- package/lib/kerror/errors/multipleErrorsError.js +1 -1
- package/lib/kerror/errors/notFoundError.d.ts +1 -1
- package/lib/kerror/errors/partialError.d.ts +1 -1
- package/lib/kerror/errors/partialError.js +1 -1
- package/lib/kerror/errors/pluginImplementationError.d.ts +1 -1
- package/lib/kerror/errors/pluginImplementationError.js +2 -1
- package/lib/kerror/errors/preconditionError.d.ts +1 -1
- package/lib/kerror/errors/serviceUnavailableError.d.ts +1 -1
- package/lib/kerror/errors/sizeLimitError.d.ts +1 -1
- package/lib/kerror/errors/tooManyRequestsError.d.ts +1 -1
- package/lib/kerror/errors/unauthorizedError.d.ts +1 -1
- package/lib/kerror/index.d.ts +3 -3
- package/lib/kerror/index.js +17 -16
- package/lib/kuzzle/dumpGenerator.js +130 -114
- package/lib/kuzzle/event/kuzzleEventEmitter.js +96 -70
- package/lib/kuzzle/event/pipeRunner.js +26 -25
- package/lib/kuzzle/event/waterfall.js +13 -15
- package/lib/kuzzle/index.js +2 -2
- package/lib/kuzzle/internalIndexHandler.js +80 -59
- package/lib/kuzzle/kuzzle.js +99 -99
- package/lib/kuzzle/kuzzleStateEnum.js +1 -1
- package/lib/kuzzle/log.js +23 -18
- package/lib/kuzzle/vault.js +34 -19
- package/lib/model/security/profile.d.ts +3 -3
- package/lib/model/security/profile.js +38 -37
- package/lib/model/security/rights.js +5 -5
- package/lib/model/security/role.d.ts +3 -3
- package/lib/model/security/role.js +25 -26
- package/lib/model/security/token.d.ts +1 -1
- package/lib/model/security/token.js +4 -4
- package/lib/model/security/user.d.ts +2 -2
- package/lib/model/security/user.js +9 -9
- package/lib/model/storage/apiKey.js +43 -33
- package/lib/model/storage/baseModel.js +49 -45
- package/lib/service/cache/redis.js +60 -55
- package/lib/service/service.js +17 -17
- package/lib/service/storage/elasticsearch.js +839 -755
- package/lib/service/storage/esWrapper.js +103 -86
- package/lib/service/storage/queryTranslator.js +52 -59
- package/lib/types/Controller.d.ts +3 -3
- package/lib/types/ControllerDefinition.d.ts +3 -3
- package/lib/types/DebugModule.d.ts +3 -2
- package/lib/types/DebugModule.js +1 -1
- package/lib/types/EventHandler.d.ts +31 -1
- package/lib/types/Global.d.ts +1 -1
- package/lib/types/HttpStream.d.ts +2 -1
- package/lib/types/HttpStream.js +7 -5
- package/lib/types/Kuzzle.d.ts +1 -1
- package/lib/types/KuzzleDocument.d.ts +1 -1
- package/lib/types/OpenApiDefinition.d.ts +1 -1
- package/lib/types/PasswordPolicy.d.ts +1 -1
- package/lib/types/Plugin.d.ts +8 -8
- package/lib/types/Plugin.js +2 -2
- package/lib/types/Policy.d.ts +1 -1
- package/lib/types/RequestPayload.d.ts +1 -1
- package/lib/types/ResponsePayload.d.ts +1 -1
- package/lib/types/Token.d.ts +1 -1
- package/lib/types/User.d.ts +1 -1
- package/lib/types/config/DumpConfiguration.d.ts +8 -8
- package/lib/types/config/HttpConfiguration.d.ts +1 -1
- package/lib/types/config/KuzzleConfiguration.d.ts +1 -1
- package/lib/types/config/LimitsConfiguration.d.ts +8 -8
- package/lib/types/config/PluginsConfiguration.d.ts +4 -4
- package/lib/types/config/SecurityConfiguration.d.ts +62 -62
- package/lib/types/config/ServerConfiguration.d.ts +55 -55
- package/lib/types/config/ServicesConfiguration.d.ts +2 -2
- package/lib/types/config/internalCache/InternalCacheRedisConfiguration.d.ts +10 -10
- package/lib/types/config/publicCache/PublicCacheRedisConfiguration.d.ts +3 -3
- package/lib/types/config/storageEngine/StorageEngineElasticsearchConfiguration.d.ts +194 -110
- package/lib/types/errors/ErrorDefinition.d.ts +1 -1
- package/lib/types/errors/ErrorDomains.d.ts +1 -1
- package/lib/types/events/EventGenericDocument.d.ts +26 -0
- package/lib/types/events/EventGenericDocument.js +3 -0
- package/lib/types/index.d.ts +39 -38
- package/lib/types/index.js +1 -0
- package/lib/types/realtime/RealtimeScope.d.ts +1 -1
- package/lib/types/realtime/RealtimeUsers.d.ts +1 -1
- package/lib/util/assertType.js +13 -11
- package/lib/util/async.d.ts +1 -0
- package/lib/util/async.js +61 -0
- package/lib/util/asyncStore.js +19 -21
- package/lib/util/bufferedPassThrough.d.ts +3 -2
- package/lib/util/bufferedPassThrough.js +4 -4
- package/lib/util/bytes.js +9 -13
- package/lib/util/crypto.js +1 -1
- package/lib/util/debug.js +5 -5
- package/lib/util/deprecate.js +24 -21
- package/lib/util/didYouMean.js +7 -7
- package/lib/util/dump-collection.d.ts +2 -2
- package/lib/util/dump-collection.js +26 -26
- package/lib/util/esRequest.d.ts +1 -0
- package/lib/util/esRequest.js +62 -0
- package/lib/util/extractFields.js +24 -25
- package/lib/util/inflector.js +5 -5
- package/lib/util/koncordeCompat.d.ts +2 -2
- package/lib/util/koncordeCompat.js +5 -5
- package/lib/util/memoize.js +3 -5
- package/lib/util/mutex.d.ts +19 -1
- package/lib/util/mutex.js +39 -12
- package/lib/util/name-generator.js +1331 -1331
- package/lib/util/promback.js +8 -10
- package/lib/util/readYamlFile.d.ts +1 -1
- package/lib/util/readYamlFile.js +1 -1
- package/lib/util/requestAssertions.js +34 -34
- package/lib/util/safeObject.js +5 -5
- package/lib/util/stackTrace.js +20 -22
- package/lib/util/wildcard.js +15 -15
- package/package.json +28 -29
- package/npm-shrinkwrap.json +0 -19422
|
@@ -19,12 +19,12 @@
|
|
|
19
19
|
* limitations under the License.
|
|
20
20
|
*/
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
"use strict";
|
|
23
23
|
|
|
24
|
-
const { Request } = require(
|
|
25
|
-
const kerror = require(
|
|
26
|
-
const HttpRouter = require(
|
|
27
|
-
const { removeStacktrace } = require(
|
|
24
|
+
const { Request } = require("../../api/request");
|
|
25
|
+
const kerror = require("../../kerror");
|
|
26
|
+
const HttpRouter = require("./httpRouter");
|
|
27
|
+
const { removeStacktrace } = require("../../util/stackTrace");
|
|
28
28
|
|
|
29
29
|
/**
|
|
30
30
|
* @class Router
|
|
@@ -32,7 +32,7 @@ const { removeStacktrace } = require('../../util/stackTrace');
|
|
|
32
32
|
* @param {Kuzzle} kuzzle
|
|
33
33
|
*/
|
|
34
34
|
class Router {
|
|
35
|
-
constructor
|
|
35
|
+
constructor() {
|
|
36
36
|
this.connections = new Map();
|
|
37
37
|
this.http = new HttpRouter();
|
|
38
38
|
}
|
|
@@ -42,15 +42,17 @@ class Router {
|
|
|
42
42
|
*
|
|
43
43
|
* @param {RequestContext} requestContext
|
|
44
44
|
*/
|
|
45
|
-
newConnection
|
|
46
|
-
if (!
|
|
47
|
-
global.kuzzle.log.error(
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
45
|
+
newConnection(requestContext) {
|
|
46
|
+
if (!requestContext.connection.id || !requestContext.connection.protocol) {
|
|
47
|
+
global.kuzzle.log.error(
|
|
48
|
+
kerror.get(
|
|
49
|
+
"protocol",
|
|
50
|
+
"runtime",
|
|
51
|
+
"invalid_connection",
|
|
52
|
+
JSON.stringify(requestContext)
|
|
53
|
+
)
|
|
54
|
+
);
|
|
55
|
+
} else {
|
|
54
56
|
this.connections.set(requestContext.connection.id, requestContext);
|
|
55
57
|
global.kuzzle.statistics.newConnection(requestContext);
|
|
56
58
|
}
|
|
@@ -61,24 +63,30 @@ class Router {
|
|
|
61
63
|
*
|
|
62
64
|
* @param {RequestContext} requestContext
|
|
63
65
|
*/
|
|
64
|
-
removeConnection
|
|
66
|
+
removeConnection(requestContext) {
|
|
65
67
|
const connId = requestContext.connection.id;
|
|
66
68
|
|
|
67
|
-
if (!
|
|
68
|
-
global.kuzzle.log.error(
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
69
|
+
if (!connId || !requestContext.connection.protocol) {
|
|
70
|
+
global.kuzzle.log.error(
|
|
71
|
+
kerror.get(
|
|
72
|
+
"protocol",
|
|
73
|
+
"runtime",
|
|
74
|
+
"invalid_connection",
|
|
75
|
+
JSON.stringify(requestContext.context)
|
|
76
|
+
)
|
|
77
|
+
);
|
|
73
78
|
return;
|
|
74
79
|
}
|
|
75
80
|
|
|
76
|
-
if (!
|
|
77
|
-
global.kuzzle.log.error(
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
81
|
+
if (!this.connections.has(connId)) {
|
|
82
|
+
global.kuzzle.log.error(
|
|
83
|
+
kerror.get(
|
|
84
|
+
"protocol",
|
|
85
|
+
"runtime",
|
|
86
|
+
"unknown_connection",
|
|
87
|
+
JSON.stringify(connId)
|
|
88
|
+
)
|
|
89
|
+
);
|
|
82
90
|
return;
|
|
83
91
|
}
|
|
84
92
|
|
|
@@ -92,24 +100,26 @@ class Router {
|
|
|
92
100
|
*
|
|
93
101
|
* @param {RequestContext} requestContext
|
|
94
102
|
*/
|
|
95
|
-
isConnectionAlive
|
|
103
|
+
isConnectionAlive(requestContext) {
|
|
96
104
|
// Check only defined connection identifiers (some protocols might
|
|
97
105
|
// not have one)
|
|
98
|
-
return
|
|
99
|
-
|
|
106
|
+
return (
|
|
107
|
+
requestContext.connection.id === null ||
|
|
108
|
+
this.connections.has(requestContext.connection.id)
|
|
109
|
+
);
|
|
100
110
|
}
|
|
101
111
|
|
|
102
112
|
/**
|
|
103
113
|
* Initializes the HTTP routes for the Kuzzle HTTP API.
|
|
104
114
|
*/
|
|
105
|
-
init
|
|
115
|
+
init() {
|
|
106
116
|
// Register API and plugin routes
|
|
107
117
|
const routes = [
|
|
108
118
|
...global.kuzzle.config.http.routes,
|
|
109
|
-
...global.kuzzle.pluginsManager.routes
|
|
119
|
+
...global.kuzzle.pluginsManager.routes,
|
|
110
120
|
];
|
|
111
121
|
|
|
112
|
-
this.http.post(
|
|
122
|
+
this.http.post("_query", (request, cb) => {
|
|
113
123
|
// We need to build a new request from the body
|
|
114
124
|
// and we also need to keep the original request context
|
|
115
125
|
const requestPayload = request.input.body;
|
|
@@ -120,9 +130,10 @@ class Router {
|
|
|
120
130
|
|
|
121
131
|
const apiRequest = new Request(
|
|
122
132
|
requestPayload,
|
|
123
|
-
request.serialize().options
|
|
133
|
+
request.serialize().options
|
|
134
|
+
);
|
|
124
135
|
|
|
125
|
-
this._executeFromHttp(
|
|
136
|
+
this._executeFromHttp("post", apiRequest, cb);
|
|
126
137
|
});
|
|
127
138
|
|
|
128
139
|
for (const route of routes) {
|
|
@@ -133,7 +144,9 @@ class Router {
|
|
|
133
144
|
request.input.action = route.action;
|
|
134
145
|
|
|
135
146
|
if (route.deprecated) {
|
|
136
|
-
const {
|
|
147
|
+
const {
|
|
148
|
+
deprecated: { since, message },
|
|
149
|
+
} = route;
|
|
137
150
|
request.addDeprecation(since, message);
|
|
138
151
|
}
|
|
139
152
|
|
|
@@ -145,21 +158,19 @@ class Router {
|
|
|
145
158
|
* Returns inner metrics from the router
|
|
146
159
|
* @returns {Object}
|
|
147
160
|
*/
|
|
148
|
-
global.kuzzle.onAsk(
|
|
149
|
-
'core:network:router:metrics',
|
|
150
|
-
() => this.metrics());
|
|
161
|
+
global.kuzzle.onAsk("core:network:router:metrics", () => this.metrics());
|
|
151
162
|
}
|
|
152
163
|
|
|
153
164
|
/**
|
|
154
165
|
* Returns the metrics of the router
|
|
155
166
|
* @returns {Object}
|
|
156
167
|
*/
|
|
157
|
-
metrics
|
|
168
|
+
metrics() {
|
|
158
169
|
const connectionsByProtocol = {};
|
|
159
170
|
|
|
160
171
|
for (const connection of this.connections.values()) {
|
|
161
172
|
const protocol = connection.connection.protocol.toLowerCase();
|
|
162
|
-
if (protocol ===
|
|
173
|
+
if (protocol === "internal") {
|
|
163
174
|
continue;
|
|
164
175
|
}
|
|
165
176
|
|
|
@@ -183,17 +194,16 @@ class Router {
|
|
|
183
194
|
* @param {Request} request - includes URL and POST query data
|
|
184
195
|
* @param {function} cb - callback to invoke with the result
|
|
185
196
|
*/
|
|
186
|
-
_executeFromHttp
|
|
197
|
+
_executeFromHttp(verb, request, cb) {
|
|
187
198
|
global.kuzzle.pipe(`http:${verb}`, request, (error, mutatedRequest) => {
|
|
188
199
|
if (error) {
|
|
189
200
|
request.setError(error);
|
|
190
201
|
cb(request);
|
|
191
|
-
}
|
|
192
|
-
else {
|
|
202
|
+
} else {
|
|
193
203
|
global.kuzzle.funnel.execute(mutatedRequest, (err, result) => {
|
|
194
204
|
const _res = result || request;
|
|
195
205
|
|
|
196
|
-
if (err && !
|
|
206
|
+
if (err && !_res.error) {
|
|
197
207
|
_res.setError(err);
|
|
198
208
|
}
|
|
199
209
|
|