Updated autodetection of server-down for socket.io and updated requirements
parent
7567734e1c
commit
d9f31fccfd
|
@ -41,6 +41,9 @@ class PrinterStateConnection(tornadio2.SocketConnection, PrinterCallback):
|
||||||
print("Closed socket")
|
print("Closed socket")
|
||||||
printer.unregisterCallback(self)
|
printer.unregisterCallback(self)
|
||||||
|
|
||||||
|
def on_message(self, message):
|
||||||
|
pass
|
||||||
|
|
||||||
def zChangeCB(self, currentZ):
|
def zChangeCB(self, currentZ):
|
||||||
formattedCurrentZ = None
|
formattedCurrentZ = None
|
||||||
if currentZ:
|
if currentZ:
|
||||||
|
|
|
@ -361,7 +361,7 @@ function TerminalViewModel() {
|
||||||
self.fromLogEvent = function(data) {
|
self.fromLogEvent = function(data) {
|
||||||
if (!self.log)
|
if (!self.log)
|
||||||
self.log = []
|
self.log = []
|
||||||
self.log.push(data.log)
|
self.log.push(data.line)
|
||||||
self.updateOutput();
|
self.updateOutput();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -528,7 +528,17 @@ function DataUpdater(connectionViewModel, printerStateViewModel, temperatureView
|
||||||
self.webcamViewModel = webcamViewModel;
|
self.webcamViewModel = webcamViewModel;
|
||||||
|
|
||||||
self.socket = io.connect();
|
self.socket = io.connect();
|
||||||
|
self.socket.on("connect", function() {
|
||||||
|
if ($("#offline_overlay").is(":visible")) {
|
||||||
|
$("#offline_overlay").hide();
|
||||||
|
self.webcamViewModel.requestData();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
self.socket.on("disconnect", function() {
|
||||||
|
// if the updated fails to communicate with the backend, we interpret this as a missing backend
|
||||||
|
if (!$("#offline_overlay").is(":visible"))
|
||||||
|
$("#offline_overlay").show();
|
||||||
|
})
|
||||||
self.socket.on("state", function(data) {
|
self.socket.on("state", function(data) {
|
||||||
self.printerStateViewModel.fromStateEvent(data);
|
self.printerStateViewModel.fromStateEvent(data);
|
||||||
self.connectionViewModel.fromStateEvent(data);
|
self.connectionViewModel.fromStateEvent(data);
|
||||||
|
@ -556,47 +566,6 @@ function DataUpdater(connectionViewModel, printerStateViewModel, temperatureView
|
||||||
self.temperatureViewModel.fromHistoryEvent(data.temperature)
|
self.temperatureViewModel.fromHistoryEvent(data.temperature)
|
||||||
self.terminalViewModel.fromHistoryEvent(data.log)
|
self.terminalViewModel.fromHistoryEvent(data.log)
|
||||||
})
|
})
|
||||||
|
|
||||||
self.requestData = function() {
|
|
||||||
var parameters = {};
|
|
||||||
|
|
||||||
if (self.includeTemperatures)
|
|
||||||
parameters.temperatures = true;
|
|
||||||
if (self.includeLogs)
|
|
||||||
parameters.log = true;
|
|
||||||
|
|
||||||
$.ajax({
|
|
||||||
url: AJAX_BASEURL + "state",
|
|
||||||
type: "GET",
|
|
||||||
dataType: "json",
|
|
||||||
data: parameters,
|
|
||||||
success: function(response) {
|
|
||||||
if ($("#offline_overlay").is(":visible")) {
|
|
||||||
$("#offline_overlay").hide();
|
|
||||||
self.webcamViewModel.requestData();
|
|
||||||
}
|
|
||||||
|
|
||||||
self.printerStateViewModel.fromResponse(response);
|
|
||||||
self.connectionViewModel.fromStateResponse(response);
|
|
||||||
self.speedViewModel.fromResponse(response);
|
|
||||||
self.webcamViewModel.fromStateResponse(response);
|
|
||||||
|
|
||||||
if (response.temperatures)
|
|
||||||
self.temperatureViewModel.fromResponse(response);
|
|
||||||
|
|
||||||
if (response.log)
|
|
||||||
self.terminalViewModel.fromResponse(response);
|
|
||||||
|
|
||||||
setTimeout(self.requestData, self.updateInterval);
|
|
||||||
},
|
|
||||||
error: function(jqXHR, textState, errorThrows) {
|
|
||||||
// if the updated fails to communicate with the backend, we interpret this as a missing backend
|
|
||||||
if (!$("#offline_overlay").is(":visible"))
|
|
||||||
$("#offline_overlay").show();
|
|
||||||
setTimeout(self.requestData, self.updateIntervalOnError);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
var dataUpdater = new DataUpdater(connectionViewModel, printerStateViewModel, temperatureViewModel, speedViewModel, terminalViewModel, webcamViewModel);
|
var dataUpdater = new DataUpdater(connectionViewModel, printerStateViewModel, temperatureViewModel, speedViewModel, terminalViewModel, webcamViewModel);
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
flask>=0.9
|
flask>=0.9
|
||||||
numpy>=1.6.2
|
numpy>=1.6.2
|
||||||
pyserial>=2.6
|
pyserial>=2.6
|
||||||
|
tornado>=2.4.1
|
||||||
|
tornadio2>=0.0.4
|
Loading…
Reference in New Issue