drachtio-srf 4.5.19 → 4.5.21

package/lib/wire-protocol.js

@@ -1,7 +1,7 @@
 const Emitter = require('events');
 const net = require('net');
 const tls = require('tls');
-const uuidV4 = require('random-uuid') ;
+const uuidV4 = require('uuid-random') ;
 const debug = require('debug')('drachtio:agent');
 const noop = require('node-noop').noop;
 const CRLF = '\r\n' ;
@@ -10,9 +10,32 @@ const DEFAULT_PING_INTERVAL = 15000;
 const MIN_PING_INTERVAL = 5000;
 const MAX_PING_INTERVAL = 300000;
 
-function countSymbols(text) {
-  return [...text].length;
-}
+const containsEmoji = (str) => {
+  const regex = /[\uD800-\uDBFF][\uDC00-\uDFFF]/;
+  return regex.test(str);
+};
+
+const countSymbols = (text) => {
+  return containsEmoji(text) ? [...text].length : text.length;
+};
+
+const parseMessageLengthSpecifier = (str) => {
+  for (let i = 0; i < 5; i++) {
+    const x = str[i];
+    if (i > 0 && x === '#') {
+      return {
+        numChars: i,
+        len: parseInt(str.slice(0, i))
+      };
+    }
+    if (x < '0' || x > '9') return;
+  }
+  return str[5] === '#' ?
+    {
+      numChars: 5,
+      len: parseInt(str.slice(0, 5))
+    } : undefined;
+};
 
 module.exports = class WireProtocol extends Emitter {
 
@@ -297,11 +320,10 @@ module.exports = class WireProtocol extends Emitter {
     obj.incomingMsg += msg;
 
     // check if we have a full message to process
-    const arr = /^(\d{1,5})#/.exec(obj.incomingMsg);
-    if (arr) {
-      const msgLength = parseInt(arr[1]);
-      if (countSymbols(obj.incomingMsg) >= msgLength + arr[1].length + 1) {
-        this.processMessageBuffer(socket, obj, msgLength, arr[1].length + 1);
+    const {numChars, len} = parseMessageLengthSpecifier(obj.incomingMsg) || {};
+    if (len) {
+      if (countSymbols(obj.incomingMsg) >= len + numChars + 1) {
+        this.processMessageBuffer(socket, obj, len, numChars + 1);
       }
       return;
     }
@@ -309,6 +331,7 @@ module.exports = class WireProtocol extends Emitter {
       // split in the middle of length specifier
       return;
     }
+
     const err = new Error(`invalid message from server, did not start with length specifier: ${obj.incomingMsg}`);
     if (this.isServer) {
       console.error(`invalid client message, closing socket: ${err}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.5.19",
+  "version": "4.5.21",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "scripts": {
@@ -10,7 +10,7 @@
     "jslint": "eslint lib"
   },
   "engines": {
-    "node": ">= 6.9.3"
+    "node": ">= 10.x"
   },
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "node-noop": "^0.0.1",
     "only": "^0.0.2",
-    "random-uuid": "^1.0.2",
+    "uuid-random": "^1.3.2",
     "sdp-transform": "^2.14.1",
     "short-uuid": "^4.2.0",
     "sip-methods": "^0.3.0",

package/test/benchmark/countSymbols.js

@@ -0,0 +1,33 @@
+const Benchmark = require('benchmark');
+const suite = new Benchmark.Suite();
+const examples = require('sip-message-examples');
+const str = examples('invite');
+
+function containsEmoji(str) {
+  const regex = /[\uD800-\uDBFF][\uDC00-\uDFFF]/;
+  return regex.test(str);
+}
+
+const run = async () => {
+
+  suite
+  .add('countSymbols', () => {
+    return [...str].length;
+  })
+  .add('countSymbols after checking for emojis', () => {
+    return containsEmoji(str) ? [...str].length : str.length;
+  })
+  .add('str.length', () => {
+    return str.length;
+  })
+  .on('cycle', function (event) {
+    console.log(String(event.target))
+  })
+  .on('complete', function () {
+    console.log('Fastest is ' + this.filter('fastest').map('name'))
+    process.exit(0);
+  })
+  .run({ async: true });
+};
+
+run();

package/test/benchmark/index.js

@@ -0,0 +1,74 @@
+const exec = require('child_process').exec ;
+const Benchmark = require('benchmark');
+const suite = new Benchmark.Suite();
+const Srf4519 = require('drachtio-srf');
+const srf4519 = new Srf4519();
+const SrfLatest = require('../..');
+const srfLatest = new SrfLatest();
+
+const startEnv = async() => {
+  return new Promise((resolve, reject) => {
+    exec(`docker-compose -f ${__dirname}/../docker-compose-testbed.yaml up -d`, (err) => {
+      if (err) return reject(err);
+      resolve();
+    });
+  });
+};
+
+const connect = (srf) => {
+  return new Promise((resolve, reject) => {
+    srf.connect({
+      "host": "127.0.0.1",
+      "port": 9061,
+      "secret": "cymru",
+      "enablePing": true,
+      "pingInterval": 5000
+    });
+    srf.on('connect', () => { resolve(); });
+  });
+}
+
+const run = async () => {
+  console.log('starting docker..')
+  await startEnv();
+  console.log('connecting to drachtio server..')
+  await connect(srf4519);
+  await connect(srfLatest);
+  console.log('starting benchmark..')
+
+  suite
+  .add('drachtio-srf@4.5.19', {
+    defer: true,
+    fn: (deferred) => {
+      srf4519.request('sip:sipp-uas-options', {method: 'OPTIONS'}, (err, req) => {
+        if (err) return deferred.reject(err);
+        req.on('response', (res) => {
+          deferred.resolve();
+        });
+      });
+    }
+  })
+  /*
+  .add('drachtio-srf@latest', {
+    defer: true,
+    fn: (deferred) => {
+      srfLatest.request('sip:sipp-uas-options', {method: 'OPTIONS'}, (err, req) => {
+        if (err) return deferred.reject(err);
+        req.on('response', (res) => {
+          deferred.resolve();
+        });
+      });
+    }
+  })
+  */
+  .on('cycle', function (event) {
+    console.log(String(event.target))
+  })
+  .on('complete', function () {
+    console.log('Fastest is ' + this.filter('fastest').map('name'))
+    process.exit(0);
+  })
+  .run({ async: true });
+};
+
+run();