diff --git a/.travis.yml b/.travis.yml
index 4231e273..91908e24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,3 +12,10 @@ script: python setup.py test
after_success:
- coverage run --source=openxc setup.py test
- coveralls
+deploy:
+ provider: pypi
+ server: https://pypi.org/legacy/
+ user: "__token__"
+ password: $PYPI_PASSWORD
+ on:
+ branch: master
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index afb6ba0d..5bf4d787 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
OpenXC Python Library Changelog
===============================
+v1.1.0
+----------
+* Feature: Generate firmware now checks for duplicate entries in json and for improperly used keys and unrecognised attributes.
+* Feature: openxc-dashboad has been updated from a command line tool to a web server and webpage.
+* Fix: Requiring windows curses on non windows system
+* Fix: Various Python 3 bugs
+
v1.0.0
----------
* Remove python 2.7 support
diff --git a/MANIFEST.in b/MANIFEST.in
index 67486837..91ed1309 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,3 +3,4 @@ include CONTRIBUTING.rst
include LICENSE
include openxc/generator/signals.cpp.footer
include openxc/generator/signals.cpp.header
+include openxc/tools/templates/dashboard.html
diff --git a/README.rst b/README.rst
index 457fcb16..fdd65a4e 100644
--- a/README.rst
+++ b/README.rst
@@ -2,9 +2,9 @@
OpenXC for Python
===============================================
-.. image:: /docs/_static/logo.png
+.. image:: https://github.com/openxc/openxc-python/raw/master/docs/_static/logo.png
-:Version: 1.0.0
+:Version: 1.1.0
:Web: http://openxcplatform.com
:Download: http://pypi.python.org/pypi/openxc/
:Documentation: http://python.openxcplatform.com
@@ -31,15 +31,16 @@ number of command-line tools for connecting to the CAN translator and
manipulating previously recorded vehicle data.
To package run "setup.py sdist bdist_wheel"
-to push to pypi run "python -m twine upload dist/*"
+to push to pypi run "python -m twine upload dist/\*"
Version files:
- CHANGELOG.rst
- README.rst
- openxc/version.py
- docs/index.rst
+
+- CHANGELOG.rst
+- README.rst
+- openxc/version.py
+- docs/index.rst
License
-=======
+========
Copyright (c) 2012-2017 Ford Motor Company
diff --git a/docs/index.rst b/docs/index.rst
index f6d2b9a6..56dbdb0f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -2,9 +2,9 @@
OpenXC for Python
===================
-.. image:: /_static/logo.png
+.. image:: https://github.com/openxc/openxc-python/raw/master/docs/_static/logo.png
-:Version: 1.0.0
+:Version: 1.1.0
:Web: http://openxcplatform.com
:Download: http://pypi.python.org/pypi/openxc/
:Documentation: http://python.openxcplatform.com
diff --git a/openxc/generator/structures.py b/openxc/generator/structures.py
index 83169519..c46cfd7d 100644
--- a/openxc/generator/structures.py
+++ b/openxc/generator/structures.py
@@ -1,6 +1,7 @@
import operator
import math
from collections import defaultdict
+from openxc.utils import fatal_error
import logging
@@ -102,6 +103,14 @@ def id(self, value):
def merge_message(self, data):
self.bus_name = self.bus_name or data.get('bus', None)
+ message_attributes = dir(self)
+ message_attributes = [a.replace('bus_name', 'bus') for a in message_attributes]
+ data_attributes = list(data.keys())
+ extra_attributes = set(data_attributes) - set(message_attributes)
+
+ if extra_attributes:
+ fatal_error('ERROR: Message %s has unrecognized attributes: %s' % (data.get('id'), ', '.join(extra_attributes)))
+
if getattr(self, 'message_set'):
self.bus = self.message_set.lookup_bus(name=self.bus_name)
if not self.bus.valid():
@@ -353,6 +362,14 @@ def merge_signal(self, data):
"%s is deprecated and has no effect " % self.generic_name +
" - see the replacement, max_frequency")
+ signal_attributes = dir(self)
+ data_attributes = list(data.keys())
+ extra_attributes = set(data_attributes) - set(signal_attributes)
+
+ if extra_attributes:
+ fatal_error('ERROR: Signal %s in %s has unrecognized attributes: %s' % (self.name, self.message.name, ', '.join(extra_attributes)))
+
+
@property
def decoder(self):
decoder = getattr(self, '_decoder', None)
diff --git a/openxc/tools/dashboard.py b/openxc/tools/dashboard.py
index 3b65b1ac..6ab089f0 100644
--- a/openxc/tools/dashboard.py
+++ b/openxc/tools/dashboard.py
@@ -1,211 +1,48 @@
-""" This module contains the methods for the ``openxc-dashboard`` command line
-program.
-
-`main` is executed when ``openxc-dashboard`` is run, and all other callables in
-this module are internal only.
-"""
-
-
-
-import argparse
-import curses
-import math
-from datetime import datetime
-from threading import Lock
-
-from .common import device_options, configure_logging, select_device
-from openxc.vehicle import Vehicle
-from openxc.measurements import EventedMeasurement, Measurement
-
-try:
- str
-except NameError:
- # Python 3
- str = str = str
-
-
-# timedelta.total_seconds() is only in 2.7, so we backport it here for 2.6
-def total_seconds(delta):
- return (delta.microseconds + (delta.seconds
- + delta.days * 24 * 3600) * 10**6) / 10**6
-
-
-# Thanks, SO: http://stackoverflow.com/questions/1094841/reusable-library-to-get-human-readable-version-of-file-size
-def sizeof_fmt(num):
- for unit in ['bytes', 'KB', 'MB', 'GB', 'TB']:
- if num < 1024.0:
- return "%3.1f%s" % (num, unit)
- num /= 1024.0
-
-
-class DataPoint(object):
- AVERAGE_FREQUENCY_ALPHA = 0.1
-
- def __init__(self, measurement_type):
- self.event = ''
- self.current_data = None
- self.events = {}
- self.messages_received = 0
- self.measurement_type = measurement_type
- self.min = None
- self.max = None
- self.last_update_time = None
- self.average_time_since_update = None
-
- def update(self, measurement):
- self.messages_received += 1
- self.current_data = measurement
-
- if self.last_update_time is not None:
- time_since_update = total_seconds(datetime.now() - self.last_update_time)
- if self.average_time_since_update is None:
- self.average_time_since_update = time_since_update
- else:
- self.average_time_since_update = ((self.AVERAGE_FREQUENCY_ALPHA *
- time_since_update) + (1 - self.AVERAGE_FREQUENCY_ALPHA) *
- self.average_time_since_update)
- self.last_update_time = datetime.now()
-
- if getattr(self.current_data.value, 'unit', None) == self.current_data.unit:
- if self.min is None or self.current_data.value < self.min:
- self.min = self.current_data.value
- elif self.max is None or self.current_data.value > self.max:
- self.max = self.current_data.value
-
- if isinstance(measurement, EventedMeasurement):
- if measurement.valid_state():
- self.events[measurement.value] = measurement.event
-
- def percentage(self):
- # TODO man, this is getting really ugly to handle all of the different
- # types
- percent = None
- if hasattr(self.measurement_type, 'valid_range'):
- percent = self.current_data.percentage_within_range()
- elif (getattr(self, 'min', None) is not None and
- getattr(self, 'max', None) is not None) and self.min != self.max:
- percent = (((self.current_data.value - self.min) / float(self.max -
- self.min)) * 100).num
- return percent
-
- def print_to_window(self, window, row, started_time):
- width = window.getmaxyx()[1]
- if self.current_data is not None:
- if len(self.events) == 0:
- value = str(self.current_data)
- else:
- result = ""
- for item, value in enumerate(self.measurement_type.states):
- # TODO missing keys here?
- result += "%s: %s " % (value, self.events.get(value, "?"))
- value = result
-
- value_color = curses.color_pair(2)
- window.addstr(row, 0, "{:>22} %s".format(value), value_color)
- window.addstr(row, 23, self.current_data.name)
-
- if width > 60:
- message_count_color = curses.color_pair(3)
- window.addstr(row, 50, "Msgs: " + str(self.messages_received),
- message_count_color)
-
- if width > 75 and self.average_time_since_update > 0:
- window.addstr(row, 61, "Freq. (Hz): %d" %
- math.ceil((1 / self.average_time_since_update)))
-
-
-class Dashboard(object):
- def __init__(self, window, vehicle):
- self.window = window
- self.elements = {}
- self.scroll_position = 0
- self.screen_lock = Lock()
- vehicle.listen(Measurement, self.receive)
-
- self.started_time = datetime.now()
- self.messages_received = 0
-
- curses.use_default_colors()
- curses.init_pair(1, curses.COLOR_RED, -1)
- curses.init_pair(2, curses.COLOR_GREEN, -1)
- curses.init_pair(3, curses.COLOR_YELLOW, -1)
-
- def receive(self, measurement, **kwargs):
- if self.messages_received == 0:
- self.started_time = datetime.now()
- self.messages_received += 1
-
- if measurement.name not in self.elements:
- self.elements[measurement.name] = DataPoint(measurement.__class__)
- self.elements[measurement.name].update(measurement)
- self._redraw()
-
- def _redraw(self):
- self.screen_lock.acquire()
- self.window.erase()
- max_rows = self.window.getmaxyx()[0] - 4
- for row, element in enumerate(sorted(list(self.elements.values()),
- key=lambda elt: elt.current_data.name)[self.scroll_position:]):
- if row > max_rows:
- break
- element.print_to_window(self.window, row, self.started_time)
- self.window.addstr(max_rows + 1, 0,
- "Message count: %d (%d corrupted)" % (self.messages_received,
- self.source.corrupted_messages), curses.A_REVERSE)
- self.window.addstr(max_rows + 2, 0,
- "Total received: %s" %
- sizeof_fmt(self.source.bytes_received),
- curses.A_REVERSE)
- self.window.addstr(max_rows + 3, 0, "Data Rate: %s" %
- sizeof_fmt(self.source.bytes_received /
- (total_seconds(datetime.now() - self.started_time)
- + 0.1)),
- curses.A_REVERSE)
- self.window.refresh()
- self.screen_lock.release()
-
- def scroll_down(self, lines):
- self.screen_lock.acquire()
- self.scroll_position = min(self.window.getmaxyx()[1],
- self.scroll_position + lines)
- self.screen_lock.release()
-
- def scroll_up(self, lines):
- self.screen_lock.acquire()
- self.scroll_position = max(0, self.scroll_position - lines)
- self.screen_lock.release()
-
-
-def run_dashboard(window, source_class, source_kwargs):
- vehicle = Vehicle()
- dashboard = Dashboard(window, vehicle)
- dashboard.source = source_class(**source_kwargs)
- vehicle.add_source(dashboard.source)
-
- window.scrollok(True)
- while True:
- c = window.getch()
- if c == curses.KEY_DOWN:
- dashboard.scroll_down(1)
- elif c == curses.KEY_UP:
- dashboard.scroll_up(1)
- elif c == curses.KEY_NPAGE:
- dashboard.scroll_down(25)
- elif c == curses.KEY_PPAGE:
- dashboard.scroll_up(25)
-
-
-
-def parse_options():
- parser = argparse.ArgumentParser(
- description="View a real-time dashboard of all OpenXC measurements",
- parents=[device_options()])
- arguments = parser.parse_args()
- return arguments
-
-
-def main():
- configure_logging()
- arguments = parse_options()
- source_class, source_kwargs = select_device(arguments)
- curses.wrapper(run_dashboard, source_class, source_kwargs)
+""" This module contains the methods for the ``openxc-dashboard`` command line
+program.
+
+`main` is executed when ``openxc-dashboard`` is run, and all other callables in
+this module are internal only.
+"""
+
+import argparse
+import threading
+import logging
+from flask import Flask
+from flask import render_template
+from flask_socketio import SocketIO
+
+from openxc.interface import UsbVehicleInterface
+
+log = logging.getLogger('werkzeug')
+log.setLevel(logging.ERROR)
+app = Flask(__name__)
+socketio = SocketIO(app)
+
+def vehicle_data_thread():
+ vi = UsbVehicleInterface(callback=send_data)
+ vi.start()
+
+def send_data(data, **kwargs):
+ socketio.emit('vehicle data', data, broadcast=True)
+
+@app.route("/")
+def dashboard_static():
+ try:
+ vehicle_data_thread()
+ except:
+ pass
+ return render_template('dashboard.html')
+
+def parse_options():
+ parser = argparse.ArgumentParser(
+ description="View a real-time dashboard of all OpenXC measurements",
+ parents=[device_options()])
+ arguments = parser.parse_args()
+ return arguments
+
+
+def main():
+ socketio.start_background_task(vehicle_data_thread)
+ print("View the dashboard at http://127.0.0.1:5000")
+ app.run()
diff --git a/openxc/tools/static/css/dashboard.css b/openxc/tools/static/css/dashboard.css
new file mode 100644
index 00000000..f4054bf2
--- /dev/null
+++ b/openxc/tools/static/css/dashboard.css
@@ -0,0 +1,12 @@
+caption {
+ font-size: 1.5em;
+}
+
+table, th, td {
+ text-align: left;
+ border-spacing: 8px 1px;
+}
+
+.metric {
+ text-align: right;
+}
\ No newline at end of file
diff --git a/openxc/tools/static/js/dashboard.js b/openxc/tools/static/js/dashboard.js
new file mode 100644
index 00000000..1936f20b
--- /dev/null
+++ b/openxc/tools/static/js/dashboard.js
@@ -0,0 +1,104 @@
+let dataPoints = {};
+
+$(document).ready(function() {
+ namespace = '';
+ var socket = io(namespace);
+ socket.on('vehicle data', function(msg, cb) {
+ // console.log(msg);
+
+ if (!(msg.name in dataPoints)) {
+ dataPoints[msg.name] = {
+ current_data: undefined,
+ events: {},
+ messages_received: 0,
+ measurement_type: undefined,
+ min: undefined,
+ max: undefined,
+ last_update_time: undefined,
+ average_time_since_update: undefined
+ };
+ }
+
+ updateDataPoint(dataPoints[msg.name], msg);
+ updateDisplay(dataPoints[msg.name]);
+
+ if (cb)
+ cb();
+ });
+});
+
+function addToDisplay(msgName) {
+ // Insert new rows alphabetically
+ var added = false;
+ $('#log tr').each(function() {
+ if (msgName < $(this).children('td:eq(0)').text()) {
+ $('|
', {
+ id: msgName
+ }).insertBefore($(this));
+ added = true;
+ return false;
+ }
+ });
+
+ if (!added) {
+ $('|
', {
+ id: msgName
+ }).appendTo('#log');
+ }
+
+ $(' | ', {
+ id: msgName + '_label',
+ text: msgName
+ }).appendTo('#' + msgName);
+
+ $(' | ', {
+ id: msgName + '_value'
+ }).appendTo('#' + msgName);
+
+ $(' | ', {
+ id: msgName + '_num',
+ class: 'metric'
+ }).appendTo('#' + msgName);
+
+ $(' | ', {
+ id: msgName + '_freq',
+ class: 'metric'
+ }).appendTo('#' + msgName);
+}
+
+function updateDisplay(dataPoint) {
+ msg = dataPoint.current_data
+
+ if (!($('#' + msg.name).length > 0)) {
+ addToDisplay(msg.name);
+ }
+
+ $('#' + msg.name + '_value').text(msg.value);
+ $('#' + msg.name + '_num').text(dataPoint.messages_received);
+ $('#' + msg.name + '_freq').text(Math.ceil(1 / dataPoint.average_time_since_update));
+}
+
+function updateDataPoint(dataPoint, measurement) {
+ dataPoint.messages_received++;
+ dataPoint.current_data = measurement;
+ let update_time = (new Date()).getTime() / 1000;
+
+ if (dataPoint.last_update_time !== undefined) {
+ dataPoint.average_time_since_update =
+ calculateAverageTimeSinceUpdate(update_time, dataPoint);
+ }
+
+ dataPoint.last_update_time = update_time;
+
+ if ('event' in measurement) {
+ dataPoint.events[measurement.value] = measurement.event;
+ }
+}
+
+function calculateAverageTimeSinceUpdate(updateTime, dataPoint) {
+ let time_since_update = updateTime - dataPoint.last_update_time;
+
+ return (dataPoint.average_time_since_update === undefined)
+ ? time_since_update
+ : (0.1 * time_since_update) + (0.9 * dataPoint.average_time_since_update);
+}
\ No newline at end of file
diff --git a/openxc/tools/static/js/jquery-3.4.1.slim.min.js b/openxc/tools/static/js/jquery-3.4.1.slim.min.js
new file mode 100644
index 00000000..af151cfe
--- /dev/null
+++ b/openxc/tools/static/js/jquery-3.4.1.slim.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.4.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/parseXML,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-event/ajax,-effects,-effects/Tween,-effects/animatedSelector | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(g,e){"use strict";var t=[],v=g.document,r=Object.getPrototypeOf,s=t.slice,y=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,m=n.hasOwnProperty,a=m.toString,l=a.call(Object),b={},x=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},w=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function C(e,t,n){var r,i,o=(n=n||v).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function T(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/parseXML,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-event/ajax,-effects,-effects/Tween,-effects/animatedSelector",E=function(e,t){return new E.fn.init(e,t)},d=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function p(e){var t=!!e&&"length"in e&&e.length,n=T(e);return!x(e)&&!w(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+R+")"+R+"*"),U=new RegExp(R+"|>"),V=new RegExp(W),X=new RegExp("^"+B+"$"),Q={ID:new RegExp("^#("+B+")"),CLASS:new RegExp("^\\.("+B+")"),TAG:new RegExp("^("+B+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+R+"*(even|odd|(([+-]|)(\\d*)n|)"+R+"*(?:([+-]|)"+R+"*(\\d+)|))"+R+"*\\)|)","i"),bool:new RegExp("^(?:"+I+")$","i"),needsContext:new RegExp("^"+R+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+R+"*((?:-\\d)?\\d*)"+R+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,G=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,J=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+R+"?|("+R+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){C()},ae=xe(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{O.apply(t=P.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){O={apply:t.length?function(e,t){q.apply(e,P.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,d=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==d&&9!==d&&11!==d)return n;if(!r&&((e?e.ownerDocument||e:m)!==T&&C(e),e=e||T,E)){if(11!==d&&(u=Z.exec(t)))if(i=u[1]){if(9===d){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return O.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&p.getElementsByClassName&&e.getElementsByClassName)return O.apply(n,e.getElementsByClassName(i)),n}if(p.qsa&&!S[t+" "]&&(!v||!v.test(t))&&(1!==d||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===d&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=N),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+be(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return O.apply(n,f.querySelectorAll(c)),n}catch(e){S(t,!0)}finally{s===N&&e.removeAttribute("id")}}}return g(t.replace(F,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>x.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[N]=!0,e}function ce(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)x.attrHandle[n[r]]=t}function de(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pe(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in p=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},C=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==T&&9===r.nodeType&&r.documentElement&&(a=(T=r).documentElement,E=!i(T),m!==T&&(n=T.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),p.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),p.getElementsByTagName=ce(function(e){return e.appendChild(T.createComment("")),!e.getElementsByTagName("*").length}),p.getElementsByClassName=J.test(T.getElementsByClassName),p.getById=ce(function(e){return a.appendChild(e).id=N,!T.getElementsByName||!T.getElementsByName(N).length}),p.getById?(x.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},x.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(x.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},x.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),x.find.TAG=p.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):p.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},x.find.CLASS=p.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(p.qsa=J.test(T.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+R+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+R+"*(?:value|"+I+")"),e.querySelectorAll("[id~="+N+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+N+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=T.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+R+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(p.matchesSelector=J.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){p.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",W)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=J.test(a.compareDocumentPosition),y=t||J.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!p.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument===m&&y(m,e)?-1:t===T||t.ownerDocument===m&&y(m,t)?1:u?H(u,e)-H(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===T?-1:t===T?1:i?-1:o?1:u?H(u,e)-H(u,t):0;if(i===o)return de(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?de(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),T},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==T&&C(e),p.matchesSelector&&E&&!S[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||p.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){S(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&V.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=d[e+" "];return t||(t=new RegExp("(^|"+R+")"+e+"("+R+"|$)"))&&d(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function L(e,n,r){return x(n)?E.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?E.grep(e,function(e){return e===n!==r}):"string"!=typeof n?E.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(E.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof E?t[0]:t,E.merge(this,E.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:v,!0)),D.test(r[1])&&E.isPlainObject(t))for(r in t)x(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=v.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):x(e)?void 0!==n.ready?n.ready(e):e(E):E.makeArray(e,this)}).prototype=E.fn,j=E(v);var O=/^(?:parents|prev(?:Until|All))/,P={children:!0,contents:!0,next:!0,prev:!0};function H(e,t){while((e=e[t])&&1!==e.nodeType);return e}E.fn.extend({has:function(e){var t=E(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,pe=/^$|^module$|\/(?:java|ecma)script/i,he={option:[1,""],thead:[1,""],col:[2,""],tr:[2,""],td:[3,""],_default:[0,"",""]};function ge(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&S(e,t)?E.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;nx",b.noCloneChecked=!!ye.cloneNode(!0).lastChild.defaultValue;var we=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function Ne(){return!1}function Ae(e,t){return e===function(){try{return v.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ne;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return E().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=E.guid++)),e.each(function(){E.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(G.set(e,i,!1),E.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=G.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(E.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),G.set(this,i,r),t=o(this,i),this[i](),r!==(n=G.get(this,i))||t?G.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(G.set(this,i,{value:E.event.trigger(E.extend(r[0],E.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===G.get(e,i)&&E.event.add(e,i,Ee)}E.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,v=G.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&E.find.matchesSelector(ie,i),n.guid||(n.guid=E.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof E&&E.event.triggered!==e.type?E.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(I)||[""]).length;while(l--)p=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),p&&(f=E.event.special[p]||{},p=(i?f.delegateType:f.bindType)||p,f=E.event.special[p]||{},c=E.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&E.expr.match.needsContext.test(i),namespace:h.join(".")},o),(d=u[p])||((d=u[p]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(p,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,c):d.push(c),E.event.global[p]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,v=G.hasData(e)&&G.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(I)||[""]).length;while(l--)if(p=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),p){f=E.event.special[p]||{},d=u[p=(r?f.delegateType:f.bindType)||p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=d.length;while(o--)c=d[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(d.splice(o,1),c.selector&&d.delegateCount--,f.remove&&f.remove.call(e,c));a&&!d.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||E.removeEvent(e,p,v.handle),delete u[p])}else for(p in u)E.event.remove(e,p+t[l],n,r,!0);E.isEmptyObject(u)&&G.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=E.event.fix(e),u=new Array(arguments.length),l=(G.get(this,"events")||{})[s.type]||[],c=E.event.special[s.type]||{};for(u[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,Le=/\s*$/g;function Oe(e,t){return S(e,"table")&&S(11!==t.nodeType?t:t.firstChild,"tr")&&E(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Ie(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(G.hasData(e)&&(o=G.access(e),a=G.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(b.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||E.isXMLDoc(e)))for(a=ge(c),r=0,i=(o=ge(e)).length;r",2===pt.childNodes.length),E.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(b.createHTMLDocument?((r=(t=v.implementation.createHTMLDocument("")).createElement("base")).href=v.location.href,t.head.appendChild(r)):t=v),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&E(o).remove(),E.merge([],i.childNodes)));var r,i,o},E.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=E.css(e,"position"),c=E(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=E.css(e,"top"),u=E.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),x(t)&&(t=t.call(e,n,E.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},E.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){E.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===E.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===E.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=E(e).offset()).top+=E.css(e,"borderTopWidth",!0),i.left+=E.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-E.css(r,"marginTop",!0),left:t.left-i.left-E.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===E.css(e,"position"))e=e.offsetParent;return e||ie})}}),E.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;E.fn[t]=function(e){return z(this,function(e,t,n){var r;if(w(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),E.each(["top","left"],function(e,n){E.cssHooks[n]=ze(b.pixelPosition,function(e,t){if(t)return t=Fe(e,n),Me.test(t)?E(e).position()[n]+"px":t})}),E.each({Height:"height",Width:"width"},function(a,s){E.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){E.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return z(this,function(e,t,n){var r;return w(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?E.css(e,t,i):E.style(e,t,n,i)},s,n?e:void 0,n)}})}),E.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){E.fn[n]=function(e,t){return 00&&!this.encoding){var t=this.packetBuffer.shift();this.packet(t)}},n.prototype.cleanup=function(){for(var t=this.subs.length,e=0;e=this._reconnectionAttempts)this.backoff.reset(),this.emitAll("reconnect_failed"),this.reconnecting=!1;else{var e=this.backoff.duration();this.reconnecting=!0;var r=setTimeout(function(){t.skipReconnect||(t.emitAll("reconnect_attempt",t.backoff.attempts),t.emitAll("reconnecting",t.backoff.attempts),t.skipReconnect||t.open(function(e){e?(t.reconnecting=!1,t.reconnect(),t.emitAll("reconnect_error",e.data)):t.onreconnect()}))},e);this.subs.push({destroy:function(){clearTimeout(r)}})}},n.prototype.onreconnect=function(){var t=this.backoff.attempts;this.reconnecting=!1,this.backoff.reset(),this.updateSocketIds(),this.emitAll("reconnect",t)}},function(t,e,r){t.exports=r(11),t.exports.parser=r(18)},function(t,e,r){function n(t,e){return this instanceof n?(e=e||{},t&&"object"==typeof t&&(e=t,t=null),t?(t=p(t),e.hostname=t.host,e.secure="https"===t.protocol||"wss"===t.protocol,e.port=t.port,t.query&&(e.query=t.query)):e.host&&(e.hostname=p(e.host).host),this.secure=null!=e.secure?e.secure:"undefined"!=typeof location&&"https:"===location.protocol,e.hostname&&!e.port&&(e.port=this.secure?"443":"80"),this.agent=e.agent||!1,this.hostname=e.hostname||("undefined"!=typeof location?location.hostname:"localhost"),this.port=e.port||("undefined"!=typeof location&&location.port?location.port:this.secure?443:80),this.query=e.query||{},"string"==typeof this.query&&(this.query=h.decode(this.query)),this.upgrade=!1!==e.upgrade,this.path=(e.path||"/engine.io").replace(/\/$/,"")+"/",this.forceJSONP=!!e.forceJSONP,this.jsonp=!1!==e.jsonp,this.forceBase64=!!e.forceBase64,this.enablesXDR=!!e.enablesXDR,this.withCredentials=!1!==e.withCredentials,this.timestampParam=e.timestampParam||"t",this.timestampRequests=e.timestampRequests,this.transports=e.transports||["polling","websocket"],this.transportOptions=e.transportOptions||{},this.readyState="",this.writeBuffer=[],this.prevBufferLen=0,this.policyPort=e.policyPort||843,this.rememberUpgrade=e.rememberUpgrade||!1,this.binaryType=null,this.onlyBinaryUpgrades=e.onlyBinaryUpgrades,this.perMessageDeflate=!1!==e.perMessageDeflate&&(e.perMessageDeflate||{}),!0===this.perMessageDeflate&&(this.perMessageDeflate={}),this.perMessageDeflate&&null==this.perMessageDeflate.threshold&&(this.perMessageDeflate.threshold=1024),this.pfx=e.pfx||null,this.key=e.key||null,this.passphrase=e.passphrase||null,this.cert=e.cert||null,this.ca=e.ca||null,this.ciphers=e.ciphers||null,this.rejectUnauthorized=void 0===e.rejectUnauthorized||e.rejectUnauthorized,this.forceNode=!!e.forceNode,this.isReactNative="undefined"!=typeof navigator&&"string"==typeof navigator.product&&"reactnative"===navigator.product.toLowerCase(),("undefined"==typeof self||this.isReactNative)&&(e.extraHeaders&&Object.keys(e.extraHeaders).length>0&&(this.extraHeaders=e.extraHeaders),e.localAddress&&(this.localAddress=e.localAddress)),this.id=null,this.upgrades=null,this.pingInterval=null,this.pingTimeout=null,this.pingIntervalTimer=null,this.pingTimeoutTimer=null,void this.open()):new n(t,e)}function o(t){var e={};for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r]);return e}var i=r(12),s=r(5),a=(r(3)("engine.io-client:socket"),r(32)),c=r(18),p=r(2),h=r(26);t.exports=n,n.priorWebsocketSuccess=!1,s(n.prototype),n.protocol=c.protocol,n.Socket=n,n.Transport=r(17),n.transports=r(12),n.parser=r(18),n.prototype.createTransport=function(t){var e=o(this.query);e.EIO=c.protocol,e.transport=t;var r=this.transportOptions[t]||{};this.id&&(e.sid=this.id);var n=new i[t]({query:e,socket:this,agent:r.agent||this.agent,hostname:r.hostname||this.hostname,port:r.port||this.port,secure:r.secure||this.secure,path:r.path||this.path,forceJSONP:r.forceJSONP||this.forceJSONP,jsonp:r.jsonp||this.jsonp,forceBase64:r.forceBase64||this.forceBase64,enablesXDR:r.enablesXDR||this.enablesXDR,withCredentials:r.withCredentials||this.withCredentials,timestampRequests:r.timestampRequests||this.timestampRequests,timestampParam:r.timestampParam||this.timestampParam,policyPort:r.policyPort||this.policyPort,pfx:r.pfx||this.pfx,key:r.key||this.key,passphrase:r.passphrase||this.passphrase,cert:r.cert||this.cert,ca:r.ca||this.ca,ciphers:r.ciphers||this.ciphers,rejectUnauthorized:r.rejectUnauthorized||this.rejectUnauthorized,perMessageDeflate:r.perMessageDeflate||this.perMessageDeflate,extraHeaders:r.extraHeaders||this.extraHeaders,forceNode:r.forceNode||this.forceNode,localAddress:r.localAddress||this.localAddress,requestTimeout:r.requestTimeout||this.requestTimeout,protocols:r.protocols||void 0,isReactNative:this.isReactNative});return n},n.prototype.open=function(){var t;if(this.rememberUpgrade&&n.priorWebsocketSuccess&&this.transports.indexOf("websocket")!==-1)t="websocket";else{if(0===this.transports.length){var e=this;return void setTimeout(function(){e.emit("error","No transports available")},0)}t=this.transports[0]}this.readyState="opening";try{t=this.createTransport(t)}catch(t){return this.transports.shift(),void this.open()}t.open(),this.setTransport(t)},n.prototype.setTransport=function(t){var e=this;this.transport&&this.transport.removeAllListeners(),this.transport=t,t.on("drain",function(){e.onDrain()}).on("packet",function(t){e.onPacket(t)}).on("error",function(t){e.onError(t)}).on("close",function(){e.onClose("transport close")})},n.prototype.probe=function(t){function e(){if(u.onlyBinaryUpgrades){var t=!this.supportsBinary&&u.transport.supportsBinary;h=h||t}h||(p.send([{type:"ping",data:"probe"}]),p.once("packet",function(t){if(!h)if("pong"===t.type&&"probe"===t.data){if(u.upgrading=!0,u.emit("upgrading",p),!p)return;n.priorWebsocketSuccess="websocket"===p.name,u.transport.pause(function(){h||"closed"!==u.readyState&&(c(),u.setTransport(p),p.send([{type:"upgrade"}]),u.emit("upgrade",p),p=null,u.upgrading=!1,u.flush())})}else{var e=new Error("probe error");e.transport=p.name,u.emit("upgradeError",e)}}))}function r(){h||(h=!0,c(),p.close(),p=null)}function o(t){var e=new Error("probe error: "+t);e.transport=p.name,r(),u.emit("upgradeError",e)}function i(){o("transport closed")}function s(){o("socket closed")}function a(t){p&&t.name!==p.name&&r()}function c(){p.removeListener("open",e),p.removeListener("error",o),p.removeListener("close",i),u.removeListener("close",s),u.removeListener("upgrading",a)}var p=this.createTransport(t,{probe:1}),h=!1,u=this;n.priorWebsocketSuccess=!1,p.once("open",e),p.once("error",o),p.once("close",i),this.once("close",s),this.once("upgrading",a),p.open()},n.prototype.onOpen=function(){if(this.readyState="open",n.priorWebsocketSuccess="websocket"===this.transport.name,this.emit("open"),this.flush(),"open"===this.readyState&&this.upgrade&&this.transport.pause)for(var t=0,e=this.upgrades.length;t1?{type:b[o],data:t.substring(1)}:{type:b[o]}:k}var i=new Uint8Array(t),o=i[0],s=f(t,1);return w&&"blob"===r&&(s=new w([s])),{type:b[o],data:s}},e.decodeBase64Packet=function(t,e){var r=b[t.charAt(0)];if(!p)return{type:r,data:{base64:!0,data:t.substr(1)}};var n=p.decode(t.substr(1));return"blob"===e&&w&&(n=new w([n])),{type:r,data:n}},e.encodePayload=function(t,r,n){function o(t){return t.length+":"+t}function i(t,n){e.encodePacket(t,!!s&&r,!1,function(t){n(null,o(t))})}"function"==typeof r&&(n=r,r=null);var s=u(t);return r&&s?w&&!g?e.encodePayloadAsBlob(t,n):e.encodePayloadAsArrayBuffer(t,n):t.length?void c(t,i,function(t,e){return n(e.join(""))}):n("0:")},e.decodePayload=function(t,r,n){if("string"!=typeof t)return e.decodePayloadAsBinary(t,r,n);"function"==typeof r&&(n=r,r=null);var o;if(""===t)return n(k,0,1);for(var i,s,a="",c=0,p=t.length;c0;){for(var s=new Uint8Array(o),a=0===s[0],c="",p=1;255!==s[p];p++){if(c.length>310)return n(k,0,1);c+=s[p]}o=f(o,2+c.length),c=parseInt(c);var h=f(o,0,c);if(a)try{h=String.fromCharCode.apply(null,new Uint8Array(h))}catch(t){var u=new Uint8Array(h);h="";for(var p=0;pn&&(r=n),e>=n||e>=r||0===n)return new ArrayBuffer(0);for(var o=new Uint8Array(t),i=new Uint8Array(r-e),s=e,a=0;s=55296&&e<=56319&&o65535&&(e-=65536,o+=d(e>>>10&1023|55296),e=56320|1023&e),o+=d(e);return o}function o(t,e){if(t>=55296&&t<=57343){if(e)throw Error("Lone surrogate U+"+t.toString(16).toUpperCase()+" is not a scalar value");return!1}return!0}function i(t,e){return d(t>>e&63|128)}function s(t,e){if(0==(4294967168&t))return d(t);var r="";return 0==(4294965248&t)?r=d(t>>6&31|192):0==(4294901760&t)?(o(t,e)||(t=65533),r=d(t>>12&15|224),r+=i(t,6)):0==(4292870144&t)&&(r=d(t>>18&7|240),r+=i(t,12),r+=i(t,6)),r+=d(63&t|128)}function a(t,e){e=e||{};for(var n,o=!1!==e.strict,i=r(t),a=i.length,c=-1,p="";++c=f)throw Error("Invalid byte index");var t=255&u[l];if(l++,128==(192&t))return 63&t;throw Error("Invalid continuation byte")}function p(t){var e,r,n,i,s;if(l>f)throw Error("Invalid byte index");if(l==f)return!1;if(e=255&u[l],l++,0==(128&e))return e;if(192==(224&e)){if(r=c(),s=(31&e)<<6|r,s>=128)return s;throw Error("Invalid continuation byte")}if(224==(240&e)){if(r=c(),n=c(),s=(15&e)<<12|r<<6|n,s>=2048)return o(s,t)?s:65533;throw Error("Invalid continuation byte")}if(240==(248&e)&&(r=c(),n=c(),i=c(),s=(7&e)<<18|r<<12|n<<6|i,s>=65536&&s<=1114111))return s;throw Error("Invalid UTF-8 detected")}function h(t,e){e=e||{};var o=!1!==e.strict;u=r(t),f=u.length,l=0;for(var i,s=[];(i=p(o))!==!1;)s.push(i);return n(s)}/*! https://mths.be/utf8js v2.1.2 by @mathias */
+var u,f,l,d=String.fromCharCode;t.exports={version:"2.1.2",encode:a,decode:h}},function(t,e){!function(){"use strict";for(var t="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",r=new Uint8Array(256),n=0;n>2],i+=t[(3&n[r])<<4|n[r+1]>>4],i+=t[(15&n[r+1])<<2|n[r+2]>>6],i+=t[63&n[r+2]];return o%3===2?i=i.substring(0,i.length-1)+"=":o%3===1&&(i=i.substring(0,i.length-2)+"=="),i},e.decode=function(t){var e,n,o,i,s,a=.75*t.length,c=t.length,p=0;"="===t[t.length-1]&&(a--,"="===t[t.length-2]&&a--);var h=new ArrayBuffer(a),u=new Uint8Array(h);for(e=0;e>4,u[p++]=(15&o)<<4|i>>2,u[p++]=(3&i)<<6|63&s;return h}}()},function(t,e){function r(t){return t.map(function(t){if(t.buffer instanceof ArrayBuffer){var e=t.buffer;if(t.byteLength!==e.byteLength){var r=new Uint8Array(t.byteLength);r.set(new Uint8Array(e,t.byteOffset,t.byteLength)),e=r.buffer}return e}return t})}function n(t,e){e=e||{};var n=new i;return r(t).forEach(function(t){n.append(t)}),e.type?n.getBlob(e.type):n.getBlob()}function o(t,e){return new Blob(r(t),e||{})}var i="undefined"!=typeof i?i:"undefined"!=typeof WebKitBlobBuilder?WebKitBlobBuilder:"undefined"!=typeof MSBlobBuilder?MSBlobBuilder:"undefined"!=typeof MozBlobBuilder&&MozBlobBuilder,s=function(){try{var t=new Blob(["hi"]);return 2===t.size}catch(t){return!1}}(),a=s&&function(){try{var t=new Blob([new Uint8Array([1,2])]);return 2===t.size}catch(t){return!1}}(),c=i&&i.prototype.append&&i.prototype.getBlob;"undefined"!=typeof Blob&&(n.prototype=Blob.prototype,o.prototype=Blob.prototype),t.exports=function(){return s?a?Blob:o:c?n:void 0}()},function(t,e){e.encode=function(t){var e="";for(var r in t)t.hasOwnProperty(r)&&(e.length&&(e+="&"),e+=encodeURIComponent(r)+"="+encodeURIComponent(t[r]));return e},e.decode=function(t){for(var e={},r=t.split("&"),n=0,o=r.length;n0);return e}function n(t){var e=0;for(h=0;h';i=document.createElement(t)}catch(t){i=document.createElement("iframe"),i.name=o.iframeId,i.src="javascript:0"}i.id=o.iframeId,o.form.appendChild(i),o.iframe=i}var o=this;if(!this.form){var i,s=document.createElement("form"),a=document.createElement("textarea"),c=this.iframeId="eio_iframe_"+this.index;s.className="socketio",s.style.position="absolute",s.style.top="-1000px",s.style.left="-1000px",s.target=c,s.method="POST",s.setAttribute("accept-charset","utf-8"),a.name="d",s.appendChild(a),document.body.appendChild(s),this.form=s,this.area=a}this.form.action=this.uri(),n(),t=t.replace(h,"\\\n"),this.area.value=t.replace(p,"\\n");try{this.form.submit()}catch(t){}this.iframe.attachEvent?this.iframe.onreadystatechange=function(){"complete"===o.iframe.readyState&&r()}:this.iframe.onload=r}}).call(e,function(){return this}())},function(t,e,r){function n(t){var e=t&&t.forceBase64;e&&(this.supportsBinary=!1),this.perMessageDeflate=t.perMessageDeflate,this.usingBrowserWebSocket=o&&!t.forceNode,this.protocols=t.protocols,this.usingBrowserWebSocket||(u=i),s.call(this,t)}var o,i,s=r(17),a=r(18),c=r(26),p=r(27),h=r(28);r(3)("engine.io-client:websocket");if("undefined"!=typeof WebSocket?o=WebSocket:"undefined"!=typeof self&&(o=self.WebSocket||self.MozWebSocket),"undefined"==typeof window)try{i=r(31)}catch(t){}var u=o||i;t.exports=n,p(n,s),n.prototype.name="websocket",n.prototype.supportsBinary=!0,n.prototype.doOpen=function(){if(this.check()){var t=this.uri(),e=this.protocols,r={agent:this.agent,perMessageDeflate:this.perMessageDeflate};r.pfx=this.pfx,r.key=this.key,r.passphrase=this.passphrase,r.cert=this.cert,r.ca=this.ca,r.ciphers=this.ciphers,r.rejectUnauthorized=this.rejectUnauthorized,this.extraHeaders&&(r.headers=this.extraHeaders),this.localAddress&&(r.localAddress=this.localAddress);try{this.ws=this.usingBrowserWebSocket&&!this.isReactNative?e?new u(t,e):new u(t):new u(t,e,r)}catch(t){return this.emit("error",t)}void 0===this.ws.binaryType&&(this.supportsBinary=!1),this.ws.supports&&this.ws.supports.binary?(this.supportsBinary=!0,this.ws.binaryType="nodebuffer"):this.ws.binaryType="arraybuffer",this.addEventListeners()}},n.prototype.addEventListeners=function(){var t=this;this.ws.onopen=function(){t.onOpen()},this.ws.onclose=function(){t.onClose()},this.ws.onmessage=function(e){t.onData(e.data)},this.ws.onerror=function(e){t.onError("websocket error",e)}},n.prototype.write=function(t){function e(){r.emit("flush"),setTimeout(function(){r.writable=!0,r.emit("drain")},0)}var r=this;this.writable=!1;for(var n=t.length,o=0,i=n;o0&&t.jitter<=1?t.jitter:0,this.attempts=0}t.exports=r,r.prototype.duration=function(){var t=this.ms*Math.pow(this.factor,this.attempts++);if(this.jitter){var e=Math.random(),r=Math.floor(e*this.jitter*t);t=0==(1&Math.floor(10*e))?t-r:t+r}return 0|Math.min(t,this.max)},r.prototype.reset=function(){this.attempts=0},r.prototype.setMin=function(t){this.ms=t},r.prototype.setMax=function(t){this.max=t},r.prototype.setJitter=function(t){this.jitter=t}}])});
+//# sourceMappingURL=socket.io.slim.js.map
\ No newline at end of file
diff --git a/openxc/tools/templates/dashboard.html b/openxc/tools/templates/dashboard.html
new file mode 100644
index 00000000..73a90333
--- /dev/null
+++ b/openxc/tools/templates/dashboard.html
@@ -0,0 +1,22 @@
+
+
+
+ Flask-SocketIO Test
+
+
+
+
+
+
+
+ OpenXC Dashboard
+
+ | Signal Name |
+ Value |
+ # Received |
+ Freq. (Hz) |
+
+
+
+
+
\ No newline at end of file
diff --git a/openxc/utils.py b/openxc/utils.py
index c0b86f8b..de20dde1 100644
--- a/openxc/utils.py
+++ b/openxc/utils.py
@@ -90,10 +90,20 @@ def find_file(filename, search_paths):
filename, search_paths))
+def dict_raise_on_duplicates(ordered_pairs):
+ """Reject duplicate keys."""
+ d = {}
+ for k, v in ordered_pairs:
+ if k in d:
+ raise ValueError("duplicate key: %r" % (k,))
+ else:
+ d[k] = v
+ return d
+
def load_json_from_search_path(filename, search_paths):
with open(find_file(filename, search_paths)) as json_file:
try:
- data = json.load(json_file)
+ data = json.load(json_file, object_pairs_hook=dict_raise_on_duplicates)
except ValueError as e:
fatal_error("%s does not contain valid JSON: \n%s\n" %
(filename, e))
diff --git a/openxc/version.py b/openxc/version.py
index bec35191..3869d1a0 100644
--- a/openxc/version.py
+++ b/openxc/version.py
@@ -6,7 +6,7 @@
which in turn needs access to this version information.)
"""
-VERSION = (1, 0, 0)
+VERSION = (1, 1, 0)
__version__ = '.'.join(map(str, VERSION))
diff --git a/setup.py b/setup.py
index c2d0aec5..c6829e10 100644
--- a/setup.py
+++ b/setup.py
@@ -13,13 +13,12 @@
install_reqs = ['pyusb==1.0.0a3', 'units >= 0.5', 'argparse', 'requests==2.20.0',
'protobuf==3.9.1']
-if sys.platform == 'win32':
- install_reqs.append('windows-curses >= 1.1')
setup(name='openxc',
version=get_version(),
description='A Python library to connect to an OpenXC vehicle interface',
long_description=long_description,
+ long_description_content_type="text/x-rst",
author='Christopher Peplin',
author_email='cpeplin@ford.com',
license='BSD',
@@ -32,7 +31,7 @@
],
url='http://github.com/openxc/openxc-python',
packages=find_packages(exclude=["tests", "tests.*"]),
- package_data={'openxc': ['generator/signals.cpp*']},
+ package_data={'openxc': ['generator/signals.cpp*'], 'openxc': ['tools/templates/dashboard.html*']},
test_suite='nose.collector',
tests_require=['nose'],
install_requires=install_reqs,
diff --git a/tests/mapped_signals.json.example b/tests/mapped_signals.json.example
index 3bec16cd..c1ca876f 100644
--- a/tests/mapped_signals.json.example
+++ b/tests/mapped_signals.json.example
@@ -2,24 +2,26 @@
"messages": {
"0x128": {
"name": "ECM_z_5D2",
+ "handlers": ["handleInvertedSteeringWheel","ignoreHandler","handleSteeringWheelMessage"],
"signals": {
"StrAnglAct": {
"generic_name": "SteeringWheelAngle",
"bit_position": 52,
"bit_size": 12,
"factor": 0.15392,
- "offset": 0,
- "handler": "handleInvertedSteeringWheel"},
+ "offset": 0
+ },
"StrAnglSign": {
"generic_name": "steering_angle_sign",
- "handler": "ignoreHandler",
"bit_position": 52,
- "bit_size": 12},
+ "bit_size": 12
+ },
"EngSpd": {
"generic_name": "engine_speed",
"max_frequency": 5,
"bit_position": 12,
- "bit_size": 8},
+ "bit_size": 8
+ },
"GrshftPos": {
"generic_name": "GearshiftPosition",
"bit_position": 41,
@@ -31,23 +33,21 @@
"FOURTH": [4],
"REVERSE": [5],
"NEUTRAL": [6]}
- },
+ },
"StrAnglErr": {
- "handler": "ignoreHandler",
"generic_name": "steering_wheel_angle_error",
"bit_position": 44,
"bit_size": 12
}
- },
- "handlers": ["handleSteeringWheelMessage"]
+ }
},
"0x49": {
"name": "BrkSt",
+ "handlers": ["booleanHandler"],
"signals": {
"BrakePedalPosition": {
"generic_name": "brake_pedal_status",
"send_same": false,
- "handler": "booleanHandler",
"bit_position": 0,
"bit_size": 0
}
@@ -58,19 +58,17 @@
"signals": {
"TurnSignalLeft": {
"generic_name": "turn_signal_left",
- "handler": "booleanHandler",
"bit_position": 0,
"bit_size": 0,
"writable": true,
- "write_handler": "booleanWriter"
+ "encoder": "booleanWriter"
},
"TurnSignalRight": {
"generic_name": "turn_signal_right",
- "handler": "booleanHandler",
"bit_position": 1,
"bit_size": 0,
"writable": true,
- "write_handler": "booleanWriter"
+ "encoder": "booleanWriter"
}
}
}