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

package/dist/alterations.d.ts

@@ -1,13 +1,13 @@
 import { MessageRequest, Route } from "@routr/common";
 export declare const updateRequestURI: (route: Route) => (request: MessageRequest) => MessageRequest;
 export declare const addSelfVia: (route: Route) => (request: MessageRequest) => MessageRequest;
-export declare const addRoute: (route: Route) => (request: MessageRequest) => MessageRequest;
+export declare const addRouteToNextHop: (route: Route) => (request: MessageRequest) => MessageRequest;
 export declare const addRouteToPeerEdgePort: (route: Route) => (request: MessageRequest) => MessageRequest;
 export declare const applyXHeaders: (route: Route) => (request: MessageRequest) => MessageRequest;
 export declare const addSelfRecordRoute: (route: Route) => (request: MessageRequest) => MessageRequest;
 export declare const addXEdgePortRef: (request: MessageRequest) => MessageRequest;
 export declare const removeXEdgePortRef: (request: MessageRequest) => MessageRequest;
 export declare const removeAuthorization: (request: MessageRequest) => MessageRequest;
-export declare const removeRoutes: (request: MessageRequest) => MessageRequest;
+export declare const removeSelfRoutes: (request: MessageRequest) => MessageRequest;
 export declare const removeTopVia: (request: MessageRequest) => MessageRequest;
 export declare const decreaseMaxForwards: (request: MessageRequest) => MessageRequest;

package/dist/alterations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decreaseMaxForwards = exports.removeTopVia = exports.removeRoutes = exports.removeAuthorization = exports.removeXEdgePortRef = exports.addXEdgePortRef = exports.addSelfRecordRoute = exports.applyXHeaders = exports.addRouteToPeerEdgePort = exports.addRoute = exports.addSelfVia = exports.updateRequestURI = void 0;
+exports.decreaseMaxForwards = exports.removeTopVia = exports.removeSelfRoutes = exports.removeAuthorization = exports.removeXEdgePortRef = exports.addXEdgePortRef = exports.addSelfRecordRoute = exports.applyXHeaders = exports.addRouteToPeerEdgePort = exports.addRouteToNextHop = exports.addSelfVia = exports.updateRequestURI = void 0;
 /*
  * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -38,13 +38,16 @@ const updateRequestURI = (route) => (request) => {
 exports.updateRequestURI = updateRequestURI;
 const addSelfVia = (route) => (request) => {
     const req = common_1.Helper.deepCopy(request);
-    const routingObjects = request.edgePortRef === route.edgePortRef ? request : route;
+    const routingObjects = request.edgePortRef === route.edgePortRef ? route : request;
     const targetIntf = (0, helper_1.getEdgeInterface)(Object.assign(Object.assign({}, routingObjects), { endpointIntf: route }));
     req.message.via = [Object.assign({}, targetIntf), ...req.message.via];
     return req;
 };
 exports.addSelfVia = addSelfVia;
-const addRoute = (route) => (request) => {
+const addRouteToNextHop = (route) => (request) => {
+    if (request.message.requestUri.host === route.host) {
+        return request;
+    }
     const req = common_1.Helper.deepCopy(request);
     const r = {
         address: {
@@ -59,7 +62,7 @@ const addRoute = (route) => (request) => {
     req.message.route = [r, ...req.message.route];
     return req;
 };
-exports.addRoute = addRoute;
+exports.addRouteToNextHop = addRouteToNextHop;
 const addRouteToPeerEdgePort = (route) => (request) => {
     const req = common_1.Helper.deepCopy(request);
     const targetIntf = (0, helper_1.getEdgeInterface)({
@@ -175,7 +178,7 @@ const removeAuthorization = (request) => {
     return req;
 };
 exports.removeAuthorization = removeAuthorization;
-const removeRoutes = (request) => {
+const removeSelfRoutes = (request) => {
     const req = common_1.Helper.deepCopy(request);
     const localIps = request.localnets.map((ln) => ln.split("/")[0]);
     req.message.route = req.message.route.filter((r) => {
@@ -189,7 +192,7 @@ const removeRoutes = (request) => {
     });
     return req;
 };
-exports.removeRoutes = removeRoutes;
+exports.removeSelfRoutes = removeSelfRoutes;
 const removeTopVia = (request) => {
     const req = common_1.Helper.deepCopy(request);
     req.message.via.shift();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/processor",
-  "version": "2.0.8-alpha.11",
+  "version": "2.0.8-alpha.13",
   "description": "Processor server and API",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -23,7 +23,7 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "@routr/common": "^2.0.8-alpha.11",
+    "@routr/common": "^2.0.8-alpha.13",
     "fp-ts": "^2.11.8"
   },
   "directories": {
@@ -43,5 +43,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "627659ac51d0814a3106bcaac31a15c581a5809f"
+  "gitHead": "d866d6c03c5ea7e8fc3ee074804005df3a5be42f"
 }