.gitmodules

@@ -13,6 +13,3 @@
 [submodule "3rdpart/pybind11"]
 	path = 3rdpart/pybind11
 	url = https://gitee.com/mirrors/pybind11.git
-[submodule "python/StreamUI"]
-	path = python/StreamUI
-	url = https://gitee.com/xia-chu/StreamUI.git

.gitmodules_github

@@ -12,7 +12,4 @@
 	url = https://github.com/1002victor/zlm_webassist
 [submodule "3rdpart/pybind11"]
 	path = 3rdpart/pybind11
-	url = https://github.com/pybind/pybind11.git
-[submodule "python/StreamUI"]
-	path = python/StreamUI
-	url = https://github.com/xia-chu/StreamUI.git
+	url = https://github.com/pybind/pybind11.git

CMakeLists.txt

@@ -572,12 +572,6 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/config.ini" DESTINATION ${EXECUTABLE
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/default.pem" DESTINATION ${EXECUTABLE_OUTPUT_PATH})
 if (ENABLE_PYTHON)
   file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/python" DESTINATION ${EXECUTABLE_OUTPUT_PATH})
-  file(GLOB FRONTEND_FILES
-          "${CMAKE_CURRENT_SOURCE_DIR}/python/StreamUI/frontend/*"
-  )
-  file(COPY ${FRONTEND_FILES}
-          DESTINATION "${EXECUTABLE_OUTPUT_PATH}/www/StreamUI/"
-  )
 endif ()
 
 # 拷贝VideoStack 无视频流时默认填充的背景图片

python/StreamUI

@@ -1 +0,0 @@
-Subproject commit d055e925a5c061d3ce785f60f07b59ded08b4e55

python/mk_plugin.py

@@ -1,63 +1,10 @@
 import mk_logger
 import mk_loader
-import asyncio
-import threading
-from StreamUI.backend.main import app
-from starlette.routing import Match
-
-def start_background_loop(loop):
-    asyncio.set_event_loop(loop)
-    loop.run_forever()
-
-loop = asyncio.new_event_loop()
-threading.Thread(target=start_background_loop, args=(loop,), daemon=True).start()
-
-def submit_coro(scope, body, send):
-    async def run():
-        # 包装 send 函数，确保它总是可等待的
-        async def async_send(message):
-            # 调用原始的 send 函数，它现在应该返回一个协程
-            result = send(message)
-            if result is not None:
-                await result
-
-        async def receive():
-            return {
-                "type": "http.request",
-                "body": body,
-                "more_body": False,
-            }
-
-        try:
-            await app(scope, receive, async_send)
-        except Exception as e:
-            mk_logger.log_warn(f"FastAPI failed: {e}")
-            # 发送错误响应
-            await async_send({
-                "type": "http.response.start",
-                "status": 500,
-                "headers": [(b"content-type", b"text/plain")],
-            })
-            await async_send({
-                "type": "http.response.body",
-                "body": b"Internal Server Error",
-                "more_body": False,
-            })
-    return asyncio.run_coroutine_threadsafe(run(), loop)
-
-def check_route(scope) -> bool:
-    for route in app.routes:
-        if hasattr(route, "matches"):
-            match, _ = route.matches(scope)
-            if match == Match.FULL:
-                return True
-    return False
 
 def on_start():
     mk_logger.log_info(f"on_start, secret: {mk_loader.get_config('api.secret')}")
-    # mk_loader.set_config('api.secret', "new_secret_from_python")
-    # mk_loader.update_config()
-    mk_loader.set_fastapi(check_route, submit_coro)
+    mk_loader.set_config('api.secret', "new_secret_from_python")
+    mk_loader.update_config()
 
 def on_exit():
     mk_logger.log_info("on_exit")

server/pyinvoker.cpp

@@ -8,8 +8,6 @@
 #include <string>
 #include <type_traits>
 #include "WebHook.h"
-#include "Common/Parser.h"
-#include "Http/HttpSession.h"
 
 using namespace toolkit;
 using namespace mediakit;
