From 5e364f0814ba8ee2bcac2630da61d38b46f76c1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Aug 2021 22:50:46 +0000
Subject: [PATCH 1/4] Bump websockets from 8.1 to 9.1 in /build

Bumps [websockets](https://github.com/aaugustin/websockets) from 8.1 to 9.1.
- [Release notes](https://github.com/aaugustin/websockets/releases)
- [Changelog](https://github.com/aaugustin/websockets/blob/9.1/docs/changelog.rst)
- [Commits](https://github.com/aaugustin/websockets/compare/8.1...9.1)

---
updated-dependencies:
- dependency-name: websockets
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/requirements.txt b/build/requirements.txt
index 1d8b09f..17487be 100644
--- a/build/requirements.txt
+++ b/build/requirements.txt
@@ -8,7 +8,7 @@ mutagen==1.45.1
 sounddevice==0.4.2
 setproctitle==1.2.2
 pyttsx3==2.90
-websockets==8.1
+websockets==9.1
 typing_extensions==3.10.0.0
 pyserial==3.5
 requests==2.26.0

From ac7d7d022246edc73fa72f3c3bbea05a90325ce7 Mon Sep 17 00:00:00 2001
From: Matthew Stratford <hi@mstratford.net>
Date: Thu, 23 Dec 2021 17:14:54 +0000
Subject: [PATCH 2/4] merge of "dependabot/pip/build/websockets-9.1" and "dev"

---
 build/requirements.txt | 4 ++--
 websocket_server.py    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/requirements.txt b/build/requirements.txt
index 5fd6c4e..c139e14 100644
--- a/build/requirements.txt
+++ b/build/requirements.txt
@@ -1,7 +1,7 @@
 wheel
 pygame==2.0.2
-sanic==21.3.4
-sanic-Cors==1.0.0
+sanic==21.9.3
+sanic-Cors==1.0.1
 syncer==1.3.0
 aiohttp==3.7.4.post0
 mutagen==1.45.1
diff --git a/websocket_server.py b/websocket_server.py
index e43ecb3..bff97af 100644
--- a/websocket_server.py
+++ b/websocket_server.py
@@ -7,7 +7,8 @@ from typing import List
 import websockets
 import json
 from os import _exit
-from websockets.server import Serve
+from websockets.legacy.server import Serve
+from websockets.server import serve
 from setproctitle import setproctitle
 from multiprocessing import current_process
 
@@ -39,7 +40,7 @@ class WebsocketServer:
         self.logger = LoggingManager("Websockets")
         self.server_name = state.get()["server_name"]
 
-        self.websocket_server = websockets.serve(
+        self.websocket_server = serve(
             self.websocket_handler, state.get()["host"], state.get()["ws_port"]
         )
 

From fd87bbd50604779b79fa0e5b74b920a145588b60 Mon Sep 17 00:00:00 2001
From: Matthew Stratford <hi@mstratford.net>
Date: Thu, 23 Dec 2021 17:25:12 +0000
Subject: [PATCH 3/4] Bump to websockets 10.1

---
 build/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/requirements.txt b/build/requirements.txt
index c139e14..ea525e9 100644
--- a/build/requirements.txt
+++ b/build/requirements.txt
@@ -8,7 +8,7 @@ mutagen==1.45.1
 sounddevice==0.4.2
 setproctitle==1.2.2
 pyttsx3==2.90
-websockets==9.1
+websockets==10.1
 typing_extensions==3.10.0.0
 pyserial==3.5
 requests==2.26.0

From 8b4265a33a62aef1fc143662280fea3d5cf544ee Mon Sep 17 00:00:00 2001
From: Matthew Stratford <hi@mstratford.net>
Date: Thu, 23 Dec 2021 17:43:54 +0000
Subject: [PATCH 4/4] Force node 14

---
 .github/workflows/build.yaml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fcd751b..32999fe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -9,7 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ['3.9']
+        node-version: ['14']
 
     steps:
     - uses: actions/checkout@v2
@@ -17,6 +18,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: actions/checkout@v2
+    - name: Set up Node ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
     - name: Build .app
       run: |
         npm run presenter-make
@@ -40,7 +46,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ['3.9']
+        node-version: ['14']
 
     steps:
     - uses: actions/checkout@v2
@@ -48,6 +55,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: actions/checkout@v2
+    - name: Set up Node ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
     - name: Build executable
       run: |
         npm run presenter-make
@@ -70,7 +82,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ['3.9']
+        node-version: ['14']
 
     steps:
     - uses: actions/checkout@v2
@@ -78,6 +91,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: actions/checkout@v2
+    - name: Set up Node ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
     - name: Build .exe
       run: |
         npm run presenter-make