From 89d41742ef888fdc9a90ba5c4672f3775586e49e Mon Sep 17 00:00:00 2001 From: genteure Date: Sat, 4 Jun 2022 03:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BB=BFCLI:=20Embed=20WebUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 16 +++++ .github/workflows/release.yml | 21 +++++++ .gitignore | 1 + .gitmodules | 3 + BililiveRecorder.Web/Startup.cs | 18 ++++-- BililiveRecorder.Web/embeded/index.html | 79 +++++++++++++++++++++++-- webui/build.ps1 | 7 +++ webui/build.sh | 8 +++ webui/source | 1 + 9 files changed, 143 insertions(+), 11 deletions(-) create mode 100644 .gitmodules create mode 100644 webui/build.ps1 create mode 100755 webui/build.sh create mode 160000 webui/source diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae6fbee..e234020 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,9 +23,17 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive - uses: actions/setup-dotnet@v2 + - name: Make sure webui can be built + if: "${{ matrix.os == 'windows-latest' }}" + run: ./webui/build.ps1 + - name: Make sure webui can be built + if: "${{ matrix.os == 'ubuntu-latest' }}" + run: ./webui/build.sh + - name: Run Tests - Debug run: dotnet test -v m -c Debug - name: Run Tests - Release @@ -39,6 +47,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 @@ -73,9 +82,13 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive - uses: actions/setup-dotnet@v2 + - name: Build WebUI + run: ./webui/build.sh + - name: Build CLI - Debug if: ${{ matrix.rid == 'any' }} run: dotnet publish -c Debug BililiveRecorder.Cli/BililiveRecorder.Cli.csproj @@ -113,6 +126,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx @@ -132,6 +146,8 @@ jobs: with: images: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Build WebUI + run: ./webui/build.sh - name: Build CLI run: dotnet build -c Release -o ./BililiveRecorder.Cli/bin/docker_out BililiveRecorder.Cli/BililiveRecorder.Cli.csproj # Build and push Docker image with Buildx (don't push on PR) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e554ea5..d6b3268 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,9 +22,17 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive - uses: actions/setup-dotnet@v2 + - name: Make sure webui can be built + if: "${{ matrix.os == 'windows-latest' }}" + run: ./webui/build.ps1 + - name: Make sure webui can be built + if: "${{ matrix.os == 'ubuntu-latest' }}" + run: ./webui/build.sh + - name: Run Tests - Debug run: dotnet test -v m -c Debug - name: Run Tests - Release @@ -41,6 +49,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - name: Restore Packages @@ -83,22 +92,31 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive + - uses: actions/setup-dotnet@v2 + + - name: Build WebUI + run: ./webui/build.sh + - name: Build CLI if: ${{ matrix.rid == 'any' }} run: dotnet publish -c ${{ matrix.build_configuration }} BililiveRecorder.Cli/BililiveRecorder.Cli.csproj - name: Build CLI if: ${{ matrix.rid != 'any' }} run: dotnet publish -c ${{ matrix.build_configuration }} -r ${{ matrix.rid }} BililiveRecorder.Cli/BililiveRecorder.Cli.csproj + - name: Upload Artifacts uses: actions/upload-artifact@v2 with: name: CLI-${{ matrix.rid }}-${{ matrix.build_configuration }} path: BililiveRecorder.Cli/publish/${{ matrix.rid }} + - name: Pack Release Asset run: | cd BililiveRecorder.Cli/publish zip -r CLI-${{ matrix.rid }}-${{ matrix.build_configuration }}.zip ./${{ matrix.rid }} + - name: Upload Release Asset uses: actions/upload-release-asset@v1 env: @@ -120,6 +138,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + submodules: recursive - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx @@ -148,6 +167,8 @@ jobs: images: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} bililive/recorder + - name: Build WebUI + run: ./webui/build.sh - name: Build CLI run: dotnet build -c Release -o ./BililiveRecorder.Cli/bin/docker_out BililiveRecorder.Cli/BililiveRecorder.Cli.csproj # Build and push Docker image with Buildx (don't push on PR) diff --git a/.gitignore b/.gitignore index f48b655..21a45dd 100644 --- a/.gitignore +++ b/.gitignore @@ -265,3 +265,4 @@ __pycache__/ BililiveRecorder.Cli/Properties/launchSettings.json **/*.received.* +BililiveRecorder.Web/embeded/ui/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7f0b5d1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "webui-source"] + path = webui/source + url = https://github.com/BililiveRecorder/BililiveRecorder-WebUI.git diff --git a/BililiveRecorder.Web/Startup.cs b/BililiveRecorder.Web/Startup.cs index 27fb480..fbf4ac1 100644 --- a/BililiveRecorder.Web/Startup.cs +++ b/BililiveRecorder.Web/Startup.cs @@ -136,7 +136,15 @@ namespace BililiveRecorder.Web var originalQueryString = context.Request.QueryString; try { - context.Request.Path = PAGE404; + if (originalPath.StartsWithSegments("/ui")) + { + context.Request.Path = "/ui/"; + } + else + { + context.Request.Path = PAGE404; + } + context.Request.QueryString = new QueryString(); await next(context); } @@ -209,10 +217,10 @@ namespace BililiveRecorder.Web endpoints.MapGraphQLWebSockets(); endpoints.MapSwagger(); - endpoints.MapGraphQLPlayground(); - endpoints.MapGraphQLGraphiQL(); - endpoints.MapGraphQLAltair(); - endpoints.MapGraphQLVoyager(); + endpoints.MapGraphQLPlayground("graphql/playground"); + endpoints.MapGraphQLGraphiQL("graphql/graphiql"); + endpoints.MapGraphQLAltair("graphql/altair"); + endpoints.MapGraphQLVoyager("graphql/voyager"); }) .UseSwaggerUI(c => { diff --git a/BililiveRecorder.Web/embeded/index.html b/BililiveRecorder.Web/embeded/index.html index 488d0af..c5ace2c 100644 --- a/BililiveRecorder.Web/embeded/index.html +++ b/BililiveRecorder.Web/embeded/index.html @@ -1,5 +1,53 @@ + + -录播姬

