新增带pymkui后台管理的docker镜像

.github/workflows/docker_py.yml

@@ -0,0 +1,89 @@
+name: DockerPy
+
+on:
+  push:
+    branches:
+      - "master"
+      - "feature/*"
+      - "release/*"
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: docker.io
+  IMAGE_NAME: zlmediakit/zlmediakit
+
+jobs:
+  build:
+
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: 下载submodule源码
+        run: mv -f .gitmodules_github .gitmodules && git submodule sync && git submodule update --init
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+      - name: Install cosign
+        uses: sigstore/cosign-installer@d572c9c13673d2e0a26fabf90b5748f36886883f
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+
+      # Workaround: https://github.com/docker/build-push-action/issues/461
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: zlmediakit
+          password: ${{ secrets.DOCKER_IO_SECRET }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        if: github.event_name != 'pull_request' && github.ref != 'refs/heads/feature/test'
+        id: build-and-push
+        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}_py
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: MODEL=Release
+          file: ./dockerfile_py
+          platforms: linux/amd64,linux/arm64
+
+      # Sign the resulting Docker image digest except on PRs.
+      # This will only write to the public Rekor transparency log when the Docker
+      # repository is public to avoid leaking data.  If you would like to publish
+      # transparency data even for private images, pass --force to cosign below.
+      # https://github.com/sigstore/cosign
+#      - name: Sign the published Docker image
+#        if: ${{ github.event_name != 'pull_request' }}
+#        env:
+#          COSIGN_EXPERIMENTAL: "true"
+#        # This step uses the identity token to provision an ephemeral certificate
+#        # against the sigstore community Fulcio instance.
+#        run: cosign sign ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

3rdpart/ZLToolKit

@@ -1 +1 @@
-Subproject commit 7302286cf4be39d416b023fec3fd4ca9c54af762
+Subproject commit bb1a382601e7cdeeb70d3bc978731c2648fd88b4

README.md

@@ -210,10 +210,15 @@ zlmediakit采用 github action 持续集成自动编译打包上传编译产出
 你可以从Docker Hub下载已经编译好的镜像并启动它：
 
 ```bash
-#此镜像为github action 持续集成自动编译推送，跟代码(master分支)保持最新状态
+# 此镜像为github action 持续集成自动编译推送，跟代码(master分支)保持最新状态
 docker run -id -p 1935:1935 -p 8080:80 -p 8443:443 -p 8554:554 -p 10000:10000 -p 10000:10000/udp -p 8000:8000/udp -p 9000:9000/udp zlmediakit/zlmediakit:master
 ```
 
+```bash
+# 此镜像为github action 持续集成自动编译推送，跟代码(master分支)保持最新状态, 并开启了pymkui后台管理系统，支持web管理界面
+docker run -id -p 1935:1935 -p 8080:80 -p 8443:443 -p 8554:554 -p 10000:10000 -p 10000:10000/udp -p 8000:8000/udp -p 9000:9000/udp zlmediakit/zlmediakit:master_py
+```
+
 你也可以根据Dockerfile编译镜像：
 
 ```bash

README_en.md

@@ -367,6 +367,11 @@ You can download the pre-compiled image from Docker Hub and start it:
 #This image is pushed by the GitHub continuous integration automatic compilation to keep up with the latest code (master branch)
 docker run -id -p 1935:1935 -p 8080:80 -p 8443:443 -p 8554:554 -p 10000:10000 -p 10000:10000/udp -p 8000:8000/udp -p 9000:9000/udp zlmediakit/zlmediakit:master
 ```
+```bash
+# This image is automatically built and pushed via GitHub Actions CI, stays up-to-date with the latest code (master branch), 
+# and includes the pymkui backend management system with a web-based UI.
+docker run -id -p 1935:1935 -p 8080:80 -p 8443:443 -p 8554:554 -p 10000:10000 -p 10000:10000/udp -p 8000:8000/udp -p 9000:9000/udp zlmediakit/zlmediakit:master_py
+```
 
 You can also compile the image based on the Dockerfile:
 

dockerfile_py

