@routr/connect 2.0.8-alpha.11 → 2.0.8-alpha.13

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.
Files changed (4) hide show
  1. package/dist/handlers.js +4 -2
  2. package/dist/router.js +10 -4
  3. package/dist/tailor.js +2 -3
  4. package/package.json +5 -5
package/dist/handlers.js CHANGED
@@ -71,7 +71,7 @@ exports.handleRegister = handleRegister;
71
71
  // TODO: Needs test
72
72
  const handleRegistry = (req, res) => {
73
73
  const route = processor_1.Helper.createRouteFromLastMessage(req);
74
- res.send((0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeRoutes, processor_1.Alterations.removeXEdgePortRef));
74
+ res.send((0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeSelfRoutes, processor_1.Alterations.removeXEdgePortRef));
75
75
  };
76
76
  exports.handleRegistry = handleRegistry;
77
77
  // TODO: If request has X-Connect-Token then validate the JWT value and continue
@@ -89,7 +89,9 @@ const handleRequest = (location, dataAPI) => (req, res) => __awaiter(void 0, voi
89
89
  else {
90
90
  // Forward request to peer edgeport
91
91
  if (req.edgePortRef !== route.edgePortRef) {
92
- return res.send((0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.addRouteToPeerEdgePort(route), processor_1.Alterations.addXEdgePortRef, processor_1.Alterations.decreaseMaxForwards));
92
+ return res.send((0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.addSelfRecordRoute(route),
93
+ // The order of the routes is important
94
+ processor_1.Alterations.addRouteToPeerEdgePort(route), processor_1.Alterations.addRouteToNextHop(route), processor_1.Alterations.addXEdgePortRef, processor_1.Alterations.decreaseMaxForwards));
93
95
  }
94
96
  res.send((0, tailor_1.tailor)(route, req));
95
97
  }
package/dist/router.js CHANGED
@@ -40,15 +40,21 @@ const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filenam
40
40
  // eslint-disable-next-line require-jsdoc
41
41
  function router(location, dataAPI) {
42
42
  return (request) => __awaiter(this, void 0, void 0, function* () {
43
+ var _a;
43
44
  const fromURI = request.message.from.address.uri;
44
45
  const requestURI = request.message.requestUri;
45
- logger.verbose("routing request from: " +
46
- (0, utils_1.getSIPURI)(fromURI) +
47
- ", to: " +
48
- (0, utils_1.getSIPURI)(requestURI), { fromURI: (0, utils_1.getSIPURI)(fromURI), requestURI: (0, utils_1.getSIPURI)(requestURI) });
49
46
  const caller = yield (0, utils_1.findResource)(dataAPI, fromURI.host, fromURI.user);
50
47
  const callee = yield (0, utils_1.findResource)(dataAPI, requestURI.host, requestURI.user);
51
48
  const routingDirection = (0, utils_1.getRoutingDirection)(caller, callee);
49
+ logger.verbose("routing request from: " +
50
+ (0, utils_1.getSIPURI)(fromURI) +
51
+ ", to: " +
52
+ (0, utils_1.getSIPURI)(requestURI), {
53
+ fromURI: (0, utils_1.getSIPURI)(fromURI),
54
+ requestURI: (0, utils_1.getSIPURI)(requestURI),
55
+ routingDirection,
56
+ sessionAffinityHeader: (_a = callee === null || callee === void 0 ? void 0 : callee.spec.location) === null || _a === void 0 ? void 0 : _a.sessionAffinityHeader
57
+ });
52
58
  if (request.method === common_1.CommonTypes.Method.INVITE) {
53
59
  const failedCheck = yield (0, access_1.checkAccess)({
54
60
  dataAPI,
package/dist/tailor.js CHANGED
@@ -22,7 +22,6 @@ exports.tailor = void 0;
22
22
  const processor_1 = require("@routr/processor");
23
23
  const function_1 = require("fp-ts/function");
24
24
  // Q: Should we add support for strict routing?
25
- const tailor = (route, req) => (0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.applyXHeaders(route), processor_1.Alterations.addRoute(route), processor_1.Alterations.addSelfRecordRoute(route), processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeRoutes, processor_1.Alterations.removeXEdgePortRef
26
- // Add updateContact for SIP.js support
27
- );
25
+ // TODO: Add updateContact for SIP.js support
26
+ const tailor = (route, req) => (0, function_1.pipe)(req, processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeSelfRoutes, processor_1.Alterations.removeXEdgePortRef, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.applyXHeaders(route), processor_1.Alterations.addSelfRecordRoute(route), processor_1.Alterations.addRouteToNextHop(route));
28
27
  exports.tailor = tailor;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@routr/connect",
3
- "version": "2.0.8-alpha.11",
3
+ "version": "2.0.8-alpha.13",
4
4
  "description": "Default processor",
5
5
  "author": "Pedro Sanders <psanders@fonoster.com>",
6
6
  "homepage": "https://github.com/fonoster/routr#readme",
@@ -28,9 +28,9 @@
28
28
  "@opentelemetry/sdk-trace-base": "^1.0.4",
29
29
  "@opentelemetry/sdk-trace-node": "^1.0.4",
30
30
  "@opentelemetry/semantic-conventions": "^1.0.4",
31
- "@routr/common": "^2.0.8-alpha.11",
32
- "@routr/location": "^2.0.8-alpha.11",
33
- "@routr/processor": "^2.0.8-alpha.11"
31
+ "@routr/common": "^2.0.8-alpha.13",
32
+ "@routr/location": "^2.0.8-alpha.13",
33
+ "@routr/processor": "^2.0.8-alpha.13"
34
34
  },
35
35
  "files": [
36
36
  "dist"
@@ -45,5 +45,5 @@
45
45
  "bugs": {
46
46
  "url": "https://github.com/fonoster/routr/issues"
47
47
  },
48
- "gitHead": "627659ac51d0814a3106bcaac31a15c581a5809f"
48
+ "gitHead": "d866d6c03c5ea7e8fc3ee074804005df3a5be42f"
49
49
  }