diff --git a/web-service/server/src/index.js b/web-service/server/src/index.js
index b3301b177c61fc5941548bd798ecf907b3a9a4ee..b75b78b49f52bb8b3d60058bc4b65661608fb123 100644
--- a/web-service/server/src/index.js
+++ b/web-service/server/src/index.js
@@ -209,18 +209,28 @@ app.get('/stream/depth', (req, res) => {
app.post('/stream/config', async (req, res) => {
const {URI, data} = req.body;
console.log(req.body)
- const savedConfigs = new Configs({
- URI,
- data
- });
+ // const savedConfigs = new Configs({
+ // Settings: URI,
+ // data
+ // });
+
+ // try{
+ // await savedConfigs.save();
+ // return res.status(200).json('Your configurations were saved successfully')
+ // }catch(err){
+ // console.log(err)
+ // return res.status(500).json("Something's wrong I can feel it")
+ // }
+
+ //EXPERIMENTAL
+ //if(saveToCPP){
+ const json = data
+ const peer = uri_data[uri].peer
+ if(peer){
+ peer.send("update_cfg", uri, json);
+ }
+ // }
- try{
- await savedConfigs.save();
- return res.status(200).json('Your configurations were saved successfully')
- }catch(err){
- console.log(err)
- return res.status(500).json("Something's wrong I can feel it")
- }
})
app.get('/stream/config', async(req, res) => {
@@ -228,11 +238,11 @@ app.get('/stream/config', async(req, res) => {
const settings = req.query.settings;
const uri = req.query.uri;
- // //Check if DB has data
- // let response = await Configs.find({URI: settings});
- // if(dbData[0].data){
- // return res.status(200).json(dbData[0]);
- // }else{
+ //Check if DB has data
+ let response = await Configs.find({Settings: settings});
+ if(dbData[0].data){
+ return res.status(200).json(dbData[0]);
+ }else{
let peer = uri_data[uri].peer
if(peer){
console.log("get_cfg", settings)
@@ -242,7 +252,7 @@ app.get('/stream/config', async(req, res) => {
}
}, settings)
}
- // }
+ }
})
diff --git a/web-service/server/src/models/generic.js b/web-service/server/src/models/generic.js
index efb4db9afb2a7b4797d547246f88d8010a6ee325..41d4229f67ff2dd31d0d95a721970295c5e2b39b 100644
--- a/web-service/server/src/models/generic.js
+++ b/web-service/server/src/models/generic.js
@@ -39,7 +39,7 @@
const mongoose = require('mongoose')
const configsSchema = mongoose.Schema({
- URI: String,
+ Settings: String,
data: Object
})
diff --git a/web-service/server/src/public/js/bundle.js b/web-service/server/src/public/js/bundle.js
index dcfd098dcda83f3f86712ad6bc0f356ff751e5fb..363d5a87d7aabf568c93269295adc24f85cca791 100644
--- a/web-service/server/src/public/js/bundle.js
+++ b/web-service/server/src/public/js/bundle.js
@@ -383,7 +383,7 @@ BufferList.prototype._match = function(offset, search) {
module.exports = BufferList
-},{"readable-stream":19,"safe-buffer":20,"util":40}],2:[function(require,module,exports){
+},{"readable-stream":18,"safe-buffer":19,"util":40}],2:[function(require,module,exports){
(function (Buffer){
// Copyright Joyent, Inc. and other Node contributors.
//
@@ -493,8 +493,8 @@ function objectToString(o) {
return Object.prototype.toString.call(o);
}
-}).call(this,{"isBuffer":require("../../../../../../../../../usr/local/lib/node_modules/browserify/node_modules/is-buffer/index.js")})
-},{"../../../../../../../../../usr/local/lib/node_modules/browserify/node_modules/is-buffer/index.js":34}],3:[function(require,module,exports){
+}).call(this,{"isBuffer":require("../../../../../../../../../../../usr/lib/node_modules/watchify/node_modules/is-buffer/index.js")})
+},{"../../../../../../../../../../../usr/lib/node_modules/watchify/node_modules/is-buffer/index.js":34}],3:[function(require,module,exports){
if (typeof Object.create === 'function') {
// implementation from standard node.js 'util' module
module.exports = function inherits(ctor, superCtor) {
@@ -613,7 +613,7 @@ function msgpack (options) {
module.exports = msgpack
-},{"./lib/decoder":6,"./lib/encoder":7,"./lib/streams":8,"assert":25,"bl":1,"safe-buffer":20}],6:[function(require,module,exports){
+},{"./lib/decoder":6,"./lib/encoder":7,"./lib/streams":8,"assert":25,"bl":1,"safe-buffer":19}],6:[function(require,module,exports){
'use strict'
var bl = require('bl')
@@ -1396,7 +1396,7 @@ function encodeFloat (obj, forceFloat64) {
return buf
}
-},{"bl":1,"safe-buffer":20}],8:[function(require,module,exports){
+},{"bl":1,"safe-buffer":19}],8:[function(require,module,exports){
'use strict'
var Transform = require('readable-stream').Transform
@@ -1488,7 +1488,7 @@ Decoder.prototype._transform = function (buf, enc, done) {
module.exports.decoder = Decoder
module.exports.encoder = Encoder
-},{"bl":1,"inherits":3,"readable-stream":19}],9:[function(require,module,exports){
+},{"bl":1,"inherits":3,"readable-stream":18}],9:[function(require,module,exports){
(function (process){
'use strict';
@@ -2739,7 +2739,7 @@ function indexOf(xs, x) {
return -1;
}
}).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./_stream_duplex":10,"./internal/streams/BufferList":15,"./internal/streams/destroy":16,"./internal/streams/stream":17,"_process":36,"core-util-is":2,"events":32,"inherits":3,"isarray":4,"process-nextick-args":9,"safe-buffer":20,"string_decoder/":18,"util":30}],13:[function(require,module,exports){
+},{"./_stream_duplex":10,"./internal/streams/BufferList":15,"./internal/streams/destroy":16,"./internal/streams/stream":17,"_process":36,"core-util-is":2,"events":32,"inherits":3,"isarray":4,"process-nextick-args":9,"safe-buffer":19,"string_decoder/":20,"util":30}],13:[function(require,module,exports){
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
@@ -3644,7 +3644,7 @@ Writable.prototype._destroy = function (err, cb) {
cb(err);
};
}).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("timers").setImmediate)
-},{"./_stream_duplex":10,"./internal/streams/destroy":16,"./internal/streams/stream":17,"_process":36,"core-util-is":2,"inherits":3,"process-nextick-args":9,"safe-buffer":20,"timers":37,"util-deprecate":21}],15:[function(require,module,exports){
+},{"./_stream_duplex":10,"./internal/streams/destroy":16,"./internal/streams/stream":17,"_process":36,"core-util-is":2,"inherits":3,"process-nextick-args":9,"safe-buffer":19,"timers":37,"util-deprecate":21}],15:[function(require,module,exports){
'use strict';
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -3724,7 +3724,7 @@ if (util && util.inspect && util.inspect.custom) {
return this.constructor.name + ' ' + obj;
};
}
-},{"safe-buffer":20,"util":30}],16:[function(require,module,exports){
+},{"safe-buffer":19,"util":30}],16:[function(require,module,exports){
'use strict';
/*<replacement>*/
@@ -3803,6 +3803,79 @@ module.exports = {
module.exports = require('events').EventEmitter;
},{"events":32}],18:[function(require,module,exports){
+exports = module.exports = require('./lib/_stream_readable.js');
+exports.Stream = exports;
+exports.Readable = exports;
+exports.Writable = require('./lib/_stream_writable.js');
+exports.Duplex = require('./lib/_stream_duplex.js');
+exports.Transform = require('./lib/_stream_transform.js');
+exports.PassThrough = require('./lib/_stream_passthrough.js');
+
+},{"./lib/_stream_duplex.js":10,"./lib/_stream_passthrough.js":11,"./lib/_stream_readable.js":12,"./lib/_stream_transform.js":13,"./lib/_stream_writable.js":14}],19:[function(require,module,exports){
+/* eslint-disable node/no-deprecated-api */
+var buffer = require('buffer')
+var Buffer = buffer.Buffer
+
+// alternative to using Object.keys for old browsers
+function copyProps (src, dst) {
+ for (var key in src) {
+ dst[key] = src[key]
+ }
+}
+if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
+ module.exports = buffer
+} else {
+ // Copy properties from require('buffer')
+ copyProps(buffer, exports)
+ exports.Buffer = SafeBuffer
+}
+
+function SafeBuffer (arg, encodingOrOffset, length) {
+ return Buffer(arg, encodingOrOffset, length)
+}
+
+// Copy static methods from Buffer
+copyProps(Buffer, SafeBuffer)
+
+SafeBuffer.from = function (arg, encodingOrOffset, length) {
+ if (typeof arg === 'number') {
+ throw new TypeError('Argument must not be a number')
+ }
+ return Buffer(arg, encodingOrOffset, length)
+}
+
+SafeBuffer.alloc = function (size, fill, encoding) {
+ if (typeof size !== 'number') {
+ throw new TypeError('Argument must be a number')
+ }
+ var buf = Buffer(size)
+ if (fill !== undefined) {
+ if (typeof encoding === 'string') {
+ buf.fill(fill, encoding)
+ } else {
+ buf.fill(fill)
+ }
+ } else {
+ buf.fill(0)
+ }
+ return buf
+}
+
+SafeBuffer.allocUnsafe = function (size) {
+ if (typeof size !== 'number') {
+ throw new TypeError('Argument must be a number')
+ }
+ return Buffer(size)
+}
+
+SafeBuffer.allocUnsafeSlow = function (size) {
+ if (typeof size !== 'number') {
+ throw new TypeError('Argument must be a number')
+ }
+ return buffer.SlowBuffer(size)
+}
+
+},{"buffer":31}],20:[function(require,module,exports){
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
@@ -4099,80 +4172,7 @@ function simpleWrite(buf) {
function simpleEnd(buf) {
return buf && buf.length ? this.write(buf) : '';
}
-},{"safe-buffer":20}],19:[function(require,module,exports){
-exports = module.exports = require('./lib/_stream_readable.js');
-exports.Stream = exports;
-exports.Readable = exports;
-exports.Writable = require('./lib/_stream_writable.js');
-exports.Duplex = require('./lib/_stream_duplex.js');
-exports.Transform = require('./lib/_stream_transform.js');
-exports.PassThrough = require('./lib/_stream_passthrough.js');
-
-},{"./lib/_stream_duplex.js":10,"./lib/_stream_passthrough.js":11,"./lib/_stream_readable.js":12,"./lib/_stream_transform.js":13,"./lib/_stream_writable.js":14}],20:[function(require,module,exports){
-/* eslint-disable node/no-deprecated-api */
-var buffer = require('buffer')
-var Buffer = buffer.Buffer
-
-// alternative to using Object.keys for old browsers
-function copyProps (src, dst) {
- for (var key in src) {
- dst[key] = src[key]
- }
-}
-if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
- module.exports = buffer
-} else {
- // Copy properties from require('buffer')
- copyProps(buffer, exports)
- exports.Buffer = SafeBuffer
-}
-
-function SafeBuffer (arg, encodingOrOffset, length) {
- return Buffer(arg, encodingOrOffset, length)
-}
-
-// Copy static methods from Buffer
-copyProps(Buffer, SafeBuffer)
-
-SafeBuffer.from = function (arg, encodingOrOffset, length) {
- if (typeof arg === 'number') {
- throw new TypeError('Argument must not be a number')
- }
- return Buffer(arg, encodingOrOffset, length)
-}
-
-SafeBuffer.alloc = function (size, fill, encoding) {
- if (typeof size !== 'number') {
- throw new TypeError('Argument must be a number')
- }
- var buf = Buffer(size)
- if (fill !== undefined) {
- if (typeof encoding === 'string') {
- buf.fill(fill, encoding)
- } else {
- buf.fill(fill)
- }
- } else {
- buf.fill(0)
- }
- return buf
-}
-
-SafeBuffer.allocUnsafe = function (size) {
- if (typeof size !== 'number') {
- throw new TypeError('Argument must be a number')
- }
- return Buffer(size)
-}
-
-SafeBuffer.allocUnsafeSlow = function (size) {
- if (typeof size !== 'number') {
- throw new TypeError('Argument must be a number')
- }
- return buffer.SlowBuffer(size)
-}
-
-},{"buffer":31}],21:[function(require,module,exports){
+},{"safe-buffer":19}],21:[function(require,module,exports){
(function (global){
/**
@@ -4836,7 +4836,7 @@ VideoPlayer.prototype._display_image = function(image) {
});
};
-VideoPlayer.prototype._handle_onload = function(pckg) {
+VideoPlayer.prototype._handle_onload = function(frame) {
var that = this;
this._set_status("initializing");
@@ -4846,7 +4846,7 @@ VideoPlayer.prototype._handle_onload = function(pckg) {
image.free();
});
- var data = pckg;
+ // var data = frame;
// var pos = 0;
// var remaining = data.byteLength;
var ratio = null;
@@ -4866,7 +4866,7 @@ VideoPlayer.prototype._handle_onload = function(pckg) {
// l = remaining;
// }
- let tmp = data
+ let tmp = frame
// var tmp = new Uint8Array(data, pos, l);
err = decoder.push_data(tmp);
// pos += l;