chore: update workflows

fix #254

.github/workflows/docker-hub.yml

@@ -18,7 +18,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/ghcr.yml

@@ -17,7 +17,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

CHANGELOG.md

@@ -1,5 +1,42 @@
 # 更新日志
 
+## 2.0.0-beta.5
+
+- 兼容长 room id
+- 更新 web api
+
+## 2.0.0-beta.4
+
+- 添加只使用 ipv4 的命令行选项
+- 修复因直播间号较长而添加任务失败
+- 检测到 init seciton 改变就分割文件
+- 修复 remux 的进度条显示异常
+- 修复 remux 出现 `Found duplicated MOOV Atom. Skipped it`
+- 修复断网检测
+
+## 2.0.0-beta.3
+
+- 修复 Python 3.8 运行出错
+- 修复添加任务出错
+- 修复片段数据不全导致转封装失败
+- 不转义弹幕的引号字符
+- 改进弹幕时间同步
+- 环境变量设置弹幕协议版本
+
+## 2.0.0-beta.2
+
+- 修复 bug
+- 重构日志功能
+
+## 2.0.0-beta.1
+
+- 修复 `m4s` 文件转 `mp4` 文件出错
+
+## 2.0.0-beta
+
+- Bark 通知的 server 设置支持带路径
+- 废弃旧的 HLS 录制实现，采用新的实现。
+
 ## 1.15.0
 
 - 修复部分只有 `HLS` 流的直播不能自动录制 (issue #183)

FAQ.md

@@ -1,19 +1,5 @@
 # 常见问题
 
-## HLS 标准录制模式和原始录制模式有什么区别？
-
-| | 标准录制模式 | 原始录制模式 | 
-| --- | --- | --- |
-| ffmpeg | 需要 | 不需要 |
-| 资源占用 | 较多 | 较少 |
-| 稳定性 | 比较差 | 比较好 |
-| 录播文件 | 一个 flv 文件 | 很多片段文件 |
-| 录播信息 | 包含在 flv 文件里 | 单独保存为一个文件 (index.meta.json) |
-| 播放器支持 | 几乎全部播放器都支持 flv | 支持 m3u8 的播放器很少 (VLC、dandanplay) |
-| 自动分割文件 | 支持 | 不支持 |
-| 手动分割文件 | 支持 | 不支持 |
-| 自动转 mp4 | 支持 | 支持 |
-
 ## 如何终止程序？
 
 `ctrl + c`

run.bat

@@ -30,6 +30,6 @@ set api_key=bili2233
 set BLREC_DEFAULT_LOG_DIR=日志文件
 set BLREC_DEFAULT_OUT_DIR=录播文件
 
-python -m blrec -c settings.toml --open --host %host% --port %port% --api-key %api_key%
+python -m blrec -c settings.toml --open --host %host% --port %port% --api-key %api_key% --ipv4
 
 pause

run.ps1

@@ -22,6 +22,6 @@ $env:api_key = "bili2233"
 $env:BLREC_DEFAULT_LOG_DIR = "日志文件"
 $env:BLREC_DEFAULT_OUT_DIR = "录播文件"
 
-python -m blrec -c settings.toml --open --host $env:host --port $env:port --api-key $env:api_key
+python -m blrec -c settings.toml --open --host $env:host --port $env:port --api-key $env:api_key --ipv4
 
 pause

setup.cfg

@@ -46,14 +46,13 @@ install_requires =
     requests >= 2.24.0, < 3.0.0
     aiofiles >= 22.1.0, < 23.0.0
     tenacity >= 8.0.1, < 9.0.0
-    colorama >= 0.4.4, < 0.5.0
+    loguru >= 0.7.2, < 0.8.0
     humanize >= 3.13.1, < 4.0.0
     tqdm >= 4.62.3, < 5.0.0
     attrs >= 21.2.0, < 22.0.0
     lxml >= 4.6.4, < 5.0.0
     toml >= 0.10.2, < 0.11.0
     m3u8 >= 3.3.0, < 4.0.0
-    av >= 10.0.0, < 11.0.0
     jsonpath == 0.82
     psutil >= 5.8.0, < 6.0.0
     reactivex >= 4.0.0, < 5.0.0

src/blrec/__init__.py

@@ -1,3 +1,3 @@
 __prog__ = 'blrec'
-__version__ = '1.15.0'
+__version__ = '2.0.0-beta.5'
 __github__ = 'https://github.com/acgnhiki/blrec'

src/blrec/application.py

@@ -1,18 +1,19 @@
 import asyncio
-import logging
 import os
 from contextlib import suppress
 from typing import Iterator, List, Optional
 
 import attr
 import psutil
+from loguru import logger
 
 from . import __prog__, __version__
 from .bili.helpers import ensure_room_id
+from .core.typing import MetaData
 from .disk_space import SpaceMonitor, SpaceReclaimer
 from .event.event_submitters import SpaceEventSubmitter
 from .exception import ExceptionHandler, ExistsError, exception_callback
-from .flv.operators import MetaData, StreamProfile
+from .flv.operators import StreamProfile
 from .notification import (
     BarkNotifier,
     EmailNotifier,
@@ -32,8 +33,6 @@ from .task import (
 )
 from .webhook import WebHookEmitter
 
-logger = logging.getLogger(__name__)
-
 
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class AppInfo:
@@ -99,6 +98,7 @@ class Application:
             await self.exit()
 
     async def launch(self) -> None:
+        self._setup_logger()
         logger.info('Launching Application...')
         self._setup()
         logger.debug(f'Default umask {os.umask(0o000)}')
@@ -295,7 +295,6 @@ class Application:
         return await self._settings_manager.change_task_options(room_id, options)
 
     def _setup(self) -> None:
-        self._setup_logger()
         self._setup_exception_handler()
         self._setup_space_monitor()
         self._setup_space_event_submitter()

src/blrec/bili/api.py

@@ -1,25 +1,22 @@
 import asyncio
 import hashlib
-import logging
-import os
+import time
 from abc import ABC
 from datetime import datetime
-from typing import Any, Dict, List, Mapping, Optional, Final
+from typing import Any, Dict, Final, List, Mapping, Optional
 from urllib.parse import urlencode
 
 import aiohttp
+from loguru import logger
 from tenacity import retry, stop_after_delay, wait_exponential
 
 from .exceptions import ApiRequestError
+from . import wbi
 from .typing import JsonResponse, QualityNumber, ResponseData
 
 __all__ = 'AppApi', 'WebApi'
 
 
-logger = logging.getLogger(__name__)
-
-TRACE_API_REQ = bool(os.environ.get('BLREC_TRACE_API_REQ'))
-
 BASE_HEADERS: Final = {
     'Accept-Encoding': 'gzip, deflate, br',
     'Accept-Language': 'zh-CN,zh;q=0.8,zh-TW;q=0.7,zh-HK;q=0.5,en;q=0.3,en-US;q=0.2',  # noqa
@@ -28,14 +25,20 @@ BASE_HEADERS: Final = {
     'Connection': 'keep-alive',
     'Origin': 'https://live.bilibili.com',
     'Pragma': 'no-cache',
-    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',  # noqa
+    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36',  # noqa
 }
 
 
 class BaseApi(ABC):
     def __init__(
-        self, session: aiohttp.ClientSession, headers: Optional[Dict[str, str]] = None
+        self,
+        session: aiohttp.ClientSession,
+        headers: Optional[Dict[str, str]] = None,
+        *,
+        room_id: Optional[int] = None,
     ):
+        self._logger = logger.bind(room_id=room_id or '')
+
         self.base_api_urls: List[str] = ['https://api.bilibili.com']
         self.base_live_api_urls: List[str] = ['https://api.live.bilibili.com']
         self.base_play_info_api_urls: List[str] = ['https://api.live.bilibili.com']
@@ -64,13 +67,13 @@ class BaseApi(ABC):
         should_check_response = kwds.pop('check_response', True)
         kwds = {'timeout': self.timeout, 'headers': self.headers, **kwds}
         async with self._session.get(*args, **kwds) as res:
-            if TRACE_API_REQ:
-                logger.debug(f'Request info: {res.request_info}')
+            self._logger.trace('Request: {}', res.request_info)
+            self._logger.trace('Response: {}', await res.text())
             try:
                 json_res = await res.json()
             except aiohttp.ContentTypeError:
                 text_res = await res.text()
-                logger.debug(f'Response text: {text_res[:200]}')
+                self._logger.debug(f'Response text: {text_res[:200]}')
                 raise
             if should_check_response:
                 self._check_response(json_res)
@@ -88,8 +91,7 @@ class BaseApi(ABC):
                 return await self._get_json_res(url, *args, **kwds)
             except Exception as exc:
                 exception = exc
-                if TRACE_API_REQ:
-                    logger.debug(f'Failed to get json from {url}', exc_info=exc)
+                self._logger.trace('Failed to get json from {}: {}', url, repr(exc))
         else:
             assert exception is not None
             raise exception
@@ -106,14 +108,14 @@ class BaseApi(ABC):
         json_responses = []
         for idx, item in enumerate(results):
             if isinstance(item, Exception):
-                if TRACE_API_REQ:
-                    logger.debug(f'Failed to get json from {urls[idx]}', exc_info=item)
+                self._logger.trace(
+                    'Failed to get json from {}: {}', urls[idx], repr(item)
+                )
                 exceptions.append(item)
             elif isinstance(item, dict):
                 json_responses.append(item)
             else:
-                if TRACE_API_REQ:
-                    logger.debug(repr(item))
+                self._logger.trace('{}', repr(item))
         if not json_responses:
             raise exceptions[0]
         return json_responses
@@ -242,6 +244,30 @@ class AppApi(BaseApi):
 
 
 class WebApi(BaseApi):
+    _wbi_key = wbi.make_key(
+        img_key="7cd084941338484aae1ad9425b84077c",
+        sub_key="4932caff0ff746eab6f01bf08b70ac45",
+    )
+    _wbi_key_mtime = 0.0
+
+    @retry(reraise=True, stop=stop_after_delay(20), wait=wait_exponential(0.1))
+    async def _get_json_res(
+        self, url: str, with_wbi: bool = False, *args: Any, **kwds: Any
+    ) -> JsonResponse:
+        if with_wbi:
+            key = self.__class__._wbi_key
+            ts = int(datetime.now().timestamp())
+            params = list(kwds.pop("params").items())
+            query = wbi.build_query(key, ts, params)
+            url = f'{url}?{query}'
+
+        try:
+            return await super()._get_json_res(url, *args, **kwds)
+        except ApiRequestError as e:
+            if e.code == -352 and time.monotonic() - self.__class__._wbi_key_mtime > 60:
+                await self._update_wbi_key()
+            raise
+
     async def room_init(self, room_id: int) -> ResponseData:
         path = '/room/v1/Room/room_init'
         params = {'id': room_id}
@@ -262,14 +288,16 @@ class WebApi(BaseApi):
             'ptype': 8,
         }
         json_responses = await self._get_jsons_concurrently(
-            self.base_play_info_api_urls, path, params=params
+            self.base_play_info_api_urls, path, with_wbi=True, params=params
         )
         return [r['data'] for r in json_responses]
 
     async def get_info_by_room(self, room_id: int) -> ResponseData:
         path = '/xlive/web-room/v1/index/getInfoByRoom'
         params = {'room_id': room_id}
-        json_res = await self._get_json(self.base_live_api_urls, path, params=params)
+        json_res = await self._get_json(
+            self.base_live_api_urls, path, with_wbi=True, params=params
+        )
         return json_res['data']
 
     async def get_info(self, room_id: int) -> ResponseData:
@@ -285,18 +313,29 @@ class WebApi(BaseApi):
         return json_res['data']['timestamp']
 
     async def get_user_info(self, uid: int) -> ResponseData:
-        path = '/x/space/acc/info'
+        path = '/x/space/wbi/acc/info'
         params = {'mid': uid}
-        json_res = await self._get_json(self.base_api_urls, path, params=params)
+        json_res = await self._get_json(
+            self.base_api_urls, path, with_wbi=True, params=params
+        )
         return json_res['data']
 
     async def get_danmu_info(self, room_id: int) -> ResponseData:
         path = '/xlive/web-room/v1/index/getDanmuInfo'
         params = {'id': room_id}
-        json_res = await self._get_json(self.base_live_api_urls, path, params=params)
+        json_res = await self._get_json(
+            self.base_live_api_urls, path, with_wbi=True, params=params
+        )
         return json_res['data']
 
     async def get_nav(self) -> ResponseData:
         path = '/x/web-interface/nav'
         json_res = await self._get_json(self.base_api_urls, path, check_response=False)
         return json_res
+
+    async def _update_wbi_key(self) -> None:
+        nav = await self.get_nav()
+        img_key = wbi.extract_key(nav['data']['wbi_img']['img_url'])
+        sub_key = wbi.extract_key(nav['data']['wbi_img']['sub_url'])
+        self.__class__._wbi_key = wbi.make_key(img_key, sub_key)
+        self.__class__._wbi_key_mtime = time.monotonic()

src/blrec/bili/danmaku_client.py

@@ -1,7 +1,8 @@
 import asyncio
 import json
-import logging
+import os
 import struct
+import zlib
 from contextlib import suppress
 from enum import Enum, IntEnum
 from typing import Any, Dict, Final, List, Optional, Tuple, Union, cast
@@ -9,13 +10,15 @@ from typing import Any, Dict, Final, List, Optional, Tuple, Union, cast
 import aiohttp
 import brotli
 from aiohttp import ClientSession
+from loguru import logger
 from tenacity import retry, retry_if_exception_type, wait_exponential
 
+from blrec.logging.context import async_task_with_logger_context
+
 from ..event.event_emitter import EventEmitter, EventListener
 from ..exception import exception_callback
-from ..logging.room_id import aio_task_with_room_id
 from ..utils.mixins import AsyncStoppableMixin
-from ..utils.string import extract_uid_from_cookie, extract_buvid_from_cookie
+from ..utils.string import extract_buvid_from_cookie, extract_uid_from_cookie
 from .api import AppApi, WebApi
 from .exceptions import DanmakuClientAuthError
 from .typing import ApiPlatform, Danmaku
@@ -23,9 +26,6 @@ from .typing import ApiPlatform, Danmaku
 __all__ = 'DanmakuClient', 'DanmakuListener', 'Danmaku', 'DanmakuCommand'
 
 
-logger = logging.getLogger(__name__)
-
-
 class DanmakuListener(EventListener):
     async def on_client_connected(self) -> None:
         ...
@@ -57,6 +57,9 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
         headers: Optional[Dict[str, str]] = None,
     ) -> None:
         super().__init__()
+        self._logger_context = {'room_id': room_id}
+        self._logger = logger.bind(**self._logger_context)
+
         self.session = session
         self.appapi = appapi
         self.webapi = webapi
@@ -71,6 +74,20 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
         self._retry_delay: int = 0
         self._MAX_RETRIES: Final[int] = max_retries
 
+        self._protover: int = WS.BODY_PROTOCOL_VERSION_BROTLI
+        if ver := os.environ.get('BLREC_DANMAKU_PROTOCOL_VERSION'):
+            if ver in (
+                str(WS.BODY_PROTOCOL_VERSION_NORMAL),
+                str(WS.BODY_PROTOCOL_VERSION_DEFLATE),
+                str(WS.BODY_PROTOCOL_VERSION_BROTLI),
+            ):
+                self._protover = int(ver)
+            else:
+                self._logger.warning(
+                    f'Invalid value of BLREC_DANMAKU_PROTOCOL_VERSION: {ver}'
+                )
+        self._logger.debug(f'protover: {self._protover}')
+
     @property
     def headers(self) -> Dict[str, str]:
         return self._headers
@@ -86,24 +103,25 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
         await self._update_danmu_info()
         await self._connect()
         await self._create_message_loop()
-        logger.debug('Started danmaku client')
+        self._logger.debug('Started danmaku client')
 
     async def _do_stop(self) -> None:
         await self._terminate_message_loop()
         await self._disconnect()
-        logger.debug('Stopped danmaku client')
+        self._logger.debug('Stopped danmaku client')
 
+    @async_task_with_logger_context
     async def restart(self) -> None:
-        logger.debug('Restarting danmaku client...')
+        self._logger.debug('Restarting danmaku client...')
         await self.stop()
         await self.start()
-        logger.debug('Restarted danmaku client')
+        self._logger.debug('Restarted danmaku client')
 
     async def reconnect(self) -> None:
         if self.stopped:
             return
 
-        logger.debug('Reconnecting...')
+        self._logger.debug('Reconnecting...')
         await self._disconnect()
         await self._connect()
         await self._emit('client_reconnected')
@@ -115,7 +133,7 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
         ),
     )
     async def _connect(self) -> None:
-        logger.debug('Connecting to server...')
+        self._logger.debug('Connecting to server...')
         try:
             await self._connect_websocket()
             await self._send_auth()
@@ -129,7 +147,7 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
                 await self._update_danmu_info()
             raise
         else:
-            logger.debug('Connected to server')
+            self._logger.debug('Connected to server')
             await self._emit('client_connected')
 
     async def _connect_websocket(self) -> None:
@@ -137,23 +155,23 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
             self._danmu_info['host_list'][self._host_index]['host'],
             self._danmu_info['host_list'][self._host_index]['wss_port'],
         )
-        logger.debug(f'Connecting WebSocket... {url}')
+        self._logger.debug(f'Connecting WebSocket... {url}')
         try:
             self._ws = await self.session.ws_connect(
                 url, timeout=5, headers=self.headers
             )
         except Exception as exc:
-            logger.debug(f'Failed to connect WebSocket: {repr(exc)}')
+            self._logger.debug(f'Failed to connect WebSocket: {repr(exc)}')
             raise
         else:
-            logger.debug('Connected WebSocket')
+            self._logger.debug('Connected WebSocket')
 
     async def _send_auth(self) -> None:
         auth_msg = json.dumps(
             {
                 "uid": self._uid,
                 'roomid': self._room_id,  # must not be the short id!
-                'protover': WS.BODY_PROTOCOL_VERSION_BROTLI,
+                'protover': self._protover,
                 "buvid": self._buvid,
                 'platform': 'web',
                 'type': 2,
@@ -161,26 +179,28 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
             }
         )
         data = Frame.encode(WS.OP_USER_AUTHENTICATION, auth_msg)
-        logger.debug('Sending user authentication...')
+        self._logger.debug('Sending user authentication...')
         try:
             await self._ws.send_bytes(data)
         except Exception as exc:
-            logger.debug(f'Failed to sent user authentication: {repr(exc)}')
+            self._logger.debug(f'Failed to sent user authentication: {repr(exc)}')
             raise
         else:
-            logger.debug('Sent user authentication')
+            self._logger.debug('Sent user authentication')
 
     async def _recieve_auth_reply(self) -> aiohttp.WSMessage:
-        logger.debug('Receiving user authentication reply...')
+        self._logger.debug('Receiving user authentication reply...')
         try:
             msg = await self._ws.receive(timeout=5)
             if msg.type != aiohttp.WSMsgType.BINARY:
                 raise aiohttp.ClientError(msg)
         except Exception as exc:
-            logger.debug(f'Failed to receive user authentication reply: {repr(exc)}')
+            self._logger.debug(
+                f'Failed to receive user authentication reply: {repr(exc)}'
+            )
             raise
         else:
-            logger.debug('Recieved user authentication reply')
+            self._logger.debug('Recieved user authentication reply')
             return msg
 
     async def _handle_auth_reply(self, reply: aiohttp.WSMessage) -> None:
@@ -190,7 +210,7 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
         code = cast(int, json.loads(msg)['code'])
 
         if code == WS.AUTH_OK:
-            logger.debug('Auth OK')
+            self._logger.debug('Auth OK')
             self._create_heartbeat_task()
         elif code == WS.AUTH_TOKEN_ERROR:
             raise DanmakuClientAuthError(f'Token expired: {code}')
@@ -204,7 +224,7 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
             self._api_platform = 'android'
 
     async def _update_danmu_info(self) -> None:
-        logger.debug(f'Updating danmu info via {self._api_platform} api...')
+        self._logger.debug(f'Updating danmu info via {self._api_platform} api...')
         api: Union[WebApi, AppApi]
         if self._api_platform == 'web':
             api = self.webapi
@@ -213,15 +233,15 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
         try:
             self._danmu_info = await api.get_danmu_info(self._room_id)
         except Exception as exc:
-            logger.warning(f'Failed to update danmu info: {repr(exc)}')
+            self._logger.warning(f'Failed to update danmu info: {repr(exc)}')
             self._danmu_info = COMMON_DANMU_INFO
         else:
-            logger.debug('Danmu info updated')
+            self._logger.debug('Danmu info updated')
 
     async def _disconnect(self) -> None:
         await self._cancel_heartbeat_task()
         await self._close_websocket()
-        logger.debug('Disconnected from server')
+        self._logger.debug('Disconnected from server')
         await self._emit('client_disconnected')
 
     async def _close_websocket(self) -> None:
@@ -237,14 +257,14 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
         with suppress(asyncio.CancelledError):
             await self._heartbeat_task
 
-    @aio_task_with_room_id
+    @async_task_with_logger_context
     async def _send_heartbeat(self) -> None:
         data = Frame.encode(WS.OP_HEARTBEAT, '')
         while True:
             try:
                 await self._ws.send_bytes(data)
             except Exception as exc:
-                logger.warning(f'Failed to send heartbeat: {repr(exc)}')
+                self._logger.warning(f'Failed to send heartbeat: {repr(exc)}')
                 await self._emit('error_occurred', exc)
                 task = asyncio.create_task(self.restart())
                 task.add_done_callback(exception_callback)
@@ -254,15 +274,15 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
     async def _create_message_loop(self) -> None:
         self._message_loop_task = asyncio.create_task(self._message_loop())
         self._message_loop_task.add_done_callback(exception_callback)
-        logger.debug('Created message loop')
+        self._logger.debug('Created message loop')
 
     async def _terminate_message_loop(self) -> None:
         self._message_loop_task.cancel()
         with suppress(asyncio.CancelledError):
             await self._message_loop_task
-        logger.debug('Terminated message loop')
+        self._logger.debug('Terminated message loop')
 
-    @aio_task_with_room_id
+    @async_task_with_logger_context
     async def _message_loop(self) -> None:
         while True:
             for msg in await self._receive():
@@ -292,8 +312,7 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
                 else:
                     await self._handle_receive_error(ValueError(wsmsg))
 
-    @staticmethod
-    async def _handle_data(data: bytes) -> Optional[List[Dict[str, Any]]]:
+    async def _handle_data(self, data: bytes) -> Optional[List[Dict[str, Any]]]:
         loop = asyncio.get_running_loop()
 
         try:
@@ -304,12 +323,14 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
             elif op == WS.OP_HEARTBEAT_REPLY:
                 pass
         except Exception as e:
-            logger.warning(f'Failed to handle data: {repr(e)}, data: {repr(data)}')
+            self._logger.warning(
+                f'Failed to handle data: {repr(e)}, data: {repr(data)}'
+            )
 
         return None
 
     async def _handle_receive_error(self, exc: Exception) -> None:
-        logger.warning(f'Failed to receive message: {repr(exc)}')
+        self._logger.warning(f'Failed to receive message: {repr(exc)}')
         await self._emit('error_occurred', exc)
         if isinstance(exc, asyncio.TimeoutError):
             return
@@ -322,7 +343,7 @@ class DanmakuClient(EventEmitter[DanmakuListener], AsyncStoppableMixin):
     async def _retry(self) -> None:
         if self._retry_count < self._MAX_RETRIES:
             if self._retry_delay > 0:
