sipware - npm Package Compare versions

Comparing version 0.1.14 to 0.1.15

index.js

@@ -5,3 +5,2 @@ var Router = require('./lib/router');
 var Client = require('./lib/client');
-var Trunk = require('./lib/trunk');
 var Protocol = require('./lib/protocol');
@@ -34,4 +33,3 @@ var Message = require('./lib/message');
   Message: Message,
-  Trunk: Trunk,
   Ua: Ua,
 }

lib/client.js

@@ -8,5 +8,9 @@ var net = require('net');
 class Client extends EventEmitter {
-  constructor(consumer, options) {
+  constructor(consumer) {
     super();
     this.consumer = consumer;
+  }
+
+  connect(options) {
+    var buf = Buffer.concat([]);
     this.opts = options;
@@ -19,10 +23,5 @@
     }
-  }
 
-  connect() {
-    var buf = Buffer.concat([]);
-
     this.client = this.srv.connect(this.opts, () => {
-      this.trunk.socket = this.client;
-      this.consumer.connect();
+      console.log('open connection:'+JSON.stringify(this.opts));
     })
@@ -33,3 +32,3 @@
       data = Buffer.concat([buf, data], buf.length + data.length);
-      var leftover = await this.consumer.read({data, trunk: this.trunk, options: this.opts});
+      var leftover = await this.consumer.read({data, options: this.opts});
 
@@ -60,10 +59,2 @@ if(leftover && leftover.length) {
 
-  set trunk(trunk) {
-    this._trunk_ = trunk;
-  }
-
-  get trunk() {
-    return this._trunk_;
-  }
-
   write(data) {
@@ -70,0 +61,0 @@ this.client.write(data);

lib/message.js

 class Message {
   constructor(data) {
-    this.trunk = data.trunk;
+    this.ua = data.ua;
   }
@@ -5,0 +5,0 @@ }

lib/router.js

@@ -105,3 +105,3 @@ var net = require('net');
     while(true) {
-      var {messages, trunk} = yield;
+      var {messages} = yield;
       this.scan(messages);
@@ -108,0 +108,0 @@ }

lib/server.js

@@ -20,4 +20,9 @@ var path = require('path');
       var buf = Buffer.concat([]);
+      var ua = await consumer.acceptChain({socket, options});
+
+      if(!ua) {
+        return socket.destroy();
+      }
+
       socks.push(socket);
-      var trunk = await consumer.acceptChain({socket, options});
 
@@ -28,3 +33,3 @@ socket.on('data', async (data) => {
         data = Buffer.concat([buf, data], buf.length + data.length);
-        var leftover = await consumer.read({data, trunk, options})
+        var leftover = await consumer.read({data, ua, options})
 
@@ -41,3 +46,3 @@ if(leftover && leftover.length) {
         console.log('socket error: '+err);
-        consumer.declineChain(trunk);
+        consumer.declineChain(ua);
       })
@@ -47,3 +52,3 @@
         console.log('socket end');
-        consumer.declineChain(trunk);
+        consumer.declineChain(ua);
       })
@@ -50,0 +55,0 @@

lib/ua.js

 var util = require('util');
+var Client = require('./client');
 var EventEmitter = require('events');
@@ -14,2 +15,9 @@ var Transaction = require('./transaction');
 
+  connect(opts) {
+    console.log('UA CONNECT');
+    this.opts = opts;
+    this.client = new Client(this);
+    this.client.connect(opts);
+  }
+
   set client(client) {
@@ -30,7 +38,3 @@ console.log('UA SET CLIENT');
 
-  connect() {
-    console.log('UA CONNECT::'+this.trunk);
-  }
-
-  _incoming_({id, msg, trunk}) {
+  _incoming_({id, msg}) {
     console.log('INCOMING:', id)
@@ -44,8 +48,8 @@
       } else if(msg.headers.code) {
-        this.emit('invalid', {req: msg, trunk});
+        this.emit('invalid', {req: msg});
       } else {
-        this.emit('request', {req: msg, trunk});
+        this.emit('request', {req: msg});
       }
     } else {
-      this.emit('notification', {msg, trunk});
+      this.emit('notification', {msg});
     }
@@ -56,2 +60,14 @@ }
 
+  set session(session) {
+    this._session_ = session;
+  }
+
+  get session() {
+    return this._session_;
+  }
+
+  send(headers, content) {
+    this.client.write(this.write({headers, content}));
+  }
+
   async _request_(headers, content, ttl) {
@@ -58,0 +74,0 @@ var req = {headers, content};

package.json

@@ -60,3 +60,3 @@ {
   "optionalDependencies": {},
-  "version": "0.1.14",
+  "version": "0.1.15",
   "directories": {
@@ -63,0 +63,0 @@ "lib": "lib"

No alert changes

Worsened metrics

Total package byte prevSize

52312

decreased by-0.94%

Number of package files

13

decreased by-7.14%

Lines of code

576

decreased by-4%

No dependency changes