@routr/processor 2.0.5-alpha.9 → 2.0.6-alpha.1
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/alterations.d.ts +8 -0
- package/dist/alterations.js +124 -15
- package/dist/extensions.d.ts +5 -1
- package/dist/extensions.js +11 -2
- package/dist/helper.d.ts +9 -1
- package/dist/helper.js +48 -3
- package/dist/index.js +5 -1
- package/dist/processor.d.ts +15 -2
- package/dist/processor.js +16 -1
- package/dist/response.d.ts +39 -4
- package/dist/response.js +36 -4
- package/dist/target.d.ts +2 -1
- package/dist/target.js +7 -5
- package/dist/tracer.d.ts +7 -0
- package/dist/tracer.js +53 -0
- package/package.json +12 -4
package/dist/alterations.d.ts
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
import { MessageRequest, Route } from "@routr/common";
|
|
2
2
|
export declare const updateRequestURI: (route: Route) => (request: MessageRequest) => MessageRequest;
|
|
3
3
|
export declare const addSelfVia: (route: Route) => (request: MessageRequest) => MessageRequest;
|
|
4
|
+
export declare const addRoute: (route: Route) => (request: MessageRequest) => MessageRequest;
|
|
5
|
+
export declare const addRouteToListeningPoint: (route: Route) => (request: MessageRequest) => MessageRequest;
|
|
6
|
+
export declare const applyXHeaders: (route: Route) => (request: MessageRequest) => MessageRequest;
|
|
7
|
+
export declare const addSelfRecordRoute: (request: MessageRequest) => MessageRequest;
|
|
8
|
+
export declare const addXEdgePortRef: (request: MessageRequest) => MessageRequest;
|
|
9
|
+
export declare const removeXEdgePortRef: (request: MessageRequest) => MessageRequest;
|
|
10
|
+
export declare const removeAuthorization: (request: MessageRequest) => MessageRequest;
|
|
11
|
+
export declare const removeRoutes: (request: MessageRequest) => MessageRequest;
|
|
4
12
|
export declare const removeTopVia: (request: MessageRequest) => MessageRequest;
|
|
5
13
|
export declare const decreaseMaxForwards: (request: MessageRequest) => MessageRequest;
|
package/dist/alterations.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.decreaseMaxForwards = exports.removeTopVia = exports.addSelfVia = exports.updateRequestURI = void 0;
|
|
3
|
+
exports.decreaseMaxForwards = exports.removeTopVia = exports.removeRoutes = exports.removeAuthorization = exports.removeXEdgePortRef = exports.addXEdgePortRef = exports.addSelfRecordRoute = exports.applyXHeaders = exports.addRouteToListeningPoint = exports.addRoute = exports.addSelfVia = exports.updateRequestURI = void 0;
|
|
4
4
|
/*
|
|
5
5
|
* Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
|
|
6
6
|
* http://github.com/fonoster/routr
|
|
@@ -20,7 +20,7 @@ exports.decreaseMaxForwards = exports.removeTopVia = exports.addSelfVia = export
|
|
|
20
20
|
* limitations under the License.
|
|
21
21
|
*/
|
|
22
22
|
const common_1 = require("@routr/common");
|
|
23
|
-
|
|
23
|
+
// Q: Should we deprecate this method since we are not doing strict routing?
|
|
24
24
|
const updateRequestURI = (route) => {
|
|
25
25
|
return (request) => {
|
|
26
26
|
const req = common_1.Helper.deepCopy(request);
|
|
@@ -32,41 +32,150 @@ const updateRequestURI = (route) => {
|
|
|
32
32
|
}
|
|
33
33
|
req.message.requestUri.host = route.host;
|
|
34
34
|
req.message.requestUri.port = route.port;
|
|
35
|
-
req.message.requestUri.
|
|
35
|
+
req.message.requestUri.transportParam = route.transport;
|
|
36
36
|
return req;
|
|
37
37
|
};
|
|
38
38
|
};
|
|
39
39
|
exports.updateRequestURI = updateRequestURI;
|
|
40
40
|
const addSelfVia = (route) => {
|
|
41
41
|
return (request) => {
|
|
42
|
+
var _a;
|
|
42
43
|
const req = common_1.Helper.deepCopy(request);
|
|
43
|
-
// If is comming from a different edgeport we the listening point instead
|
|
44
|
-
// of the endpoint to ensure connectivity
|
|
44
|
+
// If is comming from a different edgeport we use the listening point instead
|
|
45
|
+
// of the endpoint to ensure connectivity.
|
|
45
46
|
const nextHopHost = request.edgePortRef === route.edgePortRef
|
|
46
|
-
? route.host
|
|
47
|
+
? route.host
|
|
48
|
+
: route.listeningPoint.host;
|
|
47
49
|
// If the nextHopHost host is local, then use use lp to construct via
|
|
48
50
|
// otherwise, we use the first external ip available.
|
|
49
|
-
const via = common_1.IpUtils.isLocalnet(
|
|
51
|
+
const via = common_1.IpUtils.isLocalnet(req.localnets, nextHopHost)
|
|
50
52
|
? route.listeningPoint
|
|
51
53
|
: {
|
|
52
54
|
// fallback to lp host if there is no external ips
|
|
53
|
-
host: (
|
|
54
|
-
port:
|
|
55
|
-
transport:
|
|
55
|
+
host: (_a = req.externalIps[0]) !== null && _a !== void 0 ? _a : req.listeningPoint.host,
|
|
56
|
+
port: req.listeningPoint.port,
|
|
57
|
+
transport: req.listeningPoint.transport
|
|
56
58
|
};
|
|
57
|
-
req.message.via = [...req.message.via
|
|
59
|
+
req.message.via = [via, ...req.message.via];
|
|
58
60
|
return req;
|
|
59
61
|
};
|
|
60
62
|
};
|
|
61
63
|
exports.addSelfVia = addSelfVia;
|
|
64
|
+
const addRoute = (route) => {
|
|
65
|
+
return (request) => {
|
|
66
|
+
const req = common_1.Helper.deepCopy(request);
|
|
67
|
+
const r = {
|
|
68
|
+
address: {
|
|
69
|
+
uri: {
|
|
70
|
+
host: route.host,
|
|
71
|
+
port: route.port,
|
|
72
|
+
transportParam: route.transport,
|
|
73
|
+
lrParam: true
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
req.message.route = [r, ...req.message.route];
|
|
78
|
+
return req;
|
|
79
|
+
};
|
|
80
|
+
};
|
|
81
|
+
exports.addRoute = addRoute;
|
|
82
|
+
const addRouteToListeningPoint = (route) => {
|
|
83
|
+
return (request) => {
|
|
84
|
+
const req = common_1.Helper.deepCopy(request);
|
|
85
|
+
const r = {
|
|
86
|
+
address: {
|
|
87
|
+
uri: {
|
|
88
|
+
host: route.listeningPoint.host,
|
|
89
|
+
port: route.listeningPoint.port,
|
|
90
|
+
transportParam: route.listeningPoint.transport,
|
|
91
|
+
lrParam: true
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
};
|
|
95
|
+
req.message.route = [r, ...req.message.route];
|
|
96
|
+
return req;
|
|
97
|
+
};
|
|
98
|
+
};
|
|
99
|
+
exports.addRouteToListeningPoint = addRouteToListeningPoint;
|
|
100
|
+
const applyXHeaders = (route) => {
|
|
101
|
+
return (request) => {
|
|
102
|
+
const req = common_1.Helper.deepCopy(request);
|
|
103
|
+
if (route.headers && route.headers.length > 0) {
|
|
104
|
+
const headersToRemove = route.headers
|
|
105
|
+
.filter((h) => h.action === "remove")
|
|
106
|
+
.map((h) => h.name);
|
|
107
|
+
const headersToAdd = route.headers.filter((h) => h.action !== "remove");
|
|
108
|
+
req.message.extensions = req.message.extensions.filter((h) => !headersToRemove.includes(h.name.toLowerCase()));
|
|
109
|
+
headersToAdd.forEach((h) => {
|
|
110
|
+
req.message.extensions.push({ name: h.name, value: h.value });
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
return req;
|
|
114
|
+
};
|
|
115
|
+
};
|
|
116
|
+
exports.applyXHeaders = applyXHeaders;
|
|
117
|
+
const addSelfRecordRoute = (request) => {
|
|
118
|
+
const req = common_1.Helper.deepCopy(request);
|
|
119
|
+
const lp = req.listeningPoint;
|
|
120
|
+
const r = {
|
|
121
|
+
address: {
|
|
122
|
+
uri: {
|
|
123
|
+
host: lp.host,
|
|
124
|
+
port: lp.port,
|
|
125
|
+
transportParam: lp.transport,
|
|
126
|
+
lrParam: true
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
};
|
|
130
|
+
req.message.recordRoute = [r, ...req.message.recordRoute];
|
|
131
|
+
return req;
|
|
132
|
+
};
|
|
133
|
+
exports.addSelfRecordRoute = addSelfRecordRoute;
|
|
134
|
+
const addXEdgePortRef = (request) => {
|
|
135
|
+
const req = common_1.Helper.deepCopy(request);
|
|
136
|
+
const r = {
|
|
137
|
+
name: common_1.CommonTypes.ExtraHeader.EDGEPORT_REF,
|
|
138
|
+
value: request.edgePortRef
|
|
139
|
+
};
|
|
140
|
+
req.message.extensions = [r, ...req.message.extensions];
|
|
141
|
+
return req;
|
|
142
|
+
};
|
|
143
|
+
exports.addXEdgePortRef = addXEdgePortRef;
|
|
144
|
+
const removeXEdgePortRef = (request) => {
|
|
145
|
+
const req = common_1.Helper.deepCopy(request);
|
|
146
|
+
req.message.extensions = req.message.extensions.filter((ext) => ext.name.toLowerCase() !== common_1.CommonTypes.ExtraHeader.EDGEPORT_REF);
|
|
147
|
+
return req;
|
|
148
|
+
};
|
|
149
|
+
exports.removeXEdgePortRef = removeXEdgePortRef;
|
|
150
|
+
const removeAuthorization = (request) => {
|
|
151
|
+
const req = common_1.Helper.deepCopy(request);
|
|
152
|
+
delete req.message.authorization;
|
|
153
|
+
return req;
|
|
154
|
+
};
|
|
155
|
+
exports.removeAuthorization = removeAuthorization;
|
|
156
|
+
const removeRoutes = (request) => {
|
|
157
|
+
const req = common_1.Helper.deepCopy(request);
|
|
158
|
+
req.message.route = req.message.route.filter((r) => {
|
|
159
|
+
const lp = request.listeningPoint;
|
|
160
|
+
const route = r.address.uri;
|
|
161
|
+
return !((route.host === lp.host || request.externalIps.includes(route.host)) &&
|
|
162
|
+
route.port === lp.port);
|
|
163
|
+
});
|
|
164
|
+
return req;
|
|
165
|
+
};
|
|
166
|
+
exports.removeRoutes = removeRoutes;
|
|
62
167
|
const removeTopVia = (request) => {
|
|
63
168
|
const req = common_1.Helper.deepCopy(request);
|
|
64
169
|
req.message.via.shift();
|
|
65
170
|
return req;
|
|
66
171
|
};
|
|
67
172
|
exports.removeTopVia = removeTopVia;
|
|
68
|
-
const decreaseMaxForwards = (request) =>
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
173
|
+
const decreaseMaxForwards = (request) => {
|
|
174
|
+
const req = common_1.Helper.deepCopy(request);
|
|
175
|
+
if (req.message.maxForwards) {
|
|
176
|
+
req.message.maxForwards.maxForwards =
|
|
177
|
+
req.message.maxForwards.maxForwards - 1;
|
|
178
|
+
}
|
|
179
|
+
return req;
|
|
180
|
+
};
|
|
72
181
|
exports.decreaseMaxForwards = decreaseMaxForwards;
|
package/dist/extensions.d.ts
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { MessageRequest } from "@routr/common";
|
|
2
|
-
export declare const getHeaderValue: (request: MessageRequest, name: string) =>
|
|
2
|
+
export declare const getHeaderValue: (request: MessageRequest, name: string) => string;
|
|
3
3
|
export declare const updateHeader: (request: MessageRequest, header: {
|
|
4
4
|
name: string;
|
|
5
5
|
value: string;
|
|
6
6
|
}) => MessageRequest;
|
|
7
|
+
export declare const addHeader: (request: MessageRequest, header: {
|
|
8
|
+
name: string;
|
|
9
|
+
value: string;
|
|
10
|
+
}) => MessageRequest;
|
package/dist/extensions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updateHeader = exports.getHeaderValue = void 0;
|
|
3
|
+
exports.addHeader = exports.updateHeader = exports.getHeaderValue = void 0;
|
|
4
4
|
/*
|
|
5
5
|
* Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
|
|
6
6
|
* http://github.com/fonoster/routr
|
|
@@ -20,7 +20,10 @@ exports.updateHeader = exports.getHeaderValue = void 0;
|
|
|
20
20
|
* limitations under the License.
|
|
21
21
|
*/
|
|
22
22
|
const common_1 = require("@routr/common");
|
|
23
|
-
const getHeaderValue = (request, name) => {
|
|
23
|
+
const getHeaderValue = (request, name) => {
|
|
24
|
+
var _a;
|
|
25
|
+
return (_a = request.message.extensions.find((ext) => ext.name.toLowerCase() === name.toLowerCase())) === null || _a === void 0 ? void 0 : _a.value;
|
|
26
|
+
};
|
|
24
27
|
exports.getHeaderValue = getHeaderValue;
|
|
25
28
|
const updateHeader = (request, header) => {
|
|
26
29
|
const r = common_1.Helper.deepCopy(request);
|
|
@@ -30,3 +33,9 @@ const updateHeader = (request, header) => {
|
|
|
30
33
|
return r;
|
|
31
34
|
};
|
|
32
35
|
exports.updateHeader = updateHeader;
|
|
36
|
+
const addHeader = (request, header) => {
|
|
37
|
+
const r = common_1.Helper.deepCopy(request);
|
|
38
|
+
r.message.extensions = [...request.message.extensions, header];
|
|
39
|
+
return r;
|
|
40
|
+
};
|
|
41
|
+
exports.addHeader = addHeader;
|
package/dist/helper.d.ts
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
-
import { MessageRequest } from "@routr/common";
|
|
1
|
+
import { MessageRequest, Route } from "@routr/common";
|
|
2
2
|
export declare const isTypeResponse: (request: MessageRequest) => boolean;
|
|
3
3
|
export declare const isTypeRequest: (request: MessageRequest) => boolean;
|
|
4
|
+
/**
|
|
5
|
+
* A request traversing a second EdgePort would have an updated the requestUri.
|
|
6
|
+
* Therefore, we are able to re-construct the Route from the request.
|
|
7
|
+
*
|
|
8
|
+
* @param {MessageRequest} request - the request
|
|
9
|
+
* @return {Route} the route
|
|
10
|
+
*/
|
|
11
|
+
export declare function createRouteFromLastMessage(request: MessageRequest): Route;
|
package/dist/helper.js
CHANGED
|
@@ -1,7 +1,52 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isTypeRequest = exports.isTypeResponse = void 0;
|
|
4
|
-
|
|
3
|
+
exports.createRouteFromLastMessage = exports.isTypeRequest = exports.isTypeResponse = void 0;
|
|
4
|
+
/*
|
|
5
|
+
* Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
|
|
6
|
+
* http://github.com/fonoster/routr
|
|
7
|
+
*
|
|
8
|
+
* This file is part of Routr
|
|
9
|
+
*
|
|
10
|
+
* Licensed under the MIT License (the "License")
|
|
11
|
+
* you may not use this file except in compliance with
|
|
12
|
+
* the License. You may obtain a copy of the License at
|
|
13
|
+
*
|
|
14
|
+
* https://opensource.org/licenses/MIT
|
|
15
|
+
*
|
|
16
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
17
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
18
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
19
|
+
* See the License for the specific language governing permissions and
|
|
20
|
+
* limitations under the License.
|
|
21
|
+
*/
|
|
22
|
+
const common_1 = require("@routr/common");
|
|
23
|
+
const index_1 = require("./index");
|
|
24
|
+
const isTypeResponse = (request) => request.message.messageType === common_1.CommonTypes.MessageType.RESPONSE;
|
|
5
25
|
exports.isTypeResponse = isTypeResponse;
|
|
6
|
-
const isTypeRequest = (request) => !exports.isTypeResponse(request);
|
|
26
|
+
const isTypeRequest = (request) => !(0, exports.isTypeResponse)(request);
|
|
7
27
|
exports.isTypeRequest = isTypeRequest;
|
|
28
|
+
/**
|
|
29
|
+
* A request traversing a second EdgePort would have an updated the requestUri.
|
|
30
|
+
* Therefore, we are able to re-construct the Route from the request.
|
|
31
|
+
*
|
|
32
|
+
* @param {MessageRequest} request - the request
|
|
33
|
+
* @return {Route} the route
|
|
34
|
+
*/
|
|
35
|
+
function createRouteFromLastMessage(request) {
|
|
36
|
+
const uri = request.message.requestUri;
|
|
37
|
+
const sessionCount = index_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.SESSION_COUNT)
|
|
38
|
+
? parseInt(index_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.SESSION_COUNT))
|
|
39
|
+
: -1;
|
|
40
|
+
return {
|
|
41
|
+
edgePortRef: request.edgePortRef,
|
|
42
|
+
user: uri.user,
|
|
43
|
+
host: uri.host,
|
|
44
|
+
port: uri.port,
|
|
45
|
+
transport: uri.transportParam,
|
|
46
|
+
registeredOn: Date.now(),
|
|
47
|
+
sessionCount,
|
|
48
|
+
expires: index_1.Target.getTargetExpires(request),
|
|
49
|
+
listeningPoint: request.listeningPoint
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
exports.createRouteFromLastMessage = createRouteFromLastMessage;
|
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/processor.d.ts
CHANGED
|
@@ -1,9 +1,22 @@
|
|
|
1
1
|
import Response from "./response";
|
|
2
2
|
import { ProcessorConfig } from "./types";
|
|
3
|
-
import { MessageRequest } from "@routr/common";
|
|
3
|
+
import { MessageRequest, ServiceInfo } from "@routr/common";
|
|
4
|
+
/**
|
|
5
|
+
* Processor is a class that handles the processing of a request.
|
|
6
|
+
*/
|
|
4
7
|
export default class Processor {
|
|
5
8
|
config: ProcessorConfig;
|
|
6
|
-
serviceInfo:
|
|
9
|
+
serviceInfo: ServiceInfo;
|
|
10
|
+
/**
|
|
11
|
+
* Construct a new Processor.
|
|
12
|
+
*
|
|
13
|
+
* @param {ProcessorConfig} config The processor configuration
|
|
14
|
+
*/
|
|
7
15
|
constructor(config?: ProcessorConfig);
|
|
16
|
+
/**
|
|
17
|
+
* Start the processor.
|
|
18
|
+
*
|
|
19
|
+
* @param {Function} func - starts listening for incoming messages
|
|
20
|
+
*/
|
|
8
21
|
listen(func: (request: MessageRequest, response: Response) => unknown): void;
|
|
9
22
|
}
|
package/dist/processor.js
CHANGED
|
@@ -23,16 +23,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
23
23
|
*/
|
|
24
24
|
const response_1 = __importDefault(require("./response"));
|
|
25
25
|
const common_1 = require("@routr/common");
|
|
26
|
+
/**
|
|
27
|
+
* Processor is a class that handles the processing of a request.
|
|
28
|
+
*/
|
|
26
29
|
class Processor {
|
|
30
|
+
/**
|
|
31
|
+
* Construct a new Processor.
|
|
32
|
+
*
|
|
33
|
+
* @param {ProcessorConfig} config The processor configuration
|
|
34
|
+
*/
|
|
27
35
|
constructor(config = { bindAddr: "0.0.0.0:51904", name: "" }) {
|
|
28
36
|
this.config = config;
|
|
29
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* Start the processor.
|
|
40
|
+
*
|
|
41
|
+
* @param {Function} func - starts listening for incoming messages
|
|
42
|
+
*/
|
|
30
43
|
listen(func) {
|
|
31
|
-
common_1.createService({
|
|
44
|
+
(0, common_1.createService)({
|
|
32
45
|
name: this.config.name,
|
|
33
46
|
bindAddr: this.config.bindAddr,
|
|
47
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
34
48
|
service: common_1.PROCESSOR_OBJECT_PROTO.Processor.service,
|
|
35
49
|
handlers: {
|
|
50
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
36
51
|
processMessage: (call, callback) => {
|
|
37
52
|
func(call.request, new response_1.default(callback));
|
|
38
53
|
}
|
package/dist/response.d.ts
CHANGED
|
@@ -1,11 +1,46 @@
|
|
|
1
1
|
import { MessageRequest } from "@routr/common";
|
|
2
|
+
/**
|
|
3
|
+
* Response object.
|
|
4
|
+
*/
|
|
2
5
|
export default class Response {
|
|
3
|
-
callback:
|
|
4
|
-
|
|
5
|
-
|
|
6
|
+
callback: (call: unknown, response: unknown) => void;
|
|
7
|
+
/**
|
|
8
|
+
* Creates a new Response object.
|
|
9
|
+
*
|
|
10
|
+
* @param {GrpcCallback} callback - The callback to be called when the response is ready.
|
|
11
|
+
*/
|
|
12
|
+
constructor(callback: (call: unknown, response: unknown) => void);
|
|
13
|
+
/**
|
|
14
|
+
* Sends an OK response.
|
|
15
|
+
*
|
|
16
|
+
* @param {object[]} extraHeaders - Optional extra headers to be sent.
|
|
17
|
+
*/
|
|
18
|
+
sendOk(extraHeaders?: Array<{
|
|
19
|
+
name: string;
|
|
20
|
+
value: string;
|
|
21
|
+
}>): void;
|
|
22
|
+
/**
|
|
23
|
+
* Sends a method not allowed response.
|
|
24
|
+
*/
|
|
6
25
|
sendMethodNotAllowed(): void;
|
|
26
|
+
/**
|
|
27
|
+
* Sends a not found response.
|
|
28
|
+
*/
|
|
7
29
|
sendNotFound(): void;
|
|
30
|
+
/**
|
|
31
|
+
* Sends a not implemented response.
|
|
32
|
+
*/
|
|
8
33
|
sendNotImplemented(): void;
|
|
34
|
+
/**
|
|
35
|
+
* Sends a response with a SIP Message.
|
|
36
|
+
*
|
|
37
|
+
* @param {MessageRequest} message - The request message. Accepts MessageRequest or a Record.
|
|
38
|
+
*/
|
|
9
39
|
send(message: MessageRequest | Record<string, unknown>): void;
|
|
10
|
-
|
|
40
|
+
/**
|
|
41
|
+
* Sends an error response.
|
|
42
|
+
*
|
|
43
|
+
* @param {Error} error - The error to be sent.
|
|
44
|
+
*/
|
|
45
|
+
sendError(error: Error): void;
|
|
11
46
|
}
|
package/dist/response.js
CHANGED
|
@@ -1,27 +1,59 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const buildResponse = (code) => {
|
|
4
|
-
return { message: { responseType: code } };
|
|
3
|
+
const buildResponse = (code, extraHeaders) => {
|
|
4
|
+
return { message: { responseType: code, extensions: extraHeaders } };
|
|
5
5
|
};
|
|
6
|
+
/**
|
|
7
|
+
* Response object.
|
|
8
|
+
*/
|
|
6
9
|
class Response {
|
|
10
|
+
/**
|
|
11
|
+
* Creates a new Response object.
|
|
12
|
+
*
|
|
13
|
+
* @param {GrpcCallback} callback - The callback to be called when the response is ready.
|
|
14
|
+
*/
|
|
7
15
|
constructor(callback) {
|
|
8
16
|
this.callback = callback;
|
|
9
17
|
}
|
|
10
|
-
|
|
11
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Sends an OK response.
|
|
20
|
+
*
|
|
21
|
+
* @param {object[]} extraHeaders - Optional extra headers to be sent.
|
|
22
|
+
*/
|
|
23
|
+
sendOk(extraHeaders) {
|
|
24
|
+
this.callback(null, buildResponse(7, extraHeaders));
|
|
12
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Sends a method not allowed response.
|
|
28
|
+
*/
|
|
13
29
|
sendMethodNotAllowed() {
|
|
14
30
|
this.callback(null, buildResponse(21));
|
|
15
31
|
}
|
|
32
|
+
/**
|
|
33
|
+
* Sends a not found response.
|
|
34
|
+
*/
|
|
16
35
|
sendNotFound() {
|
|
17
36
|
this.callback(null, buildResponse(20));
|
|
18
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* Sends a not implemented response.
|
|
40
|
+
*/
|
|
19
41
|
sendNotImplemented() {
|
|
20
42
|
this.callback(null, buildResponse(47));
|
|
21
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Sends a response with a SIP Message.
|
|
46
|
+
*
|
|
47
|
+
* @param {MessageRequest} message - The request message. Accepts MessageRequest or a Record.
|
|
48
|
+
*/
|
|
22
49
|
send(message) {
|
|
23
50
|
this.callback(null, message);
|
|
24
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* Sends an error response.
|
|
54
|
+
*
|
|
55
|
+
* @param {Error} error - The error to be sent.
|
|
56
|
+
*/
|
|
25
57
|
sendError(error) {
|
|
26
58
|
this.callback(error, null);
|
|
27
59
|
}
|
package/dist/target.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { MessageRequest } from "@routr/common";
|
|
2
|
-
|
|
2
|
+
import { CommonTypes as CT } from "@routr/common";
|
|
3
|
+
export declare const getAOR: (uri: CT.SipURI) => string;
|
|
3
4
|
export declare const getTargetAOR: (request: MessageRequest) => string;
|
|
4
5
|
export declare const getTargetExpires: (request: MessageRequest) => number;
|
package/dist/target.js
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTargetExpires = exports.getTargetAOR = exports.getAOR = void 0;
|
|
4
|
-
const getAOR = (uri) => `${uri.secure ?
|
|
4
|
+
const getAOR = (uri) => `${uri.secure ? "sips" : "sip"}:${uri.user ? uri.user + "@" : ""}${uri.host}`;
|
|
5
5
|
exports.getAOR = getAOR;
|
|
6
|
-
const getTargetAOR = (request) => exports.getAOR(request.message.to.address.uri);
|
|
6
|
+
const getTargetAOR = (request) => (0, exports.getAOR)(request.message.to.address.uri);
|
|
7
7
|
exports.getTargetAOR = getTargetAOR;
|
|
8
8
|
const getTargetExpires = (request) => {
|
|
9
|
-
var _a, _b, _c;
|
|
9
|
+
var _a, _b, _c, _d, _e;
|
|
10
10
|
// The expires value in the Contact header takes presendence over the value
|
|
11
11
|
// on the Expires header
|
|
12
|
-
const expires = ((_b = (_a = request.message) === null || _a === void 0 ? void 0 : _a.contact) === null || _b === void 0 ? void 0 : _b.expires)
|
|
13
|
-
return expires > -1
|
|
12
|
+
const expires = (_c = (_b = (_a = request.message) === null || _a === void 0 ? void 0 : _a.contact) === null || _b === void 0 ? void 0 : _b.expires) !== null && _c !== void 0 ? _c : -1;
|
|
13
|
+
return expires > -1
|
|
14
|
+
? expires
|
|
15
|
+
: (_e = (_d = request.message.expires) === null || _d === void 0 ? void 0 : _d.expires) !== null && _e !== void 0 ? _e : -1;
|
|
14
16
|
};
|
|
15
17
|
exports.getTargetExpires = getTargetExpires;
|
package/dist/tracer.d.ts
ADDED
package/dist/tracer.js
ADDED
|
@@ -0,0 +1,53 @@
|
|
|
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
|
+
/**
|
|
34
|
+
* This function registers the instrumentations for the service.
|
|
35
|
+
*
|
|
36
|
+
* @param {string} serviceName - The name of the service.
|
|
37
|
+
* @return {Tracer} The tracer object.
|
|
38
|
+
*/
|
|
39
|
+
function init(serviceName) {
|
|
40
|
+
const provider = new sdk_trace_node_1.NodeTracerProvider({
|
|
41
|
+
resource: new resources_1.Resource({
|
|
42
|
+
[semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: serviceName
|
|
43
|
+
})
|
|
44
|
+
});
|
|
45
|
+
const exporter = new exporter_jaeger_1.JaegerExporter();
|
|
46
|
+
provider.addSpanProcessor(new sdk_trace_base_1.SimpleSpanProcessor(exporter));
|
|
47
|
+
provider.register();
|
|
48
|
+
(0, instrumentation_1.registerInstrumentations)({
|
|
49
|
+
instrumentations: [new instrumentation_grpc_1.GrpcInstrumentation()]
|
|
50
|
+
});
|
|
51
|
+
return api_1.default.trace.getTracer("routr-tracer");
|
|
52
|
+
}
|
|
53
|
+
exports.init = init;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@routr/processor",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.6-alpha.1",
|
|
4
4
|
"description": "Processor server and API",
|
|
5
5
|
"author": "Pedro Sanders <psanders@fonoster.com>",
|
|
6
6
|
"homepage": "https://github.com/fonoster/routr#readme",
|
|
@@ -12,10 +12,18 @@
|
|
|
12
12
|
"build": "tsc -b tsconfig.json"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@fonoster/logger": "
|
|
15
|
+
"@fonoster/logger": "0.3.18",
|
|
16
16
|
"@grpc/grpc-js": "^1.5.9",
|
|
17
17
|
"@grpc/proto-loader": "^0.6.9",
|
|
18
|
-
"@
|
|
18
|
+
"@opentelemetry/api": "^1.0.4",
|
|
19
|
+
"@opentelemetry/exporter-jaeger": "^1.0.4",
|
|
20
|
+
"@opentelemetry/instrumentation": "^0.27.0",
|
|
21
|
+
"@opentelemetry/instrumentation-grpc": "^0.27.0",
|
|
22
|
+
"@opentelemetry/resources": "^1.0.4",
|
|
23
|
+
"@opentelemetry/sdk-trace-base": "^1.0.4",
|
|
24
|
+
"@opentelemetry/sdk-trace-node": "^1.0.4",
|
|
25
|
+
"@opentelemetry/semantic-conventions": "^1.0.4",
|
|
26
|
+
"@routr/common": "^2.0.6-alpha.1",
|
|
19
27
|
"fp-ts": "^2.11.8"
|
|
20
28
|
},
|
|
21
29
|
"directories": {
|
|
@@ -35,5 +43,5 @@
|
|
|
35
43
|
"bugs": {
|
|
36
44
|
"url": "https://github.com/fonoster/routr/issues"
|
|
37
45
|
},
|
|
38
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "389513636bbac9ab7ffbe14f1b8ecdb5bb93bad4"
|
|
39
47
|
}
|