Merge branch 'metabrainz:master' into service-status-frontend

Author: MrKomodoDragon

docker/docker-compose.test.yml

@@ -79,7 +79,7 @@ services:
     image: listenbrainz
     volumes:
       - ..:/code/listenbrainz:z
-    command: python manage.py run_websockets -h 0.0.0.0 -p 8102
+    command: python run_websockets.py -h 0.0.0.0 -p 8102
     user: "${LB_DOCKER_USER:-root}:${LB_DOCKER_GROUP:-root}"
     expose:
       - "8102"

docker/docker-compose.yml

@@ -142,7 +142,7 @@ services:
     image: web
     volumes:
       - ..:/code/listenbrainz:z
-    command: python manage.py run_websockets -h 0.0.0.0 -p 8102
+    command: python run_websockets.py -h 0.0.0.0 -p 8102
     ports:
       - "127.0.0.1:8102:8102"
     user: "${LB_DOCKER_USER:-root}:${LB_DOCKER_GROUP:-root}"

docker/services/websockets/consul-template-websockets.conf

@@ -4,7 +4,7 @@ template {
 }
 
 exec {
-    command = ["run-lb-command", "python3", "manage.py", "run_websockets", "-h", "0.0.0.0", "-p", "3031"]
+    command = ["run-lb-command", "python3", "run_websockets.py", "-h", "0.0.0.0", "-p", "3031"]
     splay = "5s"
     reload_signal = "SIGHUP"
     kill_signal = "SIGTERM"

frontend/js/src/user/charts/components/Bar.tsx

@@ -49,9 +49,10 @@ export default function Bar(props: BarProps) {
   const horizontalAxis = {
     tickSize: 5,
     tickValues: numberOfTicks,
-    tickPadding: 5,
+    tickPadding: 8,
     legend: "Number of listens",
-    legendOffset: 30,
+    legendOffset: 45,
+    legendPosition: "middle",
   };
 
   return (

frontend/js/src/user/stats/components/UserEraActivity.tsx

@@ -345,7 +345,7 @@ export default function UserEraActivity({ user, range }: UserEraActivityProps) {
                     axisLeft={{
                       legend: "Number of listens",
                       legendPosition: "middle",
-                      legendOffset: -40,
+                      legendOffset: -52,
                       format: ".2~s",
                     }}
                     minValue={0}

listenbrainz/manage.py

@@ -30,21 +30,6 @@ def cli():
 TIMESCALE_SQL_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'admin', 'timescale')
 
 
-@cli.command(name="run_websockets")
-@click.option("--host", "-h", default="0.0.0.0", show_default=True)
-@click.option("--port", "-p", default=7082, show_default=True)
-@click.option("--debug",
-              "-d",
-              is_flag=True,
-              help="Turns debugging mode on or off. If specified, overrides "
-              "'DEBUG' value in the config file.")
-def run_websockets(host, port, debug=True):
-    from listenbrainz.websockets.websockets import run_websockets
-    application = webserver.create_app()
-    with application.app_context():
-        run_websockets(application, host=host, port=port, debug=debug)
-
-
 @cli.command(name="init_db")
 @click.option("--force", "-f", is_flag=True, help="Drop existing database and user.")
 @click.option("--create-db", is_flag=True, help="Create the database and user.")

listenbrainz/tests/integration/test_websockets.py

@@ -17,10 +17,6 @@ def test_valid_single(self):
         with open(self.path_to_data_file("valid_single.json"), "r") as f:
             payload = json.load(f)
 
-        response = self.send_data(payload)
-        self.assert200(response)
-        self.assertEqual(response.json["status"], "ok")
-
         received_listen = None
         timeout = 5  # 5 seconds timeout
 
@@ -29,6 +25,10 @@ def listen(message):
             nonlocal received_listen
             received_listen = message
 
+        response = self.send_data(payload)
+        self.assert200(response)
+        self.assertEqual(response.json["status"], "ok")
+
         start_time = time.time()
         while received_listen is None and time.time() - start_time < timeout:
             self.sio.sleep(1)
@@ -46,10 +46,6 @@ def test_valid_playing_now(self):
         with open(self.path_to_data_file("valid_playing_now.json"), "r") as f:
             payload = json.load(f)
 
-        response = self.send_data(payload)
-        self.assert200(response)
-        self.assertEqual(response.json['status'], 'ok')
-
         received_playing_now = None
         timeout = 5  # 5 seconds timeout
 
@@ -58,6 +54,10 @@ def playing_now(message):
             nonlocal received_playing_now
             received_playing_now = message
 
+        response = self.send_data(payload)
+        self.assert200(response)
+        self.assertEqual(response.json['status'], 'ok')
+
         # Wait for the 'playing_now' event
         start_time = time.time()
         while received_playing_now is None and time.time() - start_time < timeout:

listenbrainz/websockets/websockets.py

@@ -1,5 +1,3 @@
-import eventlet
-
 from flask_login import current_user
 from flask_socketio import SocketIO, join_room, emit, disconnect
 from werkzeug.exceptions import BadRequest
@@ -8,9 +6,7 @@
 from listenbrainz.webserver import ts_conn, db_conn
 from listenbrainz.websockets.listens_dispatcher import ListensDispatcher
 
-eventlet.monkey_patch(all=False, socket=True)
-
-socketio = SocketIO(cors_allowed_origins='*', logger=True, engineio_logger=True)
+socketio = SocketIO(async_mode="gevent", cors_allowed_origins='*', logger=True, engineio_logger=True)
 
 
 @socketio.on('json')

package-lock.json

@@ -69,7 +69,7 @@
     "d3-scale-chromatic": "^3.0.0",
     "date-fns": "^3.6.0",
     "debounce-async": "0.0.2",
-    "dompurify": "^3.2.4",
+    "dompurify": "^3.3.1",
     "external-svg-loader": "^1.7.1",
     "fetch-retry": "^5.0.3",
     "file-saver": "^2.0.5",