@@ -0,0 +1,130 @@
+FROM ubuntu:24.04 AS build
+#shell,rtmp,rtsp,rtsps,http,https,rtp
+EXPOSE 1935/tcp
+EXPOSE 554/tcp
+EXPOSE 80/tcp
+EXPOSE 443/tcp
+EXPOSE 10000/udp
+EXPOSE 10000/tcp
+EXPOSE 8000/udp
+EXPOSE 8000/tcp
+EXPOSE 9000/udp
+
+# 设置环境变量，避免交互提示
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y \
+    git \
+    build-essential \
+    cmake \
+    curl \
+    unzip \
+    zip \
+    nasm \
+    autoconf \
+    automake \
+    libtool \
+    autoconf-archive \
+    pkg-config \
+    libavcodec-dev \
+    libavformat-dev \
+    libavutil-dev \
+    libswscale-dev \
+    libavfilter-dev \
+    python3 \
+    python3-dev \
+    python3-pip \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN git clone https://github.com/ZLMediaKit/pymkui.git /opt/media/ZLMediaKit/pymkui
+
+# 克隆 vcpkg 并编译
+RUN git clone https://github.com/microsoft/vcpkg.git /opt/vcpkg \
+    && /opt/vcpkg/bootstrap-vcpkg.sh
+
+# 将 vcpkg 路径加入环境变量
+ENV PATH="/opt/vcpkg:$PATH"
+ENV VCPKG_ROOT=/opt/vcpkg
+ENV CMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake
+
+# 自动选择 triplet（x64-linux 或 arm64-linux）
+RUN ARCH=$(dpkg --print-architecture) && \
+    if [ "$ARCH" = "amd64" ]; then \
+        TRIPLET="x64-linux"; \
+    elif [ "$ARCH" = "arm64" ]; then \
+        TRIPLET="arm64-linux"; \
+    else \
+        echo "Unsupported architecture: $ARCH" && exit 1; \
+    fi && \
+    echo "Using vcpkg triplet: $TRIPLET" && \
+    /opt/vcpkg/vcpkg install jemalloc openssl libsrtp[openssl] --triplet $TRIPLET-dynamic
+
+
+RUN mkdir -p /opt/media
+COPY . /opt/media/ZLMediaKit
+WORKDIR /opt/media/ZLMediaKit
+
+RUN mkdir -p build release/linux/Release/lib
+
+# 根据 dpkg 架构选择 vcpkg 动态库路径
+RUN ARCH=$(dpkg --print-architecture) && \
+    if [ "$ARCH" = "amd64" ]; then VCPKG_LIB_PATH="/opt/vcpkg/installed/x64-linux-dynamic/lib"; \
+    elif [ "$ARCH" = "arm64" ]; then VCPKG_LIB_PATH="/opt/vcpkg/installed/arm64-linux-dynamic/lib"; \
+    else echo "Unsupported architecture: $ARCH" && exit 1; fi && \
+    echo "Copying libs from $VCPKG_LIB_PATH" && \
+    cp -rfP $VCPKG_LIB_PATH/* release/linux/Release/lib/
+
+WORKDIR /opt/media/ZLMediaKit/build
+
+RUN ARCH=$(dpkg --print-architecture) && \
+    if [ "$ARCH" = "amd64" ]; then TRIPLET="x64-linux"; \
+    elif [ "$ARCH" = "arm64" ]; then TRIPLET="arm64-linux"; \
+    else echo "Unsupported architecture: $ARCH" && exit 1; fi && \
+    echo "Using vcpkg triplet: $TRIPLET" && \
+    cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
+          -DVCPKG_TARGET_TRIPLET=${TRIPLET}-dynamic \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DENABLE_PYTHON=ON \
+          -DPython3_EXECUTABLE=$(which python3) \
+          -DENABLE_WEBRTC=ON -DENABLE_FFMPEG=ON \
+          -DENABLE_TESTS=OFF -DENABLE_API=OFF .. && \
+    make -j $(nproc)
+
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+         DEBIAN_FRONTEND="noninteractive" \
+         apt-get install -y --no-install-recommends \
+         ca-certificates \
+         tzdata \
+         libavcodec-dev \
+         libavformat-dev \
+         libavutil-dev \
+         libswscale-dev \
+         libavfilter-dev \
+         ffmpeg \
+         python3 \
+         python3-dev \
+         python3-pip && \
+         apt-get autoremove -y && \
+         apt-get clean -y && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
+        && echo $TZ > /etc/timezone && \
+        mkdir -p /opt/media/bin/www &&  mkdir -p /opt/media/bin/lib
+
+WORKDIR /opt/media/bin/
+
+COPY --from=build /opt/media/ZLMediaKit/release/linux/Release/MediaServer /opt/media/ZLMediaKit/default.pem /opt/media/bin/
+COPY --from=build /opt/media/ZLMediaKit/release/linux/Release/lib /opt/media/bin/lib
+COPY --from=build /opt/media/ZLMediaKit/release/linux/Release/config.ini /opt/media/conf/
+RUN echo -e "\n[python]\nplugin=mk_plugin" >> /opt/media/conf/config.ini
+COPY --from=build /opt/media/ZLMediaKit/www/ /opt/media/bin/www/
+COPY --from=build /opt/media/ZLMediaKit/pymkui /opt/media/bin/pymkui
+RUN pip3 install --no-cache-dir --break-system-packages -r /opt/media/bin/pymkui/backend/requirements.txt
+ENV PATH="/opt/media/bin:$PATH"
+ENV PYTHONPATH="/opt/media/bin/pymkui/backend"
+ENV LD_LIBRARY_PATH="/opt/media/bin/lib"
+CMD ["./MediaServer","-s", "default.pem", "-c", "../conf/config.ini", "-l","1"]

src/Rtp/RtpProcess.cpp

@@ -329,6 +329,13 @@ bool RtpProcess::close(mediakit::MediaSource &sender) {
     return true;
 }
 
+bool RtpProcess::pause(MediaSource &sender, bool pause) {
+    if (_sock) {
+        _sock->enableRecv(!pause);
+    }
+    return static_cast<bool>(_sock);
+}
+
 toolkit::EventPoller::Ptr RtpProcess::getOwnerPoller(MediaSource &sender) {
     if (_sock) {
         return _sock->getPoller();

src/Rtp/RtpProcess.h

@@ -115,8 +115,9 @@ protected:
     std::shared_ptr<SockInfo> getOriginSock(MediaSource &sender) const override;
     toolkit::EventPoller::Ptr getOwnerPoller(MediaSource &sender) override;
     float getLossRate(MediaSource &sender, TrackType type) override;
-    Ptr getRtpProcess(mediakit::MediaSource &sender) const override;
-    bool close(mediakit::MediaSource &sender) override;
+    Ptr getRtpProcess(MediaSource &sender) const override;
+    bool close(MediaSource &sender) override;
+    bool pause(MediaSource &sender, bool pause) override;
 
 private:
     RtpProcess(const MediaTuple &tuple);

src/Rtp/RtpSender.cpp

@@ -36,15 +36,7 @@ RtpSender::~RtpSender() {
 }
 
 void RtpSender::startSend(const MediaSourceEvent &sender, const MediaSourceEvent::SendRtpArgs &args, const function<void(uint16_t local_port, const SockException &ex)> &cb){
-    auto origin_socket = sender.getOriginSock(MediaSource::NullMediaSource());
-    _origin_socket = dynamic_pointer_cast<Socket>(origin_socket);
-    if (!_origin_socket) {
-        auto process = dynamic_pointer_cast<RtpProcess>(origin_socket);
-        if (process) {
-            _origin_socket = process->getSock();
-        }
-    }
-
+    _muxer = sender.getMuxer(MediaSource::NullMediaSource());
     _args = args;
     if (!_interface) {
         // 重连时不重新创建对象  [AUTO-TRANSLATED:b788cd5d]
@@ -323,12 +315,18 @@ void RtpSender::onConnect() {
         });
     }
 
-    if (_socket_rtp->sockType() == toolkit::SockNum::Sock_TCP && _origin_socket) {
+    if (_socket_rtp->sockType() == toolkit::SockNum::Sock_TCP) {
         // rtp 端口是TCP端口，转发速度应当控制收流速度
-        auto origin_socket = _origin_socket;
-        _socket_rtp->setOnFlush([origin_socket]() {
-            origin_socket->enableRecv(true);
-            return true;
+        std::weak_ptr<RtpSender> weak_self = shared_from_this();
+        _socket_rtp->setOnFlush([weak_self]() {
+            if (auto strong_self = weak_self.lock()) {
+                auto muxer = strong_self->_muxer.lock();
+                if (muxer) {
+                    muxer->pause(MediaSource::NullMediaSource(), false);
+                }
+                return true;
+            }
+            return false;
         });
     }
     InfoL << "startSend rtp success: " << _socket_rtp->get_peer_ip() << ":" << _socket_rtp->get_peer_port() << ", data_type: " << _args.data_type << ", con_type: " << _args.con_type;
@@ -451,8 +449,11 @@ void RtpSender::onFlushRtpList(shared_ptr<List<Buffer::Ptr>> rtp_list) {
                 }
                 default: CHECK(0);
             }
-            if (_args.enable_origin_recv_limit && _socket_rtp->sockType() == toolkit::SockNum::Sock_TCP && _socket_rtp->isSocketBusy() && _origin_socket) {
-                _origin_socket->enableRecv(false);
+            if (_args.enable_origin_recv_limit && _socket_rtp->sockType() == toolkit::SockNum::Sock_TCP && _socket_rtp->isSocketBusy()) {
+                auto muxer = _muxer.lock();
+                if (muxer) {
+                    muxer->pause(MediaSource::NullMediaSource(), true);
+                }
             }
         });
     };

src/Rtp/RtpSender.h

@@ -116,7 +116,6 @@ private:
 
 private:
     bool _is_connect = false;
-    toolkit::Socket::Ptr _origin_socket;
     MediaSourceEvent::SendRtpArgs _args;
     toolkit::Socket::Ptr _socket_rtp;
     toolkit::Socket::Ptr _socket_rtcp;
@@ -127,6 +126,7 @@ private:
     toolkit::Ticker _rtcp_recv_ticker;
     std::shared_ptr<RtpSession> _rtp_session;
     std::function<void(const toolkit::SockException &ex)> _on_close;
+    std::weak_ptr<MultiMediaSourceMuxer> _muxer;
 };
 
 }//namespace mediakit