diff --git a/src/RunMe.sh b/src/RunMe.sh index dcafed8..75317ef 100644 --- a/src/RunMe.sh +++ b/src/RunMe.sh @@ -10,13 +10,13 @@ # ./RunMe.sh 8080 4 # custom port + verbose=4 # GOMEMLIMIT=4G ./RunMe.sh # override memory limit # MAX_STREAMS=8 ./RunMe.sh # limit concurrent streams -# MONITOR=false ./RunMe.sh # disable security monitor +# MONITOR=true ./RunMe.sh # enable security monitor # HLS_PROXY=false ./RunMe.sh # disable HLS proxy set -euo pipefail # ─── Config Defaults ─────────────────────────────────────────────────── -MONITOR="${MONITOR:-true}" +MONITOR="${MONITOR:-false}" MONITOR_PORT="${MONITOR_PORT:-1339}" HLS_PROXY="${HLS_PROXY:-true}" @@ -39,7 +39,7 @@ ADMIN_PASS="${ADMIN_PASS:-admin1337}" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" VENV_DIR="$SCRIPT_DIR/venv" -HLS_PROXY_CONFIG="${HLS_PROXY_CONFIG:-$PROJECT_ROOT/cache/orig_urls.json}" +HLS_PROXY_CONFIG="${HLS_PROXY_CONFIG:-$SCRIPT_DIR/cache/orig_urls.json}" export PATH="$VENV_DIR/bin:/usr/bin:/bin:/usr/local/bin:${PATH:-}" cd "$SCRIPT_DIR" @@ -76,7 +76,7 @@ mkdir -p hls/live keys epg dl manifests offair overlay logos fonts \ rec scripts logs providers cache # ─── Build Args ──────────────────────────────────────────────────────── -ARGS="-c o11.cfg -p $PORT -b $BIND -stdout -v $VERBOSE" +ARGS="-c o11.cfg -p $PORT -b $BIND -stdout -v $VERBOSE -providers providers -usecdm" if [ "$KEEP_FALSE" = "true" ]; then ARGS="$ARGS -keep=false" @@ -164,7 +164,7 @@ if [ "$HLS_PROXY" = "true" ]; then else if [ -f "modules/generate_orig_urls.py" ]; then python3 modules/generate_orig_urls.py \ - --dir "$PROJECT_ROOT/providers" \ + --dir "$SCRIPT_DIR/providers" \ --output "$HLS_PROXY_CONFIG" 2>/dev/null || true fi diff --git a/src/modules/hls_proxy.py b/src/modules/hls_proxy.py index 1e5a9bd..c90bc63 100644 --- a/src/modules/hls_proxy.py +++ b/src/modules/hls_proxy.py @@ -20,7 +20,7 @@ from http.server import HTTPServer, BaseHTTPRequestHandler from urllib.parse import urlparse, parse_qs from concurrent.futures import ThreadPoolExecutor -CONFIG_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'cache', 'orig_urls.json') +CONFIG_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'cache', 'orig_urls.json') PROXY_PORT = 9999 PROXY_BIND = '127.0.0.1' UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36' diff --git a/src/test_providers.cfg b/src/test_providers.cfg index 3d40e5d..b029159 100644 --- a/src/test_providers.cfg +++ b/src/test_providers.cfg @@ -150,7 +150,7 @@ "SessionManifest": false, "SpeedUp": true, "ProcessDVBSubs": false, - "UseCdm": false, + "UseCdm": true, "CdmType": "widevine", "CdmMode": "internal", "PRLAVersion": "", @@ -171,7 +171,9 @@ "Type": "hls/ts", "Mode": "live", "BestVideo": "1080p59", - "DrmVendors": null + "DrmVendors": [ + "widevine" + ] }, "Video": "best", "Audio": "mp4a.40.5-104400-48000-2-ENG-en-", @@ -418,7 +420,7 @@ "SessionManifest": false, "SpeedUp": false, "ProcessDVBSubs": false, - "UseCdm": false, + "UseCdm": true, "CdmType": "widevine", "CdmMode": "internal", "PRLAVersion": "",