@@ -89,55 +87,6 @@ mINI to_native(const py::dict &opt) {
     return ret;
 }
 
-void handle_http_request(const py::object &check_route, const py::object &submit_coro, const Parser &parser, const HttpSession::HttpResponseInvoker &invoker, bool &consumed, toolkit::SockInfo &sender) {
-    py::gil_scoped_acquire guard;
-
-    py::dict scope;
-    scope["type"] = "http";
-    scope["http_version"] = "1.1";
-    scope["method"] = parser.method();
-    scope["path"] = parser.url();
-    scope["query_string"] = parser.params();
-    py::list hdrs;
-    for (auto &kv : parser.getHeader()) {
-        hdrs.append(py::make_tuple(py::bytes(kv.first), py::bytes(kv.second)));
-    }
-    scope["headers"] = hdrs;
-
-    bool ok = check_route(scope).cast<bool>();
-    if (!ok) {
-        return;
-    }
-    consumed = true;
-
-    StrCaseMap resp_headers;
-    std::string resp_body;
-    int status = 500;
-    auto send = py::cpp_function([invoker, status, resp_body, resp_headers](const py::dict &msg) mutable {
-        auto type = msg["type"].cast<std::string>();
-        if (type == "http.response.start") {
-            status = msg["status"].cast<int>();
-            for (auto tup : msg["headers"].cast<py::list>()) {
-                auto t = tup.cast<py::tuple>();
-                resp_headers[t[0].cast<std::string>()] = t[1].cast<std::string>();
-            }
-            return;
-        }
-
-        if (type == "http.response.body") {
-            resp_body += msg["body"].cast<std::string>();
-            // 💥 只在 more_body=False 时回调
-            bool more = msg.contains("more_body") && msg["more_body"].cast<bool>();
-            if (!more) {
-                invoker(status, resp_headers, resp_body);
-            }
-        }
-    });
-
-    submit_coro(scope, py::bytes(parser.content()), send);
-}
-
-
 PYBIND11_EMBEDDED_MODULE(mk_loader, m) {
     m.def("log", [](int lev, const char *file, int line, const char *func, const char *content) {
         py::gil_scoped_release release;
@@ -177,15 +126,6 @@ PYBIND11_EMBEDDED_MODULE(mk_loader, m) {
         auto &invoker = to_native<Broadcast::AuthInvoker>(cap);
         invoker(err);
     });
-
-    m.def("set_fastapi", [](const py::object &check_route, const py::object &submit_coro) {
-        static void *fastapi_tag = nullptr;
-        NoticeCenter::Instance().delListener(&fastapi_tag, Broadcast::kBroadcastHttpRequest);
-        NoticeCenter::Instance().addListener(&fastapi_tag, Broadcast::kBroadcastHttpRequest, [check_route, submit_coro](BroadcastHttpRequestArgs) {
-            handle_http_request(check_route, submit_coro, parser, invoker, consumed, sender);
-        });
-    });
-
 }
 
 namespace mediakit {
@@ -228,7 +168,6 @@ PythonInvoker::PythonInvoker() {
     _rel = new py::gil_scoped_release;
 
     NoticeCenter::Instance().addListener(this, Broadcast::kBroadcastReloadConfig, [this] (BroadcastReloadConfigArgs) {
-        py::gil_scoped_acquire guard;
         if (_on_reload_config) {
             _on_reload_config();
         }

src/Http/HttpSession.cpp

@@ -61,7 +61,6 @@ ssize_t HttpSession::onRecvHeader(const char *header, size_t len) {
     static onceToken token([]() {
         s_func_map.emplace("GET", &HttpSession::onHttpRequest_GET);
         s_func_map.emplace("POST", &HttpSession::onHttpRequest_POST);
-        s_func_map.emplace("PUT", &HttpSession::onHttpRequest_POST);
         // DELETE命令用于whip/whep用，只用于触发http api  [AUTO-TRANSLATED:f3b7aaea]
         // DELETE command is used for whip/whep, only used to trigger http api
         s_func_map.emplace("DELETE", &HttpSession::onHttpRequest_POST);