diff --git a/CHANGELOG.md b/CHANGELOG.md index bdcf406..6250493 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,55 @@ +## 2.3.0 [0e30a26](https://github.com/sipeed/NanoKVM/commit/0e30a26db42cbc08416662b49a88a5d16ad93424) (2025-11-26) + +### Features + +* Added an EDID editor in the terminal with a built-in 1080P EDID template +* Added German virtual keyboard and German clipboard support (thanks to [@Alexander-Ger-Reich](https://github.com/Alexander-Ger-Reich)) +* Resetting the HID also resets the USB hardware +* Added support for deleting ISO images + +### Refactoring & Improvements + +* Video (H.264 WebRTC): Refactored the module to significantly reduce video latency +* Video (H.264 Direct): Refactored to optimize data transmission and support data parsing even when the page is in the background +* Video (MJPEG): Refactored and ensure correct data length transmission +* Added locking before resetting USB to prevent HID deadlock (thanks to [@scpcom](https://github.com/scpcom)) +* Optimized HID writing logic +* Made HDMI toggle state persist across reboots (thanks to [@tpretz](https://github.com/tpretz)) +* Enhanced the paste feature with browser clipboard API integration (thanks to [@patrickpilon](https://github.com/patrickpilon)) +* Set the inquiry string for the virtual storage device (thanks to [@scpcom](https://github.com/scpcom)) +* Hostname now updates `/etc/hosts` simultaneously and takes effect immediately (thanks to [@scpcom](https://github.com/scpcom)) +* Improved compatibility for static IP configuration on Windows +* Optimized the web page title update logic +* Added a confirmation dialog when uninstalling Tailscale +* Improved UI for Clipboard, Image Mounting, and settings pages + +### Bug Fixes + +* Tailscale: Fixed an issue where Tailscale would turn the device into a router +* Tailscale: Fixed an issue where Tailscale would disable IPv6 +* Tailscale: Added a swap memory option to prevent Tailscale Out-Of-Memory errors +* Tailscale: Fixed Tailscale accept-dns configuration (thanks to [@lazydba247](https://github.com/lazydba247)) +* Fixed an issue where certain modifier keys were not recognized +* Fixed vertical mouse drift when the page is zoomed in or out + +### Localization + +* Update Korean translation (thanks to [@xenix4845](https://github.com/xenix4845)) +* Update Traditional Chinese translation (thanks to [@protonchang](https://github.com/protonchang)) +* Add Brazilian Portuguese translation (thanks to [@chiconws](https://github.com/chiconws) and [@Luccas-LF](https://github.com/Luccas-LF)) +* Add Swedish translation (thanks to [@acidflash](https://github.com/acidflash)) +* Add Catalan translation (thanks to [@Zagur](https://github.com/Zagur)) +* Add Turkish translation (thanks to [@Keylem](https://github.com/Keylem)) + +### Security + +* Implemented a delay after failed login attempts to mitigate brute-force attacks +* Upgraded dependencies to fix known security vulnerabilities + +## 2.2.9 [c77981c](https://github.com/sipeed/NanoKVM/commit/c77981cc0ceebd8f6705b6c5d8c3cf4edf4f6717) (2025-06-13) + +* fix(security): resolve parameter injection in serial port terminal + ## 2.2.8 [01e28f1](https://github.com/sipeed/NanoKVM/commit/01e28f10ae8b581d484bb6077ddfe7bbe4e57919) (2025-05-22) * feat: add AZERTY virtual keyboard Layout (thanks to [@felix068](https://github.com/felix068)) diff --git a/README.md b/README.md index 2a4e135..b75afa8 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,88 @@ -NanoKVM -====== +# NanoKVM
- -![](https://wiki.sipeed.com/hardware/assets/NanoKVM/introduce/NanoKVM_3.png) - -

- Quick Start - | - Hardware -

- -English | [中文](./README_ZH.md) | [日本語](./README_JA.md) - +
+ NanoKVM +

+ 🚀 Quick Start + | + 🛠️ Hardware Details + | + 💾 Firmware Releases +

+
-> Your NanoKVM is powered by [RISC-V](https://en.wikipedia.org/wiki/RISC-V)! -> If you have any issues or suggestions, creating issue here, or tell us with [MaixHub Discussion](https://maixhub.com/discussion/nanokvm). +## 🌟 What is NanoKVM? -## Introduction +NanoKVM is a series of compact, open-source IP-KVM devices based on the LicheeRV Nano (RISC-V). NanoKVM allows you to remotely access and control computers as if you were sitting right in front of them – perfect for managing servers, embedded systems, or any headless machine. -Lichee NanoKVM is an IP-KVM product based on LicheeRV Nano, inheriting the extreme size and powerful features of LicheeRV Nano. +## 📦 Product Family -The Lichee NanoKVM is now available in three versions: +We offer several NanoKVM versions to suit your needs: -* NanoKVM-Cube Lite is a basic configuration that is suitable for individual users with certain DIY capabilities and enterprise users with bulk requirements. - -* NanoKVM-Cube Full is a full version with a sophisticated case and complete accessories, as well as a built-in system mirror card that is ready to use at boot, and is recommended for individual users. - -* NanoKVM-PCle is a new form with a built-in PCle baffle that can be fixed inside the chassis. NanoKVM-PCle adds optional WiFi and PoE functions based on NanoKVM-Cube; it has its own PCle slot and can draw power from the motherboard PCle slot; in addition, the wired connection (ETH) is also more stable, meeting more professional needs. +* **NanoKVM-Cube Lite:** A barebones kit for DIY enthusiasts and enterprise users requiring bulk deployment. +* **NanoKVM-Cube Full:** A complete package featuring a sleek case, accessories, and a pre-flashed system SD card. Ready to use out-of-the-box; ideal for individual users. +* **NanoKVM-PCIe:** A unique form factor with a PCIe bracket for internal chassis mounting. It draws power directly from the PCIe slot and supports optional WiFi and PoE functions. +* **[NanoKVM-Pro:](https://github.com/sipeed/NanoKVM-Pro)** Based on popular demand, the **Pro version** delivers significant performance upgrades: + * **Resolution:** Upgraded from 1080P to stunning **4K@30fps / 2K@60fps**. + * **Network:** Blazing fast **1Gbps Ethernet + PoE + WiFi 6** ((upgraded from 100Mbps). + * **Latency:** Encoder accelerated latency reduced from 100-150ms to **50-100ms**.
- -![NanoKVM-Cube](https://wiki.sipeed.com/hardware/zh/kvm/assets/NanoKVM/1_intro/NanoKVM_1.jpg) - -![NanoKVM-PCIe](https://wiki.sipeed.com/hardware/assets/NanoKVM/introduce/NanoKVM-PCIe.png) - + NanoKVM Product Family
-> For users concerned about security, you can read this issue: [#301](https://github.com/sipeed/NanoKVM/issues/301). You will find explanations addressing all security concerns. -> GitHub, as an open and transparent platform, provides a space for discussing so-called "backdoor" concerns. Open-source makes products more secure! +> If you are looking for a USB-based KVM solution, check out [NanoKVM-USB](https://github.com/sipeed/NanoKVM-USB). -## Project Structure +## 🛠️ Technical Specifications + +| Feature | NanoKVM-Pro | NanoKVM (Cube/PCIe) | GxxKVM | JxxKVM | +|------------------- |-------------------------------------- |---------------------------------- |----------------------------------- |------------------------------------ | +| Core | AX630C 2xA53 1.2G | SG2002 1xC906 1.0G | RV1126 4xA7 1.5G | RV1106 1xA7 1.2G | +| Memory & Storage | 1G LPDDR4X + 32G eMMC | 256M DDR3 + 32G microSD | 1G DDR3 + 8G eMMc | 256M DDR3 + 16G eMMC | +| System | NanoKVM / PiKVM | NanoKVM | GxxKVM | JxxKVM | +| Resolution | 4K@30fps / 2K@60fps | 1080P@60fps | 4K@30fps / 2K@60fps | 1080P@60fps | +| HDMI Loopout | 4K loopout | x | x | x | +| Video Encoding | MJPEG / H.264 / H.265 | MJPEG / H264 | MJPEG / H264 | MJPEG / H264 | +| Audio Transmit | ✓ | x | ✓ | x | +| UEFI / BIOS | ✓ | ✓ | ✓ | ✓ | +| Emulated USB Keyboard & Mouse | ✓ | ✓ | ✓ | ✓ | +| Emulated USB ISO | ✓ | ✓ | ✓ | ✓ | +| IPMI | ✓ | ✓ | ✓ | x | +| Wake-on-LAN | ✓ | ✓ | ✓ | ✓ | +| Web Terminal | ✓ | ✓ | ✓ | ✓ | +| Serial Terminal | 2 channels | 2 channels | x | 1 channel | +| Custom Scripts | ✓ | ✓ | x | x | +| Storage | 32G eMMC 300MB/s | 32G MicroSD 12MB/s | 8G eMMC 120MB/s | 8G eMMC 60MB/s | +| Ethernet | 1000M | 100M | 1000M | 100M | +| PoE | Optional | Optional | x | x | +| WiFi | Optional WiFi6 | Optional WiFi6 | x | x | +| ATX Power Control | ✓ | ✓ | Extra $15 | Extra $10 | +| Display | 1.47" 320x172 LCD / 0.96" 128x64 OLED | 0.96" 128x64 OLED | - | 1.68" 280x240 | +| More Features | Sync LED Strip / Smart Assistant | - | - | - | +| Power Consumption | 0.6A@5V | 0.2A@5V | 0.4A@5V | 0.2A@5V | +| Power Input | USB-C or PoE | USB-C | USB-C | USB-C | +| Dimensions | 65x65x26mm | 40x36x36mm | 80x60x17.5mm | 60x43x(24~31)mm | + +## 📂 Project Structure ``` shell ├── kvmapp # APP update package -│ ├── jpg_stream # Compatible for direct updates from very old versions -│ ├── kvm_new_app # Triggers necessary components for kvm_system update -│ ├── kvm_system # kvm_system application -│ ├── server # NanoKVM front-end and back-end applications -│ └── system # Necessary system components -├── web # NanoKVM front-end -├── server # NanoKVM back-end -├── support # Auxiliary functions (image subsystem, system status, system updates, screen, keys, etc.) -│ ├── sg2002 # NanoKVM-Lite/Full/PCIe -│ └── h618 # NanoKVM-Pro +│ ├── jpg_stream # Legacy support for direct updates from older versions +│ ├── kvm_new_app # Triggers components for kvm_system updates +│ ├── kvm_system # Core KVM application +│ ├── server # Front-end and back-end integration +│ └── system # Essential system components +├── web # NanoKVM Front-end (UI) +├── server # NanoKVM Back-end (Service) +├── support # Auxiliary modules (Image subsystem, status, updates, OLED, HID, etc.) ├── ... ``` -## Tech Specs +## 🔩 Hardware Platform (NanoKVM Cube/PCIe) -| Products | NanoKVM (Lite) | NanoKVM (Full) | PiKVM V4 | -|------------------- |-------------------------------------- |---------------------------------- |----------------------------------- | -| Compute Units | LicheeRV Nano(RISCV) | LicheeRV Nano(RISCV) | CM4 (ARM) | -| Resolution | 1080P @ 60fps | 1080P @ 60fps | 1080P @ 60fps | -| Video encoding | MJPEG, H264 | MJPEG, H264 | MJPEG, H264 | -| Video delay | 90～230ms | 90～230ms | 100～230ms | -| UEFI/BIOS | ✓ | ✓ | ✓ | -| Virtual HID | ✓ | ✓ | ✓ | -| Virtual CD-ROM | ✓ | ✓ | ✓ | -| IPMI | ✓ | ✓ | ✓ | -| Wake-on-LAN | ✓ | ✓ | ✓ | -| ETH | 100M/10M | 100M/10M | 1000M/100M/10M | -| ATX power control | None，Users can connect by their own | USB interface IO control board | RJ-45 interface IO control board | -| OLED | None，Users can connect by their own | 128x64 0.96" white | 128x32 0.91" white | -| UART | 2 | 2 | 1 | -| TF Card | None | ✓ | ✓ | -| Expansion | None | PoE | WiFi/LTE | -| Power consumption | 0.2A@5V | 0.2A@5V | Peak 2.6A@5V | -| Power input | PC USB can be powered | PC USB or auxiliary power supply | DC 5V 3A power supply is required | -| Cooling | Silent fanless | Silent fanless | Fan cooling | -| Size | 23x37x15mm ～1/30 PiKVM V4 size | 40x36x36mm ～1/7 PiKVM V4 size | 120x68x44mm | - -![NanoKVM PCB Pinout](https://wiki.sipeed.com/hardware/zh/kvm/assets/NanoKVM/1_intro/NanoKVM_2.jpg) - -## Hardware platform NanoKVM - -NanoKVM is based on Sipeed [LicheeRV Nano](https://wiki.sipeed.com/hardware/zh/lichee/RV_Nano/1_intro.html)，you can find specifications, schematics, and dimensional drawings [here](http://cn.dl.sipeed.com/shareURL/LICHEE/LicheeRV_Nano). +NanoKVM is based on Sipeed [LicheeRV Nano](https://wiki.sipeed.com/hardware/zh/lichee/RV_Nano/1_intro.html). You can find specifications, schematics, and dimensional drawings in the [download station](http://cn.dl.sipeed.com/shareURL/LICHEE/LicheeRV_Nano). The NanoKVM Lite is constructed by the LicheeRV Nano and HDMItoCSI board, and the NanoKVM FULL adds the NanoKVM-A/B board and shell to the NanoKVM Lite. The HDMItoCSI board is used to convert the HDMI signal; NanoKVM-A, including OLED, ATX control output (USB Type-C interface), auxiliary power supply and ATX power on/off and reset buttons; The NanoKVM-B is connected to the plate at one end and the computer at the other end is connected to the computer ATX-Pin, which is used to remotely control the power of the computer. @@ -98,58 +94,37 @@ Note: Out of the 256MB memory in SG2002, 158MB is currently allocated for the mu * [NanoKVM-B Schematic](https://cn.dl.sipeed.com/fileList/KVM/nanoKVM/HDK/02_Schematic/SCH_RV_Nano_KVM_B_30131.pdf) * [NanoKVM img](https://github.com/sipeed/NanoKVM/releases/tag/NanoKVM) -## Roadmap +
+ NanoKVM PCB Pinout +
-**Enhancements:** +## 🤝 Contributing -* [x] Refactor the HDMI module and remove the libmaixcam_lib.so dependency -* [x] Disable SSH by default and add an enable/disable toggle in the web UI -* [x] Disable Tailscale by default and add an enable/disable toggle in the web UI -* [x] Add JWT configuration options to the configuration file -* [x] Secure password storage with bcrypt +We welcome contributions! Here's how you can help: -**Distribution:** +1. Fork the repository. +2. Create a feature branch. +3. Commit your changes. +4. Push to the branch. +5. Open a Pull Request. -* [x] Distribute applications via GitHub -* [x] Implement integrity checks for online updates -* [ ] Support offline updates +Please keep your pull requests small and focused to facilitate easier review and merging. -**Bug Fixes:** +> 🎁 **Contributors who submit high-quality Pull Requests may receive a NanoKVM Cube, PCIe, or Pro as a token of our appreciation!** -* [x] Fix the DNS issue -* [x] Fix the CSRF vulnerability - -**Features** - -* [ ] [79](https://github.com/sipeed/NanoKVM/issues/79) Support Zerotier -* [ ] [99](https://github.com/sipeed/NanoKVM/issues/99) Support WireGuard -* [ ] [249](https://github.com/sipeed/NanoKVM/issues/249) Add Mouse Jiggler - -## Contributing - -1. Fork the repository -2. Create a feature branch -3. Commit your changes -4. Push to the branch -5. Create a Pull Request - -Thanks for your interest in contributing to NanoKVM! - -Please keep your pull requests small and focused. This will make it easier to review and merge. - -> Developers who have contributed high-quality Pull Requests will receive a NanoKVM Cube, PCIe, or Pro as a token of our appreciation. - -## Where to buy +## 🛒 Where to Buy * [Aliexpress(global except USA&Russia)](https://www.aliexpress.com/item/1005007369816019.html) * [淘宝](https://item.taobao.com/item.htm?id=811206560480) -* [Preorder (anyother country that not support in Aliexpress or Taobao)](https://sipeed.com/nanokvm) +* [Preorder (any other country that not support in Aliexpress or Taobao)](https://sipeed.com/nanokvm) -## Community +## 💬 Community & Support -* [MaixHub Discussion](https://maixhub.com/discussion/nanokvm) +* [Discord](https://discord.gg/V4sAZ9XWpN) * QQ group: 703230713 +* email: [support@sipeed.com](mailto:support@sipeed.com) +* [FAQ](https://wiki.sipeed.com/hardware/en/kvm/NanoKVM/faq.html) -## License +## 📜 License This project is licensed under the GPL-3.0 License - see the LICENSE file for details. diff --git a/README_JA.md b/README_JA.md deleted file mode 100644 index d3512e1..0000000 --- a/README_JA.md +++ /dev/null @@ -1,129 +0,0 @@ -NanoKVM -====== - -
- -![](https://wiki.sipeed.com/hardware/assets/NanoKVM/introduce/NanoKVM_3.png) - -

- クイックスタート - | - ハードウェア -

- -[English](./README.md) | [中文](./README_ZH.md) | 日本語 - -
- -> NanoKVM は [RISC-V](https://en.wikipedia.org/wiki/RISC-V) を搭載しています！ -> 使用中に問題や提案がある場合は、ここで issue を提出するか、[MaixHub Discussion](https://maixhub.com/discussion/nanokvm) でお知らせください。 - -## オープンソース & コントリビューション - -### 2025.02.19 更新 - -NanoKVM のすべてのコンポーネントはオープンソース化されており、[front-end](https://github.com/sipeed/NanoKVM/tree/main/web)、[back-end](https://github.com/sipeed/NanoKVM/tree/main/server)、[kvm_vision](https://github.com/sipeed/NanoKVM/tree/main/vision/components/kvm)、[kvm_mmf](https://github.com/sipeed/NanoKVM/tree/main/vision/components/kvm_mmf)、[kvm_system](https://github.com/sipeed/NanoKVM/tree/main/support)、[kvmapp update package](https://github.com/sipeed/NanoKVM-System/tree/main/kvmapp)、[system sdk](https://github.com/sipeed/LicheeRV-Nano-Build/tree/NanoKVM)、[packaging methods](https://github.com/sipeed/LicheeRV-Nano-Build/blob/NanoKVM/kvm/NanoKVM_img.sh)が含まれます。 - -### 2025.02.14 更新 - -最新のアプリケーションバージョン v2.1.6 には、多くのセキュリティ強化とバグ修正が追加されているため、一般のユーザーはこのバージョン以降へのアップグレードをお勧めします。 - -### 2025.02.05 更新 - -セキュリティを懸念しているユーザーは、この issue をお読みください: 、セキュリティに関するすべての懸念事項について説明されています。 -GitHub は、オープンで透明性のあるプラットフォームとして、いわゆる「バックドア」の懸念事項を議論する場を提供しています。オープンソースであることにより、製品のセキュリティがさらに強化されます！ - -### 2024.10.18 更新 - -10/08にバックエンドコードをオープンソース化しました。すぐにPRを提出してくれたCivilに感謝します。最新のNanoKVM-PCIeを報酬として提供します！ -10月中旬のバッチはテストとパッケージングを開始しており、10/01以前のほとんどの注文は次週と次々週に出荷されます。 -10/01以降、アリエクスプレスの出荷日は12月に変更されました。これは保守的な納期です。10月の注文は11/15〜12/15の間に発送される予定です。 - -## 紹介 - -Lichee NanoKVMは、LicheeRV NanoをベースにしたIP-KVM製品で、LicheeRV Nanoの極小サイズと強力な機能を継承しています。 -Lichee NanoKVMは2つのバージョンがあります： -NanoKVM Liteは基本構成で、一定のDIY能力を持つ個人ユーザーや大量のニーズを持つ企業ユーザーに適しています。 -NanoKVM Fullは完全版で、洗練されたケースと完全なアクセサリーを備え、起動時にすぐに使用できるシステムミラーカードが内蔵されており、個人ユーザーに推奨されます。 - -![NanoKVM 分解画像](https://wiki.sipeed.com/hardware/zh/kvm/assets/NanoKVM/1_intro/NanoKVM_1.jpg) - -## 技術仕様 - -| 製品 | NanoKVM (Lite) | NanoKVM (Full) | PiKVM V4 | -|----------------------- |-------------------------------------- |---------------------------------- |----------------------------------- | -| 計算ユニット | LicheeRV Nano(RISCV) | LicheeRV Nano(RISCV) | CM4 (ARM) | -| 解像度 | 1080P @ 60fps | 1080P @ 60fps | 1080P @ 60fps | -| ビデオエンコーディング | MJPEG, H264 | MJPEG, H264 | MJPEG, H264 | -| ビデオ遅延 | 90～230ms | 90～230ms | 100～230ms | -| UEFI/BIOS | ✓ | ✓ | ✓ | -| 仮想HID | ✓ | ✓ | ✓ | -| 仮想CD-ROM | ✓ | ✓ | ✓ | -| IPMI | ✓ | ✓ | ✓ | -| Wake-on-LAN | ✓ | ✓ | ✓ | -| ETH | 100M/10M | 100M/10M | 1000M/100M/10M | -| ATX電源制御 | なし、ユーザーが自分で接続 | USBインターフェースIO制御ボード | RJ-45インターフェースIO制御ボード | -| OLED | なし、ユーザーが自分で接続 | 128x64 0.96" 白 | 128x32 0.91" 白 | -| UART | 2 | 2 | 1 | -| TFカード | なし | ✓ | ✓ | -| 拡張 | なし | PoE | WiFi/LTE | -| 消費電力 | 0.2A@5V | 0.2A@5V | ピーク時 2.6A@5V | -| 電源入力 | PC USBで給電可能 | PC USBまたは補助電源 | DC 5V 3A電源が必要 | -| 冷却 | 静音ファンレス | 静音ファンレス | ファン冷却 | -| サイズ | 23x37x15mm ～1/30 PiKVM V4サイズ | 40x36x36mm ～1/7 PiKVM V4サイズ | 120x68x44mm | - -![NanoKVM PCB ピン配置](https://wiki.sipeed.com/hardware/zh/kvm/assets/NanoKVM/1_intro/NanoKVM_2.jpg) - -## NanoKVM ハードウェアプラットフォーム - -NanoKVMはSipeed [LicheeRV Nano](https://wiki.sipeed.com/hardware/zh/lichee/RV_Nano/1_intro.html)に基づいており、仕様、回路図、寸法図は[こちら](http://cn.dl.sipeed.com/shareURL/LICHEE/LicheeRV_Nano)で確認できます。 - -NanoKVM LiteはLicheeRV NanoとHDMItoCSIボードで構成され、NanoKVM FULLはNanoKVM LiteにNanoKVM-A/Bボードとシェルを追加しています。HDMItoCSIボードはHDMI信号を変換するために使用されます。NanoKVM-AにはOLED、ATX制御出力（USB Type-Cインターフェース）、補助電源供給およびATX電源オン/オフおよびリセットボタンが含まれています。NanoKVM-Bは一端がAボードに接続され、他端がコンピュータのATXピンに接続され、コンピュータの電源をリモートで制御します。 - -NanoKVMイメージはLicheeRV Nano SDKおよびMaixCDKに基づいて構築されており、LicheeRV Nanoを使用する資料と互換性があります。逆に、KVMソフトウェアはLicheeRV Nanoや他のSG2002製品では使用できません。LicheeRV NanoやMaixCamでHDMI入力アプリケーションを構築したい場合は、技術サポートを受けるためにお問い合わせください。 - -注：SG2002の256MBメモリのうち、現在158MBがマルチメディアサブシステムに割り当てられており、NanoKVMはビデオ画像の取得と処理にこのメモリを使用します。 - -+ [NanoKVM-A 回路図](https://cn.dl.sipeed.com/fileList/KVM/nanoKVM/HDK/02_Schematic/SCH_RV_Nano_KVM_A_30111.pdf) -+ [NanoKVM-B 回路図](https://cn.dl.sipeed.com/fileList/KVM/nanoKVM/HDK/02_Schematic/SCH_HDMI_MIPI_31011.pdf) -+ [NanoKVM イメージダウンロード](https://github.com/sipeed/NanoKVM/releases/tag/NanoKVM) - -## ロードマップ - -### Q1 2025 - -**改善:** - -- [x] HDMI モジュールをリファクタリングし、libmaixcam_lib.so の依存関係を削除 -- [x] SSH をデフォルトで無効にし、Web UI に有効/無効の切り替えを追加 -- [x] Tailscale をデフォルトで無効にし、Web UI に有効/無効の切り替えを追加 -- [x] 設定ファイルに JWT 設定オプションを追加 -- [x] bcrypt を利用したパスワードストレージのセキュリティ保護 - -**配布:** - -- [x] GitHub 経由でのアプリケーション配布 -- [x] オンラインでの更新の際に整合性チェックを実施 -- [ ] オフラインでの更新をサポート - -**バグ修正:** - -- [x] DNS の問題を修正 -- [x] CSRF の脆弱性を修正 - -**機能** - -- [ ] [79](https://github.com/sipeed/NanoKVM/issues/79) Zerotier をサポート -- [ ] [99](https://github.com/sipeed/NanoKVM/issues/99) WireGuard をサポート -- [ ] [249](https://github.com/sipeed/NanoKVM/issues/249) Mouse Jiggler を追加 - -## 購入方法 - -* [Aliexpress(グローバル、米国とロシアを除く)](https://www.aliexpress.com/item/1005007369816019.html) -* [淘宝](https://item.taobao.com/item.htm?id=811206560480) -* [予約注文 (淘宝とアリエクスプレスがサポートされていない国)](https://sipeed.com/nanokvm) - -## コミュニティ - -* [MaixHub Discussion](https://maixhub.com/discussion/nanokvm) -* QQグループ: 703230713 diff --git a/README_ZH.md b/README_ZH.md deleted file mode 100644 index c2e2ad1..0000000 --- a/README_ZH.md +++ /dev/null @@ -1,111 +0,0 @@ -NanoKVM -====== - -
- -![](https://wiki.sipeed.com/hardware/assets/NanoKVM/introduce/NanoKVM_3.png) - -

- Quick Start - | - Hardware -

- -[English](./README.md) | 中文 | [日本語](./README_JA.md) - -
- -> Your NanoKVM Power by RISC-V ! -> 如果您在使用过程中有任何问题或建议，请在这里提交 issue， 或在 [MaixHub Discussion](https://maixhub.com/discussion/nanokvm)告诉我们. - -## 简介 - -Lichee NanoKVM 是基于 LicheeRV Nano 的 IP-KVM 产品，继承了 LicheeRV Nano的极致体积 和 强大功能。 - -Lichee NanoKVM 目前有三个版本： - -* NanoKVM-Cube Lite 为基础版配置，适合 具有一定DIY能力的个人用户 和 有批量需求的企业用户。 -* NanoKVM-Cube Full 为完整版配置，带精致外壳和完整配件，内置开机即用的系统镜像卡，推荐个人用户购买。 -* NanoKVM-PCle 为全新形态，内置 PCle 挡板，可固定在机箱内部。NanoKVM-PCle 在 NanoKVM-Cube 基础上增加了可选的 WiFi 和 PoE 功能；拥有自家的 PCle 插槽，可从主板 PCle 插槽取电；另外有线连接（ETH）也更加稳定，满足更多专业需求。 - -
- -![NanoKVM-Cube](https://wiki.sipeed.com/hardware/zh/kvm/assets/NanoKVM/1_intro/NanoKVM_1.jpg) - -![NanoKVM-PCIe](https://wiki.sipeed.com/hardware/assets/NanoKVM/introduce/NanoKVM-PCIe.png) - -
- -> 对于关注安全的用户，可以阅读此问题 [#301](https://github.com/sipeed/NanoKVM/issues/301)，您会找到有关所有安全问题的解释。GitHub 作为一个开放和透明的平台，为讨论所谓的“后门”担忧提供了空间。开源使产品更加安全！ - -## 项目结构 - -``` shell -├── kvmapp # APP更新包 -│ ├── jpg_stream # 兼容从非常老的版本中直接更新 -│ ├── kvm_new_app # 触发 kvm_system 更新必要组件 -│ ├── kvm_system # kvm_system 应用 -│ ├── server # NanoKVM 前后端应用 -│ └── system # 必要系统组件 -├── server # NanoKVM 后端 -├── support # 辅助功能(图像子系统、系统状态、系统更新、屏幕、按键……) -│ ├── sg2002 # NanoKVM-Lite/Full/PCIe -│ └── h618 # NanoKVM-Pro -├── web # NanoKVM 前端 -├── LICENSE -├── README_JA.md -├── README.md -├── README_ZH.md -└── CHANGELOG.md -``` - -## 参数 - -| 产品 | NanoKVM (Lite) | NanoKVM (Full) | PiKVM V4 | -| --- | --- | --- | --- | -| 计算单元 | LicheeRV Nano(RISCV) | LicheeRV Nano(RISCV) | CM4 (ARM) | -| 分辨率 | 1080P @ 60fps | 1080P @ 60fps | 1080P @ 60fps | -| 视频编码 | MJPEG, H264 | MJPEG, H264 | MJPEG, H264 | -| 视频延迟 | 90～230ms | 90～230ms | 100～230ms | -| UEFI/BIOS | ✓ | ✓ | ✓ | -| 模拟USB键鼠 | ✓ | ✓ | ✓ | -| 模拟USB存储 | ✓ | ✓ | ✓ | -| IPMI | ✓ | ✓ | ✓ | -| Wake-on-LAN | ✓ | ✓ | ✓ | -| ETH | 100M/10M | 100M/10M | 1000M/100M/10M | -| ATX电源控制 | 无，用户可自行连接 | USB接口IO控制板 | RJ45接口IO控制板 | -| OLED显示 | 无，用户可自行扩展 | 128x64 0.96" white | 128x32 0.91" white | -| 外接串口 | 2路 | 2路 | 1路 | -| TF卡 | 无，用户自备 | 有，开机即用 | 有 | -| 扩展配件 | 无 | PoE | WiFi/LTE | -| 功耗 | 0.2A@5V | 0.2A@5V | Peak 2.6A@5V | -| 电源输入 | PC USB即可供电 | PC USB即可供电
也支持额外辅助供电 | 需要DC 5V 3A供电 | -| 散热 | 静音无风扇 | 静音无风扇 | 需要风扇主动散热 | -| 尺寸 | 23x37x15mm
～1/30 PiKVM V4 体积 | 40x36x36mm
～1/7 PiKVM V4 体积 | 120x68x44mm | - -![](https://wiki.sipeed.com/hardware/zh/kvm/assets/NanoKVM/1_intro/NanoKVM_2.jpg) - -## NanoKVM 硬件平台 - -NanoKVM 基于 Sipeed [LicheeRV Nano](https://wiki.sipeed.com/hardware/zh/lichee/RV_Nano/1_intro.html) 核心板搭建，这部分硬件的规格书、原理图、尺寸图等均可在这里找到：[点击这里](http://cn.dl.sipeed.com/shareURL/LICHEE/LicheeRV_Nano) - -NanoKVM Lite 由 LicheeRV Nano E 和 HDMItoCSI 小板构成，NanoKVM FULL 在 NanoKVM Lite 基础上增加 NanoKVM-A/B 板和外壳。HDMItoCSI板用于转换HDMI信号；NanoKVM-A 包含 OLED、ATX控制输出（TypeC接口形式）、辅助供电（TypeC接口）以及ATX开关机、复位按键；NanoKVM-B 一端连接A板，一端连接电脑ATX针脚，用于电脑的远程开关机。 - -NanoKVM 镜像在LicheeRV Nano SDK 和 MaixCDK 基础上构建，可以兼容使用 LicheeRV Nano 的资料，反之LicheeRV Nano 或其他 SG2002 产品无法使用KVM软件。如果您想在 LicheeRV Nano 或 MaixCam 上构建 HDMI输入相关应用，请与我们联系，以获得技术支持。 - -注: SG2002的256MB内存中, 目前划分105MB用于多媒体子系统, NanoKVM会在视频图像采集和处理中使用这部分内存. - -* [NanoKVM-A 原理图](https://cn.dl.sipeed.com/fileList/KVM/nanoKVM/HDK/02_Schematic/SCH_RV_Nano_KVM_A_30111.pdf) -* [NanoKVM-B 原理图](https://cn.dl.sipeed.com/fileList/KVM/nanoKVM/HDK/02_Schematic/SCH_HDMI_MIPI_31011.pdf) -* [NanoKVM 镜像下载](https://github.com/sipeed/NanoKVM/releases/tag/NanoKVM) - -## 购买渠道 - -* [Aliexpress(全球，除了美国和俄罗斯)](https://www.aliexpress.com/item/1005007369816019.html) -* [淘宝](https://item.taobao.com/item.htm?id=811206560480) -* [Preorder (其它不支持淘宝和速卖通的国家)](https://sipeed.com/nanokvm) - -## 社区 - -* [MaixHub Discussion](https://maixhub.com/discussion/nanokvm) -* QQ group: 703230713 diff --git a/kvmapp/system/init.d/S03usbdev b/kvmapp/system/init.d/S03usbdev index 7195179..c84dd94 100755 --- a/kvmapp/system/init.d/S03usbdev +++ b/kvmapp/system/init.d/S03usbdev @@ -9,8 +9,20 @@ start_usb_dev(){ mkdir g0 cd g0 - echo 0x3346 > idVendor - echo 0x1009 > idProduct + # echo 0x3346 > idVendor + # echo 0x1009 > idProduct + if [ -e /boot/usb.vid ] + then + cat /boot/usb.vid > idVendor + else + echo 0x3346 > idVendor + fi + if [ -e /boot/usb.pid ] + then + cat /boot/usb.pid > idProduct + else + echo 0x1009 > idProduct + fi mkdir strings/0x409 echo '0123456789ABCDEF' > strings/0x409/serialnumber echo 'sipeed' > strings/0x409/manufacturer @@ -82,6 +94,7 @@ start_usb_dev(){ ln -s functions/hid.GS2 configs/c.1 fi + # dedicated for media if [ -e /boot/usb.disk0 ] then mkdir functions/mass_storage.disk0 @@ -92,6 +105,7 @@ start_usb_dev(){ echo 1 > functions/mass_storage.disk0/lun.0/ro echo 0 > functions/mass_storage.disk0/lun.0/cdrom fi + echo "NanoKVM USB Mass Storage0520" > functions/mass_storage.disk0/lun.0/inquiry_string disk=$(cat /boot/usb.disk0) if [ -z "${disk}" ] then diff --git a/kvmapp/system/init.d/S03usbhid b/kvmapp/system/init.d/S03usbhid index 437b26f..9dc82c2 100755 --- a/kvmapp/system/init.d/S03usbhid +++ b/kvmapp/system/init.d/S03usbhid @@ -11,8 +11,20 @@ start_usb_dev(){ echo 0x0101 > bcdUSB echo 0x0623 > bcdDevice - echo 0x3346 > idVendor - echo 0x1009 > idProduct + # echo 0x3346 > idVendor + # echo 0x1009 > idProduct + if [ -e /boot/usb.vid ] + then + cat /boot/usb.vid > idVendor + else + echo 0x3346 > idVendor + fi + if [ -e /boot/usb.pid ] + then + cat /boot/usb.pid > idProduct + else + echo 0x1009 > idProduct + fi mkdir strings/0x409 # echo '0' > strings/0x409/serialnumber echo 'sipeed' > strings/0x409/manufacturer diff --git a/kvmapp/system/init.d/S30eth b/kvmapp/system/init.d/S30eth index 17db97f..604a673 100755 --- a/kvmapp/system/init.d/S30eth +++ b/kvmapp/system/init.d/S30eth @@ -1,119 +1,67 @@ #!/bin/sh -. /etc/profile +RESERVE_INET="192.168.90.1/22" -# /boot/eth.nodhcp for example -# ipaddr/net gw[optional] -# 192.168.0.101/24 192.168.0.1 -# 192.168.3.116/22 +clean_line() { + echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/\r//g' +} -RESERVE_INET="192.168.0.1/24" +calc_gw() { + addr="$1" + netid="$2" + IFS=. read a b c d <>24)&255 )).$(( (gwnum>>16)&255 )).$(( (gwnum>>8)&255 )).$(( gwnum&255 ))" +} start() { - printf "start ethernet: " - if [ -e /boot/eth.nodhcp ] - then - [ -e /boot/eth.nodhcp ] && - cat /boot/eth.nodhcp | while read inet gw - do - addr=${inet%/*} - netid=${inet#*/} - [ -z $gw ] && - gw=$( echo $addr| ( IFS='.' read a b c d; echo $(( - (((((($a<<8)+$b)<<8)+$c)<<8)+$d) - & (((1<<$netid)-1)<<(32-$netid)) - )) - )) && - gw=$(($gw>>24&0xff)).$(($gw>>16&0xff)).$(($gw>>8&0xff)).$((1+( $gw>>0&0xff ))) + if [ -e /boot/eth.nodhcp ]; then + while IFS= read -r line || [ -n "$line" ]; do + line=$(clean_line "$line") + [ -z "$line" ] && continue + set -- $line + inet="$1" + gw="$2" + [ -z "$inet" ] && continue + addr=${inet%/*} + netid=${inet#*/} + [ -z "$gw" ] && gw=$(calc_gw "$addr" "$netid") + arping -Dqc2 -Ieth0 "$addr" || continue + ip a add "$inet" brd + dev eth0 + ip r add default via "$gw" dev eth0 + echo -e "nameserver $gw" >> /etc/resolv.conf + break + done < /boot/eth.nodhcp - arping -Dqc2 -Ieth0 $addr || continue - ip a add $inet brd + dev eth0 - ip r add default via $gw dev eth0 - cp -f /etc/resolv.conf /etc/resolv.conf.old - cat > /etc/resolv.conf << EOF -nameserver $gw -nameserver 8.8.4.4 -nameserver 8.8.8.8 -nameserver 114.114.114.114 -nameserver 119.29.29.29 -nameserver 223.5.5.5 -EOF - break - done && - ip a show dev eth0|grep inet || ( - udhcpc -i eth0 -t 3 -T 1 -A 5 -b -p /run/udhcpc.eth0.pid &>/dev/null - ip a show dev eth0|grep inet - ) || ( - # failed to apply dynamic addr, need a available static addr to visit the LAN - inet=$RESERVE_INET - addr=${inet%/*} - ip a add $inet brd + dev eth0 - ) || exit 1 + ip a show dev eth0 | grep inet > /dev/null || { + udhcpc -i eth0 -t 3 -T 1 -A 5 -b -p /run/udhcpc.eth0.pid &>/dev/null + ip a show dev eth0 | grep inet > /dev/null + } || { + inet=$RESERVE_INET + addr=${inet%/*} + ip a add "$inet" brd + dev eth0 + } || exit 1 else - (udhcpc -i eth0 -t 10 -T 1 -A 5 -b -p /run/udhcpc.eth0.pid) & + udhcpc -i eth0 -t 10 -T 1 -A 5 -b -p /run/udhcpc.eth0.pid & fi - - echo "OK" } + stop() { - [[ ! -e "/run/udhcpc.eth0.pid" ]] && echo "udhcpc is not running..." && exit 1 - kill `cat /run/udhcpc.eth0.pid` + [ ! -e "/run/udhcpc.eth0.pid" ] && exit 1 + kill "$(cat /run/udhcpc.eth0.pid)" rm /run/udhcpc.eth0.pid } case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - $0 stop - $0 start - ;; - doc) - cat </dev/null 2>&1 + sysctl -w net.ipv6.conf.all.forwarding=0 >/dev/null 2>&1 + echo "Cleanup completed. IPv4/IPv6 forwarding disabled." + + # Trigger IPv6 address renewal on all interfaces + for iface in $(ls /sys/class/net/ | grep -v lo); do + echo 0 > /proc/sys/net/ipv6/conf/$iface/forwarding 2>/dev/null + sysctl -w net.ipv6.conf.$iface.accept_ra=2 >/dev/null 2>&1 + done + + echo "If you need exit node features, please configure manually." +fi case "$1" in start) - tailscale set --accept-dns=false if [ -f /etc/kvm/GOMEMLIMIT ]; then value=$(cat /etc/kvm/GOMEMLIMIT) export GOMEMLIMIT="${value}MiB" else - export GOMEMLIMIT=1024MiB + export GOMEMLIMIT=512MiB fi - + echo "GOMEMLIMIT set to ${GOMEMLIMIT}" + + # Ensure directories exist + mkdir -p /var/lib/tailscale /var/run/tailscale + printf "Starting $DAEMON[$VERSION]: " start-stop-daemon -S -bmq -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- \ --state=/var/lib/tailscale/tailscaled.state \ --socket=/var/run/tailscale/tailscaled.sock \ --port=${PORT} \ $FLAGS - [ $? = 0 ] && echo "OK" || echo "FAIL" + if [ $? = 0 ]; then + sleep 5 + echo "OK" + tailscale set --accept-dns=false + else + echo "FAIL" + fi ;; stop) printf "Stopping $DAEMON: " start-stop-daemon -K -p "$PIDFILE" [ $? = 0 ] && (echo "OK"; rm -f "$PIDFILE") || echo "FAIL" printf "cleaning tailscaled: " - /usr/sbin/$DAEMON --cleanup &>/dev/null + /usr/sbin/$DAEMON --cleanup >/dev/null 2>&1 [ $? = 0 ] && echo "OK" || echo "FAIL" ;; restart|reload) $0 stop $0 start ;; - doc) - cat < /dev/null; then + echo -e "${RED}[ERROR] Required command '$1' not found.${NC}" + echo "Please install it or ensure it is in your PATH." + exit 1 + fi +} + +# ------------------------------------------------------------------------------ +# Step 1: Check Prerequisites +# ------------------------------------------------------------------------------ +echo -e "${YELLOW}[INFO] Checking build environment...${NC}" + +check_dependency "go" +check_dependency "patchelf" +check_dependency "$CC_COMPILER" + +echo -e "${GREEN}[OK] All dependencies found.${NC}" + +# ------------------------------------------------------------------------------ +# Step 2: Build the Binary +# ------------------------------------------------------------------------------ +echo -e "${YELLOW}[INFO] Starting cross-compilation for RISC-V 64-bit (BoringCrypto enabled)...${NC}" + +export CGO_ENABLED=1 +export GOOS=linux +export GOARCH=riscv64 +export GOEXPERIMENT=boringcrypto +export CC="$CC_COMPILER" +export CGO_CFLAGS="$CGO_CFLAGS_OPTS" + +go build -o "$BINARY_NAME" -v + +if [ -f "$BINARY_NAME" ]; then + echo -e "${GREEN}[SUCCESS] Binary '$BINARY_NAME' created successfully.${NC}" +else + echo -e "${RED}[ERROR] Build failed. Binary not found.${NC}" + exit 1 +fi + +# ------------------------------------------------------------------------------ +# Step 3: Patch RPATH +# ------------------------------------------------------------------------------ +echo -e "${YELLOW}[INFO] Patching RPATH with patchelf...${NC}" + +patchelf --add-rpath '$ORIGIN/dl_lib' "$BINARY_NAME" + +echo -e "${GREEN}[DONE] Build script completed successfully!${NC}" diff --git a/server/common/cgo.go b/server/common/kvm_vision.go similarity index 86% rename from server/common/cgo.go rename to server/common/kvm_vision.go index 0a040fd..99d3a95 100644 --- a/server/common/cgo.go +++ b/server/common/kvm_vision.go @@ -7,8 +7,6 @@ package common */ import "C" import ( - "NanoKVM-Server/config" - "strings" "sync" "unsafe" @@ -26,15 +24,8 @@ func GetKvmVision() *KvmVision { kvmVisionOnce.Do(func() { kvmVision = &KvmVision{} - conf := config.GetInstance() - logLevel := strings.ToLower(conf.Logger.Level) - - logEnable := C.uint8_t(0) - if logLevel == "debug" { - logEnable = C.uint8_t(1) - } - - C.kvmv_init(logEnable) + logLevel := C.uint8_t(0) + C.kvmv_init(logLevel) log.Debugf("kvm vision initialized") }) @@ -62,8 +53,6 @@ func (k *KvmVision) ReadMjpeg(width uint16, height uint16, quality uint16) (data defer C.free_kvmv_data(&kvmData) data = C.GoBytes(unsafe.Pointer(kvmData), C.int(dataSize)) - - log.Debugf("read kvm image: %v", result) return } @@ -88,8 +77,6 @@ func (k *KvmVision) ReadH264(width uint16, height uint16, bitRate uint16) (data defer C.free_kvmv_data(&kvmData) data = C.GoBytes(unsafe.Pointer(kvmData), C.int(dataSize)) - - log.Debugf("read kvm image: %v", result) return } diff --git a/server/config/hardware.go b/server/config/hardware.go index 79d4e2f..bea3872 100644 --- a/server/config/hardware.go +++ b/server/config/hardware.go @@ -54,24 +54,27 @@ func (h HWVersion) String() string { } } -func getHwVersion() HWVersion { +func GetHwVersion() HWVersion { content, err := os.ReadFile(HWVersionFile) if err != nil { return HWVersionAlpha } version := strings.ReplaceAll(string(content), "\n", "") - if version == "beta" { + switch version { + case "alpha": + return HWVersionAlpha + case "beta": return HWVersionBeta - } else if version == "pcie" { + case "pcie": return HWVersionPcie + default: + return HWVersionAlpha } - - return HWVersionAlpha } func getHardware() (h Hardware) { - version := getHwVersion() + version := GetHwVersion() switch version { case HWVersionAlpha: diff --git a/server/go.mod b/server/go.mod index a356ee1..eff0892 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,8 +1,6 @@ module NanoKVM-Server -go 1.23.0 - -toolchain go1.23.2 +go 1.24.0 require ( github.com/creack/pty v1.1.24 @@ -12,12 +10,14 @@ require ( github.com/golang-jwt/jwt/v5 v5.2.2 github.com/gorilla/websocket v1.5.3 github.com/mervick/aes-everywhere/go/aes256 v0.0.0-20240803013625-6759956693c0 + github.com/pion/dtls/v3 v3.0.3 + github.com/pion/rtp v1.8.18 github.com/pion/webrtc/v4 v4.0.1 github.com/rs/cors/wrapper/gin v0.0.0-20240830163046-1084d89a1692 github.com/sirupsen/logrus v1.9.3 github.com/spf13/viper v1.19.0 github.com/unrolled/secure v1.15.0 - golang.org/x/crypto v0.37.0 + golang.org/x/crypto v0.45.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -44,14 +44,12 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pion/datachannel v1.5.9 // indirect - github.com/pion/dtls/v3 v3.0.3 // indirect github.com/pion/ice/v4 v4.0.2 // indirect - github.com/pion/interceptor v0.1.37 // indirect - github.com/pion/logging v0.2.2 // indirect + github.com/pion/interceptor v0.1.39 // indirect + github.com/pion/logging v0.2.3 // indirect github.com/pion/mdns/v2 v2.0.7 // indirect github.com/pion/randutil v0.1.0 // indirect - github.com/pion/rtcp v1.2.14 // indirect - github.com/pion/rtp v1.8.9 // indirect + github.com/pion/rtcp v1.2.15 // indirect github.com/pion/sctp v1.8.33 // indirect github.com/pion/sdp/v3 v3.0.9 // indirect github.com/pion/srtp/v3 v3.0.4 // indirect @@ -73,9 +71,9 @@ require ( go.uber.org/multierr v1.9.0 // indirect golang.org/x/arch v0.8.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/net v0.39.0 // indirect - golang.org/x/sys v0.32.0 // indirect - golang.org/x/text v0.24.0 // indirect + golang.org/x/net v0.47.0 // indirect + golang.org/x/sys v0.38.0 // indirect + golang.org/x/text v0.31.0 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect ) diff --git a/server/go.sum b/server/go.sum index 717f849..2ada1f1 100644 --- a/server/go.sum +++ b/server/go.sum @@ -34,8 +34,6 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= -github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= @@ -80,18 +78,18 @@ github.com/pion/dtls/v3 v3.0.3 h1:j5ajZbQwff7Z8k3pE3S+rQ4STvKvXUdKsi/07ka+OWM= github.com/pion/dtls/v3 v3.0.3/go.mod h1:weOTUyIV4z0bQaVzKe8kpaP17+us3yAuiQsEAG1STMU= github.com/pion/ice/v4 v4.0.2 h1:1JhBRX8iQLi0+TfcavTjPjI6GO41MFn4CeTBX+Y9h5s= github.com/pion/ice/v4 v4.0.2/go.mod h1:DCdqyzgtsDNYN6/3U8044j3U7qsJ9KFJC92VnOWHvXg= -github.com/pion/interceptor v0.1.37 h1:aRA8Zpab/wE7/c0O3fh1PqY0AJI3fCSEM5lRWJVorwI= -github.com/pion/interceptor v0.1.37/go.mod h1:JzxbJ4umVTlZAf+/utHzNesY8tmRkM2lVmkS82TTj8Y= -github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= -github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= +github.com/pion/interceptor v0.1.39 h1:Y6k0bN9Y3Lg/Wb21JBWp480tohtns8ybJ037AGr9UuA= +github.com/pion/interceptor v0.1.39/go.mod h1:Z6kqH7M/FYirg3frjGJ21VLSRJGBXB/KqaTIrdqnOic= +github.com/pion/logging v0.2.3 h1:gHuf0zpoh1GW67Nr6Gj4cv5Z9ZscU7g/EaoC/Ke/igI= +github.com/pion/logging v0.2.3/go.mod h1:z8YfknkquMe1csOrxK5kc+5/ZPAzMxbKLX5aXpbpC90= github.com/pion/mdns/v2 v2.0.7 h1:c9kM8ewCgjslaAmicYMFQIde2H9/lrZpjBkN8VwoVtM= github.com/pion/mdns/v2 v2.0.7/go.mod h1:vAdSYNAT0Jy3Ru0zl2YiW3Rm/fJCwIeM0nToenfOJKA= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE= -github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4= -github.com/pion/rtp v1.8.9 h1:E2HX740TZKaqdcPmf4pw6ZZuG8u5RlMMt+l3dxeu6Wk= -github.com/pion/rtp v1.8.9/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU= +github.com/pion/rtcp v1.2.15 h1:LZQi2JbdipLOj4eBjK4wlVoQWfrZbh3Q6eHtWtJBZBo= +github.com/pion/rtcp v1.2.15/go.mod h1:jlGuAjHMEXwMUHK78RgX0UmEJFV4zUKOFHR7OP+D3D0= +github.com/pion/rtp v1.8.18 h1:yEAb4+4a8nkPCecWzQB6V/uEU18X1lQCGAQCjP+pyvU= +github.com/pion/rtp v1.8.18/go.mod h1:bAu2UFKScgzyFqvUKmbvzSdPr+NGbZtv6UB2hesqXBk= github.com/pion/sctp v1.8.33 h1:dSE4wX6uTJBcNm8+YlMg7lw1wqyKHggsP5uKbdj+NZw= github.com/pion/sctp v1.8.33/go.mod h1:beTnqSzewI53KWoG3nqB282oDMGrhNxBdb+JZnkCwRM= github.com/pion/sdp/v3 v3.0.9 h1:pX++dCHoHUwq43kuwf3PyJfHlwIj4hXA7Vrifiq0IJY= @@ -141,8 +139,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= @@ -160,35 +159,19 @@ go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTV golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= -golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= -golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= -golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= -golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= -golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= -golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= -golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= -golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/server/main.go b/server/main.go index cb861fc..4a7379b 100644 --- a/server/main.go +++ b/server/main.go @@ -16,6 +16,7 @@ import ( "NanoKVM-Server/middleware" "NanoKVM-Server/router" "NanoKVM-Server/service/vm/jiggler" + "NanoKVM-Server/utils" "github.com/gin-gonic/gin" cors "github.com/rs/cors/wrapper/gin" @@ -38,7 +39,9 @@ func initialize() { vision := common.GetKvmVision() vision.SetHDMI(false) time.Sleep(10 * time.Millisecond) - vision.SetHDMI(true) + if !utils.IsHdmiDisabled() { + vision.SetHDMI(true) + } // run mouse jiggler jiggler.GetJiggler().Run() diff --git a/server/proto/storage.go b/server/proto/storage.go index 33c25cf..8741da3 100644 --- a/server/proto/storage.go +++ b/server/proto/storage.go @@ -16,3 +16,7 @@ type GetMountedImageRsp struct { type GetCdRomRsp struct { Cdrom int64 `json:"cdrom"` } + +type DeleteImageReq struct { + File string `json:"file" validate:"required"` +} diff --git a/server/proto/vm.go b/server/proto/vm.go index 573fcad..6ad89f0 100644 --- a/server/proto/vm.go +++ b/server/proto/vm.go @@ -57,6 +57,7 @@ type DeleteScriptReq struct { type GetVirtualDeviceRsp struct { Network bool `json:"network"` + Media bool `json:"media"` Disk bool `json:"disk"` } diff --git a/server/router/hid.go b/server/router/hid.go index bba4a08..edfd358 100644 --- a/server/router/hid.go +++ b/server/router/hid.go @@ -11,9 +11,9 @@ func hidRouter(r *gin.Engine) { service := hid.NewService() api := r.Group("/api").Use(middleware.CheckToken()) - api.POST("/hid/reset", service.Reset) // reset hid api.POST("/hid/paste", service.Paste) // paste api.GET("/hid/mode", service.GetHidMode) // get hid mode api.POST("/hid/mode", service.SetHidMode) // set hid mode + api.POST("/hid/reset", service.ResetHid) // reset hid } diff --git a/server/router/storage.go b/server/router/storage.go index d29a327..008f354 100644 --- a/server/router/storage.go +++ b/server/router/storage.go @@ -15,4 +15,5 @@ func storageRouter(r *gin.Engine) { api.GET("/storage/image/mounted", service.GetMountedImage) // get mounted image api.POST("/storage/image/mount", service.MountImage) // mount image api.GET("/storage/cdrom", service.GetCdRom) // get CD-ROM flag + api.POST("/storage/image/delete", service.DeleteImage) // delete image } diff --git a/server/router/stream.go b/server/router/stream.go index b4eb7a6..44fb5a8 100644 --- a/server/router/stream.go +++ b/server/router/stream.go @@ -3,8 +3,8 @@ package router import ( "NanoKVM-Server/middleware" "NanoKVM-Server/service/stream/direct" - "NanoKVM-Server/service/stream/h264" "NanoKVM-Server/service/stream/mjpeg" + "NanoKVM-Server/service/stream/webrtc" "github.com/gin-gonic/gin" ) @@ -16,6 +16,6 @@ func streamRouter(r *gin.Engine) { api.POST("/stream/mjpeg/detect", mjpeg.UpdateFrameDetect) // update frame detect api.POST("/stream/mjpeg/detect/stop", mjpeg.StopFrameDetect) // temporary stop frame detect - api.GET("/stream/h264", h264.Connect) // h264 stream (webrtc) + api.GET("/stream/h264", webrtc.Connect) // h264 stream (webrtc) api.GET("/stream/h264/direct", direct.Connect) // h264 stream (http) } diff --git a/server/service/application/update.go b/server/service/application/update.go index e40533c..9993397 100644 --- a/server/service/application/update.go +++ b/server/service/application/update.go @@ -8,6 +8,7 @@ import ( "net/http" "os" "os/exec" + "sync" "time" "github.com/gin-gonic/gin" @@ -21,9 +22,29 @@ const ( maxTries = 3 ) +var ( + updateMutex sync.Mutex + isUpdating bool +) + func (s *Service) Update(c *gin.Context) { var rsp proto.Response + updateMutex.Lock() + if isUpdating { + updateMutex.Unlock() + rsp.ErrRsp(c, -1, "update already in progress") + return + } + isUpdating = true + updateMutex.Unlock() + + defer func() { + updateMutex.Lock() + isUpdating = false + updateMutex.Unlock() + }() + if err := update(); err != nil { rsp.ErrRsp(c, -1, fmt.Sprintf("update failed: %s", err)) return diff --git a/server/service/auth/login.go b/server/service/auth/login.go index 8e9ba28..c933ec1 100644 --- a/server/service/auth/login.go +++ b/server/service/auth/login.go @@ -4,6 +4,7 @@ import ( "NanoKVM-Server/config" "NanoKVM-Server/middleware" "NanoKVM-Server/proto" + "time" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" @@ -23,17 +24,20 @@ func (s *Service) Login(c *gin.Context) { } if err := proto.ParseFormRequest(c, &req); err != nil { + time.Sleep(3 * time.Second) rsp.ErrRsp(c, -1, "invalid parameters") return } if ok := CompareAccount(req.Username, req.Password); !ok { + time.Sleep(2 * time.Second) rsp.ErrRsp(c, -2, "invalid username or password") return } token, err := middleware.GenerateJWT(req.Username) if err != nil { + time.Sleep(1 * time.Second) rsp.ErrRsp(c, -3, "generate token failed") return } diff --git a/server/service/extensions/tailscale/cli.go b/server/service/extensions/tailscale/cli.go index 1fa4cc9..300c2b1 100644 --- a/server/service/extensions/tailscale/cli.go +++ b/server/service/extensions/tailscale/cli.go @@ -69,8 +69,6 @@ func (c *Cli) Stop() error { return err } - _ = os.Remove(ConfigPath) - return os.Remove(ScriptPath) } diff --git a/server/service/extensions/tailscale/service.go b/server/service/extensions/tailscale/service.go index eac2ff3..8075bbd 100644 --- a/server/service/extensions/tailscale/service.go +++ b/server/service/extensions/tailscale/service.go @@ -15,7 +15,6 @@ type Service struct{} const ( TailscalePath = "/usr/bin/tailscale" TailscaledPath = "/usr/sbin/tailscaled" - ConfigPath = "etc/sysctl.d/99-tailscale.conf" GoMemLimit int64 = 75 ) @@ -40,6 +39,8 @@ func (s *Service) Install(c *gin.Context) { rsp.ErrRsp(c, -1, "install failed") return } + + _ = NewCli().Start() } rsp.OkRsp(c) @@ -54,7 +55,6 @@ func (s *Service) Uninstall(c *gin.Context) { _ = os.Remove(TailscalePath) _ = os.Remove(TailscaledPath) - _ = os.Remove(ConfigPath) rsp.OkRsp(c) log.Debugf("uninstall tailscale successfully") diff --git a/server/service/hid/hid.go b/server/service/hid/hid.go index a580101..85e86b4 100644 --- a/server/service/hid/hid.go +++ b/server/service/hid/hid.go @@ -1,13 +1,12 @@ package hid import ( + "errors" "os" "sync" -) + "time" -var ( - hid *Hid - hidOnce sync.Once + log "github.com/sirupsen/logrus" ) type Hid struct { @@ -18,6 +17,24 @@ type Hid struct { mouseMutex sync.Mutex } +const ( + HID0 = "/dev/hidg0" + HID1 = "/dev/hidg1" + HID2 = "/dev/hidg2" +) + +var ( + hid *Hid + hidOnce sync.Once +) + +func GetHid() *Hid { + hidOnce.Do(func() { + hid = &Hid{} + }) + return hid +} + func (h *Hid) Lock() { h.kbMutex.Lock() h.mouseMutex.Lock() @@ -28,9 +45,117 @@ func (h *Hid) Unlock() { h.mouseMutex.Unlock() } -func GetHid() *Hid { - hidOnce.Do(func() { - hid = &Hid{} - }) - return hid +func (h *Hid) OpenNoLock() { + var err error + h.CloseNoLock() + + h.g0, err = os.OpenFile(HID0, os.O_WRONLY, 0o666) + if err != nil { + log.Errorf("open %s failed: %s", HID0, err) + } + + h.g1, err = os.OpenFile(HID1, os.O_WRONLY, 0o666) + if err != nil { + log.Errorf("open %s failed: %s", HID1, err) + } + + h.g2, err = os.OpenFile(HID2, os.O_WRONLY, 0o666) + if err != nil { + log.Errorf("open %s failed: %s", HID2, err) + } +} + +func (h *Hid) CloseNoLock() { + for _, file := range []*os.File{h.g0, h.g1, h.g2} { + if file != nil { + _ = file.Sync() + _ = file.Close() + } + } +} + +func (h *Hid) Open() { + h.kbMutex.Lock() + defer h.kbMutex.Unlock() + h.mouseMutex.Lock() + defer h.mouseMutex.Unlock() + + h.CloseNoLock() + + h.OpenNoLock() +} + +func (h *Hid) Close() { + h.kbMutex.Lock() + defer h.kbMutex.Unlock() + h.mouseMutex.Lock() + defer h.mouseMutex.Unlock() + + h.CloseNoLock() +} + +func (h *Hid) WriteHid0(data []byte) { + h.kbMutex.Lock() + _, err := h.g0.Write(data) + h.kbMutex.Unlock() + + if err != nil { + if errors.Is(err, os.ErrClosed) { + log.Errorf("hid already closed, reopen it...") + h.OpenNoLock() + } else { + log.Debugf("write to %s failed: %s", HID0, err) + } + return + } + + log.Debugf("write to %s: %v", HID0, data) +} + +func (h *Hid) WriteHid1(data []byte) { + deadline := time.Now().Add(8 * time.Millisecond) + + h.mouseMutex.Lock() + _ = h.g1.SetWriteDeadline(deadline) + _, err := h.g1.Write(data) + h.mouseMutex.Unlock() + + if err != nil { + switch { + case errors.Is(err, os.ErrClosed): + log.Errorf("hid already closed, reopen it...") + h.OpenNoLock() + case errors.Is(err, os.ErrDeadlineExceeded): + log.Debugf("write to %s timeout", HID1) + default: + log.Errorf("write to %s failed: %s", HID1, err) + } + return + } + + log.Debugf("write to %s: %v", HID1, data) +} + +func (h *Hid) WriteHid2(data []byte) { + deadline := time.Now().Add(8 * time.Millisecond) + + h.mouseMutex.Lock() + _ = h.g2.SetWriteDeadline(deadline) + _, err := h.g2.Write(data) + h.mouseMutex.Unlock() + + if err != nil { + switch { + case errors.Is(err, os.ErrClosed): + log.Errorf("hid already closed, reopen it...") + h.OpenNoLock() + case errors.Is(err, os.ErrDeadlineExceeded): + log.Debugf("write to %s timeout", HID2) + default: + log.Errorf("write to %s failed: %s", HID2, err) + } + return + } + + log.Debugf("write to %s: %v", HID2, data) } diff --git a/server/service/hid/keyboard.go b/server/service/hid/keyboard.go index cc9db3f..72e1676 100644 --- a/server/service/hid/keyboard.go +++ b/server/service/hid/keyboard.go @@ -2,20 +2,14 @@ package hid func (h *Hid) Keyboard(queue <-chan []int) { for event := range queue { - h.kbMutex.Lock() - h.writeKeyboard(event) - h.kbMutex.Unlock() + code := byte(event[0]) + + var modifier byte = 0x00 + if code > 0 { + modifier = byte(event[1]) | byte(event[2]) | byte(event[3]) | byte(event[4]) + } + + data := []byte{modifier, 0x00, code, 0x00, 0x00, 0x00, 0x00, 0x00} + h.WriteHid0(data) } } - -func (h *Hid) writeKeyboard(event []int) { - code := byte(event[0]) - - var modifier byte = 0x00 - if code > 0 { - modifier = byte(event[1]) | byte(event[2]) | byte(event[3]) | byte(event[4]) - } - - data := []byte{modifier, 0x00, code, 0x00, 0x00, 0x00, 0x00, 0x00} - h.Write(h.g0, data) -} diff --git a/server/service/hid/mouse.go b/server/service/hid/mouse.go index 60415e6..9acda14 100644 --- a/server/service/hid/mouse.go +++ b/server/service/hid/mouse.go @@ -2,9 +2,6 @@ package hid import ( "encoding/binary" - "errors" - "os" - "time" log "github.com/sirupsen/logrus" ) @@ -25,7 +22,6 @@ var mouseButtonMap = map[byte]bool{ func (h *Hid) Mouse(queue <-chan []int) { for event := range queue { - h.mouseMutex.Lock() switch event[0] { case MouseDown: @@ -39,10 +35,8 @@ func (h *Hid) Mouse(queue <-chan []int) { case MouseScroll: h.mouseScroll(event) default: - log.Debugf("invalid mouse event: %+v", event) + log.Debugf("invalid mouse event: %v", event) } - - h.mouseMutex.Unlock() } } @@ -50,17 +44,17 @@ func (h *Hid) mouseDown(event []int) { button := byte(event[1]) if _, ok := mouseButtonMap[button]; !ok { - log.Debugf("invalid mouse button: %+v", event) + log.Errorf("invalid mouse button: %v", event) return } data := []byte{button, 0, 0, 0} - h.writeWithTimeout(h.g1, data) + h.WriteHid1(data) } func (h *Hid) mouseUp() { data := []byte{0, 0, 0, 0} - h.writeWithTimeout(h.g1, data) + h.WriteHid1(data) } func (h *Hid) mouseScroll(event []int) { @@ -70,9 +64,8 @@ func (h *Hid) mouseScroll(event []int) { } data := []byte{0, 0, 0, byte(direction)} - h.writeWithTimeout(h.g1, data) + h.WriteHid1(data) } - func (h *Hid) mouseMoveAbsolute(event []int) { x := make([]byte, 2) y := make([]byte, 2) @@ -80,32 +73,10 @@ func (h *Hid) mouseMoveAbsolute(event []int) { binary.LittleEndian.PutUint16(y, uint16(event[3])) data := []byte{0, x[0], x[1], y[0], y[1], 0} - h.writeWithTimeout(h.g2, data) + h.WriteHid2(data) } func (h *Hid) mouseMoveRelative(event []int) { data := []byte{byte(event[1]), byte(event[2]), byte(event[3]), 0} - h.writeWithTimeout(h.g1, data) -} - -func (h *Hid) writeWithTimeout(file *os.File, data []byte) { - deadline := time.Now().Add(8 * time.Millisecond) - _ = file.SetWriteDeadline(deadline) - - _, err := file.Write(data) - if err != nil { - switch { - case errors.Is(err, os.ErrClosed): - log.Debugf("hid already closed, reopen it...") - h.OpenNoLock() - case errors.Is(err, os.ErrDeadlineExceeded): - log.Debugf("write to hid timeout") - default: - log.Errorf("write to hid failed: %s", err) - } - - return - } - - log.Debugf("write to hid: %+v", data) + h.WriteHid1(data) } diff --git a/server/service/hid/operation.go b/server/service/hid/operation.go deleted file mode 100644 index 3b84e63..0000000 --- a/server/service/hid/operation.go +++ /dev/null @@ -1,73 +0,0 @@ -package hid - -import ( - "errors" - "os" - - log "github.com/sirupsen/logrus" -) - -func (h *Hid) OpenNoLock() { - var err error - h.CloseNoLock() - - h.g0, err = os.OpenFile("/dev/hidg0", os.O_WRONLY, 0o666) - if err != nil { - log.Errorf("open /dev/hidg0 failed: %s", err) - } - - h.g1, err = os.OpenFile("/dev/hidg1", os.O_WRONLY, 0o666) - if err != nil { - log.Errorf("open /dev/hidg1 failed: %s", err) - } - - h.g2, err = os.OpenFile("/dev/hidg2", os.O_WRONLY, 0o666) - if err != nil { - log.Errorf("open /dev/hidg2 failed: %s", err) - } -} - -func (h *Hid) Open() { - h.kbMutex.Lock() - defer h.kbMutex.Unlock() - h.mouseMutex.Lock() - defer h.mouseMutex.Unlock() - - h.CloseNoLock() - - h.OpenNoLock() -} - -func (h *Hid) CloseNoLock() { - for _, file := range []*os.File{h.g0, h.g1, h.g2} { - if file != nil { - _ = file.Sync() - _ = file.Close() - } - } -} - -func (h *Hid) Close() { - h.kbMutex.Lock() - defer h.kbMutex.Unlock() - h.mouseMutex.Lock() - defer h.mouseMutex.Unlock() - - h.CloseNoLock() -} - -func (h *Hid) Write(file *os.File, data []byte) { - _, err := file.Write(data) - if err != nil { - if errors.Is(err, os.ErrClosed) { - log.Debugf("hid already closed, reopen it...") - h.OpenNoLock() - } else { - log.Errorf("write to hid failed: %s", err) - } - - return - } - - log.Debugf("write to hid: %+v", data) -} diff --git a/server/service/hid/paste.go b/server/service/hid/paste.go index df64468..1f8e701 100644 --- a/server/service/hid/paste.go +++ b/server/service/hid/paste.go @@ -16,38 +16,121 @@ type Char struct { type PasteReq struct { Content string `form:"content" validate:"required"` + Langue string `form:"langue"` +} + +func LangueSwitch(base map[rune]Char, lang string) map[rune]Char { + // wenn kein lang angegeben → Standardmap zurück + if lang == "" { + return base + } + + // immer Kopie erstellen + m := copyMap(base) + + switch lang { + case "de": + // Y tauschen + m['y'] = Char{0, 29} + m['Y'] = Char{2, 29} + + // Z tauschen + m['z'] = Char{0, 28} + m['Z'] = Char{2, 28} + + // deutsche Sonderzeichen hinzufügen oder remappen + m['\u00E4'] = Char{0, 52} // ä + m['\u00C4'] = Char{2, 52} // Ä + m['\u00F6'] = Char{0, 51} // ö + m['\u00D6'] = Char{2, 51} // Ö + m['\u00FC'] = Char{0, 47} // ü + m['\u00DC'] = Char{2, 47} // Ü + m['\u00DF'] = Char{0, 45} // ß + + //Tauschen + m['^'] = Char{0, 53} // muss doppelt sein + m['/'] = Char{2, 36} // Shift + 7 + m['('] = Char{2, 37} // Shift + 8 + m['&'] = Char{2, 35} // Shift + 6 + m[')'] = Char{2, 38} // Shift + 9 + m['`'] = Char{2, 46} // Grave Accent / Backtick + m['"'] = Char{2, 31} // Shift + 2 + m['?'] = Char{2, 45} // Shift + ß + m['{'] = Char{0x40, 36} // ALt Gr + 7 + m['['] = Char{0x40, 37} // ALt Gr + 8 + m[']'] = Char{0x40, 38} // ALt Gr + 6 + m['}'] = Char{0x40, 39} // ALt Gr + 0 + m['\\'] = Char{0x40, 45} // ALt Gr + ß + m['@'] = Char{0x40, 20} // ALt Gr + q + m['+'] = Char{0, 48} // Shift + + + m['*'] = Char{2, 48} // Shift + + + m['~'] = Char{0x40, 48} // Shift + + + m['#'] = Char{0, 49} // Shift + # + m['\''] = Char{2, 49} // Shift + # + m['<'] = Char{0, 100} // Shift + < + m['>'] = Char{2, 100} // Shift + < + m['|'] = Char{0x40, 100} // ALt Gr + < + m[';'] = Char{2, 54} // Shift + , + m[':'] = Char{2, 55} // Shift + . + m['-'] = Char{0, 56} // Shift + - + m['_'] = Char{2, 56} // Shift + - + + //neu + m['\u00B4'] = Char{0, 46} // ´ + m['\u00B0'] = Char{2, 53} // ° + m['\u00A7'] = Char{2, 32} // § + m['\u20AC'] = Char{0x40, 8} // € + m['\u00B2'] = Char{0x40, 31} // ² + m['\u00B3'] = Char{0x40, 32} // ³ + + } + return m } func (s *Service) Paste(c *gin.Context) { var req PasteReq var rsp proto.Response + if err := proto.ParseFormRequest(c, &req); err != nil { rsp.ErrRsp(c, -1, "invalid arguments") return } + if len(req.Content) > 1024 { rsp.ErrRsp(c, -2, "content too long") return } - s.hid.kbMutex.Lock() - defer s.hid.kbMutex.Unlock() + + charMapLocal := LangueSwitch(charMap, req.Langue) + keyUp := []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} for _, char := range req.Content { - key, ok := charMap[char] + key, ok := charMapLocal[char] if !ok { log.Debugf("unknown key '%c' (rune: %d)", char, char) continue } + keyDown := []byte{byte(key.Modifiers), 0x00, byte(key.Code), 0x00, 0x00, 0x00, 0x00, 0x00} - s.hid.Write(s.hid.g0, keyDown) - s.hid.Write(s.hid.g0, keyUp) - time.Sleep(50 * time.Millisecond) + + hid.WriteHid0(keyDown) + hid.WriteHid0(keyUp) + time.Sleep(30 * time.Millisecond) } rsp.OkRsp(c) log.Debugf("hid paste success, total %d characters processed", len(req.Content)) } + +func copyMap(src map[rune]Char) map[rune]Char { + dst := make(map[rune]Char, len(src)) + for k, v := range src { + dst[k] = v + } + return dst +} + var charMap = map[rune]Char{ // Lowercase letters 'a': {0, 4}, 'b': {0, 5}, 'c': {0, 6}, 'd': {0, 7}, 'e': {0, 8}, @@ -99,16 +182,16 @@ var charMap = map[rune]Char{ '/': {0, 56}, // Slash // Shifted symbols - '_': {2, 45}, // Underscore (Shift + Hyphen) - '+': {2, 46}, // Plus (Shift + Equals) - '{': {2, 47}, // Left Curly Brace (Shift + Left Square Bracket) - '}': {2, 48}, // Right Curly Brace (Shift + Right Square Bracket) - '|': {2, 49}, // Pipe (Shift + Backslash) + '_': {2, 45}, // Underscore (Shift + Hyphen) + '+': {2, 46}, // Plus (Shift + Equals) + '{': {2, 47}, // Left Curly Brace (Shift + Left Square Bracket) + '}': {2, 48}, // Right Curly Brace (Shift + Right Square Bracket) + '|': {2, 49}, // Pipe (Shift + Backslash) - ':': {2, 51}, // Colon (Shift + Semicolon) - '"': {2, 52}, // Double Quote (Shift + Apostrophe) - '~': {2, 53}, // Tilde (Shift + Grave Accent) - '<': {2, 54}, // Less Than (Shift + Comma) - '>': {2, 55}, // Greater Than (Shift + Period) - '?': {2, 56}, // Question Mark (Shift + Slash) + ':': {2, 51}, // Colon (Shift + Semicolon) + '"': {2, 52}, // Double Quote (Shift + Apostrophe) + '~': {2, 53}, // Tilde (Shift + Grave Accent) + '<': {2, 54}, // Less Than (Shift + Comma) + '>': {2, 55}, // Greater Than (Shift + Period) + '?': {2, 56}, // Question Mark (Shift + Slash) } diff --git a/server/service/hid/reset.go b/server/service/hid/reset.go deleted file mode 100644 index c9b883e..0000000 --- a/server/service/hid/reset.go +++ /dev/null @@ -1,74 +0,0 @@ -package hid - -import ( - "NanoKVM-Server/proto" - "os" - "time" - - "github.com/gin-gonic/gin" - log "github.com/sirupsen/logrus" -) - -func (s *Service) Reset(c *gin.Context) { - var rsp proto.Response - - // reset USB - f, err := os.OpenFile("/sys/kernel/config/usb_gadget/g0/UDC", os.O_WRONLY, 0644) - if err != nil { - log.Errorf("open /sys/kernel/config/usb_gadget/g0/UDC failed: %s", err) - rsp.ErrRsp(c, -1, "open usb gadget file failed") - return - } - err = f.Truncate(0) - if err != nil { - _ = f.Close() - log.Errorf("truncate /sys/kernel/config/usb_gadget/g0/UDC failed: %s", err) - rsp.ErrRsp(c, -1, "truncate usb gadget file failed") - return - } - _, err = f.Seek(0, 0) - if err != nil { - _ = f.Close() - log.Errorf("seek to 0 failed: %s", err) - rsp.ErrRsp(c, -1, "seek to 0 in usb gadget file failed") - return - } - _, err = f.WriteString("\n") - if err != nil { - _ = f.Close() - log.Errorf("write to /sys/kernel/config/usb_gadget/g0/UDC failed: %s", err) - rsp.ErrRsp(c, -1, "write to usb gadget file failed") - return - } - _ = f.Close() - - time.Sleep(1 * time.Second) - - devices, err := os.ReadDir("/sys/class/udc/") - if err != nil { - log.Errorf("read udc directory failed: %s", err) - rsp.ErrRsp(c, -1, "read udc directory failed") - return - } - - f, err = os.OpenFile("/sys/kernel/config/usb_gadget/g0/UDC", os.O_WRONLY, 0644) - if err != nil { - log.Errorf("open /sys/kernel/config/usb_gadget/g0/UDC failed: %s", err) - rsp.ErrRsp(c, -1, "open usb gadget file failed") - return - } - for _, device := range devices { - _, err = f.WriteString(device.Name() + "\n") - if err != nil { - _ = f.Close() - log.Errorf("write to /sys/kernel/config/usb_gadget/g0/UDC failed: %s", err) - rsp.ErrRsp(c, -1, "write to usb gadget file failed") - return - } - } - - _ = f.Close() - - rsp.OkRsp(c) - log.Debugf("reset hid success") -} diff --git a/server/service/hid/mode.go b/server/service/hid/status.go similarity index 74% rename from server/service/hid/mode.go rename to server/service/hid/status.go index 9a77cb9..08c06a1 100644 --- a/server/service/hid/mode.go +++ b/server/service/hid/status.go @@ -3,6 +3,7 @@ package hid import ( "NanoKVM-Server/proto" "errors" + "fmt" "io" "os" "os/exec" @@ -16,11 +17,12 @@ import ( const ( ModeNormal = "normal" ModeHidOnly = "hid-only" + ModeFlag = "/sys/kernel/config/usb_gadget/g0/bcdDevice" - ModeFlag = "/sys/kernel/config/usb_gadget/g0/bcdDevice" - NormalModeScript = "/kvmapp/system/init.d/S03usbdev" - HidOnlyModeScript = "/kvmapp/system/init.d/S03usbhid" - TargetModeScript = "/etc/init.d/S03usbdev" + ModeNormalScript = "/kvmapp/system/init.d/S03usbdev" + ModeHidOnlyScript = "/kvmapp/system/init.d/S03usbhid" + + USBDevScript = "/etc/init.d/S03usbdev" ) var modeMap = map[string]string{ @@ -61,9 +63,17 @@ func (s *Service) SetHidMode(c *gin.Context) { return } - srcScript := NormalModeScript + h := GetHid() + h.Lock() + h.CloseNoLock() + defer func() { + h.OpenNoLock() + h.Unlock() + }() + + srcScript := ModeNormalScript if req.Mode == ModeHidOnly { - srcScript = HidOnlyModeScript + srcScript = ModeHidOnlyScript } if err := copyModeFile(srcScript); err != nil { @@ -78,6 +88,29 @@ func (s *Service) SetHidMode(c *gin.Context) { _ = exec.Command("reboot").Run() } +func (s *Service) ResetHid(c *gin.Context) { + var rsp proto.Response + + h := GetHid() + h.Lock() + h.CloseNoLock() + defer func() { + h.OpenNoLock() + h.Unlock() + }() + + command := fmt.Sprintf("%s restart_phy", USBDevScript) + err := exec.Command("sh", "-c", command).Run() + if err != nil { + log.Errorf("failed to reset hid: %v", err) + rsp.ErrRsp(c, -1, "failed to reset hid") + return + } + + rsp.OkRsp(c) + log.Debugf("reset hid success") +} + func copyModeFile(srcScript string) error { // open the source file srcFile, err := os.Open(srcScript) @@ -98,7 +131,7 @@ func copyModeFile(srcScript string) error { // create and copy to temporary file tmpFile, err := os.CreateTemp("/etc/init.d/", ".S03usbdev-") if err != nil { - log.Errorf("failed to create temp %s: %s", TargetModeScript, err) + log.Errorf("failed to create temp %s: %s", USBDevScript, err) return err } tmpPath := tmpFile.Name() @@ -131,12 +164,12 @@ func copyModeFile(srcScript string) error { } // replace the target file with the temporary file - if err := os.Rename(tmpPath, TargetModeScript); err != nil { + if err := os.Rename(tmpPath, USBDevScript); err != nil { log.Errorf("failed to rename %s: %s", tmpPath, err) return err } - log.Debugf("copy %s to %s successful", srcScript, TargetModeScript) + log.Debugf("copy %s to %s successful", srcScript, USBDevScript) return nil } diff --git a/server/service/storage/image.go b/server/service/storage/image.go index 63360ed..a42cb07 100644 --- a/server/service/storage/image.go +++ b/server/service/storage/image.go @@ -1,6 +1,7 @@ package storage import ( + "fmt" "os" "os/exec" "path/filepath" @@ -12,14 +13,16 @@ import ( log "github.com/sirupsen/logrus" "NanoKVM-Server/proto" + "NanoKVM-Server/service/hid" ) const ( imageDirectory = "/data" - imageNone = "/dev/mmcblk0p3" cdromFlag = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/cdrom" mountDevice = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/file" + inquiryString = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/inquiry_string" roFlag = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/ro" + usbNoRstMarker = "/boot/usb.norst" ) func (s *Service) GetImages(c *gin.Context) { @@ -91,31 +94,59 @@ func (s *Service) MountImage(c *gin.Context) { } } - // mount - image := req.File - if image == "" { - image = imageNone + inquiryVen := "NanoKVM" + inquiryPrd := "USB Mass Storage" + inquiryVer := 0x0520 + if req.Cdrom { + inquiryPrd = "USB CD/DVD-ROM" } + inquiryData := fmt.Sprintf("%-8s%-16s%04x", inquiryVen, inquiryPrd, inquiryVer) - if err := os.WriteFile(mountDevice, []byte(image), 0o666); err != nil { - log.Errorf("mount file %s failed: %s", image, err) - rsp.ErrRsp(c, -2, "mount image failed") + if err := os.WriteFile(inquiryString, []byte(inquiryData), 0o666); err != nil { + log.Errorf("set inquiry %s failed: %s", inquiryData, err) + rsp.ErrRsp(c, -2, "set inquiry failed") return } - // reset usb - commands := []string{ - "echo > /sys/kernel/config/usb_gadget/g0/UDC", - "ls /sys/class/udc/ | cat > /sys/kernel/config/usb_gadget/g0/UDC", - } - - for _, command := range commands { - err := exec.Command("sh", "-c", command).Run() - if err != nil { - rsp.ErrRsp(c, -2, "execute command failed") + // mount if file provided + image := req.File + if image != "" { + if err := os.WriteFile(mountDevice, []byte(image), 0o666); err != nil { + log.Errorf("mount file %s failed: %s", image, err) + rsp.ErrRsp(c, -2, "mount image failed") return } - time.Sleep(100 * time.Millisecond) + } + + // check to see if usb gadget reset is disabled + resetUsb := true + if _, err := os.Stat(usbNoRstMarker); err == nil { + resetUsb = false + } + + h := hid.GetHid() + h.Lock() + h.CloseNoLock() + defer func() { + h.OpenNoLock() + h.Unlock() + }() + + // reset usb + if resetUsb { + commands := []string{ + "echo > /sys/kernel/config/usb_gadget/g0/UDC", + "ls /sys/class/udc/ | cat > /sys/kernel/config/usb_gadget/g0/UDC", + } + + for _, command := range commands { + err := exec.Command("sh", "-c", command).Run() + if err != nil { + rsp.ErrRsp(c, -2, "execute command failed") + return + } + time.Sleep(100 * time.Millisecond) + } } rsp.OkRsp(c) @@ -132,9 +163,6 @@ func (s *Service) GetMountedImage(c *gin.Context) { } image := strings.ReplaceAll(string(content), "\n", "") - if image == imageNone { - image = "" - } data := &proto.GetMountedImageRsp{ File: image, @@ -165,3 +193,31 @@ func (s *Service) GetCdRom(c *gin.Context) { rsp.OkRspWithData(c, data) } + +func (s *Service) DeleteImage(c *gin.Context) { + var req proto.DeleteImageReq + var rsp proto.Response + + if err := proto.ParseFormRequest(c, &req); err != nil { + rsp.ErrRsp(c, -1, "invalid arguments") + return + } + + filename := strings.ToLower(req.File) + validPrefix := strings.HasPrefix(filename, imageDirectory) + validSuffix := strings.HasSuffix(filename, ".iso") || strings.HasSuffix(filename, ".img") + + if !validPrefix || !validSuffix { + rsp.ErrRsp(c, -2, "invalid arguments") + return + } + + if err := os.Remove(req.File); err != nil { + rsp.ErrRsp(c, -3, "remove file failed") + log.Errorf("failed to remove file %s: %s", req.File, err) + return + } + + rsp.OkRsp(c) + log.Debugf("delete image %s success", req.File) +} diff --git a/server/service/stream/direct/h264.go b/server/service/stream/direct/h264.go index 0803836..ea65d73 100644 --- a/server/service/stream/direct/h264.go +++ b/server/service/stream/direct/h264.go @@ -1,30 +1,17 @@ package direct import ( - "encoding/base64" - "encoding/json" "net/http" - "sync" "time" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" log "github.com/sirupsen/logrus" - - "NanoKVM-Server/common" ) -type Frame struct { - IsKeyFrame bool `json:"isKeyFrame"` - Data string `json:"data"` - Timestamp int64 `json:"timestamp"` -} - var ( - mutex = sync.Mutex{} - wsMap = make(map[*websocket.Conn]bool) - isSending = false - upgrader = websocket.Upgrader{ + streamer = newStreamer() + upgrader = websocket.Upgrader{ CheckOrigin: func(r *http.Request) bool { return true }, @@ -34,74 +21,24 @@ var ( func Connect(c *gin.Context) { ws, err := upgrader.Upgrade(c.Writer, c.Request, nil) if err != nil { - log.Errorf("failed to create websocket: %s", err) + log.Errorf("failed to upgrade to websocket: %s", err) return } - defer func() { _ = ws.Close() - log.Debugf("h264 websocket disconnected") + log.Debugf("h264 websocket disconnected: %s", ws.RemoteAddr()) }() + log.Debugf("h264 websocket connected: %s", ws.RemoteAddr()) - var zeroTime time.Time - _ = ws.SetReadDeadline(zeroTime) + _ = ws.SetReadDeadline(time.Time{}) - mutex.Lock() - wsMap[ws] = true - if len(wsMap) == 1 && !isSending { - go send() - } - mutex.Unlock() + streamer.addClient(ws) + defer streamer.removeClient(ws) - _, _, err = ws.ReadMessage() - if err != nil { - mutex.Lock() - delete(wsMap, ws) - mutex.Unlock() - log.Debugf("failed to read message: %s", err) - } -} - -func send() { - isSending = true - screen := common.GetScreen() - common.CheckScreen() - - fps := screen.FPS - duration := time.Second / time.Duration(fps) - - ticker := time.NewTicker(duration) - defer ticker.Stop() - - vision := common.GetKvmVision() - startTime := time.Now() - - for range ticker.C { - if len(wsMap) == 0 { - isSending = false + for { + if _, _, err := ws.ReadMessage(); err != nil { + log.Debugf("failed to read message (client disconnected): %s", err) return } - - data, result := vision.ReadH264(screen.Width, screen.Height, screen.BitRate) - if result < 0 { - continue - } - - frameMsg := Frame{ - IsKeyFrame: result == 3, - Data: base64.StdEncoding.EncodeToString(data), - Timestamp: time.Since(startTime).Microseconds(), - } - - frameJSON, err := json.Marshal(frameMsg) - if err != nil { - continue - } - - for ws := range wsMap { - if err := ws.WriteMessage(websocket.TextMessage, frameJSON); err != nil { - log.Debugf("failed to write message: %s", err) - } - } } } diff --git a/server/service/stream/direct/pool.go b/server/service/stream/direct/pool.go new file mode 100644 index 0000000..1f2fe06 --- /dev/null +++ b/server/service/stream/direct/pool.go @@ -0,0 +1,12 @@ +package direct + +import ( + "bytes" + "sync" +) + +var BufferPool = sync.Pool{ + New: func() interface{} { + return new(bytes.Buffer) + }, +} diff --git a/server/service/stream/direct/streamer.go b/server/service/stream/direct/streamer.go new file mode 100644 index 0000000..0f87653 --- /dev/null +++ b/server/service/stream/direct/streamer.go @@ -0,0 +1,123 @@ +package direct + +import ( + "NanoKVM-Server/common" + "NanoKVM-Server/service/stream" + "bytes" + "encoding/binary" + "sync" + "sync/atomic" + "time" + + "github.com/gorilla/websocket" + log "github.com/sirupsen/logrus" +) + +type Streamer struct { + mutex sync.RWMutex + clients map[*websocket.Conn]bool + running int32 +} + +func newStreamer() *Streamer { + return &Streamer{ + clients: make(map[*websocket.Conn]bool), + } +} + +func (s *Streamer) addClient(ws *websocket.Conn) { + s.mutex.Lock() + s.clients[ws] = true + s.mutex.Unlock() + + if atomic.CompareAndSwapInt32(&s.running, 0, 1) { + go s.run() + log.Debug("h264 stream started") + } +} + +func (s *Streamer) removeClient(ws *websocket.Conn) { + s.mutex.Lock() + delete(s.clients, ws) + s.mutex.Unlock() + + log.Debugf("h264 websocket disconnected, remaining clients: %d", len(s.clients)) +} + +func (s *Streamer) getClientCount() int { + s.mutex.RLock() + defer s.mutex.RUnlock() + + return len(s.clients) +} + +func (s *Streamer) run() { + defer atomic.StoreInt32(&s.running, 0) + + duration := time.Second / time.Duration(120) + ticker := time.NewTicker(duration) + defer ticker.Stop() + + screen := common.GetScreen() + vision := common.GetKvmVision() + startTime := time.Now() + + for range ticker.C { + if s.getClientCount() == 0 { + log.Debug("h264 stream stopped due to no clients") + return + } + + data, result := vision.ReadH264(screen.Width, screen.Height, screen.BitRate) + if result < 0 || len(data) == 0 { + continue + } + + isKeyFrame := byte(0) + if result == 3 { + isKeyFrame = byte(1) + } + + timestamp := time.Since(startTime).Microseconds() + + if err := s.send(isKeyFrame, timestamp, data); err != nil { + continue + } + + stream.GetFrameRateCounter().Update() + } +} + +func (s *Streamer) send(isKeyFrame byte, timestamp int64, data []byte) error { + buf := BufferPool.Get().(*bytes.Buffer) + defer BufferPool.Put(buf) + + buf.Reset() + + if err := buf.WriteByte(isKeyFrame); err != nil { + log.Errorf("failed to write keyframe flag: %s", err) + return err + } + + tsBytes := make([]byte, 8) + binary.LittleEndian.PutUint64(tsBytes, uint64(timestamp)) + if _, err := buf.Write(tsBytes); err != nil { + log.Errorf("failed to write timestamp: %s", err) + return err + } + + if _, err := buf.Write(data); err != nil { + log.Errorf("failed to write h264 data: %s", err) + return err + } + + for client := range s.clients { + if err := client.WriteMessage(websocket.BinaryMessage, buf.Bytes()); err != nil { + log.Errorf("failed to write message to client %s: %s.", client.RemoteAddr(), err) + + s.removeClient(client) + } + } + + return nil +} diff --git a/server/service/stream/frame-rate.go b/server/service/stream/frame_rate.go similarity index 100% rename from server/service/stream/frame-rate.go rename to server/service/stream/frame_rate.go diff --git a/server/service/stream/h264/sender.go b/server/service/stream/h264/sender.go index 4f0c95b..e59f57f 100644 --- a/server/service/stream/h264/sender.go +++ b/server/service/stream/h264/sender.go @@ -25,7 +25,7 @@ func send() { } data, result := vision.ReadH264(screen.Width, screen.Height, screen.BitRate) - if result < 0 { + if result < 0 || len(data) == 0 { continue } @@ -40,8 +40,6 @@ func send() { } } - log.Debugf("send h264 data: %d", len(data)) - if screen.FPS != fps { fps = screen.FPS duration = time.Second / time.Duration(fps) diff --git a/server/service/stream/mjpeg/mjpeg.go b/server/service/stream/mjpeg/mjpeg.go index ffeb067..d09f818 100644 --- a/server/service/stream/mjpeg/mjpeg.go +++ b/server/service/stream/mjpeg/mjpeg.go @@ -1,99 +1,22 @@ package mjpeg import ( - "NanoKVM-Server/common" - "NanoKVM-Server/service/stream" - "sync" "time" "github.com/gin-gonic/gin" - log "github.com/sirupsen/logrus" ) -var ( - chanMap = make(map[*gin.Context]bool) - mutex = sync.Mutex{} - exitSig = make(chan bool, 1) -) +var streamer = NewStreamer() func Connect(c *gin.Context) { c.Header("Content-Type", "multipart/x-mixed-replace; boundary=frame") c.Header("Cache-Control", "no-cache") c.Header("Connection", "keep-alive") c.Header("Pragma", "no-cache") + c.Header("X-Server-Date", time.Now().Format(time.RFC1123)) - mutex.Lock() - chanMap[c] = true - if len(chanMap) == 1 { - go send() - } - mutex.Unlock() + streamer.AddClient(c) + defer streamer.RemoveClient(c) <-c.Request.Context().Done() - - mutex.Lock() - delete(chanMap, c) - if len(chanMap) == 0 { - exitSig <- true - } - mutex.Unlock() -} - -func send() { - screen := common.GetScreen() - common.CheckScreen() - - fps := screen.FPS - - ticker := time.NewTicker(time.Second / time.Duration(fps)) - defer ticker.Stop() - - vision := common.GetKvmVision() - for { - select { - case <-ticker.C: - data, result := vision.ReadMjpeg(screen.Width, screen.Height, screen.Quality) - if result < 0 || result == 5 { - continue - } - - for c := range chanMap { - if err := write(c, data); err != nil { - log.Debugf("failed to write mjpeg data: %s", err) - } - } - log.Debugf("send mjpeg data: %d", len(data)) - - stream.GetFrameRateCounter().Update() - - if screen.FPS != fps { - fps = screen.FPS - ticker.Reset(time.Second / time.Duration(fps)) - } - - case <-exitSig: - return - } - } -} - -func write(c *gin.Context, data []byte) (err error) { - if _, err = c.Writer.Write([]byte("--frame\r\n")); err != nil { - return - } - - if _, err = c.Writer.Write([]byte("Content-Type: image/jpeg\r\n\r\n")); err != nil { - return - } - - if _, err = c.Writer.Write(data); err != nil { - return - } - - if _, err = c.Writer.Write([]byte("\r\n")); err != nil { - return - } - - c.Writer.Flush() - return } diff --git a/server/service/stream/mjpeg/streamer.go b/server/service/stream/mjpeg/streamer.go new file mode 100644 index 0000000..5bddc20 --- /dev/null +++ b/server/service/stream/mjpeg/streamer.go @@ -0,0 +1,131 @@ +package mjpeg + +import ( + "NanoKVM-Server/common" + "NanoKVM-Server/service/stream" + "fmt" + "strconv" + "sync" + "sync/atomic" + "time" + + "github.com/gin-gonic/gin" + log "github.com/sirupsen/logrus" +) + +type Streamer struct { + mutex sync.RWMutex + clients map[*gin.Context]bool + running int32 +} + +func NewStreamer() *Streamer { + return &Streamer{ + clients: make(map[*gin.Context]bool), + } +} + +func (s *Streamer) AddClient(c *gin.Context) { + s.mutex.Lock() + s.clients[c] = true + s.mutex.Unlock() + + if atomic.CompareAndSwapInt32(&s.running, 0, 1) { + go s.run() + log.Debug("mjpeg stream started") + } +} + +func (s *Streamer) RemoveClient(c *gin.Context) { + s.mutex.Lock() + delete(s.clients, c) + s.mutex.Unlock() + + log.Debugf("mjpeg connection removed, remaining clients: %d", len(s.clients)) +} + +func (s *Streamer) getClients() []*gin.Context { + s.mutex.RLock() + defer s.mutex.RUnlock() + + clients := make([]*gin.Context, 0, len(s.clients)) + for c := range s.clients { + clients = append(clients, c) + } + + return clients +} + +func (s *Streamer) getClientCount() int { + s.mutex.RLock() + defer s.mutex.RUnlock() + + return len(s.clients) +} + +func (s *Streamer) run() { + defer atomic.StoreInt32(&s.running, 0) + + screen := common.GetScreen() + common.CheckScreen() + fps := screen.FPS + + vision := common.GetKvmVision() + + ticker := time.NewTicker(time.Second / time.Duration(fps)) + defer ticker.Stop() + + for range ticker.C { + if s.getClientCount() == 0 { + log.Debug("mjpeg stream stopped due to no clients") + return + } + + data, result := vision.ReadMjpeg(screen.Width, screen.Height, screen.Quality) + if result < 0 || result == 5 || len(data) == 0 { + continue + } + + clients := s.getClients() + for _, client := range clients { + if err := writeFrame(client, data); err != nil { + log.Errorf("failed to write mjpeg frame for client %s: %s", client.Request.RemoteAddr, err) + s.RemoveClient(client) + } + } + + if screen.FPS != fps && screen.FPS != 0 { + fps = screen.FPS + ticker.Reset(time.Second / time.Duration(fps)) + } + + stream.GetFrameRateCounter().Update() + } +} + +func writeFrame(c *gin.Context, data []byte) (err error) { + defer func() { + if r := recover(); r != nil { + err = c.Request.Context().Err() + if err == nil { + err = fmt.Errorf("panic recovered in writeFrame: %v", r) + } + } + }() + + header := "--frame\r\nContent-Type: image/jpeg\r\nContent-Length: " + strconv.Itoa(len(data)) + "\r\n\r\n" + if _, err = c.Writer.WriteString(header); err != nil { + return err + } + + if _, err = c.Writer.Write(data); err != nil { + return err + } + + if _, err = c.Writer.Write([]byte("\r\n")); err != nil { + return err + } + + c.Writer.Flush() + return nil +} diff --git a/server/service/stream/webrtc/client.go b/server/service/stream/webrtc/client.go new file mode 100644 index 0000000..1ace3cd --- /dev/null +++ b/server/service/stream/webrtc/client.go @@ -0,0 +1,112 @@ +package webrtc + +import ( + "encoding/json" + "errors" + + "github.com/gorilla/websocket" + "github.com/pion/rtp" + "github.com/pion/rtp/codecs" + "github.com/pion/webrtc/v4" + log "github.com/sirupsen/logrus" + + "sync" +) + +func NewClient(ws *websocket.Conn, videoConn *webrtc.PeerConnection) *Client { + return &Client{ + ws: ws, + video: videoConn, + mutex: sync.Mutex{}, + } +} + +func (c *Client) WriteMessage(event string, data string) error { + c.mutex.Lock() + defer c.mutex.Unlock() + + message := &Message{ + Event: event, + Data: data, + } + + if err := c.ws.WriteJSON(message); err != nil { + log.Errorf("failed to send message %s: %v", event, err) + return err + } + + log.Debugf("sent message %s", event) + return nil +} + +func (c *Client) ReadMessage() (*Message, error) { + _, raw, err := c.ws.ReadMessage() + if err != nil { + log.Errorf("failed to read message: %v", err) + return nil, err + } + + var message Message + if err := json.Unmarshal(raw, &message); err != nil { + log.Errorf("failed to unmarshal message: %v", err) + return nil, nil + } + + return &message, nil +} + +func (c *Client) AddTrack() error { + // video track + videoTrack, err := webrtc.NewTrackLocalStaticRTP( + webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeH264}, + "video", + "pion-video", + ) + if err != nil { + log.Errorf("failed to create video track: %s", err) + return err + } + + videoPacketizer := rtp.NewPacketizer( + 1200, + 100, + 0x1234ABCD, + &codecs.H264Payloader{}, + rtp.NewRandomSequencer(), + 90000, + ) + if videoPacketizer == nil { + err := errors.New("failed to create rtp packetizer") + log.Error(err) + return err + } + + videoSender, err := c.video.AddTrack(videoTrack) + if err != nil { + log.Errorf("failed to add video track: %s", err) + return err + } + go startRTCPReader(videoSender) + + track := &Track{ + videoPacketizer: videoPacketizer, + video: videoTrack, + } + track.updateExtension() + + c.mutex.Lock() + c.track = track + c.mutex.Unlock() + + return nil +} + +func startRTCPReader(sender *webrtc.RTPSender) { + rtcpBuf := make([]byte, 1500) + for { + if _, _, err := sender.Read(rtcpBuf); err != nil { + log.Debugf("RTCP reader error: %v", err) + return + } + } +} diff --git a/server/service/stream/webrtc/h264.go b/server/service/stream/webrtc/h264.go new file mode 100644 index 0000000..f2217c7 --- /dev/null +++ b/server/service/stream/webrtc/h264.go @@ -0,0 +1,158 @@ +package webrtc + +import ( + "NanoKVM-Server/config" + "net/http" + "sync" + "time" + + "github.com/gin-gonic/gin" + "github.com/gorilla/websocket" + "github.com/pion/dtls/v3" + "github.com/pion/webrtc/v4" + log "github.com/sirupsen/logrus" +) + +var ( + upgrader = websocket.Upgrader{ + CheckOrigin: func(r *http.Request) bool { + return true + }, + } + globalManager *WebRTCManager + managerOnce sync.Once +) + +func getManager() *WebRTCManager { + managerOnce.Do(func() { + globalManager = NewWebRTCManager() + }) + return globalManager +} + +func Connect(c *gin.Context) { + // create WebSocket connection + wsConn, err := upgrader.Upgrade(c.Writer, c.Request, nil) + if err != nil { + log.Errorf("failed to create h264 websocket: %s", err) + return + } + defer func() { + _ = wsConn.Close() + log.Debugf("h264 websocket disconnected: %s", c.ClientIP()) + }() + log.Debugf("h264 websocket connected: %s", c.ClientIP()) + + var zeroTime time.Time + _ = wsConn.SetReadDeadline(zeroTime) + + // create video connection + iceServers := createICEServers() + + mediaEngine, err := createMediaEngine() + if err != nil { + log.Errorf("failed to create h264 media engine: %s", err) + return + } + + videoConn, err := createPeerConnection(iceServers, mediaEngine) + if err != nil { + log.Errorf("failed to create h264 video peer connection: %s", err) + return + } + defer func() { + _ = videoConn.Close() + log.Debugf("h264 video peer disconnected: %s", c.ClientIP()) + }() + + // create client + client := NewClient(wsConn, videoConn) + if err := client.AddTrack(); err != nil { + log.Errorf("failed to add track: %s", err) + return + } + + manager := getManager() + manager.AddClient(wsConn, client) + defer manager.RemoveClient(wsConn) + + // handle signaling + signalingHandler := NewSignalingHandler(client) + signalingHandler.RegisterCallbacks() + + // read and wait + for { + message, err := client.ReadMessage() + if err != nil { + return + } + if message != nil { + if err := signalingHandler.HandleMessage(message); err != nil { + log.Errorf("failed to handle signaling message: %s", err) + } + } + } +} + +func createICEServers() []webrtc.ICEServer { + var iceServers []webrtc.ICEServer + + conf := config.GetInstance() + + if conf.Stun != "" && conf.Stun != "disable" { + iceServers = append(iceServers, webrtc.ICEServer{ + URLs: []string{"stun:" + conf.Stun}, + }) + } + + if conf.Turn.TurnAddr != "" && conf.Turn.TurnUser != "" && conf.Turn.TurnCred != "" { + iceServers = append(iceServers, webrtc.ICEServer{ + URLs: []string{"turn:" + conf.Turn.TurnAddr}, + Username: conf.Turn.TurnUser, + Credential: conf.Turn.TurnCred, + }) + } + + return iceServers +} + +func createMediaEngine() (*webrtc.MediaEngine, error) { + mediaEngine := &webrtc.MediaEngine{} + + if err := mediaEngine.RegisterDefaultCodecs(); err != nil { + log.Errorf("failed to register default codecs: %s", err) + return nil, err + } + + if err := mediaEngine.RegisterHeaderExtension( + webrtc.RTPHeaderExtensionCapability{URI: "http://www.webrtc.org/experiments/rtp-hdrext/playout-delay"}, + webrtc.RTPCodecTypeVideo, + ); err != nil { + log.Errorf("failed to register header extension: %s", err) + return nil, err + } + + return mediaEngine, nil +} + +func createPeerConnection(iceServers []webrtc.ICEServer, mediaEngine *webrtc.MediaEngine) (*webrtc.PeerConnection, error) { + settingEngine := webrtc.SettingEngine{} + settingEngine.SetSRTPProtectionProfiles( + dtls.SRTP_AEAD_AES_128_GCM, + dtls.SRTP_AES128_CM_HMAC_SHA1_80, + ) + + apiOptions := []func(api *webrtc.API){ + webrtc.WithSettingEngine(settingEngine), + } + if mediaEngine != nil { + apiOptions = append(apiOptions, webrtc.WithMediaEngine(mediaEngine)) + } + + api := webrtc.NewAPI(apiOptions...) + + return api.NewPeerConnection(webrtc.Configuration{ + ICEServers: iceServers, + SDPSemantics: webrtc.SDPSemanticsUnifiedPlan, + }) +} diff --git a/server/service/stream/webrtc/manager.go b/server/service/stream/webrtc/manager.go new file mode 100644 index 0000000..59d03d0 --- /dev/null +++ b/server/service/stream/webrtc/manager.go @@ -0,0 +1,96 @@ +package webrtc + +import ( + "NanoKVM-Server/common" + "NanoKVM-Server/service/stream" + "sync" + "sync/atomic" + "time" + + "github.com/gorilla/websocket" + "github.com/pion/webrtc/v4/pkg/media" + log "github.com/sirupsen/logrus" +) + +func NewWebRTCManager() *WebRTCManager { + return &WebRTCManager{ + clients: make(map[*websocket.Conn]*Client), + videoSending: 0, + mutex: sync.RWMutex{}, + } +} + +func (m *WebRTCManager) AddClient(ws *websocket.Conn, client *Client) { + client.track.updateExtension() + + m.mutex.Lock() + m.clients[ws] = client + m.mutex.Unlock() + + log.Debugf("added client %s, total clients: %d", ws.RemoteAddr(), len(m.clients)) +} + +func (m *WebRTCManager) RemoveClient(ws *websocket.Conn) { + m.mutex.Lock() + delete(m.clients, ws) + m.mutex.Unlock() + + log.Debugf("removed client %s, total clients: %d", ws.RemoteAddr(), len(m.clients)) +} + +func (m *WebRTCManager) GetClientCount() int { + m.mutex.RLock() + defer m.mutex.RUnlock() + + return len(m.clients) +} + +func (m *WebRTCManager) StartVideoStream() { + if atomic.CompareAndSwapInt32(&m.videoSending, 0, 1) { + go m.sendVideoStream() + log.Debugf("start sending h264 stream") + } +} + +func (m *WebRTCManager) sendVideoStream() { + defer atomic.StoreInt32(&m.videoSending, 0) + + screen := common.GetScreen() + common.CheckScreen() + fps := screen.FPS + duration := time.Second / time.Duration(fps) + + vision := common.GetKvmVision() + + ticker := time.NewTicker(duration) + defer ticker.Stop() + + for range ticker.C { + if m.GetClientCount() == 0 { + log.Debugf("stop sending h264 stream") + return + } + + data, result := vision.ReadH264(screen.Width, screen.Height, screen.BitRate) + if result < 0 || len(data) == 0 { + continue + } + + sample := media.Sample{ + Data: data, + Duration: duration, + } + + for _, client := range m.clients { + client.track.writeVideo(sample) + } + + if screen.FPS != fps && screen.FPS != 0 { + fps = screen.FPS + duration = time.Second / time.Duration(fps) + ticker.Reset(duration) + } + + stream.GetFrameRateCounter().Update() + } +} diff --git a/server/service/stream/webrtc/signaling.go b/server/service/stream/webrtc/signaling.go new file mode 100644 index 0000000..7423989 --- /dev/null +++ b/server/service/stream/webrtc/signaling.go @@ -0,0 +1,149 @@ +package webrtc + +import ( + "encoding/json" + "errors" + + "github.com/pion/webrtc/v4" + log "github.com/sirupsen/logrus" +) + +func NewSignalingHandler(client *Client) *SignalingHandler { + return &SignalingHandler{ + client: client, + } +} + +// RegisterCallbacks Register callback functions +func (s *SignalingHandler) RegisterCallbacks() { + // video ICE candidate + s.client.video.OnICECandidate(func(candidate *webrtc.ICECandidate) { + if candidate == nil { + return + } + + candidateByte, err := json.Marshal(candidate.ToJSON()) + if err != nil { + log.Errorf("failed to marshal video candidate: %s", err) + return + } + + if err := s.client.WriteMessage("video-candidate", string(candidateByte)); err != nil { + log.Errorf("failed to send video candidate: %s", err) + } + }) + + manager := getManager() + + // video connection state change + s.client.video.OnICEConnectionStateChange(func(state webrtc.ICEConnectionState) { + if state == webrtc.ICEConnectionStateConnected { + manager.StartVideoStream() + } + + log.Debugf("video connection state changed to %s", state.String()) + }) +} + +// HandleMessage handle the received message +func (s *SignalingHandler) HandleMessage(message *Message) error { + switch message.Event { + case "video-offer": + return s.handleVideoOffer(message.Data) + case "video-candidate": + return s.handleVideoCandidate(message.Data) + case "heartbeat": + return s.handleHeartbeat() + default: + log.Debugf("Unhandled message event: %s", message.Event) + return nil + } +} + +func (s *SignalingHandler) handleVideoOffer(data string) error { + if s.client.video.SignalingState() != webrtc.SignalingStateStable { + err := errors.New("video signaling is not stable") + log.Error(err) + return err + } + + offer := webrtc.SessionDescription{} + if err := json.Unmarshal([]byte(data), &offer); err != nil { + log.Errorf("failed to unmarshal video offer: %s", err) + return err + } + + if err := s.client.video.SetRemoteDescription(offer); err != nil { + log.Errorf("failed to set remote description: %s", err) + return err + } + + answer, err := s.client.video.CreateAnswer(nil) + if err != nil { + log.Errorf("failed to create answer: %s", err) + return err + } + + if err := s.client.video.SetLocalDescription(answer); err != nil { + log.Errorf("failed to set local description: %s", err) + return err + } + + if err := s.updateHeaderExtensionID(); err != nil { + log.Errorf("could not update header extension ID: %v", err) + return err + } + + answerByte, err := json.Marshal(answer) + if err != nil { + log.Errorf("failed to marshal answer: %s", err) + return err + } + + return s.client.WriteMessage("video-answer", string(answerByte)) +} + +// set extension ID +func (s *SignalingHandler) updateHeaderExtensionID() error { + receivers := s.client.video.GetReceivers() + if len(receivers) == 0 { + return errors.New("no RTP receiver found for video") + } + + params := receivers[0].GetParameters() + if len(params.HeaderExtensions) == 0 { + return errors.New("no header extensions found in negotiated parameters") + } + + for _, ext := range params.HeaderExtensions { + if ext.URI == "http://www.webrtc.org/experiments/rtp-hdrext/playout-delay" { + s.client.track.playoutDelayExtensionID = uint8(ext.ID) + log.Debugf("found and set playout delay extension ID to: %d", ext.ID) + return nil + } + } + + log.Warnf("no track extension found in negotiated parameters, use default value 5") + return nil +} + +// handle video candidate +func (s *SignalingHandler) handleVideoCandidate(data string) error { + candidate := webrtc.ICECandidateInit{} + if err := json.Unmarshal([]byte(data), &candidate); err != nil { + log.Errorf("failed to unmarshal candidate: %s", err) + return err + } + + if err := s.client.video.AddICECandidate(candidate); err != nil { + log.Errorf("failed to add ICECandidate: %s", err) + return err + } + + return nil +} + +// handle heartbeat +func (s *SignalingHandler) handleHeartbeat() error { + return s.client.WriteMessage("heartbeat", "") +} diff --git a/server/service/stream/webrtc/track.go b/server/service/stream/webrtc/track.go new file mode 100644 index 0000000..3c3b279 --- /dev/null +++ b/server/service/stream/webrtc/track.go @@ -0,0 +1,53 @@ +package webrtc + +import ( + "github.com/pion/rtp" + "github.com/pion/webrtc/v4/pkg/media" + log "github.com/sirupsen/logrus" +) + +func (t *Track) updateExtension() { + if t.playoutDelayExtensionID == 0 { + t.playoutDelayExtensionID = 5 + } + + if t.playoutDelayExtensionData == nil || len(t.playoutDelayExtensionData) == 0 { + playoutDelay := &rtp.PlayoutDelayExtension{ + MinDelay: 0, + MaxDelay: 0, + } + playoutDelayExtensionData, err := playoutDelay.Marshal() + if err == nil { + t.playoutDelayExtensionData = playoutDelayExtensionData + } + } +} + +func (t *Track) writeVideoSample(sample media.Sample) error { + samples := uint32(sample.Duration.Seconds() * 90000) + packets := t.videoPacketizer.Packetize(sample.Data, samples) + + for _, p := range packets { + p.Header.Extension = true + p.Header.ExtensionProfile = 0xBEDE + + if err := p.Header.SetExtension(t.playoutDelayExtensionID, t.playoutDelayExtensionData); err != nil { + log.Errorf("Failed to set extension: %v", err) + return err + } + + if err := t.video.WriteRTP(p); err != nil { + log.Errorf("failed to write RTP: %v", err) + return err + } + } + + return nil +} + +func (t *Track) writeVideo(sample media.Sample) { + err := t.writeVideoSample(sample) + if err != nil { + log.Errorf("failed to write h264 video: %s", err) + } +} diff --git a/server/service/stream/webrtc/types.go b/server/service/stream/webrtc/types.go new file mode 100644 index 0000000..e109254 --- /dev/null +++ b/server/service/stream/webrtc/types.go @@ -0,0 +1,38 @@ +package webrtc + +import ( + "sync" + + "github.com/gorilla/websocket" + "github.com/pion/rtp" + "github.com/pion/webrtc/v4" +) + +type WebRTCManager struct { + clients map[*websocket.Conn]*Client + videoSending int32 + mutex sync.RWMutex +} + +type Client struct { + ws *websocket.Conn + video *webrtc.PeerConnection + track *Track + mutex sync.Mutex +} + +type SignalingHandler struct { + client *Client +} + +type Track struct { + playoutDelayExtensionID uint8 + playoutDelayExtensionData []byte + videoPacketizer rtp.Packetizer + video *webrtc.TrackLocalStaticRTP +} + +type Message struct { + Event string `json:"event"` + Data string `json:"data"` +} diff --git a/server/service/vm/hdmi.go b/server/service/vm/hdmi.go index f6556cb..c73e733 100644 --- a/server/service/vm/hdmi.go +++ b/server/service/vm/hdmi.go @@ -5,13 +5,12 @@ import ( "NanoKVM-Server/common" "NanoKVM-Server/proto" + "NanoKVM-Server/utils" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" ) -var hdmiEnabled = true - func (s *Service) ResetHdmi(c *gin.Context) { var rsp proto.Response @@ -20,7 +19,7 @@ func (s *Service) ResetHdmi(c *gin.Context) { vision.SetHDMI(false) time.Sleep(1 * time.Second) vision.SetHDMI(true) - hdmiEnabled = true + utils.PersistHDMIEnabled() rsp.OkRsp(c) log.Debug("reset hdmi") @@ -32,7 +31,7 @@ func (s *Service) EnableHdmi(c *gin.Context) { vision := common.GetKvmVision() vision.SetHDMI(true) - hdmiEnabled = true + utils.PersistHDMIEnabled() rsp.OkRsp(c) log.Debug("enable hdmi") @@ -44,7 +43,7 @@ func (s *Service) DisableHdmi(c *gin.Context) { vision := common.GetKvmVision() vision.SetHDMI(false) - hdmiEnabled = false + utils.PersistHDMIDisabled() rsp.OkRsp(c) log.Debug("disable hdmi") @@ -54,7 +53,7 @@ func (s *Service) GetHdmiState(c *gin.Context) { var rsp proto.Response rsp.OkRspWithData(c, &proto.GetGetHdmiStateRsp{ - Enabled: hdmiEnabled, + Enabled: !utils.IsHdmiDisabled(), }) log.Debug("get hdmi state") diff --git a/server/service/vm/hostname.go b/server/service/vm/hostname.go index a62a748..357f5c8 100644 --- a/server/service/vm/hostname.go +++ b/server/service/vm/hostname.go @@ -3,6 +3,7 @@ package vm import ( "fmt" "os" + "os/exec" "strings" "NanoKVM-Server/proto" @@ -14,6 +15,7 @@ import ( const ( BootHostnameFile = "/boot/hostname" EtcHostname = "/etc/hostname" + EtcHosts = "/etc/hosts" ) func (s *Service) SetHostname(c *gin.Context) { @@ -25,6 +27,29 @@ func (s *Service) SetHostname(c *gin.Context) { return } + dataRead, err := os.ReadFile(EtcHostname) + if err != nil { + rsp.ErrRsp(c, -1, "read Hostname failed") + return + } + + oldHostname := strings.Replace(string(dataRead), "\n", "", -1) + + if (oldHostname != req.Hostname) { + dataRead, err = os.ReadFile(EtcHosts) + if err != nil { + rsp.ErrRsp(c, -1, "read Hosts failed") + return + } + + data := []byte(strings.Replace(string(dataRead), oldHostname, req.Hostname, -1)) + + if err := os.WriteFile(EtcHosts, data, 0o644); err != nil { + rsp.ErrRsp(c, -2, "failed to write data") + return + } + } + data := []byte(fmt.Sprintf("%s", req.Hostname)) if err := os.WriteFile(BootHostnameFile, data, 0o644); err != nil { @@ -39,6 +64,8 @@ func (s *Service) SetHostname(c *gin.Context) { rsp.OkRsp(c) log.Debugf("set Hostname: %s", req.Hostname) + + _ = exec.Command("hostname", "-F", EtcHostname).Run() } func (s *Service) GetHostname(c *gin.Context) { diff --git a/server/service/vm/jiggler/jiggler.go b/server/service/vm/jiggler/jiggler.go index 19621a4..4cac43f 100644 --- a/server/service/vm/jiggler/jiggler.go +++ b/server/service/vm/jiggler/jiggler.go @@ -1,6 +1,7 @@ package jiggler import ( + "NanoKVM-Server/service/hid" "os" "strings" "sync" @@ -117,3 +118,17 @@ func (j *Jiggler) IsEnabled() bool { func (j *Jiggler) GetMode() string { return j.mode } + +func move(mode string) { + h := hid.GetHid() + + if mode == "absolute" { + h.WriteHid2([]byte{0x00, 0x00, 0x3f, 0x00, 0x3f, 0x00}) + time.Sleep(100 * time.Millisecond) + h.WriteHid2([]byte{0x00, 0xff, 0x3f, 0xff, 0x3f, 0x00}) + } else { + h.WriteHid1([]byte{0x00, 0xa, 0xa, 0x00}) + time.Sleep(100 * time.Millisecond) + h.WriteHid1([]byte{0x00, 0xf6, 0xf6, 0x00}) + } +} diff --git a/server/service/vm/jiggler/mouse.go b/server/service/vm/jiggler/mouse.go deleted file mode 100644 index 7575088..0000000 --- a/server/service/vm/jiggler/mouse.go +++ /dev/null @@ -1,55 +0,0 @@ -package jiggler - -import ( - "os" - "time" - - log "github.com/sirupsen/logrus" -) - -func move(mode string) { - var ( - hid string - data [][]byte - ) - - if mode == "absolute" { - hid = "/dev/hidg2" - data = [][]byte{ - {0x00, 0x00, 0x3f, 0x00, 0x3f, 0x00}, - {0x00, 0xff, 0x3f, 0xff, 0x3f, 0x00}, - } - } else { - hid = "/dev/hidg1" - data = [][]byte{ - {0x00, 0x0a, 0x0a, 0x00}, - {0x00, 0xf6, 0xf6, 0x00}, - } - } - - write(hid, data) -} - -func write(hid string, data [][]byte) { - file, err := os.OpenFile(hid, os.O_WRONLY, 0o666) - if err != nil { - log.Errorf("failed to open %s: %s", hid, err) - return - } - defer func() { - _ = file.Close() - }() - - for _, b := range data { - deadline := time.Now().Add(8 * time.Millisecond) - if err := file.SetWriteDeadline(deadline); err != nil { - log.Errorf("failed to set deadline: %s", err) - return - } - - if _, err := file.Write(b); err != nil { - log.Errorf("failed to write: %s", err) - return - } - } -} diff --git a/server/service/vm/mouse-jiggler.go b/server/service/vm/mouse_jiggler.go similarity index 100% rename from server/service/vm/mouse-jiggler.go rename to server/service/vm/mouse_jiggler.go diff --git a/server/service/vm/virtual-device.go b/server/service/vm/virtual-device.go index 2eb40e9..3804526 100644 --- a/server/service/vm/virtual-device.go +++ b/server/service/vm/virtual-device.go @@ -14,7 +14,8 @@ import ( const ( virtualNetwork = "/boot/usb.rndis0" - virtualDisk = "/boot/usb.disk0" + virtualMedia = "/boot/usb.disk0" + virtualDisk = "/boot/usb.disk1" ) var ( @@ -31,16 +32,29 @@ var ( "/etc/init.d/S03usbdev start", } - mountDiskCommands = []string{ + mountMediaCommands = []string{ "touch /boot/usb.disk0", "/etc/init.d/S03usbdev stop", "/etc/init.d/S03usbdev start", } + unmountMediaCommands = []string{ + "/etc/init.d/S03usbdev stop", + "rm -rf /sys/kernel/config/usb_gadget/g0/configs/c.1/mass_storage.disk0", + "rm /boot/usb.disk0", + "/etc/init.d/S03usbdev start", + } + + mountDiskCommands = []string{ + "touch /boot/usb.disk1", + "/etc/init.d/S03usbdev stop", + "/etc/init.d/S03usbdev start", + } + unmountDiskCommands = []string{ "/etc/init.d/S03usbdev stop", - "rm -rf /sys/kernel/config/usb_gadget/g0/configs/c.1/mass_storage.disk0", - "rm /boot/usb.disk0", + "rm -rf /sys/kernel/config/usb_gadget/g0/configs/c.1/mass_storage.disk1", + "rm /boot/usb.disk1", "/etc/init.d/S03usbdev start", } ) @@ -49,10 +63,12 @@ func (s *Service) GetVirtualDevice(c *gin.Context) { var rsp proto.Response network, _ := isDeviceExist(virtualNetwork) + media, _ := isDeviceExist(virtualMedia) disk, _ := isDeviceExist(virtualDisk) rsp.OkRspWithData(c, &proto.GetVirtualDeviceRsp{ Network: network, + Media: media, Disk: disk, }) log.Debugf("get virtual device success") @@ -80,6 +96,15 @@ func (s *Service) UpdateVirtualDevice(c *gin.Context) { } else { commands = unmountNetworkCommands } + case "media": + device = virtualMedia + + exist, _ := isDeviceExist(device) + if !exist { + commands = mountMediaCommands + } else { + commands = unmountMediaCommands + } case "disk": device = virtualDisk diff --git a/server/service/vm/web-title.go b/server/service/vm/web_title.go similarity index 100% rename from server/service/vm/web-title.go rename to server/service/vm/web_title.go diff --git a/server/utils/hdmi.go b/server/utils/hdmi.go new file mode 100644 index 0000000..493f97b --- /dev/null +++ b/server/utils/hdmi.go @@ -0,0 +1,38 @@ +package utils + +import ( + "os" + + log "github.com/sirupsen/logrus" +) + +const ( + HDMIDisableFile = "/etc/kvm/hdmi_disable" +) + +func PersistHDMIDisabled() { + f, err := os.OpenFile(HDMIDisableFile, os.O_CREATE|os.O_RDONLY, 0644) + if err != nil { + log.Error("failed to create hdmi disable file:", err) + return + } + f.Close() +} + +func PersistHDMIEnabled() { + if err := os.Remove(HDMIDisableFile); err != nil { + log.Error("failed to remove hdmi disable file:", err) + return + } +} + +func IsHdmiDisabled() bool { + if _, err := os.Stat(HDMIDisableFile); err != nil { + if os.IsNotExist(err) { + return false // HDMI is enabled + } + log.Error("failed to check hdmi disable file:", err) + return false // Assume HDMI is enabled on error + } + return true // HDMI is disabled +} diff --git a/server/utils/move-file.go b/server/utils/move_file.go similarity index 100% rename from server/utils/move-file.go rename to server/utils/move_file.go diff --git a/tools/nanokvm_update_edid/E21_NanoKVM.bin b/tools/nanokvm_update_edid/E21_NanoKVM.bin new file mode 100644 index 0000000..005cad4 Binary files /dev/null and b/tools/nanokvm_update_edid/E21_NanoKVM.bin differ diff --git a/tools/nanokvm_update_edid/Makefile b/tools/nanokvm_update_edid/Makefile new file mode 100644 index 0000000..9b7b9ca --- /dev/null +++ b/tools/nanokvm_update_edid/Makefile @@ -0,0 +1,22 @@ +# CROSS_COMPILE = aarch64-none-linux-gnu- +# CROSS_COMPILE = riscv64-unknown-linux-gnu- +CROSS_COMPILE = riscv64-unknown-linux-musl- +# CROSS_COMPILE = riscv64-unknown-elf- + +CFLAGS += -I/usr/local/RISC-V-toolchain/riscv64-linux-musl-x86_64/sysroot/usr/include + +CC = $(CROSS_COMPILE)gcc + +SRC = nanokvm_update_edid.c + +TARGET = nanokvm_update_edid + +all: $(TARGET) + +$(TARGET): $(SRC) + $(CC) -march=rv64gc -o $@ $^ + +clean: + rm -f $(TARGET) + +.PHONY: all clean \ No newline at end of file diff --git a/tools/nanokvm_update_edid/nanokvm_update_edid b/tools/nanokvm_update_edid/nanokvm_update_edid new file mode 100755 index 0000000..8b2489e Binary files /dev/null and b/tools/nanokvm_update_edid/nanokvm_update_edid differ diff --git a/tools/nanokvm_update_edid/nanokvm_update_edid.c b/tools/nanokvm_update_edid/nanokvm_update_edid.c new file mode 100644 index 0000000..4a829ee --- /dev/null +++ b/tools/nanokvm_update_edid/nanokvm_update_edid.c @@ -0,0 +1,749 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "nanokvm_update_edid.h" + + +int client; +// old offset set to 0xff first +static uint8_t old_offset = 0xff; + +// ======================================================================================================= + +int get_edid_from_file(const char *filename, uint8_t *edid_data, uint16_t *edid_size) { + FILE *file = fopen(filename, "rb"); + if (!file) { + perror("Failed to open EDID file"); + return -1; + } + + *edid_size = fread(edid_data, 1, EDID_BUFFER_SIZE, file); + fclose(file); + + return 0; +} + +int check_edid(uint8_t *edid_data, uint16_t edid_size) +{ + uint16_t i; + // Check if the EDID data length is valid + if (edid_size != EDID_BUFFER_SIZE) { + fprintf(stderr, "EDID data length is not %d bytes\n", EDID_BUFFER_SIZE); + return -1; // EDID data length is not enough + } + + // Check EDID header + if (edid_data[0] != 0x00 || edid_data[1] != 0xFF || + edid_data[2] != 0xFF || edid_data[3] != 0xFF || + edid_data[4] != 0xFF || edid_data[5] != 0xFF || + edid_data[6] != 0xFF || edid_data[7] != 0x00) { + fprintf(stderr, "EDID header is invalid\n"); + return -1; // EDID header is invalid + } + + // First 128 Bytes checksum + uint8_t checksum1 = 0; + for (i = 0; i < 127; i++) { + checksum1 += edid_data[i]; + } + checksum1 = 0x100 - checksum1; // Reverse + if (checksum1 != edid_data[127]) { + // Checksum for first 128 bytes is incorrect + fprintf(stderr, "Checksum for first 128 bytes is incorrect\n"); + return -1; + } + + // Second 128 Bytes checksum + uint8_t checksum2 = 0; + for (i = 128; i < 255; i++) { + checksum2 += edid_data[i]; + } + checksum2 = 0x100 - checksum2; // Reverse + if (checksum2 != edid_data[255]) { + // Checksum for second 128 bytes is incorrect + fprintf(stderr, "Checksum for second 128 bytes is incorrect\n"); + return -1; + } + + return 0; // EDID is valid +} + +// ======================================================================================================= + +void NanoKVM_PCIe_HDMI_Reset(void) +{ + system("echo 0 > /sys/class/gpio/gpio451/value"); + usleep(100000); + system("echo 1 > /sys/class/gpio/gpio451/value"); + usleep(100000); +} + +// ======================================================================================================= + +// I2C write function +int i2c_write_byte(uint8_t offset, uint8_t reg, uint8_t data) +{ + // reg buffer + uint8_t reg_buf[2] = {0}; + + // if offset is changed, write it first + if (offset != old_offset) { + old_offset = offset; + reg_buf[0] = LT6911_REG_OFFSET; // Set the offset register + reg_buf[1] = offset; // Set the register to read + if (write(client, reg_buf, 2) != 2) { + perror("Failed to write offset to the i2c bus"); + return -1; + } + } + + // write the data to the i2c bus + reg_buf[0] = reg; // Set the register to write + reg_buf[1] = data; // Set the data to write + if (write(client, reg_buf, 2) != 2) { + perror("Failed to write to the i2c bus"); + return -1; + } + return 0; +} + +int i2c_write_bytes(uint8_t offset, uint8_t reg, const uint8_t *data, size_t len) +{ + // check len + if (len == 0) { + fprintf(stderr, "Data length must be greater than 0.\n"); + return -1; + } + + // reg buffer + uint8_t reg_buf[1 + len]; + + // if offset is changed, write it first + if (offset != old_offset) { + old_offset = offset; + reg_buf[0] = LT6911_REG_OFFSET; // Set the offset register + reg_buf[1] = offset; // Set the register to read + if (write(client, reg_buf, 2) != 2) { + perror("Failed to write offset to the i2c bus"); + return -1; + } + } + + // write the data to the i2c bus + reg_buf[0] = reg; + for (size_t i = 0; i < len; i++) { + reg_buf[i + 1] = data[i]; + } + + // write to the I2C bus + if (write(client, reg_buf, 1 + len) != 1 + len) { + perror("Failed to write to the i2c bus"); + return -1; + } + + return 0; +} + +// I2C read function +int i2c_read_byte(uint8_t offset, uint8_t reg, uint8_t *data) +{ + // reg buffer + uint8_t reg_buf[2] = {0}; + + // if offset is changed, write it first + if (offset != old_offset) { + old_offset = offset; + reg_buf[0] = LT6911_REG_OFFSET; // Set the offset register + reg_buf[1] = offset; // Set the register to read + if (write(client, reg_buf, 2) != 2) { + perror("Failed to write offset to the i2c bus"); + return -1; + } + } + + // write the register address to read + reg_buf[0] = reg; // Set the register to read + if (write(client, reg_buf, 1) != 1) { + perror("Failed to write register address to the i2c bus"); + return -1; + } + + // read the data from the i2c bus + if (read(client, data, 1) != 1 ) { + perror("Failed to read from the i2c bus"); + return -1; + } + + return 0; +} + +int i2c_read_bytes(uint8_t offset, uint8_t reg, uint8_t *data, size_t len) +{ + // 检查数据长度 + if (len == 0) { + fprintf(stderr, "Data length must be greater than 0.\n"); + return -1; + } + + uint8_t reg_buf[2]; // 创建寄存器缓冲区 + + // 如果偏移量改变，先写入偏移量 + if (offset != old_offset) { + old_offset = offset; + reg_buf[0] = LT6911_REG_OFFSET; // 设置偏移寄存器 + reg_buf[1] = offset; // 设置偏移值 + if (write(client, reg_buf, 2) != 2) { + perror("Failed to write offset to the i2c bus"); + return -1; + } + } + + // 写入要读取的寄存器地址 + reg_buf[0] = reg; // 设置要读取的寄存器 + if (write(client, reg_buf, 1) != 1) { + perror("Failed to write register address to the i2c bus"); + return -1; + } + + // 从 I2C 总线读取数据 + if (read(client, data, len) != len) { + perror("Failed to read from the i2c bus"); + return -1; + } + + return 0; +} + +// ======================================================================================================= + +int lt6911_enable(void) { + // Enable the LT6911UXC by writing to the appropriate register + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xEE, 0x01) != 0) { + fprintf(stderr, "Failed to enable LT6911UXC\n"); + return -1; + } + return 0; +} + +int lt6911_disable(void) { + // Disable the LT6911UXC by writing to the appropriate register + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xEE, 0x00) != 0) { + fprintf(stderr, "Failed to disable LT6911UXC\n"); + return -1; + } + return 0; +} + +// ======================================================================================================= + +int lt6911uxc_edid_write(uint8_t *edid_data, uint16_t edid_size) +{ + uint8_t i; + int ret; + uint8_t chip_data[16] = {0}; + uint8_t wr_count = edid_size / LT6911UXC_WR_SIZE + 1; + uint8_t version_str[32] = {0}; + + fprintf(stdout, "Writing EDID....\n"); + + // Start + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5E, 0xDF) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x58, 0x00) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x59, 0x51) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x10) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x00) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x58, 0x21) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x84) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5B, 0x01) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5C, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5D, 0x00) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x81) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + // Waiting for erasure + usleep(500000); + + if (i2c_read_byte(LT6911_SYS3_OFFSET, 0x08, chip_data) != 0) return -1; + if (chip_data[0] != 0xEE) { + fprintf(stderr, "Unsupported chip version\n"); + return -1; + } + if (i2c_write_byte(LT6911_SYS3_OFFSET, 0x08, 0xAE) != 0) return -1; + if (i2c_write_byte(LT6911_SYS3_OFFSET, 0x08, 0xEE) != 0) return -1; + // Write + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x84) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x84) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + for (i = 0; i < wr_count; i++) { + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5E, 0xDF) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x20) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x00) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x58, 0x21) != 0) return -1; + if (i != wr_count-1) { + if (i2c_write_bytes(LT6911_SYS_OFFSET, 0x59, edid_data+(LT6911UXC_WR_SIZE*i), LT6911UXC_WR_SIZE) != 0) return -1; + } else { + if (i2c_write_bytes(LT6911_SYS_OFFSET, 0x59, version_str, LT6911UXC_WR_SIZE) != 0) return -1; + } + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5B, 0x01) != 0) return -1; + if (i != wr_count-1) { + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5C, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5D, 0x00+(LT6911UXC_WR_SIZE*i)) != 0) return -1; + } else { + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5C, 0x81) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5D, 0x00) != 0) return -1; + } + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5E, 0xC0) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x90) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + if (i != wr_count-1) { + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x84) != 0) return -1; + } else { + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x88) != 0) return -1; + } + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + } + if (i2c_read_byte(LT6911_SYS3_OFFSET, 0x08, chip_data) != 0) return -1; + if (chip_data[0] != 0xEE) return -1; + if (i2c_write_byte(LT6911_SYS3_OFFSET, 0x08, 0xAE) != 0) return -1; + if (i2c_write_byte(LT6911_SYS3_OFFSET, 0x08, 0xEE) != 0) return -1; + + fprintf(stdout, "EDID write completed\n"); + + return 0; +} + +int lt6911uxc_edid_read(uint8_t *edid_data, uint16_t edid_size) +{ + uint8_t i; + int ret; + uint8_t chip_data[16] = {0}; + uint8_t wr_count = edid_size / LT6911UXC_WR_SIZE; + + // Read EDID data from LT6911UXC + fprintf(stdout, "Reading EDID...\n"); + // Read + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x84) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + for (i = 0; i < wr_count; i++) { + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5E, 0x5F) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0xA0) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5B, 0x01) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5C, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5D, 0x00+(LT6911UXC_WR_SIZE*i)) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x90) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x58, 0x21) != 0) return -1; + if (i2c_read_bytes(LT6911_SYS_OFFSET, 0x5F, edid_data+(LT6911UXC_WR_SIZE*i), LT6911UXC_WR_SIZE) != 0) return -1; + } + + return 0; +} + +int lt6911c_edid_write(uint8_t *edid_data, uint16_t edid_size) +{ + uint8_t i; + int ret; + uint8_t chip_data[16] = {0}; + uint8_t wr_count = edid_size / LT6911C_WR_SIZE; + uint8_t version_str[32] = {0}; + + fprintf(stdout, "Writing EDID....\n"); + + // Start + lt6911_enable(); + if (i2c_read_bytes(LT6911_SYS4_OFFSET, 0x00, chip_data, 2) != 0) return -1; + if (chip_data[0] != 0x16 || chip_data[1] != 0x05) { + fprintf(stderr, "Unsupported chip version\n"); + return -1; + } + lt6911_disable(); + + usleep(100000); + + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_read_bytes(LT6911_SYS4_OFFSET, 0x00, chip_data, 2) != 0) return -1; + if (chip_data[0] != 0x16 || chip_data[1] != 0x05) { + fprintf(stderr, "Unsupported chip version\n"); + return -1; + } + lt6911_disable(); + + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5E, 0xC0) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x58, 0x00) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x59, 0x51) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x92) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x86) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5B, 0x01) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5C, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5D, 0x00) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x83) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + + // waiting to clean + usleep(500000); + if (i2c_read_byte(LT6911_SYS2_OFFSET, 0x02, chip_data) != 0) return -1; + if (chip_data[0] != 0xFF) { + fprintf(stderr, "Clean Error\n"); + return -1; + } + if (i2c_write_byte(LT6911_SYS2_OFFSET, 0x02, 0xDF) != 0) return -1; + if (i2c_write_byte(LT6911_SYS2_OFFSET, 0x02, 0xFF) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x86) != 0) return -1; + + for (i = 0; i < wr_count; i++) { + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x86) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5E, 0xEF) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0xA2) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x58, 0x01) != 0) return -1; + if (i2c_write_bytes(LT6911_SYS_OFFSET, 0x59, edid_data+(LT6911C_WR_SIZE*i), LT6911C_WR_SIZE) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5B, 0x01) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5C, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5D, 0x00+(LT6911C_WR_SIZE*i)) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5E, 0xE0) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x92) != 0) return -1; + } + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x8A) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_read_byte(LT6911_SYS2_OFFSET, 0x02, chip_data) != 0) return -1; + if (chip_data[0] != 0xFF) return -1; + if (i2c_write_byte(LT6911_SYS2_OFFSET, 0x02, 0xDF) != 0) return -1; + if (i2c_write_byte(LT6911_SYS2_OFFSET, 0x02, 0xFF) != 0) return -1; + + fprintf(stdout, "EDID write completed\n"); + + return 0; +} + +int lt6911c_edid_read(uint8_t *edid_data, uint16_t edid_size) +{ + uint8_t i; + int ret; + uint8_t chip_data[16] = {0}; + uint8_t wr_count = edid_size / LT6911C_WR_SIZE; + + // Read EDID data from LT6911UXC + fprintf(stdout, "Reading EDID...\n"); + // Read + + if (i2c_write_byte(LT6911_SYS_OFFSET, 0xFF, 0x80) != 0) return -1; + lt6911_enable(); + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x86) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + + for (i = 0; i < wr_count; i++) { + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5E, 0x6F) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0xA2) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5B, 0x01) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5C, 0x80) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5D, 0x00+(LT6911C_WR_SIZE*i)) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x92) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x5A, 0x82) != 0) return -1; + if (i2c_write_byte(LT6911_SYS_OFFSET, 0x58, 0x01) != 0) return -1; + if (i2c_read_bytes(LT6911_SYS_OFFSET, 0x5F, edid_data+(LT6911C_WR_SIZE*i), LT6911C_WR_SIZE) != 0) return -1; + } + + return 0; +} + +// ======================================================================================================= + +int lt6911_edid_config(chip_version_t chip_version, uint8_t *edid_data, uint16_t edid_size) +{ + if (chip_version == CHIP_UNKNOWN) + { + fprintf(stderr, "Unknown chip version\n"); + return -1; + } + + // open i2c device + if ((client = open(I2C_DEVICE, O_RDWR)) < 0) { + perror("Failed to open the i2c bus"); + return -1; + } + + // // set the lt6911uxc address + if (ioctl(client, I2C_SLAVE, I2C_ADDRESS) < 0) { + perror("Failed to acquire bus access and/or talk to slave"); + close(client); + return -1; + } + + // edid write + if (chip_version == CHIP_LT6911UXC) { + if (lt6911uxc_edid_write(edid_data, edid_size) != 0) { + fprintf(stderr, "Failed to write EDID data to LT6911UXC\n"); + close(client); + return -1; + } + } else if (chip_version == CHIP_LT6911C) { + if (lt6911c_edid_write(edid_data, edid_size) != 0) { + fprintf(stderr, "Failed to write EDID data to LT6911C\n"); + close(client); + return -1; + } + } else { + fprintf(stderr, "Unknown chip version\n"); + close(client); + return -1; + } + // sleep 1s + sleep(1); + + // read edid data back + uint8_t edid_read_data[EDID_BUFFER_SIZE] = {0}; + if (chip_version == CHIP_LT6911UXC) { + if (lt6911uxc_edid_read(edid_read_data, EDID_BUFFER_SIZE) != 0) { + fprintf(stderr, "Failed to read EDID data from LT6911UXC\n"); + close(client); + return -1; + } + } else if (chip_version == CHIP_LT6911C) { + if (lt6911c_edid_read(edid_read_data, EDID_BUFFER_SIZE) != 0) { + fprintf(stderr, "Failed to read EDID data from LT6911C\n"); + close(client); + return -1; + } + } else { + fprintf(stderr, "Unknown chip version\n"); + close(client); + return -1; + } + + // check if the read data matches the written data + if (memcmp(edid_data, edid_read_data, EDID_BUFFER_SIZE) != 0) { + fprintf(stderr, "EDID data mismatch after write/read cycle\n"); + // print edid with 16*16 hex format + fprintf(stderr, "Written EDID data:\n"); + for (int i = 0; i < EDID_BUFFER_SIZE; i++) { + fprintf(stderr, "%02X ", edid_data[i]); + if ((i + 1) % 16 == 0) { + fprintf(stderr, "\n"); + } + } + fprintf(stderr, "\nRead EDID data:\n"); + for (int i = 0; i < EDID_BUFFER_SIZE; i++) { + fprintf(stderr, "%02X ", edid_read_data[i]); + if ((i + 1) % 16 == 0) { + fprintf(stderr, "\n"); + } + } + close(client); + return -1; + } else { + fprintf(stdout, "EDID data verified successfully\n"); + } + + // close client + close(client); + return 0; +} + +// ======================================================================================================= + +void print_warning(product_version_t product_version) { + printf("\n=========================================================\n"); + printf("Incorrect EDID may cause issues such as \n"); + printf("inability to display images, please modify with caution\n"); + printf("=========================================================\n\n"); + + if (product_version == PRODUCT_CUBE_A || product_version == PRODUCT_CUBE_B) { + printf("\n==========================================================\n"); + printf("⚠️ WARNING: Hardware version detected as Cube/Lite!\n"); + printf("==========================================================\n"); + printf("After flashing, you MUST manually power cycle the device!\n"); + printf("Please ensure you can physically disconnect its power,\n"); + printf("NOT just remotely reboot it!!\n"); + printf("==========================================================\n\n"); + } +} + +void print_success(product_version_t product_version) { + printf("\n=========================================================\n"); + printf("✅ EDID update successful!\n"); + if (product_version == PRODUCT_CUBE_A || product_version == PRODUCT_CUBE_B) { + printf("Please manually power cycle the device to apply changes.\n"); + } + printf("=========================================================\n\n"); +} + +int get_user_confirmation() { + char input[256]; + printf("Do you want to continue? (Y/N): \n"); + + while (1) { + + if (fgets(input, sizeof(input), stdin) == NULL) { + printf("\nInput error. Exiting.\n"); + return 0; + } + + // 去除换行符 + input[strcspn(input, "\n")] = '\0'; + + if (strlen(input) == 0) { + continue; // 空输入，重新提示 + } + + // 转换为小写方便比较 + char choice = tolower(input[0]); + + if (choice == 'y') { + return 1; + } else if (choice == 'n') { + return 0; + } else { + printf("Invalid input. Please enter Y or N.\n"); + } + } +} + +// ======================================================================================================= + +int main(int argc, char *argv[]) { + + uint8_t counter = 0; + + // Check version + chip_version_t chip_version = CHIP_UNKNOWN; + product_version_t product_version = PRODUCT_UNKNOWN; + char chip_version_str[32] = {0}; + char product_version_str[32] = {0}; + + FILE *file = fopen(VERSION_PATH, "r"); + if (file == NULL) { + fprintf(stderr, "Please upgrade to the latest system\n"); + return 1; + } + + if (fgets(chip_version_str, sizeof(chip_version_str), file) == NULL) { + fprintf(stderr, "Failed to read chip version\n"); + fclose(file); + return 1; + } + fclose(file); + + file = fopen(PRODUCT_PATH, "r"); + if (file == NULL) { + fprintf(stderr, "Please upgrade to the latest system\n"); + return 1; + } + + if (fgets(product_version_str, sizeof(product_version_str), file) == NULL) { + fprintf(stderr, "Failed to read product version\n"); + fclose(file); + return 1; + } + fclose(file); + + chip_version_str[strcspn(chip_version_str, "\n")] = '\0'; + product_version_str[strcspn(product_version_str, "\n")] = '\0'; + + if (strcmp(chip_version_str, "c") == 0) { + fprintf(stdout, "Chip Version: LT6911C\n"); + chip_version = CHIP_LT6911C; + } else if (strcmp(chip_version_str, "ux") == 0) { + fprintf(stdout, "Chip Version: LT6911UXC\n"); + chip_version = CHIP_LT6911UXC; + } else if (strcmp(chip_version_str, "ue") == 0) { + fprintf(stderr, "Chip Version Error: UE version's edid can't be updated\n"); + return 1; + } else { + fprintf(stderr, "Chip Version Error: Unknown version\n"); + return 1; + } + + if (strcmp(product_version_str, "alpha") == 0) { + fprintf(stdout, "Product Version: CUBE_A\n"); + product_version = PRODUCT_CUBE_A; + } else if (strcmp(product_version_str, "beta") == 0) { + fprintf(stdout, "Product Version: CUBE_B\n"); + product_version = PRODUCT_CUBE_B; + } else if (strcmp(product_version_str, "pcie") == 0) { + fprintf(stdout, "Product Version : PCIE_A\n"); + product_version = PRODUCT_PCIE_A; + } else { + fprintf(stderr, "Product Version Error: Unknown version\n"); + return 1; + } + + print_warning(product_version); + if (product_version == PRODUCT_CUBE_A || product_version == PRODUCT_CUBE_B) { + if (get_user_confirmation() == 0) { + return EXIT_FAILURE; + } + } + + // check command line arguments + if (argc != 2) { + fprintf(stderr, "Please enter the location of the EDID file using \"%s /path/to/edid.bin\"\n", argv[0]); + return EXIT_FAILURE; + } + + uint16_t edid_size = 0; + uint8_t edid_data[EDID_BUFFER_SIZE] = {0}; + if (get_edid_from_file(argv[1], edid_data, &edid_size) != 0) { + fprintf(stderr, "Failed to read EDID data from file %s\n", argv[1]); + return EXIT_FAILURE; + } + if (check_edid(edid_data, edid_size) != 0) { + fprintf(stderr, "EDID data is invalid\n"); + return EXIT_FAILURE; + } + fprintf(stdout, "EDID data loaded successfully from %s\n", argv[1]); + + if (product_version == PRODUCT_PCIE_A) NanoKVM_PCIe_HDMI_Reset(); + + // configure lt6911 edid + if (lt6911_edid_config(chip_version, edid_data, edid_size) != 0) { + fprintf(stderr, "Failed to configure LT6911 EDID\n"); + return EXIT_FAILURE; + } + + if (product_version == PRODUCT_PCIE_A) NanoKVM_PCIe_HDMI_Reset(); + + print_success(product_version); + + return EXIT_SUCCESS; +} diff --git a/tools/nanokvm_update_edid/nanokvm_update_edid.h b/tools/nanokvm_update_edid/nanokvm_update_edid.h new file mode 100644 index 0000000..ed743fb --- /dev/null +++ b/tools/nanokvm_update_edid/nanokvm_update_edid.h @@ -0,0 +1,41 @@ +#ifndef NANOKVM_UPDATE_EDID_H +#define NANOKVM_UPDATE_EDID_H + +#define I2C_DEVICE "/dev/i2c-4" // I2C 设备文件 +#define EDID_BUFFER_SIZE 256 // 最大支持的字节数 + +#define I2C_ADDRESS 0x2b // I2C 设备地址（根据实际设备调整） +#define LT6911_REG_OFFSET 0xFF // LT6911UXC 寄存器偏移地址 +#define LT6911_SYS_OFFSET 0x80 // LT6911UXC 寄存器偏移地址 +#define LT6911_SYS2_OFFSET 0x90 // LT6911UXC 寄存器偏移地址 +#define LT6911_SYS3_OFFSET 0x81 // LT6911UXC 寄存器偏移地址 +#define LT6911_SYS4_OFFSET 0xA0 // LT6911UXC 寄存器偏移地址 +#define LT6911_CSI_INFO_OFFSET 0x85 // LT6911UXC CSI接口信息寄存器偏移地址 +#define LT6911_HDMI_INFO_OFFSET 0x86 // LT6911UXC HDMI信息寄存器偏移地址 +#define LT6911_CSI_TOTAL_OFFSET 0xD4 // LT6911UXC CSI总线统计信息 +#define LT6911_AUDIO_INFO_OFFSET 0xB0 // LT6911UXC 音频信息寄存器偏移地址 +#define LT6911C_HDMI_INFO_OFFSET 0xD2 // LT6911C HDMI信息寄存器偏移地址 +#define LT6911C_AUDIO_INFO_OFFSET 0xD1 // LT6911C 音频信息寄存器偏移地址 +#define LT6911C_CSI_INFO_OFFSET 0xC2 // LT6911C CSI信息寄存器偏移地址 + +#define EDID_BUFFER_SIZE 256 // 最大支持的字节数 +#define LT6911UXC_WR_SIZE 32 // LT6911UXC单次读写最大字节数 +#define LT6911C_WR_SIZE 16 // LT6911C单次读写最大字节数 + +#define VERSION_PATH "/etc/kvm/hdmi_version" +#define PRODUCT_PATH "/etc/kvm/hw" + +typedef enum { + CHIP_LT6911UXC = 0, + CHIP_LT6911C, + CHIP_UNKNOWN +} chip_version_t; + +typedef enum { + PRODUCT_CUBE_A = 0, + PRODUCT_CUBE_B, + PRODUCT_PCIE_A, + PRODUCT_UNKNOWN, +} product_version_t; + +#endif // NANOKVM_UPDATE_EDID_H \ No newline at end of file diff --git a/web/package.json b/web/package.json index bed5178..ca97c7e 100644 --- a/web/package.json +++ b/web/package.json @@ -11,12 +11,12 @@ "preview": "vite preview" }, "dependencies": { - "@ant-design/icons": "^5.5.1", + "@ant-design/icons": "^5.6.1", "@xterm/addon-attach": "^0.11.0", "@xterm/addon-fit": "^0.10.0", "@xterm/xterm": "^5.5.0", - "antd": "^5.21.6", - "axios": "^1.8.4", + "antd": "^5.29.1", + "axios": "1.12.0", "clsx": "^2.1.1", "crypto-js": "^4.2.0", "i18next": "^23.16.4", @@ -38,18 +38,18 @@ "yocto-queue": "^1.2.1" }, "devDependencies": { - "@ianvs/prettier-plugin-sort-imports": "^4.3.1", + "@ianvs/prettier-plugin-sort-imports": "^4.7.0", "@types/crypto-js": "^4.2.2", "@types/js-cookie": "^3.0.6", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", "@types/semver": "^7.5.8", "@types/websocket": "^1.0.10", - "@typescript-eslint/eslint-plugin": "^8.19.1", - "@typescript-eslint/parser": "^8.19.1", - "@vitejs/plugin-react": "^4.3.3", + "@typescript-eslint/eslint-plugin": "^8.48.0", + "@typescript-eslint/parser": "^8.48.0", + "@vitejs/plugin-react": "^4.7.0", "autoprefixer": "^10.4.20", - "eslint": "^9.17.0", + "eslint": "^9.39.1", "eslint-config-prettier": "^9.1.0", "eslint-plugin-react": "^7.37.2", "eslint-plugin-react-hooks": "^5.1.0", @@ -58,9 +58,9 @@ "postcss": "^8.4.47", "prettier": "^3.4.2", "prettier-plugin-tailwindcss": "^0.6.9", - "tailwindcss": "^3.4.14", + "tailwindcss": "^3.4.18", "typescript": "^5.6.3", - "vite": "^6.2.1", + "vite": "7.1.11", "vite-tsconfig-paths": "^4.3.2" }, "msw": { diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 36e5dbb..56aa94e 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@ant-design/icons': - specifier: ^5.5.1 - version: 5.5.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.6.1 + version: 5.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@xterm/addon-attach': specifier: ^0.11.0 version: 0.11.0(@xterm/xterm@5.5.0) @@ -21,11 +21,11 @@ importers: specifier: ^5.5.0 version: 5.5.0 antd: - specifier: ^5.21.6 - version: 5.21.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.29.1 + version: 5.29.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) axios: - specifier: ^1.8.4 - version: 1.8.4 + specifier: 1.12.0 + version: 1.12.0 clsx: specifier: ^2.1.1 version: 2.1.1 @@ -85,8 +85,8 @@ importers: version: 1.2.1 devDependencies: '@ianvs/prettier-plugin-sort-imports': - specifier: ^4.3.1 - version: 4.3.1(prettier@3.4.2) + specifier: ^4.7.0 + version: 4.7.0(prettier@3.4.2) '@types/crypto-js': specifier: ^4.2.2 version: 4.2.2 @@ -106,32 +106,32 @@ importers: specifier: ^1.0.10 version: 1.0.10 '@typescript-eslint/eslint-plugin': - specifier: ^8.19.1 - version: 8.19.1(@typescript-eslint/parser@8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3) + specifier: ^8.48.0 + version: 8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3))(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3) '@typescript-eslint/parser': - specifier: ^8.19.1 - version: 8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3) + specifier: ^8.48.0 + version: 8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3) '@vitejs/plugin-react': - specifier: ^4.3.3 - version: 4.3.3(vite@6.2.1(@types/node@22.9.0)(jiti@1.21.6)(yaml@2.6.0)) + specifier: ^4.7.0 + version: 4.7.0(vite@7.1.11(@types/node@22.9.0)(jiti@1.21.7)(yaml@2.6.0)) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.4.47) eslint: - specifier: ^9.17.0 - version: 9.17.0(jiti@1.21.6) + specifier: ^9.39.1 + version: 9.39.1(jiti@1.21.7) eslint-config-prettier: specifier: ^9.1.0 - version: 9.1.0(eslint@9.17.0(jiti@1.21.6)) + version: 9.1.0(eslint@9.39.1(jiti@1.21.7)) eslint-plugin-react: specifier: ^7.37.2 - version: 7.37.2(eslint@9.17.0(jiti@1.21.6)) + version: 7.37.2(eslint@9.39.1(jiti@1.21.7)) eslint-plugin-react-hooks: specifier: ^5.1.0 - version: 5.1.0(eslint@9.17.0(jiti@1.21.6)) + version: 5.1.0(eslint@9.39.1(jiti@1.21.7)) eslint-plugin-react-refresh: specifier: ^0.4.16 - version: 0.4.16(eslint@9.17.0(jiti@1.21.6)) + version: 0.4.16(eslint@9.39.1(jiti@1.21.7)) msw: specifier: ^2.6.0 version: 2.6.0(@types/node@22.9.0)(typescript@5.6.3) @@ -143,19 +143,19 @@ importers: version: 3.4.2 prettier-plugin-tailwindcss: specifier: ^0.6.9 - version: 0.6.9(@ianvs/prettier-plugin-sort-imports@4.3.1(prettier@3.4.2))(prettier@3.4.2) + version: 0.6.9(@ianvs/prettier-plugin-sort-imports@4.7.0(prettier@3.4.2))(prettier@3.4.2) tailwindcss: - specifier: ^3.4.14 - version: 3.4.14 + specifier: ^3.4.18 + version: 3.4.18(yaml@2.6.0) typescript: specifier: ^5.6.3 version: 5.6.3 vite: - specifier: ^6.2.1 - version: 6.2.1(@types/node@22.9.0)(jiti@1.21.6)(yaml@2.6.0) + specifier: 7.1.11 + version: 7.1.11(@types/node@22.9.0)(jiti@1.21.7)(yaml@2.6.0) vite-tsconfig-paths: specifier: ^4.3.2 - version: 4.3.2(typescript@5.6.3)(vite@6.2.1(@types/node@22.9.0)(jiti@1.21.6)(yaml@2.6.0)) + version: 4.3.2(typescript@5.6.3)(vite@7.1.11(@types/node@22.9.0)(jiti@1.21.7)(yaml@2.6.0)) packages: @@ -163,21 +163,20 @@ packages: resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==} engines: {node: '>=10'} - '@ampproject/remapping@2.3.0': - resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} - engines: {node: '>=6.0.0'} - '@ant-design/colors@7.1.0': resolution: {integrity: sha512-MMoDGWn1y9LdQJQSHiCC20x3uZ3CwQnv9QMz6pCmJOrqdgM9YxsoVVY0wtrdXbmfSgnV0KNk6zi09NAhMR2jvg==} - '@ant-design/cssinjs-utils@1.1.1': - resolution: {integrity: sha512-2HAiyGGGnM0es40SxdszeQAU5iWp41wBIInq+ONTCKjlSKOrzQfnw4JDtB8IBmqE6tQaEKwmzTP2LGdt5DSwYQ==} + '@ant-design/colors@7.2.1': + resolution: {integrity: sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==} + + '@ant-design/cssinjs-utils@1.1.3': + resolution: {integrity: sha512-nOoQMLW1l+xR1Co8NFVYiP8pZp3VjIIzqV6D6ShYF2ljtdwWJn5WSsH+7kvCktXL/yhEtWURKOfH5Xz/gzlwsg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - '@ant-design/cssinjs@1.21.1': - resolution: {integrity: sha512-tyWnlK+XH7Bumd0byfbCiZNK43HEubMoCcu9VxwsAwiHdHTgWa+tMN0/yvxa+e8EzuFP1WdUNNPclRpVtD33lg==} + '@ant-design/cssinjs@1.24.0': + resolution: {integrity: sha512-K4cYrJBsgvL+IoozUXYjbT6LHHNt+19a9zkvpBPxLjFHas1UpPM2A5MlhROb0BT8N8WoavM5VsP9MeSeNK/3mg==} peerDependencies: react: '>=16.0.0' react-dom: '>=16.0.0' @@ -189,8 +188,8 @@ packages: '@ant-design/icons-svg@4.4.2': resolution: {integrity: sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==} - '@ant-design/icons@5.5.1': - resolution: {integrity: sha512-0UrM02MA2iDIgvLatWrj6YTCYe0F/cwXvVE0E2SqGrL7PZireQwgEKTKBisWpZyal5eXZLvuM98kju6YtYne8w==} + '@ant-design/icons@5.6.1': + resolution: {integrity: sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==} engines: {node: '>=8'} peerDependencies: react: '>=16.0.0' @@ -205,50 +204,70 @@ packages: resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} engines: {node: '>=6.9.0'} - '@babel/compat-data@7.26.2': - resolution: {integrity: sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==} + '@babel/code-frame@7.27.1': + resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==} engines: {node: '>=6.9.0'} - '@babel/core@7.26.0': - resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} + '@babel/compat-data@7.28.5': + resolution: {integrity: sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==} + engines: {node: '>=6.9.0'} + + '@babel/core@7.28.5': + resolution: {integrity: sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==} engines: {node: '>=6.9.0'} '@babel/generator@7.26.2': resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} engines: {node: '>=6.9.0'} - '@babel/helper-compilation-targets@7.25.9': - resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==} + '@babel/generator@7.28.5': + resolution: {integrity: sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==} engines: {node: '>=6.9.0'} - '@babel/helper-module-imports@7.25.9': - resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==} + '@babel/helper-compilation-targets@7.27.2': + resolution: {integrity: sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==} engines: {node: '>=6.9.0'} - '@babel/helper-module-transforms@7.26.0': - resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==} + '@babel/helper-globals@7.28.0': + resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==} + engines: {node: '>=6.9.0'} + + '@babel/helper-module-imports@7.27.1': + resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==} + engines: {node: '>=6.9.0'} + + '@babel/helper-module-transforms@7.28.3': + resolution: {integrity: sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-plugin-utils@7.25.9': - resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==} + '@babel/helper-plugin-utils@7.27.1': + resolution: {integrity: sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==} engines: {node: '>=6.9.0'} '@babel/helper-string-parser@7.25.9': resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.27.1': + resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.25.9': resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-option@7.25.9': - resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} + '@babel/helper-validator-identifier@7.28.5': + resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==} engines: {node: '>=6.9.0'} - '@babel/helpers@7.26.0': - resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} + '@babel/helper-validator-option@7.27.1': + resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==} + engines: {node: '>=6.9.0'} + + '@babel/helpers@7.28.4': + resolution: {integrity: sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==} engines: {node: '>=6.9.0'} '@babel/parser@7.26.2': @@ -256,14 +275,19 @@ packages: engines: {node: '>=6.0.0'} hasBin: true - '@babel/plugin-transform-react-jsx-self@7.25.9': - resolution: {integrity: sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==} + '@babel/parser@7.28.5': + resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==} + engines: {node: '>=6.0.0'} + hasBin: true + + '@babel/plugin-transform-react-jsx-self@7.27.1': + resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-react-jsx-source@7.25.9': - resolution: {integrity: sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==} + '@babel/plugin-transform-react-jsx-source@7.27.1': + resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -276,14 +300,26 @@ packages: resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==} engines: {node: '>=6.9.0'} + '@babel/template@7.27.2': + resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} + engines: {node: '>=6.9.0'} + '@babel/traverse@7.25.9': resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} engines: {node: '>=6.9.0'} + '@babel/traverse@7.28.5': + resolution: {integrity: sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==} + engines: {node: '>=6.9.0'} + '@babel/types@7.26.0': resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} engines: {node: '>=6.9.0'} + '@babel/types@7.28.5': + resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==} + engines: {node: '>=6.9.0'} + '@bundled-es-modules/cookie@2.0.1': resolution: {integrity: sha512-8o+5fRPLNbjbdGRRmJj3h6Hh1AQJf2dk3qQ/5ZFb+PXkRNiSoMGGUKlsgLfrxneb72axVJyIYji64E2+nNfYyw==} @@ -453,8 +489,8 @@ packages: cpu: [x64] os: [win32] - '@eslint-community/eslint-utils@4.4.1': - resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} + '@eslint-community/eslint-utils@4.9.0': + resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 @@ -463,28 +499,32 @@ packages: resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/config-array@0.19.1': - resolution: {integrity: sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==} + '@eslint/config-array@0.21.1': + resolution: {integrity: sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/core@0.9.1': - resolution: {integrity: sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==} + '@eslint/config-helpers@0.4.2': + resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/eslintrc@3.2.0': - resolution: {integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==} + '@eslint/core@0.17.0': + resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/js@9.17.0': - resolution: {integrity: sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==} + '@eslint/eslintrc@3.3.1': + resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/object-schema@2.1.5': - resolution: {integrity: sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==} + '@eslint/js@9.39.1': + resolution: {integrity: sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/plugin-kit@0.2.4': - resolution: {integrity: sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==} + '@eslint/object-schema@2.1.7': + resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/plugin-kit@0.4.1': + resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@humanfs/core@0.19.1': @@ -503,18 +543,27 @@ packages: resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==} engines: {node: '>=18.18'} - '@humanwhocodes/retry@0.4.1': - resolution: {integrity: sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==} + '@humanwhocodes/retry@0.4.3': + resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==} engines: {node: '>=18.18'} - '@ianvs/prettier-plugin-sort-imports@4.3.1': - resolution: {integrity: sha512-ZHwbyjkANZOjaBm3ZosADD2OUYGFzQGxfy67HmGZU94mHqe7g1LCMA7YYKB1Cq+UTPCBqlAYapY0KXAjKEw8Sg==} + '@ianvs/prettier-plugin-sort-imports@4.7.0': + resolution: {integrity: sha512-soa2bPUJAFruLL4z/CnMfSEKGznm5ebz29fIa9PxYtu8HHyLKNE1NXAs6dylfw1jn/ilEIfO2oLLN6uAafb7DA==} peerDependencies: + '@prettier/plugin-oxc': ^0.0.4 '@vue/compiler-sfc': 2.7.x || 3.x - prettier: 2 || 3 + content-tag: ^4.0.0 + prettier: 2 || 3 || ^4.0.0-0 + prettier-plugin-ember-template-tag: ^2.1.0 peerDependenciesMeta: + '@prettier/plugin-oxc': + optional: true '@vue/compiler-sfc': optional: true + content-tag: + optional: true + prettier-plugin-ember-template-tag: + optional: true '@inquirer/confirm@5.0.1': resolution: {integrity: sha512-6ycMm7k7NUApiMGfVc32yIPp28iPKxhGRMqoNDiUjq2RyTAkbs5Fx0TdzBqhabcKvniDdAAvHCmsRjnNfTsogw==} @@ -536,14 +585,16 @@ packages: peerDependencies: '@types/node': '>=18' - '@isaacs/cliui@8.0.2': - resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} - engines: {node: '>=12'} + '@jridgewell/gen-mapping@0.3.13': + resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==} '@jridgewell/gen-mapping@0.3.5': resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} engines: {node: '>=6.0.0'} + '@jridgewell/remapping@2.3.5': + resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==} + '@jridgewell/resolve-uri@3.1.2': resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} @@ -555,9 +606,15 @@ packages: '@jridgewell/sourcemap-codec@1.5.0': resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/sourcemap-codec@1.5.5': + resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + '@jridgewell/trace-mapping@0.3.31': + resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} + '@mswjs/interceptors@0.36.9': resolution: {integrity: sha512-mMRDUBwSNeCgjSMEWfjoh4Rm9fbyZ7xQ9SBq8eGHiiyRn1ieTip3pNEt0wxWVPPxR4i1Rv9bTkeEbkX7M4c15A==} engines: {node: '>=18'} @@ -583,10 +640,6 @@ packages: '@open-draft/until@2.1.0': resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} - '@pkgjs/parseargs@0.11.0': - resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} - engines: {node: '>=14'} - '@radix-ui/primitive@1.1.0': resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==} @@ -783,8 +836,8 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' - '@rc-component/qrcode@1.0.0': - resolution: {integrity: sha512-L+rZ4HXP2sJ1gHMGHjsg9jlYBX/SLN2D6OxP9Zn3qgtpMWtO2vUfxVFwiogHpAIqs54FnALxraUy/BCO1yRIgg==} + '@rc-component/qrcode@1.1.0': + resolution: {integrity: sha512-ABA80Yer0c6I2+moqNY0kF3Y1NxIT6wDP/EINIqbiRbfZKP1HtHpKMh8WuTXLgVGYsoWG2g9/n0PgM8KdnJb4Q==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' @@ -797,8 +850,8 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' - '@rc-component/trigger@2.2.3': - resolution: {integrity: sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A==} + '@rc-component/trigger@2.3.0': + resolution: {integrity: sha512-iwaxZyzOuK0D7lS+0AQEtW52zUWxoGqTGkke3dRyb8pYiShmRpCjB/8TzPI4R6YySCH7Vm9BZj/31VPiiQTLBg==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' @@ -808,98 +861,116 @@ packages: resolution: {integrity: sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==} engines: {node: '>=14.0.0'} - '@rollup/rollup-android-arm-eabi@4.34.9': - resolution: {integrity: sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==} + '@rolldown/pluginutils@1.0.0-beta.27': + resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==} + + '@rollup/rollup-android-arm-eabi@4.53.3': + resolution: {integrity: sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.34.9': - resolution: {integrity: sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==} + '@rollup/rollup-android-arm64@4.53.3': + resolution: {integrity: sha512-CbDGaMpdE9sh7sCmTrTUyllhrg65t6SwhjlMJsLr+J8YjFuPmCEjbBSx4Z/e4SmDyH3aB5hGaJUP2ltV/vcs4w==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.34.9': - resolution: {integrity: sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==} + '@rollup/rollup-darwin-arm64@4.53.3': + resolution: {integrity: sha512-Nr7SlQeqIBpOV6BHHGZgYBuSdanCXuw09hon14MGOLGmXAFYjx1wNvquVPmpZnl0tLjg25dEdr4IQ6GgyToCUA==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.34.9': - resolution: {integrity: sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==} + '@rollup/rollup-darwin-x64@4.53.3': + resolution: {integrity: sha512-DZ8N4CSNfl965CmPktJ8oBnfYr3F8dTTNBQkRlffnUarJ2ohudQD17sZBa097J8xhQ26AwhHJ5mvUyQW8ddTsQ==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.34.9': - resolution: {integrity: sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==} + '@rollup/rollup-freebsd-arm64@4.53.3': + resolution: {integrity: sha512-yMTrCrK92aGyi7GuDNtGn2sNW+Gdb4vErx4t3Gv/Tr+1zRb8ax4z8GWVRfr3Jw8zJWvpGHNpss3vVlbF58DZ4w==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.34.9': - resolution: {integrity: sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==} + '@rollup/rollup-freebsd-x64@4.53.3': + resolution: {integrity: sha512-lMfF8X7QhdQzseM6XaX0vbno2m3hlyZFhwcndRMw8fbAGUGL3WFMBdK0hbUBIUYcEcMhVLr1SIamDeuLBnXS+Q==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.34.9': - resolution: {integrity: sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==} + '@rollup/rollup-linux-arm-gnueabihf@4.53.3': + resolution: {integrity: sha512-k9oD15soC/Ln6d2Wv/JOFPzZXIAIFLp6B+i14KhxAfnq76ajt0EhYc5YPeX6W1xJkAdItcVT+JhKl1QZh44/qw==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.34.9': - resolution: {integrity: sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==} + '@rollup/rollup-linux-arm-musleabihf@4.53.3': + resolution: {integrity: sha512-vTNlKq+N6CK/8UktsrFuc+/7NlEYVxgaEgRXVUVK258Z5ymho29skzW1sutgYjqNnquGwVUObAaxae8rZ6YMhg==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.34.9': - resolution: {integrity: sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==} + '@rollup/rollup-linux-arm64-gnu@4.53.3': + resolution: {integrity: sha512-RGrFLWgMhSxRs/EWJMIFM1O5Mzuz3Xy3/mnxJp/5cVhZ2XoCAxJnmNsEyeMJtpK+wu0FJFWz+QF4mjCA7AUQ3w==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.34.9': - resolution: {integrity: sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==} + '@rollup/rollup-linux-arm64-musl@4.53.3': + resolution: {integrity: sha512-kASyvfBEWYPEwe0Qv4nfu6pNkITLTb32p4yTgzFCocHnJLAHs+9LjUu9ONIhvfT/5lv4YS5muBHyuV84epBo/A==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-loongarch64-gnu@4.34.9': - resolution: {integrity: sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==} + '@rollup/rollup-linux-loong64-gnu@4.53.3': + resolution: {integrity: sha512-JiuKcp2teLJwQ7vkJ95EwESWkNRFJD7TQgYmCnrPtlu50b4XvT5MOmurWNrCj3IFdyjBQ5p9vnrX4JM6I8OE7g==} cpu: [loong64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': - resolution: {integrity: sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==} + '@rollup/rollup-linux-ppc64-gnu@4.53.3': + resolution: {integrity: sha512-EoGSa8nd6d3T7zLuqdojxC20oBfNT8nexBbB/rkxgKj5T5vhpAQKKnD+h3UkoMuTyXkP5jTjK/ccNRmQrPNDuw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.34.9': - resolution: {integrity: sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==} + '@rollup/rollup-linux-riscv64-gnu@4.53.3': + resolution: {integrity: sha512-4s+Wped2IHXHPnAEbIB0YWBv7SDohqxobiiPA1FIWZpX+w9o2i4LezzH/NkFUl8LRci/8udci6cLq+jJQlh+0g==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.34.9': - resolution: {integrity: sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==} + '@rollup/rollup-linux-riscv64-musl@4.53.3': + resolution: {integrity: sha512-68k2g7+0vs2u9CxDt5ktXTngsxOQkSEV/xBbwlqYcUrAVh6P9EgMZvFsnHy4SEiUl46Xf0IObWVbMvPrr2gw8A==} + cpu: [riscv64] + os: [linux] + + '@rollup/rollup-linux-s390x-gnu@4.53.3': + resolution: {integrity: sha512-VYsFMpULAz87ZW6BVYw3I6sWesGpsP9OPcyKe8ofdg9LHxSbRMd7zrVrr5xi/3kMZtpWL/wC+UIJWJYVX5uTKg==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.34.9': - resolution: {integrity: sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==} + '@rollup/rollup-linux-x64-gnu@4.53.3': + resolution: {integrity: sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.34.9': - resolution: {integrity: sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==} + '@rollup/rollup-linux-x64-musl@4.53.3': + resolution: {integrity: sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.34.9': - resolution: {integrity: sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==} + '@rollup/rollup-openharmony-arm64@4.53.3': + resolution: {integrity: sha512-OueLAWgrNSPGAdUdIjSWXw+u/02BRTcnfw9PN41D2vq/JSEPnJnVuBgw18VkN8wcd4fjUs+jFHVM4t9+kBSNLw==} + cpu: [arm64] + os: [openharmony] + + '@rollup/rollup-win32-arm64-msvc@4.53.3': + resolution: {integrity: sha512-GOFuKpsxR/whszbF/bzydebLiXIHSgsEUp6M0JI8dWvi+fFa1TD6YQa4aSZHtpmh2/uAlj/Dy+nmby3TJ3pkTw==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.34.9': - resolution: {integrity: sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==} + '@rollup/rollup-win32-ia32-msvc@4.53.3': + resolution: {integrity: sha512-iah+THLcBJdpfZ1TstDFbKNznlzoxa8fmnFYK4V67HvmuNYkVdAywJSoteUszvBQ9/HqN2+9AZghbajMsFT+oA==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.34.9': - resolution: {integrity: sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==} + '@rollup/rollup-win32-x64-gnu@4.53.3': + resolution: {integrity: sha512-J9QDiOIZlZLdcot5NXEepDkstocktoVjkaKUtqzgzpt2yWjGlbYiKyp05rWwk4nypbYUNoFAztEgixoLaSETkg==} + cpu: [x64] + os: [win32] + + '@rollup/rollup-win32-x64-msvc@4.53.3': + resolution: {integrity: sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ==} cpu: [x64] os: [win32] @@ -924,6 +995,9 @@ packages: '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} + '@types/estree@1.0.8': + resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} + '@types/js-cookie@3.0.6': resolution: {integrity: sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==} @@ -954,58 +1028,70 @@ packages: '@types/websocket@1.0.10': resolution: {integrity: sha512-svjGZvPB7EzuYS94cI7a+qhwgGU1y89wUgjT6E2wVUfmAGIvRfT7obBvRtnhXCSsoMdlG4gBFGE7MfkIXZLoww==} - '@typescript-eslint/eslint-plugin@8.19.1': - resolution: {integrity: sha512-tJzcVyvvb9h/PB96g30MpxACd9IrunT7GF9wfA9/0TJ1LxGOJx1TdPzSbBBnNED7K9Ka8ybJsnEpiXPktolTLg==} + '@typescript-eslint/eslint-plugin@8.48.0': + resolution: {integrity: sha512-XxXP5tL1txl13YFtrECECQYeZjBZad4fyd3cFV4a19LkAY/bIp9fev3US4S5fDVV2JaYFiKAZ/GRTOLer+mbyQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 + '@typescript-eslint/parser': ^8.48.0 eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.8.0' + typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/parser@8.19.1': - resolution: {integrity: sha512-67gbfv8rAwawjYx3fYArwldTQKoYfezNUT4D5ioWetr/xCrxXxvleo3uuiFuKfejipvq+og7mjz3b0G2bVyUCw==} + '@typescript-eslint/parser@8.48.0': + resolution: {integrity: sha512-jCzKdm/QK0Kg4V4IK/oMlRZlY+QOcdjv89U2NgKHZk1CYTj82/RVSx1mV/0gqCVMJ/DA+Zf/S4NBWNF8GQ+eqQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.8.0' + typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/scope-manager@8.19.1': - resolution: {integrity: sha512-60L9KIuN/xgmsINzonOcMDSB8p82h95hoBfSBtXuO4jlR1R9L1xSkmVZKgCPVfavDlXihh4ARNjXhh1gGnLC7Q==} + '@typescript-eslint/project-service@8.48.0': + resolution: {integrity: sha512-Ne4CTZyRh1BecBf84siv42wv5vQvVmgtk8AuiEffKTUo3DrBaGYZueJSxxBZ8fjk/N3DrgChH4TOdIOwOwiqqw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.0.0' + + '@typescript-eslint/scope-manager@8.48.0': + resolution: {integrity: sha512-uGSSsbrtJrLduti0Q1Q9+BF1/iFKaxGoQwjWOIVNJv0o6omrdyR8ct37m4xIl5Zzpkp69Kkmvom7QFTtue89YQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.19.1': - resolution: {integrity: sha512-Rp7k9lhDKBMRJB/nM9Ksp1zs4796wVNyihG9/TU9R6KCJDNkQbc2EOKjrBtLYh3396ZdpXLtr/MkaSEmNMtykw==} + '@typescript-eslint/tsconfig-utils@8.48.0': + resolution: {integrity: sha512-WNebjBdFdyu10sR1M4OXTt2OkMd5KWIL+LLfeH9KhgP+jzfDV/LI3eXzwJ1s9+Yc0Kzo2fQCdY/OpdusCMmh6w==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.0.0' + + '@typescript-eslint/type-utils@8.48.0': + resolution: {integrity: sha512-zbeVaVqeXhhab6QNEKfK96Xyc7UQuoFWERhEnj3mLVnUWrQnv15cJNseUni7f3g557gm0e46LZ6IJ4NJVOgOpw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.8.0' + typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/types@8.19.1': - resolution: {integrity: sha512-JBVHMLj7B1K1v1051ZaMMgLW4Q/jre5qGK0Ew6UgXz1Rqh+/xPzV1aW581OM00X6iOfyr1be+QyW8LOUf19BbA==} + '@typescript-eslint/types@8.48.0': + resolution: {integrity: sha512-cQMcGQQH7kwKoVswD1xdOytxQR60MWKM1di26xSUtxehaDs/32Zpqsu5WJlXTtTTqyAVK8R7hvsUnIXRS+bjvA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.19.1': - resolution: {integrity: sha512-jk/TZwSMJlxlNnqhy0Eod1PNEvCkpY6MXOXE/WLlblZ6ibb32i2We4uByoKPv1d0OD2xebDv4hbs3fm11SMw8Q==} + '@typescript-eslint/typescript-estree@8.48.0': + resolution: {integrity: sha512-ljHab1CSO4rGrQIAyizUS6UGHHCiAYhbfcIZ1zVJr5nMryxlXMVWS3duFPSKvSUbFPwkXMFk1k0EMIjub4sRRQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - typescript: '>=4.8.4 <5.8.0' + typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/utils@8.19.1': - resolution: {integrity: sha512-IxG5gLO0Ne+KaUc8iW1A+XuKLd63o4wlbI1Zp692n1xojCl/THvgIKXJXBZixTh5dd5+yTJ/VXH7GJaaw21qXA==} + '@typescript-eslint/utils@8.48.0': + resolution: {integrity: sha512-yTJO1XuGxCsSfIVt1+1UrLHtue8xz16V8apzPYI06W0HbEbEWHxHXgZaAgavIkoh+GeV6hKKd5jm0sS6OYxWXQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.8.0' + typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/visitor-keys@8.19.1': - resolution: {integrity: sha512-fzmjU8CHK853V/avYZAvuVut3ZTfwN5YtMaoi+X9Y9MA9keaWNHC3zEQ9zvyX/7Hj+5JkNyK1l7TOR2hevHB6Q==} + '@typescript-eslint/visitor-keys@8.48.0': + resolution: {integrity: sha512-T0XJMaRPOH3+LBbAfzR2jalckP1MSG/L9eUtY0DEzUyVaXJ/t6zN0nR7co5kz0Jko/nkSYCBRkz1djvjajVTTg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@vitejs/plugin-react@4.3.3': - resolution: {integrity: sha512-NooDe9GpHGqNns1i8XDERg0Vsg5SSYRhRxxyTGogUdkdNt47jal+fbuYi+Yfq6pzRCKXyoPcWisfxE6RIM3GKA==} + '@vitejs/plugin-react@4.7.0': + resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - vite: ^4.2.0 || ^5.0.0 + vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 '@xterm/addon-attach@0.11.0': resolution: {integrity: sha512-JboCN0QAY6ZLY/SSB/Zl2cQ5zW1Eh4X3fH7BnuR1NB7xGRhzbqU2Npmpiw/3zFlxDaU88vtKzok44JKi2L2V2Q==} @@ -1025,8 +1111,8 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - acorn@8.14.0: - resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} + acorn@8.15.0: + resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} engines: {node: '>=0.4.0'} hasBin: true @@ -1041,20 +1127,12 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - ansi-regex@6.1.0: - resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} - engines: {node: '>=12'} - ansi-styles@4.3.0: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} - ansi-styles@6.2.1: - resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} - engines: {node: '>=12'} - - antd@5.21.6: - resolution: {integrity: sha512-EviOde/VEu+OsIKH5t6YXTMmmNeg9R85m0W5zXAo+Np8Latg9q10691JvAqOTMpnrRmbdeKUQL1Krp69Bzbe/g==} + antd@5.29.1: + resolution: {integrity: sha512-TTFVbpKbyL6cPfEoKq6Ya3BIjTUr7uDW9+7Z+1oysRv1gpcN7kQ4luH8r/+rXXwz4n6BIz1iBJ1ezKCdsdNW0w==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' @@ -1084,9 +1162,6 @@ packages: resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==} engines: {node: '>= 0.4'} - array-tree-filter@2.1.0: - resolution: {integrity: sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==} - array.prototype.findlast@1.2.5: resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==} engines: {node: '>= 0.4'} @@ -1121,21 +1196,25 @@ packages: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} - axios@1.8.4: - resolution: {integrity: sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==} + axios@1.12.0: + resolution: {integrity: sha512-oXTDccv8PcfjZmPGlWsPSwtOJCZ/b6W5jAMCNcfwJbCzDckwG0jrYJFaWH1yvivfCXjVzV/SPDEhMB3Q+DSurg==} balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + baseline-browser-mapping@2.8.31: + resolution: {integrity: sha512-a28v2eWrrRWPpJSzxc+mKwm0ZtVx/G8SepdQZDArnXYU/XS+IF6mp8aB/4E+hH1tyGCoDo3KlUCdlSxGDsRkAw==} + hasBin: true + binary-extensions@2.3.0: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} - brace-expansion@1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} + brace-expansion@1.1.12: + resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==} - brace-expansion@2.0.1: - resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + brace-expansion@2.0.2: + resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==} braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} @@ -1146,10 +1225,19 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + browserslist@4.28.0: + resolution: {integrity: sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + bufferutil@4.0.8: resolution: {integrity: sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==} engines: {node: '>=6.14.2'} + call-bind-apply-helpers@1.0.2: + resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} + engines: {node: '>= 0.4'} + call-bind@1.0.7: resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} engines: {node: '>= 0.4'} @@ -1162,8 +1250,11 @@ packages: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} - caniuse-lite@1.0.30001713: - resolution: {integrity: sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==} + caniuse-lite@1.0.30001756: + resolution: {integrity: sha512-4HnCNKbMLkLdhJz3TToeVWHSnfJvPaq6vu/eRP0Ahub/07n484XHhBF5AJoSGHdVrS8tKFauUQz8Bp9P7LVx7A==} + + caniuse-lite@1.0.30001757: + resolution: {integrity: sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==} chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} @@ -1241,6 +1332,9 @@ packages: csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + csstype@3.2.3: + resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==} + d@1.0.2: resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==} engines: {node: '>=0.12'} @@ -1277,6 +1371,15 @@ packages: supports-color: optional: true + debug@4.4.3: + resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} @@ -1305,8 +1408,12 @@ packages: resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==} engines: {node: '>=0.10.0'} - eastasianwidth@0.2.0: - resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + dunder-proto@1.0.1: + resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} + engines: {node: '>= 0.4'} + + electron-to-chromium@1.5.260: + resolution: {integrity: sha512-ov8rBoOBhVawpzdre+Cmz4FB+y66Eqrk6Gwqd8NGxuhv99GQ8XqMAr351KEkOt7gukXWDg6gJWEMKgL2RLMPtA==} electron-to-chromium@1.5.51: resolution: {integrity: sha512-kKeWV57KSS8jH4alKt/jKnvHPmJgBxXzGUSbMd4eQF+iOsVPl7bz2KUmu6eo80eMP8wVioTfTyTzdMgM15WXNg==} @@ -1314,9 +1421,6 @@ packages: emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - emoji-regex@9.2.2: - resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} - es-abstract@1.23.3: resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==} engines: {node: '>= 0.4'} @@ -1325,6 +1429,10 @@ packages: resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} engines: {node: '>= 0.4'} + es-define-property@1.0.1: + resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} + engines: {node: '>= 0.4'} + es-errors@1.3.0: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} @@ -1337,10 +1445,18 @@ packages: resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} engines: {node: '>= 0.4'} + es-object-atoms@1.1.1: + resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} + engines: {node: '>= 0.4'} + es-set-tostringtag@2.0.3: resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} engines: {node: '>= 0.4'} + es-set-tostringtag@2.1.0: + resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} + engines: {node: '>= 0.4'} + es-shim-unscopables@1.0.2: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} @@ -1395,20 +1511,20 @@ packages: peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7 - eslint-scope@8.2.0: - resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==} + eslint-scope@8.4.0: + resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - eslint-visitor-keys@4.2.0: - resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} + eslint-visitor-keys@4.2.1: + resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint@9.17.0: - resolution: {integrity: sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==} + eslint@9.39.1: + resolution: {integrity: sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true peerDependencies: @@ -1421,8 +1537,8 @@ packages: resolution: {integrity: sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==} engines: {node: '>=0.10'} - espree@10.3.0: - resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==} + espree@10.4.0: + resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} esquery@1.6.0: @@ -1450,8 +1566,8 @@ packages: fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - fast-glob@3.3.2: - resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} + fast-glob@3.3.3: + resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} engines: {node: '>=8.6.0'} fast-json-stable-stringify@2.1.0: @@ -1463,6 +1579,15 @@ packages: fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} + fdir@6.5.0: + resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} + engines: {node: '>=12.0.0'} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + file-entry-cache@8.0.0: resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} engines: {node: '>=16.0.0'} @@ -1494,12 +1619,8 @@ packages: for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} - foreground-child@3.3.0: - resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==} - engines: {node: '>=14'} - - form-data@4.0.1: - resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==} + form-data@4.0.5: + resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==} engines: {node: '>= 6'} fraction.js@4.3.7: @@ -1532,10 +1653,18 @@ packages: resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} engines: {node: '>= 0.4'} + get-intrinsic@1.3.0: + resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} + engines: {node: '>= 0.4'} + get-nonce@1.0.1: resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==} engines: {node: '>=6'} + get-proto@1.0.1: + resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} + engines: {node: '>= 0.4'} + get-symbol-description@1.0.2: resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} engines: {node: '>= 0.4'} @@ -1548,10 +1677,6 @@ packages: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} - glob@10.4.5: - resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==} - hasBin: true - globals@11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} @@ -1570,6 +1695,10 @@ packages: gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + gopd@1.2.0: + resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} + engines: {node: '>= 0.4'} + graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} @@ -1595,6 +1724,10 @@ packages: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} + has-symbols@1.1.0: + resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} + engines: {node: '>= 0.4'} + has-tostringtag@1.0.2: resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} engines: {node: '>= 0.4'} @@ -1619,8 +1752,12 @@ packages: resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} - import-fresh@3.3.0: - resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} + ignore@7.0.5: + resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==} + engines: {node: '>= 4'} + + import-fresh@3.3.1: + resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==} engines: {node: '>=6'} imurmurhash@0.1.4: @@ -1661,6 +1798,10 @@ packages: resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==} engines: {node: '>= 0.4'} + is-core-module@2.16.1: + resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} + engines: {node: '>= 0.4'} + is-data-view@1.0.1: resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} engines: {node: '>= 0.4'} @@ -1755,11 +1896,8 @@ packages: resolution: {integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==} engines: {node: '>= 0.4'} - jackspeak@3.4.3: - resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==} - - jiti@1.21.6: - resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} + jiti@1.21.7: + resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==} hasBin: true jotai@2.10.1: @@ -1781,8 +1919,8 @@ packages: js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-yaml@4.1.0: - resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} + js-yaml@4.1.1: + resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==} hasBin: true jsesc@3.0.2: @@ -1790,6 +1928,11 @@ packages: engines: {node: '>=6'} hasBin: true + jsesc@3.1.0: + resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==} + engines: {node: '>=6'} + hasBin: true + json-buffer@3.0.1: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} @@ -1818,12 +1961,8 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - lilconfig@2.1.0: - resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} - engines: {node: '>=10'} - - lilconfig@3.1.2: - resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==} + lilconfig@3.1.3: + resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==} engines: {node: '>=14'} lines-and-columns@1.2.4: @@ -1840,9 +1979,6 @@ packages: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true - lru-cache@10.4.3: - resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} - lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} @@ -1854,6 +1990,10 @@ packages: matchmediaquery@0.4.2: resolution: {integrity: sha512-wrZpoT50ehYOudhDjt/YvUJc6eUzcdFPdmbizfgvswCKNHD1/OBOHYJpHie+HXpu6bSkEGieFMYk6VuutaiRfA==} + math-intrinsics@1.1.0: + resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} + engines: {node: '>= 0.4'} + merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -1877,10 +2017,6 @@ packages: resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} engines: {node: '>=16 || 14 >=14.17'} - minipass@7.1.2: - resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} - engines: {node: '>=16 || 14 >=14.17'} - ms@2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} @@ -1904,6 +2040,11 @@ packages: mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} + nanoid@3.3.11: + resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + nanoid@3.3.8: resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -1922,6 +2063,9 @@ packages: node-releases@2.0.18: resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} + node-releases@2.0.27: + resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==} + normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} @@ -1977,9 +2121,6 @@ packages: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} - package-json-from-dist@1.0.1: - resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} - parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -1995,10 +2136,6 @@ packages: path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - path-scurry@1.11.1: - resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} - engines: {node: '>=16 || 14 >=14.18'} - path-to-regexp@6.3.0: resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==} @@ -2009,12 +2146,16 @@ packages: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} + picomatch@4.0.3: + resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} + engines: {node: '>=12'} + pify@2.3.0: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} engines: {node: '>=0.10.0'} - pirates@4.0.6: - resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} + pirates@4.0.7: + resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} engines: {node: '>= 6'} possible-typed-array-names@1.0.0: @@ -2027,22 +2168,28 @@ packages: peerDependencies: postcss: ^8.0.0 - postcss-js@4.0.1: - resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} + postcss-js@4.1.0: + resolution: {integrity: sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==} engines: {node: ^12 || ^14 || >= 16} peerDependencies: postcss: ^8.4.21 - postcss-load-config@4.0.2: - resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==} - engines: {node: '>= 14'} + postcss-load-config@6.0.1: + resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==} + engines: {node: '>= 18'} peerDependencies: + jiti: '>=1.21.0' postcss: '>=8.0.9' - ts-node: '>=9.0.0' + tsx: ^4.8.1 + yaml: ^2.4.2 peerDependenciesMeta: + jiti: + optional: true postcss: optional: true - ts-node: + tsx: + optional: true + yaml: optional: true postcss-nested@6.2.0: @@ -2062,8 +2209,8 @@ packages: resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==} engines: {node: ^10 || ^12 || >=14} - postcss@8.5.3: - resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} + postcss@8.5.6: + resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==} engines: {node: ^10 || ^12 || >=14} prelude-ls@1.2.1: @@ -2149,20 +2296,20 @@ packages: queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - rc-cascader@3.28.2: - resolution: {integrity: sha512-8f+JgM83iLTvjgdkgU7GfI4qY8icXOBP0cGZjOdx2iJAkEe8ucobxDQAVE69UD/c3ehCxZlcgEHeD5hFmypbUw==} + rc-cascader@3.34.0: + resolution: {integrity: sha512-KpXypcvju9ptjW9FaN2NFcA2QH9E9LHKq169Y0eWtH4e/wHQ5Wh5qZakAgvb8EKZ736WZ3B0zLLOBsrsja5Dag==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-checkbox@3.3.0: - resolution: {integrity: sha512-Ih3ZaAcoAiFKJjifzwsGiT/f/quIkxJoklW4yKGho14Olulwn8gN7hOBve0/WGDg5o/l/5mL0w7ff7/YGvefVw==} + rc-checkbox@3.5.0: + resolution: {integrity: sha512-aOAQc3E98HteIIsSqm6Xk2FPKIER6+5vyEFMZfo73TqM+VVAIqOkHoPjgKLqSNtVLWScoaM7vY2ZrGEheI79yg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-collapse@3.8.0: - resolution: {integrity: sha512-YVBkssrKPBG09TGfcWWGj8zJBYD9G3XuTy89t5iUmSXrIXEAnO1M+qjUxRW6b4Qi0+wNWG6MHJF/+US+nmIlzA==} + rc-collapse@3.9.0: + resolution: {integrity: sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' @@ -2173,82 +2320,82 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-drawer@7.2.0: - resolution: {integrity: sha512-9lOQ7kBekEJRdEpScHvtmEtXnAsy+NGDXiRWc2ZVC7QXAazNVbeT4EraQKYwCME8BJLa8Bxqxvs5swwyOepRwg==} + rc-drawer@7.3.0: + resolution: {integrity: sha512-DX6CIgiBWNpJIMGFO8BAISFkxiuKitoizooj4BDyee8/SnBn0zwO2FHrNDpqqepj0E/TFTDpmEBCyFuTgC7MOg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-dropdown@4.2.0: - resolution: {integrity: sha512-odM8Ove+gSh0zU27DUj5cG1gNKg7mLWBYzB5E4nNLrLwBmYEgYP43vHKDGOVZcJSVElQBI0+jTQgjnq0NfLjng==} + rc-dropdown@4.2.1: + resolution: {integrity: sha512-YDAlXsPv3I1n42dv1JpdM7wJ+gSUBfeyPK59ZpBD9jQhK9jVuxpjj3NmWQHOBceA1zEPVX84T2wbdb2SD0UjmA==} peerDependencies: react: '>=16.11.0' react-dom: '>=16.11.0' - rc-field-form@2.4.0: - resolution: {integrity: sha512-XZ/lF9iqf9HXApIHQHqzJK5v2w4mkUMsVqAzOyWVzoiwwXEavY6Tpuw7HavgzIoD+huVff4JghSGcgEfX6eycg==} + rc-field-form@2.7.1: + resolution: {integrity: sha512-vKeSifSJ6HoLaAB+B8aq/Qgm8a3dyxROzCtKNCsBQgiverpc4kWDQihoUwzUj+zNWJOykwSY4dNX3QrGwtVb9A==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-image@7.11.0: - resolution: {integrity: sha512-aZkTEZXqeqfPZtnSdNUnKQA0N/3MbgR7nUnZ+/4MfSFWPFHZau4p5r5ShaI0KPEMnNjv4kijSCFq/9wtJpwykw==} + rc-image@7.12.0: + resolution: {integrity: sha512-cZ3HTyyckPnNnUb9/DRqduqzLfrQRyi+CdHjdqgsyDpI3Ln5UX1kXnAhPBSJj9pVRzwRFgqkN7p9b6HBDjmu/Q==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-input-number@9.2.0: - resolution: {integrity: sha512-5XZFhBCV5f9UQ62AZ2hFbEY8iZT/dm23Q1kAg0H8EvOgD3UDbYYJAayoVIkM3lQaCqYAW5gV0yV3vjw1XtzWHg==} + rc-input-number@9.5.0: + resolution: {integrity: sha512-bKaEvB5tHebUURAEXw35LDcnRZLq3x1k7GxfAqBMzmpHkDGzjAtnUL8y4y5N15rIFIg5IJgwr211jInl3cipag==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-input@1.6.3: - resolution: {integrity: sha512-wI4NzuqBS8vvKr8cljsvnTUqItMfG1QbJoxovCgL+DX4eVUcHIjVwharwevIxyy7H/jbLryh+K7ysnJr23aWIA==} + rc-input@1.8.0: + resolution: {integrity: sha512-KXvaTbX+7ha8a/k+eg6SYRVERK0NddX8QX7a7AnRvUa/rEH0CNMlpcBzBkhI0wp2C8C4HlMoYl8TImSN+fuHKA==} peerDependencies: react: '>=16.0.0' react-dom: '>=16.0.0' - rc-mentions@2.16.1: - resolution: {integrity: sha512-GnhSTGP9Mtv6pqFFGQze44LlrtWOjHNrUUAcsdo9DnNAhN4pwVPEWy4z+2jpjkiGlJ3VoXdvMHcNDQdfI9fEaw==} + rc-mentions@2.20.0: + resolution: {integrity: sha512-w8HCMZEh3f0nR8ZEd466ATqmXFCMGMN5UFCzEUL0bM/nGw/wOS2GgRzKBcm19K++jDyuWCOJOdgcKGXU3fXfbQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-menu@9.15.1: - resolution: {integrity: sha512-UKporqU6LPfHnpPmtP6hdEK4iO5Q+b7BRv/uRpxdIyDGplZy9jwUjsnpev5bs3PQKB0H0n34WAPDfjAfn3kAPA==} + rc-menu@9.16.1: + resolution: {integrity: sha512-ghHx6/6Dvp+fw8CJhDUHFHDJ84hJE3BXNCzSgLdmNiFErWSOaZNsihDAsKq9ByTALo/xkNIwtDFGIl6r+RPXBg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-motion@2.9.3: - resolution: {integrity: sha512-rkW47ABVkic7WEB0EKJqzySpvDqwl60/tdkY7hWP7dYnh5pm0SzJpo54oW3TDUGXV5wfxXFmMkxrzRRbotQ0+w==} + rc-motion@2.9.5: + resolution: {integrity: sha512-w+XTUrfh7ArbYEd2582uDrEhmBHwK1ZENJiSJVb7uRxdE7qJSYjbO2eksRXmndqyKqKoYPc9ClpPh5242mV1vA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-notification@5.6.2: - resolution: {integrity: sha512-Id4IYMoii3zzrG0lB0gD6dPgJx4Iu95Xu0BQrhHIbp7ZnAZbLqdqQ73aIWH0d0UFcElxwaKjnzNovTjo7kXz7g==} + rc-notification@5.6.4: + resolution: {integrity: sha512-KcS4O6B4qzM3KH7lkwOB7ooLPZ4b6J+VMmQgT51VZCeEcmghdeR4IrMcFq0LG+RPdnbe/ArT086tGM8Snimgiw==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-overflow@1.3.2: - resolution: {integrity: sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw==} + rc-overflow@1.5.0: + resolution: {integrity: sha512-Lm/v9h0LymeUYJf0x39OveU52InkdRXqnn2aYXfWmo8WdOonIKB2kfau+GF0fWq6jPgtdO9yMqveGcK6aIhJmg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-pagination@4.3.0: - resolution: {integrity: sha512-UubEWA0ShnroQ1tDa291Fzw6kj0iOeF26IsUObxYTpimgj4/qPCWVFl18RLZE+0Up1IZg0IK4pMn6nB3mjvB7g==} + rc-pagination@5.1.0: + resolution: {integrity: sha512-8416Yip/+eclTFdHXLKTxZvn70duYVGTvUUWbckCCZoIl3jagqke3GLsFrMs0bsQBikiYpZLD9206Ej4SOdOXQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-picker@4.6.15: - resolution: {integrity: sha512-OWZ1yrMie+KN2uEUfYCfS4b2Vu6RC1FWwNI0s+qypsc3wRt7g+peuZKVIzXCTaJwyyZruo80+akPg2+GmyiJjw==} + rc-picker@4.11.3: + resolution: {integrity: sha512-MJ5teb7FlNE0NFHTncxXQ62Y5lytq6sh5nUw0iH8OkHL/TjARSEvSHpr940pWgjGANpjCwyMdvsEV55l5tYNSg==} engines: {node: '>=8.x'} peerDependencies: date-fns: '>= 2.x' @@ -2273,34 +2420,34 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-rate@2.13.0: - resolution: {integrity: sha512-oxvx1Q5k5wD30sjN5tqAyWTvJfLNNJn7Oq3IeS4HxWfAiC4BOXMITNAsw7u/fzdtO4MS8Ki8uRLOzcnEuoQiAw==} + rc-rate@2.13.1: + resolution: {integrity: sha512-QUhQ9ivQ8Gy7mtMZPAjLbxBt5y9GRp65VcUyGUMF3N3fhiftivPHdpuDIaWIMOTEprAjZPC08bls1dQB+I1F2Q==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-resize-observer@1.4.0: - resolution: {integrity: sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q==} + rc-resize-observer@1.4.3: + resolution: {integrity: sha512-YZLjUbyIWox8E9i9C3Tm7ia+W7euPItNWSPX5sCcQTYbnwDb5uNpnLHQCG1f22oZWUhLw4Mv2tFmeWe68CDQRQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-segmented@2.5.0: - resolution: {integrity: sha512-B28Fe3J9iUFOhFJET3RoXAPFJ2u47QvLSYcZWC4tFYNGPEjug5LAxEasZlA/PpAxhdOPqGWsGbSj7ftneukJnw==} + rc-segmented@2.7.0: + resolution: {integrity: sha512-liijAjXz+KnTRVnxxXG2sYDGd6iLL7VpGGdR8gwoxAXy2KglviKCxLWZdjKYJzYzGSUwKDSTdYk8brj54Bn5BA==} peerDependencies: react: '>=16.0.0' react-dom: '>=16.0.0' - rc-select@14.15.2: - resolution: {integrity: sha512-oNoXlaFmpqXYcQDzcPVLrEqS2J9c+/+oJuGrlXeVVX/gVgrbHa5YcyiRUXRydFjyuA7GP3elRuLF7Y3Tfwltlw==} + rc-select@14.16.8: + resolution: {integrity: sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==} engines: {node: '>=8.x'} peerDependencies: react: '*' react-dom: '*' - rc-slider@11.1.7: - resolution: {integrity: sha512-ytYbZei81TX7otdC0QvoYD72XSlxvTihNth5OeZ6PMXyEDq/vHdWFulQmfDGyXK1NwKwSlKgpvINOa88uT5g2A==} + rc-slider@11.1.9: + resolution: {integrity: sha512-h8IknhzSh3FEM9u8ivkskh+Ef4Yo4JRIY2nj7MrH6GQmrwV6mcpJf5/4KgH5JaVI1H3E52yCdpOlVyGZIeph5A==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' @@ -2319,47 +2466,47 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-table@7.47.5: - resolution: {integrity: sha512-fzq+V9j/atbPIcvs3emuclaEoXulwQpIiJA6/7ey52j8+9cJ4P8DGmp4YzfUVDrb3qhgedcVeD6eRgUrokwVEQ==} + rc-table@7.54.0: + resolution: {integrity: sha512-/wDTkki6wBTjwylwAGjpLKYklKo9YgjZwAU77+7ME5mBoS32Q4nAwoqhA2lSge6fobLW3Tap6uc5xfwaL2p0Sw==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-tabs@15.3.0: - resolution: {integrity: sha512-lzE18r+zppT/jZWOAWS6ntdkDUKHOLJzqMi5UAij1LeKwOaQaupupAoI9Srn73GRzVpmGznkECMRrzkRusC40A==} + rc-tabs@15.7.0: + resolution: {integrity: sha512-ZepiE+6fmozYdWf/9gVp7k56PKHB1YYoDsKeQA1CBlJ/POIhjkcYiv0AGP0w2Jhzftd3AVvZP/K+V+Lpi2ankA==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-textarea@1.8.2: - resolution: {integrity: sha512-UFAezAqltyR00a8Lf0IPAyTd29Jj9ee8wt8DqXyDMal7r/Cg/nDt3e1OOv3Th4W6mKaZijjgwuPXhAfVNTN8sw==} + rc-textarea@1.10.2: + resolution: {integrity: sha512-HfaeXiaSlpiSp0I/pvWpecFEHpVysZ9tpDLNkxQbMvMz6gsr7aVZ7FpWP9kt4t7DB+jJXesYS0us1uPZnlRnwQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-tooltip@6.2.1: - resolution: {integrity: sha512-rws0duD/3sHHsD905Nex7FvoUGy2UBQRhTkKxeEvr2FB+r21HsOxcDJI0TzyO8NHhnAA8ILr8pfbSBg5Jj5KBg==} + rc-tooltip@6.4.0: + resolution: {integrity: sha512-kqyivim5cp8I5RkHmpsp1Nn/Wk+1oeloMv9c7LXNgDxUpGm+RbXJGL+OPvDlcRnx9DBeOe4wyOIl4OKUERyH1g==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-tree-select@5.23.0: - resolution: {integrity: sha512-aQGi2tFSRw1WbXv0UVXPzHm09E0cSvUVZMLxQtMv3rnZZpNmdRXWrnd9QkLNlVH31F+X5rgghmdSFF3yZW0N9A==} + rc-tree-select@5.27.0: + resolution: {integrity: sha512-2qTBTzwIT7LRI1o7zLyrCzmo5tQanmyGbSaGTIf7sYimCklAToVVfpMC6OAldSKolcnjorBYPNSKQqJmN3TCww==} peerDependencies: react: '*' react-dom: '*' - rc-tree@5.9.0: - resolution: {integrity: sha512-CPrgOvm9d/9E+izTONKSngNzQdIEjMox2PBufWjS1wf7vxtvmCWzK1SlpHbRY6IaBfJIeZ+88RkcIevf729cRg==} + rc-tree@5.13.1: + resolution: {integrity: sha512-FNhIefhftobCdUJshO7M8uZTA9F4OPGVXqGfZkkD/5soDeOhwO06T/aKTrg0WD8gRg/pyfq+ql3aMymLHCTC4A==} engines: {node: '>=10.x'} peerDependencies: react: '*' react-dom: '*' - rc-upload@4.8.1: - resolution: {integrity: sha512-toEAhwl4hjLAI1u8/CgKWt30BR06ulPa4iGQSMvSXoHzO88gPCslxqV/mnn4gJU7PDoltGIC9Eh+wkeudqgHyw==} + rc-upload@4.11.0: + resolution: {integrity: sha512-ZUyT//2JAehfHzjWowqROcwYJKnZkIUGWaTE/VogVrepSl7AFNbQf4+zGfX4zl9Vrj/Jm8scLO0R6UlPDKK4wA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' @@ -2370,8 +2517,14 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' - rc-virtual-list@3.15.0: - resolution: {integrity: sha512-dF2YQztqrU3ijAeWOqscTshCEr7vpimzSqAVjO1AyAmaqcHulaXpnGR0ptK5PXfxTUy48VkJOiglMIxlkYGs0w==} + rc-util@5.44.4: + resolution: {integrity: sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + + rc-virtual-list@3.19.2: + resolution: {integrity: sha512-Ys6NcjwGkuwkeaWBDqfI3xWuZ7rDiQXlH1o2zLfFzATfEgXcqpk8CkgMfbJD81McqjcJVez25a3kPxCR807evA==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' @@ -2420,8 +2573,8 @@ packages: react-is@18.3.1: resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} - react-refresh@0.14.2: - resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==} + react-refresh@0.17.0: + resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==} engines: {node: '>=0.10.0'} react-remove-scroll-bar@2.3.6: @@ -2515,8 +2668,9 @@ packages: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} - resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + resolve@1.22.11: + resolution: {integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==} + engines: {node: '>= 0.4'} hasBin: true resolve@2.0.0-next.5: @@ -2527,8 +2681,8 @@ packages: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rollup@4.34.9: - resolution: {integrity: sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==} + rollup@4.53.3: + resolution: {integrity: sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -2606,10 +2760,6 @@ packages: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} - string-width@5.1.2: - resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} - engines: {node: '>=12'} - string.prototype.matchall@4.0.11: resolution: {integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==} engines: {node: '>= 0.4'} @@ -2632,19 +2782,15 @@ packages: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} - strip-ansi@7.1.0: - resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} - engines: {node: '>=12'} - strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} - stylis@4.3.4: - resolution: {integrity: sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==} + stylis@4.3.6: + resolution: {integrity: sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==} - sucrase@3.35.0: - resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} + sucrase@3.35.1: + resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true @@ -2656,8 +2802,8 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - tailwindcss@3.4.14: - resolution: {integrity: sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==} + tailwindcss@3.4.18: + resolution: {integrity: sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==} engines: {node: '>=14.0.0'} hasBin: true @@ -2672,6 +2818,10 @@ packages: resolution: {integrity: sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==} engines: {node: '>=12.22'} + tinyglobby@0.2.15: + resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} + engines: {node: '>=12.0.0'} + to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -2683,8 +2833,8 @@ packages: resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==} engines: {node: '>=6'} - ts-api-utils@2.0.0: - resolution: {integrity: sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==} + ts-api-utils@2.1.0: + resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==} engines: {node: '>=18.12'} peerDependencies: typescript: '>=4.8.4' @@ -2760,6 +2910,12 @@ packages: peerDependencies: browserslist: '>= 4.21.0' + update-browserslist-db@1.1.4: + resolution: {integrity: sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} @@ -2807,19 +2963,19 @@ packages: vite: optional: true - vite@6.2.1: - resolution: {integrity: sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} + vite@7.1.11: + resolution: {integrity: sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==} + engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: - '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 + '@types/node': ^20.19.0 || >=22.12.0 jiti: '>=1.21.0' - less: '*' + less: ^4.0.0 lightningcss: ^1.21.0 - sass: '*' - sass-embedded: '*' - stylus: '*' - sugarss: '*' + sass: ^1.70.0 + sass-embedded: ^1.70.0 + stylus: '>=0.54.8' + sugarss: ^5.0.0 terser: ^5.16.0 tsx: ^4.8.1 yaml: ^2.4.2 @@ -2887,10 +3043,6 @@ packages: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} - wrap-ansi@8.1.0: - resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} - engines: {node: '>=12'} - y18n@5.0.8: resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} @@ -2931,34 +3083,33 @@ snapshots: '@alloc/quick-lru@5.2.0': {} - '@ampproject/remapping@2.3.0': - dependencies: - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - '@ant-design/colors@7.1.0': dependencies: '@ctrl/tinycolor': 3.6.1 - '@ant-design/cssinjs-utils@1.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@ant-design/colors@7.2.1': dependencies: - '@ant-design/cssinjs': 1.21.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@ant-design/fast-color': 2.0.6 + + '@ant-design/cssinjs-utils@1.1.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@ant-design/cssinjs': 1.24.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@babel/runtime': 7.26.0 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@ant-design/cssinjs@1.21.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@ant-design/cssinjs@1.24.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.26.0 '@emotion/hash': 0.8.0 '@emotion/unitless': 0.7.5 classnames: 2.5.1 - csstype: 3.1.3 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + csstype: 3.2.3 + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - stylis: 4.3.4 + stylis: 4.3.6 '@ant-design/fast-color@2.0.6': dependencies: @@ -2966,7 +3117,7 @@ snapshots: '@ant-design/icons-svg@4.4.2': {} - '@ant-design/icons@5.5.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@ant-design/icons@5.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@ant-design/colors': 7.1.0 '@ant-design/icons-svg': 4.4.2 @@ -2991,22 +3142,28 @@ snapshots: js-tokens: 4.0.0 picocolors: 1.1.1 - '@babel/compat-data@7.26.2': {} - - '@babel/core@7.26.0': + '@babel/code-frame@7.27.1': dependencies: - '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.26.2 - '@babel/generator': 7.26.2 - '@babel/helper-compilation-targets': 7.25.9 - '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) - '@babel/helpers': 7.26.0 - '@babel/parser': 7.26.2 - '@babel/template': 7.25.9 - '@babel/traverse': 7.25.9 - '@babel/types': 7.26.0 + '@babel/helper-validator-identifier': 7.28.5 + js-tokens: 4.0.0 + picocolors: 1.1.1 + + '@babel/compat-data@7.28.5': {} + + '@babel/core@7.28.5': + dependencies: + '@babel/code-frame': 7.27.1 + '@babel/generator': 7.28.5 + '@babel/helper-compilation-targets': 7.27.2 + '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.5) + '@babel/helpers': 7.28.4 + '@babel/parser': 7.28.5 + '@babel/template': 7.27.2 + '@babel/traverse': 7.28.5 + '@babel/types': 7.28.5 + '@jridgewell/remapping': 2.3.5 convert-source-map: 2.0.0 - debug: 4.3.7 + debug: 4.4.3 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -3021,56 +3178,74 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 jsesc: 3.0.2 - '@babel/helper-compilation-targets@7.25.9': + '@babel/generator@7.28.5': dependencies: - '@babel/compat-data': 7.26.2 - '@babel/helper-validator-option': 7.25.9 - browserslist: 4.24.2 + '@babel/parser': 7.28.5 + '@babel/types': 7.28.5 + '@jridgewell/gen-mapping': 0.3.13 + '@jridgewell/trace-mapping': 0.3.31 + jsesc: 3.1.0 + + '@babel/helper-compilation-targets@7.27.2': + dependencies: + '@babel/compat-data': 7.28.5 + '@babel/helper-validator-option': 7.27.1 + browserslist: 4.28.0 lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-module-imports@7.25.9': + '@babel/helper-globals@7.28.0': {} + + '@babel/helper-module-imports@7.27.1': dependencies: - '@babel/traverse': 7.25.9 - '@babel/types': 7.26.0 + '@babel/traverse': 7.28.5 + '@babel/types': 7.28.5 transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)': + '@babel/helper-module-transforms@7.28.3(@babel/core@7.28.5)': dependencies: - '@babel/core': 7.26.0 - '@babel/helper-module-imports': 7.25.9 - '@babel/helper-validator-identifier': 7.25.9 - '@babel/traverse': 7.25.9 + '@babel/core': 7.28.5 + '@babel/helper-module-imports': 7.27.1 + '@babel/helper-validator-identifier': 7.28.5 + '@babel/traverse': 7.28.5 transitivePeerDependencies: - supports-color - '@babel/helper-plugin-utils@7.25.9': {} + '@babel/helper-plugin-utils@7.27.1': {} '@babel/helper-string-parser@7.25.9': {} + '@babel/helper-string-parser@7.27.1': {} + '@babel/helper-validator-identifier@7.25.9': {} - '@babel/helper-validator-option@7.25.9': {} + '@babel/helper-validator-identifier@7.28.5': {} - '@babel/helpers@7.26.0': + '@babel/helper-validator-option@7.27.1': {} + + '@babel/helpers@7.28.4': dependencies: - '@babel/template': 7.25.9 - '@babel/types': 7.26.0 + '@babel/template': 7.27.2 + '@babel/types': 7.28.5 '@babel/parser@7.26.2': dependencies: '@babel/types': 7.26.0 - '@babel/plugin-transform-react-jsx-self@7.25.9(@babel/core@7.26.0)': + '@babel/parser@7.28.5': dependencies: - '@babel/core': 7.26.0 - '@babel/helper-plugin-utils': 7.25.9 + '@babel/types': 7.28.5 - '@babel/plugin-transform-react-jsx-source@7.25.9(@babel/core@7.26.0)': + '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.28.5)': dependencies: - '@babel/core': 7.26.0 - '@babel/helper-plugin-utils': 7.25.9 + '@babel/core': 7.28.5 + '@babel/helper-plugin-utils': 7.27.1 + + '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.28.5)': + dependencies: + '@babel/core': 7.28.5 + '@babel/helper-plugin-utils': 7.27.1 '@babel/runtime@7.26.0': dependencies: @@ -3082,6 +3257,12 @@ snapshots: '@babel/parser': 7.26.2 '@babel/types': 7.26.0 + '@babel/template@7.27.2': + dependencies: + '@babel/code-frame': 7.27.1 + '@babel/parser': 7.28.5 + '@babel/types': 7.28.5 + '@babel/traverse@7.25.9': dependencies: '@babel/code-frame': 7.26.2 @@ -3094,11 +3275,28 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/traverse@7.28.5': + dependencies: + '@babel/code-frame': 7.27.1 + '@babel/generator': 7.28.5 + '@babel/helper-globals': 7.28.0 + '@babel/parser': 7.28.5 + '@babel/template': 7.27.2 + '@babel/types': 7.28.5 + debug: 4.4.3 + transitivePeerDependencies: + - supports-color + '@babel/types@7.26.0': dependencies: '@babel/helper-string-parser': 7.25.9 '@babel/helper-validator-identifier': 7.25.9 + '@babel/types@7.28.5': + dependencies: + '@babel/helper-string-parser': 7.27.1 + '@babel/helper-validator-identifier': 7.28.5 + '@bundled-es-modules/cookie@2.0.1': dependencies: cookie: 0.7.2 @@ -3193,45 +3391,50 @@ snapshots: '@esbuild/win32-x64@0.25.0': optional: true - '@eslint-community/eslint-utils@4.4.1(eslint@9.17.0(jiti@1.21.6))': + '@eslint-community/eslint-utils@4.9.0(eslint@9.39.1(jiti@1.21.7))': dependencies: - eslint: 9.17.0(jiti@1.21.6) + eslint: 9.39.1(jiti@1.21.7) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.12.1': {} - '@eslint/config-array@0.19.1': + '@eslint/config-array@0.21.1': dependencies: - '@eslint/object-schema': 2.1.5 + '@eslint/object-schema': 2.1.7 debug: 4.3.7 minimatch: 3.1.2 transitivePeerDependencies: - supports-color - '@eslint/core@0.9.1': + '@eslint/config-helpers@0.4.2': + dependencies: + '@eslint/core': 0.17.0 + + '@eslint/core@0.17.0': dependencies: '@types/json-schema': 7.0.15 - '@eslint/eslintrc@3.2.0': + '@eslint/eslintrc@3.3.1': dependencies: ajv: 6.12.6 debug: 4.3.7 - espree: 10.3.0 + espree: 10.4.0 globals: 14.0.0 ignore: 5.3.2 - import-fresh: 3.3.0 - js-yaml: 4.1.0 + import-fresh: 3.3.1 + js-yaml: 4.1.1 minimatch: 3.1.2 strip-json-comments: 3.1.1 transitivePeerDependencies: - supports-color - '@eslint/js@9.17.0': {} + '@eslint/js@9.39.1': {} - '@eslint/object-schema@2.1.5': {} + '@eslint/object-schema@2.1.7': {} - '@eslint/plugin-kit@0.2.4': + '@eslint/plugin-kit@0.4.1': dependencies: + '@eslint/core': 0.17.0 levn: 0.4.1 '@humanfs/core@0.19.1': {} @@ -3245,11 +3448,10 @@ snapshots: '@humanwhocodes/retry@0.3.1': {} - '@humanwhocodes/retry@0.4.1': {} + '@humanwhocodes/retry@0.4.3': {} - '@ianvs/prettier-plugin-sort-imports@4.3.1(prettier@3.4.2)': + '@ianvs/prettier-plugin-sort-imports@4.7.0(prettier@3.4.2)': dependencies: - '@babel/core': 7.26.0 '@babel/generator': 7.26.2 '@babel/parser': 7.26.2 '@babel/traverse': 7.25.9 @@ -3285,14 +3487,10 @@ snapshots: dependencies: '@types/node': 22.9.0 - '@isaacs/cliui@8.0.2': + '@jridgewell/gen-mapping@0.3.13': dependencies: - string-width: 5.1.2 - string-width-cjs: string-width@4.2.3 - strip-ansi: 7.1.0 - strip-ansi-cjs: strip-ansi@6.0.1 - wrap-ansi: 8.1.0 - wrap-ansi-cjs: wrap-ansi@7.0.0 + '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/trace-mapping': 0.3.31 '@jridgewell/gen-mapping@0.3.5': dependencies: @@ -3300,17 +3498,29 @@ snapshots: '@jridgewell/sourcemap-codec': 1.5.0 '@jridgewell/trace-mapping': 0.3.25 + '@jridgewell/remapping@2.3.5': + dependencies: + '@jridgewell/gen-mapping': 0.3.13 + '@jridgewell/trace-mapping': 0.3.31 + '@jridgewell/resolve-uri@3.1.2': {} '@jridgewell/set-array@1.2.1': {} '@jridgewell/sourcemap-codec@1.5.0': {} + '@jridgewell/sourcemap-codec@1.5.5': {} + '@jridgewell/trace-mapping@0.3.25': dependencies: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 + '@jridgewell/trace-mapping@0.3.31': + dependencies: + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.5.5 + '@mswjs/interceptors@0.36.9': dependencies: '@open-draft/deferred-promise': 2.2.0 @@ -3341,9 +3551,6 @@ snapshots: '@open-draft/until@2.1.0': {} - '@pkgjs/parseargs@0.11.0': - optional: true - '@radix-ui/primitive@1.1.0': {} '@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.12)(react@18.3.1)': @@ -3488,14 +3695,14 @@ snapshots: '@ant-design/fast-color': 2.0.6 '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) '@rc-component/context@1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.26.0 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -3507,7 +3714,7 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -3515,15 +3722,14 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@rc-component/qrcode@1.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@rc-component/qrcode@1.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -3531,80 +3737,91 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 '@rc-component/portal': 1.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@rc-component/trigger': 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/trigger': 2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@rc-component/trigger@2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@rc-component/trigger@2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.26.0 '@rc-component/portal': 1.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-resize-observer: 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) '@remix-run/router@1.20.0': {} - '@rollup/rollup-android-arm-eabi@4.34.9': + '@rolldown/pluginutils@1.0.0-beta.27': {} + + '@rollup/rollup-android-arm-eabi@4.53.3': optional: true - '@rollup/rollup-android-arm64@4.34.9': + '@rollup/rollup-android-arm64@4.53.3': optional: true - '@rollup/rollup-darwin-arm64@4.34.9': + '@rollup/rollup-darwin-arm64@4.53.3': optional: true - '@rollup/rollup-darwin-x64@4.34.9': + '@rollup/rollup-darwin-x64@4.53.3': optional: true - '@rollup/rollup-freebsd-arm64@4.34.9': + '@rollup/rollup-freebsd-arm64@4.53.3': optional: true - '@rollup/rollup-freebsd-x64@4.34.9': + '@rollup/rollup-freebsd-x64@4.53.3': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.34.9': + '@rollup/rollup-linux-arm-gnueabihf@4.53.3': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.34.9': + '@rollup/rollup-linux-arm-musleabihf@4.53.3': optional: true - '@rollup/rollup-linux-arm64-gnu@4.34.9': + '@rollup/rollup-linux-arm64-gnu@4.53.3': optional: true - '@rollup/rollup-linux-arm64-musl@4.34.9': + '@rollup/rollup-linux-arm64-musl@4.53.3': optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.34.9': + '@rollup/rollup-linux-loong64-gnu@4.53.3': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': + '@rollup/rollup-linux-ppc64-gnu@4.53.3': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.34.9': + '@rollup/rollup-linux-riscv64-gnu@4.53.3': optional: true - '@rollup/rollup-linux-s390x-gnu@4.34.9': + '@rollup/rollup-linux-riscv64-musl@4.53.3': optional: true - '@rollup/rollup-linux-x64-gnu@4.34.9': + '@rollup/rollup-linux-s390x-gnu@4.53.3': optional: true - '@rollup/rollup-linux-x64-musl@4.34.9': + '@rollup/rollup-linux-x64-gnu@4.53.3': optional: true - '@rollup/rollup-win32-arm64-msvc@4.34.9': + '@rollup/rollup-linux-x64-musl@4.53.3': optional: true - '@rollup/rollup-win32-ia32-msvc@4.34.9': + '@rollup/rollup-openharmony-arm64@4.53.3': optional: true - '@rollup/rollup-win32-x64-msvc@4.34.9': + '@rollup/rollup-win32-arm64-msvc@4.53.3': + optional: true + + '@rollup/rollup-win32-ia32-msvc@4.53.3': + optional: true + + '@rollup/rollup-win32-x64-gnu@4.53.3': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.53.3': optional: true '@types/babel__core@7.20.5': @@ -3634,6 +3851,8 @@ snapshots: '@types/estree@1.0.6': {} + '@types/estree@1.0.8': {} + '@types/js-cookie@3.0.6': {} '@types/json-schema@7.0.15': {} @@ -3663,91 +3882,107 @@ snapshots: dependencies: '@types/node': 22.9.0 - '@typescript-eslint/eslint-plugin@8.19.1(@typescript-eslint/parser@8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3)': + '@typescript-eslint/eslint-plugin@8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3))(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3) - '@typescript-eslint/scope-manager': 8.19.1 - '@typescript-eslint/type-utils': 8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3) - '@typescript-eslint/utils': 8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.19.1 - eslint: 9.17.0(jiti@1.21.6) + '@typescript-eslint/parser': 8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3) + '@typescript-eslint/scope-manager': 8.48.0 + '@typescript-eslint/type-utils': 8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3) + '@typescript-eslint/utils': 8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.48.0 + eslint: 9.39.1(jiti@1.21.7) graphemer: 1.4.0 - ignore: 5.3.2 + ignore: 7.0.5 natural-compare: 1.4.0 - ts-api-utils: 2.0.0(typescript@5.6.3) + ts-api-utils: 2.1.0(typescript@5.6.3) typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3)': + '@typescript-eslint/parser@8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3)': dependencies: - '@typescript-eslint/scope-manager': 8.19.1 - '@typescript-eslint/types': 8.19.1 - '@typescript-eslint/typescript-estree': 8.19.1(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.19.1 + '@typescript-eslint/scope-manager': 8.48.0 + '@typescript-eslint/types': 8.48.0 + '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.48.0 debug: 4.3.7 - eslint: 9.17.0(jiti@1.21.6) + eslint: 9.39.1(jiti@1.21.7) typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.19.1': + '@typescript-eslint/project-service@8.48.0(typescript@5.6.3)': dependencies: - '@typescript-eslint/types': 8.19.1 - '@typescript-eslint/visitor-keys': 8.19.1 - - '@typescript-eslint/type-utils@8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3)': - dependencies: - '@typescript-eslint/typescript-estree': 8.19.1(typescript@5.6.3) - '@typescript-eslint/utils': 8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3) + '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.6.3) + '@typescript-eslint/types': 8.48.0 debug: 4.3.7 - eslint: 9.17.0(jiti@1.21.6) - ts-api-utils: 2.0.0(typescript@5.6.3) typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.19.1': {} - - '@typescript-eslint/typescript-estree@8.19.1(typescript@5.6.3)': + '@typescript-eslint/scope-manager@8.48.0': dependencies: - '@typescript-eslint/types': 8.19.1 - '@typescript-eslint/visitor-keys': 8.19.1 + '@typescript-eslint/types': 8.48.0 + '@typescript-eslint/visitor-keys': 8.48.0 + + '@typescript-eslint/tsconfig-utils@8.48.0(typescript@5.6.3)': + dependencies: + typescript: 5.6.3 + + '@typescript-eslint/type-utils@8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3)': + dependencies: + '@typescript-eslint/types': 8.48.0 + '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.6.3) + '@typescript-eslint/utils': 8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3) + debug: 4.4.3 + eslint: 9.39.1(jiti@1.21.7) + ts-api-utils: 2.1.0(typescript@5.6.3) + typescript: 5.6.3 + transitivePeerDependencies: + - supports-color + + '@typescript-eslint/types@8.48.0': {} + + '@typescript-eslint/typescript-estree@8.48.0(typescript@5.6.3)': + dependencies: + '@typescript-eslint/project-service': 8.48.0(typescript@5.6.3) + '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.6.3) + '@typescript-eslint/types': 8.48.0 + '@typescript-eslint/visitor-keys': 8.48.0 debug: 4.3.7 - fast-glob: 3.3.2 - is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 2.0.0(typescript@5.6.3) + tinyglobby: 0.2.15 + ts-api-utils: 2.1.0(typescript@5.6.3) typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.19.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.3)': + '@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.6.3)': dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.6)) - '@typescript-eslint/scope-manager': 8.19.1 - '@typescript-eslint/types': 8.19.1 - '@typescript-eslint/typescript-estree': 8.19.1(typescript@5.6.3) - eslint: 9.17.0(jiti@1.21.6) + '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@1.21.7)) + '@typescript-eslint/scope-manager': 8.48.0 + '@typescript-eslint/types': 8.48.0 + '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.6.3) + eslint: 9.39.1(jiti@1.21.7) typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.19.1': + '@typescript-eslint/visitor-keys@8.48.0': dependencies: - '@typescript-eslint/types': 8.19.1 - eslint-visitor-keys: 4.2.0 + '@typescript-eslint/types': 8.48.0 + eslint-visitor-keys: 4.2.1 - '@vitejs/plugin-react@4.3.3(vite@6.2.1(@types/node@22.9.0)(jiti@1.21.6)(yaml@2.6.0))': + '@vitejs/plugin-react@4.7.0(vite@7.1.11(@types/node@22.9.0)(jiti@1.21.7)(yaml@2.6.0))': dependencies: - '@babel/core': 7.26.0 - '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.0) - '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.0) + '@babel/core': 7.28.5 + '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.5) + '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.5) + '@rolldown/pluginutils': 1.0.0-beta.27 '@types/babel__core': 7.20.5 - react-refresh: 0.14.2 - vite: 6.2.1(@types/node@22.9.0)(jiti@1.21.6)(yaml@2.6.0) + react-refresh: 0.17.0 + vite: 7.1.11(@types/node@22.9.0)(jiti@1.21.7)(yaml@2.6.0) transitivePeerDependencies: - supports-color @@ -3761,11 +3996,11 @@ snapshots: '@xterm/xterm@5.5.0': {} - acorn-jsx@5.3.2(acorn@8.14.0): + acorn-jsx@5.3.2(acorn@8.15.0): dependencies: - acorn: 8.14.0 + acorn: 8.15.0 - acorn@8.14.0: {} + acorn@8.15.0: {} ajv@6.12.6: dependencies: @@ -3780,63 +4015,59 @@ snapshots: ansi-regex@5.0.1: {} - ansi-regex@6.1.0: {} - ansi-styles@4.3.0: dependencies: color-convert: 2.0.1 - ansi-styles@6.2.1: {} - - antd@5.21.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + antd@5.29.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@ant-design/colors': 7.1.0 - '@ant-design/cssinjs': 1.21.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@ant-design/cssinjs-utils': 1.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@ant-design/icons': 5.5.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@ant-design/colors': 7.2.1 + '@ant-design/cssinjs': 1.24.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@ant-design/cssinjs-utils': 1.1.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@ant-design/fast-color': 2.0.6 + '@ant-design/icons': 5.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@ant-design/react-slick': 1.1.2(react@18.3.1) '@babel/runtime': 7.26.0 - '@ctrl/tinycolor': 3.6.1 '@rc-component/color-picker': 2.0.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@rc-component/mutate-observer': 1.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@rc-component/qrcode': 1.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/qrcode': 1.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@rc-component/tour': 1.15.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@rc-component/trigger': 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/trigger': 2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 copy-to-clipboard: 3.3.3 dayjs: 1.11.13 - rc-cascader: 3.28.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-checkbox: 3.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-collapse: 3.8.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-cascader: 3.34.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-checkbox: 3.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-collapse: 3.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) rc-dialog: 9.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-drawer: 7.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-dropdown: 4.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-field-form: 2.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-image: 7.11.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-input: 1.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-input-number: 9.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-mentions: 2.16.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-menu: 9.15.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-notification: 5.6.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-pagination: 4.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-picker: 4.6.15(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-drawer: 7.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-dropdown: 4.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-field-form: 2.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-image: 7.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-input: 1.8.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-input-number: 9.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-mentions: 2.20.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-menu: 9.16.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-notification: 5.6.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-pagination: 5.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-picker: 4.11.3(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) rc-progress: 4.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-rate: 2.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-resize-observer: 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-segmented: 2.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-select: 14.15.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-slider: 11.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-rate: 2.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-segmented: 2.7.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-select: 14.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-slider: 11.1.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1) rc-steps: 6.0.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) rc-switch: 4.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-table: 7.47.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-tabs: 15.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-textarea: 1.8.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-tooltip: 6.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-tree: 5.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-tree-select: 5.23.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-upload: 4.8.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-table: 7.54.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-tabs: 15.7.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-textarea: 1.10.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-tooltip: 6.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-tree: 5.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-tree-select: 5.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-upload: 4.11.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) scroll-into-view-if-needed: 3.1.0 @@ -3875,8 +4106,6 @@ snapshots: get-intrinsic: 1.2.4 is-string: 1.0.7 - array-tree-filter@2.1.0: {} - array.prototype.findlast@1.2.5: dependencies: call-bind: 1.0.7 @@ -3924,7 +4153,7 @@ snapshots: autoprefixer@10.4.20(postcss@8.4.47): dependencies: browserslist: 4.24.2 - caniuse-lite: 1.0.30001713 + caniuse-lite: 1.0.30001756 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.1.1 @@ -3935,24 +4164,26 @@ snapshots: dependencies: possible-typed-array-names: 1.0.0 - axios@1.8.4: + axios@1.12.0: dependencies: follow-redirects: 1.15.9 - form-data: 4.0.1 + form-data: 4.0.5 proxy-from-env: 1.1.0 transitivePeerDependencies: - debug balanced-match@1.0.2: {} + baseline-browser-mapping@2.8.31: {} + binary-extensions@2.3.0: {} - brace-expansion@1.1.11: + brace-expansion@1.1.12: dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 - brace-expansion@2.0.1: + brace-expansion@2.0.2: dependencies: balanced-match: 1.0.2 @@ -3962,15 +4193,28 @@ snapshots: browserslist@4.24.2: dependencies: - caniuse-lite: 1.0.30001713 + caniuse-lite: 1.0.30001756 electron-to-chromium: 1.5.51 node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.2) + browserslist@4.28.0: + dependencies: + baseline-browser-mapping: 2.8.31 + caniuse-lite: 1.0.30001757 + electron-to-chromium: 1.5.260 + node-releases: 2.0.27 + update-browserslist-db: 1.1.4(browserslist@4.28.0) + bufferutil@4.0.8: dependencies: node-gyp-build: 4.8.2 + call-bind-apply-helpers@1.0.2: + dependencies: + es-errors: 1.3.0 + function-bind: 1.1.2 + call-bind@1.0.7: dependencies: es-define-property: 1.0.0 @@ -3983,7 +4227,9 @@ snapshots: camelcase-css@2.0.1: {} - caniuse-lite@1.0.30001713: {} + caniuse-lite@1.0.30001756: {} + + caniuse-lite@1.0.30001757: {} chalk@4.1.2: dependencies: @@ -4054,6 +4300,8 @@ snapshots: csstype@3.1.3: {} + csstype@3.2.3: {} + d@1.0.2: dependencies: es5-ext: 0.10.64 @@ -4087,6 +4335,10 @@ snapshots: dependencies: ms: 2.1.3 + debug@4.4.3: + dependencies: + ms: 2.1.3 + deep-is@0.1.4: {} define-data-property@1.1.4: @@ -4113,14 +4365,18 @@ snapshots: dependencies: esutils: 2.0.3 - eastasianwidth@0.2.0: {} + dunder-proto@1.0.1: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-errors: 1.3.0 + gopd: 1.2.0 + + electron-to-chromium@1.5.260: {} electron-to-chromium@1.5.51: {} emoji-regex@8.0.0: {} - emoji-regex@9.2.2: {} - es-abstract@1.23.3: dependencies: array-buffer-byte-length: 1.0.1 @@ -4174,6 +4430,8 @@ snapshots: dependencies: get-intrinsic: 1.2.4 + es-define-property@1.0.1: {} + es-errors@1.3.0: {} es-iterator-helpers@1.2.0: @@ -4198,12 +4456,23 @@ snapshots: dependencies: es-errors: 1.3.0 + es-object-atoms@1.1.1: + dependencies: + es-errors: 1.3.0 + es-set-tostringtag@2.0.3: dependencies: get-intrinsic: 1.2.4 has-tostringtag: 1.0.2 hasown: 2.0.2 + es-set-tostringtag@2.1.0: + dependencies: + es-errors: 1.3.0 + get-intrinsic: 1.3.0 + has-tostringtag: 1.0.2 + hasown: 2.0.2 + es-shim-unscopables@1.0.2: dependencies: hasown: 2.0.2 @@ -4264,19 +4533,19 @@ snapshots: escape-string-regexp@4.0.0: {} - eslint-config-prettier@9.1.0(eslint@9.17.0(jiti@1.21.6)): + eslint-config-prettier@9.1.0(eslint@9.39.1(jiti@1.21.7)): dependencies: - eslint: 9.17.0(jiti@1.21.6) + eslint: 9.39.1(jiti@1.21.7) - eslint-plugin-react-hooks@5.1.0(eslint@9.17.0(jiti@1.21.6)): + eslint-plugin-react-hooks@5.1.0(eslint@9.39.1(jiti@1.21.7)): dependencies: - eslint: 9.17.0(jiti@1.21.6) + eslint: 9.39.1(jiti@1.21.7) - eslint-plugin-react-refresh@0.4.16(eslint@9.17.0(jiti@1.21.6)): + eslint-plugin-react-refresh@0.4.16(eslint@9.39.1(jiti@1.21.7)): dependencies: - eslint: 9.17.0(jiti@1.21.6) + eslint: 9.39.1(jiti@1.21.7) - eslint-plugin-react@7.37.2(eslint@9.17.0(jiti@1.21.6)): + eslint-plugin-react@7.37.2(eslint@9.39.1(jiti@1.21.7)): dependencies: array-includes: 3.1.8 array.prototype.findlast: 1.2.5 @@ -4284,7 +4553,7 @@ snapshots: array.prototype.tosorted: 1.1.4 doctrine: 2.1.0 es-iterator-helpers: 1.2.0 - eslint: 9.17.0(jiti@1.21.6) + eslint: 9.39.1(jiti@1.21.7) estraverse: 5.3.0 hasown: 2.0.2 jsx-ast-utils: 3.3.5 @@ -4298,37 +4567,37 @@ snapshots: string.prototype.matchall: 4.0.11 string.prototype.repeat: 1.0.0 - eslint-scope@8.2.0: + eslint-scope@8.4.0: dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 eslint-visitor-keys@3.4.3: {} - eslint-visitor-keys@4.2.0: {} + eslint-visitor-keys@4.2.1: {} - eslint@9.17.0(jiti@1.21.6): + eslint@9.39.1(jiti@1.21.7): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@1.21.7)) '@eslint-community/regexpp': 4.12.1 - '@eslint/config-array': 0.19.1 - '@eslint/core': 0.9.1 - '@eslint/eslintrc': 3.2.0 - '@eslint/js': 9.17.0 - '@eslint/plugin-kit': 0.2.4 + '@eslint/config-array': 0.21.1 + '@eslint/config-helpers': 0.4.2 + '@eslint/core': 0.17.0 + '@eslint/eslintrc': 3.3.1 + '@eslint/js': 9.39.1 + '@eslint/plugin-kit': 0.4.1 '@humanfs/node': 0.16.6 '@humanwhocodes/module-importer': 1.0.1 - '@humanwhocodes/retry': 0.4.1 + '@humanwhocodes/retry': 0.4.3 '@types/estree': 1.0.6 - '@types/json-schema': 7.0.15 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 debug: 4.3.7 escape-string-regexp: 4.0.0 - eslint-scope: 8.2.0 - eslint-visitor-keys: 4.2.0 - espree: 10.3.0 + eslint-scope: 8.4.0 + eslint-visitor-keys: 4.2.1 + espree: 10.4.0 esquery: 1.6.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 @@ -4344,7 +4613,7 @@ snapshots: natural-compare: 1.4.0 optionator: 0.9.4 optionalDependencies: - jiti: 1.21.6 + jiti: 1.21.7 transitivePeerDependencies: - supports-color @@ -4355,11 +4624,11 @@ snapshots: event-emitter: 0.3.5 type: 2.7.3 - espree@10.3.0: + espree@10.4.0: dependencies: - acorn: 8.14.0 - acorn-jsx: 5.3.2(acorn@8.14.0) - eslint-visitor-keys: 4.2.0 + acorn: 8.15.0 + acorn-jsx: 5.3.2(acorn@8.15.0) + eslint-visitor-keys: 4.2.1 esquery@1.6.0: dependencies: @@ -4384,7 +4653,7 @@ snapshots: fast-deep-equal@3.1.3: {} - fast-glob@3.3.2: + fast-glob@3.3.3: dependencies: '@nodelib/fs.stat': 2.0.5 '@nodelib/fs.walk': 1.2.8 @@ -4400,6 +4669,10 @@ snapshots: dependencies: reusify: 1.0.4 + fdir@6.5.0(picomatch@4.0.3): + optionalDependencies: + picomatch: 4.0.3 + file-entry-cache@8.0.0: dependencies: flat-cache: 4.0.1 @@ -4426,15 +4699,12 @@ snapshots: dependencies: is-callable: 1.2.7 - foreground-child@3.3.0: - dependencies: - cross-spawn: 7.0.6 - signal-exit: 4.1.0 - - form-data@4.0.1: + form-data@4.0.5: dependencies: asynckit: 0.4.0 combined-stream: 1.0.8 + es-set-tostringtag: 2.1.0 + hasown: 2.0.2 mime-types: 2.1.35 fraction.js@4.3.7: {} @@ -4465,8 +4735,26 @@ snapshots: has-symbols: 1.0.3 hasown: 2.0.2 + get-intrinsic@1.3.0: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.1 + es-errors: 1.3.0 + es-object-atoms: 1.1.1 + function-bind: 1.1.2 + get-proto: 1.0.1 + gopd: 1.2.0 + has-symbols: 1.1.0 + hasown: 2.0.2 + math-intrinsics: 1.1.0 + get-nonce@1.0.1: {} + get-proto@1.0.1: + dependencies: + dunder-proto: 1.0.1 + es-object-atoms: 1.1.1 + get-symbol-description@1.0.2: dependencies: call-bind: 1.0.7 @@ -4481,15 +4769,6 @@ snapshots: dependencies: is-glob: 4.0.3 - glob@10.4.5: - dependencies: - foreground-child: 3.3.0 - jackspeak: 3.4.3 - minimatch: 9.0.5 - minipass: 7.1.2 - package-json-from-dist: 1.0.1 - path-scurry: 1.11.1 - globals@11.12.0: {} globals@14.0.0: {} @@ -4505,6 +4784,8 @@ snapshots: dependencies: get-intrinsic: 1.2.4 + gopd@1.2.0: {} + graphemer@1.4.0: {} graphql@16.9.0: {} @@ -4521,6 +4802,8 @@ snapshots: has-symbols@1.0.3: {} + has-symbols@1.1.0: {} + has-tostringtag@1.0.2: dependencies: has-symbols: 1.0.3 @@ -4543,7 +4826,9 @@ snapshots: ignore@5.3.2: {} - import-fresh@3.3.0: + ignore@7.0.5: {} + + import-fresh@3.3.1: dependencies: parent-module: 1.0.1 resolve-from: 4.0.0 @@ -4588,6 +4873,10 @@ snapshots: dependencies: hasown: 2.0.2 + is-core-module@2.16.1: + dependencies: + hasown: 2.0.2 + is-data-view@1.0.1: dependencies: is-typed-array: 1.1.13 @@ -4672,13 +4961,7 @@ snapshots: reflect.getprototypeof: 1.0.6 set-function-name: 2.0.2 - jackspeak@3.4.3: - dependencies: - '@isaacs/cliui': 8.0.2 - optionalDependencies: - '@pkgjs/parseargs': 0.11.0 - - jiti@1.21.6: {} + jiti@1.21.7: {} jotai@2.10.1(@types/react@18.3.12)(react@18.3.1): optionalDependencies: @@ -4689,12 +4972,14 @@ snapshots: js-tokens@4.0.0: {} - js-yaml@4.1.0: + js-yaml@4.1.1: dependencies: argparse: 2.0.1 jsesc@3.0.2: {} + jsesc@3.1.0: {} + json-buffer@3.0.1: {} json-schema-traverse@0.4.1: {} @@ -4723,9 +5008,7 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - lilconfig@2.1.0: {} - - lilconfig@3.1.2: {} + lilconfig@3.1.3: {} lines-and-columns@1.2.4: {} @@ -4739,8 +5022,6 @@ snapshots: dependencies: js-tokens: 4.0.0 - lru-cache@10.4.3: {} - lru-cache@5.1.1: dependencies: yallist: 3.1.1 @@ -4753,6 +5034,8 @@ snapshots: dependencies: css-mediaquery: 0.1.2 + math-intrinsics@1.1.0: {} + merge2@1.4.1: {} micromatch@4.0.8: @@ -4768,13 +5051,11 @@ snapshots: minimatch@3.1.2: dependencies: - brace-expansion: 1.1.11 + brace-expansion: 1.1.12 minimatch@9.0.5: dependencies: - brace-expansion: 2.0.1 - - minipass@7.1.2: {} + brace-expansion: 2.0.2 ms@2.0.0: {} @@ -4813,6 +5094,8 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 + nanoid@3.3.11: {} + nanoid@3.3.8: {} natural-compare@1.4.0: {} @@ -4823,6 +5106,8 @@ snapshots: node-releases@2.0.18: {} + node-releases@2.0.27: {} + normalize-path@3.0.0: {} normalize-range@0.1.2: {} @@ -4880,8 +5165,6 @@ snapshots: dependencies: p-limit: 3.1.0 - package-json-from-dist@1.0.1: {} - parent-module@1.0.1: dependencies: callsites: 3.1.0 @@ -4892,20 +5175,17 @@ snapshots: path-parse@1.0.7: {} - path-scurry@1.11.1: - dependencies: - lru-cache: 10.4.3 - minipass: 7.1.2 - path-to-regexp@6.3.0: {} picocolors@1.1.1: {} picomatch@2.3.1: {} + picomatch@4.0.3: {} + pify@2.3.0: {} - pirates@4.0.6: {} + pirates@4.0.7: {} possible-typed-array-names@1.0.0: {} @@ -4914,19 +5194,20 @@ snapshots: postcss: 8.4.47 postcss-value-parser: 4.2.0 read-cache: 1.0.0 - resolve: 1.22.8 + resolve: 1.22.11 - postcss-js@4.0.1(postcss@8.4.47): + postcss-js@4.1.0(postcss@8.4.47): dependencies: camelcase-css: 2.0.1 postcss: 8.4.47 - postcss-load-config@4.0.2(postcss@8.4.47): + postcss-load-config@6.0.1(jiti@1.21.7)(postcss@8.4.47)(yaml@2.6.0): dependencies: - lilconfig: 3.1.2 - yaml: 2.6.0 + lilconfig: 3.1.3 optionalDependencies: + jiti: 1.21.7 postcss: 8.4.47 + yaml: 2.6.0 postcss-nested@6.2.0(postcss@8.4.47): dependencies: @@ -4946,19 +5227,19 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 - postcss@8.5.3: + postcss@8.5.6: dependencies: - nanoid: 3.3.8 + nanoid: 3.3.11 picocolors: 1.1.1 source-map-js: 1.2.1 prelude-ls@1.2.1: {} - prettier-plugin-tailwindcss@0.6.9(@ianvs/prettier-plugin-sort-imports@4.3.1(prettier@3.4.2))(prettier@3.4.2): + prettier-plugin-tailwindcss@0.6.9(@ianvs/prettier-plugin-sort-imports@4.7.0(prettier@3.4.2))(prettier@3.4.2): dependencies: prettier: 3.4.2 optionalDependencies: - '@ianvs/prettier-plugin-sort-imports': 4.3.1(prettier@3.4.2) + '@ianvs/prettier-plugin-sort-imports': 4.7.0(prettier@3.4.2) prettier@3.4.2: {} @@ -4978,31 +5259,30 @@ snapshots: queue-microtask@1.2.3: {} - rc-cascader@3.28.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-cascader@3.34.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 - array-tree-filter: 2.1.0 classnames: 2.5.1 - rc-select: 14.15.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-tree: 5.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-select: 14.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-tree: 5.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-checkbox@3.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-checkbox@3.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-collapse@3.8.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-collapse@3.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -5011,132 +5291,132 @@ snapshots: '@babel/runtime': 7.26.0 '@rc-component/portal': 1.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-drawer@7.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-drawer@7.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 '@rc-component/portal': 1.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-dropdown@4.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-dropdown@4.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 - '@rc-component/trigger': 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/trigger': 2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-field-form@2.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-field-form@2.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 '@rc-component/async-validator': 5.0.4 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-image@7.11.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-image@7.12.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 '@rc-component/portal': 1.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 rc-dialog: 9.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-input-number@9.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-input-number@9.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 '@rc-component/mini-decimal': 1.1.0 classnames: 2.5.1 - rc-input: 1.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-input: 1.8.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-input@1.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-input@1.8.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-mentions@2.16.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-mentions@2.20.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 - '@rc-component/trigger': 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/trigger': 2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-input: 1.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-menu: 9.15.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-textarea: 1.8.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-input: 1.8.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-menu: 9.16.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-textarea: 1.10.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-menu@9.15.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-menu@9.16.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 - '@rc-component/trigger': 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/trigger': 2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-overflow: 1.3.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-overflow: 1.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-motion@2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-motion@2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-notification@5.6.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-notification@5.6.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-overflow@1.3.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-overflow@1.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-resize-observer: 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-pagination@4.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-pagination@5.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-picker@4.6.15(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-picker@4.11.3(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 - '@rc-component/trigger': 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/trigger': 2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-overflow: 1.3.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-resize-observer: 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-overflow: 1.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: @@ -5146,53 +5426,53 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-rate@2.13.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-rate@2.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-resize-observer@1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-resize-observer@1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) resize-observer-polyfill: 1.5.1 - rc-segmented@2.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-segmented@2.7.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-select@14.15.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-select@14.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 - '@rc-component/trigger': 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/trigger': 2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-overflow: 1.3.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-virtual-list: 3.15.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-overflow: 1.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-virtual-list: 3.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-slider@11.1.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-slider@11.1.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -5200,7 +5480,7 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -5208,76 +5488,77 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-table@7.47.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-table@7.54.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 '@rc-component/context': 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 - rc-resize-observer: 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-virtual-list: 3.15.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-virtual-list: 3.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-tabs@15.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-tabs@15.7.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-dropdown: 4.2.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-menu: 9.15.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-resize-observer: 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-dropdown: 4.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-menu: 9.16.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-textarea@1.8.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-textarea@1.10.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-input: 1.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-resize-observer: 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-input: 1.8.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-tooltip@6.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-tooltip@6.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 - '@rc-component/trigger': 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@rc-component/trigger': 2.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) classnames: 2.5.1 + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-tree-select@5.23.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-tree-select@5.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-select: 14.15.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-tree: 5.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-select: 14.16.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-tree: 5.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-tree@5.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-tree@5.13.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-motion: 2.9.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-virtual-list: 3.15.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-motion: 2.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-virtual-list: 3.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - rc-upload@4.8.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-upload@4.11.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -5288,12 +5569,19 @@ snapshots: react-dom: 18.3.1(react@18.3.1) react-is: 18.3.1 - rc-virtual-list@3.15.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + rc-util@5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + dependencies: + '@babel/runtime': 7.26.0 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-is: 18.3.1 + + rc-virtual-list@3.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/runtime': 7.26.0 classnames: 2.5.1 - rc-resize-observer: 1.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - rc-util: 5.43.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-resize-observer: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -5337,7 +5625,7 @@ snapshots: react-is@18.3.1: {} - react-refresh@0.14.2: {} + react-refresh@0.17.0: {} react-remove-scroll-bar@2.3.6(@types/react@18.3.12)(react@18.3.1): dependencies: @@ -5431,9 +5719,9 @@ snapshots: resolve-from@4.0.0: {} - resolve@1.22.8: + resolve@1.22.11: dependencies: - is-core-module: 2.15.1 + is-core-module: 2.16.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 @@ -5445,29 +5733,32 @@ snapshots: reusify@1.0.4: {} - rollup@4.34.9: + rollup@4.53.3: dependencies: - '@types/estree': 1.0.6 + '@types/estree': 1.0.8 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.34.9 - '@rollup/rollup-android-arm64': 4.34.9 - '@rollup/rollup-darwin-arm64': 4.34.9 - '@rollup/rollup-darwin-x64': 4.34.9 - '@rollup/rollup-freebsd-arm64': 4.34.9 - '@rollup/rollup-freebsd-x64': 4.34.9 - '@rollup/rollup-linux-arm-gnueabihf': 4.34.9 - '@rollup/rollup-linux-arm-musleabihf': 4.34.9 - '@rollup/rollup-linux-arm64-gnu': 4.34.9 - '@rollup/rollup-linux-arm64-musl': 4.34.9 - '@rollup/rollup-linux-loongarch64-gnu': 4.34.9 - '@rollup/rollup-linux-powerpc64le-gnu': 4.34.9 - '@rollup/rollup-linux-riscv64-gnu': 4.34.9 - '@rollup/rollup-linux-s390x-gnu': 4.34.9 - '@rollup/rollup-linux-x64-gnu': 4.34.9 - '@rollup/rollup-linux-x64-musl': 4.34.9 - '@rollup/rollup-win32-arm64-msvc': 4.34.9 - '@rollup/rollup-win32-ia32-msvc': 4.34.9 - '@rollup/rollup-win32-x64-msvc': 4.34.9 + '@rollup/rollup-android-arm-eabi': 4.53.3 + '@rollup/rollup-android-arm64': 4.53.3 + '@rollup/rollup-darwin-arm64': 4.53.3 + '@rollup/rollup-darwin-x64': 4.53.3 + '@rollup/rollup-freebsd-arm64': 4.53.3 + '@rollup/rollup-freebsd-x64': 4.53.3 + '@rollup/rollup-linux-arm-gnueabihf': 4.53.3 + '@rollup/rollup-linux-arm-musleabihf': 4.53.3 + '@rollup/rollup-linux-arm64-gnu': 4.53.3 + '@rollup/rollup-linux-arm64-musl': 4.53.3 + '@rollup/rollup-linux-loong64-gnu': 4.53.3 + '@rollup/rollup-linux-ppc64-gnu': 4.53.3 + '@rollup/rollup-linux-riscv64-gnu': 4.53.3 + '@rollup/rollup-linux-riscv64-musl': 4.53.3 + '@rollup/rollup-linux-s390x-gnu': 4.53.3 + '@rollup/rollup-linux-x64-gnu': 4.53.3 + '@rollup/rollup-linux-x64-musl': 4.53.3 + '@rollup/rollup-openharmony-arm64': 4.53.3 + '@rollup/rollup-win32-arm64-msvc': 4.53.3 + '@rollup/rollup-win32-ia32-msvc': 4.53.3 + '@rollup/rollup-win32-x64-gnu': 4.53.3 + '@rollup/rollup-win32-x64-msvc': 4.53.3 fsevents: 2.3.3 run-parallel@1.2.0: @@ -5548,12 +5839,6 @@ snapshots: is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 - string-width@5.1.2: - dependencies: - eastasianwidth: 0.2.0 - emoji-regex: 9.2.2 - strip-ansi: 7.1.0 - string.prototype.matchall@4.0.11: dependencies: call-bind: 1.0.7 @@ -5597,22 +5882,18 @@ snapshots: dependencies: ansi-regex: 5.0.1 - strip-ansi@7.1.0: - dependencies: - ansi-regex: 6.1.0 - strip-json-comments@3.1.1: {} - stylis@4.3.4: {} + stylis@4.3.6: {} - sucrase@3.35.0: + sucrase@3.35.1: dependencies: - '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/gen-mapping': 0.3.13 commander: 4.1.1 - glob: 10.4.5 lines-and-columns: 1.2.4 mz: 2.7.0 - pirates: 4.0.6 + pirates: 4.0.7 + tinyglobby: 0.2.15 ts-interface-checker: 0.1.13 supports-color@7.2.0: @@ -5621,32 +5902,33 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - tailwindcss@3.4.14: + tailwindcss@3.4.18(yaml@2.6.0): dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 chokidar: 3.6.0 didyoumean: 1.2.2 dlv: 1.1.3 - fast-glob: 3.3.2 + fast-glob: 3.3.3 glob-parent: 6.0.2 is-glob: 4.0.3 - jiti: 1.21.6 - lilconfig: 2.1.0 + jiti: 1.21.7 + lilconfig: 3.1.3 micromatch: 4.0.8 normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.1.1 postcss: 8.4.47 postcss-import: 15.1.0(postcss@8.4.47) - postcss-js: 4.0.1(postcss@8.4.47) - postcss-load-config: 4.0.2(postcss@8.4.47) + postcss-js: 4.1.0(postcss@8.4.47) + postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.4.47)(yaml@2.6.0) postcss-nested: 6.2.0(postcss@8.4.47) postcss-selector-parser: 6.1.2 - resolve: 1.22.8 - sucrase: 3.35.0 + resolve: 1.22.11 + sucrase: 3.35.1 transitivePeerDependencies: - - ts-node + - tsx + - yaml thenify-all@1.6.0: dependencies: @@ -5658,6 +5940,11 @@ snapshots: throttle-debounce@5.0.2: {} + tinyglobby@0.2.15: + dependencies: + fdir: 6.5.0(picomatch@4.0.3) + picomatch: 4.0.3 + to-regex-range@5.0.1: dependencies: is-number: 7.0.0 @@ -5671,7 +5958,7 @@ snapshots: universalify: 0.2.0 url-parse: 1.5.10 - ts-api-utils@2.0.0(typescript@5.6.3): + ts-api-utils@2.1.0(typescript@5.6.3): dependencies: typescript: 5.6.3 @@ -5748,6 +6035,12 @@ snapshots: escalade: 3.2.0 picocolors: 1.1.1 + update-browserslist-db@1.1.4(browserslist@4.28.0): + dependencies: + browserslist: 4.28.0 + escalade: 3.2.0 + picocolors: 1.1.1 + uri-js@4.4.1: dependencies: punycode: 2.3.1 @@ -5787,26 +6080,29 @@ snapshots: - '@types/react' - '@types/react-dom' - vite-tsconfig-paths@4.3.2(typescript@5.6.3)(vite@6.2.1(@types/node@22.9.0)(jiti@1.21.6)(yaml@2.6.0)): + vite-tsconfig-paths@4.3.2(typescript@5.6.3)(vite@7.1.11(@types/node@22.9.0)(jiti@1.21.7)(yaml@2.6.0)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.1.4(typescript@5.6.3) optionalDependencies: - vite: 6.2.1(@types/node@22.9.0)(jiti@1.21.6)(yaml@2.6.0) + vite: 7.1.11(@types/node@22.9.0)(jiti@1.21.7)(yaml@2.6.0) transitivePeerDependencies: - supports-color - typescript - vite@6.2.1(@types/node@22.9.0)(jiti@1.21.6)(yaml@2.6.0): + vite@7.1.11(@types/node@22.9.0)(jiti@1.21.7)(yaml@2.6.0): dependencies: esbuild: 0.25.0 - postcss: 8.5.3 - rollup: 4.34.9 + fdir: 6.5.0(picomatch@4.0.3) + picomatch: 4.0.3 + postcss: 8.5.6 + rollup: 4.53.3 + tinyglobby: 0.2.15 optionalDependencies: '@types/node': 22.9.0 fsevents: 2.3.3 - jiti: 1.21.6 + jiti: 1.21.7 yaml: 2.6.0 void-elements@3.1.0: {} @@ -5878,19 +6174,14 @@ snapshots: string-width: 4.2.3 strip-ansi: 6.0.1 - wrap-ansi@8.1.0: - dependencies: - ansi-styles: 6.2.1 - string-width: 5.1.2 - strip-ansi: 7.1.0 - y18n@5.0.8: {} yaeti@0.0.6: {} yallist@3.1.1: {} - yaml@2.6.0: {} + yaml@2.6.0: + optional: true yargs-parser@21.1.1: {} diff --git a/web/src/api/application.ts b/web/src/api/application.ts index dcb1385..f3192ac 100644 --- a/web/src/api/application.ts +++ b/web/src/api/application.ts @@ -26,3 +26,4 @@ export function setPreviewUpdates(enable: boolean) { export function getPreviewUpdates() { return http.get('/api/application/preview'); } + diff --git a/web/src/api/hid.ts b/web/src/api/hid.ts index c0f80d5..40feaee 100644 --- a/web/src/api/hid.ts +++ b/web/src/api/hid.ts @@ -1,8 +1,8 @@ import { http } from '@/lib/http.ts'; // paste -export function paste(content: string) { - return http.post('/api/hid/paste', { content }); +export function paste(content: string, langue: string) { + return http.post('/api/hid/paste', { content, langue }); } // reset hid diff --git a/web/src/api/storage.ts b/web/src/api/storage.ts index 9f6c1b8..250affe 100644 --- a/web/src/api/storage.ts +++ b/web/src/api/storage.ts @@ -23,3 +23,10 @@ export function mountImage(file?: string, cdrom?: boolean) { export function getCdRom() { return http.get('/api/storage/cdrom'); } + +export function deleteImage(file: string) { + const data = { + file + }; + return http.post('/api/storage/image/delete', data); +} diff --git a/web/src/i18n/languages.ts b/web/src/i18n/languages.ts index ff2b501..51b67db 100644 --- a/web/src/i18n/languages.ts +++ b/web/src/i18n/languages.ts @@ -1,4 +1,5 @@ const languages = [ + { key: 'ca', name: 'Català' }, { key: 'nl', name: 'Nederlands' }, { key: 'da', name: 'Danish' }, { key: 'de', name: 'Deutsch' }, @@ -8,7 +9,9 @@ const languages = [ { key: 'id', name: 'Indonesia' }, { key: 'it', name: 'Italian' }, { key: 'pl', name: 'Polski' }, + { key: 'pt_br', name: 'Português (Brasil)' }, { key: 'ru', name: 'Русский' }, + { key: 'tr', name: 'Türkçe'}, { key: 'ko', name: '한국어' }, { key: 'zh', name: '简体中文' }, { key: 'zh_tw', name: '繁體中文' }, @@ -18,7 +21,8 @@ const languages = [ { key: 'cz', name: 'Česky' }, { key: 'uk', name: 'Українська' }, { key: 'nb', name: 'Norsk, bokmål' }, - { key: 'th', name: 'ภาษาไทย' } + { key: 'th', name: 'ภาษาไทย' }, + { key: 'se', name: "Svenska"} ]; languages.sort((a, b) => a.name.localeCompare(b.name, 'en', { sensitivity: 'base' })); diff --git a/web/src/i18n/locales/ca.ts b/web/src/i18n/locales/ca.ts new file mode 100644 index 0000000..acdd820 --- /dev/null +++ b/web/src/i18n/locales/ca.ts @@ -0,0 +1,347 @@ +const ca = { + translation: { + head: { + desktop: "Escriptori remot", + login: "Inici de sessió", + changePassword: "Canviar contrasenya", + terminal: "Terminal", + wifi: "Xarxa Sense fils" + }, + auth: { + login: "Inici de sessió", + placeholderUsername: "Nom d'usuari", + placeholderPassword: "Contrasenya", + placeholderPassword2: "Torna a introduir la contrasenya", + noEmptyUsername: "Cal introduir el nom d'usuari", + noEmptyPassword: "Cal introduir la contrasenya", + noAccount: "No s'ha pogut obtenir la informació de l'usuari, actualitza la pàgina web o restableix la contrasenya", + invalidUser: "Nom d'usuari o contrasenya invàlids", + error: "Error inesperat", + changePassword: "Canviar la contrasenya", + changePasswordDesc: "Per a la seguretat del dispositiu, canvia la contrasenya!", + differentPassword: "Les contrasenyes no coincideixen", + illegalUsername: "El nom d'usuari conté caràcters no permesos", + illegalPassword: "La contrasenya conté caràcters no permesos", + forgetPassword: "Has oblidat la contrasenya", + ok: "D'acord", + cancel: "Cancel·la", + loginButtonText: "Inicia sessió", + tips: { + reset1: "Per restablir les contrasenyes, mantingues premut el botó BOOT del NanoKVM durant 10 segons.", + reset2: "Per veure els passos detallats, consulta aquest document:", + reset3: "Compte web per defecte:", + reset4: "Compte SSH per defecte:", + change1: "Aquesta acció canviarà les següents contrasenyes:", + change2: "Contrasenya d'inici de sessió web", + change3: "Contrasenya root del sistema (inici de sessió SSH)", + change4: "Per restablir les contrasenyes, mantingues premut el botó BOOT del NanoKVM." + } + }, + wifi: { + title: "Xarxa Sense fils", + description: "Configura la xarxa sense fils per al NanoKVM", + success: "Comprova l'estat de la xarxa del NanoKVM i visita la nova adreça IP.", + failed: "L'operació ha fallat, torna-ho a intentar.", + confirmBtn: "D'acord", + finishBtn: "Fet" + }, + screen: { + title: "Pantalla", + video: "Mode de vídeo", + videoDirectTips: "Activa HTTPS a 'Configuració > Dispositiu' per utilitzar aquest mode", + resolution: "Resolució", + auto: "Automàtic", + autoTips: "Poden aparèixer talls o desajustos del ratolí en certes resolucions. Prova a canviar la resolució de l'amfitrió remot o desactiva el mode automàtic.", + fps: "FPS", + customizeFps: "Personalitzat", + quality: "Qualitat", + qualityLossless: "Sense pèrdua", + qualityHigh: "Alta", + qualityMedium: "Mitjana", + qualityLow: "Baixa", + frameDetect: "Detecció de fotogrames", + frameDetectTip: "Calcula la diferència entre fotogrames. S'atura la transmissió si no hi ha canvis a la pantalla de l'amfitrió remot.", + resetHdmi: "Restablir HDMI" + }, + keyboard: { + title: "Teclat", + paste: "Enganxa", + tips: "Només es permeten lletres i símbols estàndard", + placeholder: "Escriu aquí", + submit: "Envia", + virtual: "Teclat", + ctrlaltdel: "Ctrl+Alt+Del" + }, + mouse: { + title: "Ratolí", + cursor: "Estil del cursor", + default: "Cursor per defecte", + pointer: "Cursor punter", + cell: "Cursor de cel·la", + text: "Cursor de text", + grab: "Cursor de mà", + hide: "Amaga el cursor", + mode: "Mode de ratolí", + absolute: "Mode absolut", + relative: "Mode relatiu", + speed: "Velocitat de la roda", + fast: "Ràpida", + slow: "Lenta", + requestPointer: "Estàs usant el mode relatiu. Fes clic a l'escriptori per obtenir el punter.", + resetHid: "Restablir HID", + hidOnly: { + title: "Mode només HID", + desc: "Si el teclat o ratolí deixen de funcionar i restablir HID no ajuda, pot ser un problema de compatibilitat. Prova d'activar el mode només HID.", + tip1: "Activar aquest mode desmuntarà el disc virtual i la xarxa virtual", + tip2: "En mode només HID, no es pot muntar imatges", + tip3: "El NanoKVM es reiniciarà automàticament en canviar de mode", + enable: "Activa mode només HID", + disable: "Desactiva mode només HID" + } + }, + image: { + title: "Imatges", + loading: "Carregant...", + empty: "No s'ha trobat res", + cdrom: "Munta la imatge en mode CD-ROM", + mountFailed: "Error en muntar", + mountDesc: "En alguns sistemes cal expulsar el disc virtual abans de muntar la imatge.", + refresh: "Actualitza la llista", + tips: { + title: "Com pujar imatges", + usb1: "Connecta el NanoKVM al teu ordinador via USB.", + usb2: "Assegura't que el disc virtual està muntat (Configuració - Disc Virtual).", + usb3: "Obre el disc virtual i copia la imatge a l'arrel.", + scp1: "Comprova que el NanoKVM i el teu ordinador estan a la mateixa xarxa.", + scp2: "Obre un terminal i usa SCP per pujar la imatge al directori /data del NanoKVM.", + scp3: "Exemple: scp ruta-de-la-imatge root@ip-del-nanokvm:/data", + tfCard: "Targeta TF", + tf1: "Mètode disponible a sistemes GNU/Linux", + tf2: "Extreu la targeta TF del NanoKVM (versió FULL, cal obrir la carcassa).", + tf3: "Introdueix la targeta en un lector i connecta'l a l'ordinador.", + tf4: "Copia la imatge al directori /data de la targeta.", + tf5: "Reintrodueix la targeta al NanoKVM." + } + }, + script: { + title: "Scripts", + upload: "Puja", + run: "Executa", + runBackground: "Executa en segon pla", + runFailed: "Error en l'execució", + attention: "Atenció", + delDesc: "Estàs segur que vols eliminar aquest fitxer?", + confirm: "Sí", + cancel: "No", + delete: "Esborra", + close: "Tanca" + }, + terminal: { + title: "Terminal", + nanokvm: "Terminal NanoKVM", + serial: "Terminal de port sèrie", + serialPort: "Port sèrie", + serialPortPlaceholder: "Introdueix el port sèrie", + baudrate: "Velocitat (baudrate)", + parity: "Paritat", + parityNone: "Cap", + parityEven: "Parell", + parityOdd: "Senar", + flowControl: "Control de flux", + flowControlNone: "Cap", + flowControlSoft: "Suau", + flowControlHard: "Dur", + dataBits: "Bits de dades", + stopBits: "Bits de parada", + confirm: "D'acord" + }, + wol: { + title: "Wake-on-LAN", + sending: "Enviant comanda...", + sent: "Comanda enviada", + input: "Introdueix la MAC", + ok: "D'acord" + }, + download: { + title: "Descarregador d'imatges", + input: "Introdueix la URL de la imatge", + ok: "D'acord", + disabled: "La partició /data és només lectura. No es pot descarregar la imatge." + }, + power: { + title: "Alimentació", + showConfirm: "Confirmació", + showConfirmTip: "Les operacions d'alimentació requereixen confirmació", + reset: "Reinicia", + power: "Encén", + powerShort: "Clic curt", + powerLong: "Clic llarg", + resetConfirm: "Vols realment reiniciar?", + powerConfirm: "Vols realment encendre/apagar?", + okBtn: "Sí", + cancelBtn: "No" + }, + settings: { + title: "Configuració", + about: { + title: "Sobre NanoKVM", + information: "Informació", + ip: "IP", + mdns: "mDNS", + application: "Versió aplicació", + applicationTip: "Versió de la interfície web de NanoKVM", + image: "Versió de la imatge", + imageTip: "Versió del sistema NanoKVM", + deviceKey: "Clau del dispositiu", + community: "Comunitat", + hostname: "Nom del dispositiu", + hostnameUpdated: "Nom actualitzat. Reinicia per aplicar.", + ipType: { + Wired: "Cablejada", + Wireless: "Sense fil", + Other: "Altra" + } + }, + appearance: { + title: "Aparença", + display: "Pantalla", + language: "Idioma", + menuBar: "Barra de menú", + menuBarDesc: "Mostra icones a la barra de menú", + webTitle: "Títol web", + webTitleDesc: "Personalitza el títol de la pàgina" + }, + device: { + title: "Dispositiu", + oled: { + title: "OLED", + description: "Apagar pantalla OLED després de", + 0: "Mai", + 15: "15 s", + 30: "30 s", + 60: "1 min", + 180: "3 min", + 300: "5 min", + 600: "10 min", + 1800: "30 min", + 3600: "1 h" + }, + wifi: { + title: "Xarxa sense fils", + description: "Configura la xarxa sense fils", + setBtn: "Configura" + }, + ssh: { + description: "Activa accés remot per SSH", + tip: "Configura una contrasenya segura abans (Compte - Canvia contrasenya)" + }, + tls: { + description: "Activa el protocol HTTPS", + tip: "Atenció: Usar HTTPS pot augmentar la latència, sobretot amb vídeo MJPEG." + }, + advanced: "Configuració avançada", + swap: { + title: "Swap", + disable: "Desactiva", + description: "Defineix la mida del fitxer swap", + tip: "Pot reduir la vida útil de la targeta SD!" + }, + mouseJiggler: { + title: "Mou-ratolí automàtic", + description: "Evita que el dispositiu remot entri en repòs", + disable: "Desactiva", + absolute: "Mode absolut", + relative: "Mode relatiu" + }, + mdns: { + description: "Activa descobriment mDNS", + tip: "Desactiva-ho si no és necessari" + }, + hdmi: { + description: "Activa la sortida HDMI" + }, + hidOnly: "Mode només HID", + disk: "Disc virtual", + diskDesc: "Munta un disc U virtual al dispositiu remot", + network: "Xarxa virtual", + networkDesc: "Munta una targeta de xarxa virtual al dispositiu remot", + reboot: "Reinicia", + rebootDesc: "Segur que vols reiniciar el NanoKVM?", + okBtn: "Sí", + cancelBtn: "No" + }, + tailscale: { + title: "Tailscale", + memory: { + title: "Optimització de memòria", + tip: "Quan es supera el límit de memòria, es fa una neteja més agressiva. Recomanat: 75MB si uses Tailscale. Requereix reiniciar Tailscale.", + disable: "Desactiva" + }, + restart: "Reiniciar Tailscale?", + stop: "Aturar Tailscale?", + stopDesc: "Tanca la sessió i desactiva l'inici automàtic", + loading: "Carregant...", + notInstall: "Tailscale no instal·lat! Instal·la-ho.", + install: "Instal·la", + installing: "Instal·lant", + failed: "Error en la instal·lació", + retry: "Actualitza i torna-ho a provar. O instal·la manualment", + download: "Descarrega el", + package: "paquet d'instal·lació", + unzip: "i descomprimeix-lo", + upTailscale: "Puja tailscale a /usr/bin/", + upTailscaled: "Puja tailscaled a /usr/sbin/", + refresh: "Actualitza la pàgina", + notLogin: "El dispositiu no està vinculat. Inicia sessió per vincular-lo.", + urlPeriod: "Aquesta URL és vàlida durant 10 minuts", + login: "Inicia sessió", + loginSuccess: "Sessió iniciada correctament", + enable: "Activa Tailscale", + deviceName: "Nom del dispositiu", + deviceIP: "IP del dispositiu", + account: "Compte", + logout: "Tanca sessió", + logoutDesc: "Segur que vols tancar sessió?", + uninstall: "Desinstal·la Tailscale", + okBtn: "Sí", + cancelBtn: "No" + }, + update: { + title: "Comprova actualitzacions", + queryFailed: "Error en obtenir la versió", + updateFailed: "Error en actualitzar. Torna-ho a intentar.", + isLatest: "Ja tens la darrera versió.", + available: "Hi ha una actualització disponible. Vols actualitzar ara?", + updating: "Actualitzant... espera", + confirm: "Confirma", + cancel: "Cancel·la", + preview: "Versió de prova", + previewDesc: "Prova noves funcions abans que ningú", + previewTip: "Compte: aquestes versions poden tenir errors o funcions inacabades!" + }, + account: { + title: "Compte", + webAccount: "Nom del compte web", + password: "Contrasenya", + updateBtn: "Canvia", + logoutBtn: "Tanca sessió", + logoutDesc: "Segur que vols tancar sessió?", + okBtn: "Sí", + cancelBtn: "No" + } + }, + error: { + title: "Hi ha hagut un error", + refresh: "Actualitza" + }, + fullscreen: { + toggle: "Pantalla completa" + }, + menu: { + collapse: "Amaga menú", + expand: "Mostra menú" + } + } +}; + +export default ca; \ No newline at end of file diff --git a/web/src/i18n/locales/de.ts b/web/src/i18n/locales/de.ts index 0888003..5658f42 100644 --- a/web/src/i18n/locales/de.ts +++ b/web/src/i18n/locales/de.ts @@ -68,11 +68,13 @@ const de = { keyboard: { title: 'Tastatur', paste: 'Einfügen', - tips: 'Nur Standard-Tastaturbuchstaben und Symbole werden unterstützt', + tips: 'Server Tastaturbelegung', placeholder: 'Bitte eingeben', submit: 'Senden', virtual: 'Tastatur', - ctrlaltdel: 'Ctrl+Alt+Del' + ctrlaltdel: 'Ctrl+Alt+Del', + dropdownEnglish: 'Englisch', + dropdownGerman: 'Deutsch' }, mouse: { title: 'Maus', diff --git a/web/src/i18n/locales/en.ts b/web/src/i18n/locales/en.ts index 4c875c6..b1fc6f5 100644 --- a/web/src/i18n/locales/en.ts +++ b/web/src/i18n/locales/en.ts @@ -73,7 +73,13 @@ const en = { placeholder: 'Please input', submit: 'Submit', virtual: 'Keyboard', - ctrlaltdel: 'Ctrl+Alt+Del' + ctrlaltdel: 'Ctrl+Alt+Del', + readClipboard: 'Read from Clipboard', + clipboardPermissionDenied: + 'Clipboard permission denied. Please allow clipboard access in your browser.', + clipboardReadError: 'Failed to read clipboard', + dropdownEnglish: 'English', + dropdownGerman: 'German' }, mouse: { title: 'Mouse', @@ -106,11 +112,18 @@ const en = { title: 'Images', loading: 'Loading...', empty: 'Nothing Found', - cdrom: 'Mount the image in CD-ROM mode', - mountFailed: 'Mount Failed', + mountMode: 'Mount mode', + mountFailed: 'Mount failed', mountDesc: - "In some systems, it's necessary to eject the virtual disk on the remote host before mounting the image.", + 'On some systems, you need to eject the virtual disk from the remote host before mounting the image.', + unmountFailed: 'Unmount failed', + unmountDesc: + 'On some systems, you need to manually eject from the remote host before unmounting the image.', refresh: 'Refresh the image list', + attention: 'Attention', + deleteConfirm: 'Are you sure you want to delete this image?', + okBtn: 'Yes', + cancelBtn: 'No', tips: { title: 'How to upload', usb1: 'Connect the NanoKVM to your computer via USB.', @@ -266,7 +279,9 @@ const en = { }, hidOnly: 'HID-Only Mode', disk: 'Virtual Disk', - diskDesc: 'Mount virtual U-disk on the remote host', + diskDesc: 'Mount SD card on the remote host', + media: "Virtual Image", + mediaDesc: 'Attach virtual image device to the remote host', network: 'Virtual Network', networkDesc: 'Mount virtual network card on the remote host', reboot: 'Reboot', @@ -280,8 +295,11 @@ const en = { title: 'Tailscale', memory: { title: 'Memory optimization', - tip: "When memory usage exceeds the limit, garbage collection is performed more aggressively to attempt to free up memory. It's recommended to set to 75MB if using Tailscale. A Tailscale restart is required for the change to take effect.", - disable: 'Disable' + tip: 'When memory usage exceeds the limit, garbage collection is performed more aggressively to attempt to free up memory. A Tailscale restart is required for the change to take effect.' + }, + swap: { + title: 'Swap memory', + tip: 'If issues persist after enabling memory optimization, try enabling swap memory. This sets the swap file size to 256MB by default, which can be adjusted in "Settings > Device".' }, restart: 'Restart Tailscale?', stop: 'Stop Tailscale?', @@ -298,6 +316,8 @@ const en = { upTailscale: 'Upload tailscale to NanoKVM directory /usr/bin/', upTailscaled: 'Upload tailscaled to NanoKVM directory /usr/sbin/', refresh: 'Refresh current page', + notRunning: 'Tailscale is not running. Please start it to continue.', + run: 'Start', notLogin: 'The device has not been bound yet. Please login and bind this device to your account.', urlPeriod: 'This url is valid for 10 minutes', @@ -310,6 +330,7 @@ const en = { logout: 'Logout', logoutDesc: 'Are you sure you want to logout?', uninstall: 'Uninstall Tailscale', + uninstallDesc: 'Are you sure you want to uninstall Tailscale?', okBtn: 'Yes', cancelBtn: 'No' }, diff --git a/web/src/i18n/locales/ko.ts b/web/src/i18n/locales/ko.ts index 5533075..115cdf0 100644 --- a/web/src/i18n/locales/ko.ts +++ b/web/src/i18n/locales/ko.ts @@ -47,13 +47,15 @@ const ko = { finishBtn: '완료' }, screen: { + title: '화면', video: '비디오 모드', + videoDirectTips: '이 모드를 사용하려면 "설정 > 장치"에서 HTTPS를 활성화하세요', resolution: '해상도', auto: '자동 설정', autoTips: '일부 해상도에서는 화면이 왜곡되거나 마우스 동작이 비정상적으로 나타날 수 있습니다. 원격 컴퓨터의 해상도를 변경하거나 자동 설정 대신 수동 설정을 사용해 보세요.', fps: 'FPS', - customizeFps: 'FPS 설정', + customizeFps: '사용자 지정', quality: '품질', qualityLossless: '무손실', qualityHigh: '높음', @@ -65,6 +67,7 @@ const ko = { resetHdmi: 'HDMI 초기화' }, keyboard: { + title: '키보드', paste: '붙여넣기', tips: '표준 키보드 문자 및 기호만 지원됩니다', placeholder: '입력하세요', @@ -73,6 +76,8 @@ const ko = { ctrlaltdel: 'Ctrl+Alt+Del' }, mouse: { + title: '마우스', + cursor: '커서 스타일', default: '기본 커서', pointer: '포인터 커서', cell: '셀 커서', @@ -82,8 +87,20 @@ const ko = { mode: '마우스 모드', absolute: '절대값 모드', relative: '상대값 모드', + speed: '휠 속도', + fast: '빠름', + slow: '느림', requestPointer: '상대값 모드를 사용 중입니다. 커서를 찾으려면 데스크톱을 클릭하세요.', - resetHid: 'HID 초기화' + resetHid: 'HID 초기화', + hidOnly: { + title: 'HID 전용 모드', + desc: '마우스와 키보드가 응답하지 않고 HID 초기화도 도움이 되지 않는다면, NanoKVM과 장치 간의 호환성 문제일 수 있습니다. 더 나은 호환성을 위해 HID 전용 모드를 활성화해 보세요.', + tip1: 'HID 전용 모드를 활성화하면 가상 USB와 가상 네트워크가 언마운트됩니다', + tip2: 'HID 전용 모드에서는 이미지 마운트가 비활성화됩니다', + tip3: '모드 전환 후 NanoKVM이 자동으로 재부팅됩니다', + enable: 'HID 전용 모드 활성화', + disable: 'HID 전용 모드 비활성화' + } }, image: { title: '이미지', @@ -129,7 +146,17 @@ const ko = { serial: '시리얼 포트 터미널', serialPort: '시리얼 포트', serialPortPlaceholder: '시리얼 포트를 입력하세요', - baudrate: 'Baud rate', + baudrate: '전송 속도', + parity: '패리티', + parityNone: '없음', + parityEven: '짝수', + parityOdd: '홀수', + flowControl: '흐름 제어', + flowControlNone: '없음', + flowControlSoft: '소프트웨어', + flowControlHard: '하드웨어', + dataBits: '데이터 비트', + stopBits: '정지 비트', confirm: '확인' }, wol: { @@ -147,10 +174,16 @@ const ko = { }, power: { title: '전원', + showConfirm: '확인', + showConfirmTip: '전원 작업에는 추가 확인이 필요합니다', reset: '리셋', power: '전원', powerShort: '전원 (짧게 누르기)', - powerLong: '전원 (길게 누르기)' + powerLong: '전원 (길게 누르기)', + resetConfirm: '리셋 작업을 진행하시겠습니까?', + powerConfirm: '전원 작업을 진행하시겠습니까?', + okBtn: '네', + cancelBtn: '아니오' }, settings: { title: '설정', @@ -164,14 +197,23 @@ const ko = { image: '이미지 버전', imageTip: 'NanoKVM 시스템 이미지 버전', deviceKey: '장치 키', - community: '커뮤니티' + community: '커뮤니티', + hostname: '호스트 이름', + hostnameUpdated: '호스트 이름이 업데이트되었습니다. 적용하려면 재부팅하세요.', + ipType: { + Wired: '유선', + Wireless: '무선', + Other: '기타' + } }, appearance: { title: '디자인', display: '표시', language: '언어', menuBar: '메뉴 바', - menuBarDesc: '메뉴 바에 아이콘을 표시' + menuBarDesc: '메뉴 바에 아이콘을 표시', + webTitle: '웹 제목', + webTitleDesc: '웹 페이지 제목 사용자 지정' }, device: { title: '장치', @@ -197,10 +239,40 @@ const ko = { description: 'SSH 원격 접속 활성화', tip: '활성화하기 전에 강력한 비밀번호를 설정하세요. (계정 - 비밀번호 변경)' }, + tls: { + description: 'HTTPS 프로토콜 활성화', + tip: '주의: HTTPS 사용 시 특히 MJPEG 비디오 모드에서 지연 시간이 증가할 수 있습니다.' + }, + advanced: '고급 설정', + swap: { + title: '스왑', + disable: '비활성화', + description: '스왑 파일 크기 설정', + tip: '이 기능을 활성화하면 SD 카드의 수명이 단축될 수 있습니다!' + }, + mouseJiggler: { + title: '마우스 흔들기', + description: '원격 호스트가 절전 모드로 진입하는 것을 방지', + disable: '비활성화', + absolute: '절대값 모드', + relative: '상대값 모드' + }, + mdns: { + description: 'mDNS 검색 서비스 활성화', + tip: '사용하지 않는 경우 끄는 것이 좋습니다' + }, + hdmi: { + description: 'HDMI/모니터 출력 활성화' + }, + hidOnly: 'HID 전용 모드', disk: '가상 디스크', - diskDesc: '원격 호스트에서 가상 U-디스크를 마운트합니다.', + diskDesc: '원격 호스트에서 가상 USB를 마운트합니다.', network: '가상 네트워크', - networkDesc: '원격 호스트에서 가상 네트워크 카드를 마운트합니다.' + networkDesc: '원격 호스트에서 가상 네트워크 카드를 마운트합니다.', + reboot: '재부팅', + rebootDesc: 'NanoKVM을 재부팅하시겠습니까?', + okBtn: '네', + cancelBtn: '아니오' }, tailscale: { title: 'Tailscale', @@ -234,6 +306,7 @@ const ko = { deviceIP: '장치 IP', account: '계정', logout: '로그아웃', + logoutDesc: '정말로 로그아웃 하시겠습니까?', logout2: '정말로 로그아웃 합니까?', uninstall: 'Tailscale 제거', okBtn: '네', @@ -247,19 +320,32 @@ const ko = { available: '업데이트가 가능합니다. 정말로 업데이트 할까요?', updating: '업데이트 시작. 잠시 기다려주세요...', confirm: '확인', - cancel: '취소' + cancel: '취소', + preview: '미리보기 업데이트', + previewDesc: '새로운 기능과 개선 사항에 미리 접근하세요', + previewTip: '미리보기 버전에는 버그나 완성되지 않은 기능이 포함될 수 있으니 주의하세요!' }, account: { title: '계정', - webAccount: 'Web 계정', + webAccount: '웹 계정', password: '비밀번호', updateBtn: '업데이트', - logoutBtn: '로그아웃' + logoutBtn: '로그아웃', + logoutDesc: '정말로 로그아웃 하시겠습니까?', + okBtn: '네', + cancelBtn: '아니오' } }, error: { title: '문제가 발생했습니다.', refresh: '새로고침' + }, + fullscreen: { + toggle: '전체 화면 전환' + }, + menu: { + collapse: '메뉴 접기', + expand: '메뉴 펼치기' } } }; diff --git a/web/src/i18n/locales/pt_br.ts b/web/src/i18n/locales/pt_br.ts new file mode 100644 index 0000000..509170f --- /dev/null +++ b/web/src/i18n/locales/pt_br.ts @@ -0,0 +1,347 @@ +const pt_br = { + translation: { + head: { + desktop: 'Área de Trabalho Remota', + login: 'Login', + changePassword: 'Mudar Senha', + terminal: 'Terminal', + wifi: 'Wi-Fi' + }, + auth: { + login: 'Login', + placeholderUsername: 'Nome de usuário', + placeholderPassword: 'Senha', + placeholderPassword2: 'Por favor, digite a senha novamente', + noEmptyUsername: 'Nome de usuário é obrigatório', + noEmptyPassword: 'Senha é obrigatória', + noAccount: 'Falha ao obter informações do usuário, por favor atualize a página ou redefina a senha', + invalidUser: 'Nome de usuário ou senha inválidos', + error: 'Erro inesperado', + changePassword: 'Mudar Senha', + changePasswordDesc: 'Para a segurança do seu dispositivo, por favor, mude a senha!', + differentPassword: 'Senhas não conferem', + illegalUsername: 'Nome de usuário contém caracteres inválidos', + illegalPassword: 'Senha contém caracteres inválidos', + forgetPassword: 'Esqueci a senha', + ok: 'Ok', + cancel: 'Cancelar', + loginButtonText: 'Login', + tips: { + reset1: 'Para redefinir as senhas, pressione e segure o botão BOOT no NanoKVM por 10 segundos.', + reset2: 'Para etapas detalhadas, por favor, consulte este documento:', + reset3: 'Conta padrão da Web:', + reset4: 'Conta padrão SSH:', + change1: 'Por favor, note que esta ação irá alterar as seguintes senhas:', + change2: 'Senha de login da Web', + change3: 'Senha root do sistema (senha de login SSH)', + change4: 'Para redefinir as senhas, pressione e segure o botão BOOT no NanoKVM.' + } + }, + wifi: { + title: 'Wi-Fi', + description: 'Configurar Wi-Fi para o NanoKVM', + success: 'Por favor, verifique o status da rede do NanoKVM e visite o novo endereço IP.', + failed: 'Operação falhou, por favor, tente novamente.', + confirmBtn: 'Ok', + finishBtn: 'Finalizado' + }, + screen: { + title: 'Tela', + video: 'Modo de Vídeo', + videoDirectTips: 'Ative HTTPS em "Configurações > Dispositivo" para usar este modo', + resolution: 'Resolução', + auto: 'Automático', + autoTips: 'Rasgos na tela ou desvio do mouse podem ocorrer em resoluções específicas. Considere ajustar a resolução do host remoto ou desativar o modo automático.', + fps: 'FPS', + customizeFps: 'Personalizar', + quality: 'Qualidade', + qualityLossless: 'Sem perdas', + qualityHigh: 'Alta', + qualityMedium: 'Média', + qualityLow: 'Baixa', + frameDetect: 'Detecção de Quadros', + frameDetectTip: 'Calcular a diferença entre os quadros. Parar a transmissão de vídeo quando nenhuma alteração for detectada na tela do host remoto.', + resetHdmi: 'Redefinir HDMI' + }, + keyboard: { + title: 'Teclado', + paste: 'Colar', + tips: 'Apenas letras e símbolos de teclado padrão são suportados', + placeholder: 'Por favor, digite', + submit: 'Enviar', + virtual: 'Teclado', + ctrlaltdel: 'Ctrl+Alt+Del' + }, + mouse: { + title: 'Mouse', + cursor: 'Estilo do cursor', + default: 'Cursor padrão', + pointer: 'Cursor de ponteiro', + cell: 'Cursor de célula', + text: 'Cursor de texto', + grab: 'Cursor de arrastar', + hide: 'Ocultar cursor', + mode: 'Modo do mouse', + absolute: 'Modo absoluto', + relative: 'Modo relativo', + speed: 'Velocidade da roda', + fast: 'Rápido', + slow: 'Lento', + requestPointer: 'Usando modo relativo. Por favor, clique na área de trabalho para obter o ponteiro do mouse.', + resetHid: 'Redefinir HID', + hidOnly: { + title: 'Modo Somente-HID', + desc: 'Se o seu mouse e teclado pararem de responder e a redefinição de HID não ajudar, pode ser um problema de compatibilidade entre o NanoKVM e o dispositivo. Tente habilitar o modo Somente-HID para melhor compatibilidade.', + tip1: 'Habilitar o modo Somente-HID irá desmontar o U-disk virtual e a rede virtual', + tip2: 'No modo Somente-HID, a montagem de imagem está desativada', + tip3: 'NanoKVM será reiniciado automaticamente após a troca de modos', + enable: 'Habilitar modo Somente-HID', + disable: 'Desabilitar modo Somente-HID' + } + }, + image: { + title: 'Imagens', + loading: 'Carregando...', + empty: 'Nada Encontrado', + cdrom: 'Montar a imagem no modo CD-ROM', + mountFailed: 'Falha na Montagem', + mountDesc: 'Em alguns sistemas, é necessário ejetar o disco virtual no host remoto antes de montar a imagem.', + refresh: 'Atualizar a lista de imagens', + tips: { + title: 'Como fazer upload', + usb1: 'Conecte o NanoKVM ao seu computador via USB.', + usb2: 'Certifique-se de que o disco virtual está montado (Configurações - Disco Virtual).', + usb3: 'Abra o disco virtual no seu computador e copie o arquivo de imagem para o diretório raiz do disco virtual.', + scp1: 'Certifique-se de que o NanoKVM e seu computador estão na mesma rede local.', + scp2: 'Abra um terminal no seu computador e use o comando SCP para fazer upload do arquivo de imagem para o diretório /data no NanoKVM.', + scp3: 'Exemplo: scp seu-caminho-da-imagem root@seu-ip-nanokvm:/data', + tfCard: 'Cartão TF', + tf1: 'Este método é suportado em sistemas Linux', + tf2: 'Remova o cartão TF do NanoKVM (para a versão FULL, desmonte a caixa primeiro).', + tf3: 'Insira o cartão TF em um leitor de cartão e conecte-o ao seu computador.', + tf4: 'Copie o arquivo de imagem para o diretório /data no cartão TF.', + tf5: 'Insira o cartão TF no NanoKVM.' + } + }, + script: { + title: 'Scripts', + upload: 'Upload', + run: 'Executar', + runBackground: 'Executar em segundo plano', + runFailed: 'Falha na execução', + attention: 'Atenção', + delDesc: 'Tem certeza de que deseja excluir este arquivo?', + confirm: 'Sim', + cancel: 'Não', + delete: 'Excluir', + close: 'Fechar' + }, + terminal: { + title: 'Terminal', + nanokvm: 'Terminal NanoKVM', + serial: 'Terminal de Porta Serial', + serialPort: 'Porta Serial', + serialPortPlaceholder: 'Por favor, digite a porta serial', + baudrate: 'Taxa de transmissão', + parity: 'Paridade', + parityNone: 'Nenhum', + parityEven: 'Par', + parityOdd: 'Ímpar', + flowControl: 'Controle de fluxo', + flowControlNone: 'Nenhum', + flowControlSoft: 'Software', + flowControlHard: 'Hardware', + dataBits: 'Bits de dados', + stopBits: 'Bits de parada', + confirm: 'Ok' + }, + wol: { + title: 'Wake-on-LAN', + sending: 'Enviando comando...', + sent: 'Comando enviado', + input: 'Por favor, digite o MAC', + ok: 'Ok' + }, + download: { + title: 'Baixador de Imagens', + input: 'Por favor, digite uma URL de imagem remota', + ok: 'Ok', + disabled: 'A partição /data é RO, então não podemos baixar a imagem' + }, + power: { + title: 'Energia', + showConfirm: 'Confirmação', + showConfirmTip: 'Operações de energia requerem uma confirmação extra', + reset: 'Redefinir', + power: 'Energia', + powerShort: 'Energia (clique curto)', + powerLong: 'Energia (clique longo)', + resetConfirm: 'Prosseguir com a operação de redefinição?', + powerConfirm: 'Prosseguir com a operação de energia?', + okBtn: 'Sim', + cancelBtn: 'Não' + }, + settings: { + title: 'Configurações', + about: { + title: 'Sobre o NanoKVM', + information: 'Informação', + ip: 'IP', + mdns: 'mDNS', + application: 'Versão do Aplicativo', + applicationTip: 'Versão do aplicativo web NanoKVM', + image: 'Versão da Imagem', + imageTip: 'Versão da imagem do sistema NanoKVM', + deviceKey: 'Chave do Dispositivo', + community: 'Comunidade', + hostname: 'Nome do Host', + hostnameUpdated: 'Nome do host atualizado. Reinicie para aplicar.', + ipType: { + Wired: 'Com Fio', + Wireless: 'Sem Fio', + Other: 'Outro' + } + }, + appearance: { + title: 'Aparência', + display: 'Exibição', + language: 'Idioma', + menuBar: 'Barra de Menu', + menuBarDesc: 'Exibir ícones na barra de menu', + webTitle: 'Título da Web', + webTitleDesc: 'Personalizar o título da página web' + }, + device: { + title: 'Dispositivo', + oled: { + title: 'OLED', + description: 'Desligar tela OLED após', + 0: 'Nunca', + 15: '15 seg', + 30: '30 seg', + 60: '1 min', + 180: '3 min', + 300: '5 min', + 600: '10 min', + 1800: '30 min', + 3600: '1 hora' + }, + wifi: { + title: 'Wi-Fi', + description: 'Configurar Wi-Fi', + setBtn: 'Configurar' + }, + ssh: { + description: 'Habilitar acesso remoto SSH', + tip: 'Defina uma senha forte antes de habilitar (Conta - Mudar Senha)' + }, + tls: { + description: 'Habilitar protocolo HTTPS', + tip: 'Atenção: O uso de HTTPS pode aumentar a latência, especialmente com o modo de vídeo MJPEG.' + }, + advanced: 'Configurações Avançadas', + swap: { + title: 'Swap', + disable: 'Desativar', + description: 'Defina o tamanho do arquivo de swap', + tip: 'Habilitar esta função pode encurtar a vida útil do seu cartão SD!' + }, + mouseJiggler: { + title: 'Movimentador de Mouse', + description: 'Impedir que o host remoto entre em suspensão', + disable: 'Desativar', + absolute: 'Modo Absoluto', + relative: 'Modo Relativo' + }, + mdns: { + description: 'Habilitar serviço de descoberta mDNS', + tip: 'Desligue se não for necessário' + }, + hdmi: { + description: 'Habilitar saída HDMI/monitor' + }, + hidOnly: 'Modo Somente-HID', + disk: 'Disco Virtual', + diskDesc: 'Montar U-disk virtual no host remoto', + network: 'Rede Virtual', + networkDesc: 'Montar placa de rede virtual no host remoto', + reboot: 'Reiniciar', + rebootDesc: 'Tem certeza de que deseja reiniciar o NanoKVM?', + okBtn: 'Sim', + cancelBtn: 'Não' + }, + tailscale: { + title: 'Tailscale', + memory: { + title: 'Otimização de memória', + tip: 'Quando o uso de memória excede o limite, a coleta de lixo é realizada de forma mais agressiva para tentar liberar memória. Recomenda-se definir para 75MB se estiver usando Tailscale. É necessário reiniciar o Tailscale para que a alteração tenha efeito.', + disable: 'Desativar' + }, + restart: 'Reiniciar Tailscale?', + stop: 'Parar Tailscale?', + stopDesc: 'Sair do Tailscale e desabilitar a inicialização automática no boot.', + loading: 'Carregando...', + notInstall: 'Tailscale não encontrado! Por favor, instale.', + install: 'Instalar', + installing: 'Instalando', + failed: 'Falha na instalação', + retry: 'Por favor, atualize e tente novamente. Ou tente instalar manualmente', + download: 'Baixar o', + package: 'pacote de instalação', + unzip: 'e descompacte-o', + upTailscale: 'Fazer upload do tailscale para o diretório NanoKVM /usr/bin/', + upTailscaled: 'Fazer upload do tailscaled para o diretório NanoKVM /usr/sbin/', + refresh: 'Atualizar página atual', + notLogin: 'O dispositivo ainda não foi vinculado. Por favor, faça login e vincule este dispositivo à sua conta.', + urlPeriod: 'Esta URL é válida por 10 minutos', + login: 'Login', + loginSuccess: 'Login Bem-sucedido', + enable: 'Habilitar Tailscale', + deviceName: 'Nome do Dispositivo', + deviceIP: 'IP do Dispositivo', + account: 'Conta', + logout: 'Sair', + logoutDesc: 'Tem certeza de que deseja sair?', + uninstall: 'Desinstalar Tailscale', + okBtn: 'Sim', + cancelBtn: 'Não' + }, + update: { + title: 'Verificar Atualizações', + queryFailed: 'Falha ao obter a versão', + updateFailed: 'Falha na atualização. Por favor, tente novamente.', + isLatest: 'Você já tem a versão mais recente.', + available: 'Uma atualização está disponível. Tem certeza de que deseja atualizar agora?', + updating: 'Atualização iniciada. Por favor, aguarde...', + confirm: 'Confirmar', + cancel: 'Cancelar', + preview: 'Prévia das Atualizações', + previewDesc: 'Tenha acesso antecipado a novos recursos e melhorias', + previewTip: 'Esteja ciente de que as versões de prévia podem conter bugs ou funcionalidade incompleta!' + }, + account: { + title: 'Conta', + webAccount: 'Nome da Conta Web', + password: 'Senha', + updateBtn: 'Alterar', + logoutBtn: 'Sair', + logoutDesc: 'Tem certeza de que deseja sair?', + okBtn: 'Sim', + cancelBtn: 'Não' + } + }, + error: { + title: 'Encontramos um problema', + refresh: 'Atualizar' + }, + fullscreen: { + toggle: 'Alternar Tela Cheia' + }, + menu: { + collapse: 'Recolher Menu', + expand: 'Expandir Menu' + } + } +} + +export default pt_br; diff --git a/web/src/i18n/locales/se.ts b/web/src/i18n/locales/se.ts new file mode 100644 index 0000000..decb12d --- /dev/null +++ b/web/src/i18n/locales/se.ts @@ -0,0 +1,353 @@ +const se = { + translation: { + head: { + desktop: 'Fjärrskrivbord', + login: 'Logga in', + changePassword: 'Byt lösenord', + terminal: 'Terminal', + wifi: 'Wi-Fi' + }, + auth: { + login: 'Logga in', + placeholderUsername: 'Användarnamn', + placeholderPassword: 'Lösenord', + placeholderPassword2: 'Vänligen ange lösenordet igen', + noEmptyUsername: 'Användarnamn krävs', + noEmptyPassword: 'Lösenord krävs', + noAccount: 'Kunde inte hämta användarinformation, uppdatera sidan eller återställ lösenordet', + invalidUser: 'Ogiltigt användarnamn eller lösenord', + error: 'Oväntat fel', + changePassword: 'Byt lösenord', + changePasswordDesc: 'För din enhets säkerhet, byt lösenord!', + differentPassword: 'Lösenorden matchar inte', + illegalUsername: 'Användarnamnet innehåller ogiltiga tecken', + illegalPassword: 'Lösenordet innehåller ogiltiga tecken', + forgetPassword: 'Glömt lösenord', + ok: 'Ok', + cancel: 'Avbryt', + loginButtonText: 'Logga in', + tips: { + reset1: + 'För att återställa lösenordet, håll in BOOT-knappen på NanoKVM i 10 sekunder.', + reset2: 'För detaljerade steg, se detta dokument:', + reset3: 'Standardkonto för webben:', + reset4: 'Standardkonto för SSH:', + change1: 'Observera att denna åtgärd ändrar följande lösenord:', + change2: 'Webbinloggningslösenord', + change3: 'Systemets root-lösenord (SSH-lösenord)', + change4: 'För att återställa lösenordet, håll in BOOT-knappen på NanoKVM.' + } + }, + wifi: { + title: 'Wi-Fi', + description: 'Konfigurera Wi-Fi för NanoKVM', + success: 'Kontrollera nätverksstatusen för NanoKVM och besök den nya IP-adressen.', + failed: 'Åtgärden misslyckades, försök igen.', + confirmBtn: 'Ok', + finishBtn: 'Färdig' + }, + screen: { + title: 'Skärm', + video: 'Videoläge', + videoDirectTips: 'Aktivera HTTPS i "Inställningar > Enhet" för att använda detta läge', + resolution: 'Upplösning', + auto: 'Automatisk', + autoTips: + 'Skärmtear eller musförskjutning kan förekomma vid vissa upplösningar. Överväg att justera fjärrvärdens upplösning eller inaktivera automatiskt läge.', + fps: 'FPS', + customizeFps: 'Anpassa', + quality: 'Kvalitet', + qualityLossless: 'Förlustfri', + qualityHigh: 'Hög', + qualityMedium: 'Medel', + qualityLow: 'Låg', + frameDetect: 'Ramdetection', + frameDetectTip: + "Beräkna skillnaden mellan ramar. Sluta skicka videoström när inga förändringar upptäcks på fjärrvärdens skärm.", + resetHdmi: 'Återställ HDMI' + }, + keyboard: { + title: 'Tangentbord', + paste: 'Klistra in', + tips: 'Endast standardbokstäver och symboler på tangentbordet stöds', + placeholder: 'Ange text', + submit: 'Skicka', + virtual: 'Tangentbord', + ctrlaltdel: 'Ctrl+Alt+Del' + }, + mouse: { + title: 'Mus', + cursor: 'Markörstil', + default: 'Standardmarkör', + pointer: 'Pekmarkör', + cell: 'Cellmarkör', + text: 'Textmarkör', + grab: 'Greppmarkör', + hide: 'Dölj markör', + mode: 'Musläge', + absolute: 'Absolut läge', + relative: 'Relativt läge', + speed: 'Scrollhastighet', + fast: 'Snabb', + slow: 'Långsam', + requestPointer: 'Använder relativt läge. Klicka på skrivbordet för att få muspekaren.', + resetHid: 'Återställ HID', + hidOnly: { + title: 'Endast-HID-läge', + desc: 'Om din mus och ditt tangentbord slutar svara och återställning av HID inte hjälper, kan det bero på kompatibilitetsproblem mellan NanoKVM och enheten. Prova att aktivera Endast-HID-läge för bättre kompatibilitet.', + tip1: 'Aktivering av Endast-HID-läge avmonterar den virtuella U-disken och nätverket', + tip2: 'I Endast-HID-läge är avbildningsmontering inaktiverat', + tip3: 'NanoKVM kommer automatiskt att starta om efter lägesbyte', + enable: 'Aktivera Endast-HID-läge', + disable: 'Inaktivera Endast-HID-läge' + } + }, + image: { + title: 'Avbildningar', + loading: 'Laddar...', + empty: 'Inget hittades', + cdrom: 'Montera avbildning i CD-ROM-läge', + mountFailed: 'Montering misslyckades', + mountDesc: + "I vissa system måste den virtuella disken avmonteras på fjärrvärden innan avbildningen monteras.", + refresh: 'Uppdatera avbildningslistan', + tips: { + title: 'Hur man laddar upp', + usb1: 'Anslut NanoKVM till din dator via USB.', + usb2: 'Säkerställ att den virtuella disken är monterad (Inställningar - Virtuell Disk).', + usb3: 'Öppna den virtuella disken på din dator och kopiera avbildningsfilen till rotkatalogen.', + scp1: 'Säkerställ att NanoKVM och din dator är på samma lokala nätverk.', + scp2: 'Öppna en terminal på din dator och använd SCP-kommandot för att ladda upp avbildningen till /data på NanoKVM.', + scp3: 'Exempel: scp din-avbildningssökväg root@din-nanokvm-ip:/data', + tfCard: 'TF-kort', + tf1: 'Denna metod stöds på Linux-system', + tf2: 'Ta ut TF-kortet från NanoKVM (för FULL-versionen, öppna chassit först).', + tf3: 'Sätt in TF-kortet i en kortläsare och anslut till din dator.', + tf4: 'Kopiera avbildningsfilen till /data på TF-kortet.', + tf5: 'Sätt in TF-kortet i NanoKVM.' + } + }, + script: { + title: 'Skript', + upload: 'Ladda upp', + run: 'Kör', + runBackground: 'Kör i bakgrunden', + runFailed: 'Körning misslyckades', + attention: 'Observera', + delDesc: 'Är du säker på att du vill ta bort denna fil?', + confirm: 'Ja', + cancel: 'Nej', + delete: 'Ta bort', + close: 'Stäng' + }, + terminal: { + title: 'Terminal', + nanokvm: 'NanoKVM Terminal', + serial: 'Serieport-terminal', + serialPort: 'Serieport', + serialPortPlaceholder: 'Ange serieport', + baudrate: 'Baudhastighet', + parity: 'Paritet', + parityNone: 'Ingen', + parityEven: 'Jämn', + parityOdd: 'Udda', + flowControl: 'Flödeskontroll', + flowControlNone: 'Ingen', + flowControlSoft: 'Mjuk', + flowControlHard: 'Hård', + dataBits: 'Databitar', + stopBits: 'Stoppbitar', + confirm: 'Ok' + }, + wol: { + title: 'Wake-on-LAN', + sending: 'Skickar kommando...', + sent: 'Kommando skickat', + input: 'Ange MAC-adress', + ok: 'Ok' + }, + download: { + title: 'Avbildningshämtare', + input: 'Ange en fjärravbildnings-URL', + ok: 'Ok', + disabled: '/data partitionen är skrivskyddad, kan inte hämta avbildning' + }, + power: { + title: 'Ström', + showConfirm: 'Bekräftelse', + showConfirmTip: 'Strömätgärder kräver extra bekräftelse', + reset: 'Starta om', + power: 'Ström', + powerShort: 'Ström (kort tryck)', + powerLong: 'Ström (långt tryck)', + resetConfirm: 'Utföra omstart?', + powerConfirm: 'Utföra strömåtgärd?', + okBtn: 'Ja', + cancelBtn: 'Nej' + }, + settings: { + title: 'Inställningar', + about: { + title: 'Om NanoKVM', + information: 'Information', + ip: 'IP', + mdns: 'mDNS', + application: 'Applikationsversion', + applicationTip: 'NanoKVM webbapplikationsversion', + image: 'Systemversion', + imageTip: 'NanoKVM systemavbildningsversion', + deviceKey: 'Enhetsnyckel', + community: 'Community', + hostname: 'Värdnamn', + hostnameUpdated: 'Värdnamn uppdaterat. Starta om för att tillämpa.', + ipType: { + Wired: 'Trådbundet', + Wireless: 'Trådlöst', + Other: 'Annat' + } + }, + appearance: { + title: 'Utseende', + display: 'Display', + language: 'Språk', + menuBar: 'Menyfält', + menuBarDesc: 'Visa ikoner i menyfältet', + webTitle: 'Webbtitel', + webTitleDesc: 'Anpassa webbsidans titel' + }, + device: { + title: 'Enhet', + oled: { + title: 'OLED', + description: 'Stäng av OLED-skärmen efter', + 0: 'Aldrig', + 15: '15 sek', + 30: '30 sek', + 60: '1 min', + 180: '3 min', + 300: '5 min', + 600: '10 min', + 1800: '30 min', + 3600: '1 timme' + }, + wifi: { + title: 'Wi-Fi', + description: 'Konfigurera Wi-Fi', + setBtn: 'Konfigurera' + }, + ssh: { + description: 'Aktivera SSH-fjärråtkomst', + tip: 'Ställ in ett starkt lösenord innan du aktiverar (Konto - Byt lösenord)' + }, + tls: { + description: 'Aktivera HTTPS-protokoll', + tip: 'Observera: Användning av HTTPS kan öka fördröjningen, särskilt med MJPEG-läge.' + }, + advanced: 'Avancerade inställningar', + swap: { + title: 'Swap', + disable: 'Inaktivera', + description: 'Ange swap-filens storlek', + tip: 'Aktivering av denna funktion kan förkorta livslängden på ditt SD-kort!' + }, + mouseJiggler: { + title: 'Musvickare', + description: 'Förhindra att fjärrvärden går i viloläge', + disable: 'Inaktivera', + absolute: 'Absolut läge', + relative: 'Relativt läge' + }, + mdns: { + description: 'Aktivera mDNS-upptäckningstjänst', + tip: 'Stäng av om det inte behövs' + }, + hdmi: { + description: 'Aktivera HDMI/monitorutgång' + }, + hidOnly: 'Endast-HID-läge', + disk: 'Virtuell disk', + diskDesc: 'Montera virtuell U-disk på fjärrvärden', + network: 'Virtuellt nätverk', + networkDesc: 'Montera virtuell nätverkskort på fjärrvärden', + reboot: 'Starta om', + rebootDesc: 'Är du säker på att du vill starta om NanoKVM?', + okBtn: 'Ja', + cancelBtn: 'Nej' + }, + tailscale: { + title: 'Tailscale', + memory: { + title: 'Minnesoptimering', + tip: 'När minnesanvändningen överskrider gränsen utförs aggressivare skräpsamling för att frigöra minne. Rekommenderas att sättas till 75 MB om du använder Tailscale. Omstart krävs för att det ska gälla.', + disable: 'Inaktivera' + }, + restart: 'Starta om Tailscale?', + stop: 'Stoppa Tailscale?', + stopDesc: 'Logga ut från Tailscale och inaktivera autostart vid uppstart.', + loading: 'Laddar...', + notInstall: 'Tailscale hittades inte! Installera först.', + install: 'Installera', + installing: 'Installerar', + failed: 'Installationen misslyckades', + retry: 'Uppdatera sidan och försök igen. Eller installera manuellt', + download: 'Ladda ner', + package: 'installationspaketet', + unzip: 'och packa upp det', + upTailscale: 'Ladda upp tailscale till NanoKVM-katalogen /usr/bin/', + upTailscaled: 'Ladda upp tailscaled till katalogen /usr/sbin/', + refresh: 'Uppdatera sidan', + notLogin: + 'Enheten är ännu inte bunden. Logga in och bind enheten till ditt konto.', + urlPeriod: 'Denna URL är giltig i 10 minuter', + login: 'Logga in', + loginSuccess: 'Inloggning lyckades', + enable: 'Aktivera Tailscale', + deviceName: 'Enhetsnamn', + deviceIP: 'Enhets-IP', + account: 'Konto', + logout: 'Logga ut', + logoutDesc: 'Är du säker på att du vill logga ut?', + uninstall: 'Avinstallera Tailscale', + okBtn: 'Ja', + cancelBtn: 'Nej' + }, + update: { + title: 'Sök efter uppdateringar', + queryFailed: 'Kunde inte hämta version', + updateFailed: 'Uppdatering misslyckades. Försök igen.', + isLatest: 'Du har redan den senaste versionen.', + available: 'En uppdatering finns tillgänglig. Vill du uppdatera nu?', + updating: 'Uppdatering påbörjad. Vänta...', + confirm: 'Bekräfta', + cancel: 'Avbryt', + preview: 'Förhandsvisning av uppdateringar', + previewDesc: 'Få tidig tillgång till nya funktioner och förbättringar', + previewTip: + 'Observera att förhandsversioner kan innehålla buggar eller ofullständig funktionalitet!' + }, + account: { + title: 'Konto', + webAccount: 'Webbkonto-namn', + password: 'Lösenord', + updateBtn: 'Byt', + logoutBtn: 'Logga ut', + logoutDesc: 'Är du säker på att du vill logga ut?', + okBtn: 'Ja', + cancelBtn: 'Nej' + } + }, + error: { + title: 'Vi stötte på ett problem', + refresh: 'Uppdatera' + }, + fullscreen: { + toggle: 'Växla fullskärm' + }, + menu: { + collapse: 'Fäll ihop menyn', + expand: 'Expandera menyn' + } + } +}; + +export default se; diff --git a/web/src/i18n/locales/tr.ts b/web/src/i18n/locales/tr.ts new file mode 100644 index 0000000..b2bd4b1 --- /dev/null +++ b/web/src/i18n/locales/tr.ts @@ -0,0 +1,353 @@ +const tr = { + translation: { + head: { + desktop: 'Uzak masaüstü', + login: 'Giriş', + changePassword: 'Şifreyi değiştir', + terminal: 'Uçbirim', + wifi: 'Wi-Fi' + }, + auth: { + login: 'Giriş', + placeholderUsername: 'Kullanıcı Adı', + placeholderPassword: 'Şifre', + placeholderPassword2: 'Şifrenizi tekrar deneyiniz', + noEmptyUsername: 'Kullanıcı adı gereklidir', + noEmptyPassword: 'Şifre gereklidir', + noAccount: 'Kullanıcı verileri alınırken hata yaşandı, lütfen sayfayı yenileyiniz ya da şifrenizi sıfırlayınız', + invalidUser: 'Yanlış kullanıcı adı ya da şifre', + error: 'Beklenmedik bir hata', + changePassword: 'Şifrenizi değiştiriniz', + changePasswordDesc: 'Güvenlik sebebiyle lütfen şifrenizi değiştiriniz!', + differentPassword: 'Şifreler eşleşmemektedir', + illegalUsername: 'Kullanıcı adı istenmeyen karakterler içermektedir', + illegalPassword: 'Şifre istenmeyen karakterler içermektedir', + forgetPassword: 'Şifremi unuttum', + ok: 'Tamam', + cancel: 'İptal', + loginButtonText: 'Giriş', + tips: { + reset1: + 'Şifreleri sıfırlamak için NanoKVM üzerinde bulunan BOOT tuşuna 10 saniye boyunca basılı tutun.', + reset2: 'Ayrıntılı adımlar için dökümana göz atın:', + reset3: 'Arayüz varsayılan hesap:', + reset4: 'Güvenli Kabuk Bağlantısı (SSH) varsayılan hesap:', + change1: 'Bu işlem şu şifreleri değiştiricektir:', + change2: 'Arayüz giriş şifresi', + change3: 'Sistem yöneticisi şifresi (Güvenli Kabuk Bağlantısı (SSH) giriş şifresi)', + change4: 'Şifreleri sıfırlamak için NanoKVM üzerinde bulunan BOOT tuşuna 10 saniye boyunca basılı tutun.' + } + }, + wifi: { + title: 'Wi-Fi', + description: 'NanoKVM için Wi-Fi ayarlarını ayarlayın', + success: 'NanoKVM\'in bağlantı durumunu kontrol edin ve yeni IP adresini ziyaret edin.', + failed: 'İşlem başarısız oldu, lütfen tekrar deneyiniz.', + confirmBtn: 'Tamam', + finishBtn: 'Bitti' + }, + screen: { + title: 'Ekran', + video: 'Görüntü modu', + videoDirectTips: 'kullanmak için "Ayarlar > Cihaz" HTTPS aktif edin', + resolution: 'Çözünürlük', + auto: 'Otomatik', + autoTips: + "Belirli çözünürlüklerde ekran yırtılması veya fare kayması meydana gelebilir. Bu durumda uzak ana bilgisayarın çözünürlüğünü ayarlamayı ya da otomatik modu devre dışı bırakmayı deneyin.", + fps: 'Saniyedeki kare sayısı', + customizeFps: 'Kişiselleştir', + quality: 'Kalite', + qualityLossless: 'Kayıpsız', + qualityHigh: 'Yüksek', + qualityMedium: 'Orta', + qualityLow: 'Düşük', + frameDetect: 'Kareleri algıla', + frameDetectTip: + "Gönderilen kareler arasındaki farkı hesaplar. Uzak ana bilgisayardan gönderilen yayında bir değişiklik yoksa görüntü yayınını durdurur.", + resetHdmi: 'HDMI sıfırla' + }, + keyboard: { + title: 'Klavye', + paste: 'Yapıştır', + tips: 'Sadece standart klavye harfleri ve sembolleri desteklenmektedir.', + placeholder: 'Girdi', + submit: 'Gönder', + virtual: 'Klavye', + ctrlaltdel: 'Ctrl+Alt+Del' + }, + mouse: { + title: 'Fare', + cursor: 'İmleç sitili', + default: 'Varsayılan imleç', + pointer: 'Nokta imleç', + cell: 'Artı imleç', + text: 'Yazı imleç', + grab: 'El imleç', + hide: 'İmleci gizle', + mode: 'Fare modu', + absolute: 'Mutlak fare modu', + relative: 'Bağıl fare modu', + speed: 'Tekerlek hızı', + fast: 'Hızlı', + slow: 'Yavaş', + requestPointer: 'Bağıl fare modu kullanılıyor. Masaüstüne tıklayarak imleç elde edinin.', + resetHid: 'İnsan Arayüz Cihazı\'nı sıfırlayın', + hidOnly: { + title: 'Sadece İnsan Arayüz Cihazı modu', + desc: "Eğer fare ve klavye çalışmayı bırakırsa ve İnsan Arayüz Cihazı\'nı sıfırlamak sorunu çözmezse bunun sebebi cihazınız ve NanoKVM arasındaki bir uyumluluk sorunu olabilir. Uyumluluğu arttırmak için Sadece İnsan Arayüz Cihazı modunu kullanın.", + tip1: 'Sadece İnsan Arayüz Cihazı modunu aktifleştirmek, sanal U-disk’i ve sanal ağı devre dışı bırakacaktır.', + tip2: 'Sadece İnsan Arayüz Cihazı modunda disk imajı bağlama özelliği devre dışı bırakılır', + tip3: 'NanoKVM mod değişiminden sonra kendiliğinden yeniden başlatılacaktır', + enable: 'Sadece İnsan Arayüz Cihazı modunu aktifleştir', + disable: 'Sadece İnsan Arayüz Cihazı modunu devre dışı bırak' + } + }, + image: { + title: 'Disk İmajları', + loading: 'Yükleniyor...', + empty: 'Hiçbir şey bulunamadı', + cdrom: 'Disk imajını CD-ROM modunda bağlayın.', + mountFailed: 'Bağlantı başarısız oldu', + mountDesc: + "Bazı sistemlerde, disk imajını bağlamadan önce uzak ana bilgisayardaki sanal diski çıkarmak gerekir.", + refresh: 'Disk imajı listesini yenile', + tips: { + title: 'Nasıl yüklenir', + usb1: 'NanoKVM\'i bilgisayarınıza USB ile bağlayın.', + usb2: 'Sanal diskin bağlı olduğundan emin olun (Ayarlar - Sanal Disk).', + usb3: 'Sanal diski bilgisayarınızda açın ve disk imajı dosyanızı sanal diskin kök dizinine kopyalayın.', + scp1: 'NanoKVM ve bilgisayarınızın aynı yerel ağda bulunduğundan emin olun.', + scp2: 'Bilgisayarınızda uçbirimi açın ve disk imajı dosyanını SCP komudunu kullanarak NanoKVM\'in /data dizinine yükleyin.', + scp3: 'Örnek: scp senin-disk-imajı-dizinin root@senin-nanokvm-ip:/data', + tfCard: 'micro SD kart', + tf1: 'Bu yöntem Linux sistemlerde desteklenmektedir.', + tf2: 'NanoKVM\'den micro SD kartı çıkartın(TAM sürüm için öncelikle kutuyu sökün).', + tf3: 'micro SD kartı kart okuyucusuna takın ve bilgisayarınıza bağlayın.', + tf4: 'Disk imajı dosyanını micro SD kartın /data dizinine kopyalayın.', + tf5: 'micro SD kartı NanoKVM\'e geri yerleştirin.' + } + }, + script: { + title: 'Betikler', + upload: 'Yükle', + run: 'Çalıştır', + runBackground: 'Arka planda çalıştır', + runFailed: 'Çalıştırma başarısız oldu', + attention: 'Dikkat', + delDesc: 'Bu dosyayı silmek istediğinden emin misin?', + confirm: 'Evet', + cancel: 'Hayır', + delete: 'Sil', + close: 'Kapat' + }, + terminal: { + title: 'Uçbirim', + nanokvm: 'NanoKVM Uçbirimi', + serial: 'Serial Port Uçbirimi', + serialPort: 'Serial Port', + serialPortPlaceholder: 'Lütfen serial portunu giriniz', + baudrate: 'Baud hızı', + parity: 'Eşlik kontrolü', + parityNone: 'Yok', + parityEven: 'Çift', + parityOdd: 'Tek', + flowControl: 'Akış kontrolü', + flowControlNone: 'Yok', + flowControlSoft: 'Yazılımsal', + flowControlHard: 'Donanımsal', + dataBits: 'Veri bitleri', + stopBits: 'Dur bitleri', + confirm: 'Tamam' + }, + wol: { + title: 'Ağ Üzerinden Uyandırma (WOL)', + sending: 'Komut gönderiliyor...', + sent: 'Komut gönderildi', + input: 'MAC adresi girin', + ok: 'Tamam' + }, + download: { + title: 'Disk İmajı İndirici', + input: 'Uzaktaki disk imajı adresini girin', + ok: 'Tamam', + disabled: '/data bölüntüsü salt okunur modda, disk imajı indirilemiyor.' + }, + power: { + title: 'Güç', + showConfirm: 'Doğrulama', + showConfirmTip: 'Güç ile ilgili işlemler fazladan doğrulama gerektirir', + reset: 'Sıfırla', + power: 'Güç', + powerShort: 'Güç tuşu (bas-çek)', + powerLong: 'Güç tuşu (uzun bas)', + resetConfirm: 'Sıfırlama işlemine devam etmek istediğinizden emin misiniz?', + powerConfirm: 'Güç işlemine devam etmek istediğinizden emin misiniz?', + okBtn: 'Evet', + cancelBtn: 'Hayır' + }, + settings: { + title: 'Ayarlar', + about: { + title: 'NanoKVM Hakkında', + information: 'Bilgi', + ip: 'IP', + mdns: 'mDNS', + application: 'Uygulama sürümü', + applicationTip: 'NanoKVM web uygulaması sürümü', + image: 'İmaj Sürümü', + imageTip: 'NanoKVM sistem imajı sürümü', + deviceKey: 'Cihaz Anahtarı', + community: 'Topluluk', + hostname: 'Hostname', + hostnameUpdated: 'Hostname güncellendi. Uygulamak için yeniden başlatın.', + ipType: { + Wired: 'Kablolu bağlantı', + Wireless: 'Kablosuz bağlantı', + Other: 'Diğer' + } + }, + appearance: { + title: 'Görünüm', + display: 'Ekran', + language: 'Dil', + menuBar: 'Menü çubuğu', + menuBarDesc: 'Menü çubuğunda ikonları göster', + webTitle: 'Site başlığı', + webTitleDesc: 'Görünen site başlığını güncelleyin' + }, + device: { + title: 'Cihaz', + oled: { + title: 'OLED', + description: 'Oled ekranı ... sonra kapatın', + 0: 'Hiçbir zaman', + 15: '15 saniye', + 30: '30 saniye', + 60: '1 dakika', + 180: '3 dakika', + 300: '5 dakika', + 600: '10 dakika', + 1800: '30 dakika', + 3600: '1 saat' + }, + wifi: { + title: 'Wi-Fi', + description: 'Wi-Fi ayarlayın', + setBtn: 'Ayarla' + }, + ssh: { + description: 'Güvenli Kabuk Bağlantısı (SSH) aktif et', + tip: 'Aktifleştirmeden önce güçlü bir şifreye sahip olduğunuzdan emin olun (Hesap - Şifremi Değiştir)' + }, + tls: { + description: 'HTTPS protokolünü etkinleştir', + tip: 'HTTPS protokolü bağlantıda gecikmeye sebep olabilir, özellikle MJPEG görüntü modu ile.' + }, + advanced: 'Gelişmiş Ayarlar', + swap: { + title: 'Swap', + disable: 'Aktifleştir', + description: 'Swap dosyasının boyutunu belirle', + tip: "Bu özelliği aktifleştirmek micro SD kartınızın ömrünü kısaltabilir!" + }, + mouseJiggler: { + title: 'Fare Oynatıcı', + description: 'Uzak ana bilgisayarın uykuya geçmesini engeller', + disable: 'Devre dışı bırak', + absolute: 'Mutlak mod', + relative: 'Bağıl mod' + }, + mdns: { + description: 'mDNS keşif hizmetini etkinleştir', + tip: "Kullanmıyorsanız devre dışı bırakabilirsiniz" + }, + hdmi: { + description: 'HDMI/Momitör çıktısını aktifleştir' + }, + hidOnly: 'Sadece İnsan Arayüz Cihazı modu', + disk: 'Sanal Disk', + diskDesc: 'Sanal U-disk\'i uzak ana bilgisayara bağla', + network: 'Sanal Ağ', + networkDesc: 'Sanal ağ kartını uzak ana bilgisayara bağla', + reboot: 'Yeniden Başlat', + rebootDesc: 'NanoKVM\'i yeniden başlatmak istediğinizden emin misiniz?', + okBtn: 'Evet', + cancelBtn: 'Hayır' + }, + tailscale: { + title: 'Tailscale', + memory: { + title: 'Bellek optimizasyonu', + tip: "Bellek kullanımı sınırı aştığında, belleği boşaltmak amacıyla çöp toplama işlemi daha agresif bir şekilde gerçekleştirilir. Tailscale kullanıyorsanız bu değerin 75 MB olarak ayarlanması önerilir. Değişikliğin etkili olabilmesi için Tailscale'in yeniden başlatılması gerekir.", + disable: 'Devre dışı bırak' + }, + restart: 'Tailscale\'i yeniden başlat?', + stop: 'Tailscale\'i durdur?', + stopDesc: 'Tailscale oturumundan çıkış yap ve başlangıçta çalışmasını devre dışı bırak.', + loading: 'Yükleniyor...', + notInstall: 'Tailscale bulunamadı! Lütfen indirin.', + install: 'İndir', + installing: 'İndiriliyor', + failed: 'İndirme başarısız oldu', + retry: 'Lütfen sayfayı yenileyin ve tekrar deneyin, ya da manuel indirin', + download: 'İndir', + package: 'yükleme paketi', + unzip: 'sıkışmış dosyayı açın', + upTailscale: 'tailscale dosyasını NanoKVM\'in /usr/bin dizinine yükleyin', + upTailscaled: 'tailscaled dosyasını NanoKVM\'in /usr/sbin dizinine yükleyin', + refresh: 'İçinde bulunduğunuz sayfayı yenileyin', + notLogin: + 'Cihaz bağlı değil. Lütfen giriş yapıp cihazınızı hesabınıza bağlayın.', + urlPeriod: 'Adres sadece 10 ndakika boyunca geçerlidir', + login: 'Giriş yap', + loginSuccess: 'Giriş yapıldı', + enable: 'Tailscale\'i etkinleştir', + deviceName: 'Cihaz Adı', + deviceIP: 'Cihaz IP adresi', + account: 'Hesap', + logout: 'Çıkış yap', + logoutDesc: 'Çıkış yapmak istediğinizden emin misiniz?', + uninstall: 'Tailscale\'i kaldır', + okBtn: 'Evet', + cancelBtn: 'Hayır' + }, + update: { + title: 'Güncelleştirmeleri kontrol et', + queryFailed: 'Sürüm bilgisi alınamadı', + updateFailed: 'Güncelleme başarısız oldu. Lütfen tekrar deneyin.', + isLatest: 'En yeni sürüme sahipsiniz.', + available: 'Bir güncelleme indirilebilir. Şimdi güncellemek istediğinizden emin misiniz?', + updating: 'Güncelleme başlatıldı. Lütfen bekleyin...', + confirm: 'Onayla', + cancel: 'İptal', + preview: 'Ön İzleme Güncellemeleri', + previewDesc: 'En son geliştirmelere ve özelliklere erken erişin', + previewTip: + 'Ön izleme güncellemelerinin tamamlanmamış olduğunu ve sorunlara sebep olabileceğini unutmayın!' + }, + account: { + title: 'Hesap', + webAccount: 'Web Hesap Adı', + password: 'Şifre', + updateBtn: 'Değiştir', + logoutBtn: 'Çıkış yap', + logoutDesc: 'Çıkış yapmak istediğinizden emin misiniz?', + okBtn: 'Evet', + cancelBtn: 'Hayır' + } + }, + error: { + title: "Bir hata oldu!", + refresh: 'Yenile' + }, + fullscreen: { + toggle: 'Tam ekrana geç' + }, + menu: { + collapse: 'Menüyü küçült', + expand: 'Menüyü genişlet' + } + } +}; + +export default tr; diff --git a/web/src/i18n/locales/zh.ts b/web/src/i18n/locales/zh.ts index eea448d..cbf0c06 100644 --- a/web/src/i18n/locales/zh.ts +++ b/web/src/i18n/locales/zh.ts @@ -104,9 +104,16 @@ const zh = { title: '镜像', loading: '加载中', empty: '无镜像文件', - cdrom: '以 CD-ROM 模式挂载镜像', + mountMode: '挂载模式', mountFailed: '挂载失败', mountDesc: '在某些系统中，需要在远程主机中弹出虚拟硬盘后再挂载镜像。', + unmountFailed: '卸载失败', + unmountDesc: '在某些系统中，需要在远程主机中手动弹出后再卸载镜像。', + refresh: '刷新镜像列表', + attention: '注意', + deleteConfirm: '确定要删除该镜像吗？', + okBtn: '确定', + cancelBtn: '取消', tips: { title: '如何上传', usb1: '将 NanoKVM 通过 USB 连接到你的电脑；', @@ -256,8 +263,11 @@ const zh = { title: 'Tailscale', memory: { title: '内存优化', - tip: '当内存占用超过限制时，会更积极地执行垃圾回收来尝试释放内存。如果使用 Tailscale 推荐设置为 50MB，需重启 Tailscale 后生效。', - disable: '关闭' + tip: '当内存占用超过限制时，会更积极地执行垃圾回收来尝试释放内存。需重启 Tailscale 后生效。' + }, + swap: { + title: '交换内存', + tip: '如果启用内存优化后依然存在问题，可以尝试开启交换内存。启用后会将交换文件设置为256MB，可以在「设置 - 设备」中修改该选项。' }, restart: '取定要重启 Tailscale 吗？', stop: '确定要停止 Tailscale 吗？', @@ -274,6 +284,8 @@ const zh = { upTailscale: '将 tailscale 文件上传到 /usr/bin/ 目录', upTailscaled: '将 tailscaled 文件上传到 /usr/sbin/ 目录', refresh: '刷新页面', + notRunning: 'Tailscale 尚未运行，请先执行启动操作', + run: '启动', notLogin: '该设备尚未绑定，请点击登录并将这台设备绑定到您的账号。', urlPeriod: '该链接10分钟内有效', login: '登录', @@ -285,6 +297,7 @@ const zh = { logout: '退出', logoutDesc: '确定要退出吗？', uninstall: '卸载 Tailscale', + uninstallDesc: '确定要卸载 Tailscale 吗？', reboot: '重启', rebootDesc: '你确定要重启 NanoKVM 吗？', okBtn: '确认', diff --git a/web/src/i18n/locales/zh_tw.ts b/web/src/i18n/locales/zh_tw.ts index 161d3c7..897e96a 100644 --- a/web/src/i18n/locales/zh_tw.ts +++ b/web/src/i18n/locales/zh_tw.ts @@ -46,7 +46,9 @@ const zh_tw = { finishBtn: '完成' }, screen: { + title: '螢幕', video: '編碼格式', + videoDirectTips: '本模式需先啟用HTTPS，請前往「設定 -> 設備」中開啟', resolution: '解析度', auto: '自動', autoTips: @@ -63,6 +65,7 @@ const zh_tw = { resetHdmi: '重置 HDMI' }, keyboard: { + title: 'Keyboard', paste: '貼上', tips: '僅支援標準鍵盤字母和符號', placeholder: '請輸入內容', @@ -71,6 +74,8 @@ const zh_tw = { ctrlaltdel: 'Ctrl+Alt+Del' }, mouse: { + title: '滑鼠', + cursor: '游標樣式', default: '預設游標', pointer: '懸浮游標', cell: '儲存格游標', @@ -80,8 +85,20 @@ const zh_tw = { mode: '滑鼠模式', absolute: '絕對模式', relative: '相對模式', + speed: '滾輪速度', + fast: '快', + slow: '慢', requestPointer: '使用相對模式。請按一下桌面以取得滑鼠游標。', - resetHid: '重設 HID' + resetHid: '重設 HID', + hidOnly: { + title: 'HID-Only 模式', + desc: "如果您的滑鼠和鍵盤停止回應，且重設 HID 無效，可能是 NanoKVM 與裝置間的相容性問題。請嘗試啟用 HID-Only 模式以獲得更好的相容性。", + tip1: '啟用 HID-Only 模式將會卸載虛擬隨身碟和虛擬網卡', + tip2: '在 HID-Only 模式下，映像掛載功能將被停用', + tip3: 'NanoKVM 將在切換模式後自動重新啟動', + enable: '啟用 HID-Only 模式', + disable: '停用 HID-Only 模式' + } }, image: { title: '映像', @@ -90,6 +107,7 @@ const zh_tw = { cdrom: '以CD-ROM模式掛載', mountFailed: '掛載失敗', mountDesc: '在某些系統中，在掛載映像之前需要中斷遠端主機上的虛擬磁碟。', + refresh: 'Refresh the image list', tips: { title: '如何上傳', usb1: '透過 USB 將 NanoKVM 連接到您的電腦。', @@ -126,6 +144,16 @@ const zh_tw = { serialPort: 'Serial Port', serialPortPlaceholder: '請輸入 Serial Port', baudrate: 'Baud rate', + parity: 'Parity', + parityNone: 'None', + parityEven: 'Even', + parityOdd: 'Odd', + flowControl: 'Flow control', + flowControlNone: 'None', + flowControlSoft: 'Soft', + flowControlHard: 'Hard', + dataBits: 'Data bits', + stopBits: 'Stop bits', confirm: '確定' }, wol: { @@ -143,10 +171,16 @@ const zh_tw = { }, power: { title: '電源', + showConfirm: 'Confirmation', + showConfirmTip: 'Power operations require an extra confirmation', reset: '重新啟動', power: '電源', powerShort: '電源 (短按)', - powerLong: '電源 (長按)' + powerLong: '電源 (長按)', + resetConfirm: '執行重新啟動按鍵操作?', + powerConfirm: '執行電源按鍵操作?', + okBtn: '是', + cancelBtn: '取消' }, settings: { title: '設定', @@ -160,14 +194,23 @@ const zh_tw = { image: '映像版本', imageTip: 'NanoKVM 系统镜像版本', deviceKey: '設備序號', - community: '社群' + community: '社群', + hostname: '主機名稱', + hostnameUpdated: '已更新主機名稱. 請重新啟動以生效', + ipType: { + Wired: '有線', + Wireless: '無線', + Other: '其他' + } }, appearance: { title: '外觀', display: '顯示', language: '語言', menuBar: '選單列', - menuBarDesc: '是否在選單列中顯示圖案' + menuBarDesc: '是否在選單列中顯示圖案', + webTitle: '網頁標題', + webTitleDesc: '自訂網頁標題' }, device: { title: '設備', @@ -193,10 +236,40 @@ const zh_tw = { description: '啟用SSH', tip: '啟用前請務必設定強密碼（帳號 - 更改密碼）' }, + tls: { + description: '啟用 HTTPS', + tip: '啟用 HTTPS 可以提高安全性，但可能會增加延遲，特別是使用 MJPEG 編碼格式時。' + }, + advanced: '進階設定', + swap: { + title: 'Swap', + disable: '停用', + description: '設定Swap檔大小', + tip: "啟用此功能可能會減少SD卡的使用壽命！" + }, + mouseJiggler: { + title: 'Mouse Jiggler', + description: '避免遠端主機進入休眠狀態', + disable: '停用', + absolute: '絕對模式', + relative: '相對模式' + }, + mdns: { + description: '啟用mDNS服務', + tip: "若無需求，建議關閉此功能" + }, + hdmi: { + description: '啟用 HDMI/螢幕 輸出' + }, + hidOnly: 'HID-Only 模式', disk: '虛擬隨身碟', diskDesc: '在遠端主機上連接虛擬隨身碟', network: '虛擬網卡', - networkDesc: '在遠端主機上新增虛擬網卡' + networkDesc: '在遠端主機上新增虛擬網卡', + reboot: '重新啟動', + rebootDesc: '你確定要重新啟動 NanoKVM?', + okBtn: '是', + cancelBtn: '取消' }, tailscale: { title: 'Tailscale', @@ -229,7 +302,7 @@ const zh_tw = { deviceIP: '裝置 IP', account: '帳號', logout: '登出', - logout2: '確認登出?', + logoutDesc: '確認登出?', uninstall: '移除 Tailscale', okBtn: '確認', cancelBtn: '取消' @@ -242,26 +315,33 @@ const zh_tw = { available: '有可用更新。確定要更新嗎？', updating: '正在更新。請稍等...', confirm: '確定', - cancel: '取消' + cancel: '取消', + preview: '預覽更新', + previewDesc: '搶先體驗新功能和改進', + previewTip: + '請注意，預覽版本可能包含錯誤或功能不完整！' }, account: { title: '帳號', webAccount: '網頁帳號', password: '密碼', updateBtn: '修改', - logoutBtn: '登出' + logoutBtn: '登出', + logoutDesc: '你確定要登出嗎?', + okBtn: '是', + cancelBtn: '取消' } }, error: { title: '我們遇到了一些問題', - refresh: '重新整理', + refresh: '重新整理' }, fullscreen: { - toggle: '進入全螢幕模式', + toggle: '進入全螢幕模式' }, menu: { collapse: '收起選單', - expand: '展開選單', + expand: '展開選單' } } }; diff --git a/web/src/pages/desktop/keyboard/index.tsx b/web/src/pages/desktop/keyboard/index.tsx index 56b9563..a963f7f 100644 --- a/web/src/pages/desktop/keyboard/index.tsx +++ b/web/src/pages/desktop/keyboard/index.tsx @@ -2,37 +2,24 @@ import { useEffect, useRef } from 'react'; import { client } from '@/lib/websocket.ts'; -import { KeyboardCodes, ModifierCodes } from './mappings.ts'; +import { KeyboardCodes } from './mappings.ts'; export const Keyboard = () => { - const lastCodeRef = useRef(''); - const modifierRef = useRef({ - ctrl: 0, - shift: 0, - alt: 0, - meta: 0 - }); + const pressedKeys = useRef>(new Set()); // listen keyboard events useEffect(() => { - const modifiers = ['Control', 'Shift', 'Alt', 'Meta']; - window.addEventListener('keydown', handleKeyDown); window.addEventListener('keyup', handleKeyUp); + window.addEventListener('blur', releaseAllKeys); + document.addEventListener('visibilitychange', handleVisibilityChange); // press button function handleKeyDown(event: KeyboardEvent) { disableEvent(event); - lastCodeRef.current = event.code; - - if (modifiers.includes(event.key)) { - const code = ModifierCodes.get(event.code)!; - setModifier(event.key, code); - - if (event.key === 'Meta') { - return; - } + if (!pressedKeys.current.has(event.code)) { + pressedKeys.current.add(event.code); } sendKeyDown(event); @@ -42,58 +29,64 @@ export const Keyboard = () => { function handleKeyUp(event: KeyboardEvent) { disableEvent(event); - if (modifiers.includes(event.key)) { - if (event.key === 'Meta' && lastCodeRef.current === event.code) { - sendKeyDown(event, true); - sendKeyUp(); - } - - setModifier(event.key, 0); + if (pressedKeys.current.has(event.code)) { + pressedKeys.current.delete(event.code); } - if (event.key !== 'Meta') { - sendKeyUp(); + sendKeyUp(); + } + + function releaseAllKeys() { + if (pressedKeys.current.size === 0) { + return; + } + + sendKeyUp(); + pressedKeys.current.clear(); + } + + function handleVisibilityChange() { + if (document.hidden) { + releaseAllKeys(); } } return () => { window.removeEventListener('keydown', handleKeyDown); window.removeEventListener('keyup', handleKeyUp); + window.removeEventListener('blur', releaseAllKeys); + document.removeEventListener('visibilitychange', handleVisibilityChange); }; }, []); - function setModifier(key: string, code: number) { - switch (key) { - case 'Control': - modifierRef.current.ctrl = code; - break; - case 'Alt': - modifierRef.current.alt = code; - break; - case 'Shift': - modifierRef.current.shift = code; - break; - case 'Meta': - modifierRef.current.meta = code; - break; - default: - console.log('unknown key: ', key); - } - } - - function sendKeyDown(event: KeyboardEvent, isMeta?: boolean) { + function sendKeyDown(event: KeyboardEvent) { const code = KeyboardCodes.get(event.code); if (!code) { console.log('unknown code: ', event.code); return; } - const ctrl = event.ctrlKey ? modifierRef.current.ctrl || 1 : 0; - const shift = event.shiftKey ? modifierRef.current.shift || 2 : 0; - const alt = event.altKey ? modifierRef.current.alt || 4 : 0; - const meta = event.metaKey || isMeta ? modifierRef.current.meta || 8 : 0; + let ctrl = 0; + if (event.ctrlKey) { + if (pressedKeys.current.has('ControlLeft')) { + ctrl = 1; + } else if (pressedKeys.current.has('ControlRight')) { + ctrl = 16; + } else if (pressedKeys.current.has('AltRight')) { + ctrl = 0; + } else { + ctrl = 1; + } + } - client.send([1, code, ctrl, shift, alt, meta]); + const modifiers = [ + ctrl, + event.shiftKey ? (pressedKeys.current.has('ShiftRight') ? 32 : 2) : 0, + event.altKey ? (pressedKeys.current.has('AltRight') ? 64 : 4) : 0, + event.metaKey ? (pressedKeys.current.has('MetaRight') ? 128 : 8) : 0 + ]; + + client.send([1, code, ...modifiers]); } function sendKeyUp() { diff --git a/web/src/pages/desktop/keyboard/mappings.ts b/web/src/pages/desktop/keyboard/mappings.ts index 11f2b18..6ca3ba9 100644 --- a/web/src/pages/desktop/keyboard/mappings.ts +++ b/web/src/pages/desktop/keyboard/mappings.ts @@ -85,6 +85,7 @@ export const KeyboardCodes: Map = new Map([ ['Backslash', 49], ['IntlBackslash', 49], ['Backquote_azerty', 100], + ['IntlBackslash_qwertz', 100], ['Semicolon', 51], ['Quote', 52], diff --git a/web/src/pages/desktop/keyboard/virtual-keyboard.tsx b/web/src/pages/desktop/keyboard/virtual-keyboard.tsx index 2349619..76838d8 100644 --- a/web/src/pages/desktop/keyboard/virtual-keyboard.tsx +++ b/web/src/pages/desktop/keyboard/virtual-keyboard.tsx @@ -46,6 +46,7 @@ export const VirtualKeyboard = () => { const languages = [ { value: 'en', label: 'English' }, { value: 'fr', label: 'French' }, + { value: 'de', label: 'Deutsch' }, { value: 'ru', label: 'Russian' } ]; @@ -65,6 +66,7 @@ export const VirtualKeyboard = () => { const layoutMap = new Map([ ['en', 'default'], ['ru', 'rus'], + ['de', 'qwertz'], ['fr', 'azerty'] ]); @@ -126,6 +128,17 @@ export const VirtualKeyboard = () => { // all other labels use their own code return KeyboardCodes.get(base); } + if (keyboardLanguage === 'de' && key.endsWith('_qwertz')) { + const base = key.replace('_qwertz', ''); + // Tausch + if (base === 'KeyZ') return KeyboardCodes.get('KeyY'); + if (base === 'KeyY') return KeyboardCodes.get('KeyZ'); + + if (base === 'IntlBackslash') return KeyboardCodes.get('IntlBackslash_qwertz'); + + // all other labels use their own code + return KeyboardCodes.get(base); + } const specialKey = specialKeyMap.get(key); if (specialKey) { diff --git a/web/src/pages/desktop/keyboard/virtual-keys.ts b/web/src/pages/desktop/keyboard/virtual-keys.ts index de75c14..cc1a233 100644 --- a/web/src/pages/desktop/keyboard/virtual-keys.ts +++ b/web/src/pages/desktop/keyboard/virtual-keys.ts @@ -29,6 +29,14 @@ export const keyboardOptions = { '{shiftleft} RusZ RusX RusC RusV RusB RusN RusM RusComma RusPeriod RusSlash {shiftright}', '{controlleft} {winleft} {altleft} {space} {altright} {winright} {menu} {controlright}' ], + qwertz: [ + '{escape} F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12', + 'Backquote_qwertz Digit1_qwertz Digit2_qwertz Digit3_qwertz Digit4_qwertz Digit5_qwertz Digit6_qwertz Digit7_qwertz Digit8_qwertz Digit9_qwertz Digit0_qwertz Minus_qwertz Equal_qwertz {backspace}', + '{tab} KeyQ_qwertz KeyW KeyE_qwertz KeyR KeyT KeyZ_qwertz KeyU KeyI KeyO KeyP BracketLeft_qwertz BracketRight_qwertz', + '{capslock} KeyA KeyS KeyD KeyF KeyG KeyH KeyJ KeyK KeyL Semicolon_qwertz Quote_qwertz Backslash_qwertz {enter}', + '{shiftleft} IntlBackslash_qwertz KeyY_qwertz KeyX KeyC KeyV KeyB KeyN KeyM Comma_qwertz Period_qwertz Slash_qwertz {shiftright}', + '{controlleft_qwertz} {winleft} {altleft} {space} {altright_qwertz} {winright} {menu} {controlright_qwertz}' + ], azerty: [ '{escape} F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12', 'Backquote_azerty Digit1_azerty Digit2_azerty Digit3_azerty Digit4_azerty Digit5_azerty Digit6_azerty Digit7_azerty Digit8_azerty Digit9_azerty Digit0_azerty Minus_azerty Equal_azerty {backspace}', @@ -55,6 +63,39 @@ export const keyboardOptions = { Equal: '+
=', '{backspace}': 'Backspace', + Backquote_qwertz: '^
°', + Digit1_qwertz: '1
!', + Digit2_qwertz: '2
"', + Digit3_qwertz: '3
§', + Digit4_qwertz: '4
$', + Digit5_qwertz: '5
%', + Digit6_qwertz: '6
&', + Digit7_qwertz: '7{/', + Digit8_qwertz: '8[(', + Digit9_qwertz: '9])', + Digit0_qwertz: '0}=', + Minus_qwertz: 'ß\\?', + Equal_qwertz: '´
`', + + KeyY_qwertz: 'Y', + KeyZ_qwertz: 'Z', + + KeyQ_qwertz: 'Q
@', + KeyE_qwertz: 'E
€', + BracketRight_qwertz: '+~*', + Backslash_qwertz: '#
\'', + IntlBackslash_qwertz: '<|>', + Comma_qwertz: ',
;', + Period_qwertz: '.
:', + Slash_qwertz: '-
_', + '{controlleft_qwertz}': 'STRG', + '{altright_qwertz}': 'ALT GR', + '{controlright_qwertz}': 'STRG', + + BracketLeft_qwertz: 'Ü', + Semicolon_qwertz: 'Ö', + Quote_qwertz: 'Ä', + '{tab}': 'Tab', KeyQ: 'Q', KeyW: 'W', @@ -275,7 +316,12 @@ export const specialKeyMap = new Map([ ['{arrowright}', 'ArrowRight'], ['{arrowleft}', 'ArrowLeft'], ['{arrowdown}', 'ArrowDown'], - ['{arrowup}', 'ArrowUp'] + ['{arrowup}', 'ArrowUp'], + + //DE + ['{controlleft_qwertz}', 'ControlLeft'], + ['{controlright_qwertz}', 'ControlRight'], + ['{altright_qwertz}', 'AltRight'] ]); // modifier keys @@ -289,7 +335,12 @@ export const modifierKeys = [ '{controlright}', '{altright}', '{metaright}', - '{winright}' + '{winright}', + + // DE-spezifische Modifier-Tokens (für qwertz-Layout) + '{controlleft_qwertz}', + '{controlright_qwertz}', + '{altright_qwertz}' ]; // double line display buttons diff --git a/web/src/pages/desktop/menu/image/images.tsx b/web/src/pages/desktop/menu/image/images.tsx index 2c9c474..1ad9fb0 100644 --- a/web/src/pages/desktop/menu/image/images.tsx +++ b/web/src/pages/desktop/menu/image/images.tsx @@ -1,12 +1,13 @@ import { useEffect, useState } from 'react'; -import { notification } from 'antd'; +import { Button, Modal, notification, Typography } from 'antd'; import clsx from 'clsx'; import { ArrowBigDownDashIcon, ArrowBigUpDashIcon, LoaderCircleIcon, PackageIcon, - PackageSearchIcon + PackageSearchIcon, + Trash2Icon } from 'lucide-react'; import { useTranslation } from 'react-i18next'; @@ -27,6 +28,9 @@ export const Images = ({ isOpen, cdrom, setIsMounted }: ImagesProps) => { const [images, setImages] = useState([]); const [mountingImage, setMountingImage] = useState(''); const [mountedImage, setMountedImage] = useState(''); + const [isModalOpen, setIsModalOpen] = useState(false); + const [selectedImage, setSelectedImage] = useState(''); + const [deletingImage, setDeletingImage] = useState(''); useEffect(() => { if (isOpen) { @@ -34,6 +38,7 @@ export const Images = ({ isOpen, cdrom, setIsMounted }: ImagesProps) => { } }, [isOpen]); + // get image list function getImages() { if (isLoading) return; setIsLoading(true); @@ -59,32 +64,33 @@ export const Images = ({ isOpen, cdrom, setIsMounted }: ImagesProps) => { }); } - async function getMountedImage() { - try { - const rsp = await api.getMountedImage(); + // get mounted image + function getMountedImage() { + api.getMountedImage().then((rsp) => { if (rsp.code !== 0) return; const file = rsp.data?.file; setMountedImage(file); setIsMounted(!!file); - } catch (e) { - console.log(e); - } + }); } + // mount/unmount image function mountImage(image: string) { if (mountingImage) return; setMountingImage(image); client.close(); - const filename = mountedImage === image ? '' : image; + const isMounted = mountedImage === image; + const filename = isMounted ? '' : image; api .mountImage(filename, cdrom) .then((rsp) => { if (rsp.code !== 0) { - openNotification(); + console.log(rsp.msg); + openNotification(isMounted); return; } @@ -97,42 +103,90 @@ export const Images = ({ isOpen, cdrom, setIsMounted }: ImagesProps) => { }); } - function openNotification() { + // show delete image modal + function showDeleteModal(e: any, image: string) { + e.stopPropagation(); + + const isMounted = mountedImage === image; + const isDeleting = deletingImage !== ''; + + if (isMounted || isDeleting) { + return; + } + + setSelectedImage(image); + setIsModalOpen(true); + } + + // delete image + function deleteImage() { + if (!selectedImage || !!deletingImage) return; + setDeletingImage(selectedImage); + + setIsModalOpen(false); + + api + .deleteImage(selectedImage) + .then((rsp) => { + if (rsp.code !== 0) { + console.log(rsp.msg); + return; + } + + getImages(); + + setSelectedImage(''); + }) + .finally(() => { + setDeletingImage(''); + }); + } + + // show mount/unmount failed notification + function openNotification(isMounted: boolean) { + const message = isMounted ? 'image.unmountFailed' : 'image.mountFailed'; + const description = isMounted ? 'image.unmountDesc' : 'image.mountDesc'; + notify.open({ - message: t('image.mountFailed'), - description: t('image.mountDesc'), - duration: 6 + message: t(message), + description: t(description), + duration: 10 }); } + // loading + if (isLoading) { + return ( +
+ + {t('image.loading')} +
+ ); + } + + // empty image + if (images.length === 0) { + return ( +
+ + {t('image.empty')} +
+ ); + } + return ( <> - {contextHolder} - - {isLoading ? ( - // loading -
- - {t('image.loading')} -
- ) : images.length === 0 ? ( - // no image -
- - {t('image.empty')} -
- ) : ( - // image list - images.map((image) => ( +
+ {images.map((image) => (
mountImage(image)} > -
+
{mountingImage === image ? ( ) : ( @@ -142,16 +196,54 @@ export const Images = ({ isOpen, cdrom, setIsMounted }: ImagesProps) => {
{image.replace(/^.*[\\/]/, '')}
-
+
{mountedImage === image ? ( - + ) : ( - + + )} +
+ +
showDeleteModal(e, image)} + > + {deletingImage === image ? ( + + ) : ( + )}
- )) - )} + ))} +
+ + setIsModalOpen(false)} + > +
+

{t('image.deleteConfirm')}

+ {selectedImage} +
+ +
+ + +
+ + + {contextHolder} ); }; diff --git a/web/src/pages/desktop/menu/image/index.tsx b/web/src/pages/desktop/menu/image/index.tsx index ae0f499..80e0c08 100644 --- a/web/src/pages/desktop/menu/image/index.tsx +++ b/web/src/pages/desktop/menu/image/index.tsx @@ -1,11 +1,10 @@ import { useEffect, useState } from 'react'; -import { Divider, Switch, Tooltip } from 'antd'; +import { Divider, Modal, Segmented } from 'antd'; import clsx from 'clsx'; -import { DiscIcon } from 'lucide-react'; +import { DiscIcon, HardDriveIcon } from 'lucide-react'; import { useTranslation } from 'react-i18next'; -import { getCdRom, getMountedImage } from '@/api/storage.ts'; -import { MenuItem } from '@/components/menu-item.tsx'; +import * as api from '@/api/storage.ts'; import { Images } from './images.tsx'; import { Tips } from './tips.tsx'; @@ -13,64 +12,76 @@ import { Tips } from './tips.tsx'; export const Image = () => { const { t } = useTranslation(); - const [isPopoverOpen, setIsPopoverOpen] = useState(false); + const [isModalOpen, setIsModalOpen] = useState(false); const [isMounted, setIsMounted] = useState(false); - const [cdrom, setCdrom] = useState(false); + const [mode, setMode] = useState('mass-storage'); + + const modes = [ + { + value: 'mass-storage', + label: ( +
+ + Mass Storage +
+ ) + }, + { + value: 'cd-rom', + label: ( +
+ + CD ROM +
+ ) + } + ]; useEffect(() => { - getMountedImage().then((rsp) => { + api.getMountedImage().then((rsp) => { if (rsp.code === 0) { setIsMounted(!!rsp.data?.file); } }); - getCdRom().then((rsp) => { + api.getCdRom().then((rsp) => { if (rsp.code === 0) { - setCdrom(rsp.data?.cdrom === 1); + setMode(rsp.data?.cdrom === 1 ? 'cd-rom' : 'mass-storage'); } }); }, []); - const content = ( -
-
+ return ( + <> +
setIsModalOpen(true)} + > + +
+ + setIsModalOpen(false)}>
- {t('image.title')} + {t('image.title')}
-
- -
- CD-ROM + - setCdrom(checked)} - > -
- +
+
+ {t('image.mountMode')} + +
+ + + +
-
- - - - -
- ); - - return ( - } - content={content} - className={clsx( - 'flex h-[30px] w-[30px] cursor-pointer items-center justify-center rounded hover:bg-neutral-700', - isMounted ? 'text-blue-500' : 'text-neutral-300 hover:text-white' - )} - fresh={true} - onOpenChange={setIsPopoverOpen} - /> + + ); }; diff --git a/web/src/pages/desktop/menu/image/tips.tsx b/web/src/pages/desktop/menu/image/tips.tsx index 516fe0e..e54644f 100644 --- a/web/src/pages/desktop/menu/image/tips.tsx +++ b/web/src/pages/desktop/menu/image/tips.tsx @@ -51,13 +51,10 @@ export const Tips = () => { return ( <>
setIsModalOpen(true)} > - {/**/} - {/* {t('image.tips.title')}*/} - {/**/}
{ const { t } = useTranslation(); @@ -16,23 +17,56 @@ export const Paste = () => { const [isModalOpen, setIsModalOpen] = useState(false); const [inputValue, setInputValue] = useState(''); - const [status, setStatus] = useState<'' | 'error'>(''); - const [isLoading, setIsLoading] = useState(false); + const [isClipboardSupported, setIsClipboardSupported] = useState(false); + const [isReadingClipboard, setIsReadingClipboard] = useState(false); + const [langue, setLangue] = useState('en'); + const [status, setStatus] = useState(''); const [errMsg, setErrMsg] = useState(''); + const [isLoading, setIsLoading] = useState(false); const inputRef = useRef(null); + const languages = [ + { value: 'en', label: t('keyboard.dropdownEnglish') }, + { value: 'de', label: t('keyboard.dropdownGerman') } + ]; + + useEffect(() => { + setIsClipboardSupported('clipboard' in navigator); + }, []); + function onChange(e: ChangeEvent) { const value = e.target.value; setStatus(isASCII(value) ? '' : 'error'); setInputValue(value); } + async function readFromClipboard() { + if (isReadingClipboard) return; + setIsReadingClipboard(true); + + try { + const text = await navigator.clipboard.readText(); + if (!text) { + return; + } + setInputValue((value) => value + text); + } catch (error) { + if (error instanceof Error && error.name === 'NotAllowedError') { + setErrMsg(t('keyboard.clipboardPermissionDenied')); + return; + } + setErrMsg(t('keyboard.clipboardReadError')); + } finally { + setIsReadingClipboard(false); + } + } + function submit() { - if (isLoading) return; + if (isLoading || !inputValue) return; setIsLoading(true); - paste(inputValue) + paste(inputValue, langue) .then((rsp) => { if (rsp.code !== 0) { setErrMsg(rsp.msg); @@ -81,28 +115,66 @@ export const Paste = () => { setIsModalOpen(false)} afterOpenChange={afterOpenChange} > -
{t('keyboard.tips')}
+
+ {t('keyboard.paste')} + {t('keyboard.tips')} +
-