mirror of
https://github.com/kunkundi/crossdesk.git
synced 2025-12-23 00:19:40 +08:00
Compare commits
9 Commits
web-client
...
757ca330b8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
757ca330b8 | ||
|
|
640a65465e | ||
|
|
e3c2edfb1c | ||
|
|
f3901d09ea | ||
|
|
2b12749477 | ||
|
|
759488f675 | ||
|
|
4bb4240a9e | ||
|
|
1457247a6a | ||
|
|
97ab9bfca5 |
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@@ -55,7 +55,7 @@ jobs:
|
|||||||
XMAKE_GLOBALDIR: /data
|
XMAKE_GLOBALDIR: /data
|
||||||
run: |
|
run: |
|
||||||
ls -la $XMAKE_GLOBALDIR
|
ls -la $XMAKE_GLOBALDIR
|
||||||
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --root -y
|
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --USE_CUDA=true --root -y
|
||||||
xmake b -vy --root crossdesk
|
xmake b -vy --root crossdesk
|
||||||
|
|
||||||
- name: Decode and save certificate
|
- name: Decode and save certificate
|
||||||
@@ -120,7 +120,7 @@ jobs:
|
|||||||
CUDA_PATH: /usr/local/cuda
|
CUDA_PATH: /usr/local/cuda
|
||||||
XMAKE_GLOBALDIR: /data
|
XMAKE_GLOBALDIR: /data
|
||||||
run: |
|
run: |
|
||||||
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --root -y
|
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --USE_CUDA=true --root -y
|
||||||
xmake b -vy --root crossdesk
|
xmake b -vy --root crossdesk
|
||||||
|
|
||||||
- name: Decode and save certificate
|
- name: Decode and save certificate
|
||||||
@@ -189,7 +189,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build CrossDesk
|
- name: Build CrossDesk
|
||||||
run: |
|
run: |
|
||||||
xmake f --CROSSDESK_VERSION=${VERSION_NUM} -y
|
xmake f --CROSSDESK_VERSION=${VERSION_NUM} --USE_CUDA=true -y
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
|
|
||||||
- name: Decode and save certificate
|
- name: Decode and save certificate
|
||||||
@@ -298,7 +298,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build CrossDesk
|
- name: Build CrossDesk
|
||||||
run: |
|
run: |
|
||||||
xmake f --CROSSDESK_VERSION=${{ env.VERSION_NUM }} -y
|
xmake f --CROSSDESK_VERSION=${{ env.VERSION_NUM }} --USE_CUDA=true -y
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
|
|
||||||
- name: Decode and save certificate
|
- name: Decode and save certificate
|
||||||
|
|||||||
17
README.md
17
README.md
@@ -11,8 +11,14 @@
|
|||||||
|
|
||||||
[ [English](README_EN.md) / 中文 ]
|
[ [English](README_EN.md) / 中文 ]
|
||||||
|
|
||||||
|
PC 客户端
|
||||||

|

