pubo-node 1.0.32 → 1.0.34

package/lib/grpc/GrpcPool.js

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.GrpcPool = void 0;
+
+var Grpc_1 = require("./Grpc");
+
+var GrpcPool =
+/** @class */
+function () {
+  function GrpcPool(list) {
+    this.list = [];
+    this.list = list.map(function (conf) {
+      return {
+        id: conf.id,
+        grpc: new Grpc_1.Grpc(conf)
+      };
+    });
+  }
+
+  GrpcPool.prototype.getGrpc = function (id) {
+    var _a;
+
+    return (_a = this.list.find(function (item) {
+      return item.id === id;
+    })) === null || _a === void 0 ? void 0 : _a.grpc;
+  };
+
+  GrpcPool.pool = [];
+  GrpcPool.instance = null;
+
+  GrpcPool.getPool = function () {
+    if (!GrpcPool.instance) {
+      GrpcPool.instance = new GrpcPool(GrpcPool.pool);
+    }
+
+    return GrpcPool.instance;
+  };
+
+  GrpcPool.setPool = function (pool) {
+    GrpcPool.pool = pool;
+    GrpcPool.instance = new GrpcPool(GrpcPool.pool);
+  };
+
+  return GrpcPool;
+}();
+
+exports.GrpcPool = GrpcPool;

package/lib/grpc/GrpcService.d.ts

@@ -0,0 +1,13 @@
+export interface GrpcServiceConfig {
+    client: string;
+    serviceName: string;
+    requestType: string;
+}
+export declare class GrpcService {
+    private readonly config;
+    private readonly grpc?;
+    private readonly promise;
+    constructor(conf: GrpcServiceConfig);
+    serializer(requestType: string, payload?: any): any;
+    send(request?: any): Promise<any>;
+}

package/lib/grpc/GrpcService.js

@@ -0,0 +1,302 @@
+"use strict";
+
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+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;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      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]));
+  }
+
+  return ar;
+};
+
+var __values = this && this.__values || function (o) {
+  var s = typeof Symbol === "function" && Symbol.iterator,
+      m = s && o[s],
+      i = 0;
+  if (m) return m.call(o);
+  if (o && typeof o.length === "number") return {
+    next: function next() {
+      if (o && i >= o.length) o = void 0;
+      return {
+        value: o && o[i++],
+        done: !o
+      };
+    }
+  };
+  throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.GrpcService = void 0;
+
+var GrpcPool_1 = require("./GrpcPool");
+
+function createRpcPromise(fn, grpc) {
+  return function () {
+    var args = [];
+
+    for (var _i = 0; _i < arguments.length; _i++) {
+      args[_i] = arguments[_i];
+    }
+
+    return new Promise(function (resolve, reject) {
+      var client = grpc.client;
+      fn.call.apply(fn, __spread([client], args, [function (err, response) {
+        global.proto = grpc.proto;
+
+        if (err) {
+          reject(err);
+        } else {
+          resolve(response);
+        }
+      }]));
+    });
+  };
+}
+
+var GrpcService =
+/** @class */
+function () {
+  function GrpcService(conf) {
+    this.config = conf;
+    this.grpc = GrpcPool_1.GrpcPool.getPool().getGrpc(this.config.client);
+
+    if (!this.grpc || !this.grpc.client[this.config.serviceName]) {
+      throw new Error("rpc service not found:" + this.config.serviceName);
+    }
+
+    this.promise = createRpcPromise(this.grpc.client[this.config.serviceName], this.grpc);
+  }
+
+  GrpcService.prototype.serializer = function (requestType, payload) {
+    var e_1, _a;
+
+    if (payload === void 0) {
+      payload = {};
+    }
+
+    if (!this.grpc) {
+      throw new Error("rpc client not found:" + this.config.client);
+    }
+
+    global.proto = this.grpc.proto;
+    var request = new this.grpc.common[requestType]();
+
+    try {
+      for (var _b = __values(Object.keys(request.toObject())), _c = _b.next(); !_c.done; _c = _b.next()) {
+        var key = _c.value;
+
+        if (payload[key] !== undefined) {
+          request["set" + key[0].toUpperCase() + key.slice(1)](payload[key]);
+        }
+      }
+    } catch (e_1_1) {
+      e_1 = {
+        error: e_1_1
+      };
+    } finally {
+      try {
+        if (_c && !_c.done && (_a = _b["return"])) _a.call(_b);
+      } finally {
+        if (e_1) throw e_1.error;
+      }
+    }
+
+    return request;
+  };
+
+  GrpcService.prototype.send = function (request) {
+    return __awaiter(this, void 0, void 0, function () {
+      var res;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4
+            /*yield*/
+            , this.promise(this.serializer(this.config.requestType, request))];
+
+          case 1:
+            res = _a.sent();
+            return [2
+            /*return*/
+            , res.toObject()];
+        }
+      });
+    });
+  };
+
+  return GrpcService;
+}();
+
+exports.GrpcService = GrpcService;

package/lib/grpc/index.d.ts

@@ -0,0 +1,8 @@
+import { GrpcService } from './GrpcService';
+interface GrpcServiceOptions {
+    client: string;
+    requestType: string;
+    service?: string;
+}
+export declare const createGrpcService: import("pubo-utils/lib/factory").CreateFactory<GrpcServiceOptions, GrpcService>;
+export {};

package/lib/grpc/index.js

