Sync dev branch changes

This commit is contained in:
wj-xiao
2026-01-13 16:47:31 +08:00
parent 3094a8bbbd
commit 22d780da5a
7 changed files with 187 additions and 15 deletions

View File

@@ -8,7 +8,7 @@ on:
pull_request: pull_request:
branches: branches:
- main - main
env: env:
NODE_VERSION: '20' NODE_VERSION: '20'
@@ -100,7 +100,7 @@ jobs:
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y build-essential python3 libudev-dev sudo apt-get install -y build-essential python3 libudev-dev rpm
- name: Install dependencies - name: Install dependencies
run: npm install run: npm install
@@ -113,4 +113,4 @@ jobs:
with: with:
name: ${{ matrix.artifact_name }} name: ${{ matrix.artifact_name }}
path: desktop/dist path: desktop/dist
if-no-files-found: error if-no-files-found: error

160
.github/workflows/release.yml vendored Normal file
View File

@@ -0,0 +1,160 @@
name: Create Tag and Release
on:
workflow_dispatch:
inputs:
tag:
description: 'Tag name'
required: true
type: string
prerelease:
description: 'Mark as pre-release'
required: false
type: boolean
default: false
draft:
description: 'Create as draft'
required: false
type: boolean
default: false
env:
NODE_VERSION: '20'
jobs:
create-tag:
name: Create Git Tag
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Create and push tag
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git tag -a ${{ inputs.tag }} -m "Release ${{ inputs.tag }}"
git push origin ${{ inputs.tag }}
build-browser:
name: Build Browser Bundle
needs: create-tag
runs-on: ubuntu-latest
defaults:
run:
working-directory: browser
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ inputs.tag }}
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Install dependencies
run: npm install
- name: Build static site
run: npm run build
- name: Create browser archive
run: |
cd dist
zip -r ../nanokvm-usb-browser-${{ inputs.tag }}.zip .
cd ..
- name: Upload browser artifact
uses: actions/upload-artifact@v4
with:
name: browser-release
path: browser/nanokvm-usb-browser-${{ inputs.tag }}.zip
if-no-files-found: error
build-desktop:
name: Build Desktop Apps
needs: create-tag
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
target: linux
build_script: build:linux-full
artifact_name: desktop-linux
- os: windows-latest
target: windows
build_script: build:win-full
artifact_name: desktop-windows
defaults:
run:
working-directory: desktop
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ inputs.tag }}
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- name: Install Linux build dependencies
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y build-essential python3 libudev-dev rpm
- name: Install dependencies
run: npm install
- name: Build desktop package
run: npm run ${{ matrix.build_script }}
- name: Upload desktop artifacts
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.artifact_name }}
path: |
desktop/dist/*.exe
desktop/dist/*.AppImage
desktop/dist/*.deb
desktop/dist/*.rpm
desktop/dist/latest*.yml
if-no-files-found: error
create-release:
name: Create GitHub Release
needs: [build-browser, build-desktop]
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Download all artifacts
uses: actions/download-artifact@v4
with:
path: release-artifacts
- name: Display structure of downloaded files
run: ls -R release-artifacts
- name: Create Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ inputs.tag }}
name: ${{ inputs.tag }}
draft: ${{ inputs.draft }}
prerelease: ${{ inputs.prerelease }}
files: |
release-artifacts/**/*
generate_release_notes: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -15,9 +15,10 @@ pnpm dev
## Deployment ## Deployment
1. Execute `pnpm build` to build the project. 1. Execute `pnpm build` to build the project.
2. Execute `npm install -g http-server` to install http-server. 2. Execute `pnpm install -g http-server` to install http-server.
3. Execute `http-server -p 8080 -a localhost` to run the service. 3. Execute `cd dist` to change working directory to `dist/` .
4. Open the Chrome browser and visit `http://localhost:8080`. 4. Execute `http-server -p 8080 -a localhost` to run the service.
5. Open the Chrome browser and visit `http://localhost:8080`.
### Deploy in Docker ### Deploy in Docker

View File

@@ -13,7 +13,12 @@ class Camera {
this.close(); this.close();
const constraints = { const constraints = {
video: { deviceId: { exact: id }, width: { ideal: width }, height: { ideal: height } }, video: {
deviceId: { exact: id },
width: { ideal: width },
height: { ideal: height },
frameRate: { ideal: 60 }
},
audio: audioId ? { deviceId: { exact: audioId } } : false audio: audioId ? { deviceId: { exact: audioId } } : false
}; };

View File

@@ -21,7 +21,7 @@ win:
nsis: nsis:
oneClick: false oneClick: false
allowToChangeInstallationDirectory: true allowToChangeInstallationDirectory: true
artifactName: ${productName}-${version}-setup.${ext} artifactName: ${productName}-${version}-${os}-${arch}-setup.${ext}
shortcutName: ${productName} shortcutName: ${productName}
uninstallDisplayName: ${productName} uninstallDisplayName: ${productName}
createDesktopShortcut: true createDesktopShortcut: true
@@ -39,19 +39,17 @@ mac:
notarize: false notarize: false
dmg: dmg:
artifactName: ${productName}-${version}.${ext} artifactName: ${productName}-${version}-${os}-${arch}.${ext}
sign: true sign: true
linux: linux:
target: target:
- AppImage - AppImage
- snap
- deb - deb
- rpm
maintainer: sipeed.com maintainer: sipeed.com
category: Utility category: Utility
artifactName: '${productName}-${version}-${os}-${arch}.${ext}'
appImage:
artifactName: ${productName}-${version}.${ext}
npmRebuild: false npmRebuild: false

View File

@@ -17,7 +17,10 @@
"build:unpack": "npm run build && electron-builder --dir", "build:unpack": "npm run build && electron-builder --dir",
"build:win": "npm run build && electron-builder --win", "build:win": "npm run build && electron-builder --win",
"build:mac": "electron-vite build && electron-builder --mac", "build:mac": "electron-vite build && electron-builder --mac",
"build:linux": "electron-vite build && electron-builder --linux" "build:linux": "electron-vite build && electron-builder --linux",
"build:win-full": "npm run build && electron-builder --win --x64 --arm64",
"build:mac-full": "electron-vite build && electron-builder --mac --x64 --arm64",
"build:linux-full": "electron-vite build && electron-builder --linux --x64 --arm64"
}, },
"dependencies": { "dependencies": {
"@ant-design/icons": "^5.6.1", "@ant-design/icons": "^5.6.1",

View File

@@ -13,7 +13,12 @@ class Camera {
this.close() this.close()
const constraints = { const constraints = {
video: { deviceId: { exact: id }, width: { ideal: width }, height: { ideal: height } }, video: {
deviceId: { exact: id },
width: { ideal: width },
height: { ideal: height },
frameRate: { ideal: 60 }
},
audio: audioId ? { deviceId: { exact: audioId } } : false audio: audioId ? { deviceId: { exact: audioId } } : false
} }