|
||||||
|
|
||||||
|
Web 客户端
|
||||||
|
<p align="center">
|
||||||
|
<img width="850" height="550" alt="6bddcbed47ffd4b9988a4037c7f4f524" src="https://github.com/user-attachments/assets/e44f73f9-24ac-46a3-a189-b7f8b6669881" />
|
||||||
|
</p>
|
||||||
|
|
||||||
## 简介
|
## 简介
|
||||||
|
|
||||||
CrossDesk 是一个轻量级的跨平台远程桌面软件,支持 Web 端控制远程设备。
|
CrossDesk 是一个轻量级的跨平台远程桌面软件,支持 Web 端控制远程设备。
|
||||||
@@ -70,7 +76,14 @@ git submodule update
|
|||||||
|
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
```
|
```
|
||||||
|
编译选项
|
||||||
|
```
|
||||||
|
--USE_CUDA=true/false: 启用 CUDA 硬件编解码,默认不启用
|
||||||
|
--CROSSDESK_VERSION=xxx: 指定 CrossDesk 的版本
|
||||||
|
|
||||||
|
# 示例
|
||||||
|
xmake f --CROSSDESK_VERSION=1.0.0 --USE_CUDA=true
|
||||||
|
```
|
||||||
运行
|
运行
|
||||||
```
|
```
|
||||||
xmake r crossdesk
|
xmake r crossdesk
|
||||||
@@ -78,13 +91,14 @@ xmake r crossdesk
|
|||||||
|
|
||||||
### 无 CUDA 环境下的开发支持
|
### 无 CUDA 环境下的开发支持
|
||||||
|
|
||||||
对于**未安装 CUDA 环境的 Linux 开发者**,这里提供了预配置的 [Ubuntu 22.04 Docker 镜像](https://hub.docker.com/r/crossdesk/ubuntu22.04)。该镜像内置必要的构建依赖,可在容器中开箱即用,无需额外配置即可直接编译项目。
|
对于**未安装 CUDA 环境的 Linux 开发者,如果希望编译后的成果物拥有硬件编解码能力**,这里提供了预配置的 [Ubuntu 22.04 Docker 镜像](https://hub.docker.com/r/crossdesk/ubuntu22.04)。该镜像内置必要的构建依赖,可在容器中开箱即用,无需额外配置即可直接编译项目。
|
||||||
|
|
||||||
进入容器,下载工程后执行:
|
进入容器,下载工程后执行:
|
||||||
```
|
```
|
||||||
export CUDA_PATH=/usr/local/cuda
|
export CUDA_PATH=/usr/local/cuda
|
||||||
export XMAKE_GLOBALDIR=/data
|
export XMAKE_GLOBALDIR=/data
|
||||||
|
|
||||||
|
xmake f --USE_CUDA=true
|
||||||
xmake b --root -vy crossdesk
|
xmake b --root -vy crossdesk
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -106,6 +120,7 @@ set CUDA_PATH=path_to_cuda_installdir
|
|||||||
```
|
```
|
||||||
重新执行:
|
重新执行:
|
||||||
```
|
```
|
||||||
|
xmake f --USE_CUDA=true
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
17
README_EN.md
17
README_EN.md
@@ -11,8 +11,14 @@
|
|||||||
|
|
||||||
[ [中文](README.md) / English ]
|
[ [中文](README.md) / English ]
|
||||||
|
|
||||||
|
PC Client
|
||||||

|

|
||||||
|
|
||||||
|
Web Client
|
||||||
|
<p align="center">
|
||||||
|
<img width="850" height="550" alt="6bddcbed47ffd4b9988a4037c7f4f524" src="https://github.com/user-attachments/assets/e44f73f9-24ac-46a3-a189-b7f8b6669881" />
|
||||||
|
</p>
|
||||||
|
|
||||||
# Intro
|
# Intro
|
||||||
|
|
||||||
CrossDesk is a lightweight cross-platform remote desktop software.
|
CrossDesk is a lightweight cross-platform remote desktop software.
|
||||||
@@ -73,7 +79,14 @@ git submodule update
|
|||||||
|
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
```
|
```
|
||||||
|
Build options:
|
||||||
|
```
|
||||||
|
--USE_CUDA=true/false: enable CUDA acceleration codec, default: false
|
||||||
|
--CROSSDESK_VERSION=xxx: set the version number
|
||||||
|
|
||||||
|
# example:
|
||||||
|
xmake f --CROSSDESK_VERSION=1.0.0 --USE_CUDA=true
|
||||||
|
```
|
||||||
Run:
|
Run:
|
||||||
```
|
```
|
||||||
xmake r crossdesk
|
xmake r crossdesk
|
||||||
@@ -81,7 +94,7 @@ xmake r crossdesk
|
|||||||
|
|
||||||
#### Development Without CUDA Environment
|
#### Development Without CUDA Environment
|
||||||
|
|
||||||
For **Linux developers who do not have a CUDA environment** installed, a preconfigured [Ubuntu 22.04 Docker image](https://hub.docker.com/r/crossdesk/ubuntu22.04) is provided.
|
For **Linux developers who do not have a CUDA environment installed and want to enable hardware codec feature**, a preconfigured [Ubuntu 22.04 Docker image](https://hub.docker.com/r/crossdesk/ubuntu22.04) is provided.
|
||||||
This image comes with all required build dependencies and allows you to build the project directly inside the container without any additional setup.
|
This image comes with all required build dependencies and allows you to build the project directly inside the container without any additional setup.
|
||||||
|
|
||||||
After entering the container, download the project and run:
|
After entering the container, download the project and run:
|
||||||
@@ -89,6 +102,7 @@ After entering the container, download the project and run:
|
|||||||
export CUDA_PATH=/usr/local/cuda
|
export CUDA_PATH=/usr/local/cuda
|
||||||
export XMAKE_GLOBALDIR=/data
|
export XMAKE_GLOBALDIR=/data
|
||||||
|
|
||||||
|
xmake f --USE_CUDA=true
|
||||||
xmake b --root -vy crossdesk
|
xmake b --root -vy crossdesk
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -111,6 +125,7 @@ set CUDA_PATH=path_to_cuda_installdir:
|
|||||||
```
|
```
|
||||||
Then re-run:
|
Then re-run:
|
||||||
```
|
```
|
||||||
|
xmake f --USE_CUDA=true
|
||||||
xmake b -vy crossdesk
|
xmake b -vy crossdesk
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
313
src/app/daemon.cpp
Normal file
313
src/app/daemon.cpp
Normal file
@@ -0,0 +1,313 @@
|
|||||||
|
#include "daemon.h"
|
||||||
|
|
||||||
|
#include <atomic>
|
||||||
|
#include <chrono>
|
||||||
|
#include <cstring>
|
||||||
|
#include <iostream>
|
||||||
|
#include <thread>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <process.h>
|
||||||
|
#include <tchar.h>
|
||||||
|
#include <windows.h>
|
||||||
|
#elif __APPLE__
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <mach-o/dyld.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#else
|
||||||
|
#include <errno.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
Daemon* Daemon::instance_ = nullptr;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// get executable file path
|
||||||
|
static std::string GetExecutablePath() {
|
||||||
|
#ifdef _WIN32
|
||||||
|
char path[32768];
|
||||||
|
DWORD length = GetModuleFileNameA(nullptr, path, sizeof(path));
|
||||||
|
if (length > 0 && length < sizeof(path)) {
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#elif __APPLE__
|
||||||
|
char path[PATH_MAX];
|
||||||
|
uint32_t size = sizeof(path);
|
||||||
|
if (_NSGetExecutablePath(path, &size) == 0) {
|
||||||
|
char resolved_path[PATH_MAX];
|
||||||
|
if (realpath(path, resolved_path) != nullptr) {
|
||||||
|
return std::string(resolved_path);
|
||||||
|
}
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
char path[PATH_MAX];
|
||||||
|
ssize_t count = readlink("/proc/self/exe", path, sizeof(path) - 1);
|
||||||
|
if (count != -1) {
|
||||||
|
path[count] = '\0';
|
||||||
|
return std::string(path);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
Daemon::Daemon(const std::string& name)
|
||||||
|
: name_(name)
|
||||||
|
#ifdef _WIN32
|
||||||
|
,
|
||||||
|
running_(false)
|
||||||
|
#else
|
||||||
|
,
|
||||||
|
running_(true)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void Daemon::stop() { running_ = false; }
|
||||||
|
|
||||||
|
bool Daemon::isRunning() const { return running_; }
|
||||||
|
|
||||||
|
bool Daemon::start(MainLoopFunc loop) {
|
||||||
|
#ifdef _WIN32
|
||||||
|
running_ = true;
|
||||||
|
return runWithRestart(loop);
|
||||||
|
#elif __APPLE__
|
||||||
|
// macOS: Use child process monitoring (like Windows) to preserve GUI
|
||||||
|
running_ = true;
|
||||||
|
return runWithRestart(loop);
|
||||||
|
#else
|
||||||
|
// linux: Daemonize first, then run with restart monitoring
|
||||||
|
instance_ = this;
|
||||||
|
|
||||||
|
// check if running from terminal before fork
|
||||||
|
bool from_terminal =
|
||||||
|
(isatty(STDIN_FILENO) != 0) || (isatty(STDOUT_FILENO) != 0);
|
||||||
|
|
||||||
|
// first fork: detach from terminal
|
||||||
|
pid_t pid = fork();
|
||||||
|
if (pid < 0) {
|
||||||
|
std::cerr << "Failed to fork daemon process" << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (pid > 0) _exit(0);
|
||||||
|
|
||||||
|
if (setsid() < 0) {
|
||||||
|
std::cerr << "Failed to create new session" << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
pid = fork();
|
||||||
|
if (pid < 0) {
|
||||||
|
std::cerr << "Failed to fork daemon process (second fork)" << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (pid > 0) _exit(0);
|
||||||
|
|
||||||
|
umask(0);
|
||||||
|
chdir("/");
|
||||||
|
|
||||||
|
// redirect file descriptors: keep stdout/stderr if from terminal, else
|
||||||
|
// redirect to /dev/null
|
||||||
|
int fd = open("/dev/null", O_RDWR);
|
||||||
|
if (fd >= 0) {
|
||||||
|
dup2(fd, STDIN_FILENO);
|
||||||
|
if (!from_terminal) {
|
||||||
|
dup2(fd, STDOUT_FILENO);
|
||||||
|
dup2(fd, STDERR_FILENO);
|
||||||
|
}
|
||||||
|
if (fd > 2) close(fd);
|
||||||
|
}
|
||||||
|
|
||||||
|
// set up signal handlers
|
||||||
|
signal(SIGTERM, [](int) {
|
||||||
|
if (instance_) instance_->stop();
|
||||||
|
});
|
||||||
|
signal(SIGINT, [](int) {
|
||||||
|
if (instance_) instance_->stop();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ignore SIGPIPE
|
||||||
|
signal(SIGPIPE, SIG_IGN);
|
||||||
|
|
||||||
|
// set up SIGCHLD handler to reap zombie processes
|
||||||
|
struct sigaction sa_chld;
|
||||||
|
sa_chld.sa_handler = [](int) {
|
||||||
|
// reap zombie processes
|
||||||
|
while (waitpid(-1, nullptr, WNOHANG) > 0) {
|
||||||
|
// continue until no more zombie children
|
||||||
|
}
|
||||||
|
};
|
||||||
|
sigemptyset(&sa_chld.sa_mask);
|
||||||
|
sa_chld.sa_flags = SA_RESTART | SA_NOCLDSTOP;
|
||||||
|
sigaction(SIGCHLD, &sa_chld, nullptr);
|
||||||
|
|
||||||
|
running_ = true;
|
||||||
|
return runWithRestart(loop);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
static int RunLoopCatchCpp(Daemon::MainLoopFunc& loop) {
|
||||||
|
try {
|
||||||
|
loop();
|
||||||
|
return 0; // normal exit
|
||||||
|
} catch (const std::exception& e) {
|
||||||
|
std::cerr << "Exception caught: " << e.what() << std::endl;
|
||||||
|
return 1; // c++ exception
|
||||||
|
} catch (...) {
|
||||||
|
std::cerr << "Unknown exception caught" << std::endl;
|
||||||
|
return 1; // other exception
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int RunLoopWithSEH(Daemon::MainLoopFunc& loop) {
|
||||||
|
__try {
|
||||||
|
return RunLoopCatchCpp(loop);
|
||||||
|
} __except (EXCEPTION_EXECUTE_HANDLER) {
|
||||||
|
// catch system-level crashes (access violation, divide by zero, etc.)
|
||||||
|
DWORD code = GetExceptionCode();
|
||||||
|
std::cerr << "System crash detected (SEH exception code: 0x" << std::hex
|
||||||
|
<< code << std::dec << ")" << std::endl;
|
||||||
|
return 2; // System crash
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// run with restart logic: parent monitors child process and restarts on crash
|
||||||
|
bool Daemon::runWithRestart(MainLoopFunc loop) {
|
||||||
|
int restart_count = 0;
|
||||||
|
std::string exe_path = GetExecutablePath();
|
||||||
|
if (exe_path.empty()) {
|
||||||
|
std::cerr
|
||||||
|
<< "Failed to get executable path, falling back to direct execution"
|
||||||
|
<< std::endl;
|
||||||
|
while (isRunning()) {
|
||||||
|
try {
|
||||||
|
loop();
|
||||||
|
break;
|
||||||
|
} catch (...) {
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Exception caught, restarting... (attempt "
|
||||||
|
<< restart_count << ")" << std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (isRunning()) {
|
||||||
|
#ifdef _WIN32
|
||||||
|
// windows: use CreateProcess to create child process
|
||||||
|
STARTUPINFOA si = {sizeof(si)};
|
||||||
|
PROCESS_INFORMATION pi = {0};
|
||||||
|
|
||||||
|
std::string cmd_line = "\"" + exe_path + "\" --child";
|
||||||
|
std::vector<char> cmd_line_buf(cmd_line.begin(), cmd_line.end());
|
||||||
|
cmd_line_buf.push_back('\0');
|
||||||
|
|
||||||
|
BOOL success = CreateProcessA(
|
||||||
|
nullptr, // executable file path (specified in command line)
|
||||||
|
cmd_line_buf.data(), // command line arguments
|
||||||
|
nullptr, // process security attributes
|
||||||
|
nullptr, // thread security attributes
|
||||||
|
FALSE, // don't inherit handles
|
||||||
|
0, // creation flags
|
||||||
|
nullptr, // environment variables (inherit from parent)
|
||||||
|
nullptr, // current directory
|
||||||
|
&si, // startup info
|
||||||
|
&pi // process information
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!success) {
|
||||||
|
std::cerr << "Failed to create child process, error: " << GetLastError()
|
||||||
|
<< std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
restart_count++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
DWORD exit_code = 0;
|
||||||
|
WaitForSingleObject(pi.hProcess, INFINITE);
|
||||||
|
GetExitCodeProcess(pi.hProcess, &exit_code);
|
||||||
|
CloseHandle(pi.hProcess);
|
||||||
|
CloseHandle(pi.hThread);
|
||||||
|
|
||||||
|
if (exit_code == 0) {
|
||||||
|
break; // normal exit
|
||||||
|
}
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Child process exited with code " << exit_code
|
||||||
|
<< ", restarting... (attempt " << restart_count << ")"
|
||||||
|
<< std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
#else
|
||||||
|
// linux: use fork + exec to create child process
|
||||||
|
pid_t pid = fork();
|
||||||
|
if (pid == 0) {
|
||||||
|
execl(exe_path.c_str(), exe_path.c_str(), "--child", nullptr);
|
||||||
|
_exit(1); // exec failed
|
||||||
|
} else if (pid > 0) {
|
||||||
|
int status = 0;
|
||||||
|
pid_t waited_pid = waitpid(pid, &status, 0);
|
||||||
|
|
||||||
|
if (waited_pid < 0) {
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "waitpid failed, errno: " << errno
|
||||||
|
<< ", restarting... (attempt " << restart_count << ")"
|
||||||
|
<< std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (WIFEXITED(status)) {
|
||||||
|
int exit_code = WEXITSTATUS(status);
|
||||||
|
if (exit_code == 0) {
|
||||||
|
break; // normal exit
|
||||||
|
}
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Child process exited with code " << exit_code
|
||||||
|
<< ", restarting... (attempt " << restart_count << ")"
|
||||||
|
<< std::endl;
|
||||||
|
} else if (WIFSIGNALED(status)) {
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Child process crashed with signal " << WTERMSIG(status)
|
||||||
|
<< ", restarting... (attempt " << restart_count << ")"
|
||||||
|
<< std::endl;
|
||||||
|
} else {
|
||||||
|
restart_count++;
|
||||||
|
std::cerr << "Child process exited with unknown status, restarting... "
|
||||||
|
"(attempt "
|
||||||
|
<< restart_count << ")" << std::endl;
|
||||||
|
}
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
} else {
|
||||||
|
std::cerr << "Failed to fork child process" << std::endl;
|
||||||
|
std::this_thread::sleep_for(
|
||||||
|
std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
|
||||||
|
restart_count++;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
39
src/app/daemon.h
Normal file
39
src/app/daemon.h
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* @Author: DI JUNKUN
|
||||||
|
* @Date: 2025-11-19
|
||||||
|
* Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _DAEMON_H_
|
||||||
|
#define _DAEMON_H_
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#define DAEMON_DEFAULT_RESTART_DELAY_MS 1000
|
||||||
|
|
||||||
|
class Daemon {
|
||||||
|
public:
|
||||||
|
using MainLoopFunc = std::function<void()>;
|
||||||
|
|
||||||
|
Daemon(const std::string& name);
|
||||||
|
|
||||||
|
bool start(MainLoopFunc loop);
|
||||||
|
|
||||||
|
void stop();
|
||||||
|
|
||||||
|
bool isRunning() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::string name_;
|
||||||
|
bool runWithRestart(MainLoopFunc loop);
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
bool running_;
|
||||||
|
#else
|
||||||
|
static Daemon* instance_;
|
||||||
|
volatile bool running_;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -6,12 +6,61 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "rd_log.h"
|
#include <cstring>
|
||||||
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include "config_center.h"
|
||||||
|
#include "daemon.h"
|
||||||
|
#include "path_manager.h"
|
||||||
#include "render.h"
|
#include "render.h"
|
||||||
|
|
||||||
int main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
|
// check if running as child process
|
||||||
|
bool is_child = false;
|
||||||
|
for (int i = 1; i < argc; i++) {
|
||||||
|
if (strcmp(argv[i], "--child") == 0) {
|
||||||
|
is_child = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_child) {
|
||||||
|
// child process: run render directly
|
||||||
|
crossdesk::Render render;
|
||||||
|
render.Run();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool enable_daemon = false;
|
||||||
|
auto path_manager = std::make_unique<crossdesk::PathManager>("CrossDesk");
|
||||||
|
if (path_manager) {
|
||||||
|
std::string cert_path =
|
||||||
|
(path_manager->GetCertPath() / "crossdesk.cn_root.crt").string();
|
||||||
|
std::string cache_path = path_manager->GetCachePath().string();
|
||||||
|
crossdesk::ConfigCenter config_center(cache_path + "/config.ini",
|
||||||
|
cert_path);
|
||||||
|
enable_daemon = config_center.IsEnableDaemon();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (enable_daemon) {
|
||||||
|
// start daemon with restart monitoring
|
||||||
|
Daemon daemon("CrossDesk");
|
||||||
|
|
||||||
|
// define main loop function: run render and stop daemon on normal exit
|
||||||
|
Daemon::MainLoopFunc main_loop = [&daemon]() {
|
||||||
|
crossdesk::Render render;
|
||||||
|
render.Run();
|
||||||
|
daemon.stop();
|
||||||
|
};
|
||||||
|
|
||||||
|
// start daemon and return result
|
||||||
|
bool success = daemon.start(main_loop);
|
||||||
|
return success ? 0 : 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// run without daemon: direct execution
|
||||||
crossdesk::Render render;
|
crossdesk::Render render;
|
||||||
render.Run();
|
render.Run();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -53,6 +53,7 @@ int ConfigCenter::Load() {
|
|||||||
ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
||||||
enable_autostart_ =
|
enable_autostart_ =
|
||||||
ini_.GetBoolValue(section_, "enable_autostart", enable_autostart_);
|
ini_.GetBoolValue(section_, "enable_autostart", enable_autostart_);
|
||||||
|
enable_daemon_ = ini_.GetBoolValue(section_, "enable_daemon", enable_daemon_);
|
||||||
enable_minimize_to_tray_ = ini_.GetBoolValue(
|
enable_minimize_to_tray_ = ini_.GetBoolValue(
|
||||||
section_, "enable_minimize_to_tray", enable_minimize_to_tray_);
|
section_, "enable_minimize_to_tray", enable_minimize_to_tray_);
|
||||||
|
|
||||||
@@ -76,6 +77,7 @@ int ConfigCenter::Save() {
|
|||||||
ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
|
ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
|
||||||
ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
|
||||||
ini_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
|
ini_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
|
||||||
|
ini_.SetBoolValue(section_, "enable_daemon", enable_daemon_);
|
||||||
ini_.SetBoolValue(section_, "enable_minimize_to_tray",
|
ini_.SetBoolValue(section_, "enable_minimize_to_tray",
|
||||||
enable_minimize_to_tray_);
|
enable_minimize_to_tray_);
|
||||||
|
|
||||||
@@ -249,6 +251,18 @@ int ConfigCenter::SetAutostart(bool enable_autostart) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ConfigCenter::SetDaemon(bool enable_daemon) {
|
||||||
|
enable_daemon_ = enable_daemon;
|
||||||
|
|
||||||
|
ini_.SetBoolValue(section_, "enable_daemon", enable_daemon_);
|
||||||
|
SI_Error rc = ini_.SaveFile(config_path_.c_str());
|
||||||
|
if (rc < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
// getters
|
// getters
|
||||||
|
|
||||||
ConfigCenter::LANGUAGE ConfigCenter::GetLanguage() const { return language_; }
|
ConfigCenter::LANGUAGE ConfigCenter::GetLanguage() const { return language_; }
|
||||||
@@ -304,4 +318,6 @@ bool ConfigCenter::IsSelfHosted() const { return enable_self_hosted_; }
|
|||||||
bool ConfigCenter::IsMinimizeToTray() const { return enable_minimize_to_tray_; }
|
bool ConfigCenter::IsMinimizeToTray() const { return enable_minimize_to_tray_; }
|
||||||
|
|
||||||
bool ConfigCenter::IsEnableAutostart() const { return enable_autostart_; }
|
bool ConfigCenter::IsEnableAutostart() const { return enable_autostart_; }
|
||||||
|
|
||||||
|
bool ConfigCenter::IsEnableDaemon() const { return enable_daemon_; }
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
@@ -41,6 +41,7 @@ class ConfigCenter {
|
|||||||
int SetSelfHosted(bool enable_self_hosted);
|
int SetSelfHosted(bool enable_self_hosted);
|
||||||
int SetMinimizeToTray(bool enable_minimize_to_tray);
|
int SetMinimizeToTray(bool enable_minimize_to_tray);
|
||||||
int SetAutostart(bool enable_autostart);
|
int SetAutostart(bool enable_autostart);
|
||||||
|
int SetDaemon(bool enable_daemon);
|
||||||
|
|
||||||
// read config
|
// read config
|
||||||
|
|
||||||
@@ -62,6 +63,7 @@ class ConfigCenter {
|
|||||||
bool IsSelfHosted() const;
|
bool IsSelfHosted() const;
|
||||||
bool IsMinimizeToTray() const;
|
bool IsMinimizeToTray() const;
|
||||||
bool IsEnableAutostart() const;
|
bool IsEnableAutostart() const;
|
||||||
|
bool IsEnableDaemon() const;
|
||||||
|
|
||||||
int Load();
|
int Load();
|
||||||
int Save();
|
int Save();
|
||||||
@@ -89,6 +91,7 @@ class ConfigCenter {
|
|||||||
bool enable_self_hosted_ = false;
|
bool enable_self_hosted_ = false;
|
||||||
bool enable_minimize_to_tray_ = false;
|
bool enable_minimize_to_tray_ = false;
|
||||||
bool enable_autostart_ = false;
|
bool enable_autostart_ = false;
|
||||||
|
bool enable_daemon_ = false;
|
||||||
};
|
};
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
#endif
|
#endif
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -20,6 +20,15 @@
|
|||||||
#define INPUT_WINDOW_PADDING_EN 96
|
#define INPUT_WINDOW_PADDING_EN 96
|
||||||
#define SETTINGS_WINDOW_WIDTH_CN 202
|
#define SETTINGS_WINDOW_WIDTH_CN 202
|
||||||
#define SETTINGS_WINDOW_WIDTH_EN 248
|
#define SETTINGS_WINDOW_WIDTH_EN 248
|
||||||
|
#if USE_CUDA
|
||||||
|
#if _WIN32
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_CN 405
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_EN 405
|
||||||
|
#else
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_CN 375
|
||||||
|
#define SETTINGS_WINDOW_HEIGHT_EN 375
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
#define SETTINGS_WINDOW_HEIGHT_CN 375
|
#define SETTINGS_WINDOW_HEIGHT_CN 375
|
||||||
#define SETTINGS_WINDOW_HEIGHT_EN 375
|
#define SETTINGS_WINDOW_HEIGHT_EN 375
|
||||||
@@ -27,6 +36,7 @@
|
|||||||
#define SETTINGS_WINDOW_HEIGHT_CN 345
|
#define SETTINGS_WINDOW_HEIGHT_CN 345
|
||||||
#define SETTINGS_WINDOW_HEIGHT_EN 345
|
#define SETTINGS_WINDOW_HEIGHT_EN 345
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228
|
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228
|
||||||
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275
|
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275
|
||||||
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 195
|
#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 195
|
||||||
@@ -49,6 +59,8 @@
|
|||||||
#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218
|
#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218
|
||||||
#define ENABLE_AUTOSTART_PADDING_CN 171
|
#define ENABLE_AUTOSTART_PADDING_CN 171
|
||||||
#define ENABLE_AUTOSTART_PADDING_EN 218
|
#define ENABLE_AUTOSTART_PADDING_EN 218
|
||||||
|
#define ENABLE_DAEMON_PADDING_CN 171
|
||||||
|
#define ENABLE_DAEMON_PADDING_EN 218
|
||||||
#define ENABLE_MINIZE_TO_TRAY_PADDING_CN 171
|
#define ENABLE_MINIZE_TO_TRAY_PADDING_CN 171
|
||||||
#define ENABLE_MINIZE_TO_TRAY_PADDING_EN 218
|
#define ENABLE_MINIZE_TO_TRAY_PADDING_EN 218
|
||||||
#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90
|
#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90
|
||||||
|
|||||||
@@ -171,6 +171,11 @@ static std::vector<std::string> confirm_delete_connection = {
|
|||||||
|
|
||||||
static std::vector<std::string> enable_autostart = {
|
static std::vector<std::string> enable_autostart = {
|
||||||
reinterpret_cast<const char*>(u8"开机自启:"), "Auto Start:"};
|
reinterpret_cast<const char*>(u8"开机自启:"), "Auto Start:"};
|
||||||
|
static std::vector<std::string> enable_daemon = {
|
||||||
|
reinterpret_cast<const char*>(u8"启用守护进程:"), "Enable Daemon:"};
|
||||||
|
static std::vector<std::string> takes_effect_after_restart = {
|
||||||
|
reinterpret_cast<const char*>(u8"重启后生效"),
|
||||||
|
"Takes effect after restart"};
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
static std::vector<std::string> minimize_to_tray = {
|
static std::vector<std::string> minimize_to_tray = {
|
||||||
reinterpret_cast<const char*>(u8"退出时最小化到系统托盘:"),
|
reinterpret_cast<const char*>(u8"退出时最小化到系统托盘:"),
|
||||||
|
|||||||
@@ -261,6 +261,7 @@ int Render::LoadSettingsFromCacheFile() {
|
|||||||
enable_srtp_ = config_center_->IsEnableSrtp();
|
enable_srtp_ = config_center_->IsEnableSrtp();
|
||||||
enable_self_hosted_ = config_center_->IsSelfHosted();
|
enable_self_hosted_ = config_center_->IsSelfHosted();
|
||||||
enable_autostart_ = config_center_->IsEnableAutostart();
|
enable_autostart_ = config_center_->IsEnableAutostart();
|
||||||
|
enable_daemon_ = config_center_->IsEnableDaemon();
|
||||||
enable_minimize_to_tray_ = config_center_->IsMinimizeToTray();
|
enable_minimize_to_tray_ = config_center_->IsMinimizeToTray();
|
||||||
|
|
||||||
language_button_value_last_ = language_button_value_;
|
language_button_value_last_ = language_button_value_;
|
||||||
|
|||||||
@@ -465,6 +465,8 @@ class Render {
|
|||||||
bool enable_self_hosted_last_ = false;
|
bool enable_self_hosted_last_ = false;
|
||||||
bool enable_autostart_ = false;
|
bool enable_autostart_ = false;
|
||||||
bool enable_autostart_last_ = false;
|
bool enable_autostart_last_ = false;
|
||||||
|
bool enable_daemon_ = false;
|
||||||
|
bool enable_daemon_last_ = false;
|
||||||
bool enable_minimize_to_tray_ = false;
|
bool enable_minimize_to_tray_ = false;
|
||||||
bool enable_minimize_to_tray_last_ = false;
|
bool enable_minimize_to_tray_last_ = false;
|
||||||
char signal_server_ip_self_[256] = "";
|
char signal_server_ip_self_[256] = "";
|
||||||
|
|||||||
@@ -158,6 +158,7 @@ int Render::SettingWindow() {
|
|||||||
video_encode_format_items, IM_ARRAYSIZE(video_encode_format_items));
|
video_encode_format_items, IM_ARRAYSIZE(video_encode_format_items));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if USE_CUDA && !defined(__aarch64__) && !defined(__arm__)
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -176,6 +177,7 @@ int Render::SettingWindow() {
|
|||||||
ImGui::Checkbox("##enable_hardware_video_codec",
|
ImGui::Checkbox("##enable_hardware_video_codec",
|
||||||
&enable_hardware_video_codec_);
|
&enable_hardware_video_codec_);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
@@ -252,6 +254,34 @@ int Render::SettingWindow() {
|
|||||||
ImGui::SetCursorPosY(settings_items_offset);
|
ImGui::SetCursorPosY(settings_items_offset);
|
||||||
ImGui::Checkbox("##enable_autostart_", &enable_autostart_);
|
ImGui::Checkbox("##enable_autostart_", &enable_autostart_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ImGui::Separator();
|
||||||
|
|
||||||
|
{
|
||||||
|
settings_items_offset += settings_items_padding;
|
||||||
|
ImGui::SetCursorPosY(settings_items_offset + 4);
|
||||||
|
|
||||||
|
ImGui::Text(
|
||||||
|
"%s",
|
||||||
|
localization::enable_daemon[localization_language_index_].c_str());
|
||||||
|
|
||||||
|
if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
|
||||||
|
ImGui::SetCursorPosX(ENABLE_DAEMON_PADDING_CN);
|
||||||
|
} else {
|
||||||
|
ImGui::SetCursorPosX(ENABLE_DAEMON_PADDING_EN);
|
||||||
|
}
|
||||||
|
ImGui::SetCursorPosY(settings_items_offset);
|
||||||
|
ImGui::Checkbox("##enable_daemon_", &enable_daemon_);
|
||||||
|
if (ImGui::IsItemHovered()) {
|
||||||
|
ImGui::BeginTooltip();
|
||||||
|
ImGui::SetWindowFontScale(0.5f);
|
||||||
|
ImGui::Text("%s", localization::takes_effect_after_restart
|
||||||
|
[localization_language_index_]
|
||||||
|
.c_str());
|
||||||
|
ImGui::SetWindowFontScale(1.0f);
|
||||||
|
ImGui::EndTooltip();
|
||||||
|
}
|
||||||
|
}
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
@@ -373,6 +403,13 @@ int Render::SettingWindow() {
|
|||||||
}
|
}
|
||||||
enable_autostart_last_ = enable_autostart_;
|
enable_autostart_last_ = enable_autostart_;
|
||||||
|
|
||||||
|
if (enable_daemon_) {
|
||||||
|
config_center_->SetDaemon(true);
|
||||||
|
} else {
|
||||||
|
config_center_->SetDaemon(false);
|
||||||
|
}
|
||||||
|
enable_daemon_last_ = enable_daemon_;
|
||||||
|
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
if (enable_minimize_to_tray_) {
|
if (enable_minimize_to_tray_) {
|
||||||
config_center_->SetMinimizeToTray(true);
|
config_center_->SetMinimizeToTray(true);
|
||||||
|
|||||||
Submodule submodules/minirtc updated: 29ae03237f...bb892a1f9d
11
xmake.lua
11
xmake.lua
@@ -7,6 +7,12 @@ option("CROSSDESK_VERSION")
|
|||||||
set_description("Set CROSSDESK_VERSION for build")
|
set_description("Set CROSSDESK_VERSION for build")
|
||||||
option_end()
|
option_end()
|
||||||
|
|
||||||
|
option("USE_CUDA")
|
||||||
|
set_default(false)
|
||||||
|
set_showmenu(true)
|
||||||
|
set_description("Use CUDA for hardware codec acceleration")
|
||||||
|
option_end()
|
||||||
|
|
||||||
add_rules("mode.release", "mode.debug")
|
add_rules("mode.release", "mode.debug")
|
||||||
set_languages("c++17")
|
set_languages("c++17")
|
||||||
set_encodings("utf-8")
|
set_encodings("utf-8")
|
||||||
@@ -16,6 +22,8 @@ set_encodings("utf-8")
|
|||||||
-- add_cxxflags("/W4", "/WX")
|
-- add_cxxflags("/W4", "/WX")
|
||||||
|
|
||||||
add_defines("UNICODE")
|
add_defines("UNICODE")
|
||||||
|
add_defines("USE_CUDA=" .. (is_config("USE_CUDA", true) and "1" or "0"))
|
||||||
|
|
||||||
if is_mode("debug") then
|
if is_mode("debug") then
|
||||||
add_defines("CROSSDESK_DEBUG")
|
add_defines("CROSSDESK_DEBUG")
|
||||||
end
|
end
|
||||||
@@ -179,4 +187,5 @@ target("gui")
|
|||||||
target("crossdesk")
|
target("crossdesk")
|
||||||
set_kind("binary")
|
set_kind("binary")
|
||||||
add_deps("rd_log", "common", "gui")
|
add_deps("rd_log", "common", "gui")
|
||||||
add_files("src/app/main.cpp")
|
add_files("src/app/*.cpp")
|
||||||
|
add_includedirs("src/app", {public = true})
|
||||||
Reference in New Issue
Block a user