diff --git a/.gitmodules b/.gitmodules index 6f68726..1bc3f38 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ [submodule "taoyao-media-server/mediasoup"] path = taoyao-media-server/mediasoup url = https://github.com/acgist/mediasoup.git - branch = taoyao diff --git a/README.md b/README.md index d0a4c55..65e5163 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ |模块|名称|描述| |:--|:--|:--| -|taoyao-client|终端|终端示例| -|taoyao-media-server|媒体|媒体服务| -|taoyao-signal-server|信令|信令服务| +|taoyao-client|终端示例|Web端终端示例| +|taoyao-media-server|媒体服务|Mediasoup媒体服务| +|taoyao-signal-server|信令服务|直播会议业务逻辑| ### 流程 @@ -23,12 +23,18 @@ * [mediasoup文档](https://mediasoup.org/documentation/v3/mediasoup) * [mediasoup接口](https://mediasoup.org/documentation/v3/mediasoup/api) -## 终端 +## Web终端 * [mediasoup-client源码](https://github.com/versatica/mediasoup-client) * [mediasoup-client文档](https://mediasoup.org/documentation/v3/mediasoup-client) * [mediasoup-client接口](https://mediasoup.org/documentation/v3/mediasoup-client/api) +## C++终端 + +* [libmediasoupclient源码](https://github.com/versatica/libmediasoupclient) +* [libmediasoupclient文档](https://mediasoup.org/documentation/v3/libmediasoupclient) +* [libmediasoupclient接口](https://mediasoup.org/documentation/v3/libmediasoupclient/api) + ## TODO * 录制 diff --git a/docs/Deploy.md b/docs/Deploy.md index 0070b44..e175b00 100644 --- a/docs/Deploy.md +++ b/docs/Deploy.md @@ -147,6 +147,46 @@ PATH=$PATH:/data/maven/apache-maven-3.8.6/bin mvn -version ``` +## 安装Python + +``` +# 依赖 +yum install zlib-devel +yum install libffi-devel +yum install openssl-devel + +# 下载 +mkdir -p /data/python +cd /data/python +#wget https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz +wget https://mirrors.huaweicloud.com/python/3.8.16/Python-3.8.16.tar.xz +xz -d Python-3.8.16.tar.xz +tar -xf Python-3.8.16.tar + +# 安装 +cd Python-3.8.16 +./configure --prefix=/usr/local/python3 --with-ssl +make && make install + +# 配置 +ln -sf /usr/local/python3/bin/pip3.8 /usr/bin/pip +ln -sf /usr/local/python3/bin/python3.8 /usr/bin/python +ln -sf /usr/local/python3/bin/python3.8 /usr/bin/python3 + +# 配置YUM + +vim /usr/bin/yum +vim /usr/libexec/urlgrabber-ext-down + +--- +/usr/bin/python => /usr/bin/python2.7 +--- + +## 验证 +pip --version +python --version +``` + ## 下载源码 ``` @@ -157,13 +197,51 @@ git clone https://gitee.com/acgist/taoyao.git --recursive ## 安装媒体 ``` +# 设置镜像 +vim ~/.pip/pip.conf + +--- +[global] +index-url = http://mirrors.aliyun.com/pypi/simple/ +[install] +trusted-host = mirrors.aliyun.com +--- + +# 验证镜像 +pip config list + # 编译代码 cd /data/taoyao/taoyao-media-server +git submodule update --remote +cd modulesup +git checkout taoyao +cd .. npm install # 启动媒体 +npm run dev | release ``` +### Mediasoup单独编译 + +编译媒体服务时会自动编译`mediasoup`所以可以不用单独编译 + +``` +# 编译 +# make -C worker +cd /data/taoyao/taoyao-media-server/mediasoup/worker +make + +# 清理 +make clean +``` + +### 问题 + +#### Subproject exists but has no meson.build file + +编译过程需要第三方的依赖,进入目录`mediasoup/worker/subprojects`,查看`*.wrap`依次下载然后修改名称放到`packagecache`,重新编译即可。 + ## 安装信令 ``` @@ -205,12 +283,24 @@ systemctl enable taoyao ## 安装终端 +``` +# 编译 +cd /data/taoyao/taoyao-client +npm install + +# 启动 +npm run dev +``` + ## 配置防火墙 ### taoyao-media-server ``` +# 终端 +firewall-cmd --zone=public --add-port=5173/tcp --permanent +# 信令服务 firewall-cmd --zone=public --add-port=8888/tcp --permanent # 媒体服务(数据):40000-49999 firewall-cmd --zone=public --add-port=40000-49999/udp --permanent @@ -219,6 +309,7 @@ firewall-cmd --reload firewall-cmd --list-ports # 删除端口 +#firewall-cmd --zone=public --remove-port=5173/udp --permanent #firewall-cmd --zone=public --remove-port=8888/udp --permanent #firewall-cmd --zone=public --remove-port=40000-49999/udp --permanent ``` diff --git a/taoyao-client/.gitignore b/taoyao-client/.gitignore index 38adffa..3656759 100644 --- a/taoyao-client/.gitignore +++ b/taoyao-client/.gitignore @@ -1,28 +1,7 @@ -# Logs -logs *.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* -lerna-debug.log* -node_modules -.DS_Store +logs dist -dist-ssr -coverage -*.local - -/cypress/videos/ -/cypress/screenshots/ - -# Editor directories and files .vscode/* !.vscode/extensions.json -.idea -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? +node_modules diff --git a/taoyao-client/vite.config.js b/taoyao-client/vite.config.js index 4d60b3a..80580b0 100644 --- a/taoyao-client/vite.config.js +++ b/taoyao-client/vite.config.js @@ -6,6 +6,9 @@ import vue from "@vitejs/plugin-vue"; // https://vitejs.dev/config/ export default defineConfig({ plugins: [vue()], + server: { + host: "0.0.0.0" + }, resolve: { alias: { "@": fileURLToPath(new URL("./src", import.meta.url)),