录播姬，以后再写管理界面

API 界面： GraphiQL Playground Altair Voyager

说明：录播姬 API 里的 objectId 在重启后会重新生成，是不保存到配置文件里的

API 用法示例

graphql 的语法请查看官方文档 https://graphql.org/learn/ ，或中文翻译镜像 https://graphql.cn/learn/

列出所有直播间和基本信息

列出所有直播间的所有信息（截至编写此页面时，具体最新属性见API界面的文档）

+ +
+
+

列出所有直播间的所有信息（截至编写此页面时，具体最新属性见API界面的文档）

添加一个房间

+
+
+

添加一个房间

添加一个房间，用变量传参版

+
+
+

添加一个房间，用变量传参版

启用自动录制

+
+
+

启用自动录制

开始录制、结束录制、手动切分，都是 mutation，在 graphql 文档页面里可以看到
\ No newline at end of file + + +
开始录制、结束录制、手动切分，都是 mutation，在 graphql 文档页面里可以看到
+ + + + diff --git a/webui/build.ps1 b/webui/build.ps1 new file mode 100644 index 0000000..4b16125 --- /dev/null +++ b/webui/build.ps1 @@ -0,0 +1,7 @@ +Set-PSDebug -Trace 1 +Push-Location "$PSScriptRoot/source" +$env:BASE_URL = "/ui/" +npm ci +npx vite build +Copy-Item -Recurse dist ../../BililiveRecorder.Web/embeded/ui +Pop-Location diff --git a/webui/build.sh b/webui/build.sh new file mode 100755 index 0000000..c4ca961 --- /dev/null +++ b/webui/build.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -ex +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )"; +pushd "$SCRIPT_DIR/source" +export BASE_URL="/ui/" +npm ci && npx vite build +cp --recursive dist ../../BililiveRecorder.Web/embeded/ui +popd diff --git a/webui/source b/webui/source new file mode 160000 index 0000000..9c05813 --- /dev/null +++ b/webui/source @@ -0,0 +1 @@ +Subproject commit 9c058133cd4e88d4b31a00faf6433d1e4e5fb853