sip-lab 1.12.14 → 1.12.19

package/DEV.md

@@ -28,3 +28,8 @@ npm install
 Then perform code changes and tests. When you are satisfied with them, update install.sh with the new commit id.
 
 
+#### Running tests
+```
+npm test
+```
+

package/README.md

@@ -37,6 +37,11 @@ However since it takes several minutes to build this module, you can install it
 npm install -g sip-lab
 ```
 
+But if you do so, you will need to set NODE_PATH for node to find it by doing:
+```
+  export NODE_PATH=$(npm root --quiet -g)
+```
+
 To test from within this repo just build and install by doing:
 ```
   npm install -g node-gyp

package/install.sh

@@ -8,7 +8,7 @@ set -o pipefail
 START_DIR=`pwd`
 
 
-mkdir -p 3rdParty
+mkdir -p $START_DIR/3rdParty
 
 
 cd $START_DIR/3rdParty

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.12.14",
+  "version": "1.12.19",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -19,13 +19,10 @@
   "gypfile": true,
   "homepage": "https://github.com/MayamaTakeshi/sip-lab",
   "dependencies": {
-    "node-addon-api": "^1.7.2",
-    "node-gyp": "^8.4.1"
-  },
-  "devDependencies": {
     "@mayama/zeq": "^4.1.14",
-    "data-matching": "^1.23.8",
-    "sip-matching": "^1.3.31",
-    "string-matching": "^1.11.9"
+    "data-matching": "^1.24.0",
+    "node-addon-api": "^1.7.2",
+    "node-gyp": "^8.4.1",
+    "sip-matching": "^1.3.31"
   }
 }

package/samples/g729.js

@@ -42,11 +42,11 @@ async function test() {
                 $rs: '100',
                 $rr: 'Trying',
                 '$(hdrcnt(via))': 1,
-                '$hdr(call-id)': m.collect('sip_call_id'),
+                'hdr_call_id': m.collect('sip_call_id'),
                 $fU: 'alice',
                 $fd: 'test.com',
                 $tU: 'bob',
-                '$hdr(l)': '0',
+                'hdr_l': '0',
             }),
         },
     ], 1000)
@@ -84,7 +84,7 @@ async function test() {
                 $fU: 'alice',
                 $fd: 'test.com',
                 $tU: 'bob',
-                '$hdr(content-type)': 'application/sdp',
+                'hdr_content_type': 'application/sdp',
                 $rb: '!{_}a=sendrecv',
             }),
         },

package/samples/register_subscribe.js

@@ -48,7 +48,7 @@ async function test() {
                 $tU: 'user1',
                 $td: domain,
                 '$hdr(X-MyHeader1)': 'aaa',
-                '$hdr(X-MyHeader2)': 'bbb',
+                'hdr_x_myheader2': 'bbb',
             }),
         },
     ], 1000)
@@ -79,7 +79,9 @@ async function test() {
             },
     })
 
-    sip.subscription.subscribe(s1, {expires: 120})
+    const sub_expires = 120 
+
+    sip.subscription.subscribe(s1, {expires: sub_expires})
 
     await z.wait([
         {
@@ -91,8 +93,8 @@ async function test() {
                 $fU: 'user1',
                 $fd: domain,
                 '$hdr(Event)': 'dialog',
-                '$hdr(Accept)': 'application/dialog-info+xml',
-                '$hdr(Allow-Events)': 'refer, dialog',
+                'hdr_accept': 'application/dialog-info+xml',
+                'hdr_allow_events': 'refer, dialog',
             })
         },
     ], 1000)
@@ -116,14 +118,15 @@ async function test() {
             subscription_id: s1,
             msg: sip_msg({
                 $rm: 'NOTIFY',
-                '$hdr(Event)': 'dialog',
-                '$hdr(Subscription-State)': 'active;expires=!{sub_expires}',
+                'hdr_event': 'dialog',
+                '$hdr(Subscription-State)': 'active;expires=!{sub_expires:num}',
                 '$hdr(Allow-Events)': 'refer, dialog',
             }),
         },
     ], 1000)
 
-    assert(parseInt(z.store.sub_expires) > 0)
+    // Subscription-State expires will be computed by pjsip. It might not be the exact value of sub_expires due to latence so we give 2 seconds of tolerance
+    assert(z.store.sub_expires > (sub_expires - 2))
 
     sip.account.unregister(a1)
 

package/samples/tcp_and_extra_headers.js

@@ -40,7 +40,7 @@ async function test() {
                 $fd: 'test.com',
                 $tU: 'bob',
                 '$hdr(X-MyHeader1)': 'abc',
-                '$hdr(X-MyHeader2)': 'def',
+                'hdr_x_myheader2': 'def',
             }),
         },
         {
@@ -51,7 +51,7 @@ async function test() {
                 $rs: '100',
                 $rr: 'Trying',
                 '$(hdrcnt(via))': 1,
-                '$hdr(call-id)': m.collect('sip_call_id'),
+                'hdr_call_id': m.collect('sip_call_id'),
                 $fU: 'alice',
                 $fd: 'test.com',
                 $tU: 'bob',
@@ -96,7 +96,7 @@ async function test() {
             msg: sip_msg({
                 $rs: '200',
                 $rr: 'OK',
-                '$(hdrcnt(VIA))': 1,
+                '$(hdrcnt(v))': 1,
                 $fU: 'alice',
                 $fd: 'test.com',
                 $tU: 'bob',