Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Editor/Include/Editor/WebUIServer.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ namespace Editor {

void Start();
void Stop();
const std::string& BaseUrl() const;

private:
Common::UniquePtr<Common::NamedThread> serverThread;
Common::UniquePtr<httplib::Server> server;
WebUIServer();

std::string baseUrl;
Common::UniquePtr<Common::NamedThread> productServerThread;
Common::UniquePtr<httplib::Server> productServer;
};
}
6 changes: 5 additions & 1 deletion Editor/Src/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//

#include <QApplication>
#include <QNetworkProxy>

#include <Core/Cmdline.h>
#include <Runtime/Engine.h>
Expand Down Expand Up @@ -73,7 +74,10 @@ static void InitializePreQtApp(EditorApplicationModel inModel)
Runtime::EngineHolder::Load("Editor", params);
}

static void InitializePostQtApp() {}
static void InitializePostQtApp()
{
QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy);
}

static void Cleanup(EditorApplicationModel inModel)
{
Expand Down
63 changes: 51 additions & 12 deletions Editor/Src/WebUIServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,76 @@
// Created by johnk on 2025/8/8.
//

#include <Editor/WebUIServer.h>
#include <Core/Cmdline.h>
#include <Core/Log.h>
#include <Editor/WebUIServer.h>

static Core::CmdlineArgValue<uint32_t> caWebUIPort(
"webUIPort", "-webUIPort", 10907,
"WebUI port");

static Core::CmdlineArgValue<bool> caWebUIDev(
"webUIDev", "-webUIDev", false,
"Whether to enable hot reload for web UI");

static Core::CmdlineArgValue<uint32_t> caWebUIDevServerPort(
"webUIDevServerPort", "-webUIDevServerPort", 5173,
"Port of web ui dev server, which works only when dev mode enabled");

namespace Editor {
WebUIServer& WebUIServer::Get()
{
static WebUIServer webUIServer;
return webUIServer;
}

WebUIServer::WebUIServer() = default;

void WebUIServer::Start()
{
serverThread = std::make_unique<Common::NamedThread>("WebUIServerThread", [this]() -> void {
server = Common::MakeUnique<httplib::Server>();
server->set_mount_point("/", "./Web");
server->Get("/(.+)", [](const httplib::Request&, httplib::Response& res) {
res.set_file_content("./Web/index.html");
uint32_t serverPort;
std::string serverMode;

if (caWebUIDev.GetValue()) {
serverPort = caWebUIDevServerPort.GetValue();
serverMode = "development";

httplib::Client client(std::format("http://localhost:{}", serverPort));
auto res = client.Get("/");
AssertWithReason(
res->status == 200,
"did you forget to start dev server, just call Script/start_editor_web_dev_server.py manually");
} else {
serverPort = caWebUIPort.GetValue();
serverMode = "product";
productServerThread = std::make_unique<Common::NamedThread>("WebUIServerThread", [this, serverPort]() -> void {
productServer = Common::MakeUnique<httplib::Server>();
productServer->set_mount_point("/", "./Web");
productServer->Get("/(.+)", [](const httplib::Request&, httplib::Response& res) {
res.set_file_content("./Web/index.html");
});
productServer->listen("localhost", static_cast<int32_t>(serverPort));
});
server->listen("localhost", caWebUIPort.GetValue());
});
}

baseUrl = std::format("http://localhost:{}", serverPort);
LogInfo(WebUI, "{} web ui server listening on {}", serverMode, baseUrl);
}

void WebUIServer::Stop()
{
server->stop();
serverThread->Join();
server.Reset();
serverThread.Reset();
if (productServer.Valid()) {
productServer->stop();
}
if (productServerThread.Valid()) {
productServerThread->Join();
}
productServer.Reset();
productServerThread.Reset();
}

const std::string& WebUIServer::BaseUrl() const
{
return baseUrl;
}
} // namespace Editor
15 changes: 4 additions & 11 deletions Editor/Src/Widget/WebWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,9 @@
//

#include <Editor/Widget/WebWidget.h>
#include <Core/Cmdline.h>
#include <Editor/Widget/moc_WebWidget.cpp>

static Core::CmdlineArgValue<bool> caWebUIDev(
"webUIDev", "-webUIDev", false,
"Whether to enable hot reload for web UI");

static Core::CmdlineArgValue<uint32_t> caWebUIDevServerPort(
"webUIDevServerPort", "-webUIDevServerPort", 5173,
"Port of web ui dev server, which works only when dev mode enabled");
#include <Core/Cmdline.h>
#include <Editor/WebUIServer.h>

namespace Editor {
WebWidget::WebWidget(QWidget* inParent)
Expand All @@ -29,8 +22,8 @@ namespace Editor {
static Core::CmdlineArg& caWebUIPort = Core::Cli::Get().GetArg("webUIPort");

Assert(inUrl.starts_with("/"));
const std::string baseUrl = std::format("http://localhost:{}", caWebUIDev.GetValue() ? caWebUIDevServerPort.GetValue() : caWebUIPort.GetValue<uint32_t>());
const std::string fullUrl = baseUrl + inUrl;
const auto& baseUrl = WebUIServer::Get().BaseUrl();
const auto fullUrl = baseUrl + inUrl;
load(QUrl(fullUrl.c_str()));
}

Expand Down
Loading