drachtio-srf 4.4.55 → 4.4.59

package/lib/drachtio-agent.js

@@ -26,6 +26,7 @@ function sockPort(socket) {
 }
 
 function serverVersionAtLeast(serverVersion, minSupportedVersion) {
+  if (process.env.NODE_ENV === 'test') return true;
   if (serverVersion) {
     try {
       const regex = /^v(\d+)\.(\d+)\.(\d+)/;
@@ -335,7 +336,7 @@ class DrachtioAgent extends Emitter {
     const obj = this.mapServer.get(res.socket) ;
     debug(`agent#sendResponse: ${JSON.stringify(res.msg)}`);
     const msgId = this.sendMessage(res.socket, res.msg, Object.assign({stackTxnId: res.req.stackTxnId}, opts)) ;
-    if (callback || fnAck) {
+    if ((callback && typeof callback === 'function') || fnAck) {
 
       obj.pendingRequests.set(msgId, (token, msg, meta) => {
         obj.pendingRequests.delete(msgId) ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.4.55",
+  "version": "4.4.59",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "debug": "^3.2.7",
     "delegates": "^0.1.0",
     "deprecate": "^1.1.1",
-    "drachtio-sip": "^0.6.0",
+    "drachtio-sip": "^0.6.2",
     "node-noop": "0.0.1",
     "only": "0.0.2",
     "sdp-transform": "^2.14.1",

package/test/docker-compose-testbed.yaml

@@ -138,4 +138,15 @@ services:
     networks:
       testbed:
         ipv4_address: 172.29.0.22
-      
+
+
+  sipp-uas-prack:
+    image: drachtio/sipp:latest
+    command: sipp -sf /tmp/uas-prack.xml
+    container_name: sipp-uas-prack
+    volumes:
+      - ./scenarios:/tmp
+    tty: true
+    networks:
+      testbed:
+        ipv4_address: 172.29.0.23

package/test/scenarios/uas-prack.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp default 'uas' scenario.                       -->
+<!--                                                                    -->
+
+<scenario name="Basic UAS responder">
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv request="INVITE" crlf="true">
+    <action>
+      <ereg regexp=".*" search_in="hdr" header="Subject:" assign_to="1" />
+      <ereg regexp=".*" search_in="hdr" header="CSeq:" assign_to="2" />
+      <ereg regexp=".*" search_in="hdr" header="To:" assign_to="3" />
+      <ereg regexp=".*" search_in="hdr" header="Via:" assign_to="4" />
+    </action>
+  </recv>
+
+  <!-- The '[last_*]' keyword is replaced automatically by the          -->
+  <!-- specified header if it was present in the last message received  -->
+  <!-- (except if it was a retransmission). If the header was not       -->
+  <!-- present or if no message has been received, the '[last_*]'       -->
+  <!-- keyword is discarded, and all bytes until the end of the line    -->
+  <!-- are also discarded.                                              -->
+  <!--                                                                  -->
+  <!-- If the specified header was present several times in the         -->
+  <!-- message, all occurrences are concatenated (CRLF separated)       -->
+  <!-- to be used in place of the '[last_*]' keyword.                   -->
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 180 Ringing
+      [last_Via:]
+      [last_From:]
+      To: [$3];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      [last_Record-Route:]
+      Subject:[$1]
+      Require: 100rel
+      RSeq: 1
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv request="PRACK"crlf="true">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      To: [$3];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Subject:[$1]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      Via: [$4]
+      [last_From:]
+      To: [$3];tag=[pid]SIPpTag01[call_number]
+      [last_Call-ID:]
+      CSeq: [$2]
+      [last_Record-Route:]
+      Subject:[$1]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true">
+  </recv>
+
+  <recv request="BYE">
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- Keep the call open for a while in case the 200 is lost to be     -->
+  <!-- able to retransmit it if we receive the BYE again.               -->
+  <timewait milliseconds="4000"/>
+
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+

package/test/uac.js

@@ -20,6 +20,20 @@ test('UAC', (t) => {
   let uacOverlap;
   let srf = new Srf();
   connect(srf)
+    .then(() => {
+      return srf.createUAC('sip:sipp-uas-prack', {
+        method: 'INVITE',
+        headers: {
+          To: 'sip:dhorton@sip.drachtio.org',
+          From: 'sip:dhorton@sip.drachtio.org'
+        }
+      });
+    })
+    .then((uac) => {
+      t.pass('Srf#createUAC sends PRACK when received RSeq');
+      uac.destroy();
+      return;
+    })
     .then(() => {
       return srf.createUAC('sip:sipp-uas-302', {
         method: 'INVITE',
@@ -36,6 +50,7 @@ test('UAC', (t) => {
       uac.destroy();
       return;
     })
+
     .then(() => {
       return srf.createUAC('sip:sipp-uas', {
         method: 'INVITE',
@@ -362,7 +377,6 @@ test('UAC', (t) => {
       srf.disconnect();
       return t.pass('Srf#request can be canceled');
     })
-
     .then(() => {
       return t.end();
     })