Fix STRM health checks and media source routing

Author: hrd201

CHANGELOG.md

@@ -18,6 +18,8 @@ All notable changes to this project will be documented in this file.
 - Regular polling no longer recursively requeues every known child directory.
 - New and restored STRM files are reported separately, and partial directory failures return a non-zero exit status.
 - Upgrade and rebuild failures now preserve production data and produce accurate task state.
+- STRM health checks now read the rotated Emby key and service URLs from runtime configuration and discover a user dynamically.
+- NJS playback routing now normalizes non-string and repeated `MediaSourceId` query values before path lookup.
 
 ## [0.2.2] - 2026-06-23
 

CHANGELOG.zh-CN.md

@@ -18,6 +18,8 @@
 - 普通定时轮询不再无条件递归加入所有已知子目录。
 - 分开统计真正新增和缺失补回，目录部分失败时返回非零状态。
 - 升级与全量重建失败时保护生产数据并正确记录任务状态。
+- STRM 健康检查改为从运行配置读取轮换后的 Emby Key 和服务地址，并自动选择检测用户。
+- NJS 播放路由会先规范化非字符串或重复的 `MediaSourceId` 参数，再执行路径查询。
 
 ## [0.2.2] - 2026-06-23
 

emby2alist/emby2Alist/conf.d/common/url-util.js

@@ -47,7 +47,8 @@ function getDefaultApiKey(rArgs) {
   // emby old TV client only use config.embyApiKey
   const embyApiKey = config.embyApiKey;
   if (!rArgs) { return embyApiKey; }
-  return rArgs["X-Emby-Token"] ?? (rArgs.api_key ?? embyApiKey);
+  const value = rArgs["X-Emby-Token"] ?? (rArgs.api_key ?? embyApiKey);
+  return Array.isArray(value) ? value[0] : value;
 }
 
 function getDeviceId(r) {
@@ -64,7 +65,8 @@ function getDeviceId(r) {
 }
 
 function getMediaSourceId(rArgs) {
-  return rArgs.MediaSourceId ? rArgs.MediaSourceId : rArgs.mediaSourceId;
+  const value = rArgs.MediaSourceId ? rArgs.MediaSourceId : rArgs.mediaSourceId;
+  return Array.isArray(value) ? value[0] : value;
 }
 
 // r only is PlaybackInfo
@@ -164,4 +166,4 @@ export default {
   getFilePathPart,
   parseUrl,
   getRealIp,
-}
+}

emby2alist/emby2Alist/conf.d/common/util.js