@@ -0,0 +1,32 @@
+"use strict";
+
+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];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createGrpcService = void 0;
+
+var pubo_utils_1 = require("pubo-utils");
+
+var GrpcService_1 = require("./GrpcService");
+
+exports.createGrpcService = pubo_utils_1.superFactory(function (config, key) {
+  return new GrpcService_1.GrpcService(__assign(__assign({}, config), {
+    serviceName: config.service || key
+  }));
+});

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 export { JsonStorage } from './storage/json';
-export { initRtspVideos } from './rtsp-video';
 export { FtpClient } from './ftp-client';
 export { md5 } from './md5';
+export { createGrpcService } from './grpc';
+export { GrpcPool } from './grpc/GrpcPool';

package/lib/index.js

@@ -13,15 +13,6 @@ Object.defineProperty(exports, "JsonStorage", {
   }
 });
 
-var rtsp_video_1 = require("./rtsp-video");
-
-Object.defineProperty(exports, "initRtspVideos", {
-  enumerable: true,
-  get: function get() {
-    return rtsp_video_1.initRtspVideos;
-  }
-});
-
 var ftp_client_1 = require("./ftp-client");
 
 Object.defineProperty(exports, "FtpClient", {
@@ -38,4 +29,22 @@ Object.defineProperty(exports, "md5", {
   get: function get() {
     return md5_1.md5;
   }
+});
+
+var grpc_1 = require("./grpc");
+
+Object.defineProperty(exports, "createGrpcService", {
+  enumerable: true,
+  get: function get() {
+    return grpc_1.createGrpcService;
+  }
+});
+
+var GrpcPool_1 = require("./grpc/GrpcPool");
+
+Object.defineProperty(exports, "GrpcPool", {
+  enumerable: true,
+  get: function get() {
+    return GrpcPool_1.GrpcPool;
+  }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -20,8 +20,9 @@
   },
   "dependencies": {
     "@types/node": "^17.0.25",
+    "grpc": "^1.24.11",
     "pako": "^2.0.4",
-    "pubo-utils": "^1.0.32"
+    "pubo-utils": "^1.0.34"
   },
-  "gitHead": "2a8c06e4ad83471773f7b7b29c9586cd5b5b419e"
+  "gitHead": "c5218221058a304c692c4e9e789e7b8f8a2c7bce"
 }

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

@@ -1,15 +0,0 @@
-import { RTSP2Mpeg } from './rtsp2mpeg';
-interface VideoConfig {
-    url: string;
-    input?: string[];
-    output?: string[];
-}
-interface Props {
-    app: any;
-    server?: any;
-    videos: VideoConfig[];
-    path: string;
-    expressWs?: any;
-}
-export declare const initRtspVideos: ({ app, server, videos, path, expressWs }: Props) => RTSP2Mpeg[];
-export {};

package/es/rtsp-video/index.js

@@ -1,50 +0,0 @@
-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];
-  }
-
-  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;
-};
-
-import { RTSP2Mpeg } from './rtsp2mpeg';
-export var initRtspVideos = function initRtspVideos(_a) {
-  var app = _a.app,
-      server = _a.server,
-      videos = _a.videos,
-      path = _a.path,
-      expressWs = _a.expressWs;
-  var mpegList = videos.map(function (_a) {
-    var url = _a.url,
-        options = __rest(_a, ["url"]);
-
-    return new RTSP2Mpeg(url, options);
-  });
-
-  if (!app.ws) {
-    expressWs(app, server);
-  }
-
-  app.ws(path, function (ws, req) {
-    var _a = req.query.channel,
-        channel = _a === void 0 ? 0 : _a;
-    var listener = null;
-
-    if (mpegList[channel]) {
-      listener = mpegList[channel].on('data', function (chunk) {
-        ws.send(chunk);
-      });
-    }
-
-    ws.on('close', function () {
-      if (listener) {
-        mpegList[channel].cancel(listener);
-      }
-    });
-  });
-  return mpegList;
-};

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

@@ -1,13 +0,0 @@
-export declare class RTSP2Mpeg {
-    private readonly eventEmitter;
-    private readonly dog;
-    private readonly url;
-    private s;
-    private readonly options;
-    constructor(url: string, options: any);
-    private onMessage;
-    private closeOld;
-    private connect;
-    on(event: string, cb: (data: any) => void): string;
-    cancel(id: any): void;
-}

package/es/rtsp-video/rtsp2mpeg.js

@@ -1,125 +0,0 @@
-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];
-      }
-    }
-
-    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;
-
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
-      ar.push(r.value);
-    }
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      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]));
-  }
-
-  return ar;
-};
-
-import { spawn } from 'child_process';
-import { Emitter, WatchDog } from 'pubo-utils';
-
-var RTSP2Mpeg =
-/** @class */
-function () {
-  function RTSP2Mpeg(url, options) {
-    var _this = this;
-
-    this.eventEmitter = new Emitter();
-    this.dog = new WatchDog({
-      limit: 10,
-      onTimeout: function onTimeout() {
-        return _this.connect();
-      }
-    });
-    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;");
-      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 = spawn('ffmpeg', options, {
-      detached: false
-    });
-    this.s.stderr.on('data', function (buffer) {
-      return _this.onMessage(buffer);
-    });
-    this.s.stdout.on('data', function (buffer) {
-      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);
-  };
-
-  return RTSP2Mpeg;
-}();
-
-export { RTSP2Mpeg };

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

@@ -1,15 +0,0 @@
-import { RTSP2Mpeg } from './rtsp2mpeg';
-interface VideoConfig {
-    url: string;
-    input?: string[];
-    output?: string[];
-}
-interface Props {
-    app: any;
-    server?: any;
-    videos: VideoConfig[];
-    path: string;
-    expressWs?: any;
-}
-export declare const initRtspVideos: ({ app, server, videos, path, expressWs }: Props) => RTSP2Mpeg[];
-export {};