修改API规则中

api/controllers/vag.js

@@ -1,18 +1,51 @@
-
+/**
+ * 将数据打包成ntv接口返回格式
+ * @param {json} msg 
+ */
+function ntvMsg(msg){
+    if("result" in msg){
+        msg.code     = msg.result?0:1;
+        delete msg.result;
+    }
+    if("message" in msg){
+        msg.err_desc = msg.message;
+        delete msg.message;
+    }
+    
+    return msg;
+}
 //获取所有SIP会话
 function getSessions(req, res, next) {
-    let sessions = {};
-
+    let result = { code: 0, err_desc: 'OK' ,data:{}};
+    let items  = [];
+    let index  = 0;
     this.sessions.forEach(function (session, id) {
         if (session.TAG === 'sip')
-            sessions[session.id] = { host: session.via.host, port: session.via.port, info: session.deviceinfo, status: session.devicestatus, catalog: session.catalog };
+            items[index++] = { id:session.id,host: session.via.host, port: session.via.port, info: session.deviceinfo, status: session.devicestatus, catalog: session.catalog, playmode:session.playmode };
     });
-
-    res.json(sessions);
+    result.data.count=index;
+    result.data.items=items;
+    res.json(result);
 }
 
 //获取指定设备ID的目录数据
+//改造成返回某个设备的信息
 function getCatalog(req, res) {
+    let result = { code: 1, err_desc: 'OK' };
+    if (this.sessions.has(req.params.device)) {
+        let session = this.sessions.get(req.params.device);
+        result.code = 0;
+        result.data = {};
+        result.data.count=1;
+        result.data.items = [{ id:session.id, host: session.via.host, port: session.via.port, info: session.deviceinfo, status: session.devicestatus, catalog: session.catalog, playmode:session.playmode }];
+    }
+    else {
+        result.err_desc = '设备不在线或没有注册！';
+    }
+    res.json(result);
+}
+//原有版本
+/*function getCatalog(req, res) {
     let result = { result: false, message: 'OK' };
     if (this.sessions.has(req.params.device)) {
         let session = this.sessions.get(req.params.device);
@@ -24,7 +57,7 @@ function getCatalog(req, res) {
         result.message = 'device not online.';
     }
     res.json(result);
-}
+}*/
 
 //预览请求
 async function realplay(req, res) {
@@ -69,7 +102,7 @@ async function realplay(req, res) {
         result.result = false;
         result.message = 'device not online.';
     }
-    res.json(result);
+    res.json(ntvMsg(result));
 }
 
 //回看请求
@@ -113,7 +146,7 @@ async function playback(req, res) {
         result.result = false;
         result.message = 'device not online';
     }
-    res.json(result);
+    res.json(ntvMsg(result));
 }
 
 //回看播放控制
@@ -140,7 +173,7 @@ async function playControl(req, res) {
         result.result = false;
         result.message = 'device not online.';
     }
-    res.json(result);
+    res.json(ntvMsg(result));
 }
 
 //云台控制
@@ -169,7 +202,7 @@ function ptzControl(req, res) {
         result.result = false;
         result.message = 'device not online.';
     }
-    res.json(result);
+    res.json(ntvMsg(result));
 }
 
 //录像文件查询
@@ -209,7 +242,7 @@ async function recordQuery(req, res) {
         result.result = false;
         result.message = 'device not online.';
     }
-    res.json(result);
+    res.json(ntvMsg(result));
 }
 
 //关闭流
@@ -258,7 +291,7 @@ function closeStream(req, res) {
         }
     }
 
-    res.json(result);
+    res.json(ntvMsg(result));
 }
 
 function _prefixInteger(num, m) {

api/server.js

@@ -30,12 +30,14 @@ class NodeHttpServer {
       app.use('/api/*', basicAuth(this.config.VAG.auth.api_user, this.config.VAG.auth.api_pass));
     }
 
-    app.use('/api/v1/vag', vagRoute(context));
+    // ntv 简化
+    //app.use('/api/v1/vag', vagRoute(context));
+    app.use('/api', vagRoute(context));
 
     app.get('/', (req, res, next) => {
       res.setHeader('Content-type', 'application/json');
-      res.setHeader('Server', 'VAG');
-      res.send('{"success":true,"name":"YTMS-VAG 网关","version":"1.0.0.0"}');
+      res.setHeader('Server', 'ntv-api-server on www.ruiboyun.com');
+      res.send('{"success":true,"name":"api server","version":"1.1"}');
       res.end();
     });
 
@@ -44,15 +46,15 @@ class NodeHttpServer {
 
   run() {
     this.httpServer.listen(this.port, () => {
-      Logger.log(`Node Media Http Server started on port: ${this.port}`);
+      Logger.log(`Http API Server started on port: ${this.port}`);
     });
 
     this.httpServer.on('error', (e) => {
-      Logger.error(`Node Media Http Server ${e}`);
+      Logger.error(`Http API Server ${e}`);
     });
 
     this.httpServer.on('close', () => {
-      Logger.log('Node Media Http Server Close.');
+      Logger.log('Http API Server Close.');
     });
   }