Merge branch 'nightly' into 'master'

0.9.6 Release

See merge request osp-group/flask-nginx-rtmp-manager!373

ATTRIBUTION

@@ -12,6 +12,7 @@
 - Bootstrap-Toggle - Used to Build Toggle Buttons with Bootstrap
 - NGINX - Open-Source, high-performance HTTP server and reverse proxy
 - NGINX-RTMP-Module - NGINX Module for RTMP/HLS/MPEG-DASH live streaming
+- winshining/nginx-http-flv-module - Replacement Nginx Module for RTMP/HLS Live Streaming
 - Socket.io - Real-Time Communications Engine Between Client and Server
 - Flask Socket.io - Interface Socket.io with Flask
 - Video.js - Handles the HTML5 Video Playback of HLS video streams and MP4 Files

CHANGELOG

@@ -1,3 +1,11 @@
+0.9.6
+==============================================
+Nginx-OSP: Moved Core Code of Nginx RTMP to winshining/nginx-http-flv-module.  New Installs will use the new backend. Existing can be migrated using Reset Nginx via osp-config.sh
+OSP-Core: Hourly Task of Cleaning up Guests which have not logged in within the last 3 months
+OSP-Core: Hourly Task of Cleaning up Read/Unread Notifications in DB (90 days for read, 180 days for unread)
+OSP-Core: Optimized RTMP Stage 1, Stage 2, and RTMP Restream API Queries which were causing an issue with Starting a Stream on larger channels
+OSP-Core: Optimized User Channels Settings Page to load and post faster
+
 0.9.5
 ==============================================
 OSP-Core: Upgrade Cachelib == 0.8.0

blueprints/apis/channel_ns.py

@@ -356,12 +356,29 @@ def get(self, channelEndpointID):
             channelData = cachedDbCalls.getChannelByLoc(channelEndpointID)
 
         if channelData is not None:
-            restreamDestinationQuery = Channel.restreamDestinations.query.filter_by(
-                channel=channelData.id
-            ).all()
-            restreamDestinations = restreamDestinationQuery
+            restreamDestinationQuery = (
+                Channel.restreamDestinations.query.filter_by(channel=channelData.id)
+                .with_entities(
+                    Channel.restreamDestinations.id,
+                    Channel.restreamDestinations.channel,
+                    Channel.restreamDestinations.name,
+                    Channel.restreamDestinations.enabled,
+                    Channel.restreamDestinations.url,
+                )
+                .all()
+            )
+            restreamDestinations = []
+            for entry in restreamDestinationQuery:
+                serialized = {
+                    "id": entry.id,
+                    "channel": templateFilters.get_channelLocationFromID(entry.channel),
+                    "name": entry.name,
+                    "enabled": entry.enabled,
+                    "url": entry.url,
+                }
+                restreamDestinations.append(serialized)
             db.session.commit()
-            return {"results": [ob.serialize() for ob in restreamDestinations]}
+            return {"results": restreamDestinations}
 
         else:
             db.session.commit()

blueprints/apis/rtmp_ns.py

@@ -3,6 +3,7 @@
 import datetime
 import socket
 import hashlib
+import logging
 
 from classes import settings
 from classes import Channel
@@ -13,6 +14,8 @@
 from functions import system
 from functions import securityFunc
 
+log = logging.getLogger("app.blueprints.apis.rtmp_ns")
+
 
 def checkRTMPAuthIP(requestData):
     authorized = False
@@ -94,6 +97,12 @@ def post(self):
         # Perform RTMP IP Authorization Check
         authorized = checkRTMPAuthIP(request)
         if authorized[0] is False:
+            log.warning(
+                {
+                    "level": "warning",
+                    "message": "Unauthorized RTMP Server - " + authorized[1],
+                }
+            )
             return {
                 "results": {"message": "Unauthorized RTMP Server - " + authorized[1]}
             }, 400
@@ -105,10 +114,28 @@ def post(self):
             addr = args["addr"]
             results = rtmpFunc.rtmp_stage1_streamkey_check(name, addr)
             if results["success"] is True:
+                log.info(
+                    {
+                        "level": "info",
+                        "message": "Stage 1 Auth Complete - " + results["channelLoc"],
+                    }
+                )
                 return {"results": results}, 200
             else:
+                log.warning(
+                    {
+                        "level": "warning",
+                        "message": "Stage 1 Auth Failed - " + results["channelLoc"],
+                    }
+                )
                 return {"results": results}, 400
         else:
+            log.warning(
+                {
+                    "level": "warning",
+                    "message": "Stage 1 Auth Failed - Missing Required Data",
+                }
+            )
             return {
                 "results": {
                     "time": str(datetime.datetime.utcnow()),
@@ -140,6 +167,12 @@ def post(self):
         # Perform RTMP IP Authorization Check
         authorized = checkRTMPAuthIP(request)
         if authorized[0] is False:
+            log.warning(
+                {
+                    "level": "warning",
+                    "message": "Unauthorized RTMP Server - " + authorized[1],
+                }
+            )
             return {
                 "results": {"message": "Unauthorized RTMP Server - " + authorized[1]}
             }, 400
@@ -152,10 +185,28 @@ def post(self):
             rtmpServer = authorized[2]
             results = rtmpFunc.rtmp_stage2_user_auth_check(name, addr, rtmpServer)
             if results["success"] is True:
+                log.info(
+                    {
+                        "level": "info",
+                        "message": "Stage 2 Auth Complete - " + results["channelLoc"],
+                    }
+                )
                 return {"results": results}, 200
             else:
+                log.warning(
+                    {
+                        "level": "warning",
+                        "message": "Stage 2 Auth Failed - " + results["channelLoc"],
+                    }
+                )
                 return {"results": results}, 400
         else:
+            log.warning(
+                {
+                    "level": "warning",
+                    "message": "Stage 2 Auth Failed - Missing Required Data",
+                }
+            )
             return {
                 "results": {
                     "time": str(datetime.datetime.utcnow()),
@@ -182,6 +233,12 @@ def post(self):
         # Perform RTMP IP Authorization Check
         authorized = checkRTMPAuthIP(request)
         if authorized[0] is False:
+            log.warning(
+                {
+                    "level": "warning",
+                    "message": "Unauthorized RTMP Server - " + authorized[1],
+                }
+            )
             return {
                 "results": {"message": "Unauthorized RTMP Server - " + authorized[1]}
             }, 400