@@ -528,11 +528,12 @@ function getItemInfo(r) {
     if (mediaSourceId) {
       // before is GUID like "3c25399d9cbb41368a5abdb71cfe3dc9", V4.9.0.25 is "mediasource_447039" fomrmat
       // 447039 is't main itemId, is mutiple video mediaSourceId
-      let newMediaSourceId;
-      if (mediaSourceId.startsWith("mediasource_")) {
-        newMediaSourceId = mediaSourceId.replace("mediasource_", "");
+      const normalizedMediaSourceId = String(Array.isArray(mediaSourceId) ? mediaSourceId[0] : mediaSourceId);
+      let newMediaSourceId = normalizedMediaSourceId;
+      if (normalizedMediaSourceId.startsWith("mediasource_")) {
+        newMediaSourceId = normalizedMediaSourceId.replace("mediasource_", "");
       }
-      itemInfoUri = `${embyHost}/Items?Ids=${newMediaSourceId ?? mediaSourceId}&Fields=Path,MediaSources&Limit=1&api_key=${api_key}`;
+      itemInfoUri = `${embyHost}/Items?Ids=${newMediaSourceId}&Fields=Path,MediaSources&Limit=1&api_key=${api_key}`;
     } else {
       itemInfoUri = `${embyHost}/Items?Ids=${itemId}&Fields=Path,MediaSources&Limit=1&api_key=${api_key}`;
     }

emby2alist/emby2Alist/conf.d/emby.js

@@ -616,7 +616,14 @@ async function fetchEmbyFilePath(itemInfoUri, itemId, Etag, mediaSourceId) {
           }
           // item.MediaSources on Emby has one, on Jellyfin has many!
           if (mediaSourceId) {
-            mediaSource = item.MediaSources.find((m) => m.Id == mediaSourceId);
+            const matchedMediaSource = item.MediaSources.find((m) => m.Id == mediaSourceId);
+            if (matchedMediaSource) {
+              mediaSource = matchedMediaSource;
+            }
+          }
+          if (!mediaSource) {
+            rvt.message = `error: emby_api item has no usable media source`;
+            return rvt;
           }
           rvt.path = mediaSource.Path;
           rvt.itemName = item.Name;

nginx/conf.d/common/url-util.js

@@ -47,7 +47,8 @@ function getDefaultApiKey(rArgs) {
   // emby old TV client only use config.embyApiKey
   const embyApiKey = config.embyApiKey;
   if (!rArgs) { return embyApiKey; }
-  return rArgs["X-Emby-Token"] ?? (rArgs.api_key ?? embyApiKey);
+  const value = rArgs["X-Emby-Token"] ?? (rArgs.api_key ?? embyApiKey);
+  return Array.isArray(value) ? value[0] : value;
 }
 
 function getDeviceId(r) {
@@ -64,7 +65,8 @@ function getDeviceId(r) {
 }
 
 function getMediaSourceId(rArgs) {
-  return rArgs.MediaSourceId ? rArgs.MediaSourceId : rArgs.mediaSourceId;
+  const value = rArgs.MediaSourceId ? rArgs.MediaSourceId : rArgs.mediaSourceId;
+  return Array.isArray(value) ? value[0] : value;
 }
 
 // r only is PlaybackInfo
@@ -164,4 +166,4 @@ export default {
   getFilePathPart,
   parseUrl,
   getRealIp,
-}
+}

nginx/conf.d/common/util.js

@@ -528,11 +528,12 @@ function getItemInfo(r) {
     if (mediaSourceId) {
       // before is GUID like "3c25399d9cbb41368a5abdb71cfe3dc9", V4.9.0.25 is "mediasource_447039" fomrmat
       // 447039 is't main itemId, is mutiple video mediaSourceId
-      let newMediaSourceId;
-      if (mediaSourceId.startsWith("mediasource_")) {
-        newMediaSourceId = mediaSourceId.replace("mediasource_", "");
+      const normalizedMediaSourceId = String(Array.isArray(mediaSourceId) ? mediaSourceId[0] : mediaSourceId);
+      let newMediaSourceId = normalizedMediaSourceId;
+      if (normalizedMediaSourceId.startsWith("mediasource_")) {
+        newMediaSourceId = normalizedMediaSourceId.replace("mediasource_", "");
       }
-      itemInfoUri = `${embyHost}/Items?Ids=${newMediaSourceId ?? mediaSourceId}&Fields=Path,MediaSources&Limit=1&api_key=${api_key}`;
+      itemInfoUri = `${embyHost}/Items?Ids=${newMediaSourceId}&Fields=Path,MediaSources&Limit=1&api_key=${api_key}`;
     } else {
       itemInfoUri = `${embyHost}/Items?Ids=${itemId}&Fields=Path,MediaSources&Limit=1&api_key=${api_key}`;
     }

nginx/conf.d/emby.js

@@ -616,7 +616,14 @@ async function fetchEmbyFilePath(itemInfoUri, itemId, Etag, mediaSourceId) {
           }
           // item.MediaSources on Emby has one, on Jellyfin has many!
           if (mediaSourceId) {
-            mediaSource = item.MediaSources.find((m) => m.Id == mediaSourceId);
+            const matchedMediaSource = item.MediaSources.find((m) => m.Id == mediaSourceId);
+            if (matchedMediaSource) {
+              mediaSource = matchedMediaSource;
+            }
+          }
+          if (!mediaSource) {
+            rvt.message = `error: emby_api item has no usable media source`;
+            return rvt;
           }
           rvt.path = mediaSource.Path;
           rvt.itemName = item.Name;

scripts/strm_health_check.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import argparse
 import json
 import os
 import ssl
@@ -13,11 +14,9 @@
 
 BASE_DIR = Path(__file__).resolve().parent.parent
 CONFIG_PATH = BASE_DIR / 'config' / 'strm-sync.yaml'
+RUNTIME_PATH = BASE_DIR / 'config' / 'runtime.yaml'
 OUT_PATH = BASE_DIR / 'data' / 'strm-health-report.json'
-EMBY_URL = 'http://127.0.0.1:8096/emby'
-TEST_URL = 'https://127.0.0.1:8095'
 USER_AGENT = 'VidHub/2.2.2'
-USER_ID = 'a5fc8f5b7cf843dc8f9c3c904f937090'
 
 
 class NoRedirect(urllib.request.HTTPRedirectHandler):
@@ -26,11 +25,26 @@ def redirect_request(self, req, fp, code, msg, headers, newurl):
 
 
 def load_cfg():
-    return yaml.safe_load(CONFIG_PATH.read_text(encoding='utf-8')) or {}
+    sync = yaml.safe_load(CONFIG_PATH.read_text(encoding='utf-8')) or {}
+    runtime = yaml.safe_load(RUNTIME_PATH.read_text(encoding='utf-8')) or {} if RUNTIME_PATH.exists() else {}
+    return sync, runtime
 
 
-def emby_api_key(cfg):
-    return (cfg.get('emby2alist', {}) or {}).get('api_key') or 'YOUR_EMBY_API_KEY'
+def emby_api_key(sync_cfg, runtime_cfg):
+    key = (sync_cfg.get('emby2alist', {}) or {}).get('api_key') or (runtime_cfg.get('emby', {}) or {}).get('api_key')
+    if not key or key == 'YOUR_EMBY_API_KEY':
+        raise RuntimeError('Emby API key is not configured')
+    return key
+
+
+def service_urls(runtime_cfg):
+    emby = (runtime_cfg.get('emby', {}) or {}).get('host', 'http://127.0.0.1:8096').rstrip('/') + '/emby'
+    nginx = runtime_cfg.get('nginx', {}) or {}
+    if nginx.get('https_enabled'):
+        proxy = f"https://127.0.0.1:{int(nginx.get('https_port', 8095))}"
+    else:
+        proxy = f"http://127.0.0.1:{int(nginx.get('http_port', 8091))}"
+    return emby, proxy
 
 
 def fetch_json(url: str):
@@ -39,17 +53,25 @@ def fetch_json(url: str):
         return json.load(r)
 
 
-def main():
-    cfg = load_cfg()
-    api_key = emby_api_key(cfg)
+def main(limit: int = 0):
+    sync_cfg, runtime_cfg = load_cfg()
+    api_key = emby_api_key(sync_cfg, runtime_cfg)
+    emby_url, test_url = service_urls(runtime_cfg)
+    users = fetch_json(emby_url + '/Users?' + urllib.parse.urlencode({'api_key': api_key}))
+    admin = next((user for user in users if (user.get('Policy') or {}).get('IsAdministrator')), None)
+    user = admin or (users[0] if users else None)
+    if not user or not user.get('Id'):
+        raise RuntimeError('No Emby user is available for playback health checks')
+    user_id = user['Id']
     params = {
         'api_key': api_key,
         'Recursive': 'true',
         'IncludeItemTypes': 'Movie,Episode,Video',
         'Fields': 'Path,MediaSources',
         'Limit': '10000',
     }
-    url = EMBY_URL + '/Items?' + urllib.parse.urlencode(params)
+    params['UserId'] = user_id
+    url = emby_url + '/Items?' + urllib.parse.urlencode(params)
     data = fetch_json(url)
     items = data.get('Items', [])
 
@@ -69,6 +91,9 @@ def main():
                 'mediaSourceId': media_source_id,
                 'file_exists': bool(path and os.path.exists(path)),
             })
+    available_strm_items = len(strm_items)
+    if limit > 0:
+        strm_items = strm_items[:limit]
 
     opener = urllib.request.build_opener(
         urllib.request.HTTPSHandler(context=ssl._create_unverified_context()),
@@ -83,8 +108,8 @@ def main():
             continue
 
         test_url = (
-            f"{TEST_URL}/emby/videos/{item['id']}/stream.strm?AutoOpenLiveStream=false"
-            f"&UserId={USER_ID}&MaxStreamingBitrate=500000000&reqformat=json&IsPlayback=true"
+            f"{test_url}/emby/videos/{item['id']}/stream.strm?AutoOpenLiveStream=false"
+            f"&UserId={user_id}&MaxStreamingBitrate=500000000&reqformat=json&IsPlayback=true"
             f"&api_key={api_key}&MediaSourceId={urllib.parse.quote(item['mediaSourceId'])}&Static=true"
         )
         req = urllib.request.Request(test_url, headers={'User-Agent': USER_AGENT}, method='GET')
@@ -111,6 +136,7 @@ def main():
 
     report = {
         'generated_at': time.strftime('%Y-%m-%dT%H:%M:%S%z'),
+        'available_strm_items': available_strm_items,
         'total_strm_items': len(strm_items),
         'healthy_redirect': len(healthy),
         'missing_file': len(missing),
@@ -126,7 +152,9 @@ def main():
 
 if __name__ == '__main__':
     try:
-        main()
+        parser = argparse.ArgumentParser(description='Check Emby STRM files and proxy redirects.')
+        parser.add_argument('--limit', type=int, default=0, help='Check only the first N STRM items; 0 checks all.')
+        main(max(0, parser.parse_args().limit))
     except Exception as e:
         print(json.dumps({'ok': False, 'error': str(e)}, ensure_ascii=False), file=sys.stderr)
         sys.exit(1)