-                logger.debug(
+                self._logger.debug(
                     'Retry after {} second{}'.format(
                         self._retry_delay, 's' if self._retry_delay > 1 else ''
                     )
@@ -365,6 +386,12 @@ class Frame:
         if op == WS.OP_MESSAGE:
             if ver == WS.BODY_PROTOCOL_VERSION_BROTLI:
                 data = brotli.decompress(body)
+            elif ver == WS.BODY_PROTOCOL_VERSION_DEFLATE:
+                data = zlib.decompress(body)
+            elif ver == WS.BODY_PROTOCOL_VERSION_NORMAL:
+                pass
+            else:
+                raise NotImplementedError(f'Unsupported protocol version: {ver}')
 
             msg_list = []
             offset = 0
@@ -401,6 +428,7 @@ class WS(IntEnum):
     OPERATION_OFFSET = 8
     SEQUENCE_OFFSET = 12
     BODY_PROTOCOL_VERSION_NORMAL = 0
+    BODY_PROTOCOL_VERSION_DEFLATE = 2
     BODY_PROTOCOL_VERSION_BROTLI = 3
     HEADER_DEFAULT_VERSION = 1
     HEADER_DEFAULT_OPERATION = 1

src/blrec/bili/helpers.py

@@ -6,14 +6,21 @@ from jsonpath import jsonpath
 from ..exception import NotFoundError
 from .api import WebApi
 from .exceptions import ApiRequestError
+from .net import connector, timeout
 from .typing import QualityNumber, ResponseData, StreamCodec, StreamFormat
 
 __all__ = 'room_init', 'ensure_room_id'
 
 
 async def room_init(room_id: int) -> ResponseData:
-    async with aiohttp.ClientSession(raise_for_status=True) as session:
-        api = WebApi(session)
+    async with aiohttp.ClientSession(
+        connector=connector,
+        connector_owner=False,
+        raise_for_status=True,
+        trust_env=True,
+        timeout=timeout,
+    ) as session:
+        api = WebApi(session, room_id=room_id)
         return await api.room_init(room_id)
 
 
@@ -31,7 +38,13 @@ async def ensure_room_id(room_id: int) -> int:
 
 
 async def get_nav(cookie: str) -> ResponseData:
-    async with aiohttp.ClientSession(raise_for_status=True) as session:
+    async with aiohttp.ClientSession(
+        connector=connector,
+        connector_owner=False,
+        raise_for_status=True,
+        trust_env=True,
+        timeout=timeout,
+    ) as session:
         headers = {
             'Origin': 'https://passport.bilibili.com',
             'Referer': 'https://passport.bilibili.com/account/security',

src/blrec/bili/live.py

@@ -1,6 +1,5 @@
 import asyncio
 import json
-import logging
 import re
 import time
 from typing import Any, Dict, List
@@ -22,11 +21,12 @@ from .exceptions import (
 )
 from .helpers import extract_codecs, extract_formats, extract_streams
 from .models import LiveStatus, RoomInfo, UserInfo
+from .net import connector, timeout
 from .typing import ApiPlatform, QualityNumber, ResponseData, StreamCodec, StreamFormat
 
 __all__ = ('Live',)
 
-logger = logging.getLogger(__name__)
+from loguru import logger
 
 _INFO_PATTERN = re.compile(
     rb'<script>\s*window\.__NEPTUNE_IS_MY_WAIFU__\s*=\s*(\{.*?\})\s*</script>'
@@ -36,18 +36,23 @@ _LIVE_STATUS_PATTERN = re.compile(rb'"live_status"\s*:\s*(\d)')
 
 class Live:
     def __init__(self, room_id: int, user_agent: str = '', cookie: str = '') -> None:
+        self._logger = logger.bind(room_id=room_id)
+
         self._room_id = room_id
         self._user_agent = user_agent
         self._cookie = cookie
+        self._update_headers()
         self._html_page_url = f'https://live.bilibili.com/{room_id}'
 
         self._session = aiohttp.ClientSession(
-            connector=aiohttp.TCPConnector(limit=200),
+            connector=connector,
+            connector_owner=False,
             raise_for_status=True,
             trust_env=True,
+            timeout=timeout,
         )
-        self._appapi = AppApi(self._session, self.headers)
-        self._webapi = WebApi(self._session, self.headers)
+        self._appapi = AppApi(self._session, self.headers, room_id=room_id)
+        self._webapi = WebApi(self._session, self.headers, room_id=room_id)
 
         self._room_info: RoomInfo
         self._user_info: UserInfo
@@ -87,6 +92,7 @@ class Live:
     @user_agent.setter
     def user_agent(self, value: str) -> None:
         self._user_agent = value
+        self._update_headers()
         self._webapi.headers = self.headers
         self._appapi.headers = self.headers
 
@@ -97,12 +103,16 @@ class Live:
     @cookie.setter
     def cookie(self, value: str) -> None:
         self._cookie = value
+        self._update_headers()
         self._webapi.headers = self.headers
         self._appapi.headers = self.headers
 
     @property
     def headers(self) -> Dict[str, str]:
-        return {
+        return self._headers
+
+    def _update_headers(self) -> None:
+        self._headers = {
             **BASE_HEADERS,
             'Referer': f'https://live.bilibili.com/{self._room_id}',
             'User-Agent': self._user_agent,
@@ -165,11 +175,13 @@ class Live:
 
     async def check_connectivity(self) -> bool:
         try:
-            await self._session.head('https://live.bilibili.com/', timeout=3)
-        except (aiohttp.ClientConnectionError, asyncio.TimeoutError):
-            return False
-        else:
+            await self._session.head('https://live.bilibili.com/', timeout=3, headers={
+                'User-Agent': self._user_agent,
+            })
             return True
+        except Exception as e:
+            self._logger.warning(f'Check connectivity failed: {repr(e)}')
+            return False
 
     async def update_info(self, raise_exception: bool = False) -> bool:
         return all(
@@ -183,7 +195,7 @@ class Live:
         try:
             self._user_info = await self.get_user_info(self._room_info.uid)
         except Exception as e:
-            logger.error(f'Failed to update user info: {repr(e)}')
+            self._logger.error(f'Failed to update user info: {repr(e)}')
             if raise_exception:
                 raise
             return False
@@ -194,7 +206,7 @@ class Live:
         try:
             self._room_info = await self.get_room_info()
         except Exception as e:
-            logger.error(f'Failed to update room info: {repr(e)}')
+            self._logger.error(f'Failed to update room info: {repr(e)}')
             if raise_exception:
                 raise
             return False
@@ -224,17 +236,15 @@ class Live:
     )
     async def get_user_info(self, uid: int) -> UserInfo:
         try:
-            user_info_data = await self._webapi.get_user_info(uid)
-            return UserInfo.from_web_api_data(user_info_data)
+            return await self._get_user_info_via_api(uid)
         except Exception:
-            user_info_data = await self._appapi.get_user_info(uid)
-            return UserInfo.from_app_api_data(user_info_data)
+            return await self._get_user_info_via_html_page()
 
     async def get_timestamp(self) -> int:
         try:
             ts = await self.get_server_timestamp()
         except Exception as e:
-            logger.warning(f'Failed to get timestamp from server: {repr(e)}')
+            self._logger.warning(f'Failed to get timestamp from server: {repr(e)}')
             ts = int(time.time())
         return ts
 
@@ -336,6 +346,18 @@ class Live:
         room_info_data = await self._get_room_info_via_api()
         return int(room_info_data['live_status'])
 
+    async def _get_user_info_via_api(self, uid: int) -> UserInfo:
+        try:
+            data = await self._webapi.get_info_by_room(self._room_id)
+            return UserInfo.from_info_by_room(data)
+        except Exception:
+            try:
+                data = await self._appapi.get_info_by_room(self._room_id)
+                return UserInfo.from_info_by_room(data)
+            except Exception:
+                data = await self._appapi.get_user_info(uid)
+                return UserInfo.from_app_api_data(data)
+
     async def _get_room_info_via_api(self) -> ResponseData:
         try:
             info_data = await self._webapi.get_info_by_room(self._room_id)
@@ -358,6 +380,10 @@ class Live:
 
         return int(m.group(1))
 
+    async def _get_user_info_via_html_page(self) -> UserInfo:
+        info_res = await self._get_room_info_res_via_html_page()
+        return UserInfo.from_info_by_room(info_res)
+
     async def _get_room_info_via_html_page(self) -> ResponseData:
         info_res = await self._get_room_info_res_via_html_page()
         return info_res['room_info']

src/blrec/bili/live_monitor.py

@@ -1,10 +1,11 @@
 import asyncio
-import logging
 import random
 from contextlib import suppress
 
+from loguru import logger
+
 from blrec.exception import exception_callback
-from blrec.logging.room_id import aio_task_with_room_id
+from blrec.logging.context import async_task_with_logger_context
 
 from ..event.event_emitter import EventEmitter, EventListener
 from ..utils.mixins import SwitchableMixin
@@ -17,9 +18,6 @@ from .typing import Danmaku
 __all__ = 'LiveMonitor', 'LiveEventListener'
 
 
-logger = logging.getLogger(__name__)
-
-
 class LiveEventListener(EventListener):
     async def on_live_status_changed(
         self, current_status: LiveStatus, previous_status: LiveStatus
@@ -45,6 +43,8 @@ class LiveEventListener(EventListener):
 class LiveMonitor(EventEmitter[LiveEventListener], DanmakuListener, SwitchableMixin):
     def __init__(self, danmaku_client: DanmakuClient, live: Live) -> None:
         super().__init__()
+        self._logger_context = {'room_id': live.room_id}
+        self._logger = logger.bind(**self._logger_context)
         self._danmaku_client = danmaku_client
         self._live = live
 
@@ -61,13 +61,13 @@ class LiveMonitor(EventEmitter[LiveEventListener], DanmakuListener, SwitchableMi
         self._init_status()
         self._danmaku_client.add_listener(self)
         self._start_polling()
-        logger.debug('Enabled live monitor')
+        self._logger.debug('Enabled live monitor')
 
     def _do_disable(self) -> None:
         self._danmaku_client.remove_listener(self)
         asyncio.create_task(self._stop_polling())
         asyncio.create_task(self._stop_checking())
-        logger.debug('Disabled live monitor')
+        self._logger.debug('Disabled live monitor')
 
     def _start_polling(self) -> None:
         self._polling_task = asyncio.create_task(self._poll_live_status())
@@ -99,23 +99,23 @@ class LiveMonitor(EventEmitter[LiveEventListener], DanmakuListener, SwitchableMi
         # events if necessary.
         # make sure the recorder works well continuously after interruptions
         # such as an operating system hibernation.
-        logger.warning('The Danmaku Client Reconnected')
+        self._logger.warning('The Danmaku Client Reconnected')
 
         await self._live.update_room_info()
         current_status = self._live.room_info.live_status
 
         if current_status == self._previous_status:
             if current_status == LiveStatus.LIVE:
-                logger.debug('Simulating stream reset event')
+                self._logger.debug('Simulating stream reset event')
                 await self._handle_status_change(current_status)
         else:
             if current_status == LiveStatus.LIVE:
-                logger.debug('Simulating live began event')
+                self._logger.debug('Simulating live began event')
                 await self._handle_status_change(current_status)
-                logger.debug('Simulating live stream available event')
+                self._logger.debug('Simulating live stream available event')
                 await self._handle_status_change(current_status)
             else:
-                logger.debug('Simulating live ended event')
+                self._logger.debug('Simulating live ended event')
                 await self._handle_status_change(current_status)
 
     async def on_danmaku_received(self, danmu: Danmaku) -> None:
@@ -135,7 +135,7 @@ class LiveMonitor(EventEmitter[LiveEventListener], DanmakuListener, SwitchableMi
             await self._emit('room_changed', self._live.room_info)
 
     async def _handle_status_change(self, current_status: LiveStatus) -> None:
-        logger.debug(
+        self._logger.debug(
             'Live status changed from {} to {}'.format(
                 self._previous_status.name, current_status.name
             )
@@ -163,49 +163,62 @@ class LiveMonitor(EventEmitter[LiveEventListener], DanmakuListener, SwitchableMi
             else:
                 pass
 
-        logger.debug('Number of sequential LIVE status: {}'.format(self._status_count))
+        self._logger.debug(
+            'Number of sequential LIVE status: {}'.format(self._status_count)
+        )
 
         self._previous_status = current_status
 
-    @aio_task_with_room_id
+    async def check_live_status(self) -> None:
+        self._logger.debug('Checking live status...')
+        try:
+            await self._check_live_status()
+        except Exception as e:
+            self._logger.warning(f'Failed to check live status: {repr(e)}')
+        self._logger.debug('Done checking live status')
+
+    async def _check_live_status(self) -> None:
+        await self._live.update_room_info()
+        current_status = self._live.room_info.live_status
+        if current_status != self._previous_status:
+            await self._handle_status_change(current_status)
+
+    @async_task_with_logger_context
     async def _poll_live_status(self) -> None:
-        logger.debug('Started polling live status')
+        self._logger.debug('Started polling live status')
 
         while True:
             try:
                 await asyncio.sleep(600 + random.randrange(-60, 60))
-                await self._live.update_room_info()
-                current_status = self._live.room_info.live_status
-                if current_status != self._previous_status:
-                    await self._handle_status_change(current_status)
+                await self._check_live_status()
             except asyncio.CancelledError:
-                logger.debug('Cancelled polling live status')
+                self._logger.debug('Cancelled polling live status')
                 break
             except Exception as e:
-                logger.warning(f'Failed to poll live status: {repr(e)}')
+                self._logger.warning(f'Failed to poll live status: {repr(e)}')
 
-        logger.debug('Stopped polling live status')
+        self._logger.debug('Stopped polling live status')
 
-    @aio_task_with_room_id
+    @async_task_with_logger_context
     async def _check_if_stream_available(self) -> None:
-        logger.debug('Started checking if stream available')
+        self._logger.debug('Started checking if stream available')
 
         while True:
             try:
                 streams = await self._live.get_live_streams()
                 if streams:
-                    logger.debug('live stream available')
+                    self._logger.debug('live stream available')
                     self._stream_available = True
                     flv_formats = extract_formats(streams, 'flv')
                     self._live._no_flv_stream = not flv_formats
                     await self._emit('live_stream_available', self._live)
                     break
             except asyncio.CancelledError:
-                logger.debug('Cancelled checking if stream available')
+                self._logger.debug('Cancelled checking if stream available')
                 break
             except Exception as e:
-                logger.warning(f'Failed to check if stream available: {repr(e)}')
+                self._logger.warning(f'Failed to check if stream available: {repr(e)}')
 
             await asyncio.sleep(1)
 
-        logger.debug('Stopped checking if stream available')
+        self._logger.debug('Stopped checking if stream available')

src/blrec/bili/models.py

@@ -50,10 +50,10 @@ class RoomInfo:
         else:
             raise ValueError(f'Failed to init live_start_time: {data}')
 
-        if (cover := data.get('cover') or data.get('user_cover', '')):
+        if cover := data.get('cover') or data.get('user_cover', ''):
             cover = ensure_scheme(cover, 'https')
 
-        if (description := data['description']):
+        if description := data['description']:
             description = re.sub(r'<br\s*/?>', '\n', description)
             tree = html.fromstring(description)
             description = clean_html(tree).text_content().strip()
@@ -82,8 +82,6 @@ class UserInfo:
     gender: str
     face: str
     uid: int
-    level: int
-    sign: str
 
     @staticmethod
     def from_web_api_data(data: ResponseData) -> 'UserInfo':
@@ -92,8 +90,6 @@ class UserInfo:
             gender=data['sex'],
             face=ensure_scheme(data['face'], 'https'),
             uid=data['mid'],
-            level=data['level'],
-            sign=data['sign'],
         )
 
     @staticmethod
@@ -101,9 +97,18 @@ class UserInfo:
         card = data['card']
         return UserInfo(
             name=card['name'],
-            gender=card['sex'],
+            gender=card.get('sex', ''),
             face=ensure_scheme(card['face'], 'https'),
             uid=card['mid'],
-            level=card['level_info']['current_level'],
-            sign=card['sign'],
+        )
+
+    @staticmethod
+    def from_info_by_room(data: ResponseData) -> 'UserInfo':
+        room_info = data['room_info']
+        base_info = data['anchor_info']['base_info']
+        return UserInfo(
+            name=base_info['uname'],
+            gender=base_info['gender'],
+            face=ensure_scheme(base_info['face'], 'https'),
+            uid=room_info['uid'],
         )

src/blrec/bili/net.py

@@ -0,0 +1,18 @@
+import os
+import socket
+
+import aiohttp
+import requests
+
+__all__ = ('connector', 'timeout')
+
+USE_IPV4_ONLY = bool(os.environ.get('BLREC_IPV4'))
+
+if not USE_IPV4_ONLY:
+    family = 0
+else:
+    requests.packages.urllib3.util.connection.HAS_IPV6 = False  # type: ignore
+    family = socket.AF_INET
+
+connector = aiohttp.TCPConnector(family=family, limit=200)
+timeout = aiohttp.ClientTimeout(total=10)

src/blrec/bili/wbi.py

@@ -0,0 +1,84 @@
+import hashlib
+from typing import Any, List, Tuple
+
+
+def extract_key(url: str) -> str:
+    return url.rsplit("/", 1)[-1].rsplit(".", 1)[0]
+
+
+def make_key(img_key: str, sub_key: str) -> str:
+    # fmt: off
+    MAPPING = [
+        46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35,
+        27, 43, 5, 49, 33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13,
+    ]
+    key = (img_key + sub_key).encode()
+    return bytes([key[n] for n in MAPPING]).decode()
+
+
+def encode_value(value: str) -> str:
+    chars = []
+
+    for c in value:
+        if c in "!'()*":
+            continue
+        if (c.isascii() and c.isalnum()) or c in "-_.~":
+            chars.append(c)
+        else:
+            for b in c.encode():
+                chars.append(f"%{b:02X}")
+
+    return "".join(chars)
+
+
+def build_query(key: str, ts: int, params: List[Tuple[str, Any]]) -> str:
+    params.append(("wts", str(ts)))
+    params.sort(key=lambda p: p[0])
+
+    parts = []
+    for name, value in params:
+        parts.append(f"{name}={encode_value(str(value))}")
+    query = "&".join(parts)
+
+    sign = hashlib.md5((query + key).encode()).hexdigest()
+    query += f"&w_rid={sign}"
+
+    return query
+
+
+def test_extract_key() -> None:
+    url = "https://i0.hdslb.com/bfs/wbi/7cd084941338484aae1ad9425b84077c.png"
+    key = extract_key(url)
+    assert key == "7cd084941338484aae1ad9425b84077c"
+
+
+def test_make_key() -> None:
+    img_key = "7cd084941338484aae1ad9425b84077c"
+    sub_key = "4932caff0ff746eab6f01bf08b70ac45"
+    expected = "ea1db124af3c7062474693fa704f4ff8"
+    key = make_key(img_key, sub_key)
+    assert key == expected
+
+
+def test_encode_value() -> None:
+    expected = "-_-%20F%20%E5%93%94~"
+    assert encode_value(")-_-( F**' 哔~!") == expected
+
+
+def test_build_query() -> None:
+    img_key = "7cd084941338484aae1ad9425b84077c"
+    sub_key = "4932caff0ff746eab6f01bf08b70ac45"
+
+    key = make_key(img_key, sub_key)
+    ts = 1748867128
+    params = [("foo", ")-_-( F**' 哔~!"), ("bar", 2333)]
+
+    expected = "bar=2333&foo=-_-%20F%20%E5%93%94~&wts=1748867128&w_rid=6ba96e28a3f09b40e704f1e4b4f8e3e3"  # noqa
+    assert build_query(key, ts, params) == expected
+
+
+if __name__ == "__main__":
+    test_extract_key()
+    test_make_key()
+    test_encode_value()
+    test_build_query()

src/blrec/cli/main.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import sys
 from copy import deepcopy
@@ -6,13 +5,12 @@ from typing import Optional
 
 import typer
 import uvicorn
+from loguru import logger
 from uvicorn.config import LOGGING_CONFIG
 
 from .. import __prog__, __version__
 from ..logging import TqdmOutputStream
 
-logger = logging.getLogger(__name__)
-
 cli = typer.Typer()
 
 
@@ -49,6 +47,7 @@ def cli_main(
     host: str = typer.Option('localhost', help='webapp host bind'),
     port: int = typer.Option(2233, help='webapp port bind'),
     open: bool = typer.Option(False, help='open webapp in default browser'),
+    ipv4: bool = typer.Option(False, help='use IPv4 only'),
     root_path: str = typer.Option('', help='ASGI root path'),
     key_file: Optional[str] = typer.Option(None, help='SSL key file'),
     cert_file: Optional[str] = typer.Option(None, help='SSL certificate file'),
@@ -63,6 +62,8 @@ def cli_main(
         os.environ['BLREC_OUT_DIR'] = out_dir
     if log_dir is not None:
         os.environ['BLREC_LOG_DIR'] = log_dir
+    if ipv4 is not None:
+        os.environ['BLREC_IPV4'] = '1'
 
     if not sys.stderr.isatty():
         progress = False

src/blrec/core/cover_downloader.py

@@ -1,16 +1,16 @@
-import logging
 from enum import Enum
 from threading import Lock
 from typing import Set
 
 import aiofiles
 import aiohttp
+from loguru import logger
 from tenacity import retry, stop_after_attempt, wait_fixed
 
 from blrec.bili.live import Live
+from blrec.bili.net import connector, timeout
 from blrec.event.event_emitter import EventEmitter, EventListener
 from blrec.exception import submit_exception
-from blrec.logging.room_id import aio_task_with_room_id
 from blrec.path import cover_path
 from blrec.utils.hash import sha1sum
 from blrec.utils.mixins import SwitchableMixin
@@ -20,12 +20,8 @@ from .stream_recorder import StreamRecorder, StreamRecorderEventListener
 __all__ = 'CoverDownloader', 'CoverDownloaderEventListener'
 
 
-logger = logging.getLogger(__name__)
-
-
 class CoverDownloaderEventListener(EventListener):
-    async def on_cover_image_downloaded(self, path: str) -> None:
-        ...
+    async def on_cover_image_downloaded(self, path: str) -> None: ...
 
 
 class CoverSaveStrategy(Enum):
@@ -54,6 +50,8 @@ class CoverDownloader(
         cover_save_strategy: CoverSaveStrategy = CoverSaveStrategy.DEFAULT,
     ) -> None:
         super().__init__()
+        self._logger_context = {'room_id': live.room_id}
+        self._logger = logger.bind(**self._logger_context)
         self._live = live
         self._stream_recorder = stream_recorder
         self._lock: Lock = Lock()
@@ -64,11 +62,11 @@ class CoverDownloader(
     def _do_enable(self) -> None:
         self._sha1_set.clear()
         self._stream_recorder.add_listener(self)
-        logger.debug('Enabled cover downloader')
+        self._logger.debug('Enabled cover downloader')
 
     def _do_disable(self) -> None:
         self._stream_recorder.remove_listener(self)
-        logger.debug('Disabled cover downloader')
+        self._logger.debug('Disabled cover downloader')
 
     async def on_video_file_completed(self, video_path: str) -> None:
         with self._lock:
@@ -76,7 +74,6 @@ class CoverDownloader(
                 return
             await self._save_cover(video_path)
 
-    @aio_task_with_room_id
     async def _save_cover(self, video_path: str) -> None:
         try:
             await self._live.update_room_info()
@@ -92,15 +89,21 @@ class CoverDownloader(
             await self._save_file(path, data)
             self._sha1_set.add(sha1)
         except Exception as e:
-            logger.error(f'Failed to save cover image: {repr(e)}')
+            self._logger.error(f'Failed to save cover image: {repr(e)}')
             submit_exception(e)
         else:
-            logger.info(f'Saved cover image: {path}')
+            self._logger.info(f'Saved cover image: {path}')
             await self._emit('cover_image_downloaded', path)
 
     @retry(reraise=True, wait=wait_fixed(1), stop=stop_after_attempt(3))
     async def _fetch_cover(self, url: str) -> bytes:
-        async with aiohttp.ClientSession(raise_for_status=True) as session:
+        async with aiohttp.ClientSession(
+            connector=connector,
+            connector_owner=False,
+            raise_for_status=True,
+            trust_env=True,
+            timeout=timeout,
+        ) as session:
             async with session.get(url) as response:
                 return await response.read()
 

src/blrec/core/danmaku_dumper.py

@@ -1,10 +1,11 @@
 import asyncio
 import html
-import logging
 from contextlib import suppress
+from decimal import Decimal
 from threading import Lock
 from typing import Iterator, List, Optional
 
+from loguru import logger
 from tenacity import AsyncRetrying, retry_if_not_exception_type, stop_after_attempt
 
 from blrec import __github__, __prog__, __version__
@@ -21,7 +22,7 @@ from blrec.danmaku.models import (
 )
 from blrec.event.event_emitter import EventEmitter, EventListener
 from blrec.exception import exception_callback, submit_exception
-from blrec.logging.room_id import aio_task_with_room_id
+from blrec.logging.context import async_task_with_logger_context
 from blrec.path import danmaku_path
 from blrec.utils.mixins import SwitchableMixin
 
@@ -32,9 +33,6 @@ from .stream_recorder import StreamRecorder, StreamRecorderEventListener
 __all__ = 'DanmakuDumper', 'DanmakuDumperEventListener'
 
 
-logger = logging.getLogger(__name__)
-
-
 class DanmakuDumperEventListener(EventListener):
     async def on_danmaku_file_created(self, path: str) -> None:
         ...
@@ -61,6 +59,8 @@ class DanmakuDumper(
         record_super_chat: bool = False,
     ) -> None:
         super().__init__()
+        self._logger_context = {'room_id': live.room_id}
+        self._logger = logger.bind(**self._logger_context)
 
         self._live = live
         self._stream_recorder = stream_recorder
@@ -96,13 +96,13 @@ class DanmakuDumper(
     def _do_enable(self) -> None:
         self._stream_recorder.add_listener(self)
         self._statistics.reset()
-        logger.debug('Enabled danmaku dumper')
+        self._logger.debug('Enabled danmaku dumper')
 
     def _do_disable(self) -> None:
         self._stream_recorder.remove_listener(self)
         asyncio.create_task(self._stop_dumping())
         self._statistics.freeze()
-        logger.debug('Disabled danmaku dumper')
+        self._logger.debug('Disabled danmaku dumper')
 
     def set_live_start_time(self, time: int) -> None:
         self._live_start_time = time
@@ -123,7 +123,6 @@ class DanmakuDumper(
         with self._lock:
             self._delta: float = 0
             self._record_start_time: int = record_start_time
-            self._timebase: int = self._record_start_time * 1000
             self._stream_recording_interrupted: bool = False
             self._path = danmaku_path(video_path)
             self._files.append(self._path)
@@ -135,19 +134,32 @@ class DanmakuDumper(
             await self._stop_dumping()
             self._path = None
 
-    async def on_stream_recording_interrupted(self, duration: float) -> None:
-        logger.debug(f'Stream recording interrupted, {duration}')
+    async def on_stream_recording_interrupted(
+        self, timestamp: float, duration: float
+    ) -> None:
+        self._interrupted_timestamp = timestamp
         self._duration = duration
-        self._stream_recording_recovered = asyncio.Condition()
         self._stream_recording_interrupted = True
+        self._logger.debug(
+            'Stream recording interrupted, '
+            f'timestamp: {timestamp}, duration: {duration}'
+        )
 
-    async def on_stream_recording_recovered(self, timestamp: int) -> None:
-        logger.debug(f'Stream recording recovered, {timestamp}')
-        self._timebase = timestamp * 1000
-        self._delta = self._duration * 1000
+    async def on_stream_recording_recovered(self, timestamp: float) -> None:
+        self._recovered_timestamp = timestamp
+        self._delta += -float(
+            Decimal(str(self._recovered_timestamp))
+            - Decimal(str(self._interrupted_timestamp))
+        )
         self._stream_recording_interrupted = False
-        async with self._stream_recording_recovered:
-            self._stream_recording_recovered.notify_all()
+        self._logger.debug(
+            'Stream recording recovered, '
+            f'timestamp: {timestamp}, delta: {self._delta}'
+        )
+
+    async def on_duration_lost(self, duration: float) -> None:
+        self._logger.debug(f'Total duration lost: ≈ {(duration)} s')
+        self._delta = -duration
 
     def _start_dumping(self) -> None:
         self._create_dump_task()
@@ -166,14 +178,14 @@ class DanmakuDumper(
         with suppress(asyncio.CancelledError):
             await self._dump_task
 
-    @aio_task_with_room_id
+    @async_task_with_logger_context
     async def _do_dump(self) -> None:
         assert self._path is not None
-        logger.debug('Started dumping danmaku')
+        self._logger.debug('Started dumping danmaku')
 
         try:
             async with DanmakuWriter(self._path) as writer:
-                logger.info(f"Danmaku file created: '{self._path}'")
+                self._logger.info(f"Danmaku file created: '{self._path}'")
                 await self._emit('danmaku_file_created', self._path)
                 await writer.write_metadata(self._make_metadata())
 
@@ -188,9 +200,9 @@ class DanmakuDumper(
                             submit_exception(e)
                             raise
         finally:
-            logger.info(f"Danmaku file completed: '{self._path}'")
+            self._logger.info(f"Danmaku file completed: '{self._path}'")
             await self._emit('danmaku_file_completed', self._path)
-            logger.debug('Stopped dumping danmaku')
+            self._logger.debug('Stopped dumping danmaku')
 
     async def _dumping_loop(self, writer: DanmakuWriter) -> None:
         while True:
@@ -217,14 +229,7 @@ class DanmakuDumper(
                     continue
                 await writer.write_super_chat_record(self._make_super_chat_record(msg))
             else:
-                logger.warning('Unsupported message type:', repr(msg))
-
-            if self._stream_recording_interrupted:
-                logger.debug(
-                    f'Last message before stream recording interrupted: {repr(msg)}'
-                )
-                async with self._stream_recording_recovered:
-                    await self._stream_recording_recovered.wait()
+                self._logger.warning(f'Unsupported message type: {repr(msg)}')
 
     def _make_metadata(self) -> Metadata:
         return Metadata(
@@ -243,10 +248,10 @@ class DanmakuDumper(
             text = f'{msg.uname}: {msg.text}'
         else:
             text = msg.text
-        text = html.escape(text)
+        text = html.escape(text, quote=False)
 
         return Danmu(
-            stime=self._calc_stime(msg.date),
+            stime=self._calc_stime(msg.date / 1000),
             mode=msg.mode,
             size=msg.size,
             color=msg.color,
@@ -261,7 +266,7 @@ class DanmakuDumper(
 
     def _make_gift_send_record(self, msg: GiftSendMsg) -> GiftSendRecord:
         return GiftSendRecord(
-            ts=self._calc_stime(msg.timestamp * 1000),
+            ts=self._calc_stime(msg.timestamp),
             uid=msg.uid,
             user=msg.uname,
             giftname=msg.gift_name,
@@ -272,7 +277,7 @@ class DanmakuDumper(
 
     def _make_guard_buy_record(self, msg: GuardBuyMsg) -> GuardBuyRecord:
         return GuardBuyRecord(
-            ts=self._calc_stime(msg.timestamp * 1000),
+            ts=self._calc_stime(msg.timestamp),
             uid=msg.uid,
             user=msg.uname,
             giftname=msg.gift_name,
@@ -283,7 +288,7 @@ class DanmakuDumper(
 
     def _make_super_chat_record(self, msg: SuperChatMsg) -> SuperChatRecord:
         return SuperChatRecord(
-            ts=self._calc_stime(msg.timestamp * 1000),
+            ts=self._calc_stime(msg.timestamp),
             uid=msg.uid,
             user=msg.uname,
             price=msg.price * msg.rate,
@@ -293,7 +298,7 @@ class DanmakuDumper(
 
     def _make_user_toast(self, msg: UserToastMsg) -> UserToast:
         return UserToast(
-            ts=self._calc_stime(msg.start_time * 1000),
+            ts=self._calc_stime(msg.start_time),
             uid=msg.uid,
             user=msg.username,
             unit=msg.unit,
@@ -304,5 +309,15 @@ class DanmakuDumper(
             msg=msg.toast_msg,
         )
 
-    def _calc_stime(self, timestamp: int) -> float:
-        return (max(timestamp - self._timebase, 0) + self._delta) / 1000
+    def _calc_stime(self, timestamp: float) -> float:
+        if self._stream_recording_interrupted:
+            return self._duration
+        else:
+            return (
+                max(
+                    timestamp * 1000
+                    - self._record_start_time * 1000
+                    + self._delta * 1000,
+                    0,
+                )
+            ) / 1000

src/blrec/core/danmaku_receiver.py

@@ -1,8 +1,10 @@
-import logging
 from asyncio import Queue, QueueFull
 from typing import Final
 
+from loguru import logger
+
 from blrec.bili.danmaku_client import DanmakuClient, DanmakuCommand, DanmakuListener
+from blrec.bili.live import Live
 from blrec.bili.typing import Danmaku
 from blrec.utils.mixins import StoppableMixin
 
@@ -12,25 +14,23 @@ from .typing import DanmakuMsg
 __all__ = ('DanmakuReceiver',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class DanmakuReceiver(DanmakuListener, StoppableMixin):
     _MAX_QUEUE_SIZE: Final[int] = 2000
 
-    def __init__(self, danmaku_client: DanmakuClient) -> None:
+    def __init__(self, live: Live, danmaku_client: DanmakuClient) -> None:
         super().__init__()
+        self._logger = logger.bind(room_id=live.room_id)
         self._danmaku_client = danmaku_client
         self._queue: Queue[DanmakuMsg] = Queue(maxsize=self._MAX_QUEUE_SIZE)
 
     def _do_start(self) -> None:
         self._danmaku_client.add_listener(self)
-        logger.debug('Started danmaku receiver')
+        self._logger.debug('Started danmaku receiver')
 
     def _do_stop(self) -> None:
         self._danmaku_client.remove_listener(self)
         self._clear_queue()
-        logger.debug('Stopped danmaku receiver')
+        self._logger.debug('Stopped danmaku receiver')
 
     async def get_message(self) -> DanmakuMsg:
         return await self._queue.get()

src/blrec/core/flv_stream_recorder_impl.py

@@ -1,9 +1,10 @@
-import logging
 from typing import Optional
 
+from loguru import logger
 from reactivex.scheduler import NewThreadScheduler
 
 from blrec.bili.live import Live
+from blrec.bili.live_monitor import LiveMonitor
 from blrec.bili.typing import QualityNumber
 from blrec.flv import operators as flv_ops
 from blrec.flv.metadata_dumper import MetadataDumper
@@ -15,13 +16,11 @@ from .stream_recorder_impl import StreamRecorderImpl
 __all__ = ('FLVStreamRecorderImpl',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class FLVStreamRecorderImpl(StreamRecorderImpl, SupportDebugMixin):
     def __init__(
         self,
         live: Live,
+        live_monitor: LiveMonitor,
         out_dir: str,
         path_template: str,
         *,
@@ -34,6 +33,7 @@ class FLVStreamRecorderImpl(StreamRecorderImpl, SupportDebugMixin):
     ) -> None:
         super().__init__(
             live=live,
+            live_monitor=live_monitor,
             out_dir=out_dir,
             path_template=path_template,
             stream_format='flv',
@@ -66,7 +66,7 @@ class FLVStreamRecorderImpl(StreamRecorderImpl, SupportDebugMixin):
         )
 
         self._recording_monitor = core_ops.RecordingMonitor(
-            live, lambda: self._analyser.duration
+            live, lambda: self._analyser.duration, self._analyser.duration_updated
         )
 
         self._prober.profiles.subscribe(self._on_profile_updated)
@@ -131,30 +131,33 @@ class FLVStreamRecorderImpl(StreamRecorderImpl, SupportDebugMixin):
         self._metadata_dumper.disable()
 
     def _run(self) -> None:
-        self._subscription = (
-            self._stream_param_holder.get_stream_params()  # type: ignore
-            .pipe(
-                self._stream_url_resolver,
-                self._stream_fetcher,
-                self._recording_monitor,
-                self._dl_statistics,
-                self._stream_parser,
-                self._connection_error_handler,
-                self._request_exception_handler,
-                flv_ops.process(sort_tags=True),
-                self._cutter,
-                self._limiter,
-                self._join_point_extractor,
-                self._prober,
-                self._injector,
-                self._analyser,
-                self._dumper,
-                self._rec_statistics,
-                self._progress_bar,
-                self._exception_handler,
+        with logger.contextualize(room_id=self._live.room_id):
+            self._subscription = (
+                self._stream_param_holder.get_stream_params()  # type: ignore
+                .pipe(
+                    self._stream_url_resolver,
+                    self._stream_fetcher,
+                    self._recording_monitor,
+                    self._dl_statistics,
+                    self._stream_parser,
+                    self._connection_error_handler,
+                    self._request_exception_handler,
+                    flv_ops.process(sort_tags=True),
+                    self._cutter,
+                    self._limiter,
+                    self._join_point_extractor,
+                    self._prober,
+                    self._injector,
+                    self._analyser,
+                    self._dumper,
+                    self._rec_statistics,
+                    self._progress_bar,
+                    self._exception_handler,
+                )
+                .subscribe(
+                    on_completed=self._on_completed,
+                    scheduler=NewThreadScheduler(
+                        self._thread_factory('StreamRecorder')
+                    ),
+                )
             )
-            .subscribe(
-                on_completed=self._on_completed,
-                scheduler=NewThreadScheduler(self._thread_factory('StreamRecorder')),
-            )
-        )

src/blrec/core/hls_raw_stream_recorder_impl.py

@@ -1,110 +0,0 @@
-import logging
-from typing import Optional
-
-from reactivex.scheduler import NewThreadScheduler
-
-from blrec.bili.live import Live
-from blrec.bili.typing import QualityNumber
-from blrec.hls import operators as hls_ops
-from blrec.hls.metadata_dumper import MetadataDumper
-from blrec.utils import operators as utils_ops
-
-from . import operators as core_ops
-from .stream_recorder_impl import StreamRecorderImpl
-
-__all__ = ('HLSRawStreamRecorderImpl',)
-
-
-logger = logging.getLogger(__name__)
-
-
-class HLSRawStreamRecorderImpl(StreamRecorderImpl):
-    def __init__(
-        self,
-        live: Live,
-        out_dir: str,
-        path_template: str,
-        *,
-        quality_number: QualityNumber = 10000,
-        buffer_size: Optional[int] = None,
-        read_timeout: Optional[int] = None,
-        disconnection_timeout: Optional[int] = None,
-        filesize_limit: int = 0,
-        duration_limit: int = 0,
-    ) -> None:
-        super().__init__(
-            live=live,
-            out_dir=out_dir,
-            path_template=path_template,
-            stream_format='fmp4',
-            recording_mode='raw',
-            quality_number=quality_number,
-            buffer_size=buffer_size,
-            read_timeout=read_timeout,
-            disconnection_timeout=disconnection_timeout,
-            filesize_limit=filesize_limit,
-            duration_limit=duration_limit,
-        )
-
-        self._playlist_fetcher = hls_ops.PlaylistFetcher(self._live, self._session)
-        self._playlist_dumper = hls_ops.PlaylistDumper(self._path_provider)
-        self._segment_fetcher = hls_ops.SegmentFetcher(
-            self._live, self._session, self._stream_url_resolver
-        )
-        self._segment_dumper = hls_ops.SegmentDumper(self._playlist_dumper)
-        self._ff_metadata_dumper = MetadataDumper(
-            self._playlist_dumper, self._metadata_provider
-        )
-
-        self._prober = hls_ops.Prober()
-        self._dl_statistics = core_ops.SizedStatistics()
-
-        self._recording_monitor = core_ops.RecordingMonitor(
-            live, lambda: self._playlist_dumper.duration
-        )
-
-        self._prober.profiles.subscribe(self._on_profile_updated)
-        self._playlist_dumper.file_opened.subscribe(self._on_video_file_opened)
-        self._playlist_dumper.file_closed.subscribe(self._on_video_file_closed)
-        self._recording_monitor.interrupted.subscribe(self._on_recording_interrupted)
-        self._recording_monitor.recovered.subscribe(self._on_recording_recovered)
-
-    @property
-    def recording_path(self) -> Optional[str]:
-        return self._playlist_dumper.path
-
-    def _on_start(self) -> None:
-        self._ff_metadata_dumper.enable()
-
-    def _on_stop(self) -> None:
-        self._ff_metadata_dumper.disable()
-
-    def _run(self) -> None:
-        self._subscription = (
-            self._stream_param_holder.get_stream_params()  # type: ignore
-            .pipe(
-                self._stream_url_resolver,
-                self._playlist_fetcher,
-                self._recording_monitor,
-                self._connection_error_handler,
-                self._request_exception_handler,
-                self._playlist_dumper,
-                utils_ops.observe_on_new_thread(
-                    queue_size=60,
-                    thread_name=f'SegmentDownloader::{self._live.room_id}',
-                ),
-                self._segment_fetcher,
-                self._dl_statistics,
-                self._prober,
-                self._segment_dumper,
-                self._rec_statistics,
-                self._progress_bar,
-                self._exception_handler,
-            )
-            .subscribe(
-                on_completed=self._on_completed,
-                scheduler=NewThreadScheduler(
-                    self._thread_factory('HLSRawStreamRecorder')
-                ),
-            )
-        )

src/blrec/core/hls_stream_recorder_impl.py

@@ -1,13 +1,13 @@
-import logging
 from typing import Optional
 
+from loguru import logger
 from reactivex.scheduler import NewThreadScheduler
 
 from blrec.bili.live import Live
+from blrec.bili.live_monitor import LiveMonitor
 from blrec.bili.typing import QualityNumber
-from blrec.flv import operators as flv_ops
-from blrec.flv.metadata_dumper import MetadataDumper
 from blrec.hls import operators as hls_ops
+from blrec.hls.metadata_dumper import MetadataDumper
 from blrec.utils import operators as utils_ops
 
 from . import operators as core_ops
@@ -16,13 +16,11 @@ from .stream_recorder_impl import StreamRecorderImpl
 __all__ = ('HLSStreamRecorderImpl',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class HLSStreamRecorderImpl(StreamRecorderImpl):
     def __init__(
         self,
         live: Live,
+        live_monitor: LiveMonitor,
         out_dir: str,
         path_template: str,
         *,
@@ -35,6 +33,7 @@ class HLSStreamRecorderImpl(StreamRecorderImpl):
     ) -> None:
         super().__init__(
             live=live,
+            live_monitor=live_monitor,
             out_dir=out_dir,
             path_template=path_template,
             stream_format='fmp4',
@@ -52,43 +51,41 @@ class HLSStreamRecorderImpl(StreamRecorderImpl):
         self._segment_fetcher = hls_ops.SegmentFetcher(
             self._live, self._session, self._stream_url_resolver
         )
-        self._segment_remuxer = hls_ops.SegmentRemuxer(live)
-
-        self._prober = hls_ops.Prober()
-        self._dl_statistics = core_ops.SizedStatistics()
-
-        self._segment_parser = hls_ops.SegmentParser()
-        self._analyser = flv_ops.Analyser()
-        self._injector = flv_ops.Injector(self._metadata_provider)
-        self._join_point_extractor = flv_ops.JoinPointExtractor()
-        self._limiter = flv_ops.Limiter(filesize_limit, duration_limit)
-        self._cutter = flv_ops.Cutter()
-        self._dumper = flv_ops.Dumper(self._path_provider, buffer_size)
-        self._metadata_dumper = MetadataDumper(
-            self._dumper, self._analyser, self._join_point_extractor
+        self._segment_dumper = hls_ops.SegmentDumper(self._path_provider)
+        self._playlist_dumper = hls_ops.PlaylistDumper(self._segment_dumper)
+        self._ff_metadata_dumper = MetadataDumper(
+            self._segment_dumper, self._metadata_provider
         )
 
+        self._cutter = hls_ops.Cutter(self._playlist_dumper)
+        self._limiter = hls_ops.Limiter(
+            self._playlist_dumper,
+            self._segment_dumper,
+            filesize_limit=filesize_limit,
+            duration_limit=duration_limit,
+        )
+        self._prober = hls_ops.Prober()
+        self._analyser = hls_ops.Analyser(
+            self._playlist_dumper, self._segment_dumper, self._prober
+        )
+        self._dl_statistics = core_ops.SizedStatistics()
+
         self._recording_monitor = core_ops.RecordingMonitor(
-            live, lambda: self._analyser.duration
+            live,
+            lambda: self._playlist_dumper.duration,
+            self._playlist_dumper.duration_updated,
         )
 
         self._prober.profiles.subscribe(self._on_profile_updated)
-        self._dumper.file_opened.subscribe(self._on_video_file_opened)
-        self._dumper.file_closed.subscribe(self._on_video_file_closed)
+        self._segment_dumper.file_opened.subscribe(self._on_video_file_opened)
+        self._segment_dumper.file_closed.subscribe(self._on_video_file_closed)
+        self._playlist_dumper.segments_lost.subscribe(self._on_duration_lost)
         self._recording_monitor.interrupted.subscribe(self._on_recording_interrupted)
         self._recording_monitor.recovered.subscribe(self._on_recording_recovered)
 
-    @property
-    def buffer_size(self) -> int:
-        return self._dumper.buffer_size
-
-    @buffer_size.setter
-    def buffer_size(self, value: int) -> None:
-        self._dumper.buffer_size = value
-
     @property
     def recording_path(self) -> Optional[str]:
-        return self._dumper.path
+        return self._segment_dumper.path
 
     @property
     def filesize_limit(self) -> int:
@@ -107,11 +104,8 @@ class HLSStreamRecorderImpl(StreamRecorderImpl):
         self._limiter.duration_limit = value
 
     @property
-    def metadata(self) -> Optional[flv_ops.MetaData]:
-        try:
-            return self._analyser.make_metadata()
-        except Exception:
-            return None
+    def metadata(self) -> Optional[hls_ops.MetaData]:
+        return self._analyser.make_metadata()
 
     def can_cut_stream(self) -> bool:
         return self._cutter.can_cut_stream()
@@ -120,45 +114,43 @@ class HLSStreamRecorderImpl(StreamRecorderImpl):
         return self._cutter.cut_stream()
 
     def _on_start(self) -> None:
-        self._metadata_dumper.enable()
+        self._ff_metadata_dumper.enable()
 
     def _on_stop(self) -> None:
-        self._metadata_dumper.disable()
+        self._ff_metadata_dumper.disable()
 
     def _run(self) -> None:
-        self._subscription = (
-            self._stream_param_holder.get_stream_params()  # type: ignore
-            .pipe(
-                self._stream_url_resolver,
-                self._playlist_fetcher,
-                self._recording_monitor,
-                self._connection_error_handler,
-                self._request_exception_handler,
-                self._playlist_resolver,
-                utils_ops.observe_on_new_thread(
-                    queue_size=60, thread_name=f'SegmentFetcher::{self._live.room_id}'
-                ),
-                self._segment_fetcher,
-                self._dl_statistics,
-                self._prober,
-                utils_ops.observe_on_new_thread(
-                    queue_size=10, thread_name=f'StreamRecorder::{self._live.room_id}'
-                ),
-                self._segment_remuxer,
-                self._segment_parser,
-                flv_ops.process(),
-                self._cutter,
-                self._limiter,
-                self._join_point_extractor,
-                self._injector,
-                self._analyser,
-                self._dumper,
-                self._rec_statistics,
-                self._progress_bar,
-                self._exception_handler,
+        with logger.contextualize(room_id=self._live.room_id):
+            self._subscription = (
+                self._stream_param_holder.get_stream_params()  # type: ignore
+                .pipe(
+                    self._stream_url_resolver,
+                    self._playlist_fetcher,
+                    self._recording_monitor,
+                    self._connection_error_handler,
+                    self._request_exception_handler,
+                    self._playlist_resolver,
+                    utils_ops.observe_on_new_thread(
+                        queue_size=60,
+                        thread_name=f'SegmentFetcher::{self._live.room_id}',
+                        logger_context={'room_id': self._live.room_id},
+                    ),
+                    self._segment_fetcher,
+                    self._dl_statistics,
+                    self._prober,
+                    self._analyser,
+                    self._cutter,
+                    self._limiter,
+                    self._segment_dumper,
+                    self._rec_statistics,
+                    self._progress_bar,
+                    self._playlist_dumper,
+                    self._exception_handler,
+                )
+                .subscribe(
+                    on_completed=self._on_completed,
+                    scheduler=NewThreadScheduler(
+                        self._thread_factory('HLSStreamRecorder')
+                    ),
+                )
             )
-            .subscribe(
-                on_completed=self._on_completed,
-                scheduler=NewThreadScheduler(self._thread_factory('HLSStreamRecorder')),
-            )
-        )

src/blrec/core/metadata_provider.py

@@ -54,13 +54,6 @@ class MetadataProvider:
             ', bluray' if '_bluray' in self._stream_recorder.stream_url else '',
         )
 
-        if self._stream_recorder.recording_mode == 'standard':
-            recording_mode_desc = '标准'
-        elif self._stream_recorder.recording_mode == 'raw':
-            recording_mode_desc = '原始'
-        else:
-            recording_mode_desc = '？？'
-
         return {
             'Title': self._live.room_info.title,
             'Artist': self._live.user_info.name,
@@ -74,11 +67,10 @@ B站直播录像
 开播时间：{live_start_time}
 开始推流时间: {stream_available_time}
 HLS流可用时间: {hls_stream_available_time}
-开始录制时间: {record_start_time}
+录播起始时间: {record_start_time}
 流主机: {self._stream_recorder.stream_host}
 流格式：{self._stream_recorder.stream_format}
 流画质：{stream_quality}
-录制模式: {recording_mode_desc}
 录制程序：{__prog__} v{__version__} {__github__}''',
             'description': OrderedDict(
                 {
@@ -95,7 +87,6 @@ HLS流可用时间: {hls_stream_available_time}
                     'StreamHost': self._stream_recorder.stream_host,
                     'StreamFormat': self._stream_recorder.stream_format,
                     'StreamQuality': stream_quality,
-                    'RecordingMode': self._stream_recorder.recording_mode,
                     'Recorder': f'{__prog__} v{__version__} {__github__}',
                 }
             ),

src/blrec/core/models.py

@@ -1,12 +1,9 @@
-import logging
 from typing import Literal
 
 import attr
 
 from blrec.bili.typing import Danmaku
 
-logger = logging.getLogger(__name__)
-
 
 @attr.s(auto_attribs=True, frozen=True, slots=True)
 class DanmuMsg:

src/blrec/core/operators/connection_error_handler.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-import logging
 import time
 from typing import Optional, TypeVar
 
 import aiohttp
 import requests
+from loguru import logger
 from reactivex import Observable, abc
 
 from blrec.bili.live import Live
@@ -15,8 +15,6 @@ from blrec.utils.mixins import AsyncCooperationMixin
 __all__ = ('ConnectionErrorHandler',)
 
 
-logger = logging.getLogger(__name__)
-
 _T = TypeVar('_T')
 
 
@@ -77,7 +75,7 @@ class ConnectionErrorHandler(AsyncCooperationMixin):
         timeout = self.disconnection_timeout
         logger.info(f'Waiting {timeout} seconds for connection recovery... ')
         timebase = time.monotonic()
-        while not self._run_coroutine(self._live.check_connectivity()):
+        while not self._call_coroutine(self._live.check_connectivity()):
             if timeout is not None and time.monotonic() - timebase > timeout:
                 logger.error(f'Connection not recovered in {timeout} seconds')
                 return False

src/blrec/core/operators/exception_handler.py

@@ -1,20 +1,19 @@
 from __future__ import annotations
 
 import errno
-import logging
 from typing import Optional, TypeVar
 
+from loguru import logger
 from reactivex import Observable, abc
 
 from blrec.bili.exceptions import LiveRoomEncrypted, LiveRoomHidden, LiveRoomLocked
+from blrec.exception.helpers import format_exception
 from blrec.utils import operators as utils_ops
 from blrec.utils.mixins import AsyncCooperationMixin
 
 __all__ = ('ExceptionHandler',)
 
 
-logger = logging.getLogger(__name__)
-
 _T = TypeVar('_T')
 
 
@@ -28,12 +27,11 @@ class ExceptionHandler(AsyncCooperationMixin):
             scheduler: Optional[abc.SchedulerBase] = None,
         ) -> abc.DisposableBase:
             def on_error(exc: Exception) -> None:
-                logger.exception(repr(exc))
                 self._submit_exception(exc)
                 try:
                     raise exc
                 except OSError as e:
-                    logger.critical(repr(e), exc_info=e)
+                    logger.critical('{}\n{}', repr(exc), format_exception(exc))
                     if e.errno == errno.ENOSPC:
                         # OSError(28, 'No space left on device')
                         observer.on_completed()

src/blrec/core/operators/progress_bar.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging
 import os
 from typing import Optional
 
@@ -13,11 +12,8 @@ from blrec.flv.operators.typing import FLVStream, FLVStreamItem
 
 __all__ = ('ProgressBar',)
 
-
 DISPLAY_PROGRESS = bool(os.environ.get('BLREC_PROGRESS'))
 
-logger = logging.getLogger(__name__)
-
 
 class ProgressBar:
     def __init__(self, live: Live) -> None:

src/blrec/core/operators/recording_monitor.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import logging
-from typing import Callable, Final, Optional, TypeVar
+import time
+from typing import Callable, Final, Optional, Tuple, TypeVar
 
 from reactivex import Observable, Subject, abc
 
@@ -11,27 +11,39 @@ from blrec.utils.mixins import AsyncCooperationMixin
 __all__ = ('RecordingMonitor',)
 
 
-logger = logging.getLogger(__name__)
-
 _T = TypeVar('_T')
 
 
 class RecordingMonitor(AsyncCooperationMixin):
-    def __init__(self, live: Live, duration_provider: Callable[..., float]) -> None:
+    def __init__(
+        self,
+        live: Live,
+        duration_provider: Callable[..., float],
+        duration_updated: Observable[float],
+    ) -> None:
         super().__init__()
         self._live = live
         self._duration_provider = duration_provider
-        self._interrupted: Subject[float] = Subject()
-        self._recovered: Subject[int] = Subject()
+        self._duration_updated = duration_updated
+        self._duration_subscription: Optional[abc.DisposableBase] = None
+        self._interrupted: Subject[Tuple[float, float]] = Subject()
+        self._recovered: Subject[float] = Subject()
 
     @property
-    def interrupted(self) -> Observable[float]:
+    def interrupted(self) -> Observable[Tuple[float, float]]:
         return self._interrupted
 
     @property
-    def recovered(self) -> Observable[int]:
+    def recovered(self) -> Observable[float]:
         return self._recovered
 
+    def _on_duration_updated(self, duration: float) -> None:
+        ts = time.time()
+        self._recovered.on_next(ts)
+        assert self._duration_subscription is not None
+        self._duration_subscription.dispose()
+        self._duration_subscription = None
+
     def __call__(self, source: Observable[_T]) -> Observable[_T]:
         return self._monitor(source)
 
@@ -48,8 +60,11 @@ class RecordingMonitor(AsyncCooperationMixin):
                 nonlocal recording, failed_count
                 recording = True
                 if failed_count >= CRITERIA:
-                    ts = self._run_coroutine(self._live.get_timestamp())
-                    self._recovered.on_next(ts)
+                    if self._duration_subscription is not None:
+                        self._duration_subscription.dispose()
+                    self._duration_subscription = self._duration_updated.subscribe(
+                        self._on_duration_updated
+                    )
                 failed_count = 0
                 observer.on_next(item)
 
@@ -58,8 +73,9 @@ class RecordingMonitor(AsyncCooperationMixin):
                 if recording:
                     failed_count += 1
                     if failed_count == CRITERIA:
+                        ts = time.time()
                         duration = self._duration_provider()
-                        self._interrupted.on_next(duration)
+                        self._interrupted.on_next((ts, duration))
                 observer.on_error(exc)
 
             return source.subscribe(

src/blrec/core/operators/request_exception_handler.py

@@ -1,32 +1,34 @@
 from __future__ import annotations
 
 import asyncio
-import logging
 import time
 from typing import Optional, TypeVar
 
 import aiohttp
 import requests
 import urllib3
+from loguru import logger
 from reactivex import Observable, abc
+from reactivex import operators as ops
 
+from blrec.core import operators as core_ops
 from blrec.utils import operators as utils_ops
 
 __all__ = ('RequestExceptionHandler',)
 
 
-logger = logging.getLogger(__name__)
-
 _T = TypeVar('_T')
 
 
 class RequestExceptionHandler:
-    def __init__(self) -> None:
+    def __init__(self, stream_url_resolver: core_ops.StreamURLResolver) -> None:
+        self._stream_url_resolver = stream_url_resolver
         self._last_retry_time = time.monotonic()
 
     def __call__(self, source: Observable[_T]) -> Observable[_T]:
         return self._handle(source).pipe(
-            utils_ops.retry(should_retry=self._should_retry)
+            ops.do_action(on_error=self._before_retry),
+            utils_ops.retry(should_retry=self._should_retry),
         )
 
     def _handle(self, source: Observable[_T]) -> Observable[_T]:
@@ -74,3 +76,10 @@ class RequestExceptionHandler:
             return True
         else:
             return False
+
+    def _before_retry(self, exc: Exception) -> None:
+        if isinstance(
+            exc, requests.exceptions.HTTPError
+        ) and exc.response.status_code in (403, 404):
+            self._stream_url_resolver.reset()
+            self._stream_url_resolver.rotate_routes()

src/blrec/core/operators/stream_fetcher.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
 import io
-import logging
 from typing import Optional
 
 import requests
+from loguru import logger
 from reactivex import Observable, abc
 
 from blrec.bili.live import Live
@@ -13,9 +13,6 @@ from blrec.utils.mixins import AsyncCooperationMixin
 __all__ = ('StreamFetcher',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class StreamFetcher(AsyncCooperationMixin):
     def __init__(
         self,

src/blrec/core/operators/stream_parser.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import io
-import logging
 
+from loguru import logger
 from reactivex import Observable
 from reactivex import operators as ops
 
@@ -16,9 +16,6 @@ from ..stream_param_holder import StreamParamHolder
 __all__ = ('StreamParser',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class StreamParser:
     def __init__(
         self,

src/blrec/core/operators/stream_url_resolver.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-import logging
-from typing import Optional
+from typing import Final, Optional
 from urllib.parse import urlparse
 
 import requests
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex import operators as ops
 
@@ -19,6 +19,7 @@ from blrec.bili.exceptions import (
     NoStreamQualityAvailable,
 )
 from blrec.bili.live import Live
+from blrec.bili.live_monitor import LiveMonitor
 from blrec.utils import operators as utils_ops
 from blrec.utils.mixins import AsyncCooperationMixin
 
@@ -27,17 +28,25 @@ from ..stream_param_holder import StreamParamHolder, StreamParams
 __all__ = ('StreamURLResolver',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class StreamURLResolver(AsyncCooperationMixin):
-    def __init__(self, live: Live, stream_param_holder: StreamParamHolder) -> None:
+    _MAX_ATTEMPTS_FOR_NO_STREAM: Final[int] = 10
+
+    def __init__(
+        self,
+        live: Live,
+        session: requests.Session,
+        live_monitor: LiveMonitor,
+        stream_param_holder: StreamParamHolder,
+    ) -> None:
         super().__init__()
         self._live = live
+        self._session = session
+        self._live_monitor = live_monitor
         self._stream_param_holder = stream_param_holder
         self._stream_url: str = ''
         self._stream_host: str = ''
         self._stream_params: Optional[StreamParams] = None
+        self._attempts_for_no_stream: int = 0
 
     @property
     def stream_url(self) -> str:
@@ -47,10 +56,22 @@ class StreamURLResolver(AsyncCooperationMixin):
     def stream_host(self) -> str:
         return self._stream_host
 
+    @property
+    def use_alternative_stream(self) -> bool:
+        return self._stream_param_holder.use_alternative_stream
+
+    @use_alternative_stream.setter
+    def use_alternative_stream(self, value: bool) -> None:
+        self._stream_param_holder.use_alternative_stream = value
+
     def reset(self) -> None:
         self._stream_url = ''
         self._stream_host = ''
         self._stream_params = None
+        self._attempts_for_no_stream = 0
+
+    def rotate_routes(self) -> None:
+        self.use_alternative_stream = not self.use_alternative_stream
 
     def __call__(self, source: Observable[StreamParams]) -> Observable[str]:
         self.reset()
@@ -77,7 +98,7 @@ class StreamURLResolver(AsyncCooperationMixin):
                         f'api platform: {params.api_platform}, '
                         f'use alternative stream: {params.use_alternative_stream}'
                     )
-                    url = self._run_coroutine(
+                    url = self._call_coroutine(
                         self._live.get_live_stream_url(
                             params.quality_number,
                             api_platform=params.api_platform,
@@ -93,6 +114,7 @@ class StreamURLResolver(AsyncCooperationMixin):
                     self._stream_url = url
                     self._stream_host = urlparse(url).hostname or ''
                     self._stream_params = params
+                    self._attempts_for_no_stream = 0
                     observer.on_next(url)
 
             return source.subscribe(
@@ -104,8 +126,8 @@ class StreamURLResolver(AsyncCooperationMixin):
     def _can_resue_url(self, params: StreamParams) -> bool:
         if params == self._stream_params and self._stream_url:
             try:
-                response = requests.get(
-                    self._stream_url, stream=True, headers=self._live.headers
+                response = self._session.get(
+                    self._stream_url, stream=True, headers=self._live.headers, timeout=3
                 )
                 response.raise_for_status()
             except Exception:
@@ -134,14 +156,20 @@ class StreamURLResolver(AsyncCooperationMixin):
         try:
             raise exc
         except (NoStreamAvailable, NoStreamCodecAvailable, NoStreamFormatAvailable):
-            pass
+            self._attempts_for_no_stream += 1
+            if self._attempts_for_no_stream > self._MAX_ATTEMPTS_FOR_NO_STREAM:
+                self._run_coroutine(self._live_monitor.check_live_status())
+                self._attempts_for_no_stream = 0
         except NoStreamQualityAvailable:
             qn = self._stream_param_holder.quality_number
-            logger.info(
-                f'The specified stream quality ({qn}) is not available, '
-                'will using the original stream quality (10000) instead.'
-            )
-            self._stream_param_holder.fall_back_quality()
+            if qn == 10000:
+                logger.warning('The original stream quality (10000) is not available')
+            else:
+                logger.info(
+                    f'The specified stream quality ({qn}) is not available, '
+                    'will using the original stream quality (10000) instead.'
+                )
+                self._stream_param_holder.fall_back_quality()
         except NoAlternativeStreamAvailable:
             logger.debug(
                 'No alternative stream url available, '

src/blrec/core/path_provider.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import re
 from datetime import datetime
@@ -10,8 +9,6 @@ from blrec.utils.mixins import AsyncCooperationMixin
 
 __all__ = ('PathProvider',)
 
-logger = logging.getLogger(__name__)
-
 
 class PathProvider(AsyncCooperationMixin):
     def __init__(self, live: Live, out_dir: str, path_template: str) -> None:
@@ -20,10 +17,11 @@ class PathProvider(AsyncCooperationMixin):
         self.out_dir = out_dir
         self.path_template = path_template
 
-    def __call__(self) -> Tuple[str, int]:
-        ts = self._run_coroutine(self._live.get_timestamp())
-        path = self._make_path(ts)
-        return path, ts
+    def __call__(self, timestamp: int = None) -> Tuple[str, int]:
+        if timestamp is None:
+            timestamp = self._call_coroutine(self._live.get_timestamp())
+        path = self._make_path(timestamp)
+        return path, timestamp
 
     def _make_path(self, timestamp: int) -> str:
         date_time = datetime.fromtimestamp(timestamp)

src/blrec/core/raw_danmaku_dumper.py

@@ -1,17 +1,17 @@
 import asyncio
 import json
-import logging
 from contextlib import suppress
 from threading import Lock
 
 import aiofiles
 from aiofiles.threadpool.text import AsyncTextIOWrapper
+from loguru import logger
 from tenacity import AsyncRetrying, retry_if_not_exception_type, stop_after_attempt
 
 from blrec.bili.live import Live
 from blrec.event.event_emitter import EventEmitter, EventListener
 from blrec.exception import exception_callback, submit_exception
-from blrec.logging.room_id import aio_task_with_room_id
+from blrec.logging.context import async_task_with_logger_context
 from blrec.path import raw_danmaku_path
 from blrec.utils.mixins import SwitchableMixin
 
@@ -21,9 +21,6 @@ from .stream_recorder import StreamRecorder, StreamRecorderEventListener
 __all__ = 'RawDanmakuDumper', 'RawDanmakuDumperEventListener'
 
 
-logger = logging.getLogger(__name__)
-
-
 class RawDanmakuDumperEventListener(EventListener):
     async def on_raw_danmaku_file_created(self, path: str) -> None:
         ...
@@ -44,19 +41,20 @@ class RawDanmakuDumper(
         danmaku_receiver: RawDanmakuReceiver,
     ) -> None:
         super().__init__()
-        self._live = live  # @aio_task_with_room_id
+        self._logger_context = {'room_id': live.room_id}
+        self._logger = logger.bind(**self._logger_context)
         self._stream_recorder = stream_recorder
         self._receiver = danmaku_receiver
         self._lock: Lock = Lock()
 
     def _do_enable(self) -> None:
         self._stream_recorder.add_listener(self)
-        logger.debug('Enabled raw danmaku dumper')
+        self._logger.debug('Enabled raw danmaku dumper')
 
     def _do_disable(self) -> None:
         self._stream_recorder.remove_listener(self)
         asyncio.create_task(self._stop_dumping())
-        logger.debug('Disabled raw danmaku dumper')
+        self._logger.debug('Disabled raw danmaku dumper')
 
     async def on_video_file_created(
         self, video_path: str, record_start_time: int
@@ -87,12 +85,12 @@ class RawDanmakuDumper(
         with suppress(asyncio.CancelledError):
             await self._dump_task
 
-    @aio_task_with_room_id
+    @async_task_with_logger_context
     async def _do_dump(self) -> None:
-        logger.debug('Started dumping raw danmaku')
+        self._logger.debug('Started dumping raw danmaku')
         try:
             async with aiofiles.open(self._path, 'wt', encoding='utf8') as f:
-                logger.info(f"Raw danmaku file created: '{self._path}'")
+                self._logger.info(f"Raw danmaku file created: '{self._path}'")
                 await self._emit('raw_danmaku_file_created', self._path)
 
                 async for attempt in AsyncRetrying(
@@ -110,9 +108,9 @@ class RawDanmakuDumper(
                     json_string = json.dumps(danmu, ensure_ascii=False)
                     await f.write(json_string + '\n')
         finally:
-            logger.info(f"Raw danmaku file completed: '{self._path}'")
+            self._logger.info(f"Raw danmaku file completed: '{self._path}'")
             await self._emit('raw_danmaku_file_completed', self._path)
-            logger.debug('Stopped dumping raw danmaku')
+            self._logger.debug('Stopped dumping raw danmaku')
 
     async def _dumping_loop(self, file: AsyncTextIOWrapper) -> None:
         while True:

src/blrec/core/raw_danmaku_receiver.py

@@ -1,33 +1,33 @@
-import logging
 from asyncio import Queue, QueueFull
 from typing import Final
 
+from loguru import logger
+
 from blrec.bili.danmaku_client import DanmakuClient, DanmakuListener
+from blrec.bili.live import Live
 from blrec.bili.typing import Danmaku
 from blrec.utils.mixins import StoppableMixin
 
 __all__ = ('RawDanmakuReceiver',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class RawDanmakuReceiver(DanmakuListener, StoppableMixin):
     _MAX_QUEUE_SIZE: Final[int] = 2000
 
-    def __init__(self, danmaku_client: DanmakuClient) -> None:
+    def __init__(self, live: Live, danmaku_client: DanmakuClient) -> None:
         super().__init__()
+        self._logger = logger.bind(room_id=live.room_id)
         self._danmaku_client = danmaku_client
         self._queue: Queue[Danmaku] = Queue(maxsize=self._MAX_QUEUE_SIZE)
 
     def _do_start(self) -> None:
         self._danmaku_client.add_listener(self)
-        logger.debug('Started raw danmaku receiver')
+        self._logger.debug('Started raw danmaku receiver')
 
     def _do_stop(self) -> None:
         self._danmaku_client.remove_listener(self)
         self._clear_queue()
-        logger.debug('Stopped raw danmaku receiver')
+        self._logger.debug('Stopped raw danmaku receiver')
 
     async def get_raw_danmaku(self) -> Danmaku:
         return await self._queue.get()

src/blrec/core/recorder.py

@@ -1,19 +1,20 @@
 from __future__ import annotations
 
 import asyncio
-import logging
 from datetime import datetime
 from typing import Iterator, Optional
 
 import humanize
+from loguru import logger
 
 from blrec.bili.danmaku_client import DanmakuClient
 from blrec.bili.live import Live
 from blrec.bili.live_monitor import LiveEventListener, LiveMonitor
 from blrec.bili.models import RoomInfo
 from blrec.bili.typing import QualityNumber, StreamFormat
+from blrec.core.typing import MetaData
 from blrec.event.event_emitter import EventEmitter, EventListener
-from blrec.flv.operators import MetaData, StreamProfile
+from blrec.flv.operators import StreamProfile
 from blrec.setting.typing import RecordingMode
 from blrec.utils.mixins import AsyncStoppableMixin
 
@@ -31,9 +32,6 @@ from .stream_recorder import StreamRecorder, StreamRecorderEventListener
 __all__ = 'RecorderEventListener', 'Recorder'
 
 
-logger = logging.getLogger(__name__)
-
-
 class RecorderEventListener(EventListener):
     async def on_recording_started(self, recorder: Recorder) -> None:
         ...
@@ -104,6 +102,8 @@ class Recorder(
         save_raw_danmaku: bool = False,
     ) -> None:
         super().__init__()
+        self._logger_context = {'room_id': live.room_id}
+        self._logger = logger.bind(**self._logger_context)
 
         self._live = live
         self._danmaku_client = danmaku_client
@@ -114,7 +114,8 @@ class Recorder(
         self._stream_available: bool = False
 
         self._stream_recorder = StreamRecorder(
-            self._live,
+            live,
+            live_monitor,
             out_dir=out_dir,
             path_template=path_template,
             stream_format=stream_format,
@@ -128,9 +129,9 @@ class Recorder(
             duration_limit=duration_limit,
         )
 
-        self._danmaku_receiver = DanmakuReceiver(danmaku_client)
+        self._danmaku_receiver = DanmakuReceiver(live, danmaku_client)
         self._danmaku_dumper = DanmakuDumper(
-            self._live,
+            live,
             self._stream_recorder,
             self._danmaku_receiver,
             danmu_uname=danmu_uname,
@@ -139,13 +140,13 @@ class Recorder(
             record_guard_buy=record_guard_buy,
             record_super_chat=record_super_chat,
         )
-        self._raw_danmaku_receiver = RawDanmakuReceiver(danmaku_client)
+        self._raw_danmaku_receiver = RawDanmakuReceiver(live, danmaku_client)
         self._raw_danmaku_dumper = RawDanmakuDumper(
-            self._live, self._stream_recorder, self._raw_danmaku_receiver
+            live, self._stream_recorder, self._raw_danmaku_receiver
         )
 
         self._cover_downloader = CoverDownloader(
-            self._live,
+            live,
             self._stream_recorder,
             save_cover=save_cover,
             cover_save_strategy=cover_save_strategy,
@@ -378,12 +379,12 @@ class Recorder(
         return self._stream_recorder.cut_stream()
 
     async def on_live_began(self, live: Live) -> None:
-        logger.info('The live has began')
+        self._logger.info('The live has began')
         self._print_live_info()
         await self._start_recording()
 
     async def on_live_ended(self, live: Live) -> None:
-        logger.info('The live has ended')
+        self._logger.info('The live has ended')
         await asyncio.sleep(3)
         self._stream_available = False
         self._stream_recorder.stream_available_time = None
@@ -391,13 +392,13 @@ class Recorder(
         self._print_waiting_message()
 
     async def on_live_stream_available(self, live: Live) -> None:
-        logger.debug('The live stream becomes available')
+        self._logger.debug('The live stream becomes available')
         self._stream_available = True
         self._stream_recorder.stream_available_time = await live.get_timestamp()
         await self._stream_recorder.start()
 
     async def on_live_stream_reset(self, live: Live) -> None:
-        logger.warning('The live stream has been reset')
+        self._logger.warning('The live stream has been reset')
         if not self._recording:
             await self._start_recording()
 
@@ -427,7 +428,7 @@ class Recorder(
         await self._emit('cover_image_downloaded', self, path)
 
     async def on_stream_recording_completed(self) -> None:
-        logger.debug('Stream recording completed')
+        self._logger.debug('Stream recording completed')
         await self._stop_recording()
 
     async def _do_start(self) -> None:
@@ -435,7 +436,7 @@ class Recorder(
         self._danmaku_dumper.add_listener(self)
         self._raw_danmaku_dumper.add_listener(self)
         self._cover_downloader.add_listener(self)
-        logger.debug('Started recorder')
+        self._logger.debug('Started recorder')
 
         self._print_live_info()
         if self._live.is_living():
@@ -450,7 +451,7 @@ class Recorder(
         self._danmaku_dumper.remove_listener(self)
         self._raw_danmaku_dumper.remove_listener(self)
         self._cover_downloader.remove_listener(self)
-        logger.debug('Stopped recorder')
+        self._logger.debug('Stopped recorder')
 
     async def _start_recording(self) -> None:
         if self._recording:
@@ -469,7 +470,7 @@ class Recorder(
         if self._stream_available:
             await self._stream_recorder.start()
 
-        logger.info('Started recording')
+        self._logger.info('Started recording')
         await self._emit('recording_started', self)
 
     async def _stop_recording(self) -> None:
@@ -487,10 +488,10 @@ class Recorder(
         self._stream_recorder.remove_listener(self)
 
         if self._stopped:
-            logger.info('Recording Cancelled')
+            self._logger.info('Recording Cancelled')
             await self._emit('recording_cancelled', self)
         else:
-            logger.info('Recording Finished')
+            self._logger.info('Recording Finished')
             await self._emit('recording_finished', self)
 
     async def _prepare(self) -> None:
@@ -500,7 +501,7 @@ class Recorder(
         self._stream_recorder.clear_files()
 
     def _print_waiting_message(self) -> None:
-        logger.info('Waiting... until the live starts')
+        self._logger.info('Waiting... until the live starts')
 
     def _print_live_info(self) -> None:
         room_info = self._live.room_info
@@ -513,11 +514,9 @@ class Recorder(
 
         msg = f"""
 ================================== User Info ==================================
+user id          : {user_info.uid}
 user name        : {user_info.name}
 gender           : {user_info.gender}
-sign             : {user_info.sign}
-uid              : {user_info.uid}
-level            : {user_info.level}
 ---------------------------------- Room Info ----------------------------------
 title            : {room_info.title}
 cover            : {room_info.cover}
@@ -535,7 +534,7 @@ description      :
 {room_info.description}
 ===============================================================================
 """
-        logger.info(msg)
+        self._logger.info(msg)
 
     def _print_changed_room_info(self, room_info: RoomInfo) -> None:
         msg = f"""
@@ -547,4 +546,4 @@ parent area id   : {room_info.parent_area_id}
 parent area name : {room_info.parent_area_name}
 ===============================================================================
 """
-        logger.info(msg)
+        self._logger.info(msg)

src/blrec/core/stream_param_holder.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging
 from typing import Any, Final, Optional
 
 import attr
@@ -13,9 +12,6 @@ from blrec.bili.typing import ApiPlatform, QualityNumber, StreamFormat
 __all__ = ('StreamParamHolder',)
 
 
-logger = logging.getLogger(__name__)
-
-
 @attr.s(auto_attribs=True, frozen=True, slots=True)
 class StreamParams:
     stream_format: StreamFormat

src/blrec/core/stream_recorder.py

@@ -1,27 +1,26 @@
 import asyncio
-import logging
 import time
 from typing import Iterator, Optional
 
+from loguru import logger
+
 from blrec.bili.live import Live
+from blrec.bili.live_monitor import LiveMonitor
 from blrec.bili.typing import QualityNumber, StreamFormat
 from blrec.event.event_emitter import EventEmitter
-from blrec.flv.operators import MetaData, StreamProfile
+from blrec.flv.operators import StreamProfile
 from blrec.setting.typing import RecordingMode
 from blrec.utils.libc import malloc_trim
 from blrec.utils.mixins import AsyncStoppableMixin
 
 from .flv_stream_recorder_impl import FLVStreamRecorderImpl
-from .hls_raw_stream_recorder_impl import HLSRawStreamRecorderImpl
 from .hls_stream_recorder_impl import HLSStreamRecorderImpl
 from .stream_recorder_impl import StreamRecorderEventListener
+from .typing import MetaData
 
 __all__ = 'StreamRecorder', 'StreamRecorderEventListener'
 
 
-logger = logging.getLogger(__name__)
-
-
 class StreamRecorder(
     StreamRecorderEventListener,
     EventEmitter[StreamRecorderEventListener],
@@ -30,6 +29,7 @@ class StreamRecorder(
     def __init__(
         self,
         live: Live,
+        live_monitor: LiveMonitor,
         out_dir: str,
         path_template: str,
         *,
@@ -44,8 +44,11 @@ class StreamRecorder(
         duration_limit: int = 0,
     ) -> None:
         super().__init__()
+        self._logger_context = {'room_id': live.room_id}
+        self._logger = logger.bind(**self._logger_context)
 
         self._live = live
+        self._live_monitor = live_monitor
         self.stream_format = stream_format
         self.recording_mode = recording_mode
         self.fmp4_stream_timeout = fmp4_stream_timeout
@@ -53,12 +56,9 @@ class StreamRecorder(
         if stream_format == 'flv':
             cls = FLVStreamRecorderImpl
         elif stream_format == 'fmp4':
-            if recording_mode == 'standard':
-                cls = HLSStreamRecorderImpl  # type: ignore
-            else:
-                cls = HLSRawStreamRecorderImpl  # type: ignore
+            cls = HLSStreamRecorderImpl  # type: ignore
         else:
-            logger.warning(
+            self._logger.warning(
                 f'The specified stream format ({stream_format}) is '
                 'unsupported, will using the stream format (flv) instead.'
             )
@@ -67,6 +67,7 @@ class StreamRecorder(
 
         self._impl = cls(
             live=live,
+            live_monitor=live_monitor,
             out_dir=out_dir,
             path_template=path_template,
             quality_number=quality_number,
@@ -241,7 +242,7 @@ class StreamRecorder(
 
         if self._live.has_no_flv_streams():
             if stream_format == 'flv':
-                logger.warning(
+                self._logger.warning(
                     'The specified stream format (flv) is not available, '
                     'falling back to stream format (fmp4).'
                 )
@@ -249,7 +250,7 @@ class StreamRecorder(
             self.hls_stream_available_time = self.stream_available_time
         else:
             if stream_format == 'fmp4':
-                logger.info('Waiting for the fmp4 stream becomes available...')
+                self._logger.info('Waiting for the fmp4 stream becomes available...')
                 available = await self._wait_fmp4_stream()
                 if available:
                     if self.stream_available_time is not None:
@@ -257,7 +258,7 @@ class StreamRecorder(
                             await self._live.get_timestamp()
                         )
                 else:
-                    logger.warning(
+                    self._logger.warning(
                         'The specified stream format (fmp4) is not available '
                         f'in {self.fmp4_stream_timeout} seconcds, '
                         'falling back to stream format (flv).'
@@ -277,10 +278,12 @@ class StreamRecorder(
     async def on_video_file_completed(self, path: str) -> None:
         await self._emit('video_file_completed', path)
 
-    async def on_stream_recording_interrupted(self, duration: float) -> None:
-        await self._emit('stream_recording_interrupted', duration)
+    async def on_stream_recording_interrupted(
+        self, timestamp: float, duration: float
+    ) -> None:
+        await self._emit('stream_recording_interrupted', timestamp, duration)
 
-    async def on_stream_recording_recovered(self, timestamp: int) -> None:
+    async def on_stream_recording_recovered(self, timestamp: float) -> None:
         await self._emit('stream_recording_recovered', timestamp)
 
     async def on_stream_recording_completed(self) -> None:
@@ -307,12 +310,9 @@ class StreamRecorder(
         if stream_format == 'flv':
             cls = FLVStreamRecorderImpl
         elif stream_format == 'fmp4':
-            if self.recording_mode == 'standard':
-                cls = HLSStreamRecorderImpl  # type: ignore
-            else:
-                cls = HLSRawStreamRecorderImpl  # type: ignore
+            cls = HLSStreamRecorderImpl  # type: ignore
         else:
-            logger.warning(
+            self._logger.warning(
                 f'The specified stream format ({stream_format}) is '
                 'unsupported, will using the stream format (flv) instead.'
             )
@@ -327,6 +327,7 @@ class StreamRecorder(
 
         self._impl = cls(
             live=self._impl._live,
+            live_monitor=self._impl._live_monitor,
             out_dir=self._impl.out_dir,
             path_template=self._impl.path_template,
             quality_number=self._impl.quality_number,
@@ -341,4 +342,4 @@ class StreamRecorder(
         self._impl.stream_available_time = stream_available_time
         self._impl.hls_stream_available_time = hls_stream_available_time
 
-        logger.debug(f'Changed stream recorder impl to {cls.__name__}')
+        self._logger.debug(f'Changed stream recorder impl to {cls.__name__}')

src/blrec/core/stream_recorder_impl.py

@@ -7,16 +7,18 @@ from typing import Any, Iterator, List, Optional, Tuple, Union
 
 import requests
 import urllib3
+from loguru import logger
 from reactivex import abc
 from reactivex.typing import StartableFactory, StartableTarget
 
 from blrec.bili.live import Live
+from blrec.bili.live_monitor import LiveMonitor
 from blrec.bili.typing import QualityNumber, StreamFormat
 from blrec.event.event_emitter import EventEmitter, EventListener
 from blrec.flv import operators as flv_ops
 from blrec.flv.operators import StreamProfile
 from blrec.flv.utils import format_timestamp
-from blrec.logging.room_id import aio_task_with_room_id
+from blrec.hls import operators as hls_ops
 from blrec.setting.typing import RecordingMode
 from blrec.utils.mixins import AsyncCooperationMixin, AsyncStoppableMixin
 
@@ -28,7 +30,6 @@ from .stream_param_holder import StreamParamHolder
 __all__ = ('StreamRecorderImpl',)
 
 
-logger = logging.getLogger(__name__)
 logging.getLogger(urllib3.__name__).setLevel(logging.WARNING)
 
 
@@ -39,10 +40,15 @@ class StreamRecorderEventListener(EventListener):
     async def on_video_file_completed(self, path: str) -> None:
         ...
 
-    async def on_stream_recording_interrupted(self, duratin: float) -> None:
+    async def on_stream_recording_interrupted(
+        self, timestamp: float, duration: float
+    ) -> None:
         ...
 
-    async def on_stream_recording_recovered(self, timestamp: int) -> None:
+    async def on_stream_recording_recovered(self, timestamp: float) -> None:
+        ...
+
+    async def on_duration_lost(self, duration: float) -> None:
         ...
 
     async def on_stream_recording_completed(self) -> None:
@@ -58,6 +64,7 @@ class StreamRecorderImpl(
     def __init__(
         self,
         live: Live,
+        live_monitor: LiveMonitor,
         out_dir: str,
         path_template: str,
         *,
@@ -71,8 +78,11 @@ class StreamRecorderImpl(
         duration_limit: int = 0,
     ) -> None:
         super().__init__()
+        self._logger_context = {'room_id': live.room_id}
+        self._logger = logger.bind(**self._logger_context)
 
         self._live = live
+        self._live_monitor = live_monitor
         self._session = requests.Session()
 
         self._recording_mode = recording_mode
@@ -85,7 +95,7 @@ class StreamRecorderImpl(
             stream_format=stream_format, quality_number=quality_number
         )
         self._stream_url_resolver = core_ops.StreamURLResolver(
-            live, self._stream_param_holder
+            live, self._session, live_monitor, self._stream_param_holder
         )
         self._progress_bar = core_ops.ProgressBar(live)
         self._metadata_provider = MetadataProvider(live, self)
@@ -93,7 +103,9 @@ class StreamRecorderImpl(
         self._rec_statistics = core_ops.SizedStatistics()
         self._dl_statistics: Union[core_ops.StreamStatistics, core_ops.SizedStatistics]
 
-        self._request_exception_handler = core_ops.RequestExceptionHandler()
+        self._request_exception_handler = core_ops.RequestExceptionHandler(
+            self._stream_url_resolver
+        )
         self._connection_error_handler = core_ops.ConnectionErrorHandler(
             live, disconnection_timeout=disconnection_timeout
         )
@@ -240,7 +252,7 @@ class StreamRecorderImpl(
         return ''
 
     @property
-    def metadata(self) -> Optional[flv_ops.MetaData]:
+    def metadata(self) -> Optional[Union[flv_ops.MetaData, hls_ops.MetaData]]:
         return None
 
     @property
@@ -272,14 +284,14 @@ class StreamRecorderImpl(
         self._completed = False
 
     async def _do_start(self) -> None:
-        logger.debug('Starting stream recorder...')
+        self._logger.debug('Starting stream recorder...')
         self._on_start()
         self._reset()
         self._run()
-        logger.debug('Started stream recorder')
+        self._logger.debug('Started stream recorder')
 
     async def _do_stop(self) -> None:
-        logger.debug('Stopping stream recorder...')
+        self._logger.debug('Stopping stream recorder...')
         self._stream_param_holder.cancel()
         thread = self._thread_factory('StreamRecorderDisposer')(self._dispose)
         thread.start()
@@ -287,7 +299,7 @@ class StreamRecorderImpl(
             await self._loop.run_in_executor(None, thread.join, 30)
         self._threads.clear()
         self._on_stop()
-        logger.debug('Stopped stream recorder')
+        self._logger.debug('Stopped stream recorder')
 
     def _on_start(self) -> None:
         pass
@@ -301,10 +313,15 @@ class StreamRecorderImpl(
 
     def _thread_factory(self, name: str) -> StartableFactory:
         def factory(target: StartableTarget) -> Thread:
+            def run() -> None:
+                with logger.contextualize(room_id=self._live.room_id):
+                    target()
+
             thread = Thread(
-                target=target, daemon=True, name=f'{name}::{self._live.room_id}'
+                target=run, daemon=True, name=f'{name}::{self._live.room_id}'
             )
             self._threads.append(thread)
+
             return thread
 
         return factory
@@ -324,32 +341,37 @@ class StreamRecorderImpl(
         self._emit_event('stream_recording_completed')
 
     def _on_profile_updated(self, profile: StreamProfile) -> None:
-        logger.debug(f'Stream profile: {profile}')
+        self._logger.debug(f'Stream profile: {profile}')
         self._stream_profile = profile
 
     def _on_video_file_opened(self, args: Tuple[str, int]) -> None:
-        logger.info(f"Video file created: '{args[0]}'")
+        self._logger.info(f"Video file created: '{args[0]}'")
         self._files.append(args[0])
         self._record_start_time = args[1]
         self._emit_event('video_file_created', *args)
 
     def _on_video_file_closed(self, path: str) -> None:
-        logger.info(f"Video file completed: '{path}'")
+        self._logger.info(f"Video file completed: '{path}'")
         self._emit_event('video_file_completed', path)
 
-    def _on_recording_interrupted(self, duration: float) -> None:
-        duration_string = format_timestamp(int(duration * 1000))
-        logger.info(f'Recording interrupted, current duration: {duration_string}')
-        self._emit_event('stream_recording_interrupted', duration)
-
-    def _on_recording_recovered(self, timestamp: int) -> None:
+    def _on_recording_interrupted(self, args: Tuple[float, float]) -> None:
+        timestamp, duration = args[0], args[1]
         datetime_string = datetime.fromtimestamp(timestamp).isoformat()
-        logger.info(f'Recording recovered, current date time {(datetime_string)}')
+        duration_string = format_timestamp(int(duration * 1000))
+        self._logger.warning(
+            f'Recording interrupted, datetime: {datetime_string}, '
+            f'duration: {duration_string}'
+        )
+        self._emit_event('stream_recording_interrupted', timestamp, duration)
+
+    def _on_recording_recovered(self, timestamp: float) -> None:
+        datetime_string = datetime.fromtimestamp(timestamp).isoformat()
+        self._logger.warning(f'Recording recovered, datetime: {(datetime_string)}')
         self._emit_event('stream_recording_recovered', timestamp)
 
-    def _emit_event(self, name: str, *args: Any, **kwds: Any) -> None:
-        self._run_coroutine(self._emit(name, *args, **kwds))
+    def _on_duration_lost(self, duration: float) -> None:
+        self._logger.warning(f'Total duration lost: ≈ {(duration)} s')
+        self._emit_event('duration_lost', duration)
 
-    @aio_task_with_room_id
-    async def _emit(self, *args: Any, **kwds: Any) -> None:  # type: ignore
-        await super()._emit(*args, **kwds)
+    def _emit_event(self, name: str, *args: Any, **kwds: Any) -> None:
+        self._call_coroutine(self._emit(name, *args, **kwds))

src/blrec/core/typing.py

@@ -1,5 +1,9 @@
 from typing import Union
 
+from blrec.flv.operators import MetaData as FLVMetaData
+from blrec.hls.operators import MetaData as HLSMetaData
+
 from .models import DanmuMsg, GiftSendMsg, GuardBuyMsg, SuperChatMsg, UserToastMsg
 
 DanmakuMsg = Union[DanmuMsg, GiftSendMsg, GuardBuyMsg, SuperChatMsg, UserToastMsg]
+MetaData = Union[FLVMetaData, HLSMetaData]

src/blrec/danmaku/combination.py

@@ -1,18 +1,12 @@
-import logging
 from typing import Iterable
 
-
-from .io import DanmakuReader, DanmakuWriter
 from .common import copy_damus
+from .io import DanmakuReader, DanmakuWriter
 from .typing import TimebaseType
 
-
 __all__ = 'TimebaseType', 'DanmakuCombinator'
 
 
-logger = logging.getLogger(__name__)
-
-
 class DanmakuCombinator:
     def __init__(
         self,

src/blrec/danmaku/concatenation.py

@@ -1,13 +1,7 @@
-import logging
 from typing import Iterable
 
-
-from .io import DanmakuReader, DanmakuWriter
 from .common import copy_damus
-
-
-logger = logging.getLogger(__name__)
-
+from .io import DanmakuReader, DanmakuWriter
 
 __all__ = 'DanmakuConcatenator'
 

src/blrec/danmaku/io.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import asyncio
 import html
-import logging
 import unicodedata
 from datetime import datetime, timedelta, timezone
 from typing import Any, AsyncIterator, Final, List
@@ -24,9 +23,6 @@ from .typing import Element
 __all__ = 'DanmakuReader', 'DanmakuWriter'
 
 
-logger = logging.getLogger(__name__)
-
-
 class DanmakuReader:  # TODO rewrite
     def __init__(self, path: str) -> None:
         self._path = path

src/blrec/data/webapp/index.html

@@ -10,6 +10,6 @@
 <body>
   <app-root></app-root>
   <noscript>Please enable JavaScript to continue using this application.</noscript>
-<script src="runtime.bad8d115055bada4.js" type="module"></script><script src="polyfills.4e5433063877ea34.js" type="module"></script><script src="main.f21b7d831ad9cafb.js" type="module"></script>
+<script src="runtime.5566e7902022ba3e.js" type="module"></script><script src="polyfills.4e5433063877ea34.js" type="module"></script><script src="main.f21b7d831ad9cafb.js" type="module"></script>
 
 </body></html>

src/blrec/data/webapp/ngsw.json

@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1697282115210,
+  "timestamp": 1718810136190,
   "index": "/index.html",
   "assetGroups": [
     {
@@ -12,17 +12,17 @@
       },
       "urls": [
         "/103.4a2aea63cc3bf42b.js",
-        "/287.5c768f00dcd24631.js",
+        "/287.f1c0b0beeb6810b2.js",
         "/386.2404f3bc252e1df3.js",
         "/503.6553f508f4a9247d.js",
-        "/548.73ee5c2419f2617e.js",
+        "/548.e2df47ddad764d0b.js",
         "/688.7032fddba7983cf6.js",
         "/common.1fc175bce139f4df.js",
         "/index.html",
         "/main.f21b7d831ad9cafb.js",
         "/manifest.webmanifest",
         "/polyfills.4e5433063877ea34.js",
-        "/runtime.bad8d115055bada4.js",
+        "/runtime.5566e7902022ba3e.js",
         "/styles.ae81e04dfa5b2860.css"
       ],
       "patterns": []
@@ -1635,10 +1635,10 @@
   "dataGroups": [],
   "hashTable": {
     "/103.4a2aea63cc3bf42b.js": "2711817f2977bfdc18c34fee4fe9385fe012bb22",
-    "/287.5c768f00dcd24631.js": "4cd0f85040b1a482bf9796575738afdd2dcda00e",
+    "/287.f1c0b0beeb6810b2.js": "875dca7598179957ed411aa5204ce12871a8e958",
     "/386.2404f3bc252e1df3.js": "f937945645579b9651be2666f70cec2c5de4e367",
     "/503.6553f508f4a9247d.js": "0878ea0e91bfd5458dd55875561e91060ecb0837",
-    "/548.73ee5c2419f2617e.js": "93153313f106aed86859050288e59e6c19e3d4cf",
+    "/548.e2df47ddad764d0b.js": "0b60f5f001bd127b90d490617bba2091c4c39de3",
     "/688.7032fddba7983cf6.js": "eae55044529782a51b7e534365255bbfa5522b05",
     "/assets/animal/panda.js": "fec2868bb3053dd2da45f96bbcb86d5116ed72b1",
     "/assets/animal/panda.svg": "bebd302cdc601e0ead3a6d2710acf8753f3d83b1",
@@ -3234,11 +3234,11 @@
     "/assets/twotone/warning.js": "fb2d7ea232f3a99bf8f080dbc94c65699232ac01",
     "/assets/twotone/warning.svg": "8c7a2d3e765a2e7dd58ac674870c6655cecb0068",
     "/common.1fc175bce139f4df.js": "af1775164711ec49e5c3a91ee45bd77509c17c54",
-    "/index.html": "8dc97bacb089295cf14011c3c3e21b14ba7108a1",
+    "/index.html": "abe6df528859e9b6fafa3dda8a4001db74c04dd7",
     "/main.f21b7d831ad9cafb.js": "fc51efa446c2ac21ee17e165217dd3faeacc5290",
     "/manifest.webmanifest": "62c1cb8c5ad2af551a956b97013ab55ce77dd586",
     "/polyfills.4e5433063877ea34.js": "68159ab99e0608976404a17132f60b5ceb6f12d2",
-    "/runtime.bad8d115055bada4.js": "a679fb0193729e75a72e77d0551dc85e080d9b41",
+    "/runtime.5566e7902022ba3e.js": "c7fa8d060497bd9938aca48eba6f523bf0eb85cd",
     "/styles.ae81e04dfa5b2860.css": "5933b4f1c4d8fcc1891b68940ee78af4091472b7"
   },
   "navigationUrls": [

src/blrec/data/webapp/runtime.5566e7902022ba3e.js

@@ -0,0 +1 @@
+(()=>{"use strict";var e,v={},m={};function r(e){var n=m[e];if(void 0!==n)return n.exports;var t=m[e]={exports:{}};return v[e](t,t.exports,r),t.exports}r.m=v,e=[],r.O=(n,t,o,f)=>{if(!t){var a=1/0;for(i=0;i<e.length;i++){for(var[t,o,f]=e[i],c=!0,u=0;u<t.length;u++)(!1&f||a>=f)&&Object.keys(r.O).every(p=>r.O[p](t[u]))?t.splice(u--,1):(c=!1,f<a&&(a=f));if(c){e.splice(i--,1);var d=o();void 0!==d&&(n=d)}}return n}f=f||0;for(var i=e.length;i>0&&e[i-1][2]>f;i--)e[i]=e[i-1];e[i]=[t,o,f]},r.n=e=>{var n=e&&e.__esModule?()=>e.default:()=>e;return r.d(n,{a:n}),n},r.d=(e,n)=>{for(var t in n)r.o(n,t)&&!r.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:n[t]})},r.f={},r.e=e=>Promise.all(Object.keys(r.f).reduce((n,t)=>(r.f[t](e,n),n),[])),r.u=e=>(592===e?"common":e)+"."+{103:"4a2aea63cc3bf42b",287:"f1c0b0beeb6810b2",386:"2404f3bc252e1df3",503:"6553f508f4a9247d",548:"e2df47ddad764d0b",592:"1fc175bce139f4df",688:"7032fddba7983cf6"}[e]+".js",r.miniCssF=e=>{},r.o=(e,n)=>Object.prototype.hasOwnProperty.call(e,n),(()=>{var e={},n="blrec:";r.l=(t,o,f,i)=>{if(e[t])e[t].push(o);else{var a,c;if(void 0!==f)for(var u=document.getElementsByTagName("script"),d=0;d<u.length;d++){var l=u[d];if(l.getAttribute("src")==t||l.getAttribute("data-webpack")==n+f){a=l;break}}a||(c=!0,(a=document.createElement("script")).type="module",a.charset="utf-8",a.timeout=120,r.nc&&a.setAttribute("nonce",r.nc),a.setAttribute("data-webpack",n+f),a.src=r.tu(t)),e[t]=[o];var s=(g,p)=>{a.onerror=a.onload=null,clearTimeout(b);var _=e[t];if(delete e[t],a.parentNode&&a.parentNode.removeChild(a),_&&_.forEach(h=>h(p)),g)return g(p)},b=setTimeout(s.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=s.bind(null,a.onerror),a.onload=s.bind(null,a.onload),c&&document.head.appendChild(a)}}})(),r.r=e=>{typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var e;r.tt=()=>(void 0===e&&(e={createScriptURL:n=>n},typeof trustedTypes<"u"&&trustedTypes.createPolicy&&(e=trustedTypes.createPolicy("angular#bundler",e))),e)})(),r.tu=e=>r.tt().createScriptURL(e),r.p="",(()=>{var e={666:0};r.f.j=(o,f)=>{var i=r.o(e,o)?e[o]:void 0;if(0!==i)if(i)f.push(i[2]);else if(666!=o){var a=new Promise((l,s)=>i=e[o]=[l,s]);f.push(i[2]=a);var c=r.p+r.u(o),u=new Error;r.l(c,l=>{if(r.o(e,o)&&(0!==(i=e[o])&&(e[o]=void 0),i)){var s=l&&("load"===l.type?"missing":l.type),b=l&&l.target&&l.target.src;u.message="Loading chunk "+o+" failed.\n("+s+": "+b+")",u.name="ChunkLoadError",u.type=s,u.request=b,i[1](u)}},"chunk-"+o,o)}else e[o]=0},r.O.j=o=>0===e[o];var n=(o,f)=>{var u,d,[i,a,c]=f,l=0;if(i.some(b=>0!==e[b])){for(u in a)r.o(a,u)&&(r.m[u]=a[u]);if(c)var s=c(r)}for(o&&o(f);l<i.length;l++)r.o(e,d=i[l])&&e[d]&&e[d][0](),e[d]=0;return r.O(s)},t=self.webpackChunkblrec=self.webpackChunkblrec||[];t.forEach(n.bind(null,0)),t.push=n.bind(null,t.push.bind(t))})()})();

src/blrec/data/webapp/runtime.bad8d115055bada4.js

@@ -1 +0,0 @@
-(()=>{"use strict";var e,v={},m={};function r(e){var n=m[e];if(void 0!==n)return n.exports;var t=m[e]={exports:{}};return v[e](t,t.exports,r),t.exports}r.m=v,e=[],r.O=(n,t,f,o)=>{if(!t){var a=1/0;for(i=0;i<e.length;i++){for(var[t,f,o]=e[i],c=!0,u=0;u<t.length;u++)(!1&o||a>=o)&&Object.keys(r.O).every(b=>r.O[b](t[u]))?t.splice(u--,1):(c=!1,o<a&&(a=o));if(c){e.splice(i--,1);var d=f();void 0!==d&&(n=d)}}return n}o=o||0;for(var i=e.length;i>0&&e[i-1][2]>o;i--)e[i]=e[i-1];e[i]=[t,f,o]},r.n=e=>{var n=e&&e.__esModule?()=>e.default:()=>e;return r.d(n,{a:n}),n},r.d=(e,n)=>{for(var t in n)r.o(n,t)&&!r.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:n[t]})},r.f={},r.e=e=>Promise.all(Object.keys(r.f).reduce((n,t)=>(r.f[t](e,n),n),[])),r.u=e=>(592===e?"common":e)+"."+{103:"4a2aea63cc3bf42b",287:"5c768f00dcd24631",386:"2404f3bc252e1df3",503:"6553f508f4a9247d",548:"73ee5c2419f2617e",592:"1fc175bce139f4df",688:"7032fddba7983cf6"}[e]+".js",r.miniCssF=e=>{},r.o=(e,n)=>Object.prototype.hasOwnProperty.call(e,n),(()=>{var e={},n="blrec:";r.l=(t,f,o,i)=>{if(e[t])e[t].push(f);else{var a,c;if(void 0!==o)for(var u=document.getElementsByTagName("script"),d=0;d<u.length;d++){var l=u[d];if(l.getAttribute("src")==t||l.getAttribute("data-webpack")==n+o){a=l;break}}a||(c=!0,(a=document.createElement("script")).type="module",a.charset="utf-8",a.timeout=120,r.nc&&a.setAttribute("nonce",r.nc),a.setAttribute("data-webpack",n+o),a.src=r.tu(t)),e[t]=[f];var s=(g,b)=>{a.onerror=a.onload=null,clearTimeout(p);var _=e[t];if(delete e[t],a.parentNode&&a.parentNode.removeChild(a),_&&_.forEach(h=>h(b)),g)return g(b)},p=setTimeout(s.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=s.bind(null,a.onerror),a.onload=s.bind(null,a.onload),c&&document.head.appendChild(a)}}})(),r.r=e=>{typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var e;r.tt=()=>(void 0===e&&(e={createScriptURL:n=>n},typeof trustedTypes<"u"&&trustedTypes.createPolicy&&(e=trustedTypes.createPolicy("angular#bundler",e))),e)})(),r.tu=e=>r.tt().createScriptURL(e),r.p="",(()=>{var e={666:0};r.f.j=(f,o)=>{var i=r.o(e,f)?e[f]:void 0;if(0!==i)if(i)o.push(i[2]);else if(666!=f){var a=new Promise((l,s)=>i=e[f]=[l,s]);o.push(i[2]=a);var c=r.p+r.u(f),u=new Error;r.l(c,l=>{if(r.o(e,f)&&(0!==(i=e[f])&&(e[f]=void 0),i)){var s=l&&("load"===l.type?"missing":l.type),p=l&&l.target&&l.target.src;u.message="Loading chunk "+f+" failed.\n("+s+": "+p+")",u.name="ChunkLoadError",u.type=s,u.request=p,i[1](u)}},"chunk-"+f,f)}else e[f]=0},r.O.j=f=>0===e[f];var n=(f,o)=>{var u,d,[i,a,c]=o,l=0;if(i.some(p=>0!==e[p])){for(u in a)r.o(a,u)&&(r.m[u]=a[u]);if(c)var s=c(r)}for(f&&f(o);l<i.length;l++)r.o(e,d=i[l])&&e[d]&&e[d][0](),e[d]=0;return r.O(s)},t=self.webpackChunkblrec=self.webpackChunkblrec||[];t.forEach(n.bind(null,0)),t.push=n.bind(null,t.push.bind(t))})()})();

src/blrec/disk_space/helpers.py

@@ -1,20 +1,16 @@
+import asyncio
 import os
 import shutil
-import logging
-import asyncio
 from typing import Literal
 
-
-logger = logging.getLogger(__name__)
+from loguru import logger
 
 
 def is_space_enough(path: str, size: int) -> bool:
     return shutil.disk_usage(path).free > size
 
 
-async def delete_file(
-    path: str, log_level: Literal['INFO', 'DEBUG'] = 'INFO'
-) -> None:
+async def delete_file(path: str, log_level: Literal['INFO', 'DEBUG'] = 'INFO') -> None:
     loop = asyncio.get_running_loop()
 
     try:
@@ -22,4 +18,4 @@ async def delete_file(
     except Exception as e:
         logger.error(f'Failed to delete {path!r}, due to: {repr(e)}')
     else:
-        logger.log(logging.getLevelName(log_level), f'Deleted {path!r}')
+        logger.log(log_level, f'Deleted {path!r}')

src/blrec/disk_space/space_monitor.py

@@ -1,11 +1,11 @@
 import asyncio
-import logging
 import shutil
 from contextlib import suppress
 
+from loguru import logger
+
 from ..event.event_emitter import EventEmitter, EventListener
 from ..exception import exception_callback
-from ..logging.room_id import aio_task_with_room_id
 from ..utils.mixins import AsyncStoppableMixin, SwitchableMixin
 from .helpers import is_space_enough
 from .models import DiskUsage
@@ -13,9 +13,6 @@ from .models import DiskUsage
 __all__ = 'SpaceMonitor', 'SpaceEventListener'
 
 
-logger = logging.getLogger(__name__)
-
-
 class SpaceEventListener(EventListener):
     async def on_space_no_enough(
         self, path: str, threshold: int, disk_usage: DiskUsage
@@ -76,7 +73,6 @@ class SpaceMonitor(
         with suppress(asyncio.CancelledError):
             await self._polling_task
 
-    @aio_task_with_room_id
     async def _polling_loop(self) -> None:
         while True:
             if not is_space_enough(self.path, self.space_threshold):

src/blrec/disk_space/space_reclaimer.py

@@ -1,28 +1,36 @@
-import os
-import glob
-from datetime import datetime
-from pathlib import Path
-import logging
 import asyncio
+import glob
+import os
+from datetime import datetime
 from functools import partial
+from pathlib import Path
 from typing import Iterable, List
 
-from tenacity import retry, wait_none, stop_after_attempt, retry_if_exception_type
+from loguru import logger
+from tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_none
 
-from .helpers import delete_file, is_space_enough
-from .space_monitor import SpaceMonitor, DiskUsage, SpaceEventListener
 from ..utils.mixins import SwitchableMixin
-
+from .helpers import delete_file, is_space_enough
+from .space_monitor import DiskUsage, SpaceEventListener, SpaceMonitor
 
 __all__ = ('SpaceReclaimer',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class SpaceReclaimer(SpaceEventListener, SwitchableMixin):
     _SUFFIX_SET = frozenset(
-        ('.flv', '.mp4', '.ts', '.m4s', '.m3u8' '.xml', '.jsonl', '.jpg')
+        (
+            '.flv',
+            '.mp4',
+            '.ts',
+            '.m4s',
+            '.m3u8',
+            '.xml',
+            '.json',
+            '.meta',
+            '.jsonl',
+            '.jpg',
+            '.png',
+        )
     )
 
     def __init__(

src/blrec/event/event_emitter.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
+
 from abc import ABC
 from contextlib import suppress
-from typing import Any, List, Generic, TypeVar
-
+from typing import Any, Generic, List, TypeVar
 
 from ..exception import ExceptionSubmitter
 
-
 __all__ = 'EventListener', 'EventEmitter'
 
 

src/blrec/exception/exception_handler.py

@@ -1,14 +1,10 @@
-import logging
+from loguru import logger
 
-
-from .exception_center import ExceptionCenter
 from ..utils.mixins import SwitchableMixin
+from .exception_center import ExceptionCenter
+from .helpers import format_exception
 
-
-logger = logging.getLogger(__name__)
-
-
-__all__ = 'ExceptionHandler',
+__all__ = ('ExceptionHandler',)
 
 
 class ExceptionHandler(SwitchableMixin):
@@ -25,5 +21,4 @@ class ExceptionHandler(SwitchableMixin):
         self._log_exception(exc)
 
     def _log_exception(self, exc: BaseException) -> None:
-        exc_info = (type(exc), exc, exc.__traceback__)
-        logger.critical(type(exc).__name__, exc_info=exc_info)
+        logger.critical('{}\n{}', repr(exc), format_exception(exc))

src/blrec/flv/io.py

@@ -1,4 +1,3 @@
-import logging
 from io import SEEK_CUR
 from typing import Iterable, Iterator
 
@@ -11,9 +10,6 @@ from .utils import AutoRollbacker, OffsetRepositor
 __all__ = 'FlvReader', 'FlvWriter'
 
 
-logger = logging.getLogger(__name__)
-
-
 class FlvReader:
     def __init__(
         self,

src/blrec/flv/metadata_analysis.py

@@ -1,8 +1,8 @@
 import json
-import logging
 import os
 
 import attr
+from loguru import logger
 from reactivex import Observable
 from reactivex import operators as ops
 
@@ -13,9 +13,6 @@ from .operators.helpers import from_file
 __all__ = 'AnalysingProgress', 'analyse_metadata'
 
 
-logger = logging.getLogger(__name__)
-
-
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class AnalysingProgress:
     count: int

src/blrec/flv/metadata_dumper.py

@@ -1,9 +1,9 @@
 import json
-import logging
 from contextlib import suppress
 from typing import List, Optional
 
 import attr
+from loguru import logger
 
 from ..flv import operators as flv_ops
 from ..path import extra_metadata_path
@@ -11,8 +11,6 @@ from ..utils.mixins import SwitchableMixin
 
 __all__ = ('MetadataDumper',)
 
-logger = logging.getLogger(__name__)
-
 
 class MetadataDumper(SwitchableMixin):
     def __init__(

src/blrec/flv/metadata_injection.py

@@ -1,4 +1,3 @@
-import logging
 import os
 from datetime import datetime
 from typing import Any, Dict
@@ -16,9 +15,6 @@ from .operators.helpers import from_file
 __all__ = 'InjectingProgress', 'inject_metadata'
 
 
-logger = logging.getLogger(__name__)
-
-
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class InjectingProgress:
     count: int

src/blrec/flv/operators/analyse.py

@@ -4,10 +4,10 @@ ref: https://github.com/ioppermann/yamdi/blob/master/yamdi.c
 """
 from __future__ import annotations
 
-import logging
 from typing import List, Optional, TypedDict
 
 import attr
+from loguru import logger
 from reactivex import Observable, Subject, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -25,8 +25,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = 'Analyser', 'MetaData', 'KeyFrames'
 
-logger = logging.getLogger(__name__)
-
 
 @attr.s(auto_attribs=True, slots=True, frozen=True, kw_only=True)
 class KeyFrames:
@@ -103,6 +101,7 @@ class MetaDataDict:
 class Analyser:
     def __init__(self) -> None:
         self._metadatas: Subject[Optional[MetaData]] = Subject()
+        self._duration_updated: Subject[float] = Subject()
         self._reset()
 
     def _reset(self) -> None:
@@ -135,6 +134,10 @@ class Analyser:
     def metadatas(self) -> Observable[Optional[MetaData]]:
         return self._metadatas
 
+    @property
+    def duration_updated(self) -> Observable[float]:
+        return self._duration_updated
+
     def __call__(self, source: FLVStream) -> FLVStream:
         return self._analyse(source)
 
@@ -307,6 +310,7 @@ class Analyser:
         self._size_of_tags += tag.tag_size
         self._size_of_data += tag.data_size
         self._last_timestamp = tag.timestamp
+        self._duration_updated.on_next(self._last_timestamp / 1000)
 
     def _analyse_audio_tag(self, tag: AudioTag) -> None:
         if not self._audio_analysed:

src/blrec/flv/operators/concat.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-import logging
 from enum import IntEnum, auto
 from typing import Callable, List, Optional, TypedDict, cast
 
 import attr
+from loguru import logger
 from reactivex import Observable, Subject, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 from typing_extensions import TypeGuard
@@ -26,8 +26,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = ('concat', 'JoinPointExtractor', 'JoinPoint', 'JoinPointData')
 
-logger = logging.getLogger(__name__)
-
 
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class JoinPoint:

src/blrec/flv/operators/correct.py

@@ -1,6 +1,6 @@
-import logging
 from typing import Callable, Optional
 
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -10,8 +10,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = ('correct',)
 
-logger = logging.getLogger(__name__)
-
 
 def correct() -> Callable[[FLVStream], FLVStream]:
     def _correct(source: FLVStream) -> FLVStream:

src/blrec/flv/operators/cut.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-import logging
 from typing import Optional
 
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -20,9 +20,6 @@ from .typing import FLVStream, FLVStreamItem
 __all__ = ('Cutter',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class Cutter:
     def __init__(self, min_duration: int = 5_000) -> None:
         self._min_duration = min_duration  # milliseconds

src/blrec/flv/operators/defragment.py

@@ -1,6 +1,6 @@
-import logging
 from typing import Callable, List, Optional
 
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -9,8 +9,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = ('defragment',)
 
-logger = logging.getLogger(__name__)
-
 
 def defragment(min_tags: int = 10) -> Callable[[FLVStream], FLVStream]:
     def _defragment(source: FLVStream) -> FLVStream:

src/blrec/flv/operators/dump.py

@@ -1,7 +1,7 @@
 import io
-import logging
 from typing import Callable, Optional, Tuple
 
+from loguru import logger
 from reactivex import Observable, Subject, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -11,8 +11,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = ('Dumper',)
 
-logger = logging.getLogger(__name__)
-
 
 class Dumper:
     def __init__(

src/blrec/flv/operators/fix.py

@@ -1,7 +1,7 @@
-import logging
 import math
 from typing import Callable, Optional
 
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -17,8 +17,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = ('fix',)
 
-logger = logging.getLogger(__name__)
-
 
 def fix() -> Callable[[FLVStream], FLVStream]:
     def _fix(source: FLVStream) -> FLVStream:

src/blrec/flv/operators/helpers.py

@@ -1,5 +1,4 @@
 import io
-import logging
 
 from reactivex import of
 
@@ -8,8 +7,6 @@ from .typing import FLVStream
 
 __all__ = ('from_file', 'from_stream')
 
-logger = logging.getLogger(__name__)
-
 
 def from_stream(
     stream: io.RawIOBase,
@@ -31,7 +28,7 @@ def from_file(
     path: str, *, backup_timestamp: bool = False, restore_timestamp: bool = False
 ) -> FLVStream:
     return from_stream(
-        open(path, 'rb'),
+        open(path, 'rb'),  # type: ignore
         complete_on_eof=True,
         backup_timestamp=backup_timestamp,
         restore_timestamp=restore_timestamp,

src/blrec/flv/operators/inject.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-import logging
 from typing import Any, Callable, Dict, Optional, cast
 
+from loguru import logger
 from reactivex import Observable, abc
 
 from ..common import (
@@ -19,9 +19,6 @@ from .typing import FLVStream, FLVStreamItem
 __all__ = ('Injector',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class Injector:
     def __init__(
         self, metadata_provider: Callable[[Dict[str, Any]], Dict[str, Any]]

src/blrec/flv/operators/limit.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-import logging
 from typing import Optional
 
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -19,9 +19,6 @@ from .typing import FLVStream, FLVStreamItem
 __all__ = ('Limiter',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class Limiter:
     def __init__(
         self,

src/blrec/flv/operators/parse.py

@@ -1,10 +1,12 @@
 import io
-import logging
 from typing import Callable, Optional
 
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
+from blrec.exception.helpers import format_exception
+
 from ..common import create_avc_end_sequence_tag, is_avc_end_sequence
 from ..io import FlvReader
 from ..models import FlvTag
@@ -12,8 +14,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = ('parse',)
 
-logger = logging.getLogger(__name__)
-
 
 def parse(
     *,
@@ -36,7 +36,7 @@ def parse(
                 try:
                     try:
                         reader = FlvReader(
-                            stream,
+                            stream,  # type: ignore
                             backup_timestamp=backup_timestamp,
                             restore_timestamp=restore_timestamp,
                         )
@@ -60,7 +60,9 @@ def parse(
                             observer.on_error(e)
                 except ValueError as e:
                     logger.debug(
-                        f'Error occurred while parsing stream: {repr(e)}', exc_info=e
+                        'Error occurred while parsing stream: {}\n{}',
+                        repr(e),
+                        format_exception(e),
                     )
                     if not ignore_value_error:
                         observer.on_error(e)

src/blrec/flv/operators/probe.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
 import io
-import logging
 from typing import List, Optional, cast
 
+from loguru import logger
 from reactivex import Observable, Subject, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
-from ...utils.ffprobe import StreamProfile, ffprobe
+from ...utils.ffprobe import StreamProfile, ffprobe_on
 from ..common import find_aac_header_tag, find_avc_header_tag
 from ..io import FlvWriter
 from ..models import FlvHeader, FlvTag
@@ -16,9 +16,6 @@ from .typing import FLVStream, FLVStreamItem
 __all__ = ('Prober', 'StreamProfile')
 
 
-logger = logging.getLogger(__name__)
-
-
 class Prober:
     def __init__(self) -> None:
         self._profiles: Subject[StreamProfile] = Subject()
@@ -99,4 +96,4 @@ class Prober:
         def on_error(e: Exception) -> None:
             logger.warning(f'Failed to probe stream by ffprobe: {repr(e)}')
 
-        ffprobe(bytes_io.getvalue()).subscribe(on_next, on_error)
+        ffprobe_on(bytes_io.getvalue()).subscribe(on_next, on_error)

src/blrec/flv/operators/process.py

@@ -1,4 +1,3 @@
-import logging
 from typing import Callable
 
 from reactivex import operators as ops
@@ -14,8 +13,6 @@ from .typing import FLVStream
 
 __all__ = ('process',)
 
-logger = logging.getLogger(__name__)
-
 
 def process(sort_tags: bool = False) -> Callable[[FLVStream], FLVStream]:
     def _process(source: FLVStream) -> FLVStream:

src/blrec/flv/operators/progress.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging
 from typing import Optional
 
 from reactivex import Observable, abc
@@ -12,9 +11,6 @@ from .typing import FLVStream, FLVStreamItem
 __all__ = ('ProgressBar',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class ProgressBar:
     def __init__(
         self,

src/blrec/flv/operators/sort.py

@@ -1,7 +1,6 @@
-import logging
-import os
 from typing import Callable, List, Optional
 
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -20,10 +19,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = ('sort',)
 
-logger = logging.getLogger(__name__)
-
-TRACE_OP_SORT = bool(os.environ.get('BLREC_TRACE_OP_SORT'))
-
 
 def sort() -> Callable[[FLVStream], FLVStream]:
     "Sort tags in GOP by timestamp to ensure subsequent operators work as expected."
@@ -46,14 +41,17 @@ def sort() -> Callable[[FLVStream], FLVStream]:
                 if not gop_tags:
                     return
 
-                if TRACE_OP_SORT:
-                    logger.debug(
-                        'Tags in GOP:\n'
-                        f'Number of tags: {len(gop_tags)}\n'
-                        f'Total size of tags: {sum(map(len, gop_tags))}\n'
-                        f'The first tag is {gop_tags[0]}\n'
-                        f'The last tag is {gop_tags[-1]}'
-                    )
+                logger.opt(lazy=True).trace(
+                    'Tags in GOP:\n'
+                    'Number of tags: {}\n'
+                    'Total size of tags: {}\n'
+                    'The first tag is {}\n'
+                    'The last tag is {}',
+                    lambda: len(gop_tags),
+                    lambda: sum(map(len, gop_tags)),
+                    lambda: gop_tags[0],
+                    lambda: gop_tags[-1],
+                )
 
                 if len(gop_tags) < 10:
                     avc_header_tag = find_avc_header_tag(gop_tags)

src/blrec/flv/operators/split.py

@@ -1,6 +1,6 @@
-import logging
 from typing import Callable, Optional
 
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
@@ -15,8 +15,6 @@ from .typing import FLVStream, FLVStreamItem
 
 __all__ = ('split',)
 
-logger = logging.getLogger(__name__)
-
 
 def split() -> Callable[[FLVStream], FLVStream]:
     def _split(source: FLVStream) -> FLVStream:

src/blrec/flv/scriptdata.py

@@ -1,7 +1,8 @@
-import logging
 from io import BytesIO
 from typing import Any, BinaryIO, Mapping, TypedDict
 
+from loguru import logger
+
 from .amf import AMFReader, AMFWriter
 
 __all__ = (
@@ -14,8 +15,6 @@ __all__ = (
     'ScriptDataDumper',
 )
 
-logger = logging.getLogger(__name__)
-
 
 class ScriptData(TypedDict):
     name: str

src/blrec/hls/helpler.py

@@ -0,0 +1,12 @@
+import os
+
+__all__ = ('name_of', 'sequence_number_of')
+
+
+def name_of(uri: str) -> str:
+    name, _ext = os.path.splitext(uri)
+    return name
+
+
+def sequence_number_of(uri: str) -> int:
+    return int(name_of(uri))

src/blrec/hls/metadata_dumper.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 import json
-import logging
 from contextlib import suppress
 from typing import Any, Callable, Dict, Tuple
 
+from loguru import logger
+
 from blrec.path.helpers import record_metadata_path
 from blrec.utils.mixins import SwitchableMixin
 
@@ -12,23 +13,21 @@ from . import operators as hls_ops
 
 __all__ = ('MetadataDumper',)
 
-logger = logging.getLogger(__name__)
-
 
 class MetadataDumper(SwitchableMixin):
     def __init__(
         self,
-        playlist_dumper: hls_ops.PlaylistDumper,
+        segment_dumper: hls_ops.SegmentDumper,
         metadata_provider: Callable[[Dict[str, Any]], Dict[str, Any]],
     ) -> None:
         super().__init__()
-        self._playlist_dumper = playlist_dumper
+        self._segment_dumper = segment_dumper
         self._metadata_provider = metadata_provider
         self._metadata: Dict[str, Any] = {}
 
     def _do_enable(self) -> None:
-        self._file_opened_subscription = self._playlist_dumper.file_opened.subscribe(
-            self._on_playlist_file_opened
+        self._file_opened_subscription = self._segment_dumper.file_opened.subscribe(
+            self._on_video_file_opened
         )
         logger.debug('Enabled metadata dumper')
 
@@ -39,13 +38,13 @@ class MetadataDumper(SwitchableMixin):
         self._metadata.clear()
         logger.debug('Disabled metadata dumper')
 
-    def _on_playlist_file_opened(self, args: Tuple[str, int]) -> None:
-        playlist_path, _ = args
+    def _on_video_file_opened(self, args: Tuple[str, int]) -> None:
+        video_path, _timestamp = args
         metadata = self._metadata_provider({})
-        self._dump_metadata(playlist_path, metadata)
+        self._dump_metadata(video_path, metadata)
 
-    def _dump_metadata(self, playlist_path: str, metadata: Dict[str, Any]) -> None:
-        path = record_metadata_path(playlist_path)
+    def _dump_metadata(self, video_path: str, metadata: Dict[str, Any]) -> None:
+        path = record_metadata_path(video_path)
         logger.debug(f"Dumping metadata to file: '{path}'")
 
         with open(path, 'wt', encoding='utf8') as file:

src/blrec/hls/operators/__init__.py

@@ -1,14 +1,19 @@
+from .analyser import Analyser, MetaData
+from .cutter import Cutter
+from .limiter import Limiter
 from .playlist_dumper import PlaylistDumper
 from .playlist_fetcher import PlaylistFetcher
 from .playlist_resolver import PlaylistResolver
 from .prober import Prober, StreamProfile
 from .segment_dumper import SegmentDumper
 from .segment_fetcher import InitSectionData, SegmentData, SegmentFetcher
-from .segment_parser import SegmentParser
-from .segment_remuxer import SegmentRemuxer
 
 __all__ = (
+    'Analyser',
+    'Cutter',
     'InitSectionData',
+    'Limiter',
+    'MetaData',
     'PlaylistDumper',
     'PlaylistFetcher',
     'PlaylistResolver',
@@ -16,7 +21,5 @@ __all__ = (
     'SegmentData',
     'SegmentDumper',
     'SegmentFetcher',
-    'SegmentParser',
-    'SegmentRemuxer',
     'StreamProfile',
 )

src/blrec/hls/operators/analyser.py

@@ -0,0 +1,88 @@
+from __future__ import annotations
+
+from typing import Optional, Union
+
+import attr
+from reactivex import Observable, abc
+from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
+
+from .playlist_dumper import PlaylistDumper
+from .prober import Prober, StreamProfile
+from .segment_dumper import SegmentDumper
+from .segment_fetcher import InitSectionData, SegmentData
+
+__all__ = ('Analyser', 'MetaData')
+
+
+@attr.s(auto_attribs=True, slots=True, frozen=True, kw_only=True)
+class MetaData:
+    duration: float
+    filesize: int
+    width: int
+    height: int
+
+
+class Analyser:
+    def __init__(
+        self,
+        playlist_dumper: PlaylistDumper,
+        segment_dumper: SegmentDumper,
+        prober: Prober,
+    ) -> None:
+        self._playlist_dumper = playlist_dumper
+        self._segment_dumper = segment_dumper
+        self._prober = prober
+
+        self._reset()
+        self._prober.profiles.subscribe(self._on_profile_updated)
+
+    def _reset(self) -> None:
+        self._video_width: int = 0
+        self._video_height: int = 0
+
+    def _on_profile_updated(self, profile: StreamProfile) -> None:
+        video_profile = profile['streams'][0]
+        assert video_profile['codec_type'] == 'video'
+        self._video_width = video_profile['width']
+        self._video_height = video_profile['height']
+
+    def make_metadata(self) -> MetaData:
+        return MetaData(
+            duration=self._playlist_dumper.duration,
+            filesize=self._segment_dumper.filesize,
+            width=self._video_width,
+            height=self._video_height,
+        )
+
+    def __call__(
+        self, source: Observable[Union[InitSectionData, SegmentData]]
+    ) -> Observable[Union[InitSectionData, SegmentData]]:
+        return self._analyse(source)
+
+    def _analyse(
+        self, source: Observable[Union[InitSectionData, SegmentData]]
+    ) -> Observable[Union[InitSectionData, SegmentData]]:
+        def subscribe(
+            observer: abc.ObserverBase[Union[InitSectionData, SegmentData]],
+            scheduler: Optional[abc.SchedulerBase] = None,
+        ) -> abc.DisposableBase:
+            disposed = False
+            subscription = SerialDisposable()
+
+            self._reset()
+
+            def on_next(item: Union[InitSectionData, SegmentData]) -> None:
+                observer.on_next(item)
+
+            def dispose() -> None:
+                nonlocal disposed
+                disposed = True
+                self._reset()
+
+            subscription.disposable = source.subscribe(
+                on_next, observer.on_error, observer.on_completed, scheduler=scheduler
+            )
+
+            return CompositeDisposable(subscription, Disposable(dispose))
+
+        return Observable(subscribe)

src/blrec/hls/operators/cutter.py

@@ -0,0 +1,86 @@
+from __future__ import annotations
+
+from typing import Optional, Tuple, Union
+
+from reactivex import Observable, abc
+from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
+
+from .playlist_dumper import PlaylistDumper
+from .segment_fetcher import InitSectionData, SegmentData
+
+__all__ = ('Cutter',)
+
+
+class Cutter:
+    def __init__(
+        self, playlist_dumper: PlaylistDumper, min_duration: float = 5.0
+    ) -> None:
+        self._playlist_dumper = playlist_dumper
+        self._min_duration = min_duration  # seconds
+
+        self._cutting: bool
+        self._triggered: bool
+        self._reset()
+
+        def on_open(args: Tuple[str, int]) -> None:
+            self._cutting = False
+
+        self._playlist_dumper.file_opened.subscribe(on_open)
+
+    def _reset(self) -> None:
+        self._cutting = False
+        self._triggered = False
+
+    def is_cutting(self) -> bool:
+        return self._cutting
+
+    def can_cut_stream(self) -> bool:
+        if self._triggered or self._cutting:
+            return False
+        return self._playlist_dumper.duration >= self._min_duration
+
+    def cut_stream(self) -> bool:
+        if self.can_cut_stream():
+            self._triggered = True
+            return True
+        return False
+
+    def _add_flag(self, item: Union[InitSectionData, SegmentData]) -> None:
+        item.segment.custom_parser_values['split'] = True
+
+    def __call__(
+        self, source: Observable[Union[InitSectionData, SegmentData]]
+    ) -> Observable[Union[InitSectionData, SegmentData]]:
+        return self._cut(source)
+
+    def _cut(
+        self, source: Observable[Union[InitSectionData, SegmentData]]
+    ) -> Observable[Union[InitSectionData, SegmentData]]:
+        def subscribe(
+            observer: abc.ObserverBase[Union[InitSectionData, SegmentData]],
+            scheduler: Optional[abc.SchedulerBase] = None,
+        ) -> abc.DisposableBase:
+            disposed = False
+            subscription = SerialDisposable()
+
+            self._reset()
+
+            def on_next(item: Union[InitSectionData, SegmentData]) -> None:
+                if self._triggered:
+                    self._add_flag(item)
+                    self._cutting = True
+                    self._triggered = False
+
+                observer.on_next(item)
+
+            def dispose() -> None:
+                nonlocal disposed
+                disposed = True
+
+            subscription.disposable = source.subscribe(
+                on_next, observer.on_error, observer.on_completed, scheduler=scheduler
+            )
+
+            return CompositeDisposable(subscription, Disposable(dispose))
+
+        return Observable(subscribe)

src/blrec/hls/operators/limiter.py

@@ -0,0 +1,90 @@
+from __future__ import annotations
+
+from typing import Optional, Union
+
+from loguru import logger
+from reactivex import Observable, abc
+from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
+
+from .playlist_dumper import PlaylistDumper
+from .segment_dumper import SegmentDumper
+from .segment_fetcher import InitSectionData, SegmentData
+
+__all__ = ('Limiter',)
+
+
+class Limiter:
+    def __init__(
+        self,
+        playlist_dumper: PlaylistDumper,
+        segment_dumper: SegmentDumper,
+        *,
+        filesize_limit: int = 0,  # file size in bytes, no limit by default.
+        duration_limit: int = 0,  # duration in seconds, no limit by default.
+    ) -> None:
+        self._playlist_dumper = playlist_dumper
+        self._segment_dumper = segment_dumper
+
+        self.filesize_limit = filesize_limit
+        self.duration_limit = duration_limit
+
+    def _will_over_limits(self, item: Union[InitSectionData, SegmentData]) -> bool:
+        if (
+            self.filesize_limit > 0
+            and self._segment_dumper.filesize + len(item) >= self.filesize_limit
+        ):
+            logger.debug(
+                'File size will be over the limit: {} + {}'.format(
+                    self._segment_dumper.filesize, len(item)
+                )
+            )
+            return True
+
+        if (
+            self.duration_limit > 0
+            and self._playlist_dumper.duration + float(item.segment.duration)
+            >= self.duration_limit
+        ):
+            logger.debug(
+                'Duration will be over the limit: {} + {}'.format(
+                    self._playlist_dumper.duration, item.segment.duration
+                )
+            )
+            return True
+
+        return False
+
+    def _add_flag(self, item: Union[InitSectionData, SegmentData]) -> None:
+        item.segment.custom_parser_values['split'] = True
+
+    def __call__(
+        self, source: Observable[Union[InitSectionData, SegmentData]]
+    ) -> Observable[Union[InitSectionData, SegmentData]]:
+        return self._limit(source)
+
+    def _limit(
+        self, source: Observable[Union[InitSectionData, SegmentData]]
+    ) -> Observable[Union[InitSectionData, SegmentData]]:
+        def subscribe(
+            observer: abc.ObserverBase[Union[InitSectionData, SegmentData]],
+            scheduler: Optional[abc.SchedulerBase] = None,
+        ) -> abc.DisposableBase:
+            disposed = False
+            subscription = SerialDisposable()
+
+            def on_next(item: Union[InitSectionData, SegmentData]) -> None:
+                if self._will_over_limits(item):
+                    self._add_flag(item)
+                observer.on_next(item)
+
+            def dispose() -> None:
+                nonlocal disposed
+                disposed = True
+
+            subscription.disposable = source.subscribe(
+                on_next, observer.on_error, observer.on_completed, scheduler=scheduler
+            )
+
+            return CompositeDisposable(subscription, Disposable(dispose))
+
+        return Observable(subscribe)

src/blrec/hls/operators/playlist_dumper.py

@@ -1,32 +1,52 @@
 from __future__ import annotations
 
 import io
-import logging
-import os
 from copy import deepcopy
 from decimal import Decimal
-from typing import Callable, Optional, Tuple
+from pathlib import PurePath
+from typing import Optional, Tuple, Union, cast
 
 import m3u8
+from loguru import logger
+from m3u8.model import InitializationSection
 from reactivex import Observable, Subject, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
-__all__ = ('PlaylistDumper',)
+from ..helpler import sequence_number_of
+from .segment_dumper import SegmentDumper
+from .segment_fetcher import InitSectionData, SegmentData
 
-logger = logging.getLogger(__name__)
+__all__ = ('PlaylistDumper',)
 
 
 class PlaylistDumper:
-    def __init__(self, path_provider: Callable[..., Tuple[str, int]]) -> None:
-        self._path_provider = path_provider
+    def __init__(self, segment_dumper: SegmentDumper) -> None:
+        self._segment_dumper = segment_dumper
+
+        def on_open(args: Tuple[str, int]) -> None:
+            self._open_file(*args)
+
+        def on_close(path: str) -> None:
+            self._close_file()
+            self._reset()
+
+        self._segment_dumper.file_opened.subscribe(on_open)
+        self._segment_dumper.file_closed.subscribe(on_close)
+
         self._file_opened: Subject[Tuple[str, int]] = Subject()
         self._file_closed: Subject[str] = Subject()
+        self._duration_updated: Subject[float] = Subject()
+        self._segments_lost: Subject[int] = Subject()
+
         self._reset()
 
     def _reset(self) -> None:
         self._path: str = ''
         self._file: Optional[io.TextIOWrapper] = None
         self._duration: Decimal = Decimal()
+        self._last_segment: Optional[m3u8.Segment] = None
+        self._last_seq_num: Optional[int] = None
+        self._num_of_segments_lost: int = 0
 
     @property
     def path(self) -> str:
@@ -36,6 +56,10 @@ class PlaylistDumper:
     def duration(self) -> float:
         return float(self._duration)
 
+    @property
+    def num_of_segments_lost(self) -> int:
+        return self._num_of_segments_lost
+
     @property
     def file_opened(self) -> Observable[Tuple[str, int]]:
         return self._file_opened
@@ -44,17 +68,27 @@ class PlaylistDumper:
     def file_closed(self) -> Observable[str]:
         return self._file_closed
 
-    def __call__(self, source: Observable[m3u8.M3U8]) -> Observable[m3u8.Segment]:
+    @property
+    def duration_updated(self) -> Observable[float]:
+        return self._duration_updated
+
+    @property
+    def segments_lost(self) -> Observable[int]:
+        return self._segments_lost
+
+    def __call__(
+        self, source: Observable[Union[InitSectionData, SegmentData]]
+    ) -> Observable[Union[InitSectionData, SegmentData]]:
         return self._dump(source)
 
-    def _open_file(self) -> None:
-        path, timestamp = self._path_provider()
-        root, ext = os.path.splitext(path)
-        os.makedirs(root, exist_ok=True)
-        self._path = os.path.join(root, 'index.m3u8')
+    def _open_file(self, video_path: str, timestamp: int) -> None:
+        path = PurePath(video_path)
+        self._video_file_name = path.name
+        self._path = str(path.with_suffix('.m3u8'))
         self._file = open(self._path, 'wt', encoding='utf8')  # type: ignore
         logger.debug(f'Opened file: {self._path}')
         self._file_opened.on_next((self._path, timestamp))
+        self._header_dumped = False
 
     def _close_file(self) -> None:
         if self._file is not None and not self._file.closed:
@@ -63,97 +97,89 @@ class PlaylistDumper:
             logger.debug(f'Closed file: {self._path}')
             self._file_closed.on_next(self._path)
 
-    def _name_of(self, uri: str) -> str:
-        name, ext = os.path.splitext(uri)
-        return name
+    def _dump_header(self, item: InitSectionData) -> None:
+        if self._header_dumped:
+            return
+        playlist: m3u8.M3U8 = deepcopy(item.segment.custom_parser_values['playlist'])
+        playlist.segments.clear()
+        playlist.is_endlist = False
+        assert self._file is not None
+        self._file.write(playlist.dumps())
+        self._file.flush()
+        self._header_dumped = True
 
-    def _sequence_number_of(self, uri: str) -> int:
-        return int(self._name_of(uri))
-
-    def _replace_uri(self, segment: m3u8.Segment) -> m3u8.Segment:
-        copied_seg = deepcopy(segment)
-        if init_section := getattr(copied_seg, 'init_section', None):
-            init_section.uri = f'segments/{init_section.uri}'
-        uri = segment.uri
-        name = self._name_of(uri)
-        copied_seg.uri = 'segments/%s/%s' % (name[:-3], uri)
-        return copied_seg
-
-    def _replace_all_uri(self, playlist: m3u8.M3U8) -> m3u8.M3U8:
-        copied_playlist = deepcopy(playlist)
-        copied_playlist.segments = m3u8.SegmentList(
-            self._replace_uri(s) for s in copied_playlist.segments
+    def _dump_segment(self, init_item: InitSectionData, item: SegmentData) -> None:
+        seg = self._make_segment(
+            item.segment,
+            self._video_file_name,
+            init_section_byterange=f'{len(init_item)}@{init_item.offset}',
+            segment_byterange=f'{len(item)}@{item.offset}',
         )
-        return copied_playlist
+
+        curr_seq_num = sequence_number_of(item.segment.uri)
+        if self._last_seq_num is not None:
+            if self._last_seq_num + 1 != curr_seq_num:
+                seg.discontinuity = True
+            if self._last_seq_num + 1 < curr_seq_num:
+                self._num_of_segments_lost += curr_seq_num - self._last_seq_num - 1
+                self._segments_lost.on_next(self._num_of_segments_lost)
+
+        assert self._file is not None
+        self._file.write(seg.dumps(self._last_segment) + '\n')
+        self._file.flush()
+
+        self._last_segment = seg
+        self._last_seq_num = curr_seq_num
+
+    def _make_segment(
+        self,
+        segment: m3u8.Segment,
+        uri: str,
+        init_section_byterange: str,
+        segment_byterange: str,
+    ) -> m3u8.Segment:
+        seg = deepcopy(segment)
+        if init_section := getattr(seg, 'init_section', None):
+            init_section = cast(InitializationSection, init_section)
+            init_section.uri = uri
+            init_section.base_uri = ''
+            init_section.byterange = init_section_byterange
+        seg.uri = uri
+        seg.byterange = segment_byterange
+        seg.title += '|' + segment.uri
+        return seg
 
     def _update_duration(self, segment: m3u8.Segment) -> None:
         self._duration += Decimal(str(segment.duration))
+        self._duration_updated.on_next(float(self._duration))
 
-    def _dump(self, source: Observable[m3u8.M3U8]) -> Observable[m3u8.Segment]:
+    def _dump(
+        self, source: Observable[Union[InitSectionData, SegmentData]]
+    ) -> Observable[Union[InitSectionData, SegmentData]]:
         def subscribe(
-            observer: abc.ObserverBase[m3u8.Segment],
+            observer: abc.ObserverBase[Union[InitSectionData, SegmentData]],
             scheduler: Optional[abc.SchedulerBase] = None,
         ) -> abc.DisposableBase:
             disposed = False
             subscription = SerialDisposable()
+            last_init_item: Optional[InitSectionData] = None
 
-            last_segment: Optional[m3u8.Segment] = None
-            last_sequence_number: Optional[int] = None
-            first_playlist_dumped: bool = False
-
-            self._close_file()
-            self._reset()
-
-            def on_next(playlist: m3u8.M3U8) -> None:
-                nonlocal last_sequence_number, last_segment, first_playlist_dumped
-
-                if playlist.is_endlist:
-                    logger.debug('Playlist ended')
-
+            def on_next(item: Union[InitSectionData, SegmentData]) -> None:
+                nonlocal last_init_item
                 try:
-                    if not first_playlist_dumped:
-                        self._close_file()
-                        self._reset()
-                        self._open_file()
-                        assert self._file is not None
-                        playlist.is_endlist = False
-                        self._file.write(self._replace_all_uri(playlist).dumps())
-                        self._file.flush()
-                        for seg in playlist.segments:
-                            observer.on_next(seg)
-                            self._update_duration(seg)
-                            last_segment = seg
-                            last_sequence_number = self._sequence_number_of(seg.uri)
-                        first_playlist_dumped = True
-                        logger.debug('The first playlist has been dumped')
-                        return
-
-                    assert self._file is not None
-                    for seg in playlist.segments:
-                        num = self._sequence_number_of(seg.uri)
-                        discontinuity = False
-                        if last_sequence_number is not None:
-                            if last_sequence_number >= num:
-                                continue
-                            if last_sequence_number + 1 != num:
-                                logger.warning(
-                                    'Segments discontinuous: '
-                                    f'last sequence number: {last_sequence_number}, '
-                                    f'current sequence number: {num}'
-                                )
-                                discontinuity = True
-                        new_seg = self._replace_uri(seg)
-                        new_seg.discontinuity = discontinuity
-                        new_last_seg = self._replace_uri(last_segment)
-                        self._file.write(new_seg.dumps(new_last_seg) + '\n')
-                        observer.on_next(seg)
-                        self._update_duration(seg)
-                        last_segment = seg
-                        last_sequence_number = num
+                    if isinstance(item, InitSectionData):
+                        self._dump_header(item)
+                        last_init_item = item
+                    else:
+                        assert last_init_item is not None
+                        self._dump_segment(last_init_item, item)
+                        self._update_duration(item.segment)
                 except Exception as e:
                     self._close_file()
                     self._reset()
                     observer.on_error(e)
+                else:
+                    observer.on_next(item)
 
             def on_completed() -> None:
                 self._close_file()
@@ -167,10 +193,9 @@ class PlaylistDumper:
 
             def dispose() -> None:
                 nonlocal disposed
-                nonlocal last_segment, last_sequence_number
+                nonlocal last_init_item
                 disposed = True
-                last_segment = None
-                last_sequence_number = None
+                last_init_item = None
                 self._close_file()
                 self._reset()
 

src/blrec/hls/operators/playlist_fetcher.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging
 import time
 from datetime import datetime
 from typing import Optional
@@ -8,6 +7,7 @@ from typing import Optional
 import m3u8
 import requests
 import urllib3
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 from tenacity import retry, retry_if_exception_type, stop_after_delay, wait_exponential
@@ -18,9 +18,6 @@ from blrec.utils.mixins import SupportDebugMixin
 __all__ = ('PlaylistFetcher',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class PlaylistFetcher(SupportDebugMixin):
     def __init__(self, live: Live, session: requests.Session) -> None:
         super().__init__()
@@ -49,9 +46,14 @@ class PlaylistFetcher(SupportDebugMixin):
 
             def on_next(url: str) -> None:
                 logger.info(f'Fetching playlist... {url}')
+
                 while not disposed:
                     try:
                         content = self._fetch_playlist(url)
+                    except Exception as e:
+                        logger.warning(f'Failed to fetch playlist: {repr(e)}')
+                        observer.on_error(e)
+                    else:
                         if self._debug:
                             playlist_debug_file.write(content + '\n')
                         playlist = m3u8.loads(content, uri=url)
@@ -59,12 +61,9 @@ class PlaylistFetcher(SupportDebugMixin):
                             url = self._get_best_quality_url(playlist)
                             logger.debug('Playlist changed to variant playlist')
                             on_next(url)
-                    except Exception as e:
-                        logger.warning(f'Failed to fetch playlist: {repr(e)}')
-                        observer.on_error(e)
-                    else:
-                        observer.on_next(playlist)
-                        time.sleep(1)
+                        else:
+                            observer.on_next(playlist)
+                            time.sleep(1)
 
             def dispose() -> None:
                 nonlocal disposed
@@ -96,10 +95,15 @@ class PlaylistFetcher(SupportDebugMixin):
             )
         ),
         wait=wait_exponential(multiplier=0.1, max=1),
-        stop=stop_after_delay(10),
+        stop=stop_after_delay(8),
     )
     def _fetch_playlist(self, url: str) -> str:
-        response = self._session.get(url, headers=self._live.headers, timeout=3)
-        response.raise_for_status()
-        response.encoding = 'utf-8'
-        return response.text
+        try:
+            response = self._session.get(url, headers=self._live.headers, timeout=3)
+            response.raise_for_status()
+        except Exception as e:
+            logger.debug(f'Failed to fetch playlist: {repr(e)}')
+            raise
+        else:
+            response.encoding = 'utf-8'
+            return response.text

src/blrec/hls/operators/playlist_resolver.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-import logging
-import os
 from typing import Optional
 
 import m3u8
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex import operators as ops
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
@@ -13,16 +12,16 @@ from blrec.core import operators as core_ops
 from blrec.utils import operators as utils_ops
 
 from ..exceptions import NoNewSegments
+from ..helpler import sequence_number_of
 
 __all__ = ('PlaylistResolver',)
 
 
-logger = logging.getLogger(__name__)
-
-
 class PlaylistResolver:
     def __init__(self, stream_url_resolver: core_ops.StreamURLResolver) -> None:
         self._stream_url_resolver = stream_url_resolver
+        self._last_media_sequence: int = 0
+        self._last_sequence_number: Optional[int] = None
 
     def __call__(self, source: Observable[m3u8.M3U8]) -> Observable[m3u8.Segment]:
         return self._solve(source).pipe(
@@ -30,14 +29,10 @@ class PlaylistResolver:
             utils_ops.retry(should_retry=self._should_retry),
         )
 
-    def _name_of(self, uri: str) -> str:
-        name, ext = os.path.splitext(uri)
-        return name
-
-    def _sequence_number_of(self, uri: str) -> int:
-        return int(self._name_of(uri))
-
     def _solve(self, source: Observable[m3u8.M3U8]) -> Observable[m3u8.Segment]:
+        self._last_media_sequence = 0
+        self._last_sequence_number = None
+
         def subscribe(
             observer: abc.ObserverBase[m3u8.Segment],
             scheduler: Optional[abc.SchedulerBase] = None,
@@ -46,29 +41,43 @@ class PlaylistResolver:
             subscription = SerialDisposable()
 
             attempts: int = 0
-            last_sequence_number: Optional[int] = None
 
             def on_next(playlist: m3u8.M3U8) -> None:
-                nonlocal attempts, last_sequence_number
+                nonlocal attempts
+                discontinuity = False
 
                 if playlist.is_endlist:
                     logger.debug('Playlist ended')
 
+                if playlist.media_sequence < self._last_media_sequence:
+                    logger.warning(
+                        'Segments discontinuous: '
+                        f'last media sequence: {self._last_media_sequence}, '
+                        f'current media sequence: {playlist.media_sequence}'
+                    )
+                    discontinuity = True
+                    self._last_sequence_number = None
+                self._last_media_sequence = playlist.media_sequence
+
                 new_segments = []
                 for seg in playlist.segments:
-                    num = self._sequence_number_of(seg.uri)
-                    if last_sequence_number is not None:
-                        if last_sequence_number >= num:
+                    num = sequence_number_of(seg.uri)
+                    if self._last_sequence_number is not None:
+                        if num <= self._last_sequence_number:
                             continue
-                        if last_sequence_number + 1 != num:
+                        if num == self._last_sequence_number + 1:
+                            discontinuity = False
+                        else:
                             logger.warning(
                                 'Segments discontinuous: '
-                                f'last sequence number: {last_sequence_number}, '
+                                f'last sequence number: {self._last_sequence_number}, '
                                 f'current sequence number: {num}'
                             )
-                            seg.discontinuity = True
+                            discontinuity = True
+                    seg.discontinuity = discontinuity
+                    seg.custom_parser_values['playlist'] = playlist
                     new_segments.append(seg)
-                    last_sequence_number = num
+                    self._last_sequence_number = num
 
                 if not new_segments:
                     attempts += 1
@@ -84,9 +93,7 @@ class PlaylistResolver:
 
             def dispose() -> None:
                 nonlocal disposed
-                nonlocal last_sequence_number
                 disposed = True
-                last_sequence_number = None
 
             subscription.disposable = source.subscribe(
                 on_next, observer.on_error, observer.on_completed, scheduler=scheduler

src/blrec/hls/operators/prober.py

@@ -1,22 +1,19 @@
 from __future__ import annotations
 
 import io
-import logging
 from typing import List, Optional, Union
 
+from loguru import logger
 from reactivex import Observable, Subject, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
-from blrec.utils.ffprobe import StreamProfile, ffprobe
+from blrec.utils.ffprobe import StreamProfile, ffprobe_on
 
 from .segment_fetcher import InitSectionData, SegmentData
 
 __all__ = ('Prober', 'StreamProfile')
 
 
-logger = logging.getLogger(__name__)
-
-
 class Prober:
     def __init__(self) -> None:
         self._profiles: Subject[StreamProfile] = Subject()
@@ -88,4 +85,4 @@ class Prober:
         def on_error(e: Exception) -> None:
             logger.warning(f'Failed to probe stream by ffprobe: {repr(e)}')
 
-        ffprobe(bytes_io.getvalue()).subscribe(on_next, on_error)
+        ffprobe_on(bytes_io.getvalue()).subscribe(on_next, on_error)

src/blrec/hls/operators/segment_dumper.py

@@ -1,31 +1,40 @@
-import logging
-import os
-from typing import Optional, Tuple, Union
+import io
+from pathlib import PurePath
+from typing import Callable, Optional, Tuple, Union
 
+import attr
+from loguru import logger
 from reactivex import Observable, Subject, abc
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
 
-from blrec.hls.operators.segment_fetcher import InitSectionData, SegmentData
+from blrec.utils.ffprobe import ffprobe
 
-from .playlist_dumper import PlaylistDumper
+from .segment_fetcher import InitSectionData, SegmentData
 
 __all__ = ('SegmentDumper',)
 
-logger = logging.getLogger(__name__)
-
 
 class SegmentDumper:
-    def __init__(self, playlist_dumper: PlaylistDumper) -> None:
-        self._playlist_dumper = playlist_dumper
-        self._out_dir: str = ''
-
-        def on_next(args: Tuple[str, int]) -> None:
-            path, timestamp = args
-            self._out_dir = os.path.dirname(path)
-
-        self._playlist_dumper.file_opened.subscribe(on_next)
+    def __init__(
+        self, path_provider: Callable[[Optional[int]], Tuple[str, int]]
+    ) -> None:
+        self._path_provider = path_provider
         self._file_opened: Subject[Tuple[str, int]] = Subject()
         self._file_closed: Subject[str] = Subject()
+        self._reset()
+
+    def _reset(self) -> None:
+        self._path: str = ''
+        self._file: Optional[io.BufferedWriter] = None
+        self._filesize: int = 0
+
+    @property
+    def path(self) -> str:
+        return self._path
+
+    @property
+    def filesize(self) -> int:
+        return self._filesize
 
     @property
     def file_opened(self) -> Observable[Tuple[str, int]]:
@@ -40,6 +49,90 @@ class SegmentDumper:
     ) -> Observable[Union[InitSectionData, SegmentData]]:
         return self._dump(source)
 
+    def _open_file(self) -> None:
+        path, timestamp = self._path_provider()
+        self._path = str(PurePath(path).with_suffix('.m4s'))
+        self._file = open(self._path, 'wb')  # type: ignore
+        logger.debug(f'Opened file: {self._path}')
+        self._file_opened.on_next((self._path, timestamp))
+
+    def _close_file(self) -> None:
+        if self._file is not None and not self._file.closed:
+            self._file.close()
+            logger.debug(f'Closed file: {self._path}')
+            self._file_closed.on_next(self._path)
+
+    def _write_data(self, item: Union[InitSectionData, SegmentData]) -> Tuple[int, int]:
+        assert self._file is not None
+        offset = self._file.tell()
+        size = self._file.write(item.payload)
+        assert size == len(item)
+        return offset, size
+
+    def _update_filesize(self, size: int) -> None:
+        self._filesize += size
+
+    def _is_redundant(
+        self, prev_init_item: Optional[InitSectionData], curr_init_item: InitSectionData
+    ) -> bool:
+        return (
+            prev_init_item is not None
+            and curr_init_item.payload == prev_init_item.payload
+        )
+
+    def _must_split_file(
+        self, prev_init_item: Optional[InitSectionData], curr_init_item: InitSectionData
+    ) -> bool:
+        if prev_init_item is None:
+            curr_profile = ffprobe(curr_init_item.payload)
+            logger.debug(f'current init section profile: {curr_profile}')
+            return True
+
+        prev_profile = ffprobe(prev_init_item.payload)
+        logger.debug(f'previous init section profile: {prev_profile}')
+        curr_profile = ffprobe(curr_init_item.payload)
+        logger.debug(f'current init section profile: {curr_profile}')
+
+        if prev_init_item.payload == curr_init_item.payload:
+            logger.debug('the current init section is identical to the previous one')
+            return False
+
+        prev_video_profile = prev_profile['streams'][0]
+        prev_audio_profile = prev_profile['streams'][1]
+        assert prev_video_profile['codec_type'] == 'video'
+        assert prev_audio_profile['codec_type'] == 'audio'
+
+        curr_video_profile = curr_profile['streams'][0]
+        curr_audio_profile = curr_profile['streams'][1]
+        assert curr_video_profile['codec_type'] == 'video'
+        assert curr_audio_profile['codec_type'] == 'audio'
+
+        if (
+            prev_video_profile['codec_name'] != curr_video_profile['codec_name']
+            or prev_video_profile['width'] != curr_video_profile['width']
+            or prev_video_profile['height'] != curr_video_profile['height']
+            or prev_video_profile['coded_width'] != curr_video_profile['coded_width']
+            or prev_video_profile['coded_height'] != curr_video_profile['coded_height']
+        ):
+            logger.warning('Video parameters changed')
+
+        if (
+            prev_audio_profile['codec_name'] != curr_audio_profile['codec_name']
+            or prev_audio_profile['channels'] != curr_audio_profile['channels']
+            or prev_audio_profile['sample_rate'] != curr_audio_profile['sample_rate']
+            or prev_audio_profile.get('bit_rate') != curr_audio_profile.get('bit_rate')
+        ):
+            logger.warning('Audio parameters changed')
+
+        logger.debug(
+            'must split the file '
+            'because the current init section is not identical to the previous one'
+        )
+        return True
+
+    def _need_split_file(self, item: Union[InitSectionData, SegmentData]) -> bool:
+        return item.segment.custom_parser_values.get('split', False)
+
     def _dump(
         self, source: Observable[Union[InitSectionData, SegmentData]]
     ) -> Observable[Union[InitSectionData, SegmentData]]:
@@ -47,31 +140,64 @@ class SegmentDumper:
             observer: abc.ObserverBase[Union[InitSectionData, SegmentData]],
             scheduler: Optional[abc.SchedulerBase] = None,
         ) -> abc.DisposableBase:
+            disposed = False
             subscription = SerialDisposable()
+            last_init_item: Optional[InitSectionData] = None
 
             def on_next(item: Union[InitSectionData, SegmentData]) -> None:
+                nonlocal last_init_item
+                split_file = False
+
                 if isinstance(item, InitSectionData):
-                    uri = item.init_section.uri
-                    path = os.path.join(self._out_dir, 'segments', uri)
-                else:
-                    uri = item.segment.uri
-                    name, ext = os.path.splitext(uri)
-                    path = os.path.join(self._out_dir, 'segments', name[:-3], uri)
-                os.makedirs(os.path.dirname(path), exist_ok=True)
+                    if self._is_redundant(last_init_item, item):
+                        return
+                    split_file = self._must_split_file(last_init_item, item)
+                    last_init_item = item
+
+                if not split_file:
+                    split_file = self._need_split_file(item)
+
+                if split_file:
+                    self._close_file()
+                    self._reset()
+                    self._open_file()
+
                 try:
-                    with open(path, 'wb') as file:
-                        file.write(item.payload)
+                    if split_file and not isinstance(item, InitSectionData):
+                        assert last_init_item is not None
+                        offset, size = self._write_data(last_init_item)
+                        self._update_filesize(size)
+                        observer.on_next(attr.evolve(last_init_item, offset=offset))
+
+                    offset, size = self._write_data(item)
+                    self._update_filesize(size)
+                    observer.on_next(attr.evolve(item, offset=offset))
                 except Exception as e:
-                    logger.error(f'Failed to dump segmemt: {repr(e)}')
+                    logger.error(f'Failed to write data: {repr(e)}')
+                    self._close_file()
+                    self._reset()
                     observer.on_error(e)
-                else:
-                    observer.on_next(item)
+
+            def on_completed() -> None:
+                self._close_file()
+                self._reset()
+                observer.on_completed()
+
+            def on_error(e: Exception) -> None:
+                self._close_file()
+                self._reset()
+                observer.on_error(e)
 
             def dispose() -> None:
-                pass
+                nonlocal disposed
+                nonlocal last_init_item
+                disposed = True
+                last_init_item = None
+                self._close_file()
+                self._reset()
 
             subscription.disposable = source.subscribe(
-                on_next, observer.on_error, observer.on_completed, scheduler=scheduler
+                on_next, on_error, on_completed, scheduler=scheduler
             )
 
             return CompositeDisposable(subscription, Disposable(dispose))

src/blrec/hls/operators/segment_fetcher.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging
 import time
 from typing import Optional, Union
 
@@ -8,7 +7,7 @@ import attr
 import m3u8
 import requests
 import urllib3
-from m3u8.model import InitializationSection
+from loguru import logger
 from reactivex import Observable, abc
 from reactivex import operators as ops
 from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
@@ -25,19 +24,18 @@ from blrec.bili.live import Live
 from blrec.core import operators as core_ops
 from blrec.utils import operators as utils_ops
 from blrec.utils.hash import cksum
+from blrec.exception.helpers import format_exception
 
-from ..exceptions import FetchSegmentError
+from ..exceptions import FetchSegmentError, SegmentDataCorrupted
 
 __all__ = ('SegmentFetcher', 'InitSectionData', 'SegmentData')
 
 
-logger = logging.getLogger(__name__)
-
-
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class InitSectionData:
-    init_section: InitializationSection
+    segment: m3u8.Segment
     payload: bytes
+    offset: int = 0
 
     def __len__(self) -> int:
         return len(self.payload)
@@ -47,6 +45,7 @@ class InitSectionData:
 class SegmentData:
     segment: m3u8.Segment
     payload: bytes
+    offset: int = 0
 
     def __len__(self) -> int:
         return len(self.payload)
@@ -93,7 +92,6 @@ class SegmentFetcher:
                         (
                             last_segment is None
                             or seg.init_section != last_segment.init_section
-                            or seg.discontinuity
                         )
                     ):
                         url = seg.init_section.absolute_uri
@@ -116,28 +114,38 @@ class SegmentFetcher:
                                     f'init section url: {url}'
                                 )
                                 data = _data
-                        observer.on_next(
-                            InitSectionData(init_section=seg.init_section, payload=data)
-                        )
+                        observer.on_next(InitSectionData(segment=seg, payload=data))
                     last_segment = seg
 
                     url = seg.absolute_uri
-                    crc32 = seg.title.split('|')[-1]
+                    hex_size, crc32, *_ = seg.title.split('|')
+                    size = int(hex_size, 16)
                     for _ in range(3):
                         data = self._fetch_segment(url)
+                        if len(data) != size:
+                            logger.debug(
+                                'Segment data incomplete: '
+                                f'size expected: {size}, '
+                                f'size fetched: {len(data)}, '
+                                f'segment url: {url}'
+                            )
+                            continue
                         crc32_of_data = cksum(data)
-                        if crc32_of_data == crc32:
-                            break
-                        logger.debug(
-                            'Segment data corrupted: '
-                            f'correct crc32: {crc32}, '
-                            f'crc32 of segment data: {crc32_of_data}, '
-                            f'segment url: {url}'
-                        )
+                        if crc32_of_data != crc32:
+                            logger.debug(
+                                'Segment data corrupted: '
+                                f'correct crc32: {crc32}, '
+                                f'crc32 of segment data: {crc32_of_data}, '
+                                f'segment url: {url}'
+                            )
+                            continue
+                        break
                     else:
-                        logger.warning(f'Segment data corrupted: {url}')
+                        raise SegmentDataCorrupted(url)
                 except Exception as exc:
-                    logger.warning(f'Failed to fetch segment {url}', exc_info=exc)
+                    logger.warning(
+                        'Failed to fetch segment: {}\n{}', url, format_exception(exc)
+                    )
                     attempts += 1
                     if attempts > 3:
                         attempts = 0
@@ -172,8 +180,13 @@ class SegmentFetcher:
         stop=stop_after_delay(60),
     )
     def _fetch_segment(self, url: str) -> bytes:
-        with self._session.get(url, headers=self._live.headers, timeout=10) as response:
+        try:
+            response = self._session.get(url, headers=self._live.headers, timeout=5)
             response.raise_for_status()
+        except Exception as e:
+            logger.debug(f'Failed to fetch segment {url}: {repr(e)}')
+            raise
+        else:
             return response.content
 
     def _should_retry(self, exc: Exception) -> bool:
@@ -189,3 +202,4 @@ class SegmentFetcher:
             'Fetch segments failed continuously, trying to update the stream url.'
         )
         self._stream_url_resolver.reset()
+        self._stream_url_resolver.rotate_routes()

src/blrec/hls/operators/segment_parser.py

@@ -1,104 +0,0 @@
-from __future__ import annotations
-
-import io
-import logging
-from typing import Optional
-
-from reactivex import Observable, abc
-from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
-
-from blrec.flv.common import (
-    is_audio_sequence_header,
-    is_metadata_tag,
-    is_video_sequence_header,
-)
-from blrec.flv.io import FlvReader
-from blrec.flv.models import AudioTag, FlvHeader, ScriptTag, VideoTag
-from blrec.flv.operators.typing import FLVStream, FLVStreamItem
-
-__all__ = ('SegmentParser',)
-
-
-logger = logging.getLogger(__name__)
-
-
-class SegmentParser:
-    def __init__(self) -> None:
-        self._backup_timestamp = True
-
-    def __call__(self, source: Observable[bytes]) -> FLVStream:
-        return self._parse(source)
-
-    def _parse(self, source: Observable[bytes]) -> FLVStream:
-        def subscribe(
-            observer: abc.ObserverBase[FLVStreamItem],
-            scheduler: Optional[abc.SchedulerBase] = None,
-        ) -> abc.DisposableBase:
-            disposed = False
-            subscription = SerialDisposable()
-
-            last_flv_header: Optional[FlvHeader] = None
-            last_metadata_tag: Optional[ScriptTag] = None
-            last_audio_sequence_header: Optional[AudioTag] = None
-            last_video_sequence_header: Optional[VideoTag] = None
-
-            def reset() -> None:
-                nonlocal last_flv_header, last_metadata_tag
-                nonlocal last_audio_sequence_header, last_video_sequence_header
-                last_flv_header = None
-                last_metadata_tag = None
-                last_audio_sequence_header = None
-                last_video_sequence_header = None
-
-            def on_next(data: bytes) -> None:
-                nonlocal last_flv_header, last_metadata_tag
-                nonlocal last_audio_sequence_header, last_video_sequence_header
-
-                if b'' == data:
-                    reset()
-                    return
-
-                try:
-                    reader = FlvReader(
-                        io.BytesIO(data), backup_timestamp=self._backup_timestamp
-                    )
-
-                    flv_header = reader.read_header()
-                    if not last_flv_header:
-                        observer.on_next(flv_header)
-                        last_flv_header = flv_header
-                    else:
-                        assert last_flv_header == flv_header
-
-                    while not disposed:
-                        tag = reader.read_tag()
-                        if is_metadata_tag(tag):
-                            if last_metadata_tag is not None:
-                                continue
-                            last_metadata_tag = tag
-                        elif is_video_sequence_header(tag):
-                            if tag == last_video_sequence_header:
-                                continue
-                            last_video_sequence_header = tag
-                        elif is_audio_sequence_header(tag):
-                            if tag == last_audio_sequence_header:
-                                continue
-                            last_audio_sequence_header = tag
-                        observer.on_next(tag)
-                except EOFError:
-                    pass
-                except Exception as e:
-                    observer.on_error(e)
-
-            def dispose() -> None:
-                nonlocal disposed
-                disposed = True
-                reset()
-
-            subscription.disposable = source.subscribe(
-                on_next, observer.on_error, observer.on_completed, scheduler=scheduler
-            )
-
-            return CompositeDisposable(subscription, Disposable(dispose))
-
-        return Observable(subscribe)

src/blrec/hls/operators/segment_remuxer.py

@@ -1,111 +0,0 @@
-from __future__ import annotations
-
-import io
-import logging
-import os
-from typing import Optional, Union
-
-import av
-from reactivex import Observable, abc
-from reactivex.disposable import CompositeDisposable, Disposable, SerialDisposable
-
-from blrec.bili.live import Live
-
-from .segment_fetcher import InitSectionData, SegmentData
-
-__all__ = ('SegmentRemuxer',)
-
-
-logger = logging.getLogger(__name__)
-
-TRACE_REMUX_SEGMENT = bool(os.environ.get('BLREC_TRACE_REMUX_SEGMENT'))
-TRACE_LIBAV = bool(os.environ.get('BLREC_TRACE_LIBAV'))
-if TRACE_LIBAV:
-    logging.getLogger('libav').setLevel(5)
-else:
-    av.logging.set_level(av.logging.FATAL)
-
-
-class SegmentRemuxer:
-    def __init__(self, live: Live) -> None:
-        self._live = live
-
-    def __call__(
-        self, source: Observable[Union[InitSectionData, SegmentData]]
-    ) -> Observable[bytes]:
-        return self._remux(source)
-
-    def _remux(
-        self, source: Observable[Union[InitSectionData, SegmentData]]
-    ) -> Observable[bytes]:
-        def subscribe(
-            observer: abc.ObserverBase[bytes],
-            scheduler: Optional[abc.SchedulerBase] = None,
-        ) -> abc.DisposableBase:
-            disposed = False
-            subscription = SerialDisposable()
-
-            init_section_data: Optional[bytes] = None
-
-            def reset() -> None:
-                nonlocal init_section_data
-                init_section_data = None
-
-            def on_next(data: Union[InitSectionData, SegmentData]) -> None:
-                nonlocal init_section_data
-
-                if isinstance(data, InitSectionData):
-                    init_section_data = data.payload
-                    observer.on_next(b'')
-                    return
-
-                if init_section_data is None:
-                    return
-
-                try:
-                    remuxed_data = self._remux_segemnt(init_section_data + data.payload)
-                except av.FFmpegError as e:
-                    logger.warning(f'Failed to remux segment: {repr(e)}', exc_info=e)
-                else:
-                    observer.on_next(remuxed_data)
-
-            def dispose() -> None:
-                nonlocal disposed
-                disposed = True
-                reset()
-
-            subscription.disposable = source.subscribe(
-                on_next, observer.on_error, observer.on_completed, scheduler=scheduler
-            )
-
-            return CompositeDisposable(subscription, Disposable(dispose))
-
-        return Observable(subscribe)
-
-    def _remux_segemnt(self, data: bytes, format: str = 'flv') -> bytes:
-        in_file = io.BytesIO(data)
-        out_file = io.BytesIO()
-
-        with av.open(in_file) as in_container:
-            with av.open(out_file, mode='w', format=format) as out_container:
-                in_video_stream = in_container.streams.video[0]
-                in_audio_stream = in_container.streams.audio[0]
-                out_video_stream = out_container.add_stream(template=in_video_stream)
-                out_audio_stream = out_container.add_stream(template=in_audio_stream)
-
-                for packet in in_container.demux():
-                    if TRACE_REMUX_SEGMENT:
-                        logger.debug(repr(packet))
-                    # We need to skip the "flushing" packets that `demux` generates.
-                    if packet.dts is None:
-                        continue
-                    # We need to assign the packet to the new stream.
-                    if packet.stream.type == 'video':
-                        packet.stream = out_video_stream
-                    elif packet.stream.type == 'audio':
-                        packet.stream = out_audio_stream
-                    else:
-                        raise NotImplementedError(packet.stream.type)
-                    out_container.mux(packet)
-
-        return out_file.getvalue()

src/blrec/logging/__init__.py

@@ -1,8 +1,3 @@
-from .configure_logging import configure_logger, TqdmOutputStream, ConsoleHandler
+from .configure_logging import TqdmOutputStream, configure_logger
 
-
-__all__ = (
-    'configure_logger',
-    'TqdmOutputStream',
-    'ConsoleHandler',
-)
+__all__ = ('configure_logger', 'TqdmOutputStream')

src/blrec/logging/configure_logging.py

@@ -1,85 +1,46 @@
-import asyncio
-import atexit
-import logging
 import os
-import threading
+import sys
 from datetime import datetime
-from logging import Handler, LogRecord
-from logging.handlers import TimedRotatingFileHandler
-from typing import Any, List, Optional
+from typing import Optional
 
-from colorama import Back, Fore, Style, deinit, init
+from loguru import logger
 from tqdm import tqdm
 
 from .typing import LOG_LEVEL
 
-__all__ = 'configure_logger', 'ConsoleHandler', 'TqdmOutputStream'
+__all__ = 'configure_logger', 'TqdmOutputStream'
 
+LOGURU_CONSOLE_FORMAT = (
+    '<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | '
+    '<level>{level}</level> | '
+    '<cyan>{module}</cyan>:<cyan>{line}</cyan> | '
+    '<level>{extra[room_id]}</level> - '
+    '<level>{message}</level>'
+)
 
-DISPLAY_PROGRESS = bool(os.environ.get('BLREC_PROGRESS'))
+LOGURU_FILE_FORMAT = (
+    '<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | '
+    '<level>{level}</level> | '
+    '<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> | '
+    '<level>{extra[room_id]}</level> - '
+    '<level>{message}</level>'
+)
 
 
 class TqdmOutputStream:
     def write(self, string: str = '') -> None:
-        tqdm.write(string, end='')
+        tqdm.write(string, file=sys.stderr, end='')
+
+    def isatty(self) -> bool:
+        return sys.stderr.isatty()
 
 
-class ConsoleHandler(logging.StreamHandler):
-    def __init__(self, stream=None) -> None:  # type: ignore
-        super().__init__(stream)
+_console_handler_id: Optional[int] = None
+_file_handler_id: Optional[int] = None
 
-    def format(self, record: LogRecord) -> str:
-        msg = super().format(record)
-
-        level = record.levelno
-        if level == logging.DEBUG:
-            style = Fore.GREEN
-        elif level == logging.WARNING:
-            style = Fore.YELLOW
-        elif level == logging.ERROR:
-            style = Fore.RED
-        elif level == logging.CRITICAL:
-            style = Fore.WHITE + Back.RED + Style.BRIGHT
-        else:
-            style = ''
-
-        return style + msg + Style.RESET_ALL if style else msg
-
-
-_old_factory = logging.getLogRecordFactory()
-
-
-def obtain_room_id() -> str:
-    try:
-        task = asyncio.current_task()
-        assert task is not None
-    except Exception:
-        name = threading.current_thread().getName()
-    else:
-        name = task.get_name()
-
-    if '::' in name:
-        if room_id := name.split('::')[-1]:
-            return room_id
-
-    return ''
-
-
-def record_factory(*args: Any, **kwargs: Any) -> LogRecord:
-    record = _old_factory(*args, **kwargs)
-
-    if room_id := obtain_room_id():
-        record.roomid = '[' + room_id + '] '  # type: ignore
-    else:
-        record.roomid = ''  # type: ignore
-
-    return record
-
-
-logging.setLogRecordFactory(record_factory)
-
-
-_old_handlers: List[Handler] = []
+_old_log_dir: Optional[str] = None
+_old_console_log_level: Optional[LOG_LEVEL] = None
+_old_backup_count: Optional[int] = None
 
 
 def configure_logger(
@@ -88,52 +49,55 @@ def configure_logger(
     console_log_level: LOG_LEVEL = 'INFO',
     backup_count: Optional[int] = None,
 ) -> None:
-    # config root logger
-    logger = logging.getLogger()
-    logger.setLevel(logging.DEBUG)
+    global _console_handler_id, _file_handler_id
+    global _old_log_dir, _old_console_log_level, _old_backup_count
 
-    # config formatter
-    formatter = logging.Formatter(
-        '[%(asctime)s] [%(levelname)s] [%(module)s] %(roomid)s%(message)s'
-    )
+    logger.configure(extra={'room_id': ''})
 
-    # logging to console
-    if DISPLAY_PROGRESS:
-        console_handler = ConsoleHandler(TqdmOutputStream())
-    else:
-        console_handler = ConsoleHandler()
-    console_handler.setLevel(logging.getLevelName(console_log_level))
-    console_handler.setFormatter(formatter)
-    logger.addHandler(console_handler)
+    if console_log_level != _old_console_log_level:
+        if _console_handler_id is not None:
+            logger.remove(_console_handler_id)
+        else:
+            logger.remove()  # remove the default stderr handler
 
-    # logging to file
-    log_file_path = make_log_file_path(log_dir)
-    file_handler = TimedRotatingFileHandler(
-        filename=log_file_path,
-        when='MIDNIGHT',
-        backupCount=backup_count or 0,
-        encoding='utf-8',
-    )
-    file_handler.setLevel(logging.DEBUG)
-    file_handler.setFormatter(formatter)
-    logger.addHandler(file_handler)
+        if bool(os.environ.get('BLREC_PROGRESS')):
+            _console_handler_id = logger.add(
+                TqdmOutputStream(),
+                level=console_log_level,
+                format=LOGURU_CONSOLE_FORMAT,
+            )
+        else:
+            _console_handler_id = logger.add(
+                sys.stderr, level=console_log_level, format=LOGURU_CONSOLE_FORMAT
+            )
 
-    # remove old handlers after re-configured
-    for handler in _old_handlers:
-        logger.removeHandler(handler)
+        _old_console_log_level = console_log_level
 
-    # retain old handlers for the removing
-    _old_handlers.append(console_handler)
-    _old_handlers.append(file_handler)
+    if log_dir != _old_log_dir or backup_count != _old_backup_count:
+        log_file_path = make_log_file_path(log_dir)
+        logger.info(f'log file: {log_file_path}')
 
-    logger.info(f'log file: {log_file_path}')
+        file_handler_id = logger.add(
+            log_file_path,
+            level='TRACE' if bool(os.environ.get('BLREC_TRACE')) else 'DEBUG',
+            format=LOGURU_FILE_FORMAT,
+            enqueue=True,
+            rotation="00:00",
+            retention=backup_count,
+            backtrace=True,
+            diagnose=True,
+        )
+
+        if _file_handler_id is not None:
+            logger.remove(_file_handler_id)
+
+        _file_handler_id = file_handler_id
+
+        _old_log_dir = log_dir
+        _old_backup_count = backup_count
 
 
 def make_log_file_path(log_dir: str) -> str:
-    data_time_string = datetime.now().strftime("%Y-%m-%d-%H%M%S-%f")
+    data_time_string = datetime.now().strftime("%Y-%m-%d_%H-%M-%S_%f")
     filename = f'blrec_{data_time_string}.log'
     return os.path.abspath(os.path.join(log_dir, filename))
-
-
-init()
-atexit.register(deinit)

src/blrec/logging/context.py

@@ -0,0 +1,19 @@
+from functools import wraps
+from typing import Any, Awaitable, Callable, TypeVar
+
+from loguru import logger
+
+_T = TypeVar('_T')
+
+__all__ = ('async_task_with_logger_context',)
+
+
+def async_task_with_logger_context(
+    func: Callable[..., Awaitable[_T]]
+) -> Callable[..., Awaitable[_T]]:
+    @wraps(func)
+    async def wrapper(obj: Any, *arg: Any, **kwargs: Any) -> _T:
+        with logger.contextualize(**obj._logger_context):
+            return await func(obj, *arg, **kwargs)
+
+    return wrapper

src/blrec/logging/room_id.py

@@ -1,46 +0,0 @@
-import threading
-import asyncio
-from functools import wraps
-from typing import Any, Awaitable, Callable, TypeVar
-
-
-_T = TypeVar('_T')
-
-
-def with_room_id(room_id: int):  # type: ignore
-    def decorate(func: Callable[..., _T]) -> Callable[..., _T]:
-        @wraps(func)
-        def wrapper(*arg: Any, **kwargs: Any) -> _T:
-            curr_thread = threading.current_thread()
-            old_name = curr_thread.getName()
-            curr_thread.setName(f'{func.__qualname__}::{room_id}')
-            try:
-                return func(*arg, **kwargs)
-            finally:
-                curr_thread.setName(old_name)
-        return wrapper
-    return decorate
-
-
-def aio_task_with_room_id(
-    func: Callable[..., Awaitable[_T]]
-) -> Callable[..., Awaitable[_T]]:
-    @wraps(func)
-    async def wrapper(obj: Any, *arg: Any, **kwargs: Any) -> _T:
-        if hasattr(obj, '_room_id'):
-            room_id = obj._room_id
-        elif hasattr(obj, '_live'):
-            room_id = obj._live.room_id
-        else:
-            room_id = ''
-
-        curr_task = asyncio.current_task()
-        assert curr_task is not None
-        old_name = curr_task.get_name()
-        curr_task.set_name(f'{func.__qualname__}::{room_id}')
-        try:
-            return await func(obj, *arg, **kwargs)
-        finally:
-            curr_task.set_name(old_name)
-
-    return wrapper

src/blrec/logging/typing.py

@@ -1,20 +1,5 @@
 from typing import Literal
 
-# CRITICAL = 50
-# FATAL = CRITICAL
-# ERROR = 40
-# WARNING = 30
-# WARN = WARNING
-# INFO = 20
-# DEBUG = 10
-# NOTSET = 0
-
 LOG_LEVEL = Literal[
-    'CRITICAL',
-    'FATAL',
-    'ERROR',
-    'WARNING',
-    'INFO',
-    'DEBUG',
-    'NOTSET',  # equivalent to verbose
+    'TRACE', 'DEBUG', 'INFO', 'SUCCESS', 'WARNING', 'ERROR', 'CRITICAL',
 ]

src/blrec/notification/notifiers.py

@@ -1,5 +1,4 @@
 import asyncio
-import logging
 import os
 from abc import ABC, abstractmethod
 from datetime import datetime
@@ -30,13 +29,13 @@ from ..exception import ExceptionCenter, format_exception
 from ..setting.typing import MessageType
 from ..utils.mixins import SwitchableMixin
 from .providers import (
+    Bark,
     EmailService,
     MessagingProvider,
     Pushdeer,
     Pushplus,
     Serverchan,
     Telegram,
-    Bark,
 )
 
 __all__ = (
@@ -47,11 +46,11 @@ __all__ = (
     'PushdeerNotifier',
     'PushplusNotifier',
     'TelegramNotifier',
-    'BarkNotifer',
+    'BarkNotifier',
 )
 
 
-logger = logging.getLogger(__name__)
+from loguru import logger
 
 
 class Notifier(SwitchableMixin, ABC):

src/blrec/notification/providers.py

@@ -1,5 +1,4 @@
 import asyncio
-import logging
 import smtplib
 import ssl
 from abc import ABC, abstractmethod
@@ -11,13 +10,13 @@ from urllib.parse import urljoin
 import aiohttp
 
 from ..setting.typing import (
+    BarkMessageType,
     EmailMessageType,
     MessageType,
     PushdeerMessageType,
     PushplusMessageType,
     ServerchanMessageType,
     TelegramMessageType,
-    BarkMessageType,
 )
 from ..utils.patterns import Singleton
 
@@ -32,9 +31,6 @@ __all__ = (
 )
 
 
-logger = logging.getLogger(__name__)
-
-
 class MessagingProvider(Singleton, ABC):
     def __init__(self) -> None:
         super().__init__()
@@ -267,11 +263,11 @@ class BarkResponse(TypedDict):
 
 class Bark(MessagingProvider):
     _server: Final = 'https://api.day.app'
-    _endpoint: Final = '/push'
+    _endpoint: Final = 'push'
 
     def __init__(self, server: str = '', pushkey: str = '') -> None:
         super().__init__()
-        self.server = server
+        self.server = server if len(server) > 0 else self._server
         self.pushkey = pushkey
 
     async def send_message(
@@ -287,7 +283,7 @@ class Bark(MessagingProvider):
     async def _post_message(
         self, title: str, content: str, msg_type: BarkMessageType
     ) -> None:
-        url = urljoin(self.server or self._server, self._endpoint)
+        url = urljoin(self.server, self._endpoint)
         # content size is limited to a maximum size of 4 KB (4096 bytes)
         if len(content.encode()) >= 4096:
             content = content.encode()[:4090].decode(errors='ignore') + ' ...'
@@ -296,7 +292,7 @@ class Bark(MessagingProvider):
             "body": content,
             "device_key": self.pushkey,
             "badge": 1,
-            "icon": "https://raw.githubusercontent.com/acgnhiki/blrec/master/webapp/src/assets/icons/icon-72x72.png",
+            "icon": "https://raw.githubusercontent.com/acgnhiki/blrec/master/webapp/src/assets/icons/icon-72x72.png",  # noqa
             "group": "blrec",
         }
         async with aiohttp.ClientSession(raise_for_status=True) as session: