pubo-node 1.0.66 → 1.0.68

package/lib/rtsp-video/index.js

@@ -4,43 +4,29 @@ var __assign = this && this.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
       s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
     }
-
     return t;
   };
-
   return __assign.apply(this, arguments);
 };
-
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
-
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
-
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
   if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
     if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
   }
   return t;
 };
-
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
   var i = m.call(o),
-      r,
-      ar = [],
-      e;
-
+    r,
+    ar = [],
+    e;
   try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
-      ar.push(r.value);
-    }
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
   } catch (error) {
     e = {
       error: error
@@ -52,48 +38,39 @@ var __read = this && this.__read || function (o, n) {
       if (e) throw e.error;
     }
   }
-
   return ar;
 };
-
-var __spread = this && this.__spread || function () {
-  for (var ar = [], i = 0; i < arguments.length; i++) {
-    ar = ar.concat(__read(arguments[i]));
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
   }
-
-  return ar;
+  return to.concat(ar || Array.prototype.slice.call(from));
 };
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.initRtspVideos = exports.RtspVideosManager = void 0;
-
 var fs_1 = require("fs");
-
 var path_1 = require("path");
-
 var rtsp2mpeg_1 = require("./rtsp2mpeg");
-
-var VideoStorage =
-/** @class */
-function () {
+var VideoStorage = /** @class */function () {
   function VideoStorage() {
-    this.path = path_1.resolve('resources/temp/videos.json');
+    this.path = (0, path_1.resolve)('resources/temp/videos.json');
   }
-
   VideoStorage.prototype.async = function (data) {
     try {
-      fs_1.writeFileSync(this.path, JSON.stringify(data));
+      (0, fs_1.writeFileSync)(this.path, JSON.stringify(data));
     } catch (err) {
       console.log(err);
     }
   };
-
   Object.defineProperty(VideoStorage.prototype, "data", {
     get: function get() {
       try {
-        var buffer = fs_1.readFileSync(this.path);
+        var buffer = (0, fs_1.readFileSync)(this.path);
         console.log(buffer.toString());
         return JSON.parse(buffer.toString());
       } catch (err) {
@@ -106,10 +83,7 @@ function () {
   });
   return VideoStorage;
 }();
-
-var RtspVideosManager =
-/** @class */
-function () {
+var RtspVideosManager = /** @class */function () {
   function RtspVideosManager(videos) {
     this._system = [];
     this._customer = [];
@@ -124,87 +98,69 @@ function () {
     this._customer = this.storage.data || [];
     this.system = videos.map(function (_a) {
       var url = _a.url,
-          options = __rest(_a, ["url"]);
-
+        options = __rest(_a, ["url"]);
       return new rtsp2mpeg_1.RTSP2Mpeg(url, options);
     });
     this.customer = this._customer.map(function (_a) {
       var url = _a.url,
-          options = __rest(_a, ["url"]);
-
+        options = __rest(_a, ["url"]);
       return new rtsp2mpeg_1.RTSP2Mpeg(url, options);
     });
   }
-
   Object.defineProperty(RtspVideosManager.prototype, "list", {
     get: function get() {
-      return __spread(this.system, this.customer);
+      return __spreadArray(__spreadArray([], __read(this.system), false), __read(this.customer), false);
     },
     enumerable: false,
     configurable: true
   });
-
   RtspVideosManager.prototype.getVideos = function () {
-    return __spread(this._system, this._customer);
+    return __spreadArray(__spreadArray([], __read(this._system), false), __read(this._customer), false);
   };
-
   RtspVideosManager.prototype.create = function (conf) {
     if (this._customer.some(function (item) {
       return item.url === conf.url;
     })) {
       throw new Error('该地址已存在');
     }
-
     var video = new rtsp2mpeg_1.RTSP2Mpeg(conf.url, conf);
-
     this._customer.push(conf);
-
     this.customer.push(video);
     this.storage.async(this._customer);
   };
-
   RtspVideosManager.prototype.remove = function (index) {
     if (index < this.system.length) {
       throw new Error('系统配置不可删除');
     } else if (index > this.system.length + this.customer.length - 1) {
       throw new Error('超限');
     }
-
     this._customer.splice(index - this.system.length - 1, 1);
-
     var video = this.customer.splice(index - this.system.length - 1, 1);
     video[0].destroy();
     this.storage.async(this._customer);
   };
-
   return RtspVideosManager;
 }();
-
 exports.RtspVideosManager = RtspVideosManager;
-
-exports.initRtspVideos = function (_a) {
+var initRtspVideos = function initRtspVideos(_a) {
   var app = _a.app,
-      server = _a.server,
-      videos = _a.videos,
-      path = _a.path,
-      expressWs = _a.expressWs;
+    server = _a.server,
+    videos = _a.videos,
+    path = _a.path,
+    expressWs = _a.expressWs;
   var manager = new RtspVideosManager(videos);
-
   if (!app.ws) {
     expressWs(app, server);
   }
-
   app.ws(path, function (ws, req) {
     var _a = req.query.channel,
-        channel = _a === void 0 ? 0 : _a;
+      channel = _a === void 0 ? 0 : _a;
     var listener = null;
-
     if (manager.list[channel]) {
       listener = manager.list[channel].on('data', function (chunk) {
         ws.send(chunk);
       });
     }
-
     ws.on('close', function () {
       if (listener && manager.list[channel]) {
         manager.list[channel].cancel(listener);
@@ -212,4 +168,5 @@ exports.initRtspVideos = function (_a) {
     });
   });
   return manager;
-};
+};
+exports.initRtspVideos = initRtspVideos;

package/lib/rtsp-video/rtsp2mpeg.js

@@ -4,30 +4,21 @@ var __assign = this && this.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
       s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
     }
-
     return t;
   };
-
   return __assign.apply(this, arguments);
 };
-
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
   var i = m.call(o),
-      r,
-      ar = [],
-      e;
-
+    r,
+    ar = [],
+    e;
   try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
-      ar.push(r.value);
-    }
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
   } catch (error) {
     e = {
       error: error
@@ -39,33 +30,26 @@ var __read = this && this.__read || function (o, n) {
       if (e) throw e.error;
     }
   }
-
   return ar;
 };
-
-var __spread = this && this.__spread || function () {
-  for (var ar = [], i = 0; i < arguments.length; i++) {
-    ar = ar.concat(__read(arguments[i]));
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
   }
-
-  return ar;
+  return to.concat(ar || Array.prototype.slice.call(from));
 };
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RTSP2Mpeg = void 0;
-
 var child_process_1 = require("child_process");
-
 var pubo_utils_1 = require("pubo-utils");
-
-var RTSP2Mpeg =
-/** @class */
-function () {
+var RTSP2Mpeg = /** @class */function () {
   function RTSP2Mpeg(url, options) {
     var _this = this;
-
     this.eventEmitter = new pubo_utils_1.Emitter();
     this.dog = new pubo_utils_1.WatchDog({
       limit: 10,
@@ -75,40 +59,31 @@ function () {
     });
     this.url = url;
     this.options = __assign({}, options);
-
     if (!this.options.input) {
       this.options.input = ['-rtsp_transport', 'tcp', '-i'];
     }
-
     if (!this.options.output) {
       this.options.output = ['-f', 'mpegts', '-codec:v', 'mpeg1video'];
     }
-
     this.connect();
     this.dog.init();
   }
-
   RTSP2Mpeg.prototype.onMessage = function (msg) {
     this.dog.feed();
     this.eventEmitter.emit('message', msg.toString());
   };
-
   RTSP2Mpeg.prototype.closeOld = function () {
     if (this.s) {
-      console.log("LOG Video-Server: " + this.url + " try to reconnect;");
+      console.log("LOG Video-Server: ".concat(this.url, " try to reconnect;"));
       this.s.kill();
       this.s = null;
     }
   };
-
   RTSP2Mpeg.prototype.connect = function () {
     var _this = this;
-
     this.closeOld();
-
-    var options = __spread(this.options.input, [this.url], this.options.output, ['-']);
-
-    this.s = child_process_1.spawn('ffmpeg', options, {
+    var options = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(this.options.input), false), [this.url], false), __read(this.options.output), false), ['-'], false);
+    this.s = (0, child_process_1.spawn)('ffmpeg', options, {
       detached: false
     });
     this.s.stderr.on('data', function (buffer) {
@@ -118,26 +93,20 @@ function () {
       return _this.eventEmitter.emit('data', buffer);
     });
   };
-
   RTSP2Mpeg.prototype.on = function (event, cb) {
     return this.eventEmitter.on(event, cb);
   };
-
   RTSP2Mpeg.prototype.cancel = function (id) {
     this.eventEmitter.cancel(id);
   };
-
   RTSP2Mpeg.prototype.destroy = function () {
     this.eventEmitter.clear();
     this.dog.stop();
-
     if (this.s) {
       this.s.kill();
       this.s = null;
     }
   };
-
   return RTSP2Mpeg;
 }();
-
 exports.RTSP2Mpeg = RTSP2Mpeg;

package/lib/storage/json.js

@@ -4,31 +4,28 @@ var __assign = this && this.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
       s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
     }
-
     return t;
   };
-
   return __assign.apply(this, arguments);
 };
-
 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];
