diff --git a/aprsd/flask.py b/aprsd/flask.py
index bf4a81c..62b8fa9 100644
--- a/aprsd/flask.py
+++ b/aprsd/flask.py
@@ -199,7 +199,7 @@ class SendMessageThread(threads.APRSDThread):
SentMessages().ack(self.msg.id)
socketio.emit(
"ack", SentMessages().get(self.msg.id),
- namespace="/ws",
+ namespace="/sendmsg",
)
stats.APRSDStats().ack_rx_inc()
self.got_ack = True
@@ -224,7 +224,7 @@ class SendMessageThread(threads.APRSDThread):
SentMessages().set_status(self.msg.id, "Got Reply")
socketio.emit(
"reply", SentMessages().get(self.msg.id),
- namespace="/ws",
+ namespace="/sendmsg",
)
# Send the ack back?
@@ -449,8 +449,8 @@ class SendMessageNamespace(Namespace):
global socketio
LOG.debug("Web socket connected")
socketio.emit(
- "connected", {"data": "Lets dance"},
- namespace="/ws",
+ "connected", {"data": "/sendmsg Connected"},
+ namespace="/sendmsg",
)
def on_disconnect(self):
@@ -470,7 +470,7 @@ class SendMessageNamespace(Namespace):
msgs.set_status(msg.id, "Sending")
socketio.emit(
"sent", SentMessages().get(self.msg.id),
- namespace="/ws",
+ namespace="/sendmsg",
)
socketio.start_background_task(self._start, self._config, data, msg, self)
@@ -548,5 +548,5 @@ def init_flask(config, loglevel, quiet):
# import eventlet
# eventlet.monkey_patch()
- socketio.on_namespace(SendMessageNamespace("/ws", config=config))
+ socketio.on_namespace(SendMessageNamespace("/sendmsg", config=config))
return socketio, flask_app
diff --git a/aprsd/web/static/js/send-message.js b/aprsd/web/static/js/send-message.js
index 812cafc..51b71c4 100644
--- a/aprsd/web/static/js/send-message.js
+++ b/aprsd/web/static/js/send-message.js
@@ -1,10 +1,9 @@
-msgs_list = {};
var cleared = false;
function size_dict(d){c=0; for (i in d) ++c; return c}
function init_messages() {
- const socket = io("/ws");
+ const socket = io("/sendmsg");
socket.on('connect', function () {
console.log("Connected to socketio");
});
@@ -62,7 +61,7 @@ function init_messages() {
}
function add_msg(msg) {
- var msgsdiv = $("#msgsDiv");
+ var msgsdiv = $("#sendMsgsDiv");
ts_str = msg["ts"].toString();
ts = ts_str.split(".")[0]*1000;
@@ -96,7 +95,7 @@ function add_msg(msg) {
}
function update_msg(msg) {
- var msgsdiv = $("#msgsDiv");
+ var msgsdiv = $("#sendMsgsDiv");
// We have an existing entry
ts_str = msg["ts"].toString();
id = ts_str.split('.')[0]
diff --git a/aprsd/web/templates/index.html b/aprsd/web/templates/index.html
index f82be37..97523b1 100644
--- a/aprsd/web/templates/index.html
+++ b/aprsd/web/templates/index.html
@@ -3,6 +3,8 @@
+
+
@@ -17,6 +19,8 @@
+
+