remove namespaces

raspberry/roberto/camera/camera_gstreamer_webrtc.py

@@ -162,7 +162,7 @@ class WebRTCCamera(Thread):
     def connect(self):
         while not sio.sid:
             print("connecting camera websocket..")
-            sio.connect(self.server, namespaces=['/webrtc'], transports=['websocket'])
+            sio.connect(self.server, transports=['websocket'])
             time.sleep(1)
         print('camera sid is', sio.sid)
         self.sid = sio.sid
@@ -343,7 +343,7 @@ class WebRTCCamera(Thread):
     def on_ice_candidate(self, _, mlineindex, candidate, client_sid):
         print("on_ice_candidate [%s]" % client_sid)
         icemsg = json.dumps({'type': 'ice', 'data': {'candidate': candidate, 'sdpMLineIndex': mlineindex}, 'sid': client_sid})
-        sio.emit('message', data=icemsg, namespace='/webrtc')
+        sio.emit('message', data=icemsg)
 
     # Offer created by our pipeline, to be sent to the peer
     def on_offer_created(self, promise, _, client_sid, __):
@@ -357,10 +357,10 @@ class WebRTCCamera(Thread):
         text = offer.sdp.as_text()
         print ('Sending offer:\n%s' % text)
         msg = json.dumps({'type': 'sdp', 'data': {'type': 'offer', 'sdp': text}, 'sid': client_sid})
-        sio.emit('message', data=msg, namespace='/webrtc')
+        sio.emit('message', data=msg)
         print("test")
 
-    @sio.on('message', namespace='/webrtc')
+    @sio.on('message')
     def webrtc_message(data):
         from roberto import webrtccamera
 #        print('WebRTCCamera got Message: {}'.format(data))

raspberry/roberto/views/frontend/templates/gamepad.js

@@ -7,11 +7,11 @@
  * You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-namespace = '/gamepad';
-var gp_socket = io(namespace, { transports: [ 'websocket' ] });
+//namespace = '/gamepad';
+//var gp_socket = io(namespace, { transports: [ 'websocket' ] });
 
-gp_socket.on('connect', function() {
-    gp_socket.emit('my_event', {data: 'I\'m connected!'});
+socket.on('connect', function() {
+    socket.emit('my_event', {data: 'I\'m connected!'});
 });
 
 var haveEvents = 'GamepadEvent' in window;
@@ -69,7 +69,7 @@ function updateStatus() {
     }
 
     if (axesChanged) {
-      gp_socket.emit('axes', {0: controller.axes[0], 1: controller.axes[1], 3: controller.axes[3], 4: controller.axes[4]});
+      socket.emit('axes', {0: controller.axes[0], 1: controller.axes[1], 3: controller.axes[3], 4: controller.axes[4]});
     }
   }
   rAF(updateStatus);
@@ -144,7 +144,7 @@ var joystick_axes = {
 
 setInterval(function(){
     if (joystick_axes.moved) {
-        gp_socket.emit('axes', {0: joystick_axes.x1, 1: joystick_axes.y1, 3: joystick_axes.x2, 4: joystick_axes.y2});
+        socket.emit('axes', {0: joystick_axes.x1, 1: joystick_axes.y1, 3: joystick_axes.x2, 4: joystick_axes.y2});
         joystick_axes.moved = false;
     }
 }, 50);

raspberry/roberto/views/frontend/templates/index.html

@@ -87,7 +87,7 @@
     <script type="text/javascript">
       'use strict';
       var html5VideoElement;
-      var wsUrl = "wss://" + window.location.hostname + ":" + window.location.port + "/webrtc";
+      var wsUrl = "wss://" + window.location.hostname + ":" + window.location.port;
       var socket = io.connect(wsUrl, { autoConnect: false, transports: [ 'websocket' ] });
       var webrtcPeerConnection;
       var webrtcConfiguration;
@@ -225,16 +225,6 @@ function getConnectionStats() {
 
 var statsInterval = window.setInterval(getConnectionStats, 1000);
 
-setInterval(function(){
-    if (socket.connected) {
-        socket.emit('ping_message', { "type": "ping" });
-    }
-}, 10000);
-
-socket.on('ping_message', (data) => {
-  console.log('ping received: ',data);
-});
-
     </script>
 
     <script src="{{ url_for('frontend.gamepad_js') }}"></script>

raspberry/roberto/views/websocket/routes.py

@@ -10,23 +10,7 @@ from roberto import socketio
 #### routes ####
 ################
  
-@socketio.on('my_event', namespace='/test')
-def test_message(message):
-    emit('my response', {'data': message['data']})
-
-@socketio.on('my broadcast event', namespace='/test')
-def test_message(message):
-    emit('my response', {'data': message['data']}, broadcast=True)
-
-@socketio.on('connect', namespace='/test')
-def test_connect():
-    emit('my response', {'data': 'Connected'})
-
-@socketio.on('disconnect', namespace='/test')
-def test_disconnect():
-    print('Client disconnected')
-
-@socketio.on('axes', namespace='/gamepad')
+@socketio.on('axes')
 def gamepad_axes(axes_data):
     print('GAMEPAD axes')
     print(axes_data)
@@ -53,7 +37,7 @@ def applyDeadZone(value, threshold):
          new_value = new_value * -1
     return new_value
 
-@socketio.on('text', namespace='/gamepad')
+@socketio.on('text')
 def display_text(text):
     print("display_text()")
     print(text['data'])
@@ -73,7 +57,7 @@ ROOM = 'default'
 def camera():
     return render_template('camera.html', room=ROOM)
 
-@socketio.on('message', namespace='/webrtc')  # ok
+@socketio.on('message')  # ok
 def webrtc_message(data):
     sid = request.sid
     print('Message from {}: {}'.format(sid, data))
@@ -88,15 +72,9 @@ def webrtc_message(data):
         data['from_sid'] = sid
     else:
         print("unknown message type")
-    socketio.emit('message', data=data, room=ROOM, namespace='/webrtc', skip_sid=sid)
-
-@socketio.on('ping_message', namespace='/webrtc')
-def ping_message(data):
-    sid = request.sid
-    print("Received ping from %s" % sid)
-    socketio.emit('ping_message', data={ 'type':'pong' }, room=sid, namespace='/webrtc')
+    socketio.emit('message', data=data, room=ROOM, skip_sid=sid)
 
-@socketio.on('disconnect', namespace='/webrtc')
+@socketio.on('disconnect')
 def disconnect():
     sid = request.sid
     print("Received Disconnect message from %s" % sid)
@@ -106,7 +84,7 @@ def disconnect():
     if sid != webrtccamera.sid:
         serial.del_callback('B', display_battery)
 
-@socketio.on('connect', namespace='/webrtc')
+@socketio.on('connect')
 def connect():
     sid = request.sid
     print("Received Connect message from %s" % sid)
@@ -126,5 +104,5 @@ def default_error_handler(e):
         print('%s: %s' % (key, repr(request[key])))
 
 def display_battery(val):
-    socketio.emit('battery', data=val, room=ROOM, namespace='/webrtc')
-    socketio.emit('battery', data=val, namespace='/webrtc')
+    socketio.emit('battery', data=val, room=ROOM)
+    #socketio.emit('battery', data=val)