-    }
-  });
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function get() {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
 } : 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,
@@ -37,40 +34,28 @@ var __setModuleDefault = this && this.__setModuleDefault || (Object.create ? fun
 } : 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);
-  }
-
+  if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
   __setModuleDefault(result, mod);
-
   return result;
 };
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.JsonStorage = void 0;
-
 var fs_1 = require("fs");
-
 var pako = __importStar(require("pako"));
-
-var JsonStorage =
-/** @class */
-function () {
+var JsonStorage = /** @class */function () {
   function JsonStorage(path) {
     this._state = {};
     this.path = path;
     this.init();
   }
-
   JsonStorage.prototype.init = function () {
     try {
-      var buf = fs_1.readFileSync(this.path);
+      var buf = (0, fs_1.readFileSync)(this.path);
       var data = pako.inflate(buf, {
         to: 'string'
       });
@@ -79,7 +64,6 @@ function () {
       this.state = {};
     }
   };
-
   Object.defineProperty(JsonStorage.prototype, "state", {
     get: function get() {
       return this._state;
@@ -87,7 +71,7 @@ function () {
     set: function set(values) {
       var data = pako.deflate(JSON.stringify(values));
       var buf = Buffer.from(data);
-      fs_1.writeFile(this.path, buf, function (err) {
+      (0, fs_1.writeFile)(this.path, buf, function (err) {
         return err && console.log(err);
       });
       this._state = values;
@@ -95,7 +79,6 @@ function () {
     enumerable: false,
     configurable: true
   });
-
   JsonStorage.prototype.get = function (key) {
     if (!key) {
       return __assign({}, this.state);
@@ -103,19 +86,14 @@ function () {
       return this.state[key];
     }
   };
-
   JsonStorage.prototype.set = function (key, values) {
     var temp = __assign({}, this.state);
-
     temp[key] = values;
     this.state = temp;
   };
-
   JsonStorage.prototype.merge = function (values) {
     this.state = __assign(__assign({}, this._state), values);
   };
-
   return JsonStorage;
 }();
-
 exports.JsonStorage = JsonStorage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -20,9 +20,8 @@
   },
   "dependencies": {
     "@types/node": "^17.0.25",
-    "grpc": "^1.24.11",
     "pako": "^2.0.4",
-    "pubo-utils": "^1.0.66"
+    "pubo-utils": "^1.0.68"
   },
-  "gitHead": "c426ff977160010b6b3af440963c31b92a543952"
+  "gitHead": "899d754737a6d62cc70078e99a8999484a345d1c"
 }