mlbserver 2025.2.25 → 2025.2.27

package/Dockerfile

@@ -21,4 +21,4 @@ RUN npm install
 COPY . .
 
 EXPOSE 9999 10000
-CMD [ "node", "index.js", "--env" ]
+CMD [ "node", "index.js", "--env", "--port", "9999", "--multiview_port", "10000", "--data_directory", "/mlbserver/data_directory" ]

package/README.md

@@ -14,7 +14,7 @@ npm install -g mlbserver
 
 ### docker
 ```
-docker pull tonywagner/mlbserver
+docker pull tonywagner/mlbserver:latest
 ```
 
 
@@ -30,54 +30,10 @@ node index.js
 ```
 
 ### docker-compose
-Update the environment variables below and save it as docker-compose.yml:
-```
-services:
-  mlbserver:
-    image: tonywagner/mlbserver:latest
-    container_name: mlbserver
-    environment:
-      - TZ=America/New York
-      - data_directory=/mlbserver/data_directory
-      - account_username=your.account.email@example.com
-      - account_password=youraccountpassword
-      #- fav_teams=AZ,BAL
-      #- debug=false
-      #- port=9999
-      #- multiview_port=10000
-      #- multiview_path=
-      #- ffmpeg_path=
-      #- ffmpeg_encoder=
-      #- page_username=
-      #- page_password=
-      #- content_protect=
-      #- gamechanger_delay=0
-      #- http_root=/mlbserver
-    ports:
-      - 9999:9999
-      - 10000:10000
-    volumes:
-      - /path/to/your/desired/local/mlbserver/persistent/data/directory:/mlbserver/data_directory
-```
-Then launch it with ```docker-compose up --detach```
+Update the required environment variables in the sample [docker-compose.yml](https://github.com/tonywagner/mlbserver/blob/master/docker-compose.yml) file, then launch it with ```docker-compose up --detach```
 
 ### docker-cli
-Update the environment variables in the command below and run it:
-```
-docker run -d \
-  --name mlbserver \
-  --env TZ="America/New_York" \
-  --env data_directory=/mlbserver/data_directory \
-  --env account_username=your.account.email@example.com \
-  --env account_password=youraccountpassword \
-  -p 9999:9999 \
-  -p 10000:10000 \
-  --volume /path/to/your/desired/local/mlbserver/persistent/data/directory:/mlbserver/data_directory \
-  tonywagner/mlbserver
-```
-Subsequent runs can be launched with ```docker start mlbserver```
-
-Docker installs may require further configuration to get multiview streaming to work.
+Update the environment variables in the sample [docker-cli](https://github.com/tonywagner/mlbserver/blob/master/docker-cli) command, then run the command. Subsequent runs can be launched with ```docker start mlbserver```
 
 
 ## Usage
@@ -93,7 +49,7 @@ Basic command line or Docker environment options:
 --logout or -l (logs out and clears session)
 --session or -s (clears session)
 --cache or -c (clears cache)
---env or -e (use environment variables instead of command line arguments; necessary for Docker)
+--env or -e (use environment variables instead of command line arguments; automatically applied in the Docker image)
 ```
 
 Advanced command line or Docker environment options:
