diff --git a/package-lock.json b/package-lock.json index e9b37333452f49bd17ee3b46dec3ecabf28d71f4..708e53d8ef58bc00c8edd73ae4987d22769c6239 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7548,6 +7548,11 @@ "slash": "^3.0.0" } }, + "google-protobuf": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.0.tgz", + "integrity": "sha512-byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g==" + }, "graceful-fs": { "version": "4.2.6", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", diff --git a/package.json b/package.json index c992410e816558c807d4fb1748a5f1f9c65d4960..48045559c523821cd9899d0930cb865c75a738c4 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "bootstrap": "4.5", "flexlayout-react": "0.5.5", + "google-protobuf": "3.21.0", "jquery": "3.6.0", "jszip": "3.2.0", "mqtt": "4.3.5", diff --git a/src/services/mqtt-client-service.js b/src/services/mqtt-client-service.js index 3056fd811a0429743c7d00c31fa3030f0a760499..fe899e0659d905fc6c70404754ef8c6f1529494f 100644 --- a/src/services/mqtt-client-service.js +++ b/src/services/mqtt-client-service.js @@ -1,6 +1,8 @@ import mqtt from 'mqtt'; import { EventEmitter } from 'events'; +//import DataPackMessage from 'nrp-jsproto/engine_grpc_pb'; + let _instance = null; const SINGLETON_ENFORCER = Symbol(); @@ -13,6 +15,8 @@ export default class MqttClientService extends EventEmitter { if (enforcer !== SINGLETON_ENFORCER) { throw new Error('Use ' + this.constructor.name + '.instance'); } + + //console.info(['DataPackMessage', DataPackMessage]); } static get instance() { @@ -49,7 +53,7 @@ export default class MqttClientService extends EventEmitter { console.info('"' + topic + '" message format = ' + msg); } else { - let msg = proto.Engine.DataPackMessage.decode(payload); + let msg = DataPackMessage.deserializeBinary(payload); console.info('DataPackMessage'); console.info(msg); }