@routr/location 2.0.5-alpha.12 → 2.0.5-alpha.15
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/dist/config/get_config.js +5 -1
- package/dist/index.js +5 -1
- package/dist/location.js +2 -2
- package/dist/memory_store.js +1 -1
- package/dist/redis_store.js +1 -1
- package/dist/runner.js +3 -2
- package/dist/service.js +2 -2
- package/dist/tracer.d.ts +1 -0
- package/dist/tracer.js +49 -0
- package/dist/utils.js +1 -1
- package/package.json +12 -4
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/location.js
CHANGED
|
@@ -50,7 +50,7 @@ class Location {
|
|
|
50
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
51
51
|
const routes = request.labels
|
|
52
52
|
? (yield this.store.get(request.aor))
|
|
53
|
-
.filter(utils_1.filterOnlyMatchingLabels(request.labels))
|
|
53
|
+
.filter((0, utils_1.filterOnlyMatchingLabels)(request.labels))
|
|
54
54
|
: (yield this.store.get(request.aor)) || [];
|
|
55
55
|
if (request.aor.startsWith('sip:')) {
|
|
56
56
|
return routes;
|
|
@@ -61,7 +61,7 @@ class Location {
|
|
|
61
61
|
throw new errors_1.NotRoutesFoundForAOR(request.aor);
|
|
62
62
|
}
|
|
63
63
|
// If it has not affinity sesssion then get next
|
|
64
|
-
return !utils_1.hasAffinitySession(backend)
|
|
64
|
+
return !(0, utils_1.hasAffinitySession)(backend)
|
|
65
65
|
? [this.next(routes, backend)]
|
|
66
66
|
: [this.nextWithAffinity(yield routes, backend.sessionAffinity.ref)];
|
|
67
67
|
}
|
package/dist/memory_store.js
CHANGED
|
@@ -12,7 +12,7 @@ class MemoryStore {
|
|
|
12
12
|
// Avoids duplicate or expired routes
|
|
13
13
|
const filteredRoutes = routes
|
|
14
14
|
.filter(utils_1.expiredFilter)
|
|
15
|
-
.filter(r => utils_1.duplicateFilter(r, route));
|
|
15
|
+
.filter(r => (0, utils_1.duplicateFilter)(r, route));
|
|
16
16
|
if (filteredRoutes.length > 0) {
|
|
17
17
|
this.collections.set(key, [route, ...filteredRoutes]);
|
|
18
18
|
}
|
package/dist/redis_store.js
CHANGED
|
@@ -24,7 +24,7 @@ const utils_1 = require("./utils");
|
|
|
24
24
|
const logger_1 = __importDefault(require("@fonoster/logger"));
|
|
25
25
|
class RedisStore {
|
|
26
26
|
constructor(config) {
|
|
27
|
-
this.client = config ? redis_1.createClient({ url: utils_1.getUrlString(config) }) : redis_1.createClient();
|
|
27
|
+
this.client = config ? (0, redis_1.createClient)({ url: (0, utils_1.getUrlString)(config) }) : (0, redis_1.createClient)();
|
|
28
28
|
this.client.connect();
|
|
29
29
|
this.client.on('error', (err) => logger_1.default.error('redis client error: ', err));
|
|
30
30
|
}
|
package/dist/runner.js
CHANGED
|
@@ -22,12 +22,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
22
22
|
* See the License for the specific language governing permissions and
|
|
23
23
|
* limitations under the License.
|
|
24
24
|
*/
|
|
25
|
+
require("./tracer").init("dispatcher");
|
|
25
26
|
const logger_1 = __importDefault(require("@fonoster/logger"));
|
|
26
27
|
const service_1 = __importDefault(require("./service"));
|
|
27
28
|
const get_config_1 = require("./config/get_config");
|
|
28
|
-
const result = get_config_1.getConfig(process.env.CONFIG_PATH);
|
|
29
|
+
const result = (0, get_config_1.getConfig)(process.env.CONFIG_PATH);
|
|
29
30
|
if (result._tag === 'Right') {
|
|
30
|
-
service_1.default(result.right);
|
|
31
|
+
(0, service_1.default)(result.right);
|
|
31
32
|
}
|
|
32
33
|
else {
|
|
33
34
|
logger_1.default.error(result.left);
|
package/dist/service.js
CHANGED
|
@@ -33,14 +33,14 @@ function LocationService(config) {
|
|
|
33
33
|
const { bindAddr, cache } = config;
|
|
34
34
|
let store;
|
|
35
35
|
if (cache.provider === types_1.CACHE_PROVIDER.REDIS) {
|
|
36
|
-
store = new redis_store_1.default(utils_1.configFromString(cache.parameters, allowedParameters));
|
|
36
|
+
store = new redis_store_1.default((0, utils_1.configFromString)(cache.parameters, allowedParameters));
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
39
|
store = new memory_store_1.default();
|
|
40
40
|
}
|
|
41
41
|
const backends = new Map();
|
|
42
42
|
config.backends.forEach(b => backends.set(`backend:${b.ref}`, b));
|
|
43
|
-
common_1.createService(utils_1.getServiceInfo(bindAddr, new location_1.default(store, backends)));
|
|
43
|
+
(0, common_1.createService)((0, utils_1.getServiceInfo)(bindAddr, new location_1.default(store, backends)));
|
|
44
44
|
logger_1.default.info(`using ${cache.provider} as cache provider`);
|
|
45
45
|
}
|
|
46
46
|
exports.default = LocationService;
|
package/dist/tracer.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function init(serviceName: string): import("@opentelemetry/api").Tracer;
|
package/dist/tracer.js
ADDED
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.init = void 0;
|
|
7
|
+
/*
|
|
8
|
+
* Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
|
|
9
|
+
* http://github.com/fonoster/routr
|
|
10
|
+
*
|
|
11
|
+
* This file is part of Routr
|
|
12
|
+
*
|
|
13
|
+
* Licensed under the MIT License (the "License")
|
|
14
|
+
* you may not use this file except in compliance with
|
|
15
|
+
* the License. You may obtain a copy of the License at
|
|
16
|
+
*
|
|
17
|
+
* https://opensource.org/licenses/MIT
|
|
18
|
+
*
|
|
19
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
20
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
21
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
22
|
+
* See the License for the specific language governing permissions and
|
|
23
|
+
* limitations under the License.
|
|
24
|
+
*/
|
|
25
|
+
const api_1 = __importDefault(require("@opentelemetry/api"));
|
|
26
|
+
const instrumentation_1 = require("@opentelemetry/instrumentation");
|
|
27
|
+
const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
|
|
28
|
+
const resources_1 = require("@opentelemetry/resources");
|
|
29
|
+
const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
|
|
30
|
+
const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
|
|
31
|
+
const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
|
|
32
|
+
const instrumentation_grpc_1 = require("@opentelemetry/instrumentation-grpc");
|
|
33
|
+
function init(serviceName) {
|
|
34
|
+
const provider = new sdk_trace_node_1.NodeTracerProvider({
|
|
35
|
+
resource: new resources_1.Resource({
|
|
36
|
+
[semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: serviceName,
|
|
37
|
+
}),
|
|
38
|
+
});
|
|
39
|
+
const exporter = new exporter_jaeger_1.JaegerExporter();
|
|
40
|
+
provider.addSpanProcessor(new sdk_trace_base_1.SimpleSpanProcessor(exporter));
|
|
41
|
+
provider.register();
|
|
42
|
+
(0, instrumentation_1.registerInstrumentations)({
|
|
43
|
+
instrumentations: [
|
|
44
|
+
new instrumentation_grpc_1.GrpcInstrumentation(),
|
|
45
|
+
],
|
|
46
|
+
});
|
|
47
|
+
return api_1.default.trace.getTracer('routr-tracer');
|
|
48
|
+
}
|
|
49
|
+
exports.init = init;
|
package/dist/utils.js
CHANGED
|
@@ -21,7 +21,7 @@ exports.mergeKeyValue = mergeKeyValue;
|
|
|
21
21
|
const compareArrays = (arr, target) => target.every(v => arr.includes(v)) && arr.length === target.length;
|
|
22
22
|
exports.compareArrays = compareArrays;
|
|
23
23
|
const filterOnlyMatchingLabels = (requestLabels) => (route) => route.labels
|
|
24
|
-
? exports.compareArrays(exports.mergeKeyValue(requestLabels), exports.mergeKeyValue(route.labels))
|
|
24
|
+
? (0, exports.compareArrays)((0, exports.mergeKeyValue)(requestLabels), (0, exports.mergeKeyValue)(route.labels))
|
|
25
25
|
: false;
|
|
26
26
|
exports.filterOnlyMatchingLabels = filterOnlyMatchingLabels;
|
|
27
27
|
const hasAffinitySession = (backend) => { var _a; return (_a = backend === null || backend === void 0 ? void 0 : backend.sessionAffinity) === null || _a === void 0 ? void 0 : _a.enabled; };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@routr/location",
|
|
3
|
-
"version": "2.0.5-alpha.
|
|
3
|
+
"version": "2.0.5-alpha.15",
|
|
4
4
|
"description": "Creates and maintains a list of routes to all registered endpoints",
|
|
5
5
|
"author": "Pedro Sanders <psanders@fonoster.com>",
|
|
6
6
|
"homepage": "https://github.com/fonoster/routr#readme",
|
|
@@ -26,8 +26,16 @@
|
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@grpc/grpc-js": "^1.5.9",
|
|
29
|
-
"@
|
|
30
|
-
"@
|
|
29
|
+
"@opentelemetry/api": "^1.0.4",
|
|
30
|
+
"@opentelemetry/exporter-jaeger": "^1.0.4",
|
|
31
|
+
"@opentelemetry/instrumentation": "^0.27.0",
|
|
32
|
+
"@opentelemetry/instrumentation-grpc": "^0.27.0",
|
|
33
|
+
"@opentelemetry/resources": "^1.0.4",
|
|
34
|
+
"@opentelemetry/sdk-trace-base": "^1.0.4",
|
|
35
|
+
"@opentelemetry/sdk-trace-node": "^1.0.4",
|
|
36
|
+
"@opentelemetry/semantic-conventions": "^1.0.4",
|
|
37
|
+
"@routr/common": "^2.0.5-alpha.15",
|
|
38
|
+
"@routr/processor": "^2.0.5-alpha.15",
|
|
31
39
|
"ajv": "^6.12.6",
|
|
32
40
|
"fp-ts": "^2.11.8",
|
|
33
41
|
"redis": "^4.0.4"
|
|
@@ -39,5 +47,5 @@
|
|
|
39
47
|
"bugs": {
|
|
40
48
|
"url": "https://github.com/fonoster/routr/issues"
|
|
41
49
|
},
|
|
42
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "3e08aa86f1596252546134bff677d17d7dd54ced"
|
|
43
51
|
}
|