Merge pull request #1303 from sdr-enthusiasts/updates

Update deps and move to event
sdr-enthusiasts · Oct 24, 2024 · 49e27aa · 49e27aa
2 parents d0d7608 + 7280bd1
commit 49e27aa
Show file tree

Hide file tree

Showing 7 changed files with 521 additions and 531 deletions.
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/[email protected]

diff --git a/acarshub-typescript/package-lock.json b/acarshub-typescript/package-lock.json
diff --git a/acarshub-typescript/package.json b/acarshub-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acarshub-typescript",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Web front end for the docker-acarshub project",
   "main": "index.js",
   "repository": "https://github.com/sdr-enthusiasts/docker-acarshub",
@@ -13,19 +13,19 @@
   "author": "Fred Clausen",
   "license": "GPL-3.0-only",
   "devDependencies": {
-    "@babel/core": "7.25.8",
-    "@babel/preset-env": "7.25.8",
-    "@types/jquery": "3.5.31",
+    "@babel/core": "7.25.9",
+    "@babel/preset-env": "7.25.9",
+    "@types/jquery": "3.5.32",
     "@types/js-cookie": "3.0.6",
-    "@types/leaflet": "1.9.13",
-    "@types/node": "22.7.7",
+    "@types/leaflet": "1.9.14",
+    "@types/node": "22.7.9",
     "@types/showdown": "2.0.6",
     "autoprefixer": "10.4.20",
     "babel-loader": "9.2.1",
     "css-loader": "7.1.2",
     "favicons": "7.2.0",
     "favicons-webpack-plugin": "6.0.1",
-    "html-webpack-plugin": "5.6.2",
+    "html-webpack-plugin": "5.6.3",
     "inject-body-webpack-plugin": "1.3.0",
     "path": "0.12.7",
     "postcss-loader": "8.1.1",
@@ -40,7 +40,7 @@
     "webpack-image-loader": "0.1.2"
   },
   "dependencies": {
-    "@airframes/acars-decoder": "1.6.11",
+    "@airframes/acars-decoder": "1.6.12",
     "@fortawesome/fontawesome-free": "6.6.0",
     "@fortawesome/fontawesome-svg-core": "6.6.0",
     "@fortawesome/free-regular-svg-icons": "6.6.0",

diff --git a/rootfs/etc/s6-overlay/scripts/webapp b/rootfs/etc/s6-overlay/scripts/webapp
@@ -14,7 +14,7 @@ if [[ ${ENABLE_WEB,,} =~ true ]]; then
       -b "0.0.0.0:8888" \
       -w 1 \
       --no-sendfile \
-      -k eventlet \
+      -k gevent \
       acarshub:app \
       --timeout 120 \
     2>&1 | stdbuf -oL sed --unbuffered '/^$/d' | \

diff --git a/rootfs/webapp/acarshub.py b/rootfs/webapp/acarshub.py
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with acarshub.  If not, see <http://www.gnu.org/licenses/>.
 
-import eventlet
-
-eventlet.monkey_patch()
 import acarshub_helpers  # noqa: E402
 import acarshub_configuration  # noqa: E402
 import acarshub_logging  # noqa: E402
@@ -362,14 +359,14 @@ def message_listener(message_type=None, ip="127.0.0.1", port=None):
                 acarshub_logging.log(
                     "Reassembly successful, message not skipped after all!",
                     f"{message_type.lower()}Generator",
-                    level=LOG_LEVEL["DEBUG"]
+                    level=LOG_LEVEL["DEBUG"],
                 )
             except Exception as e:
                 # reassembly didn't work, don't do anything but print an error when debug is enabled
                 acarshub_logging.log(
                     f"Reassembly failed {e}: {combined}",
                     f"{message_type.lower()}Generator",
-                    level=LOG_LEVEL["WARNING"]
+                    level=LOG_LEVEL["WARNING"],
                 )
 
             # forget the partial message, it can't be useful anymore
@@ -389,7 +386,9 @@ def message_listener(message_type=None, ip="127.0.0.1", port=None):
                     # last element in the list, could be a partial json object
                     partial_message = part
                 acarshub_logging.log(
-                    f"Skipping Message: {part}", f"{message_type.lower()}Generator", LOG_LEVEL["DEBUG"]
+                    f"Skipping Message: {part}",
+                    f"{message_type.lower()}Generator",
+                    LOG_LEVEL["DEBUG"],
                 )
                 continue
             except Exception as e:
@@ -432,9 +431,7 @@ def message_listener(message_type=None, ip="127.0.0.1", port=None):
                 if not acarshub_configuration.QUIET_MESSAGES:
                     print(f"MESSAGE:{message_type.lower()}Generator: {msg}")
 
-                client_message = generateClientMessage(
-                    que_type, formatted_message
-                )
+                client_message = generateClientMessage(que_type, formatted_message)
 
                 # add to recent message que for anyone fresh loading the page
                 list_of_recent_messages.append(client_message)
@@ -460,9 +457,11 @@ def init_listeners(special_message=""):
 
     # show log message if this is container startup
     acarshub_logging.log(
-        "Starting Data Listeners"
-        if special_message == ""
-        else "Checking Data Listeners",
+        (
+            "Starting Data Listeners"
+            if special_message == ""
+            else "Checking Data Listeners"
+        ),
         "init",
         level=LOG_LEVEL["INFO"] if special_message == "" else LOG_LEVEL["DEBUG"],
     )

diff --git a/rootfs/webapp/requirements.txt b/rootfs/webapp/requirements.txt
@@ -1,7 +1,7 @@
-eventlet==0.37.0
 Flask==3.0.3
-Flask-SocketIO==5.3.7
-gunicorn[eventlet]==23.0.0
+Flask-SocketIO==5.4.1
+gevent==24.10.3
+gunicorn[gevent]==23.0.0
 requests==2.32.3
 rrdtool==0.1.16
 schedule==1.2.2

diff --git a/version-nextgen b/version-nextgen
@@ -1 +1 @@
-v3.6.0
+v3.7.0