BugFix

GB28181Server.js

@@ -219,6 +219,12 @@ class NodeSIPServer {
                 //刷新过期时间
                 session.expires = expires || this.expires;
 
+                //ntv add
+                if(session.host != remote.address || session.port != remote.port){
+                    session.updateRemote({ request: request, info: remote });
+                    Logger.log(`[${userId}] device host changed. ${session.host}:${session.port} ---> ${remote.address}:${remote.port} `);
+                }
+
                 Logger.log(`[${userId}] device register refresh.`);
             }
             else {

GB28181Session.js

@@ -27,7 +27,7 @@ class NodeSipSession {
                 this.expires = this.request.headers.expires;
         }
 
-        //主机通讯地址&端口 
+        //远程监控设备的主机通讯地址&端口 
         this.host = remote.info.address;
 
         this.port = remote.info.port;
@@ -75,6 +75,25 @@ class NodeSipSession {
         context.sessions.set(this.id, this);
     }
 
+    //ntv add 更新远程设备信息
+    updateRemote(remote){
+        this.request = remote.request;
+        this.protocol = remote.info.protocol;
+        //注册请求
+        if (this.request && this.request.headers) {
+
+            if (this.request.headers.via[0])
+                this.via = this.request.headers.via[0];
+
+            //过期时间 
+            if (this.request.headers.expires)
+                this.expires = this.request.headers.expires;
+        }
+
+        //主机通讯地址&端口 
+        this.host = remote.info.address;
+        this.port = remote.info.port;
+    }
     //启动
     async run(authModule,auto_play) {
 
@@ -760,7 +779,7 @@ class NodeSipSession {
 
             for (var key in this.dialogs) {
                 let session = this.dialogs[key];
-                if (session.bye && session.port === rport && session.host === rhost && session.channelId === channelId && session.play === 'realplay') {
+                if (session.bye && session.port == rport && session.host == rhost && session.channelId == channelId && session.play == 'realplay') {
                     isFinded = true;
                     findssrc = session.ssrc;
                     break;
@@ -778,10 +797,10 @@ class NodeSipSession {
 
             //ssrc is here  -- by ntv wangjian
             //let ssrc = "0" + channelId.substring(16, 20) + channelId.substring(3, 8);
-            let ssed = channelId.substring(13);
-            let ised = '' + (parseInt(ssed)*13+10000);
-            let ssrc = "1" + ssed + ised.substring(ised.length-2);
- 
+            let sub1 = 10000 + parseInt(this.id.substring(15));
+            let sub2 = channelId.substring(15);
+            let ssrc = '' + sub1 + sub2;
+
             let host = rhost || "127.0.0.1";
 
             let port = rport || 9200;
@@ -857,6 +876,9 @@ class NodeSipSession {
 
                                     context.nodeEvent.emit('sdpReceived', sdp);
 
+                                    //add ntv
+                                    context.ssrcs.set(ssrc,{id:that.id,chid:channelId,play:'realplay'});
+
                                     //Step 7 SIP服务器收到媒体流发送者返回200 OK响应后，向 媒体流发送者 发送 ACK请求，请求中不携带消息体，完成与媒体流发送者的invite会话建立过程
                                     that.uas.send({
                                         method: 'ACK',
@@ -888,6 +910,9 @@ class NodeSipSession {
                                         }
 
                                         that.dialogs[key] = { channelId: channelId, ssrc: ssrc, host: host, port: port, bye: byeRequest, play: 'realplay' };
+                                        
+                                        //console.log("BYE INFO:");
+                                        //console.log(that.dialogs[key]);
                                     }
 
                                     result.data = { ssrc: ssrc };
@@ -924,13 +949,17 @@ class NodeSipSession {
                 //搜索满足条件的会话
                 let session = this.dialogs[key];
                 //ntv  注释掉多余条件，因为数据类型不同导致找不到
-                if (session.bye /*&& session.port === rport && session.host === rhost */ && session.channelId === channelId && session.play === 'realplay') {
+                if (session.bye && session.port == rport && session.host == rhost && session.channelId == channelId && session.play == 'realplay') {
                     //ntv 挪到回调中，TODO 这个指令发不成功！
                     //context.nodeEvent.emit('stopPlayed', session.ssrc);
+                    
+                    //add by ntv  强制更新uri地址，因为终端地址会变。
+                    session.bye.uri = 'sip:' + this.id + '@' + this.host + ':' + this.port;
+
                     this.uas.send(session.bye, (response) => {
                         Logger.log(`[${this.id}] StopRealPlay status=${response.status}`);
                         
-                        if(response.status==200){
+                        //if(response.status==200){  //ntv 注释20210127
                             /** 
                             ntv remove rtp连接断开时再emit这条消息，放到了stream/session中执行
                             */
@@ -944,7 +973,7 @@ class NodeSipSession {
                                 }
                                 
                             });
-                        }
+                        //}
                     });
 
                     //ntv

core/ctx.js

@@ -12,4 +12,7 @@ let stat = {
   outbytes: 0,
   accepted: 0
 };
-module.exports = { sessions, publishers, nodeEvent, stat };
+
+let ssrcs = new Map();   //ssrc和注册用户映射关系表，键是ssrc, 值是 {id,chid,play}
+
+module.exports = { sessions, publishers, nodeEvent, stat , ssrcs};

stream/server.js

@@ -76,6 +76,11 @@ class NodeGB28181StreamServer {
                 context.publishers.delete(key);
                 Logger.log("rtmp session removed ",ssrc);
             }
+            if(context.ssrcs.has(key)){
+                //console.log(context.ssrcs.get(key));
+                context.ssrcs.delete(key);
+                Logger.log("ssrc session removed ",ssrc);
+            }
         });
 
         //ntv add 上一个函数主动关闭，或网络异常，或其他原因关闭rtmp

stream/session.js

@@ -130,7 +130,7 @@ class NodeGB28181StreamServerSession {
 		//ntv-wangjian
         //Logger.log(`[${ssrc}] RTP Packet: timestamp:${timestamp} seqNumber:${seqNumber} length:${playload.length} `);
         //ntv add
-        if(!that.ssrc){
+        if(that && !that.ssrc){
             that.ssrc = ssrc;
         }