bugfix

GB28181Session.js

@@ -127,10 +127,20 @@ class NodeSipSession {
         //获取设备目录
         this.catalog = await this.getCatalog();
 
+        //console.log(this.catalog);
+        let channels = "";
+        let firstChid= "";
+        for(var key in this.catalog.devicelist){
+            let chn = this.catalog.devicelist[key];
+            channels += chn.DeviceID + "=" + chn.Name + "|";
+            if(firstChid=="") firstChid = chn.DeviceID;
+        }
+        //console.log(channels);
+
         //ntv 提交状态，自动开启视频... 
         this.authModule = authModule;
         this.auto_play  = auto_play;
-        this.authModule.status(this.id,1,(data)=>{
+        this.authModule.status(this.id,1,channels,(data)=>{
             if(data.code==0){
                 Logger.log("设备在线状态已上报！");
             }else{
@@ -139,17 +149,27 @@ class NodeSipSession {
             
         });
         
-        await this.startRealPlay(this.id,auto_play);
+        //ntv 尝试自动开启视频，只开启第一个通道。 TODO: 对于硬盘录像机，应可以开启多个通道
+        await this.startRealPlay(firstChid,auto_play);
     }
 
     //ntv add 自动发realplay消息 TODO streamServer配置项增加服务器ip选项，使摄像头可以推送到其他服务器。
     async startRealPlay(channelId,auto_play) {
         let config = this.config;
-        if(config.GB28181.streamServer.enable && (auto_play || config.GB28181.streamServer.auto_play)){
-            let host = config.GB28181.sipServer.host;
-            let port = config.GB28181.streamServer.listen;
-            let mode = 1;
-            Logger.log(`[${channelId}] auto send real play message`);
+        if(auto_play || (config.GB28181.streamServer.enable && config.GB28181.streamServer.auto_play) ){
+            let host = config.GB28181.rtp_server.server;
+            let port = config.GB28181.rtp_server.port;
+            let mode = config.GB28181.rtp_server.mode;
+            if(host==""){
+                if(config.GB28181.streamServer.enable){
+                    host = config.GB28181.sipServer.host;
+                }else{
+                    Logger.log("No stream server is defined!");
+                    return;
+                }
+                
+            }
+            Logger.log(`[${channelId}] auto send real play message.`);
             this.sendRealPlayMessage(channelId,host,port,mode);
         }
     }
@@ -166,7 +186,7 @@ class NodeSipSession {
             this.isStarting = false;
             context.sessions.delete(this.id);
 
-            this.authModule.status(this.id,0,(data)=>{
+            this.authModule.status(this.id,0,"",(data)=>{
                 if(data.code==0){
                     Logger.log("设备离线状态已上报！");
                 }else{
@@ -768,7 +788,7 @@ class NodeSipSession {
 
     //预览 channelId 通道国标编码
     sendRealPlayMessage(channelId, rhost, rport, mode) {
-
+        Logger.log("Start real play " + this.id + ":" + channelId + " " + rhost + ":" + rport + " mode:" + mode);
         return new Promise((resolve, reject) => {
 
             let result = { result: true, message: 'OK' };
@@ -942,6 +962,7 @@ class NodeSipSession {
 
     //停止实时预览
     async sendStopRealPlayMessage(channelId, rhost, rport) {
+        Logger.log("Stop real play " + this.id + ":" + channelId + " " + rhost + ":" + rport);
         return new Promise((resolve, reject) => {
             let result = { result: false, message: '没有找到视频通道！' };
 

NtvAuthModule.js

@@ -102,12 +102,13 @@ class NtvAuthModule {
 	 * 
 	 * @param {*} usrId 
 	 * @param {*} status  1 = online
+	 * @param {string} channels  id=name|id=name
 	 * @param {*} callback 
 	 */
-	status(usrId,status,callback){
+	status(usrId,status,channels,callback){
 		var config = this.config;
 		var path = "/api/sipMgr/";
-		var paras= "action=sip_status&id=" + usrId +"&status=" + status;
+		var paras= "action=sip_status&id=" + usrId +"&status=" + status + "&chn=" + encodeURIComponent(channels);
 		var host = config.host;
 		var port = config.port;
 		this.postCall(host,port,path,paras,callback);

config.js

@@ -1,40 +0,0 @@
-var config = module.exports = {
-    GB28181: {
-        sipServer: {
-            ping: 60,               //心跳周期（秒）
-            ping_timeout: 3,        //最大心跳超时次数
-            expires: 3600,          //注册有效期（秒）
-            host: '8.131.101.81',   //SIP服务器通讯IP地址,如果使用内网映射到公网IP需要设置为公网IP地址
-            serial: '34020000002000000001', //SIP服务器编号
-            listen: 5060,                   //SIP通信端口
-            realm: '3402000000',            //SIP服务器域
-            password: '123456',             //默认密码
-            ack_timeout: 30                 //服务端发送ack后，接收回应的超时时间，单位为秒,如果指定时间没有回应，认为失败
-        },
-        streamServer: {
-            enable: true,         //是否启用内置流媒体服务 接收/转码/RTMP推送功能，如有支持GB PS RTP 收流服务器，可以设置为flase
-            listen: 9200,         //接收设备端rtp流的多路复用端口
-            audio_enable: false,  //是否转发音频流
-            rtp_idle_timeout: 30, //rtp包空闲等待时间，如果指定时间没有收到任何包,rtp监听连接自动停止，发送BYE命令
-            rtp_mix_port: 9300,  //rtp接收监听端口范围，最小值
-            rtp_max_port: 9400,  //rtp接收监听端口范围，最大值           
-            invite_port_fixed: true, //设备将流发送的端口，是否固定,true:发送流到多路复用端口 如9200,false:动从rtp_mix_port - rtp_max_port 之间的值中选一个可以用的端口
-            host: '0.0.0.0',         //本地地址
-            rtmpServer: 'rtmp://60.205.164.47/liveshow'  //RTMP服务器基地址
-        }
-    },
-    VAG: {
-        http: {
-            port: 82,
-            allow_origin: '*'
-        },
-        auth: {
-            api: false,          // true to open base auth
-            api_user: 'admin', //default admin
-            api_pass: 'admin', //default admin
-            play: true,
-            publish: true,
-            secret: 'nodemedia2017privatekey'
-        }
-    }
-};