pubo-node 1.0.5-alpha.0 → 1.0.6-alpha.0

package/dist/pubo-node.js

@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports["pubo-node"]=e():t["pubo-node"]=e()}(this,(function(){return function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=4)}([function(t,e){t.exports=require("pubo-utils")},function(t,e){t.exports=require("express-ws")},function(t,e){t.exports=require("child_process")},function(t,e){t.exports=require("crypto")},function(t,e,n){"use strict";n.r(e),n.d(e,"initRtspVideos",(function(){return f})),n.d(e,"md5",(function(){return r}));var o=n(3),r=function(t){return Object(o.createHash)("md5").update(t).digest("hex")},i=n(1),u=n(2),c=n(0),s=function(){function t(t){var e=this;this.eventEmitter=new c.Emitter,this.dog=new c.WatchDog({limit:10,onTimeout:function(){return e.connect()}}),this.url=t,this.connect(),this.dog.init()}return t.prototype.onMessage=function(t){this.dog.feed(),this.eventEmitter.emit("message",t.toString())},t.prototype.closeOld=function(){this.s&&(console.log("LOG Video-Server: "+this.url+" try to reconnect;"),this.s.kill(),this.s=null)},t.prototype.connect=function(){var t=this;this.closeOld();var e=["-rtsp_transport","tcp","-i",this.url,"-f","mpegts","-codec:v","mpeg1video","-"];this.s=Object(u.spawn)("ffmpeg",e,{detached:!1}),this.s.stderr.on("data",(function(e){return t.onMessage(e)})),this.s.stdout.on("data",(function(e){return t.eventEmitter.emit("data",e)}))},t.prototype.on=function(t,e){return this.eventEmitter.on(t,e)},t.prototype.cancel=function(t){this.eventEmitter.cancel(t)},t}(),f=function(t){var e=t.app,n=t.server,o=t.videos,r=t.path,u=o.map((function(t){return new s(t)}));return i(e,n),e.ws(r,(function(t,e){var n=e.query.channel,o=void 0===n?0:n,r=null;u[o]&&(r=u[o].on("data",(function(e){t.send(e)}))),t.on("close",(function(){r&&u[o].cancel(r)}))})),u}}])}));
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports["pubo-node"]=e():t["pubo-node"]=e()}(this,(function(){return function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=3)}([function(t,e){t.exports=require("pubo-utils")},function(t,e){t.exports=require("child_process")},function(t,e){t.exports=require("crypto")},function(t,e,n){"use strict";n.r(e),n.d(e,"initRtspVideos",(function(){return s})),n.d(e,"md5",(function(){return r}));var o=n(2),r=function(t){return Object(o.createHash)("md5").update(t).digest("hex")},i=n(1),u=n(0),c=function(){function t(t){var e=this;this.eventEmitter=new u.Emitter,this.dog=new u.WatchDog({limit:10,onTimeout:function(){return e.connect()}}),this.url=t,this.connect(),this.dog.init()}return t.prototype.onMessage=function(t){this.dog.feed(),this.eventEmitter.emit("message",t.toString())},t.prototype.closeOld=function(){this.s&&(console.log("LOG Video-Server: "+this.url+" try to reconnect;"),this.s.kill(),this.s=null)},t.prototype.connect=function(){var t=this;this.closeOld();var e=["-rtsp_transport","tcp","-i",this.url,"-f","mpegts","-codec:v","mpeg1video","-"];this.s=Object(i.spawn)("ffmpeg",e,{detached:!1}),this.s.stderr.on("data",(function(e){return t.onMessage(e)})),this.s.stdout.on("data",(function(e){return t.eventEmitter.emit("data",e)}))},t.prototype.on=function(t,e){return this.eventEmitter.on(t,e)},t.prototype.cancel=function(t){this.eventEmitter.cancel(t)},t}(),s=function(t){var e=t.app,n=t.server,o=t.videos,r=t.path,i=t.expressWs,u=o.map((function(t){return new c(t)}));return i(e,n),e.ws(r,(function(t,e){var n=e.query.channel,o=void 0===n?0:n,r=null;u[o]&&(r=u[o].on("data",(function(e){t.send(e)}))),t.on("close",(function(){r&&u[o].cancel(r)}))})),u}}])}));

package/es/rtsp-video/index.d.ts

@@ -1,6 +1,7 @@
-export declare const initRtspVideos: ({ app, server, videos, path }: {
+export declare const initRtspVideos: ({ app, server, videos, path, expressWs }: {
     app: any;
     server: any;
     videos: any;
     path: any;
+    expressWs: any;
 }) => any;

package/es/rtsp-video/index.js

@@ -1,10 +1,10 @@
-import * as expressWs from 'express-ws';
 import { RTSP2Mpeg } from './rtsp2mpeg';
 export var initRtspVideos = function initRtspVideos(_a) {
   var app = _a.app,
       server = _a.server,
       videos = _a.videos,
-      path = _a.path;
+      path = _a.path,
+      expressWs = _a.expressWs;
   var mpegList = videos.map(function (url) {
     return new RTSP2Mpeg(url);
   });

package/lib/rtsp-video/index.d.ts

@@ -1,6 +1,7 @@
-export declare const initRtspVideos: ({ app, server, videos, path }: {
+export declare const initRtspVideos: ({ app, server, videos, path, expressWs }: {
     app: any;
     server: any;
     videos: any;
     path: any;
+    expressWs: any;
 }) => any;

package/lib/rtsp-video/index.js

@@ -1,53 +1,18 @@
 "use strict";
 
-var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function get() {
-      return m[k];
-    }
-  });
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-
-var __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function (o, v) {
-  Object.defineProperty(o, "default", {
-    enumerable: true,
-    value: v
-  });
-} : function (o, v) {
-  o["default"] = v;
-});
-
-var __importStar = this && this.__importStar || function (mod) {
-  if (mod && mod.__esModule) return mod;
-  var result = {};
-  if (mod != null) for (var k in mod) {
-    if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-  }
-
-  __setModuleDefault(result, mod);
-
-  return result;
-};
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.initRtspVideos = void 0;
 
-var expressWs = __importStar(require("express-ws"));
-
 var rtsp2mpeg_1 = require("./rtsp2mpeg");
 
 exports.initRtspVideos = function (_a) {
   var app = _a.app,
       server = _a.server,
       videos = _a.videos,
-      path = _a.path;
+      path = _a.path,
+      expressWs = _a.expressWs;
   var mpegList = videos.map(function (url) {
     return new rtsp2mpeg_1.RTSP2Mpeg(url);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.5-alpha.0",
+  "version": "1.0.6-alpha.0",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -20,9 +20,7 @@
   },
   "dependencies": {
     "@types/node": "^17.0.25",
-    "express": "^4.17.3",
-    "express-ws": "^5.0.2",
     "pubo-utils": "^1.0.5-alpha.0"
   },
-  "gitHead": "0adede4ec5ab594ec9df7b5415e29690d138052b"
+  "gitHead": "db997ea9d84f35349d8ed34d03b67df1e799fac5"
 }