@@ -102,8 +58,9 @@ Advanced command line or Docker environment options:
 --account_username (required, email address, default will use stored credentials or prompt user to enter them if not using Docker)
 --account_password (required, default will use stored credentials or prompt user to enter them if not using Docker)
 --fav_teams (optional, comma-separated list of favorite team abbreviations from https://github.com/tonywagner/mlbserver/blob/master/session.js#L23 -- will prompt if not set or stored and not using Docker)
+--http_root (specify the alternative http webroot or initial path prefix, default is none)
 --free (optional, highlights free games)
---multiview_port (port for multiview streaming; defaults to 1 more than primary port, or 10000)
+--multiview_port (local port for multiview streaming; defaults to 1 more than primary port, or 10000; does not need to be mapped or used externally)
 --multiview_path (where to create the folder for multiview encoded files; defaults to app directory)
 --ffmpeg_path (path to ffmpeg binary to use for multiview encoding; default downloads a binary using ffmpeg-static)
 --ffmpeg_encoder (ffmpeg video encoder to use for multiview; default is the software encoder libx264)
@@ -112,9 +69,11 @@ Advanced command line or Docker environment options:
 --page_password (password to protect pages; default is no protection)
 --content_protect (specify the content protection key to include as a URL parameter, if page protection is enabled)
 --gamechanger_delay (specify extra delay for the gamechanger switches in 10 second increments, default is 0)
---http_root (specify the alternative http webroot or initial path prefix, default is none)
+--data_directory (defaults to installed application directory; in the Docker image, this defaults to /mlbserver/data_directory for mapping persistent storage)
 ```
 
+Supports [SWAG](https://docs.linuxserver.io/general/swag/#preset-proxy-confs) using the custom [mlbserver.subfolder.conf](https://github.com/tonywagner/mlbserver/blob/master/mlbserver.subfolder.conf) file.
+
 For multiview, the default software encoder is limited by your CPU. You may want to experiment with different ffmpeg hardware encoders. "h264_videotoolbox" is confirmed to work on supported Macs, and "h264_v4l2m2m" is confirmed to work on a Raspberry Pi 4 (and likely other Linux systems) when ffmpeg is compiled with this patch: https://www.raspberrypi.org/forums/viewtopic.php?p=1780625#p1780625
 
 More potential hardware encoders are described at https://stackoverflow.com/a/50703794

package/docker-cli

@@ -0,0 +1,8 @@
+docker run -d \
+  --name mlbserver \
+  --env TZ="America/New_York" \
+  --env account_username=your.account.email@example.com \
+  --env account_password=youraccountpassword \
+  -p 9999:9999 \
+  --volume /path/to/your/desired/local/mlbserver/persistent/data/directory:/mlbserver/data_directory \
+  tonywagner/mlbserver

package/docker-compose.yml

@@ -4,13 +4,11 @@ services:
     container_name: mlbserver
     environment:
       - TZ=America/New York
-      - data_directory=/mlbserver/data_directory
       - account_username=your.account.email@example.com
       - account_password=youraccountpassword
       #- fav_teams=AZ,BAL
+      #- http_root=/mlbserver
       #- debug=false
-      #- port=9999
-      #- multiview_port=10000
       #- multiview_path=
       #- ffmpeg_path=
       #- ffmpeg_encoder=
@@ -18,8 +16,9 @@ services:
       #- page_password=
       #- content_protect=
       #- gamechanger_delay=0
+      #- PUID=1000
+      #- PGID=1000
     ports:
       - 9999:9999
-      - 10000:10000
     volumes:
       - /path/to/your/desired/local/mlbserver/persistent/data/directory:/mlbserver/data_directory

package/index.js

@@ -106,7 +106,12 @@ var argv = minimist(process.argv, {
   string: ['account_username', 'account_password', 'fav_teams', 'multiview_path', 'ffmpeg_path', 'ffmpeg_encoder', 'page_username', 'page_password', 'content_protect', 'data_directory', 'http_root']
 })
 
-if (argv.env) argv = process.env
+if (argv.env) {
+  process.env.port = argv.port
+  process.env.multiview_port = argv.multiview_port
+  process.env.data_directory = argv.data_directory
+  argv = process.env
+}
 
 // Version
 var version = require('./package').version
@@ -2994,7 +2999,7 @@ app.get('/download.html', async function(req, res) {
       session.debuglog('force alternate audio', req)
     }
 
-    let server = (req.headers['x-forwarded-proto'] ? req.headers['x-forwarded-proto'] : 'http') + '://' + req.headers.host + http_root
+    let server = 'http://127.0.0.1:' + session.data.port + http_root
 
     let video_url = '/stream.m3u8'
     if ( req.query.src ) {
@@ -3022,7 +3027,7 @@ app.get('/download.html', async function(req, res) {
     // Set input stream and minimize ffmpeg startup latency
     ffmpeg_command.input(video_url)
     .addInputOption('-fflags', 'nobuffer')
-    .addInputOption('-probesize', '32')
+    .addInputOption('-probesize', '1000000')
     .addInputOption('-analyzeduration', '0')
 
     // video

package/mlbserver.subfolder.conf

@@ -0,0 +1,20 @@
+## Version 2025/02/27
+# make sure that your mlbserver container is named mlbserver
+# make sure that mlbserver is set to work with the base url /mlbserver/
+#
+# For the subfolder to work you need to edit your mlbserver docker compose / cli config
+# and set the http_root environment variable to /mlbserver, e.g. in docker compose:
+# - http_root=/mlbserver
+
+location /mlbserver {
+    return 301 $scheme://$host/mlbserver/;
+}
+
+location /mlbserver/ {
+    include /config/nginx/proxy.conf;
+    include /config/nginx/resolver.conf;
+    set $upstream_app mlbserver;
+    set $upstream_port 9999;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlbserver",
-  "version": "2025.02.25",
+  "version": "2025.02.27",
   "description": "",
   "repository": {
     "type": "git",