@routr/rtprelay 2.8.0 → 2.9.1

package/dist/client.d.ts

@@ -1,5 +1,6 @@
 import { MessageRequest } from "@routr/common";
 import { RTPEConfig, RTPEFunctionResult } from "./types";
-export declare function offer(config: RTPEConfig): (request: MessageRequest) => Promise<RTPEFunctionResult>;
-export declare function answer(config: RTPEConfig): (request: MessageRequest) => Promise<RTPEFunctionResult>;
+export declare function query(config: RTPEConfig): (request: MessageRequest) => Promise<RTPEFunctionResult>;
+export declare function offer(config: RTPEConfig, invertTags?: boolean): (request: MessageRequest) => Promise<RTPEFunctionResult>;
+export declare function answer(config: RTPEConfig, invertTags?: boolean): (request: MessageRequest) => Promise<RTPEFunctionResult>;
 export declare function del(config: RTPEConfig): (request: MessageRequest) => Promise<RTPEFunctionResult>;

package/dist/client.js

@@ -9,25 +9,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.del = exports.answer = exports.offer = void 0;
+exports.del = exports.answer = exports.offer = exports.query = void 0;
 const envs_1 = require("./envs");
 const utils_1 = require("./utils");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Client = require("rtpengine-client").Client;
 const rtpe = new Client({ timeout: envs_1.RTPENGINE_TIMEOUT });
-function offer(config) {
+function query(config) {
+    return (request) => __awaiter(this, void 0, void 0, function* () {
+        return yield rtpe.query(config, {
+            "call-id": request.message.callId.callId
+        });
+    });
+}
+exports.query = query;
+function offer(config, invertTags = false) {
     return (request) => __awaiter(this, void 0, void 0, function* () {
         const direction = (0, utils_1.getDirectionFromRequest)(request);
         const sdpModifiers = (0, utils_1.getRTPEParamsByDirection)(direction);
-        return yield rtpe.offer(config, Object.assign(Object.assign({}, sdpModifiers), { sdp: request.message.body, "call-id": request.message.callId.callId, "from-tag": request.message.from.tag }));
+        return yield rtpe.offer(config, Object.assign(Object.assign({}, sdpModifiers), { sdp: request.message.body, "call-id": request.message.callId.callId, "from-tag": invertTags ? request.message.to.tag : request.message.from.tag }));
     });
 }
 exports.offer = offer;
-function answer(config) {
+function answer(config, invertTags = false) {
     return (request) => __awaiter(this, void 0, void 0, function* () {
         const direction = (0, utils_1.getDirectionFromResponse)(request);
         const sdpModifiers = (0, utils_1.getRTPEParamsByDirection)(direction);
-        return yield rtpe.answer(config, Object.assign(Object.assign({}, sdpModifiers), { sdp: request.message.body, "call-id": request.message.callId.callId, "from-tag": request.message.from.tag, "to-tag": request.message.to.tag }));
+        return yield rtpe.answer(config, Object.assign(Object.assign({}, sdpModifiers), { sdp: request.message.body, "call-id": request.message.callId.callId, "from-tag": invertTags
+                ? request.message.to.tag
+                : request.message.from.tag, "to-tag": invertTags ? request.message.from.tag : request.message.to.tag }));
     });
 }
 exports.answer = answer;

package/dist/service.js

@@ -78,24 +78,36 @@ function rtprelay(bindAddr, rtpeConfig) {
             const direction = processor_1.Helper.isTypeResponse(req)
                 ? (0, utils_1.getDirectionFromResponse)(req)
                 : (0, utils_1.getDirectionFromRequest)(req);
-            const sendRequest = (f) => __awaiter(this, void 0, void 0, function* () {
-                const r = yield f(rtpeConfig)(req);
+            const sendRequest = (f, invertTags = false) => __awaiter(this, void 0, void 0, function* () {
+                const r = yield f(rtpeConfig, invertTags)(req);
                 if (r.result === "error") {
                     throw new common_1.CommonErrors.BadRequestError(r["error-reason"]);
                 }
                 req.message.body = r.sdp;
                 return res.send(req);
             });
-            if (processor_1.Helper.isInviteOrAckWithSDP(req)) {
+            const queryResponse = yield (0, client_1.query)(rtpeConfig)(req);
+            const isNewCall = queryResponse.result === "error";
+            logger.verbose("request", {
+                direction,
+                isNewCall,
+                type: processor_1.Helper.isTypeRequest(req) ? req.method : req.message.responseType
+            });
+            if (processor_1.Helper.isInviteWithSDP(req)) {
                 return yield sendRequest(client_1.offer);
             }
+            else if (processor_1.Helper.isAckWithSDP(req)) {
+                return yield sendRequest(client_1.answer, true);
+            }
             else if (processor_1.Helper.isRinging(req) && direction === types_1.Direction.WEB_TO_PHONE) {
                 // FIXME: This was added to prevent the ringing message from being sent to the
                 // caller while the call is being established. This is a temporary fix
                 req.message.body = "";
-                return res.send(req);
             }
-            else if (processor_1.Helper.isOkOrRingingWithSDP(req)) {
+            else if (processor_1.Helper.isResponseWithSDP(req) && isNewCall) {
+                return yield sendRequest(client_1.offer, true);
+            }
+            else if (processor_1.Helper.isResponseWithSDP(req)) {
                 return yield sendRequest(client_1.answer);
             }
             else if (processor_1.Helper.isBye(req)) {

package/dist/types.d.ts

@@ -30,4 +30,4 @@ export type RTPEFunctionResult = {
     result: "error";
     "error-reason": string;
 };
-export type RTPEFunction = (config: RTPEConfig) => (req: MessageRequest) => Promise<RTPEFunctionResult>;
+export type RTPEFunction = (config: RTPEConfig, invertTags?: boolean) => (req: MessageRequest) => Promise<RTPEFunctionResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/rtprelay",
-  "version": "2.8.0",
+  "version": "2.9.1",
   "description": "Media Relay for Routr using RTPengine",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "@fonoster/logger": "0.3.20",
+    "@grpc/grpc-js": "~1.10.1",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.4",
     "@opentelemetry/instrumentation": "^0.27.0",
@@ -28,8 +29,8 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "@routr/common": "^2.8.0",
-    "@routr/processor": "^2.8.0",
+    "@routr/common": "^2.9.1",
+    "@routr/processor": "^2.9.1",
     "rtpengine-client": "^0.4.11"
   },
   "files": [
@@ -45,5 +46,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "9756a4d85d85200f219a63e7059b32bd0ea27361"
+  "gitHead": "e9fa0c9f251b4fb694c2d7ac7c37c0958e0a9b56"
 }