bump: v1184

Fixes #643

.github/FUNDING.yml

@@ -1,14 +1 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: lollipopkit
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-polar: # Replace with a single Polar username
-buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
-custom: ['https://afdian.com/a/lollipopkit'] # Replace with up to 4 custom sponsorship URLs
+custom: ['https://cdn.lpkt.cn/donate']

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 name: Flutter Release
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - "v*"
@@ -18,12 +19,12 @@ jobs:
       - name: Install Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
-          flutter-version: '3.22.3'
+          channel: "stable"
+          flutter-version: "3.32.1"
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: '17'
+          distribution: "zulu"
+          java-version: "17"
       - name: Fetch secrets
         run: |
           curl -u ${{ secrets.BASIC_AUTH }} -o android/app/app.key ${{ secrets.URL_PREFIX }}app.key
@@ -53,14 +54,29 @@ jobs:
         uses: actions/checkout@v4
       - name: Install Flutter
         uses: subosito/flutter-action@v2
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          # Basic
+          sudo apt install -y clang cmake ninja-build pkg-config libgtk-3-dev libvulkan-dev desktop-file-utils wget
+          # App Specific
+          sudo apt install -y libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libunwind-dev
+          # Packaging
+          sudo wget https://github.com/AppImage/appimagetool/releases/download/1.9.0/appimagetool-x86_64.AppImage -O /bin/appimagetool
+          sudo chmod +x /bin/appimagetool
       - name: Build
         run: |
-          dart run fl_build -p linux
+          dart run fl_build
+          dart run flutter_distributor:main package --platform=linux --target=appimage
+      - name: Rename artifacts
+        run: |
+          appimage_name=$(ls dist/*/*.AppImage)
+          mv $appimage_name ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.appimage
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.AppImage
+            ${{ env.APP_NAME }}_${{ env.BUILD_NUMBER }}_amd64.appimage
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -90,9 +106,9 @@ jobs:
   #       uses: actions/checkout@v4
   #     - name: Install Flutter
   #       uses: subosito/flutter-action@v2
-        # with:
-        #   channel: 'stable'
-        #   flutter-version: '3.22.2'
+  # with:
+  #   channel: 'stable'
+  #   flutter-version: '3.32.1'
   #     - name: Build
   #       run: dart run fl_build -p ios,mac
   #     - name: Create Release

.gitignore

@@ -46,6 +46,7 @@ app.*.map.json
 /android/app/release
 
 /android/app/fjy.androidstudio.key
+/android/app/app.key
 /release
 test.dart
 
@@ -64,3 +65,4 @@ untranlated.json
 .vscode/settings.json
 more_build_data.json
 trans.txt
+android/app/.cxx

README.md

@@ -2,82 +2,84 @@ English | [简体中文](README_zh.md)
 
 <h2 align="center">Flutter Server Box</h2>
 
-<p align="center">
-  <img alt="lang" src="https://img.shields.io/badge/lang-dart-pink">
-  <img alt="license" src="https://img.shields.io/badge/license-GPLv3-pink">
-</p>
+<div align="center">
+  <a href="https://cdn.lpkt.cn/donate"><img alt="donate" src="https://img.shields.io/badge/donate-me-pink"></a>
+  <img alt="lang" src="https://img.shields.io/badge/lang-dart-cyan">
+  <img alt="license" src="https://img.shields.io/badge/license-GPLv3-yellow">
+  <a href="https://deepwiki.com/lollipopkit/flutter_server_box"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
+</div>
 
 <p align="center">
-A Flutter project which provide charts to display <a href="../../issues/43">Linux</a> server status and tools to manage server.
+A Flutter project which provide charts to display <a href="https://github.com/lollipopkit/flutter_server_box/issues/43">Linux</a> server status and tools to manage server.
 <br>
 Especially thanks to <a href="https://github.com/TerminalStudio/dartssh2">dartssh2</a> & <a href="https://github.com/TerminalStudio/xterm.dart">xterm.dart</a>.
 </p>
 
+## 🏙️ Screenshots
 
-## 📥 Install
-
-Platform | From
---- | --- 
-iOS / macOS | [AppStore](https://apps.apple.com/app/id1586449703)
-Android | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lolli.tech/serverbox/?sort=time&order=desc&layout=grid) / [F-Droid](https://f-droid.org/packages/tech.lolli.toolbox) / [OpenAPK](https://www.openapk.net/serverbox/tech.lolli.toolbox/)
-Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lolli.tech/serverbox/?sort=time&order=desc&layout=grid)
-
-**Please only download pkgs from the source that you trust!**  
-- `AppStore` & `CDN` packages are built by myself
-- Github releases are built by Github Actions
-- Other sources are built by themselves
-
-
-## 🔖 Feature
-- `Status chart` (CPU, Sensors, GPU...), `SSH` Term, `SFTP`, `Docker & Process`...
-- Platform specific: `Bio auth`、`Msg push`、`Home widget`、`watchOS App`...
-- English, 简体中文; Deutsch [@its-tom](https://github.com/its-tom), 繁體中文 [@kalashnikov](https://github.com/kalashnikov), Indonesian [@azkadev](https://github.com/azkadev), Français [@FrancXPT](https://github.com/FrancXPT), Dutch [@QazCetelic](https://github.com/QazCetelic), Türkçe [@mikropsoft](https://github.com/mikropsoft); Español, Русский язык, Português, 日本語 (Generated by GPT)
-
-
-## 🏙️ ScreenShots
 <table>
   <tr>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/1.png"></td>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/2.png"></td>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/3.png"></td>
-  </tr>
-  <tr>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/4.png"> </td>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/5.png"></td>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/6.png"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/1.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/2.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/3.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/4.jpg"></td>
   </tr>
 </table>
 
+## 📥 Install
+
+| Platform        | From                                                                                                                                                                                                                                                                              |
+|-----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| iOS / macOS     | [AppStore](https://apps.apple.com/app/id1586449703)                                                                                                                                                                                                                               |
+| Android         | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lpkt.cn/serverbox/pkg/?sort=time&order=desc&layout=grid) / [F-Droid](https://f-droid.org/packages/tech.lolli.toolbox) / [OpenAPK](https://www.openapk.net/serverbox/tech.lolli.toolbox/) |
+| Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lpkt.cn/serverbox/pkg/?sort=time&order=desc&layout=grid)                                                                                                                                 |
+
+Please only download pkgs from the source that **you trust**!  
+
+## 🔖 Feature
+
+- `Status chart` (CPU, Sensors, GPU...), `SSH` Term, `SFTP`, `Docker & Process & Systemd`...
+- Platform specific: `Bio auth`、`Msg push`、`Home widget`、`watchOS App`...
+- English, 简体中文; Deutsch [@its-tom](https://github.com/its-tom), 繁體中文 [@kalashnikov](https://github.com/kalashnikov), Indonesian [@azkadev](https://github.com/azkadev), Français [@FrancXPT](https://github.com/FrancXPT), Dutch [@QazCetelic](https://github.com/QazCetelic), Türkçe [@mikropsoft](https://github.com/mikropsoft), Українська мова [@CakesTwix](https://github.com/CakesTwix); Español, Русский язык, Português, 日本語 (Generated by GPT)
 
 ## 🆘 Help
+
+<div align="center">
+  <a href="https://t.me/lpktg"><img alt="donate" src="https://img.shields.io/badge/Telegram-lpktg-green"></a>
+  <a href="https://discord.gg/SsVNbRhK7w"><img alt="discord" src="https://img.shields.io/badge/Discord-lpkt-purple"></a>
+</div>
+
 - In order to push  server status to your portable device without opening ServerBox app (Such as **message push** and **home widget**), you need to install [ServerBoxMonitor](https://github.com/lollipopkit/server_box_monitor) on your servers, and config it correctly. See [wiki](https://github.com/lollipopkit/server_box_monitor/wiki) for more details.
 - **Common issues** can be found in [app wiki](https://github.com/lollipopkit/flutter_server_box/wiki).
 
 Before you open an issue, please read the following:
+
 1. Paste the **entire log** (click the top right of the home page) in the issue template.
 2. Make sure whether the issue is caused by ServerBox app.
 3. Welcome all valid and positive feedback, subjective feedback (such as you think other UI is better) may not be accepted.
 
 After you read the above, you can open an [issue](https://github.com/lollipopkit/flutter_server_box/issues/new).
 
-
 ## 🧱 Contribution
+
 Any positive contribution is welcome.
 
 ### Development
+
 1. Setup [Flutter](https://flutter.dev/docs/get-started/install) environment.
 2. Clone this repo, run `flutter run` to start the app.
 3. Run `dart run fl_build -p PLATFORM` to build the app.
 
 ### Translation
+
 - [Guide](https://blog.lpkt.cn/posts/faq/) can be found in my blog.
 - We need your help! Just feel free to open a PR.
 
-
 ## 💡 My other apps
+
 - [GPT Box](https://github.com/lollipopkit/flutter_gpt_box) - A third-party GPT Client for OpenAI API on all platforms.
 - [More](https://github.com/lollipopkit) - Tools & etc.
 
-
 ## 📝 License
+
 `GPL v3 lollipopkit`

README_zh.md

@@ -2,68 +2,67 @@
 
 <h2 align="center">Flutter Server Box</h2>
 
-<p align="center">
-  <img alt="lang" src="https://img.shields.io/badge/lang-dart-pink">
-  <img alt="license" src="https://img.shields.io/badge/license-GPLv3-pink">
-</p>
+<div align="center">
+  <a href="https://cdn.lpkt.cn/donate"><img alt="donate" src="https://img.shields.io/badge/捐赠-我-pink"></a>
+  <img alt="语言" src="https://img.shields.io/badge/语言-dart-cyan">
+  <img alt="license" src="https://img.shields.io/badge/证书-GPLv3-yellow">
+  <a href="https://deepwiki.com/lollipopkit/flutter_server_box"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
+</div>
 
 <p align="center">
-使用 Flutter 开发的 <a href="../../issues/43">Linux</a> 服务器工具箱，提供服务器状态图表和管理工具。
+使用 Flutter 开发的 <a href="https://github.com/lollipopkit/flutter_server_box/issues/43">Linux</a> 服务器工具箱，提供服务器状态图表和管理工具。
 <br>
 特别感谢 <a href="https://github.com/TerminalStudio/dartssh2">dartssh2</a> & <a href="https://github.com/TerminalStudio/xterm.dart">xterm.dart</a>。
 </p>
 
-## 📥 安装
-
-平台 | 下载
---- | --- 
-iOS / macOS | [AppStore](https://apps.apple.com/app/id1586449703)
-Android | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lolli.tech/serverbox/?sort=time&order=desc&layout=grid) / [F-Droid](https://f-droid.org/packages/tech.lolli.toolbox) / [OpenAPK](https://www.openapk.net/serverbox/tech.lolli.toolbox/)
-Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lolli.tech/serverbox/?sort=time&order=desc&layout=grid)
-
-**请不要从不受信任的来源下载!**
-- `AppStore` & `CDN` 的包由我构建
-- Github 的包由 Github Actions 构建
-- 其他来源由其所有者构建
-
-
-## 🔖 特点
-- `状态图表`（CPU、传感器、GPU 等）, `SSH` 终端, `SFTP`, `Docker & 进程` 管理...
-- 特殊支持：`生物认证`、`推送`、`桌面小部件`、`watchOS App`、`跟随系统颜色`...
-- 本地化
-  - English, 简体中文
-  - Español, Русский язык, Português, 日本語 (Generated by GPT)
-  - Deutsch [@its-tom](https://github.com/its-tom), 繁體中文 [@kalashnikov](https://github.com/kalashnikov), Indonesian [@azkadev](https://github.com/azkadev), Français [@FrancXPT](https://github.com/FrancXPT), Dutch [@QazCetelic](https://github.com/QazCetelic), Türkçe [@mikropsoft](https://github.com/mikropsoft);
-
 
 ## 🏙️ 截屏
 <table>
   <tr>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/1.png"></td>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/2.png"></td>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/3.png"></td>
-  </tr>
-  <tr>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/4.png"> </td>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/5.png"></td>
-    <td><img width="277px" src="https://cdn.lolli.tech/serverbox/screenshot/6.png"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/1.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/2.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/3.jpg"></td>
+    <td><img width="200px" src="https://cdn.lpkt.cn/serverbox/screenshot/4.jpg"></td>
   </tr>
 </table>
 
 
+## 📥 安装
+
+平台            | 下载
+----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+iOS / macOS     | [AppStore](https://apps.apple.com/app/id1586449703)
+Android         | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lpkt.cn/serverbox/pkg/?sort=time&order=desc&layout=grid) / [F-Droid](https://f-droid.org/packages/tech.lolli.toolbox) / [OpenAPK](https://www.openapk.net/serverbox/tech.lolli.toolbox/)
+Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/releases) / [CDN](https://cdn.lpkt.cn/serverbox/pkg/?sort=time&order=desc&layout=grid)
+
+请从 **信任** 的来源下载!
+
+
+## 🔖 特点
+- `状态图表`（CPU、传感器、GPU 等）, `SSH` 终端, `SFTP`, `Docker & 进程 & Systemd` 管理...
+- 特殊支持：`生物认证`、`推送`、`桌面小部件`、`watchOS App`、`跟随系统颜色`...
+- 本地化
+  - English, 简体中文
+  - Español, Русский язык, Português, 日本語 (Generated by GPT)
+  - Deutsch [@its-tom](https://github.com/its-tom), 繁體中文 [@kalashnikov](https://github.com/kalashnikov), Indonesian [@azkadev](https://github.com/azkadev), Français [@FrancXPT](https://github.com/FrancXPT), Dutch [@QazCetelic](https://github.com/QazCetelic), Türkçe [@mikropsoft](https://github.com/mikropsoft), Українська мова [@CakesTwix](https://github.com/CakesTwix);
+  - 感谢贡献者们！
+
+
 ## 🆘 帮助
 
-- 吹水、参与开发、了解如何使用，QQ群 **762870488**
-- 为了可以在不使用 ServerBox app 时获取服务器状态（例如：桌面小部件、推送服务），你需要在你的服务器上安装 [ServerBoxMonitor](https://github.com/lollipopkit/server_box_monitor)，并且正确配置，详情可见 [wiki](https://github.com/lollipopkit/server_box_monitor/wiki/%E4%B8%BB%E9%A1%B5)。
-- **常见问题**可以在 [app wiki](https://github.com/lollipopkit/flutter_server_box/wiki/主页) 查看。
+<div align="center">
+  <a href="https://t.me/lpktg"><img alt="donate" src="https://img.shields.io/badge/Telegram-lpktg-green"></a>
+  <a href="https://discord.gg/SsVNbRhK7w"><img alt="discord" src="https://img.shields.io/badge/Discord-lpkt-purple"></a>
+</div>
+
+- 为了可以在不使用 ServerBox app 时获取服务器状态（例如：桌面小部件、推送服务），你需要在你的服务器上安装 [ServerBoxMonitor](https://github.com/lollipopkit/server_box_monitor)，详情见 [wiki](https://github.com/lollipopkit/server_box_monitor/wiki/%E4%B8%BB%E9%A1%B5)。  
+- **常见问题** 可以在 [app wiki](https://github.com/lollipopkit/flutter_server_box/wiki/主页) 查看。
 
 反馈前须知：
 1. 反馈问题请附带 log（点击首页右上角），并以 bug 模版提交。
 2. 反馈问题前请检查是否是 serverbox 的问题。
 3. 欢迎所有有效、正面的反馈，主观（比如你觉得其他UI更好看）的反馈不一定会接受
 
-确认了解上述内容后，请在 [问题](https://github.com/lollipopkit/flutter_server_box/issues/new) 中反馈。
-
 
 ## 🧱 贡献
 任何正面的贡献都欢迎。
@@ -74,7 +73,7 @@ Linux / Windows | [GitHub](https://github.com/lollipopkit/flutter_server_box/rel
 3. 运行 `dart run fl_build -p PLATFORM` 构建应用
 
 ### 翻译
-[指南](https://blog.lolli.tech/faq/) 可在我的博客中找到。
+[指南](https://blog.lpkt.cn/faq/) 可在我的博客中找到。
 
 ## 💡 我的其它 Apps
 - [GPT Box](https://github.com/lollipopkit/flutter_gpt_box) - 支持 OpenAI API 的 第三方全平台客户端。

analysis_options.yaml

@@ -11,11 +11,13 @@ include: package:flutter_lints/flutter.yaml
 
 analyzer:
   exclude:
-    - '**/*.g.dart'
+    - "**/*.g.dart"
   language:
     # strict-casts: true
     # strict-inference: true
     # strict-raw-types: true
+  errors:
+    invalid_annotation_target: ignore
 
 linter:
   # The lint rules applied to this project can be customized in the
@@ -30,14 +32,20 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    library_private_types_in_public_api: false
+    library_private_types_in_public_api: true
     use_build_context_synchronously: false
     depend_on_referenced_packages: false
     prefer_final_locals: true
     unnecessary_parenthesis: true
     implicit_call_tearoffs: true
+    always_declare_return_types: true
+    always_use_package_imports: true
+    annotate_overrides: true
+    avoid_empty_else: true
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+    prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
+    avoid_return_types_on_setters: true
+    directives_ordering: true # Enable sorting of imports
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

android/app/build.gradle

@@ -53,7 +53,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "tech.lolli.toolbox"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
@@ -86,11 +85,11 @@ android {
         }
 
         debug {
-            applicationIdSuffix '.debug'
+            // No applicationIdSuffix or resValue here
         }
 
         profile {
-            applicationIdSuffix '.debug'
+            // No applicationIdSuffix or resValue here
         }
     }
 }

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -10,18 +11,19 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
-        android:label="ServerBox"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="true"
         android:hasFragileUserData="true"
-        android:restoreAnyVersion="true">
+        android:restoreAnyVersion="true"
+        tools:targetApi="q">
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|layoutDirection|fontScale|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
@@ -29,12 +31,12 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+            />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -43,11 +45,6 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
-        <service
-            android:name="id.flutter.flutter_background_service.BackgroundService"
-            android:foregroundServiceType="dataSync"
-        />
-        
         <receiver
             android:name=".widget.HomeWidget"
             android:exported="false"
@@ -67,7 +64,12 @@
                 android:resource="@xml/home_widget" />
         </receiver>
 
-        <service android:name=".KeepAliveService"/>
+        <service
+            android:name=".ForegroundService"
+            android:enabled="true"
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
+
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility?hl=en and
@@ -76,8 +78,8 @@
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
         <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
+            <action android:name="android.intent.action.PROCESS_TEXT" />
+            <data android:mimeType="text/plain" />
         </intent>
     </queries>
-</manifest>
+</manifest>

android/app/src/main/kotlin/tech/lolli/toolbox/ForegroundService.kt

@@ -0,0 +1,161 @@
+package tech.lolli.toolbox
+
+import android.app.*
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+import java.io.File
+import java.util.*
+
+class ForegroundService : Service() {
+    private val chanId = "ForegroundServiceChannel"
+
+    private fun logError(message: String, error: Throwable? = null) {
+        Log.e("ForegroundService", message, error)
+        try {
+            val logFile = File(getExternalFilesDir(null), "server_box.log")
+            val timestamp = java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date())
+            val logMessage = "$timestamp [ForegroundService] ERROR: $message\n${error?.stackTraceToString() ?: ""}\n"
+            logFile.appendText(logMessage)
+        } catch (e: Exception) {
+            Log.e("ForegroundService", "Failed to write log", e)
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        Log.d("ForegroundService", "Service onCreate")
+        createNotificationChannel()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+                androidx.core.content.ContextCompat.checkSelfPermission(
+                    this, android.Manifest.permission.POST_NOTIFICATIONS
+                ) != android.content.pm.PackageManager.PERMISSION_GRANTED
+            ) {
+                Log.w("ForegroundService", "Notification permission denied. Stopping service.")
+                stopForegroundService()
+                return START_NOT_STICKY
+            }
+
+            if (intent == null) {
+                Log.w("ForegroundService", "onStartCommand called with null intent")
+                stopForegroundService()
+                return START_NOT_STICKY
+            }
+
+            val action = intent.action
+            Log.d("ForegroundService", "onStartCommand action=$action")
+
+            // Create notification before starting foreground
+            val notification = createNotification()
+            
+            // Use try-catch for startForeground
+            try {
+                startForeground(1, notification)
+            } catch (e: Exception) {
+                logError("Failed to start foreground", e)
+                stopSelf()
+                return START_NOT_STICKY
+            }
+
+            return when (action) {
+                "ACTION_STOP_FOREGROUND" -> {
+                    stopForegroundService()
+                    START_NOT_STICKY
+                }
+                else -> {
+                    START_STICKY
+                }
+            }
+            
+        } catch (e: Exception) {
+            logError("Error in onStartCommand", e)
+            stopSelf()
+            return START_NOT_STICKY
+        }
+    }
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val manager = getSystemService(NotificationManager::class.java)
+            if (manager == null) {
+                Log.e("ForegroundService", "Failed to get NotificationManager")
+                return
+            }
+            val serviceChannel = NotificationChannel(
+                chanId,
+                "ForegroundServiceChannel",
+                NotificationManager.IMPORTANCE_DEFAULT
+            ).apply {
+                description = "For foreground service"
+            }
+            manager.createNotificationChannel(serviceChannel)
+        }
+    }
+
+    private fun createNotification(): Notification {
+        try {
+            val notificationIntent = Intent(this, MainActivity::class.java)
+            val pendingIntent = PendingIntent.getActivity(
+                this,
+                0,
+                notificationIntent,
+                PendingIntent.FLAG_IMMUTABLE
+            )
+
+            val deleteIntent = Intent(this, ForegroundService::class.java).apply {
+                action = "ACTION_STOP_FOREGROUND"
+            }
+            val deletePendingIntent = PendingIntent.getService(
+                this,
+                0,
+                deleteIntent,
+                PendingIntent.FLAG_IMMUTABLE
+            )
+
+            val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                Notification.Builder(this, chanId)
+            } else {
+                Notification.Builder(this)
+            }
+
+            return builder
+                .setContentTitle("Server Box")
+                .setContentText("Running in background")
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .setContentIntent(pendingIntent)
+                .addAction(android.R.drawable.ic_delete, "Stop", deletePendingIntent)
+                .build()
+        } catch (e: Exception) {
+            logError("Error creating notification", e)
+            // Return a basic notification as fallback
+            return Notification.Builder(this)
+                .setContentTitle("Server Box")
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .build()
+        }
+    }
+
+    private fun stopForegroundService() {
+        try {
+            stopForeground(true)
+        } catch (e: Exception) {
+            logError("Error stopping foreground", e)
+        }
+        stopSelf()
+        Log.d("ForegroundService", "ForegroundService stopped")
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        Log.d("ForegroundService", "Service onDestroy")
+    }
+}

android/app/src/main/kotlin/tech/lolli/toolbox/KeepAliveService.kt

@@ -1,18 +0,0 @@
-package tech.lolli.toolbox
-
-import android.app.Service
-import android.content.Intent
-
-import android.os.IBinder
-import org.jetbrains.annotations.Nullable
-
-class KeepAliveService : Service() {
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        return START_STICKY
-    }
-
-    @Nullable
-    override fun onBind(intent: Intent?): IBinder? {
-        return null
-    }
-}

android/app/src/main/kotlin/tech/lolli/toolbox/MainActivity.kt

@@ -1,16 +1,23 @@
 package tech.lolli.toolbox
 
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.Manifest
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
+import android.appwidget.AppWidgetManager
+import tech.lolli.toolbox.widget.HomeWidget
 
 class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         val binaryMessenger = flutterEngine.dartExecutor.binaryMessenger
 
-        MethodChannel(binaryMessenger, "tech.lolli.toolbox/app_retain").apply {
+        MethodChannel(binaryMessenger, "tech.lolli.toolbox/main_chan").apply {
             setMethodCallHandler { method, result ->
                 when (method.method) {
                     "sendToBackground" -> {
@@ -18,8 +25,31 @@ class MainActivity: FlutterFragmentActivity() {
                         result.success(null)
                     }
                     "startService" -> {
-                        val intent = Intent(this@MainActivity, KeepAliveService::class.java)
-                        startService(intent)
+                        try {
+                            reqPerm()
+                            val serviceIntent = Intent(this@MainActivity, ForegroundService::class.java)
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                startForegroundService(serviceIntent)
+                            } else {
+                                startService(serviceIntent)
+                            }
+                            result.success(null)
+                        } catch (e: Exception) {
+                            // Log error but don't crash
+                            android.util.Log.e("MainActivity", "Failed to start service: ${e.message}")
+                            result.error("SERVICE_ERROR", e.message, null)
+                        }
+                    }
+                    "stopService" -> {
+                        val serviceIntent = Intent(this@MainActivity, ForegroundService::class.java)
+                        stopService(serviceIntent)
+                        result.success(null)
+                    }
+                    "updateHomeWidget" -> {
+                        val intent = Intent(this@MainActivity, HomeWidget::class.java)
+                        intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+                        sendBroadcast(intent)
+                        result.success(null)
                     }
                     else -> {
                         result.notImplemented()
@@ -28,4 +58,24 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
     }
+
+    private fun reqPerm() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
+        
+        // Check if we already have the permission to avoid unnecessary prompts
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED) {
+            try {
+                ActivityCompat.requestPermissions(
+                    this,
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    123,
+                )
+            } catch (e: Exception) {
+                // Log error but don't crash
+                android.util.Log.e("MainActivity", "Failed to request permissions: ${e.message}")
+            }
+        }
+    }
 }
+

android/app/src/main/kotlin/tech/lolli/toolbox/widget/HomeWidget.kt

@@ -6,15 +6,18 @@ import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
 import android.os.Build
+import android.util.Log
 import android.view.View
 import android.widget.RemoteViews
-import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import tech.lolli.toolbox.R
 import java.net.URL
+import java.net.HttpURLConnection
+import java.io.FileNotFoundException
 
 class HomeWidget : AppWidgetProvider() {
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
@@ -23,7 +26,6 @@ class HomeWidget : AppWidgetProvider() {
         }
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
     private fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int) {
         val views = RemoteViews(context.packageName, R.layout.home_widget)
         val sp = context.getSharedPreferences("FlutterSharedPreferences", Context.MODE_PRIVATE)
@@ -36,6 +38,10 @@ class HomeWidget : AppWidgetProvider() {
             url = gUrl
         }
 
+        if (url.isNullOrEmpty()) {
+            Log.e("HomeWidget", "URL not found")
+        }
+
         val intentUpdate = Intent(context, HomeWidget::class.java)
         intentUpdate.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
         val ids = intArrayOf(appWidgetId)
@@ -54,11 +60,13 @@ class HomeWidget : AppWidgetProvider() {
         views.setOnClickPendingIntent(R.id.widget_container, pendingUpdate)
 
         if (url.isNullOrEmpty()) {
-            views.setViewVisibility(R.id.widget_cpu_label, View.INVISIBLE)
-            views.setViewVisibility(R.id.widget_mem_label, View.INVISIBLE)
-            views.setViewVisibility(R.id.widget_disk_label, View.INVISIBLE)
-            views.setViewVisibility(R.id.widget_net_label, View.INVISIBLE)
-            views.setTextViewText(R.id.widget_name, "ID: $appWidgetId")
+            views.setTextViewText(R.id.widget_name, "No URL")
+            // Update the widget to display a message for missing URL
+            views.setViewVisibility(R.id.error_message, View.VISIBLE)
+            views.setTextViewText(R.id.error_message, "Please configure the widget URL.")
+            views.setViewVisibility(R.id.widget_content, View.GONE)
+            views.setFloat(R.id.widget_name, "setAlpha", 1f)
+            views.setFloat(R.id.error_message, "setAlpha", 1f)
             appWidgetManager.updateAppWidget(appWidgetId, views)
             return
         } else {
@@ -68,44 +76,53 @@ class HomeWidget : AppWidgetProvider() {
             views.setViewVisibility(R.id.widget_net_label, View.VISIBLE)
         }
 
-        GlobalScope.launch(Dispatchers.IO) {
+        CoroutineScope(Dispatchers.IO).launch {
             try {
-                val jsonStr = URL(url).readText()
-                val jsonObject = JSONObject(jsonStr)
-                val data = jsonObject.getJSONObject("data")
-                val server = data.getString("name")
-                val cpu = data.getString("cpu")
-                val mem = data.getString("mem")
-                val disk = data.getString("disk")
-                val net = data.getString("net")
-
-                GlobalScope.launch(Dispatchers.Main) main@ {
-                    // mem or disk is empty -> get status failed
-                    // (cpu | net) isEmpty -> data is not ready
-                    if (mem.isEmpty() || disk.isEmpty()) {
-                        return@main
+                val connection = URL(url).openConnection() as HttpURLConnection
+                connection.requestMethod = "GET"
+                val responseCode = connection.responseCode
+                if (responseCode == HttpURLConnection.HTTP_OK) {
+                    val jsonStr = connection.inputStream.bufferedReader().use { it.readText() }
+                    val jsonObject = JSONObject(jsonStr)
+                    val data = jsonObject.getJSONObject("data")
+                    val server = data.getString("name")
+                    val cpu = data.getString("cpu")
+                    val mem = data.getString("mem")
+                    val disk = data.getString("disk")
+                    val net = data.getString("net")
+                    withContext(Dispatchers.Main) {
+                        if (mem.isEmpty() || disk.isEmpty()) {
+                            Log.e("HomeWidget", "Failed to retrieve status: Memory or disk information is empty")
+                            return@withContext
+                        }
+                        views.setTextViewText(R.id.widget_name, server)
+                        views.setTextViewText(R.id.widget_cpu, cpu)
+                        views.setTextViewText(R.id.widget_mem, mem)
+                        views.setTextViewText(R.id.widget_disk, disk)
+                        views.setTextViewText(R.id.widget_net, net)
+                        val timeStr = android.text.format.DateFormat.format("HH:mm", java.util.Date()).toString()
+                        views.setTextViewText(R.id.widget_time, timeStr)
+                        views.setFloat(R.id.widget_name, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_cpu_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_mem_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_disk_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_net_label, "setAlpha", 1f)
+                        views.setFloat(R.id.widget_time, "setAlpha", 1f)
+                        appWidgetManager.updateAppWidget(appWidgetId, views)
                     }
-                    views.setTextViewText(R.id.widget_name, server)
-
-                    views.setTextViewText(R.id.widget_cpu, cpu)
-                    views.setTextViewText(R.id.widget_mem, mem)
-                    views.setTextViewText(R.id.widget_disk, disk)
-                    views.setTextViewText(R.id.widget_net, net)
-
-                    val timeStr = android.text.format.DateFormat.format("HH:mm", java.util.Date()).toString()
-                    views.setTextViewText(R.id.widget_time, timeStr)
-
-                    appWidgetManager.updateAppWidget(appWidgetId, views)
+                } else {
+                    throw FileNotFoundException("HTTP response code: $responseCode")
                 }
             } catch (e: Exception) {
-                println("ServerBoxHomeWidget: ${e.localizedMessage}")
-                GlobalScope.launch(Dispatchers.Main) main@ {
-                    views.setViewVisibility(R.id.widget_cpu_label, View.INVISIBLE)
-                    views.setViewVisibility(R.id.widget_mem_label, View.INVISIBLE)
-                    views.setViewVisibility(R.id.widget_disk_label, View.INVISIBLE)
-                    views.setViewVisibility(R.id.widget_net_label, View.INVISIBLE)
-                    views.setTextViewText(R.id.widget_name, "ID: $appWidgetId")
-                    views.setTextViewText(R.id.widget_mem, e.localizedMessage)
+                Log.e("HomeWidget", "Error updating widget: ${e.localizedMessage}", e)
+                withContext(Dispatchers.Main) {
+                    views.setTextViewText(R.id.widget_name, "Error")
+                    // Update the widget to display a message for data retrieval failure
+                    views.setViewVisibility(R.id.error_message, View.VISIBLE)
+                    views.setTextViewText(R.id.error_message, "Failed to retrieve data.")
+                    views.setViewVisibility(R.id.widget_content, View.GONE)
+                    views.setFloat(R.id.widget_name, "setAlpha", 1f)
+                    views.setFloat(R.id.error_message, "setAlpha", 1f)
                     appWidgetManager.updateAppWidget(appWidgetId, views)
                 }
             }

android/app/src/main/res/layout/home_widget.xml

@@ -16,124 +16,151 @@
         android:textSize="23sp"
         android:textStyle="bold"
         android:maxLines="1"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
         tools:text="Server Name" />
 
-    <RelativeLayout
-        android:id="@+id/widget_container_inner"
+    <!-- Wrap the content in a LinearLayout for easy visibility management -->
+    <LinearLayout
+        android:id="@+id/widget_content"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_below="@id/widget_name"
         android:paddingTop="13dp">
 
-        <LinearLayout
-            android:id="@+id/widget_cpu_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="2.7dp"
+        <RelativeLayout
+            android:id="@+id/widget_container_inner"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:paddingTop="13dp"
+            android:animateLayoutChanges="true">
 
-            <ImageView
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:src="@drawable/speed_24">
-            </ImageView>
-
-            <TextView
-                android:id="@+id/widget_cpu"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:id="@+id/widget_cpu_label"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="11dp"
-                android:singleLine="true"
-                android:ellipsize = "marquee"
-                android:textColor="@color/widgetSummaryText"
-                android:textSize="12.7sp"
-                tools:text="CPU" />
+                android:paddingBottom="2.7dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
+                    android:src="@drawable/speed_24">
+                </ImageView>
+
+                <TextView
+                    android:id="@+id/widget_cpu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:singleLine="true"
+                    android:ellipsize = "marquee"
+                    android:textColor="@color/widgetSummaryText"
+                    android:textSize="12.7sp"
+                    tools:text="CPU" />
 
 
-        </LinearLayout>
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/widget_mem_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="2.7dp"
-            android:layout_below="@id/widget_cpu_label"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:src="@drawable/memory_24">
-            </ImageView>
-
-            <TextView
-                android:id="@+id/widget_mem"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:id="@+id/widget_mem_label"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="11dp"
-                android:maxLines="1"
-                android:textColor="@color/widgetSummaryText"
-                android:textSize="12.7sp"
-                tools:text="Mem" />
+                android:paddingBottom="2.7dp"
+                android:layout_below="@id/widget_cpu_label"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        </LinearLayout>
+                <ImageView
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
+                    android:src="@drawable/memory_24">
+                </ImageView>
 
-        <LinearLayout
-            android:id="@+id/widget_disk_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="2.7dp"
-            android:layout_below="@id/widget_mem_label"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/widget_mem"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:maxLines="1"
+                    android:textColor="@color/widgetSummaryText"
+                    android:textSize="12.7sp"
+                    tools:text="Mem" />
 
-            <ImageView
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:src="@drawable/storage_24">
-            </ImageView>
+            </LinearLayout>
 
-            <TextView
-                android:id="@+id/widget_disk"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:id="@+id/widget_disk_label"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="11dp"
-                android:maxLines="1"
-                android:textColor="@color/widgetSummaryText"
-                android:textSize="12.7sp"
-                tools:text="Disk" />
+                android:paddingBottom="2.7dp"
+                android:layout_below="@id/widget_mem_label"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        </LinearLayout>
+                <ImageView
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
+                    android:src="@drawable/storage_24">
+                </ImageView>
 
-        <LinearLayout
-            android:id="@+id/widget_net_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/widget_disk_label"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/widget_disk"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:maxLines="1"
+                    android:textColor="@color/widgetSummaryText"
+                    android:textSize="12.7sp"
+                    tools:text="Disk" />
 
-            <ImageView
-                android:layout_width="17dp"
-                android:layout_height="17dp"
-                android:src="@drawable/net_24">
-            </ImageView>
+            </LinearLayout>
 
-            <TextView
-                android:id="@+id/widget_net"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:id="@+id/widget_net_label"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="11dp"
-                android:maxLines="1"
-                android:textColor="@color/widgetSummaryText"
-                android:textSize="12.7sp"
-                tools:text="Net" />
+                android:layout_below="@id/widget_disk_label"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        </LinearLayout>
+                <ImageView
+                    android:layout_width="17dp"
+                    android:layout_height="17dp"
+                    android:src="@drawable/net_24">
+                </ImageView>
 
-    </RelativeLayout>
+                <TextView
+                    android:id="@+id/widget_net"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="11dp"
+                    android:maxLines="1"
+                    android:textColor="@color/widgetSummaryText"
+                    android:textSize="12.7sp"
+                    tools:text="Net" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!-- Add a TextView for error messages -->
+    <TextView
+        android:id="@+id/error_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/widget_name"
+        android:textColor="@color/widgetSummaryText"
+        android:textSize="12sp"
+        android:visibility="gone"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
+        tools:text="Error message" />
 
     <TextView
         android:id="@+id/widget_time"
@@ -143,6 +170,8 @@
         android:maxLines="2"
         android:textColor="@color/widgetSummaryText"
         android:textSize="11sp"
+        android:alpha="0"
+        android:animateLayoutChanges="true"
         tools:text="UpdateTime" />
 
 </RelativeLayout>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
 </adaptive-icon>

android/app/src/main/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ServerBox</string>
+</resources>

android/build.gradle

@@ -9,6 +9,23 @@ rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
+
+subprojects { subproject ->
+  // Only works on com.android.application(the main app module)
+  if (subproject.plugins.hasPlugin('com.android.application')) {
+    subproject.afterEvaluate {
+      android.buildTypes.matching { it.name == 'profile' }.all { buildType ->
+        buildType.applicationIdSuffix = ".profile"
+        buildTypes.profile.resValue 'string', 'app_name', 'SrvBxP'
+      }
+      android.buildTypes.matching { it.name == 'debug' }.all { buildType ->
+        buildType.applicationIdSuffix = ".debug"
+        buildTypes.debug.resValue 'string', 'app_name', 'SrvBxD'
+      }
+    }
+  }
+}
+
 subprojects {
     project.evaluationDependsOn(':app')
 }

android/gradle.properties

@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,5 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
-distributionSha256Sum=6001aba9b2204d26fa25a5800bb9382cf3ee01ccb78fe77317b2872336eb2f80
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

android/settings.gradle

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.10" apply false
+    id "com.android.application" version '8.6.0' apply false
+    id "org.jetbrains.kotlin.android" version "2.1.21" apply false
 }
 
 include ":app"

distribute_options.yaml

@@ -0,0 +1,13 @@
+variables:
+output: dist/
+releases:
+  - name: linux
+    jobs:
+      - name: release-linux-deb
+        package:
+          platform: linux
+          target: deb
+      - name: release-linux-rpm
+        package:
+          platform: linux
+          target: rpm

ios/Podfile.lock

@@ -1,24 +1,23 @@
 PODS:
-  - device_info_plus (0.0.1):
+  - app_links (0.0.2):
+    - Flutter
+  - camera_avfoundation (0.0.1):
     - Flutter
   - file_picker (0.0.1):
     - Flutter
   - Flutter (1.0.0)
-  - flutter_background_service_ios (0.0.3):
-    - Flutter
-  - flutter_native_splash (0.0.1):
+  - flutter_native_splash (2.4.3):
     - Flutter
   - icloud_storage (0.0.1):
     - Flutter
   - local_auth_darwin (0.0.1):
     - Flutter
+    - FlutterMacOS
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.3.0):
-    - Flutter
   - plain_notification_token (0.0.1):
     - Flutter
   - share_plus (0.0.1):
@@ -34,16 +33,15 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
-  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - app_links (from `.symlinks/plugins/app_links/ios`)
+  - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
-  - flutter_background_service_ios (from `.symlinks/plugins/flutter_background_service_ios/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - icloud_storage (from `.symlinks/plugins/icloud_storage/ios`)
   - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
-  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - plain_notification_token (from `.symlinks/plugins/plain_notification_token/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -52,14 +50,14 @@ DEPENDENCIES:
   - watch_connectivity (from `.symlinks/plugins/watch_connectivity/ios`)
 
 EXTERNAL SOURCES:
-  device_info_plus:
-    :path: ".symlinks/plugins/device_info_plus/ios"
+  app_links:
+    :path: ".symlinks/plugins/app_links/ios"
+  camera_avfoundation:
+    :path: ".symlinks/plugins/camera_avfoundation/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
     :path: Flutter
-  flutter_background_service_ios:
-    :path: ".symlinks/plugins/flutter_background_service_ios/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   icloud_storage:
@@ -70,8 +68,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
-  permission_handler_apple:
-    :path: ".symlinks/plugins/permission_handler_apple/ios"
   plain_notification_token:
     :path: ".symlinks/plugins/plain_notification_token/ios"
   share_plus:
@@ -86,23 +82,22 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/watch_connectivity/ios"
 
 SPEC CHECKSUMS:
-  device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
-  file_picker: c79185e70b9b45728cde2a8d8da454e0cb43f287
+  app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7
+  camera_avfoundation: be3be85408cd4126f250386828e9b1dfa40ab436
+  file_picker: fb04e739ae6239a76ce1f571863a196a922c87d4
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac
-  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
-  icloud_storage: d9ac7a33ced81df08ba7ea1bf3099cc0ee58f60a
-  local_auth_darwin: 4d56c90c2683319835a61274b57620df9c4520ab
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  plain_notification_token: b36467dc91939a7b6754267c701bbaca14996ee1
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
-  watch_connectivity: 715eb484685e05846eab74795348a44bb2809b82
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  icloud_storage: e55639f0c0d7cb2b0ba9c0b3d5968ccca9cd9aa2
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  plain_notification_token: 047876b9d80a5b93565ddcc13a487a7e7b906f7d
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
+  watch_connectivity: 88e5bea25b473e66ef8d3f960954d154ed0356d6
 
 PODFILE CHECKSUM: ec6ef69056f066e8b21a3391082f23b5ad2d37f8
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -302,7 +302,6 @@
 				E33A3E4A2A626DD0009744AB /* Embed Foundation Extensions */,
 				E39515D52AB5AD64003602C1 /* Embed Watch Content */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				955896919A10AA2BEC131F36 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -452,23 +451,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		955896919A10AA2BEC131F36 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -690,7 +672,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -700,7 +682,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -826,7 +808,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -836,7 +818,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -854,7 +836,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -864,7 +846,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -885,7 +867,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -898,7 +880,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
@@ -924,7 +906,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -937,7 +919,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -960,7 +942,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -973,7 +955,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -996,7 +978,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1008,7 +990,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
@@ -1037,7 +1019,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1049,7 +1031,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;
@@ -1075,7 +1057,7 @@
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1051;
+				CURRENT_PROJECT_VERSION = 1184;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_PREVIEWS = YES;
@@ -1087,7 +1069,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1051;
+				MARKETING_VERSION = 1.0.1184;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
 				PRODUCT_NAME = ServerBox;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -43,11 +44,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

ios/Runner/AppDelegate.swift

@@ -2,7 +2,7 @@ import UIKit
 import WidgetKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
     override func application(
         _ application: UIApplication,

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1 +1,37 @@
-{"images":[{"scale":"3x","idiom":"universal","filename":"AppIcon-29.0x29.0@3x.png","size":"29x29","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-29.0x29.0@2x.png","size":"29x29","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-64.0x64.0@3x.png","size":"64x64","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-20.0x20.0@2x.png","size":"20x20","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-60.0x60.0@2x.png","size":"60x60","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-40.0x40.0@3x.png","size":"40x40","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-76.0x76.0@2x.png","size":"76x76","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-38.0x38.0@3x.png","size":"38x38","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-68.0x68.0@2x.png","size":"68x68","platform":"ios"},{"scale":"1x","idiom":"universal","filename":"AppIcon-1024.0x1024.0@1x.png","size":"1024x1024","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-64.0x64.0@2x.png","size":"64x64","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-40.0x40.0@2x.png","size":"40x40","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-83.5x83.5@2x.png","size":"83.5x83.5","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-20.0x20.0@3x.png","size":"20x20","platform":"ios"},{"scale":"2x","idiom":"universal","filename":"AppIcon-38.0x38.0@2x.png","size":"38x38","platform":"ios"},{"scale":"3x","idiom":"universal","filename":"AppIcon-60.0x60.0@3x.png","size":"60x60","platform":"ios"}],"info":{"version":1,"author":"appicon"}}
+{
+  "images" : [
+    {
+      "filename" : "Icon-1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icon-1024 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/Info-Debug.plist

@@ -1,76 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>en</string>
-		<string>zh</string>
-	</array>
-	<key>CFBundleName</key>
-	<string>ServerBox</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>LSSupportsOpeningDocumentsInPlace</key>
-	<true/>
-	<key>NSBonjourServices</key>
-	<array>
-		<string>_dartobservatory._tcp</string>
-	</array>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Required for auth</string>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>ServerBox needs to access your local network to discover and connect to your server.</string>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>ConfigurationIntent</string>
-	</array>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>fetch</string>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIStatusBarHidden</key>
-	<false/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
-</plist>
+	<dict>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true />
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleLocalizations</key>
+		<array>
+			<string>en</string>
+			<string>zh</string>
+		</array>
+		<key>CFBundleName</key>
+		<string>ServerBox</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(MARKETING_VERSION)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(CURRENT_PROJECT_VERSION)</string>
+		<key>ITSAppUsesNonExemptEncryption</key>
+		<false />
+		<key>LSRequiresIPhoneOS</key>
+		<true />
+		<key>LSSupportsOpeningDocumentsInPlace</key>
+		<true />
+		<key>NSBonjourServices</key>
+		<array>
+			<string>_dartobservatory._tcp</string>
+		</array>
+		<key>NSUserActivityTypes</key>
+		<array>
+			<string>ConfigurationIntent</string>
+		</array>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true />
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>fetch</string>
+		</array>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UIStatusBarHidden</key>
+		<false />
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false />
+
+		<key>NSLocalNetworkUsageDescription</key>
+		<string>Access your local network to discover and connect to your server.</string>
+		<key>NSFaceIDUsageDescription</key>
+		<string>Required for auth</string>
+		<key>NSCameraUsageDescription</key>
+		<string>Scan QR codes and etc.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Get QR code and etc.</string>
+	</dict>
+</plist>

ios/Runner/Info-Profile.plist

@@ -64,9 +64,14 @@
 		<array>
 			<string>_dartobservatory._tcp</string>
 		</array>
+
 		<key>NSLocalNetworkUsageDescription</key>
-		<string>ServerBox needs to access your local network to discover and connect to your server.</string>
+		<string>Access your local network to discover and connect to your server.</string>
 		<key>NSFaceIDUsageDescription</key>
 		<string>Required for auth</string>
+		<key>NSCameraUsageDescription</key>
+		<string>Scan QR codes and etc.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Get QR code and etc.</string>
 	</dict>
 </plist>

ios/Runner/Info-Release.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 	<dict>
 		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true/>
+		<true />
 		<key>CFBundleDevelopmentRegion</key>
 		<string>$(DEVELOPMENT_LANGUAGE)</string>
 		<key>CFBundleExecutable</key>
@@ -28,13 +28,13 @@
 		<key>CFBundleVersion</key>
 		<string>$(CURRENT_PROJECT_VERSION)</string>
 		<key>ITSAppUsesNonExemptEncryption</key>
-		<false/>
+		<false />
 		<key>LSRequiresIPhoneOS</key>
-		<true/>
+		<true />
 		<key>LSSupportsOpeningDocumentsInPlace</key>
-		<true/>
+		<true />
 		<key>UIApplicationSupportsIndirectInputEvents</key>
-		<true/>
+		<true />
 		<key>UIBackgroundModes</key>
 		<array>
 			<string>fetch</string>
@@ -44,7 +44,7 @@
 		<key>UIMainStoryboardFile</key>
 		<string>Main</string>
 		<key>UIStatusBarHidden</key>
-		<false/>
+		<false />
 		<key>UISupportedInterfaceOrientations</key>
 		<array>
 			<string>UIInterfaceOrientationPortrait</string>
@@ -59,8 +59,13 @@
 			<string>UIInterfaceOrientationLandscapeRight</string>
 		</array>
 		<key>UIViewControllerBasedStatusBarAppearance</key>
-		<false/>
+		<false />
+
 		<key>NSFaceIDUsageDescription</key>
 		<string>Required for auth</string>
+		<key>NSCameraUsageDescription</key>
+		<string>Scan QR codes and etc.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Get QR code and etc.</string>
 	</dict>
-</plist>
+</plist>

l10n.yaml

@@ -1,4 +1,6 @@
 arb-dir: lib/l10n
 template-arb-file: app_en.arb
 output-localization-file: l10n.dart
+output-dir: lib/generated/l10n
+synthetic-package: false
 untranslated-messages-file: untranlated.json

lib/app.dart

@@ -1,14 +1,14 @@
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fl_lib/fl_lib.dart';
-import 'package:fl_lib/l10n/gen_l10n/lib_l10n.dart';
+import 'package:fl_lib/generated/l10n/lib_l10n.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:icons_plus/icons_plus.dart';
+import 'package:responsive_framework/responsive_framework.dart';
 import 'package:server_box/core/extension/context/locale.dart';
 import 'package:server_box/data/res/build_data.dart';
-import 'package:server_box/data/res/rebuild.dart';
 import 'package:server_box/data/res/store.dart';
-import 'package:server_box/view/page/home/home.dart';
-import 'package:icons_plus/icons_plus.dart';
+import 'package:server_box/generated/l10n/l10n.dart';
+import 'package:server_box/view/page/home.dart';
 
 part 'intro.dart';
 
@@ -22,48 +22,67 @@ class MyApp extends StatelessWidget {
       listenable: RNodes.app,
       builder: (context, _) {
         if (!Stores.setting.useSystemPrimaryColor.fetch()) {
-          final colorSeed = Color(Stores.setting.colorSeed.fetch());
-          UIs.colorSeed = colorSeed;
-          // Past code uses [UIs.primaryColor] as the primary color
-          UIs.primaryColor = colorSeed;
-          return _buildApp(
-            context,
-            light: ThemeData(
-              useMaterial3: true,
-              colorSchemeSeed: UIs.colorSeed,
-            ),
-            dark: ThemeData(
-              useMaterial3: true,
-              brightness: Brightness.dark,
-              colorSchemeSeed: UIs.colorSeed,
-            ),
-          );
+          return _build(context);
         }
-        return DynamicColorBuilder(
-          builder: (light, dark) {
-            final lightTheme = ThemeData(
-              useMaterial3: true,
-              colorScheme: light,
-            );
-            final darkTheme = ThemeData(
-              useMaterial3: true,
-              brightness: Brightness.dark,
-              colorScheme: dark,
-            );
-            if (context.isDark && dark != null) {
-              UIs.primaryColor = dark.primary;
-            } else if (!context.isDark && light != null) {
-              UIs.primaryColor = light.primary;
-            }
-            return _buildApp(context, light: lightTheme, dark: darkTheme);
-          },
-        );
+
+        return _buildDynamicColor(context);
       },
     );
   }
 
-  Widget _buildApp(BuildContext ctx,
-      {required ThemeData light, required ThemeData dark}) {
+  Widget _build(BuildContext context) {
+    final colorSeed = Color(Stores.setting.colorSeed.fetch());
+    UIs.colorSeed = colorSeed;
+    UIs.primaryColor = colorSeed;
+
+    return _buildApp(
+      context,
+      light: ThemeData(
+        useMaterial3: true,
+        colorSchemeSeed: UIs.colorSeed,
+        appBarTheme: AppBarTheme(
+          scrolledUnderElevation: 0.0,
+        ),
+      ),
+      dark: ThemeData(
+        useMaterial3: true,
+        brightness: Brightness.dark,
+        colorSchemeSeed: UIs.colorSeed,
+        appBarTheme: AppBarTheme(
+          scrolledUnderElevation: 0.0,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildDynamicColor(BuildContext context) {
+    return DynamicColorBuilder(
+      builder: (light, dark) {
+        final lightTheme = ThemeData(
+          useMaterial3: true,
+          colorScheme: light,
+        );
+        final darkTheme = ThemeData(
+          useMaterial3: true,
+          brightness: Brightness.dark,
+          colorScheme: dark,
+        );
+        if (context.isDark && dark != null) {
+          UIs.primaryColor = dark.primary;
+        } else if (!context.isDark && light != null) {
+          UIs.primaryColor = light.primary;
+        }
+
+        return _buildApp(context, light: lightTheme, dark: darkTheme);
+      },
+    );
+  }
+
+  Widget _buildApp(
+    BuildContext ctx, {
+    required ThemeData light,
+    required ThemeData dark,
+  }) {
     final tMode = Stores.setting.themeMode.fetch();
     // Issue #57
     final themeMode = switch (tMode) {
@@ -74,6 +93,15 @@ class MyApp extends StatelessWidget {
     final locale = Stores.setting.locale.fetch().toLocale;
 
     return MaterialApp(
+      key: ValueKey(locale),
+      builder: (context, child) => ResponsiveBreakpoints.builder(
+        child: child ?? UIs.placeholder,
+        breakpoints: const [
+          Breakpoint(start: 0, end: 450, name: MOBILE),
+          Breakpoint(start: 451, end: 800, name: TABLET),
+          Breakpoint(start: 801, end: 1920, name: DESKTOP),
+        ],
+      ),
       locale: locale,
       localizationsDelegates: const [
         LibLocalizations.delegate,
@@ -92,12 +120,18 @@ class MyApp extends StatelessWidget {
           final appL10n = AppLocalizations.of(context);
           if (appL10n != null) l10n = appL10n;
 
+          Widget child;
           final intros = _IntroPage.builders;
           if (intros.isNotEmpty) {
-            return _IntroPage(intros);
+            child = _IntroPage(intros);
           }
 
-          return const HomePage();
+          child = const HomePage();
+
+          return VirtualWindowFrame(
+            title: BuildData.name,
+            child: child,
+          );
         },
       ),
     );

lib/core/chan.dart

@@ -0,0 +1,30 @@
+import 'package:fl_lib/fl_lib.dart';
+import 'package:flutter/services.dart';
+import 'package:server_box/data/res/misc.dart';
+import 'package:server_box/data/res/store.dart';
+
+abstract final class MethodChans {
+  static const _channel = MethodChannel('${Miscs.pkgName}/main_chan');
+
+  static void moveToBg() {
+    _channel.invokeMethod('sendToBackground');
+  }
+
+  /// Issue #662
+  static void startService() {
+    // if (Stores.setting.fgService.fetch() != true) return;
+    // _channel.invokeMethod('startService');
+  }
+
+  /// Issue #662
+  static void stopService() {
+    // if (Stores.setting.fgService.fetch() != true) return;
+    // _channel.invokeMethod('stopService');
+  }
+
+  static void updateHomeWidget() async {
+    if (!isIOS || !isAndroid) return;
+    if (!Stores.setting.autoUpdateHomeWidget.fetch()) return;
+    await _channel.invokeMethod('updateHomeWidget');
+  }
+}

lib/core/channel/bg_run.dart

@@ -1,14 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:server_box/data/res/misc.dart';
-
-abstract final class BgRunMC {
-  static const _channel = MethodChannel('${Miscs.pkgName}/app_retain');
-
-  static void moveToBg() {
-    _channel.invokeMethod('sendToBackground');
-  }
-
-  static void startService() {
-    _channel.invokeMethod('startService');
-  }
-}

lib/core/channel/home_widget.dart

@@ -1,12 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:server_box/data/res/misc.dart';
-import 'package:server_box/data/res/store.dart';
-
-abstract final class HomeWidgetMC {
-  static const _channel = MethodChannel('${Miscs.pkgName}/home_widget');
-
-  static void update() {
-    if (!Stores.setting.autoUpdateHomeWidget.fetch()) return;
-    _channel.invokeMethod('update');
-  }
-}

lib/core/extension/build.dart

@@ -1,5 +0,0 @@
-import 'package:server_box/data/res/build_data.dart';
-
-extension BuildDataX on BuildData {
-  static const versionStr = 'v1.0.${BuildData.build}';
-}

lib/core/extension/context/locale.dart

@@ -1,4 +1,9 @@
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:flutter_gen/gen_l10n/l10n_en.dart';
+import 'package:flutter/widgets.dart';
+import 'package:server_box/generated/l10n/l10n.dart';
+import 'package:server_box/generated/l10n/l10n_en.dart';
 
 AppLocalizations l10n = AppLocalizationsEn();
+
+extension LocaleX on BuildContext {
+  AppLocalizations get l10n => AppLocalizations.of(this)!;
+}

lib/core/extension/sftpfile.dart

@@ -12,17 +12,17 @@ extension SftpFileX on SftpFileMode {
 
   UnixPerm toUnixPerm() {
     return UnixPerm(
-      user: RWX(
+      user: UnixPermOp(
         r: userRead,
         w: userWrite,
         x: userExecute,
       ),
-      group: RWX(
+      group: UnixPermOp(
         r: groupRead,
         w: groupWrite,
         x: groupExecute,
       ),
-      other: RWX(
+      other: UnixPermOp(
         r: otherRead,
         w: otherWrite,
         x: otherExecute,

lib/core/extension/ssh_client.dart

@@ -5,72 +5,74 @@ import 'package:dartssh2/dartssh2.dart';
 import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/widgets.dart';
 
-import '../../data/res/misc.dart';
+import 'package:server_box/data/res/misc.dart';
 
-typedef _OnStdout = void Function(String data, SSHSession session);
-typedef _OnStdin = void Function(SSHSession session);
+typedef OnStdout = void Function(String data, SSHSession session);
+typedef OnStdin = void Function(SSHSession session);
 
 typedef PwdRequestFunc = Future<String?> Function(String? user);
 
 extension SSHClientX on SSHClient {
-  Future<SSHSession> exec(
-    String cmd, {
-    _OnStdout? onStderr,
-    _OnStdout? onStdout,
-    _OnStdin? stdin,
-    bool redirectToBash = false, // not working yet. do not use
+  Future<(SSHSession, String)> exec(
+    OnStdin onStdin, {
+    String? entry,
+    SSHPtyConfig? pty,
+    OnStdout? onStdout,
+    OnStdout? onStderr,
+    bool stdout = true,
+    bool stderr = true,
+    Map<String, String>? env,
   }) async {
-    final session = await execute(redirectToBash ? "head -1 | bash" : cmd);
-
-    if (redirectToBash) {
-      session.stdin.add("$cmd\n".uint8List);
-    }
+    final session = await execute(
+      entry ?? 'cat | sh',
+      pty: pty,
+      environment: env,
+    );
 
+    final result = BytesBuilder(copy: false);
     final stdoutDone = Completer<void>();
     final stderrDone = Completer<void>();
 
-    if (onStdout != null) {
-      session.stdout.listen(
-        (e) => onStdout(e.string, session),
-        onDone: stdoutDone.complete,
-      );
-    } else {
-      stdoutDone.complete();
-    }
+    session.stdout.listen(
+      (e) {
+        onStdout?.call(e.string, session);
+        if (stdout) result.add(e);
+      },
+      onDone: stdoutDone.complete,
+      onError: stderrDone.completeError,
+    );
 
-    if (onStderr != null) {
-      session.stderr.listen(
-        (e) => onStderr(e.string, session),
-        onDone: stderrDone.complete,
-      );
-    } else {
-      stderrDone.complete();
-    }
+    session.stderr.listen(
+      (e) {
+        onStderr?.call(e.string, session);
+        if (stderr) result.add(e);
+      },
+      onDone: stderrDone.complete,
+      onError: stderrDone.completeError,
+    );
 
-    if (stdin != null) {
-      stdin(session);
-    }
+    onStdin(session);
 
     await stdoutDone.future;
     await stderrDone.future;
 
-    session.close();
-    return session;
+    return (session, result.takeBytes().string);
   }
 
   Future<int?> execWithPwd(
-    String cmd, {
+    String script, {
+    String? entry,
     BuildContext? context,
-    _OnStdout? onStdout,
-    _OnStdout? onStderr,
-    _OnStdin? stdin,
-    bool redirectToBash = false, // not working yet. do not use
+    OnStdout? onStdout,
+    OnStdout? onStderr,
     required String id,
   }) async {
     var isRequestingPwd = false;
-    final session = await exec(
-      cmd,
-      redirectToBash: redirectToBash,
+    final (session, _) = await exec(
+      (sess) {
+        sess.stdin.add('$script\n'.uint8List);
+        sess.stdin.close();
+      },
       onStderr: (data, session) async {
         onStderr?.call(data, session);
         if (isRequestingPwd) return;
@@ -83,56 +85,38 @@ extension SSHClientX on SSHClient {
               ? await context.showPwdDialog(title: user, id: id)
               : null;
           if (pwd == null || pwd.isEmpty) {
-            session.kill(SSHSignal.TERM);
+            session.stdin.close();
           } else {
             session.stdin.add('$pwd\n'.uint8List);
           }
           isRequestingPwd = false;
         }
       },
-      onStdout: (data, sink) async {
-        onStdout?.call(data, sink);
-      },
-      stdin: stdin,
+      onStdout: onStdout,
+      entry: entry,
     );
     return session.exitCode;
   }
 
-  Future<Uint8List> runForOutput(
-    String command, {
-    bool runInPty = false,
+  Future<String> execForOutput(
+    String script, {
+    SSHPtyConfig? pty,
     bool stdout = true,
     bool stderr = true,
-    Map<String, String>? environment,
-    Future<void> Function(SSHSession)? action,
+    String? entry,
+    Map<String, String>? env,
   }) async {
-    final session = await execute(
-      command,
-      pty: runInPty ? const SSHPtyConfig() : null,
-      environment: environment,
+    final ret = await exec(
+      (session) {
+        session.stdin.add('$script\n'.uint8List);
+        session.stdin.close();
+      },
+      pty: pty,
+      env: env,
+      stdout: stdout,
+      stderr: stderr,
+      entry: entry,
     );
-
-    final result = BytesBuilder(copy: false);
-    final stdoutDone = Completer<void>();
-    final stderrDone = Completer<void>();
-
-    session.stdout.listen(
-      stdout ? result.add : (_) {},
-      onDone: stdoutDone.complete,
-      onError: stderrDone.completeError,
-    );
-
-    session.stderr.listen(
-      stderr ? result.add : (_) {},
-      onDone: stderrDone.complete,
-      onError: stderrDone.completeError,
-    );
-
-    if (action != null) await action(session);
-
-    await stdoutDone.future;
-    await stderrDone.future;
-
-    return result.takeBytes();
+    return ret.$2;
   }
 }

lib/core/route.dart

@@ -1,246 +1,9 @@
-import 'package:fl_lib/fl_lib.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:server_box/data/model/server/private_key_info.dart';
 import 'package:server_box/data/model/server/server_private_info.dart';
-import 'package:server_box/data/res/build_data.dart';
-import 'package:server_box/data/res/store.dart';
-import 'package:server_box/view/page/backup.dart';
-import 'package:server_box/view/page/container.dart';
-import 'package:server_box/view/page/home/home.dart';
-import 'package:server_box/view/page/iperf.dart';
-import 'package:server_box/view/page/ping.dart';
-import 'package:server_box/view/page/private_key/edit.dart';
-import 'package:server_box/view/page/private_key/list.dart';
-import 'package:server_box/view/page/pve.dart';
-import 'package:server_box/view/page/server/detail/view.dart';
-import 'package:server_box/view/page/setting/platform/android.dart';
-import 'package:server_box/view/page/setting/platform/ios.dart';
-import 'package:server_box/view/page/setting/seq/srv_func_seq.dart';
-import 'package:server_box/view/page/snippet/result.dart';
-import 'package:server_box/view/page/ssh/page.dart';
-import 'package:server_box/view/page/setting/seq/virt_key.dart';
-import 'package:server_box/view/page/storage/local.dart';
 
-import '../data/model/server/snippet.dart';
-import '../view/page/editor.dart';
-import '../view/page/process.dart';
-import '../view/page/server/edit.dart';
-import '../view/page/server/tab.dart';
-import '../view/page/setting/entry.dart';
-import '../view/page/setting/seq/srv_detail_seq.dart';
-import '../view/page/setting/seq/srv_seq.dart';
-import '../view/page/snippet/edit.dart';
-import '../view/page/snippet/list.dart';
-import '../view/page/storage/sftp.dart';
-import '../view/page/storage/sftp_mission.dart';
+/// The args class for [AppRoute].
+final class SpiRequiredArgs {
+  /// The only required argument for this class.
+  final Spi spi;
 
-class AppRoutes {
-  final Widget page;
-  final String title;
-
-  AppRoutes(this.page, this.title);
-
-  Future<T?> go<T>(BuildContext context) {
-    return Navigator.push<T>(
-      context,
-      Stores.setting.cupertinoRoute.fetch()
-          ? CupertinoPageRoute(builder: (context) => page)
-          : MaterialPageRoute(builder: (context) => page),
-    );
-  }
-
-  Future<T?> checkGo<T>({
-    required BuildContext context,
-    required bool Function() check,
-  }) {
-    if (check()) {
-      return go(context);
-    }
-    return Future.value(null);
-  }
-
-  static AppRoutes serverDetail({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(ServerDetailPage(key: key, spi: spi), 'server_detail');
-  }
-
-  static AppRoutes serverTab({Key? key}) {
-    return AppRoutes(ServerPage(key: key), 'server_tab');
-  }
-
-  static AppRoutes serverEdit({Key? key, ServerPrivateInfo? spi}) {
-    return AppRoutes(
-      ServerEditPage(spi: spi),
-      'server_${spi == null ? 'add' : 'edit'}',
-    );
-  }
-
-  static AppRoutes keyEdit({Key? key, PrivateKeyInfo? pki}) {
-    return AppRoutes(
-      PrivateKeyEditPage(pki: pki),
-      'key_${pki == null ? 'add' : 'edit'}',
-    );
-  }
-
-  static AppRoutes keyList({Key? key}) {
-    return AppRoutes(PrivateKeysListPage(key: key), 'key_detail');
-  }
-
-  static AppRoutes snippetEdit({Key? key, Snippet? snippet}) {
-    return AppRoutes(
-      SnippetEditPage(snippet: snippet),
-      'snippet_${snippet == null ? 'add' : 'edit'}',
-    );
-  }
-
-  static AppRoutes snippetList({Key? key}) {
-    return AppRoutes(SnippetListPage(key: key), 'snippet_detail');
-  }
-
-  static AppRoutes ssh({
-    Key? key,
-    required ServerPrivateInfo spi,
-    String? initCmd,
-    Snippet? initSnippet,
-  }) {
-    return AppRoutes(
-      SSHPage(
-        key: key,
-        spi: spi,
-        initCmd: initCmd,
-        initSnippet: initSnippet,
-      ),
-      'ssh_term',
-    );
-  }
-
-  static AppRoutes sshVirtKeySetting({Key? key}) {
-    return AppRoutes(SSHVirtKeySettingPage(key: key), 'ssh_virt_key_setting');
-  }
-
-  static AppRoutes localStorage(
-      {Key? key, bool isPickFile = false, String? initDir}) {
-    return AppRoutes(
-        LocalStoragePage(
-          key: key,
-          isPickFile: isPickFile,
-          initDir: initDir,
-        ),
-        'local_storage');
-  }
-
-  static AppRoutes sftpMission({Key? key}) {
-    return AppRoutes(SftpMissionPage(key: key), 'sftp_mission');
-  }
-
-  static AppRoutes sftp(
-      {Key? key,
-      required ServerPrivateInfo spi,
-      String? initPath,
-      bool isSelect = false}) {
-    return AppRoutes(
-        SftpPage(
-          key: key,
-          spi: spi,
-          initPath: initPath,
-          isSelect: isSelect,
-        ),
-        'sftp');
-  }
-
-  static AppRoutes backup({Key? key}) {
-    return AppRoutes(BackupPage(key: key), 'backup');
-  }
-
-  static AppRoutes debug({Key? key}) {
-    return AppRoutes(
-      DebugPage(
-        key: key,
-        args: const DebugPageArgs(title: 'Logs(${BuildData.build})'),
-      ),
-      'debug',
-    );
-  }
-
-  static AppRoutes docker({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(ContainerPage(key: key, spi: spi), 'docker');
-  }
-
-  /// - Pop true if the text is changed & [path] is not null
-  /// - Pop text if [path] is null
-  static AppRoutes editor({
-    Key? key,
-    String? path,
-    String? text,
-    String? langCode,
-    String? title,
-  }) {
-    return AppRoutes(
-        EditorPage(
-          key: key,
-          path: path,
-          text: text,
-          langCode: langCode,
-          title: title,
-        ),
-        'editor');
-  }
-
-  // static AppRoutes fullscreen({Key? key}) {
-  //   return AppRoutes(FullScreenPage(key: key), 'fullscreen');
-  // }
-
-  static AppRoutes home({Key? key}) {
-    return AppRoutes(HomePage(key: key), 'home');
-  }
-
-  static AppRoutes ping({Key? key}) {
-    return AppRoutes(PingPage(key: key), 'ping');
-  }
-
-  static AppRoutes process({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(ProcessPage(key: key, spi: spi), 'process');
-  }
-
-  static AppRoutes settings({Key? key}) {
-    return AppRoutes(SettingPage(key: key), 'setting');
-  }
-
-  static AppRoutes serverOrder({Key? key}) {
-    return AppRoutes(ServerOrderPage(key: key), 'server_order');
-  }
-
-  static AppRoutes serverDetailOrder({Key? key}) {
-    return AppRoutes(ServerDetailOrderPage(key: key), 'server_detail_order');
-  }
-
-  static AppRoutes iosSettings({Key? key}) {
-    return AppRoutes(IOSSettingsPage(key: key), 'ios_setting');
-  }
-
-  static AppRoutes androidSettings({Key? key}) {
-    return AppRoutes(AndroidSettingsPage(key: key), 'android_setting');
-  }
-
-  static AppRoutes snippetResult(
-      {Key? key, required List<SnippetResult?> results}) {
-    return AppRoutes(
-        SnippetResultPage(
-          key: key,
-          results: results,
-        ),
-        'snippet_result');
-  }
-
-  static AppRoutes iperf({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(IPerfPage(key: key, spi: spi), 'iperf');
-  }
-
-  static AppRoutes serverFuncBtnsOrder({Key? key}) {
-    return AppRoutes(ServerFuncBtnsOrderPage(key: key), 'server_func_btns_seq');
-  }
-
-  static AppRoutes pve({Key? key, required ServerPrivateInfo spi}) {
-    return AppRoutes(PvePage(key: key, spi: spi), 'pve');
-  }
+  const SpiRequiredArgs(this.spi);
 }

lib/core/sync.dart

@@ -0,0 +1,33 @@
+import 'dart:io';
+
+import 'package:fl_lib/fl_lib.dart';
+import 'package:server_box/data/model/app/bak/backup2.dart';
+import 'package:server_box/data/model/app/bak/utils.dart';
+
+const bakSync = BakSyncer._();
+
+final icloud = ICloud(containerId: 'iCloud.tech.lolli.serverbox');
+
+final class BakSyncer extends SyncIface {
+  const BakSyncer._() : super();
+
+  @override
+  Future<void> saveToFile() => BackupV2.backup();
+
+  @override
+  Future<Mergeable> fromFile(String path) async {
+    final content = await File(path).readAsString();
+    return MergeableUtils.fromJsonString(content).$1;
+  }
+
+  @override
+  RemoteStorage? get remoteStorage {
+    final icloudEnabled = PrefProps.icloudSync.get();
+    if (icloudEnabled) return icloud;
+
+    final webdavEnabled = PrefProps.webdavSync.get();
+    if (webdavEnabled) return Webdav.shared;
+
+    return null;
+  }
+}

lib/core/utils/server.dart

@@ -1,12 +1,12 @@
 import 'dart:async';
 
 import 'package:dartssh2/dartssh2.dart';
+import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/foundation.dart';
 import 'package:server_box/data/model/app/error.dart';
+import 'package:server_box/data/model/server/server_private_info.dart';
 import 'package:server_box/data/res/store.dart';
 
-import '../../data/model/server/server_private_info.dart';
-
 /// Must put this func out of any Class.
 ///
 /// Because of this function is called by [compute].
@@ -31,7 +31,7 @@ enum GenSSHClientStatus {
 }
 
 String getPrivateKey(String id) {
-  final pki = Stores.key.get(id);
+  final pki = Stores.key.fetchOne(id);
   if (pki == null) {
     throw SSHErr(
       type: SSHErrType.noPrivateKey,
@@ -42,7 +42,7 @@ String getPrivateKey(String id) {
 }
 
 Future<SSHClient> genClient(
-  ServerPrivateInfo spi, {
+  Spi spi, {
   void Function(GenSSHClientStatus)? onStatus,
 
   /// Only pass this param if using multi-threading and key login
@@ -52,16 +52,18 @@ Future<SSHClient> genClient(
   String? jumpPrivateKey,
   Duration timeout = const Duration(seconds: 5),
 
-  /// [ServerPrivateInfo] of the jump server
+  /// [Spi] of the jump server
   ///
   /// Must pass this param if using multi-threading and key login
-  ServerPrivateInfo? jumpSpi,
+  Spi? jumpSpi,
 
   /// Handle keyboard-interactive authentication
   FutureOr<List<String>?> Function(SSHUserInfoRequest)? onKeyboardInteractive,
 }) async {
   onStatus?.call(GenSSHClientStatus.socket);
 
+  String? alterUser;
+
   final socket = await () async {
     // Proxy
     final jumpSpi_ = () {
@@ -91,15 +93,18 @@ Future<SSHClient> genClient(
         timeout: timeout,
       );
     } catch (e) {
+      Loggers.app.warning('genClient', e);
       if (spi.alterUrl == null) rethrow;
       try {
-        final ipPort = spi.fromStringUrl();
+        final res = spi.fromStringUrl();
+        alterUser = res.$2;
         return await SSHSocket.connect(
-          ipPort.ip,
-          ipPort.port,
+          res.$1,
+          res.$3,
           timeout: timeout,
         );
       } catch (e) {
+        Loggers.app.warning('genClient alterUrl', e);
         rethrow;
       }
     }
@@ -110,7 +115,7 @@ Future<SSHClient> genClient(
     onStatus?.call(GenSSHClientStatus.pwd);
     return SSHClient(
       socket,
-      username: spi.user,
+      username: alterUser ?? spi.user,
       onPasswordRequest: () => spi.pwd,
       onUserInfoRequest: onKeyboardInteractive,
       // printDebug: debugPrint,

lib/core/utils/ssh_auth.dart

@@ -4,16 +4,16 @@ import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/material.dart';
 import 'package:server_box/core/extension/context/locale.dart';
 import 'package:server_box/data/model/server/server_private_info.dart';
-import 'package:server_box/data/res/provider.dart';
+import 'package:server_box/data/provider/app.dart';
 
 abstract final class KeybordInteractive {
   static FutureOr<List<String>?> defaultHandle(
-    ServerPrivateInfo spi, {
+    Spi spi, {
     BuildContext? ctx,
   }) async {
     try {
-      final res = await (ctx ?? Pros.app.ctx)?.showPwdDialog(
-        title: '2FA ${l10n.pwd}',
+      final res = await (ctx ?? AppProvider.ctx)?.showPwdDialog(
+        title: l10n.pwd,
         id: spi.id,
         label: spi.id,
       );

lib/core/utils/sync/icloud.dart

@@ -1,224 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:computer/computer.dart';
-import 'package:fl_lib/fl_lib.dart';
-import 'package:icloud_storage/icloud_storage.dart';
-import 'package:logging/logging.dart';
-import 'package:server_box/data/model/app/backup.dart';
-import 'package:server_box/data/model/app/sync.dart';
-import 'package:server_box/data/res/misc.dart';
-
-import '../../../data/model/app/error.dart';
-
-abstract final class ICloud {
-  static const _containerId = 'iCloud.tech.lolli.serverbox';
-
-  static final _logger = Logger('iCloud');
-
-  /// Upload file to iCloud
-  ///
-  /// - [relativePath] is the path relative to [Paths.doc],
-  /// must not starts with `/`
-  /// - [localPath] has higher priority than [relativePath], but only apply
-  /// to the local path instead of iCloud path
-  ///
-  /// Return [null] if upload success, [ICloudErr] otherwise
-  static Future<ICloudErr?> upload({
-    required String relativePath,
-    String? localPath,
-  }) async {
-    final completer = Completer<ICloudErr?>();
-    try {
-      await ICloudStorage.upload(
-        containerId: _containerId,
-        filePath: localPath ?? '${Paths.doc}/$relativePath',
-        destinationRelativePath: relativePath,
-        onProgress: (stream) {
-          stream.listen(
-            null,
-            onDone: () => completer.complete(null),
-            onError: (e) => completer.complete(
-              ICloudErr(type: ICloudErrType.generic, message: '$e'),
-            ),
-          );
-        },
-      );
-    } catch (e, s) {
-      _logger.warning('Upload $relativePath failed', e, s);
-      completer.complete(ICloudErr(type: ICloudErrType.generic, message: '$e'));
-    }
-
-    return completer.future;
-  }
-
-  static Future<List<ICloudFile>> getAll() async {
-    return await ICloudStorage.gather(
-      containerId: _containerId,
-    );
-  }
-
-  static Future<void> delete(String relativePath) async {
-    try {
-      await ICloudStorage.delete(
-        containerId: _containerId,
-        relativePath: relativePath,
-      );
-    } catch (e, s) {
-      _logger.warning('Delete $relativePath failed', e, s);
-    }
-  }
-
-  /// Download file from iCloud
-  ///
-  /// - [relativePath] is the path relative to [Paths.doc],
-  /// must not starts with `/`
-  /// - [localPath] has higher priority than [relativePath], but only apply
-  /// to the local path instead of iCloud path
-  ///
-  /// Return `null` if upload success, [ICloudErr] otherwise
-  static Future<ICloudErr?> download({
-    required String relativePath,
-    String? localPath,
-  }) async {
-    final completer = Completer<ICloudErr?>();
-    try {
-      await ICloudStorage.download(
-        containerId: _containerId,
-        relativePath: relativePath,
-        destinationFilePath: localPath ?? '${Paths.doc}/$relativePath',
-        onProgress: (stream) {
-          stream.listen(
-            null,
-            onDone: () => completer.complete(null),
-            onError: (e) => completer.complete(
-              ICloudErr(type: ICloudErrType.generic, message: '$e'),
-            ),
-          );
-        },
-      );
-    } catch (e, s) {
-      _logger.warning('Download $relativePath failed', e, s);
-      completer.complete(ICloudErr(type: ICloudErrType.generic, message: '$e'));
-    }
-    return completer.future;
-  }
-
-  /// Sync file between iCloud and local
-  ///
-  /// - [relativePaths] is the path relative to [Paths.doc],
-  /// must not starts with `/`
-  /// - [bakPrefix] is the suffix of backup file, default to [null].
-  /// All files downloaded from cloud will be suffixed with [bakPrefix].
-  ///
-  /// Return `null` if upload success, [ICloudErr] otherwise
-  static Future<SyncResult<String, ICloudErr>> syncFiles({
-    required Iterable<String> relativePaths,
-    String? bakPrefix,
-  }) async {
-    final uploadFiles = <String>[];
-    final downloadFiles = <String>[];
-
-    try {
-      final errs = <String, ICloudErr>{};
-
-      final allFiles = await getAll();
-
-      /// remove files not in relativePaths
-      allFiles.removeWhere((e) => !relativePaths.contains(e.relativePath));
-
-      final missions = <Future<void>>[];
-
-      /// upload files not in iCloud
-      final missed = relativePaths.where((e) {
-        return !allFiles.any((f) => f.relativePath == e);
-      });
-      missions.addAll(missed.map((e) async {
-        final err = await upload(relativePath: e);
-        if (err != null) {
-          errs[e] = err;
-        }
-      }));
-
-      final docPath = Paths.doc;
-
-      /// compare files in iCloud and local
-      missions.addAll(allFiles.map((file) async {
-        final relativePath = file.relativePath;
-
-        /// Check date
-        final localFile = File('$docPath/$relativePath');
-        if (!localFile.existsSync()) {
-          /// Local file not found, download remote file
-          final err = await download(relativePath: relativePath);
-          if (err != null) {
-            errs[relativePath] = err;
-          }
-          return;
-        }
-        final localDate = await localFile.lastModified();
-        final remoteDate = file.contentChangeDate;
-
-        /// Same date, skip
-        if (remoteDate.difference(localDate) == Duration.zero) return;
-
-        /// Local is newer than remote, so upload local file
-        if (remoteDate.isBefore(localDate)) {
-          await delete(relativePath);
-          final err = await upload(relativePath: relativePath);
-          if (err != null) {
-            errs[relativePath] = err;
-          }
-          uploadFiles.add(relativePath);
-          return;
-        }
-
-        /// Remote is newer than local, so download remote
-        final localPath = '$docPath/${bakPrefix ?? ''}$relativePath';
-        final err = await download(
-          relativePath: relativePath,
-          localPath: localPath,
-        );
-        if (err != null) {
-          errs[relativePath] = err;
-        }
-        downloadFiles.add(relativePath);
-      }));
-
-      await Future.wait(missions);
-
-      return SyncResult(up: uploadFiles, down: downloadFiles, err: errs);
-    } catch (e, s) {
-      _logger.warning('Sync: $relativePaths failed', e, s);
-      return SyncResult(up: uploadFiles, down: downloadFiles, err: {
-        'Generic': ICloudErr(type: ICloudErrType.generic, message: '$e')
-      });
-    } finally {
-      _logger.info('Sync, up: $uploadFiles, down: $downloadFiles');
-    }
-  }
-
-  static Future<void> sync() async {
-    final result = await download(relativePath: Miscs.bakFileName);
-    if (result != null) {
-      await backup();
-      return;
-    }
-
-    final dlFile = await File(Paths.bak).readAsString();
-    final dlBak = await Computer.shared.start(Backup.fromJsonString, dlFile);
-    await dlBak.restore();
-
-    await backup();
-  }
-
-  static Future<void> backup() async {
-    await Backup.backup();
-    final uploadResult = await upload(relativePath: Miscs.bakFileName);
-    if (uploadResult != null) {
-      _logger.warning('Upload backup failed: $uploadResult');
-    } else {
-      _logger.info('Upload backup success');
-    }
-  }
-}

lib/core/utils/sync/webdav.dart

@@ -1,127 +0,0 @@
-import 'dart:io';
-
-import 'package:computer/computer.dart';
-import 'package:fl_lib/fl_lib.dart';
-import 'package:logging/logging.dart';
-import 'package:server_box/data/model/app/backup.dart';
-import 'package:server_box/data/model/app/error.dart';
-import 'package:server_box/data/res/misc.dart';
-import 'package:server_box/data/res/store.dart';
-import 'package:webdav_client/webdav_client.dart';
-
-abstract final class Webdav {
-  /// Some WebDAV provider only support non-root path
-  static const _prefix = 'srvbox/';
-
-  static var _client = WebdavClient(
-    url: Stores.setting.webdavUrl.fetch(),
-    user: Stores.setting.webdavUser.fetch(),
-    pwd: Stores.setting.webdavPwd.fetch(),
-  );
-
-  static final _logger = Logger('Webdav');
-
-  static Future<String?> test(String url, String user, String pwd) async {
-    final client = WebdavClient(url: url, user: user, pwd: pwd);
-    try {
-      await client.ping();
-      return null;
-    } catch (e, s) {
-      _logger.warning('Test failed', e, s);
-      return e.toString();
-    }
-  }
-
-  static Future<WebdavErr?> upload({
-    required String relativePath,
-    String? localPath,
-  }) async {
-    try {
-      await _client.writeFile(
-        localPath ?? '${Paths.doc}/$relativePath',
-        _prefix + relativePath,
-      );
-    } catch (e, s) {
-      _logger.warning('Upload $relativePath failed', e, s);
-      return WebdavErr(type: WebdavErrType.generic, message: '$e');
-    }
-    return null;
-  }
-
-  static Future<WebdavErr?> delete(String relativePath) async {
-    try {
-      await _client.remove(_prefix + relativePath);
-    } catch (e, s) {
-      _logger.warning('Delete $relativePath failed', e, s);
-      return WebdavErr(type: WebdavErrType.generic, message: '$e');
-    }
-    return null;
-  }
-
-  static Future<WebdavErr?> download({
-    required String relativePath,
-    String? localPath,
-  }) async {
-    try {
-      await _client.readFile(
-        _prefix + relativePath,
-        localPath ?? '${Paths.doc}/$relativePath',
-      );
-    } catch (e) {
-      _logger.warning('Download $relativePath failed');
-      return WebdavErr(type: WebdavErrType.generic, message: '$e');
-    }
-    return null;
-  }
-
-  static Future<List<String>> list() async {
-    try {
-      final list = await _client.readDir(_prefix);
-      final names = <String>[];
-      for (final item in list) {
-        if ((item.isDir ?? true) || item.name == null) continue;
-        names.add(item.name!);
-      }
-      return names;
-    } catch (e, s) {
-      _logger.warning('List failed', e, s);
-      return [];
-    }
-  }
-
-  static void changeClient(String url, String user, String pwd) {
-    _client = WebdavClient(url: url, user: user, pwd: pwd);
-    Stores.setting.webdavUrl.put(url);
-    Stores.setting.webdavUser.put(user);
-    Stores.setting.webdavPwd.put(pwd);
-  }
-
-  static Future<void> sync() async {
-    final result = await download(relativePath: Miscs.bakFileName);
-    if (result != null) {
-      await backup();
-      return;
-    }
-
-    try {
-      final dlFile = await File(Paths.bak).readAsString();
-      final dlBak = await Computer.shared.start(Backup.fromJsonString, dlFile);
-      await dlBak.restore();
-    } catch (e) {
-      _logger.warning('Restore failed: $e');
-    }
-
-    await backup();
-  }
-
-  /// Create a local backup and upload it to WebDAV
-  static Future<void> backup() async {
-    await Backup.backup();
-    final uploadResult = await upload(relativePath: Miscs.bakFileName);
-    if (uploadResult != null) {
-      _logger.warning('Upload failed: $uploadResult');
-    } else {
-      _logger.info('Upload success');
-    }
-  }
-}

lib/data/model/app/bak/backup.dart

@@ -2,29 +2,32 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:fl_lib/fl_lib.dart';
+import 'package:json_annotation/json_annotation.dart';
 import 'package:logging/logging.dart';
 import 'package:server_box/data/model/server/private_key_info.dart';
 import 'package:server_box/data/model/server/server_private_info.dart';
 import 'package:server_box/data/model/server/snippet.dart';
 import 'package:server_box/data/res/misc.dart';
-import 'package:server_box/data/res/provider.dart';
-import 'package:server_box/data/res/rebuild.dart';
 import 'package:server_box/data/res/store.dart';
 
+part 'backup.g.dart';
+
 const backupFormatVersion = 1;
 
 final _logger = Logger('Backup');
 
-class Backup {
+@JsonSerializable()
+class Backup implements Mergeable {
   // backup format version
   final int version;
   final String date;
-  final List<ServerPrivateInfo> spis;
+  final List<Spi> spis;
   final List<Snippet> snippets;
   final List<PrivateKeyInfo> keys;
   final Map<String, dynamic> container;
   final Map<String, dynamic> history;
   final int? lastModTime;
+  final Map<String, dynamic>? settings;
 
   const Backup({
     required this.version,
@@ -34,54 +37,40 @@ class Backup {
     required this.keys,
     required this.container,
     required this.history,
+    required this.settings,
     this.lastModTime,
   });
 
-  Backup.fromJson(Map<String, dynamic> json)
-      : version = json['version'] as int,
-        date = json['date'],
-        spis = (json['spis'] as List)
-            .map((e) => ServerPrivateInfo.fromJson(e))
-            .toList(),
-        snippets =
-            (json['snippets'] as List).map((e) => Snippet.fromJson(e)).toList(),
-        keys = (json['keys'] as List)
-            .map((e) => PrivateKeyInfo.fromJson(e))
-            .toList(),
-        container = json['container'] ?? {},
-        lastModTime = json['lastModTime'],
-        history = json['history'] ?? {};
+  factory Backup.fromJson(Map<String, dynamic> json) => _$BackupFromJson(json);
 
-  Map<String, dynamic> toJson() => {
-        'version': version,
-        'date': date,
-        'spis': spis,
-        'snippets': snippets,
-        'keys': keys,
-        'container': container,
-        'lastModTime': lastModTime,
-        'history': history,
-      };
+  Map<String, dynamic> toJson() => _$BackupToJson(this);
 
-  Backup.loadFromStore()
-      : version = backupFormatVersion,
-        date = DateTime.now().toString().split('.').firstOrNull ?? '',
-        spis = Stores.server.fetch(),
-        snippets = Stores.snippet.fetch(),
-        keys = Stores.key.fetch(),
-        container = Stores.container.box.toJson(),
-        lastModTime = Stores.lastModTime,
-        history = Stores.history.box.toJson();
+  static Future<Backup> loadFromStore() async {
+    final lastModTime = Stores.lastModTime;
+    return Backup(
+      version: backupFormatVersion,
+      date: DateTime.now().toString().split('.').firstOrNull ?? '',
+      spis: Stores.server.fetch(),
+      snippets: Stores.snippet.fetch(),
+      keys: Stores.key.fetch(),
+      container: Stores.container.getAllMap(),
+      lastModTime: lastModTime,
+      history: Stores.history.getAllMap(),
+      settings: Stores.setting.getAllMap(),
+    );
+  }
 
   static Future<String> backup([String? name]) async {
-    final result = _diyEncrypt(json.encode(Backup.loadFromStore().toJson()));
-    final path = '${Paths.doc}/${name ?? Miscs.bakFileName}';
+    final bak = await Backup.loadFromStore();
+    final result = _diyEncrypt(json.encode(bak.toJson()));
+    final path = Paths.doc.joinPath(name ?? Miscs.bakFileName);
     await File(path).writeAsString(result);
     return path;
   }
 
-  Future<void> restore({bool force = false}) async {
-    final curTime = Stores.lastModTime ?? 0;
+  @override
+  Future<void> merge({bool force = false}) async {
+    final curTime = Stores.lastModTime;
     final bakTime = lastModTime ?? 0;
     final shouldRestore = force || curTime < bakTime;
     if (!shouldRestore) {
@@ -195,14 +184,37 @@ class Backup {
       }
     }
 
-    Pros.reload();
+    // Settings
+    final settings_ = settings;
+    if (settings_ != null) {
+      if (force) {
+        Stores.setting.box.putAll(settings_);
+      } else {
+        final nowSettings = Stores.setting.box.keys.toSet();
+        final bakSettings = settings_.keys.toSet();
+        final newSettings = bakSettings.difference(nowSettings);
+        final delSettings = nowSettings.difference(bakSettings);
+        final updateSettings = nowSettings.intersection(bakSettings);
+        for (final s in newSettings) {
+          Stores.setting.box.put(s, settings_[s]);
+        }
+        for (final s in delSettings) {
+          Stores.setting.box.delete(s);
+        }
+        for (final s in updateSettings) {
+          Stores.setting.box.put(s, settings_[s]);
+        }
+      }
+    }
+
+    Provider.reload();
     RNodes.app.notify();
 
     _logger.info('Restore success');
   }
 
-  Backup.fromJsonString(String raw)
-      : this.fromJson(json.decode(_diyDecrypt(raw)));
+  factory Backup.fromJsonString(String raw) =>
+      Backup.fromJson(json.decode(_diyDecrypt(raw)));
 }
 
 String _diyEncrypt(String raw) => json.encode(
@@ -222,3 +234,4 @@ String _diyDecrypt(String raw) {
     rethrow;
   }
 }
+

lib/data/model/app/bak/backup.g.dart

@@ -0,0 +1,37 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'backup.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Backup _$BackupFromJson(Map<String, dynamic> json) => Backup(
+  version: (json['version'] as num).toInt(),
+  date: json['date'] as String,
+  spis: (json['spis'] as List<dynamic>)
+      .map((e) => Spi.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  snippets: (json['snippets'] as List<dynamic>)
+      .map((e) => Snippet.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  keys: (json['keys'] as List<dynamic>)
+      .map((e) => PrivateKeyInfo.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  container: json['container'] as Map<String, dynamic>,
+  history: json['history'] as Map<String, dynamic>,
+  settings: json['settings'] as Map<String, dynamic>?,
+  lastModTime: (json['lastModTime'] as num?)?.toInt(),
+);
+
+Map<String, dynamic> _$BackupToJson(Backup instance) => <String, dynamic>{
+  'version': instance.version,
+  'date': instance.date,
+  'spis': instance.spis,
+  'snippets': instance.snippets,
+  'keys': instance.keys,
+  'container': instance.container,
+  'history': instance.history,
+  'lastModTime': instance.lastModTime,
+  'settings': instance.settings,
+};

lib/data/model/app/bak/backup2.dart

@@ -0,0 +1,89 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:fl_lib/fl_lib.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:logging/logging.dart';
+import 'package:server_box/data/res/misc.dart';
+import 'package:server_box/data/res/store.dart';
+
+part 'backup2.freezed.dart';
+part 'backup2.g.dart';
+
+final _loggerV2 = Logger('BackupV2');
+
+@freezed
+abstract class BackupV2 with _$BackupV2 implements Mergeable {
+  const BackupV2._();
+
+  /// Construct a backup with the latest format (v2).
+  ///
+  /// All `Map<String, dynamic>` are:
+  /// ```json
+  /// {
+  ///   "key1": Model{},
+  ///   "_lastModTime": {
+  ///     "key1": 1234567890,
+  ///   },
+  /// }
+  /// ```
+  const factory BackupV2({
+    required int version,
+    required int date,
+    required Map<String, Object?> spis,
+    required Map<String, Object?> snippets,
+    required Map<String, Object?> keys,
+    required Map<String, Object?> container,
+    required Map<String, Object?> history,
+    required Map<String, Object?> settings,
+  }) = _BackupV2;
+
+  factory BackupV2.fromJson(Map<String, dynamic> json) => _$BackupV2FromJson(json);
+
+  @override
+  Future<void> merge({bool force = false}) async {
+    _loggerV2.info('Merging...');
+
+    // Merge each store
+    await Mergeable.mergeStore(backupData: spis, store: Stores.server, force: force);
+    await Mergeable.mergeStore(backupData: snippets, store: Stores.snippet, force: force);
+    await Mergeable.mergeStore(backupData: keys, store: Stores.key, force: force);
+    await Mergeable.mergeStore(backupData: container, store: Stores.container, force: force);
+    await Mergeable.mergeStore(backupData: history, store: Stores.history, force: force);
+    await Mergeable.mergeStore(backupData: settings, store: Stores.setting, force: force);
+
+    // Reload providers and notify listeners
+    Provider.reload();
+    RNodes.app.notify();
+
+    _loggerV2.info('Merge completed');
+  }
+
+  static const formatVer = 2;
+
+  static Future<BackupV2> loadFromStore() async {
+    return BackupV2(
+      version: formatVer,
+      date: DateTimeX.timestamp,
+      spis: Stores.server.getAllMap(includeInternalKeys: true),
+      snippets: Stores.snippet.getAllMap(includeInternalKeys: true),
+      keys: Stores.key.getAllMap(includeInternalKeys: true),
+      container: Stores.container.getAllMap(includeInternalKeys: true),
+      history: Stores.history.getAllMap(includeInternalKeys: true),
+      settings: Stores.setting.getAllMap(includeInternalKeys: true),
+    );
+  }
+
+  static Future<String> backup([String? name]) async {
+    final bak = await BackupV2.loadFromStore();
+    final result = json.encode(bak.toJson());
+    final path = Paths.doc.joinPath(name ?? Miscs.bakFileName);
+    await File(path).writeAsString(result);
+    return path;
+  }
+
+  factory BackupV2.fromJsonString(String jsonString) {
+    final map = json.decode(jsonString) as Map<String, dynamic>;
+    return BackupV2.fromJson(map);
+  }
+}

lib/data/model/app/bak/backup2.freezed.dart

@@ -0,0 +1,372 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'backup2.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+  'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models',
+);
+
+BackupV2 _$BackupV2FromJson(Map<String, dynamic> json) {
+  return _BackupV2.fromJson(json);
+}
+
+/// @nodoc
+mixin _$BackupV2 {
+  int get version => throw _privateConstructorUsedError;
+  int get date => throw _privateConstructorUsedError;
+  Map<String, Object?> get spis => throw _privateConstructorUsedError;
+  Map<String, Object?> get snippets => throw _privateConstructorUsedError;
+  Map<String, Object?> get keys => throw _privateConstructorUsedError;
+  Map<String, Object?> get container => throw _privateConstructorUsedError;
+  Map<String, Object?> get history => throw _privateConstructorUsedError;
+  Map<String, Object?> get settings => throw _privateConstructorUsedError;
+
+  /// Serializes this BackupV2 to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of BackupV2
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $BackupV2CopyWith<BackupV2> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $BackupV2CopyWith<$Res> {
+  factory $BackupV2CopyWith(BackupV2 value, $Res Function(BackupV2) then) =
+      _$BackupV2CopyWithImpl<$Res, BackupV2>;
+  @useResult
+  $Res call({
+    int version,
+    int date,
+    Map<String, Object?> spis,
+    Map<String, Object?> snippets,
+    Map<String, Object?> keys,
+    Map<String, Object?> container,
+    Map<String, Object?> history,
+    Map<String, Object?> settings,
+  });
+}
+
+/// @nodoc
+class _$BackupV2CopyWithImpl<$Res, $Val extends BackupV2>
+    implements $BackupV2CopyWith<$Res> {
+  _$BackupV2CopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of BackupV2
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? version = null,
+    Object? date = null,
+    Object? spis = null,
+    Object? snippets = null,
+    Object? keys = null,
+    Object? container = null,
+    Object? history = null,
+    Object? settings = null,
+  }) {
+    return _then(
+      _value.copyWith(
+            version: null == version
+                ? _value.version
+                : version // ignore: cast_nullable_to_non_nullable
+                      as int,
+            date: null == date
+                ? _value.date
+                : date // ignore: cast_nullable_to_non_nullable
+                      as int,
+            spis: null == spis
+                ? _value.spis
+                : spis // ignore: cast_nullable_to_non_nullable
+                      as Map<String, Object?>,
+            snippets: null == snippets
+                ? _value.snippets
+                : snippets // ignore: cast_nullable_to_non_nullable
+                      as Map<String, Object?>,
+            keys: null == keys
+                ? _value.keys
+                : keys // ignore: cast_nullable_to_non_nullable
+                      as Map<String, Object?>,
+            container: null == container
+                ? _value.container
+                : container // ignore: cast_nullable_to_non_nullable
+                      as Map<String, Object?>,
+            history: null == history
+                ? _value.history
+                : history // ignore: cast_nullable_to_non_nullable
+                      as Map<String, Object?>,
+            settings: null == settings
+                ? _value.settings
+                : settings // ignore: cast_nullable_to_non_nullable
+                      as Map<String, Object?>,
+          )
+          as $Val,
+    );
+  }
+}
+
+/// @nodoc
+abstract class _$$BackupV2ImplCopyWith<$Res>
+    implements $BackupV2CopyWith<$Res> {
+  factory _$$BackupV2ImplCopyWith(
+    _$BackupV2Impl value,
+    $Res Function(_$BackupV2Impl) then,
+  ) = __$$BackupV2ImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({
+    int version,
+    int date,
+    Map<String, Object?> spis,
+    Map<String, Object?> snippets,
+    Map<String, Object?> keys,
+    Map<String, Object?> container,
+    Map<String, Object?> history,
+    Map<String, Object?> settings,
+  });
+}
+
+/// @nodoc
+class __$$BackupV2ImplCopyWithImpl<$Res>
+    extends _$BackupV2CopyWithImpl<$Res, _$BackupV2Impl>
+    implements _$$BackupV2ImplCopyWith<$Res> {
+  __$$BackupV2ImplCopyWithImpl(
+    _$BackupV2Impl _value,
+    $Res Function(_$BackupV2Impl) _then,
+  ) : super(_value, _then);
+
+  /// Create a copy of BackupV2
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? version = null,
+    Object? date = null,
+    Object? spis = null,
+    Object? snippets = null,
+    Object? keys = null,
+    Object? container = null,
+    Object? history = null,
+    Object? settings = null,
+  }) {
+    return _then(
+      _$BackupV2Impl(
+        version: null == version
+            ? _value.version
+            : version // ignore: cast_nullable_to_non_nullable
+                  as int,
+        date: null == date
+            ? _value.date
+            : date // ignore: cast_nullable_to_non_nullable
+                  as int,
+        spis: null == spis
+            ? _value._spis
+            : spis // ignore: cast_nullable_to_non_nullable
+                  as Map<String, Object?>,
+        snippets: null == snippets
+            ? _value._snippets
+            : snippets // ignore: cast_nullable_to_non_nullable
+                  as Map<String, Object?>,
+        keys: null == keys
+            ? _value._keys
+            : keys // ignore: cast_nullable_to_non_nullable
+                  as Map<String, Object?>,
+        container: null == container
+            ? _value._container
+            : container // ignore: cast_nullable_to_non_nullable
+                  as Map<String, Object?>,
+        history: null == history
+            ? _value._history
+            : history // ignore: cast_nullable_to_non_nullable
+                  as Map<String, Object?>,
+        settings: null == settings
+            ? _value._settings
+            : settings // ignore: cast_nullable_to_non_nullable
+                  as Map<String, Object?>,
+      ),
+    );
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$BackupV2Impl extends _BackupV2 {
+  const _$BackupV2Impl({
+    required this.version,
+    required this.date,
+    required final Map<String, Object?> spis,
+    required final Map<String, Object?> snippets,
+    required final Map<String, Object?> keys,
+    required final Map<String, Object?> container,
+    required final Map<String, Object?> history,
+    required final Map<String, Object?> settings,
+  }) : _spis = spis,
+       _snippets = snippets,
+       _keys = keys,
+       _container = container,
+       _history = history,
+       _settings = settings,
+       super._();
+
+  factory _$BackupV2Impl.fromJson(Map<String, dynamic> json) =>
+      _$$BackupV2ImplFromJson(json);
+
+  @override
+  final int version;
+  @override
+  final int date;
+  final Map<String, Object?> _spis;
+  @override
+  Map<String, Object?> get spis {
+    if (_spis is EqualUnmodifiableMapView) return _spis;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_spis);
+  }
+
+  final Map<String, Object?> _snippets;
+  @override
+  Map<String, Object?> get snippets {
+    if (_snippets is EqualUnmodifiableMapView) return _snippets;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_snippets);
+  }
+
+  final Map<String, Object?> _keys;
+  @override
+  Map<String, Object?> get keys {
+    if (_keys is EqualUnmodifiableMapView) return _keys;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_keys);
+  }
+
+  final Map<String, Object?> _container;
+  @override
+  Map<String, Object?> get container {
+    if (_container is EqualUnmodifiableMapView) return _container;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_container);
+  }
+
+  final Map<String, Object?> _history;
+  @override
+  Map<String, Object?> get history {
+    if (_history is EqualUnmodifiableMapView) return _history;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_history);
+  }
+
+  final Map<String, Object?> _settings;
+  @override
+  Map<String, Object?> get settings {
+    if (_settings is EqualUnmodifiableMapView) return _settings;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_settings);
+  }
+
+  @override
+  String toString() {
+    return 'BackupV2(version: $version, date: $date, spis: $spis, snippets: $snippets, keys: $keys, container: $container, history: $history, settings: $settings)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$BackupV2Impl &&
+            (identical(other.version, version) || other.version == version) &&
+            (identical(other.date, date) || other.date == date) &&
+            const DeepCollectionEquality().equals(other._spis, _spis) &&
+            const DeepCollectionEquality().equals(other._snippets, _snippets) &&
+            const DeepCollectionEquality().equals(other._keys, _keys) &&
+            const DeepCollectionEquality().equals(
+              other._container,
+              _container,
+            ) &&
+            const DeepCollectionEquality().equals(other._history, _history) &&
+            const DeepCollectionEquality().equals(other._settings, _settings));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+    runtimeType,
+    version,
+    date,
+    const DeepCollectionEquality().hash(_spis),
+    const DeepCollectionEquality().hash(_snippets),
+    const DeepCollectionEquality().hash(_keys),
+    const DeepCollectionEquality().hash(_container),
+    const DeepCollectionEquality().hash(_history),
+    const DeepCollectionEquality().hash(_settings),
+  );
+
+  /// Create a copy of BackupV2
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$BackupV2ImplCopyWith<_$BackupV2Impl> get copyWith =>
+      __$$BackupV2ImplCopyWithImpl<_$BackupV2Impl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$BackupV2ImplToJson(this);
+  }
+}
+
+abstract class _BackupV2 extends BackupV2 {
+  const factory _BackupV2({
+    required final int version,
+    required final int date,
+    required final Map<String, Object?> spis,
+    required final Map<String, Object?> snippets,
+    required final Map<String, Object?> keys,
+    required final Map<String, Object?> container,
+    required final Map<String, Object?> history,
+    required final Map<String, Object?> settings,
+  }) = _$BackupV2Impl;
+  const _BackupV2._() : super._();
+
+  factory _BackupV2.fromJson(Map<String, dynamic> json) =
+      _$BackupV2Impl.fromJson;
+
+  @override
+  int get version;
+  @override
+  int get date;
+  @override
+  Map<String, Object?> get spis;
+  @override
+  Map<String, Object?> get snippets;
+  @override
+  Map<String, Object?> get keys;
+  @override
+  Map<String, Object?> get container;
+  @override
+  Map<String, Object?> get history;
+  @override
+  Map<String, Object?> get settings;
+
+  /// Create a copy of BackupV2
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$BackupV2ImplCopyWith<_$BackupV2Impl> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/data/model/app/bak/backup2.g.dart

@@ -0,0 +1,31 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'backup2.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$BackupV2Impl _$$BackupV2ImplFromJson(Map<String, dynamic> json) =>
+    _$BackupV2Impl(
+      version: (json['version'] as num).toInt(),
+      date: (json['date'] as num).toInt(),
+      spis: json['spis'] as Map<String, dynamic>,
+      snippets: json['snippets'] as Map<String, dynamic>,
+      keys: json['keys'] as Map<String, dynamic>,
+      container: json['container'] as Map<String, dynamic>,
+      history: json['history'] as Map<String, dynamic>,
+      settings: json['settings'] as Map<String, dynamic>,
+    );
+
+Map<String, dynamic> _$$BackupV2ImplToJson(_$BackupV2Impl instance) =>
+    <String, dynamic>{
+      'version': instance.version,
+      'date': instance.date,
+      'spis': instance.spis,
+      'snippets': instance.snippets,
+      'keys': instance.keys,
+      'container': instance.container,
+      'history': instance.history,
+      'settings': instance.settings,
+    };

lib/data/model/app/bak/utils.dart

@@ -0,0 +1,15 @@
+import 'package:fl_lib/fl_lib.dart';
+import 'package:server_box/data/model/app/bak/backup.dart';
+import 'package:server_box/data/model/app/bak/backup2.dart';
+
+abstract final class MergeableUtils {
+  static (Mergeable, String) fromJsonString(String json) {
+    try {
+      final bak = BackupV2.fromJsonString(json);
+      return (bak, DateTime.fromMillisecondsSinceEpoch(bak.date).hms());
+    } catch (e) {
+      final bak = Backup.fromJsonString(json);
+      return (bak, bak.date);
+    }
+  }
+}

lib/data/model/app/error.dart

@@ -1,27 +1,6 @@
+import 'package:fl_lib/fl_lib.dart';
 import 'package:server_box/core/extension/context/locale.dart';
 
-enum ErrFrom {
-  unknown,
-  apt,
-  docker,
-  sftp,
-  ssh,
-  status,
-  icloud,
-  webdav,
-  ;
-}
-
-abstract class Err<T> {
-  final ErrFrom from;
-  final T type;
-  final String? message;
-
-  String? get solution;
-
-  Err({required this.from, required this.type, this.message});
-}
-
 enum SSHErrType {
   unknown,
   connect,
@@ -35,7 +14,7 @@ enum SSHErrType {
 }
 
 class SSHErr extends Err<SSHErrType> {
-  SSHErr({required super.type, super.message}) : super(from: ErrFrom.ssh);
+  SSHErr({required super.type, super.message});
 
   @override
   String? get solution => switch (type) {
@@ -45,11 +24,6 @@ class SSHErr extends Err<SSHErrType> {
         SSHErrType.noPrivateKey => l10n.noPrivateKeyTip,
         _ => null,
       };
-
-  @override
-  String toString() {
-    return 'SSHErr<$type>: $message';
-  }
 }
 
 enum ContainerErrType {
@@ -65,16 +39,10 @@ enum ContainerErrType {
 }
 
 class ContainerErr extends Err<ContainerErrType> {
-  ContainerErr({required super.type, super.message})
-      : super(from: ErrFrom.docker);
+  ContainerErr({required super.type, super.message});
 
   @override
   String? get solution => null;
-
-  @override
-  String toString() {
-    return 'ContainerErr<$type>: $message';
-  }
 }
 
 enum ICloudErrType {
@@ -84,15 +52,10 @@ enum ICloudErrType {
 }
 
 class ICloudErr extends Err<ICloudErrType> {
-  ICloudErr({required super.type, super.message}) : super(from: ErrFrom.icloud);
+  ICloudErr({required super.type, super.message});
 
   @override
   String? get solution => null;
-
-  @override
-  String toString() {
-    return 'ICloudErr<$type>: $message';
-  }
 }
 
 enum WebdavErrType {
@@ -102,15 +65,10 @@ enum WebdavErrType {
 }
 
 class WebdavErr extends Err<WebdavErrType> {
-  WebdavErr({required super.type, super.message}) : super(from: ErrFrom.webdav);
+  WebdavErr({required super.type, super.message});
 
   @override
   String? get solution => null;
-
-  @override
-  String toString() {
-    return 'WebdavErr<$type>: $message';
-  }
 }
 
 enum PveErrType {
@@ -121,13 +79,8 @@ enum PveErrType {
 }
 
 class PveErr extends Err<PveErrType> {
-  PveErr({required super.type, super.message}) : super(from: ErrFrom.status);
+  PveErr({required super.type, super.message});
 
   @override
   String? get solution => null;
-
-  @override
-  String toString() {
-    return 'PveErr<$type>: $message';
-  }
 }

lib/data/model/app/menu/server_func.dart

@@ -1,30 +1,35 @@
 import 'package:flutter/material.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:icons_plus/icons_plus.dart';
 import 'package:server_box/core/extension/context/locale.dart';
+import 'package:server_box/data/res/store.dart';
 
-part 'server_func.g.dart';
-
-@HiveType(typeId: 6)
 enum ServerFuncBtn {
-  @HiveField(0)
-  terminal,
-  @HiveField(1)
-  sftp,
-  @HiveField(2)
-  container,
-  @HiveField(3)
-  process,
-  //@HiveField(4)
-  //pkg,
-  @HiveField(5)
-  snippet,
-  @HiveField(6)
-  iperf,
-  // @HiveField(7)
-  // pve,
+  terminal(),
+  sftp(),
+  container(),
+  process(),
+  //pkg(),
+  snippet(),
+  iperf(),
+  // pve(),
+  systemd(1058),
   ;
 
+  final int? addedVersion;
+
+  const ServerFuncBtn([this.addedVersion]);
+
+  static void autoAddNewFuncs(int cur) {
+    if (cur >= systemd.addedVersion!) {
+      final prop = Stores.setting.serverFuncBtns;
+      final list = prop.fetch();
+      if (!list.contains(systemd.index)) {
+        list.add(systemd.index);
+        prop.put(list);
+      }
+    }
+  }
+
   static final defaultIdxs = [
     terminal,
     sftp,
@@ -32,6 +37,7 @@ enum ServerFuncBtn {
     process,
     //pkg,
     snippet,
+    systemd,
   ].map((e) => e.index).toList();
 
   IconData get icon => switch (this) {
@@ -42,6 +48,7 @@ enum ServerFuncBtn {
         process => Icons.list_alt_outlined,
         terminal => Icons.terminal,
         iperf => Icons.speed,
+        systemd => MingCute.plugin_2_fill,
       };
 
   String get toStr => switch (this) {
@@ -52,5 +59,6 @@ enum ServerFuncBtn {
         process => l10n.process,
         terminal => l10n.terminal,
         iperf => 'iperf',
+        systemd => 'Systemd',
       };
 }

lib/data/model/app/menu/server_func.g.dart

@@ -1,66 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'server_func.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class ServerFuncBtnAdapter extends TypeAdapter<ServerFuncBtn> {
-  @override
-  final int typeId = 6;
-
-  @override
-  ServerFuncBtn read(BinaryReader reader) {
-    switch (reader.readByte()) {
-      case 0:
-        return ServerFuncBtn.terminal;
-      case 1:
-        return ServerFuncBtn.sftp;
-      case 2:
-        return ServerFuncBtn.container;
-      case 3:
-        return ServerFuncBtn.process;
-      case 5:
-        return ServerFuncBtn.snippet;
-      case 6:
-        return ServerFuncBtn.iperf;
-      default:
-        return ServerFuncBtn.terminal;
-    }
-  }
-
-  @override
-  void write(BinaryWriter writer, ServerFuncBtn obj) {
-    switch (obj) {
-      case ServerFuncBtn.terminal:
-        writer.writeByte(0);
-        break;
-      case ServerFuncBtn.sftp:
-        writer.writeByte(1);
-        break;
-      case ServerFuncBtn.container:
-        writer.writeByte(2);
-        break;
-      case ServerFuncBtn.process:
-        writer.writeByte(3);
-        break;
-      case ServerFuncBtn.snippet:
-        writer.writeByte(5);
-        break;
-      case ServerFuncBtn.iperf:
-        writer.writeByte(6);
-        break;
-    }
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is ServerFuncBtnAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}

lib/data/model/app/net_view.dart

@@ -1,18 +1,10 @@
 import 'package:fl_lib/fl_lib.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:server_box/core/extension/context/locale.dart';
 import 'package:server_box/data/model/server/server.dart';
-import 'package:server_box/data/res/store.dart';
 
-part 'net_view.g.dart';
-
-@HiveType(typeId: 5)
 enum NetViewType {
-  @HiveField(0)
   conn,
-  @HiveField(1)
   speed,
-  @HiveField(2)
   traffic;
 
   NetViewType get next => switch (this) {
@@ -27,36 +19,43 @@ enum NetViewType {
         NetViewType.speed => l10n.speed,
       };
 
-  (String, String) build(ServerStatus ss) {
-    final ignoreLocal = Stores.setting.ignoreLocalNet.fetch();
-    switch (this) {
-      case NetViewType.conn:
-        return (
-          '${l10n.conn}:\n${ss.tcp.maxConn}',
-          '${libL10n.fail}:\n${ss.tcp.fail}',
-        );
-      case NetViewType.speed:
-        if (ignoreLocal) {
+  /// If no device is specified, return the cached value (only real devices,
+  /// such as ethX, wlanX...).
+  (String, String) build(ServerStatus ss, {String? dev}) {
+    final notSepcifyDev = dev == null || dev.isEmpty;
+    try {
+      switch (this) {
+        case NetViewType.conn:
           return (
-            '↓:\n${ss.netSpeed.cachedRealVals.speedIn}',
-            '↑:\n${ss.netSpeed.cachedRealVals.speedOut}',
+            '${l10n.conn}:\n${ss.tcp.maxConn}',
+            '${libL10n.fail}:\n${ss.tcp.fail}',
           );
-        }
-        return (
-          '↓:\n${ss.netSpeed.speedIn()}',
-          '↑:\n${ss.netSpeed.speedOut()}',
-        );
-      case NetViewType.traffic:
-        if (ignoreLocal) {
+        case NetViewType.speed:
+          if (notSepcifyDev) {
+            return (
+              '↓:\n${ss.netSpeed.cachedVals.speedIn}',
+              '↑:\n${ss.netSpeed.cachedVals.speedOut}',
+            );
+          }
           return (
-            '↓:\n${ss.netSpeed.cachedRealVals.sizeIn}',
-            '↑:\n${ss.netSpeed.cachedRealVals.sizeOut}',
+            '↓:\n${ss.netSpeed.speedIn(device: dev)}',
+            '↑:\n${ss.netSpeed.speedOut(device: dev)}',
           );
-        }
-        return (
-          '↓:\n${ss.netSpeed.sizeIn()}',
-          '↑:\n${ss.netSpeed.sizeOut()}',
-        );
+        case NetViewType.traffic:
+          if (notSepcifyDev) {
+            return (
+              '↓:\n${ss.netSpeed.cachedVals.sizeIn}',
+              '↑:\n${ss.netSpeed.cachedVals.sizeOut}',
+            );
+          }
+          return (
+            '↓:\n${ss.netSpeed.sizeIn(device: dev)}',
+            '↑:\n${ss.netSpeed.sizeOut(device: dev)}',
+          );
+      }
+    } catch (e, s) {
+      Loggers.app.warning('NetViewType.build', e, s);
+      return ('N/A', 'N/A');
     }
   }
 

lib/data/model/app/net_view.g.dart

@@ -1,51 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'net_view.dart';
-
-// **************************************************************************
-// TypeAdapterGenerator
-// **************************************************************************
-
-class NetViewTypeAdapter extends TypeAdapter<NetViewType> {
-  @override
-  final int typeId = 5;
-
-  @override
-  NetViewType read(BinaryReader reader) {
-    switch (reader.readByte()) {
-      case 0:
-        return NetViewType.conn;
-      case 1:
-        return NetViewType.speed;
-      case 2:
-        return NetViewType.traffic;
-      default:
-        return NetViewType.conn;
-    }
-  }
-
-  @override
-  void write(BinaryWriter writer, NetViewType obj) {
-    switch (obj) {
-      case NetViewType.conn:
-        writer.writeByte(0);
-        break;
-      case NetViewType.speed:
-        writer.writeByte(1);
-        break;
-      case NetViewType.traffic:
-        writer.writeByte(2);
-        break;
-    }
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is NetViewTypeAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}

lib/data/model/app/path_with_prefix.dart

@@ -1,10 +1,12 @@
 import 'package:fl_lib/fl_lib.dart';
 
+final _seperator = Pfs.seperator;
+
 /// It's used on platform's file system.
 /// So use [Platform.pathSeparator] to join path.
 class LocalPath {
   final String _prefixPath;
-  String _path = '/';
+  String _path = _seperator;
   String? _prePath;
   String get path => _prefixPath + _path;
 
@@ -13,20 +15,20 @@ class LocalPath {
   void update(String newPath) {
     _prePath = _path;
     if (newPath == '..') {
-      _path = _path.substring(0, _path.lastIndexOf('/'));
+      _path = _path.substring(0, _path.lastIndexOf(_seperator));
       if (_path == '') {
-        _path = '/';
+        _path = _seperator;
       }
       return;
     }
-    if (newPath == '/') {
-      _path = '/';
+    if (newPath == _seperator) {
+      _path = _seperator;
       return;
     }
     _path = _path.joinPath(newPath);
   }
 
-  bool get canBack => path != '$_prefixPath/';
+  bool get canBack => path != '$_prefixPath$_seperator';
 
   bool undo() {
     if (_prePath == null || _path == _prePath) {
@@ -38,7 +40,7 @@ class LocalPath {
 }
 
 String _trimSuffix(String prefixPath) {
-  if (prefixPath.endsWith('/')) {
+  if (prefixPath.endsWith(_seperator)) {
     return prefixPath.substring(0, prefixPath.length - 1);
   }
   return prefixPath;

lib/data/model/app/server_detail_card.dart

@@ -11,13 +11,13 @@ enum ServerDetailCards {
   swap(Icons.swap_horiz),
   gpu(Bootstrap.gpu_card),
   disk(Bootstrap.device_hdd_fill),
+  smart(Icons.health_and_safety, sinceBuild: 1174),
   net(ZondIcons.network),
   sensor(MingCute.dashboard_4_line),
   temp(FontAwesome.temperature_empty_solid),
   battery(Icons.battery_full),
   pve(BoxIcons.bxs_dashboard, sinceBuild: 818),
-  custom(Icons.code, sinceBuild: 825),
-  ;
+  custom(Icons.code, sinceBuild: 825);
 
   final int? sinceBuild;
 
@@ -31,19 +31,20 @@ enum ServerDetailCards {
   static final names = values.map((e) => e.name).toList();
 
   String get toStr => switch (this) {
-        about => libL10n.about,
-        cpu => 'CPU',
-        mem => 'RAM',
-        swap => 'Swap',
-        gpu => 'GPU',
-        disk => l10n.disk,
-        net => l10n.net,
-        sensor => l10n.sensors,
-        temp => l10n.temperature,
-        battery => l10n.battery,
-        pve => 'PVE',
-        custom => l10n.cmd,
-      };
+    about => libL10n.about,
+    cpu => 'CPU',
+    mem => 'RAM',
+    swap => 'Swap',
+    gpu => 'GPU',
+    disk => l10n.disk,
+    smart => l10n.diskHealth,
+    net => l10n.net,
+    sensor => l10n.sensors,
+    temp => l10n.temperature,
+    battery => l10n.battery,
+    pve => 'PVE',
+    custom => l10n.cmd,
+  };
 
   /// If:
   /// Version 1 => user set [about], default is [about, cpu]

lib/data/model/app/shell_func.dart

@@ -1,7 +1,7 @@
 import 'package:server_box/core/extension/context/locale.dart';
-
-import '../../res/build_data.dart';
-import '../server/system.dart';
+import 'package:server_box/data/model/server/system.dart';
+import 'package:server_box/data/provider/server.dart';
+import 'package:server_box/data/res/build_data.dart';
 
 enum ShellFunc {
   status,
@@ -9,8 +9,7 @@ enum ShellFunc {
   process,
   shutdown,
   reboot,
-  suspend,
-  ;
+  suspend;
 
   static const seperator = 'SrvBoxSep';
 
@@ -29,16 +28,20 @@ enum ShellFunc {
   /// Default is [scriptDirTmp]/[scriptFile], if this path is not accessible,
   /// it will be changed to [scriptDirHome]/[scriptFile].
   static String getScriptDir(String id) {
+    final customScriptDir = ServerProvider.pick(
+      id: id,
+    )?.value.spi.custom?.scriptDir;
+    if (customScriptDir != null) return customScriptDir;
     return _scriptDirMap.putIfAbsent(id, () {
       return scriptDirTmp;
     });
   }
 
   static void switchScriptDir(String id) => switch (_scriptDirMap[id]) {
-        scriptDirTmp => _scriptDirMap[id] = scriptDirHome,
-        scriptDirHome => _scriptDirMap[id] = scriptDirTmp,
-        _ => _scriptDirMap[id] = scriptDirHome,
-      };
+    scriptDirTmp => _scriptDirMap[id] = scriptDirHome,
+    scriptDirHome => _scriptDirMap[id] = scriptDirTmp,
+    _ => _scriptDirMap[id] = scriptDirHome,
+  };
 
   static String getScriptPath(String id) {
     return '${getScriptDir(id)}/$scriptFile';
@@ -47,21 +50,21 @@ enum ShellFunc {
   static String getInstallShellCmd(String id) {
     final scriptDir = getScriptDir(id);
     final scriptPath = '$scriptDir/$scriptFile';
-    return """
+    return '''
 mkdir -p $scriptDir
 cat > $scriptPath
-chmod 744 $scriptPath
-""";
+chmod 755 $scriptPath
+''';
   }
 
   String get flag => switch (this) {
-        ShellFunc.process => 'p',
-        ShellFunc.shutdown => 'sd',
-        ShellFunc.reboot => 'r',
-        ShellFunc.suspend => 'sp',
-        ShellFunc.status => 's',
-        // ShellFunc.docker=> 'd',
-      };
+    ShellFunc.process => 'p',
+    ShellFunc.shutdown => 'sd',
+    ShellFunc.reboot => 'r',
+    ShellFunc.suspend => 'sp',
+    ShellFunc.status => 's',
+    // ShellFunc.docker=> 'd',
+  };
 
   String exec(String id) => 'sh ${getScriptPath(id)} -$flag';
 
@@ -92,14 +95,14 @@ if [ "\$macSign" = "" ] && [ "\$bsdSign" = "" ]; then
 else
 \t${BSDStatusCmdType.values.map((e) => e.cmd).join(cmdDivider)}
 fi''';
-//       case ShellFunc.docker:
-//         return '''
-// result=\$(docker version 2>&1 | grep "permission denied")
-// if [ "\$result" != "" ]; then
-// \t${_dockerCmds.join(_cmdDivider)}
-// else
-// \t${_dockerCmds.map((e) => "sudo -S $e").join(_cmdDivider)}
-// fi''';
+      //       case ShellFunc.docker:
+      //         return '''
+      // result=\$(docker version 2>&1 | grep "permission denied")
+      // if [ "\$result" != "" ]; then
+      // \t${_dockerCmds.join(_cmdDivider)}
+      // else
+      // \t${_dockerCmds.map((e) => "sudo -S $e").join(_cmdDivider)}
+      // fi''';
       case ShellFunc.process:
         return '''
 if [ "\$macSign" = "" ] && [ "\$bsdSign" = "" ]; then
@@ -205,22 +208,25 @@ enum StatusCmdType {
   echo._('echo ${SystemType.linuxSign}'),
   time._('date +%s'),
   net._('cat /proc/net/dev'),
-  sys._('cat /etc/*-release | grep PRETTY_NAME'),
+  sys._('cat /etc/*-release | grep ^PRETTY_NAME'),
   cpu._('cat /proc/stat | grep cpu'),
   uptime._('uptime'),
   conn._('cat /proc/net/snmp'),
-  disk._('df'),
+  disk._(
+    'lsblk --bytes --json --output FSTYPE,PATH,NAME,KNAME,MOUNTPOINT,FSSIZE,FSUSED,FSAVAIL,FSUSE%,UUID',
+  ),
   mem._("cat /proc/meminfo | grep -E 'Mem|Swap'"),
   tempType._('cat /sys/class/thermal/thermal_zone*/type'),
   tempVal._('cat /sys/class/thermal/thermal_zone*/temp'),
   host._('cat /etc/hostname'),
   diskio._('cat /proc/diskstats'),
   battery._(
-      'for f in /sys/class/power_supply/*/uevent; do cat "\$f"; echo; done'),
+    'for f in /sys/class/power_supply/*/uevent; do cat "\$f"; echo; done',
+  ),
   nvidia._('nvidia-smi -q -x'),
   sensors._('sensors'),
-  cpuBrand._('cat /proc/cpuinfo | grep "model name"'),
-  ;
+  diskSmart._('for d in \$(lsblk -dn -o KNAME); do smartctl -j /dev/\$d; echo; done'),
+  cpuBrand._('cat /proc/cpuinfo | grep "model name"');
 
   final String cmd;
 
@@ -234,12 +240,12 @@ enum BSDStatusCmdType {
   sys._('uname -or'),
   cpu._('top -l 1 | grep "CPU usage"'),
   uptime._('uptime'),
+  // Keep df -k for BSD systems as lsblk is not available on macOS/BSD
   disk._('df -k'),
   mem._('top -l 1 | grep PhysMem'),
   //temp,
   host._('hostname'),
-  cpuBrand._('sysctl -n machdep.cpu.brand_string'),
-  ;
+  cpuBrand._('sysctl -n machdep.cpu.brand_string');
 
   final String cmd;
 
@@ -248,10 +254,10 @@ enum BSDStatusCmdType {
 
 extension StatusCmdTypeX on StatusCmdType {
   String get i18n => switch (this) {
-        StatusCmdType.sys => l10n.system,
-        StatusCmdType.host => l10n.host,
-        StatusCmdType.uptime => l10n.uptime,
-        StatusCmdType.battery => l10n.battery,
-        final val => val.name,
-      };
+    StatusCmdType.sys => l10n.system,
+    StatusCmdType.host => l10n.host,
+    StatusCmdType.uptime => l10n.uptime,
+    StatusCmdType.battery => l10n.battery,
+    final val => val.name,
+  };
 }

lib/data/model/app/sync.dart

@@ -1,24 +0,0 @@
-import 'dart:async';
-
-class SyncResult<T, E> {
-  final List<T> up;
-  final List<T> down;
-  final Map<T, E> err;
-
-  const SyncResult({
-    required this.up,
-    required this.down,
-    required this.err,
-  });
-
-  @override
-  String toString() {
-    return 'SyncResult{up: $up, down: $down, err: $err}';
-  }
-}
-
-abstract class SyncIface<T> {
-  /// Merge [other] into [this], return [this] after merge.
-  /// Data in [other] has higher priority than [this].
-  FutureOr<void> sync(T other);
-}

lib/data/model/app/tab.dart

@@ -1,26 +1,96 @@
+import 'package:fl_lib/fl_lib.dart';
 import 'package:flutter/material.dart';
-import 'package:server_box/view/page/ping.dart';
-import 'package:server_box/view/page/server/tab.dart';
+import 'package:icons_plus/icons_plus.dart';
+import 'package:server_box/core/extension/context/locale.dart';
+import 'package:server_box/view/page/server/tab/tab.dart';
+// import 'package:server_box/view/page/setting/entry.dart';
 import 'package:server_box/view/page/snippet/list.dart';
 import 'package:server_box/view/page/ssh/tab.dart';
+import 'package:server_box/view/page/storage/local.dart';
 
 enum AppTab {
   server,
   ssh,
+  file,
   snippet,
-  ping,
+  //settings,
   ;
 
   Widget get page {
-    switch (this) {
-      case server:
-        return const ServerPage();
-      case snippet:
-        return const SnippetListPage();
-      case ssh:
-        return const SSHTabPage();
-      case ping:
-        return const PingPage();
-    }
+    return switch (this) {
+      server => const ServerPage(),
+      //settings => const SettingsPage(),
+      ssh => const SSHTabPage(),
+      file => const LocalFilePage(),
+      snippet => const SnippetListPage(),
+    };
+  }
+
+  NavigationDestination get navDestination {
+    return switch (this) {
+      server => NavigationDestination(
+          icon: const Icon(BoxIcons.bx_server),
+          label: l10n.server,
+          selectedIcon: const Icon(BoxIcons.bxs_server),
+        ),
+      // settings => NavigationDestination(
+      //     icon: const Icon(Icons.settings),
+      //     label: libL10n.setting,
+      //     selectedIcon: const Icon(Icons.settings),
+      //   ),
+      ssh => const NavigationDestination(
+          icon: Icon(Icons.terminal_outlined),
+          label: 'SSH',
+          selectedIcon: Icon(Icons.terminal),
+        ),
+      snippet => NavigationDestination(
+          icon: const Icon(Icons.code),
+          label: l10n.snippet,
+          selectedIcon: const Icon(Icons.code),
+        ),
+      file => NavigationDestination(
+          icon: const Icon(Icons.folder_open),
+          label: libL10n.file,
+          selectedIcon: const Icon(Icons.folder),
+        ),
+    };
+  }
+
+  NavigationRailDestination get navRailDestination {
+    return switch (this) {
+      server => NavigationRailDestination(
+          icon: const Icon(BoxIcons.bx_server),
+          label: Text(l10n.server),
+          selectedIcon: const Icon(BoxIcons.bxs_server),
+        ),
+      // settings => NavigationRailDestination(
+      //     icon: const Icon(Icons.settings),
+      //     label: libL10n.setting,
+      //     selectedIcon: const Icon(Icons.settings),
+      //   ),
+      ssh => const NavigationRailDestination(
+          icon: Icon(Icons.terminal_outlined),
+          label: Text('SSH'),
+          selectedIcon: Icon(Icons.terminal),
+        ),
+      snippet => NavigationRailDestination(
+          icon: const Icon(Icons.code),
+          label: Text(l10n.snippet),
+          selectedIcon: const Icon(Icons.code),
+        ),
+      file => NavigationRailDestination(
+          icon: const Icon(Icons.folder_open),
+          label: Text(libL10n.file),
+          selectedIcon: const Icon(Icons.folder),
+        ),
+    };
+  }
+
+  static List<NavigationDestination> get navDestinations {
+    return AppTab.values.map((e) => e.navDestination).toList();
+  }
+
+  static List<NavigationRailDestination> get navRailDestinations {
+    return AppTab.values.map((e) => e.navRailDestination).toList();
   }
 }

lib/data/model/app/tag_pickable.dart

@@ -1,5 +0,0 @@
-abstract class TagPickable {
-  bool containsTag(String tag);
-
-  String get tagName;
-}

lib/data/model/container/image.dart

@@ -45,21 +45,21 @@ final class PodmanImg implements ContainerImg {
   String toRawJson() => json.encode(toJson());
 
   factory PodmanImg.fromJson(Map<String, dynamic> json) => PodmanImg(
-        repository: json["repository"],
-        tag: json["tag"],
-        id: json["Id"],
-        created: json["Created"],
-        size: json["Size"],
-        containers: json["Containers"],
+        repository: json['repository'],
+        tag: json['tag'],
+        id: json['Id'],
+        created: json['Created'],
+        size: json['Size'],
+        containers: json['Containers'],
       );
 
   Map<String, dynamic> toJson() => {
-        "repository": repository,
-        "tag": tag,
-        "Id": id,
-        "Created": created,
-        "Size": size,
-        "Containers": containers,
+        'repository': repository,
+        'tag': tag,
+        'Id': id,
+        'Created': created,
+        'Size': size,
+        'Containers': containers,
       };
 }
 
@@ -96,36 +96,36 @@ final class DockerImg implements ContainerImg {
   String toRawJson() => json.encode(toJson());
 
   factory DockerImg.fromJson(Map<String, dynamic> json) {
-    final containers = switch (json["Containers"]) {
+    final containers = switch (json['Containers']) {
       final String a => a,
       final Object? a => a.toString(),
     };
-    final repo = switch (json["Repository"] ?? json["Names"]) {
+    final repo = switch (json['Repository'] ?? json['Names']) {
       final String a => a,
       final List a => a.firstOrNull.toString(),
       final Object? a => a.toString(),
     };
-    final size = switch (json["Size"]) {
+    final size = switch (json['Size']) {
       final String a => a,
       final int a => a.bytes2Str,
       final Object? a => a.toString(),
     };
     return DockerImg(
       containers: containers,
-      createdAt: json["CreatedAt"],
-      id: json["ID"] ?? json["Id"] ?? '',
+      createdAt: json['CreatedAt'],
+      id: json['ID'] ?? json['Id'] ?? '',
       repository: repo,
       size: size,
-      tag: json["Tag"],
+      tag: json['Tag'],
     );
   }
 
   Map<String, dynamic> toJson() => {
-        "Containers": containers,
-        "CreatedAt": createdAt,
-        "ID": id,
-        "Repository": repository,
-        "Size": size,
-        "Tag": tag,
+        'Containers': containers,
+        'CreatedAt': createdAt,
+        'ID': id,
+        'Repository': repository,
+        'Size': size,
+        'Tag': tag,
       };
 }

lib/data/model/container/ps.dart

@@ -84,29 +84,29 @@ final class PodmanPs implements ContainerPs {
   String toRawJson() => json.encode(toJson());
 
   factory PodmanPs.fromJson(Map<String, dynamic> json) => PodmanPs(
-        command: json["Command"] == null
+        command: json['Command'] == null
             ? []
-            : List<String>.from(json["Command"]!.map((x) => x)),
+            : List<String>.from(json['Command']!.map((x) => x)),
         created:
-            json["Created"] == null ? null : DateTime.parse(json["Created"]),
-        exited: json["Exited"],
-        id: json["Id"],
-        image: json["Image"],
-        names: json["Names"] == null
+            json['Created'] == null ? null : DateTime.parse(json['Created']),
+        exited: json['Exited'],
+        id: json['Id'],
+        image: json['Image'],
+        names: json['Names'] == null
             ? []
-            : List<String>.from(json["Names"]!.map((x) => x)),
-        startedAt: json["StartedAt"],
+            : List<String>.from(json['Names']!.map((x) => x)),
+        startedAt: json['StartedAt'],
       );
 
   Map<String, dynamic> toJson() => {
-        "Command":
+        'Command':
             command == null ? [] : List<dynamic>.from(command!.map((x) => x)),
-        "Created": created?.toIso8601String(),
-        "Exited": exited,
-        "Id": id,
-        "Image": image,
-        "Names": names == null ? [] : List<dynamic>.from(names!.map((x) => x)),
-        "StartedAt": startedAt,
+        'Created': created?.toIso8601String(),
+        'Exited': exited,
+        'Id': id,
+        'Image': image,
+        'Names': names == null ? [] : List<dynamic>.from(names!.map((x) => x)),
+        'StartedAt': startedAt,
       };
 }
 

lib/data/model/pkg/manager.dart

@@ -22,8 +22,6 @@ enum PkgManager {
         return 'opkg list-upgradable';
       case PkgManager.apk:
         return 'apk list --upgradable';
-      default:
-        return null;
     }
   }
 
@@ -56,8 +54,6 @@ enum PkgManager {
         return 'opkg upgrade $args';
       case PkgManager.apk:
         return 'apk upgrade';
-      default:
-        return null;
     }
   }
 
@@ -109,6 +105,7 @@ enum PkgManager {
         return PkgManager.apt;
       case Dist.opensuse:
         return PkgManager.zypper;
+      case Dist.coreelec:
       case Dist.wrt:
         return PkgManager.opkg;
       case Dist.arch:

lib/data/model/pkg/upgrade_info.dart

@@ -34,9 +34,9 @@ class UpgradePkgInfo {
   }
 
   void _parseApt(String raw) {
-    final split1 = raw.split("/");
+    final split1 = raw.split('/');
     package = split1[0];
-    final split2 = split1[1].split(" ");
+    final split2 = split1[1].split(' ');
     newVersion = split2[1];
     arch = split2[2];
     nowVersion = split2[5].replaceFirst(']', '');
@@ -53,7 +53,7 @@ class UpgradePkgInfo {
   }
 
   void _parseZypper(String raw) {
-    final cols = raw.split("|");
+    final cols = raw.split('|');
     package = cols[2].trim();
     nowVersion = cols[3].trim();
     newVersion = cols[4].trim();

lib/data/model/server/conn.dart

@@ -1,4 +1,4 @@
-import '../../res/misc.dart';
+import 'package:server_box/data/res/misc.dart';
 
 class Conn {
   final int maxConn;

lib/data/model/server/custom.dart

@@ -1,24 +1,29 @@
-import 'package:hive_flutter/adapters.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'custom.g.dart';
 
-@HiveType(typeId: 7)
+@JsonSerializable(includeIfNull: false)
 final class ServerCustom {
   // @HiveField(0)
   // final String? temperature;
-  @HiveField(1)
+
   final String? pveAddr;
-  @HiveField(2, defaultValue: false)
+
   final bool pveIgnoreCert;
 
   /// {"title": "cmd"}
-  @HiveField(3)
   final Map<String, String>? cmds;
-  @HiveField(4)
+
   final String? preferTempDev;
-  @HiveField(5)
+
   final String? logoUrl;
 
+  /// The device name of the network interface displayed in the home server card.
+  final String? netDev;
+
+  /// The directory where the script is stored.
+  final String? scriptDir;
+
   const ServerCustom({
     //this.temperature,
     this.pveAddr,
@@ -26,51 +31,13 @@ final class ServerCustom {
     this.cmds,
     this.preferTempDev,
     this.logoUrl,
+    this.netDev,
+    this.scriptDir,
   });
 
-  static ServerCustom fromJson(Map<String, dynamic> json) {
-    //final temperature = json["temperature"] as String?;
-    final pveAddr = json["pveAddr"] as String?;
-    final pveIgnoreCert = json["pveIgnoreCert"] as bool;
-    final cmds = json["cmds"] as Map<String, dynamic>?;
-    final preferTempDev = json["preferTempDev"] as String?;
-    final logoUrl = json["logoUrl"] as String?;
-    return ServerCustom(
-      //temperature: temperature,
-      pveAddr: pveAddr,
-      pveIgnoreCert: pveIgnoreCert,
-      cmds: cmds?.cast<String, String>(),
-      preferTempDev: preferTempDev,
-      logoUrl: logoUrl,
-    );
-  }
+  factory ServerCustom.fromJson(Map<String, dynamic> json) => _$ServerCustomFromJson(json);
 
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    // if (temperature != null) {
-    //   json["temperature"] = temperature;
-    // }
-    if (pveAddr != null) {
-      json["pveAddr"] = pveAddr;
-    }
-    json["pveIgnoreCert"] = pveIgnoreCert;
-
-    if (cmds != null) {
-      json["cmds"] = cmds;
-    }
-    if (preferTempDev != null) {
-      json["preferTempDev"] = preferTempDev;
-    }
-    if (logoUrl != null) {
-      json["logoUrl"] = logoUrl;
-    }
-    return json;
-  }
-
-  @override
-  String toString() {
-    return toJson().toString();
-  }
+  Map<String, dynamic> toJson() => _$ServerCustomToJson(this);
 
   @override
   bool operator ==(Object other) {
@@ -80,7 +47,9 @@ final class ServerCustom {
         other.pveIgnoreCert == pveIgnoreCert &&
         other.cmds == cmds &&
         other.preferTempDev == preferTempDev &&
-        other.logoUrl == logoUrl;
+        other.logoUrl == logoUrl &&
+        other.netDev == netDev &&
+        other.scriptDir == scriptDir;
   }
 
   @override
@@ -90,5 +59,7 @@ final class ServerCustom {
       pveIgnoreCert.hashCode ^
       cmds.hashCode ^
       preferTempDev.hashCode ^
-      logoUrl.hashCode;
+      logoUrl.hashCode ^
+      netDev.hashCode ^
+      scriptDir.hashCode;
 }

lib/data/model/server/custom.g.dart

@@ -3,51 +3,28 @@
 part of 'custom.dart';
 
 // **************************************************************************
-// TypeAdapterGenerator
+// JsonSerializableGenerator
 // **************************************************************************
 
-class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
-  @override
-  final int typeId = 7;
+ServerCustom _$ServerCustomFromJson(Map<String, dynamic> json) => ServerCustom(
+  pveAddr: json['pveAddr'] as String?,
+  pveIgnoreCert: json['pveIgnoreCert'] as bool? ?? false,
+  cmds: (json['cmds'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, e as String),
+  ),
+  preferTempDev: json['preferTempDev'] as String?,
+  logoUrl: json['logoUrl'] as String?,
+  netDev: json['netDev'] as String?,
+  scriptDir: json['scriptDir'] as String?,
+);
 
-  @override
-  ServerCustom read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+Map<String, dynamic> _$ServerCustomToJson(ServerCustom instance) =>
+    <String, dynamic>{
+      if (instance.pveAddr case final value?) 'pveAddr': value,
+      'pveIgnoreCert': instance.pveIgnoreCert,
+      if (instance.cmds case final value?) 'cmds': value,
+      if (instance.preferTempDev case final value?) 'preferTempDev': value,
+      if (instance.logoUrl case final value?) 'logoUrl': value,
+      if (instance.netDev case final value?) 'netDev': value,
+      if (instance.scriptDir case final value?) 'scriptDir': value,
     };
-    return ServerCustom(
-      pveAddr: fields[1] as String?,
-      pveIgnoreCert: fields[2] == null ? false : fields[2] as bool,
-      cmds: (fields[3] as Map?)?.cast<String, String>(),
-      preferTempDev: fields[4] as String?,
-      logoUrl: fields[5] as String?,
-    );
-  }
-
-  @override
-  void write(BinaryWriter writer, ServerCustom obj) {
-    writer
-      ..writeByte(5)
-      ..writeByte(1)
-      ..write(obj.pveAddr)
-      ..writeByte(2)
-      ..write(obj.pveIgnoreCert)
-      ..writeByte(3)
-      ..write(obj.cmds)
-      ..writeByte(4)
-      ..write(obj.preferTempDev)
-      ..writeByte(5)
-      ..write(obj.logoUrl);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is ServerCustomAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}

lib/data/model/server/disk.dart

@@ -1,29 +1,208 @@
+import 'dart:convert';
+
+import 'package:equatable/equatable.dart';
 import 'package:fl_lib/fl_lib.dart';
 import 'package:server_box/data/model/server/time_seq.dart';
 
-import '../../res/misc.dart';
+import 'package:server_box/data/res/misc.dart';
 
-class Disk {
-  final String fs;
+class Disk with EquatableMixin {
+  final String path;
+  final String? fsTyp;
   final String mount;
   final int usedPercent;
   final BigInt used;
   final BigInt size;
   final BigInt avail;
 
+  /// Device name (e.g., sda1, nvme0n1p1)
+  final String? name;
+
+  /// Internal kernel device name
+  final String? kname;
+
+  /// Filesystem UUID
+  final String? uuid;
+
+  /// Child disks (partitions)
+  final List<Disk> children;
+
   const Disk({
-    required this.fs,
+    required this.path,
+    this.fsTyp,
     required this.mount,
     required this.usedPercent,
     required this.used,
     required this.size,
     required this.avail,
+    this.name,
+    this.kname,
+    this.uuid,
+    this.children = const [],
   });
 
   static List<Disk> parse(String raw) {
+    final list = <Disk>[];
+    raw = raw.trim();
+    try {
+      if (raw.startsWith('{')) {
+        // Parse JSON output from lsblk command
+        final Map<String, dynamic> jsonData = json.decode(raw);
+        final List<dynamic> blockdevices = jsonData['blockdevices'] ?? [];
+
+        for (final device in blockdevices) {
+          // Process each device
+          _processTopLevelDevice(device, list);
+        }
+      } else {
+        // Fallback to the old parsing method in case of non-JSON output
+        return _parseWithOldMethod(raw);
+      }
+    } catch (e) {
+      Loggers.app.warning('Failed to parse disk info: $e', e);
+    }
+    return list;
+  }
+
+  /// Process a top-level device and add all valid disks to the list
+  static void _processTopLevelDevice(Map<String, dynamic> device, List<Disk> list) {
+    final disk = _processDiskDevice(device);
+    if (disk != null) {
+      list.add(disk);
+    }
+    
+    // For devices with children (like physical disks with partitions),
+    // also process each child individually to ensure BTRFS RAID disks are properly handled
+    final List<dynamic> childDevices = device['children'] ?? [];
+    for (final childDevice in childDevices) {
+      final String childPath = childDevice['path']?.toString() ?? '';
+      final String childFsType = childDevice['fstype']?.toString() ?? '';
+      
+      // If this is a BTRFS partition, add it directly to ensure it's properly represented
+      if (childFsType == 'btrfs' && childPath.isNotEmpty) {
+        final childDisk = _processSingleDevice(childDevice);
+        if (childDisk != null) {
+          list.add(childDisk);
+        }
+      }
+    }
+  }
+
+  /// Process a single device without recursively processing its children
+  static Disk? _processSingleDevice(Map<String, dynamic> device) {
+    final fstype = device['fstype']?.toString();
+    final String mountpoint = device['mountpoint']?.toString() ?? '';
+    final String path = device['path']?.toString() ?? '';
+    
+    if (path.isEmpty || (fstype == null && mountpoint.isEmpty)) {
+      return null;
+    }
+    
+    if (!_shouldCalc(fstype ?? '', mountpoint)) {
+      return null;
+    }
+
+    final sizeStr = device['fssize']?.toString() ?? '0';
+    final size = (BigInt.tryParse(sizeStr) ?? BigInt.zero) ~/ BigInt.from(1024);
+
+    final usedStr = device['fsused']?.toString() ?? '0';
+    final used = (BigInt.tryParse(usedStr) ?? BigInt.zero) ~/ BigInt.from(1024);
+
+    final availStr = device['fsavail']?.toString() ?? '0';
+    final avail = (BigInt.tryParse(availStr) ?? BigInt.zero) ~/ BigInt.from(1024);
+
+    // Parse fsuse% which is usually in the format "45%"
+    String usePercentStr = device['fsuse%']?.toString() ?? '0';
+    usePercentStr = usePercentStr.replaceAll('%', '');
+    final usedPercent = int.tryParse(usePercentStr) ?? 0;
+
+    final name = device['name']?.toString();
+    final kname = device['kname']?.toString();
+    final uuid = device['uuid']?.toString();
+
+    return Disk(
+      path: path,
+      fsTyp: fstype,
+      mount: mountpoint,
+      usedPercent: usedPercent,
+      used: used,
+      size: size,
+      avail: avail,
+      name: name,
+      kname: kname,
+      uuid: uuid,
+      children: const [], // No children for direct device
+    );
+  }
+
+  static Disk? _processDiskDevice(Map<String, dynamic> device) {
+    final fstype = device['fstype']?.toString();
+    final String mountpoint = device['mountpoint']?.toString() ?? '';
+
+    // For parent devices that don't have a mountpoint themselves
+    final String path = device['path']?.toString() ?? '';
+    final String mount = mountpoint;
+    final List<Disk> childDisks = [];
+
+    // Process children devices recursively
+    final List<dynamic> childDevices = device['children'] ?? [];
+    for (final childDevice in childDevices) {
+      final childDisk = _processDiskDevice(childDevice);
+      if (childDisk != null) {
+        childDisks.add(childDisk);
+      }
+    }
+
+    // Handle common filesystem cases or parent devices with children
+    if ((fstype != null && _shouldCalc(fstype, mount)) ||
+        (childDisks.isNotEmpty && path.isNotEmpty)) {
+      final sizeStr = device['fssize']?.toString() ?? '0';
+      final size = (BigInt.tryParse(sizeStr) ?? BigInt.zero) ~/ BigInt.from(1024);
+
+      final usedStr = device['fsused']?.toString() ?? '0';
+      final used = (BigInt.tryParse(usedStr) ?? BigInt.zero) ~/ BigInt.from(1024);
+
+      final availStr = device['fsavail']?.toString() ?? '0';
+      final avail = (BigInt.tryParse(availStr) ?? BigInt.zero) ~/ BigInt.from(1024);
+
+      // Parse fsuse% which is usually in the format "45%"
+      String usePercentStr = device['fsuse%']?.toString() ?? '0';
+      usePercentStr = usePercentStr.replaceAll('%', '');
+      final usedPercent = int.tryParse(usePercentStr) ?? 0;
+
+      final name = device['name']?.toString();
+      final kname = device['kname']?.toString();
+      final uuid = device['uuid']?.toString();
+
+      return Disk(
+        path: path,
+        fsTyp: fstype,
+        mount: mount,
+        usedPercent: usedPercent,
+        used: used,
+        size: size,
+        avail: avail,
+        name: name,
+        kname: kname,
+        uuid: uuid,
+        children: childDisks,
+      );
+    } else if (childDisks.isNotEmpty) {
+      // If this is a parent device with no filesystem but has children,
+      // return the first valid child instead
+      if (childDisks.isNotEmpty) {
+        return childDisks.first;
+      }
+    }
+
+    return null;
+  }
+
+  // Fallback to the old parsing method in case JSON parsing fails
+  static List<Disk> _parseWithOldMethod(String raw) {
     final list = <Disk>[];
     final items = raw.split('\n');
-    items.removeAt(0);
+    if (items.isNotEmpty) items.removeAt(0);
     var pathCache = '';
     for (var item in items) {
       if (item.isEmpty) {
@@ -43,12 +222,12 @@ class Disk {
         final mount = vals[5];
         if (!_shouldCalc(fs, mount)) continue;
         list.add(Disk(
-          fs: fs,
+          path: fs,
           mount: mount,
           usedPercent: int.parse(vals[4].replaceFirst('%', '')),
-          used: BigInt.parse(vals[2]),
-          size: BigInt.parse(vals[1]),
-          avail: BigInt.parse(vals[3]),
+          used: BigInt.parse(vals[2]) ~/ BigInt.from(1024),
+          size: BigInt.parse(vals[1]) ~/ BigInt.from(1024),
+          avail: BigInt.parse(vals[3]) ~/ BigInt.from(1024),
         ));
       } catch (e) {
         continue;
@@ -58,9 +237,8 @@ class Disk {
   }
 
   @override
-  String toString() {
-    return 'Disk{dev: $fs, mount: $mount, usedPercent: $usedPercent, used: $used, size: $size, avail: $avail}';
-  }
+  List<Object?> get props =>
+      [path, name, kname, fsTyp, mount, usedPercent, used, size, avail, uuid, children];
 }
 
 class DiskIO extends TimeSeq<List<DiskIOPiece>> {
@@ -72,9 +250,16 @@ class DiskIO extends TimeSeq<List<DiskIOPiece>> {
   }
 
   (double?, double?) _getSpeed(String dev) {
-    if (dev.startsWith('/dev/')) dev = dev.substring(5);
-    final old = pre.firstWhereOrNull((e) => e.dev == dev);
-    final new_ = now.firstWhereOrNull((e) => e.dev == dev);
+    // Extract the device name from path if needed
+    String searchDev = dev;
+    if (dev.startsWith('/dev/')) {
+      searchDev = dev.substring(5);
+    }
+
+    // Try to find by exact device name first
+    final old = pre.firstWhereOrNull((e) => e.dev == searchDev);
+    final new_ = now.firstWhereOrNull((e) => e.dev == searchDev);
+
     if (old == null || new_ == null) return (null, null);
     final sectorsRead = new_.sectorsRead - old.sectorsRead;
     final sectorsWrite = new_.sectorsWrite - old.sectorsWrite;
@@ -104,11 +289,14 @@ class DiskIO extends TimeSeq<List<DiskIOPiece>> {
           !item.dev.startsWith('vd') &&
           !item.dev.startsWith('hd') &&
           !item.dev.startsWith('mmcblk') &&
-          !item.dev.startsWith('sr')) continue;
+          !item.dev.startsWith('sr')) {
+        continue;
+      }
       final (read_, write_) = _getSpeed(item.dev);
       read += read_ ?? 0;
       write += write_ ?? 0;
     }
+
     final readStr = '${read.bytes2Str}/s';
     final writeStr = '${write.bytes2Str}/s';
     return (readStr, writeStr);
@@ -166,7 +354,11 @@ class DiskUsage {
     required this.size,
   });
 
-  double get usedPercent => used / size * 100;
+  double get usedPercent {
+    // Avoid division by zero
+    if (size == BigInt.zero) return 0;
+    return used / size * 100;
+  }
 
   /// Find all devs, add their used and size
   static DiskUsage parse(List<Disk> disks) {
@@ -174,9 +366,12 @@ class DiskUsage {
     var used = BigInt.zero;
     var size = BigInt.zero;
     for (var disk in disks) {
-      if (!_shouldCalc(disk.fs, disk.mount)) continue;
-      if (devs.contains(disk.fs)) continue;
-      devs.add(disk.fs);
+      if (!_shouldCalc(disk.path, disk.mount)) continue;
+      // Use a combination of path and kernel name to uniquely identify disks
+      // This helps distinguish between multiple physical disks in BTRFS RAID setups
+      final uniqueId = '${disk.path}:${disk.kname ?? "unknown"}';
+      if (devs.contains(uniqueId)) continue;
+      devs.add(uniqueId);
       used += disk.used;
       size += disk.size;
     }
@@ -185,12 +380,24 @@ class DiskUsage {
 }
 
 bool _shouldCalc(String fs, String mount) {
+  // Skip swap partitions
+  // if (mount == '[SWAP]') return false;
+
+  // Include standard filesystems
   if (fs.startsWith('/dev')) return true;
   // Some NAS may have mounted path like this `//192.168.1.2/`
   if (fs.startsWith('//')) return true;
   if (mount.startsWith('/mnt')) return true;
-  // if (fs.startsWith('shm') ||
-  //     fs.startsWith('overlay') ||
-  //     fs.startsWith('tmpfs')) return false;
-  return false;
+
+  // Include common filesystem types
+  // final commonFsTypes = ['ext2', 'ext3', 'ext4', 'xfs', 'btrfs', 'zfs', 'ntfs', 'fat', 'vfat'];
+  // if (commonFsTypes.any((type) => fs.toLowerCase() == type)) return true;
+
+  // Skip special filesystems
+  // if (fs == 'LVM2_member' || fs == 'crypto_LUKS') return false;
+  if (fs.startsWith('shm') || fs.startsWith('overlay') || fs.startsWith('tmpfs')) {
+    return false;
+  }
+
+  return true;
 }

lib/data/model/server/disk_smart.dart

@@ -0,0 +1,204 @@
+import 'dart:convert';
+
+import 'package:fl_lib/fl_lib.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'disk_smart.freezed.dart';
+part 'disk_smart.g.dart';
+
+@freezed
+class DiskSmart with _$DiskSmart {
+  const DiskSmart._();
+
+  const factory DiskSmart({
+    required String device,
+    bool? healthy,
+    double? temperature,
+    String? model,
+    String? serial,
+    int? powerOnHours,
+    int? powerCycleCount,
+    required Map<String, dynamic> rawData,
+    required Map<String, SmartAttribute> smartAttributes,
+  }) = _DiskSmart;
+
+  factory DiskSmart.fromJson(Map<String, dynamic> json) => _$DiskSmartFromJson(json);
+
+  static List<DiskSmart> parse(String raw) {
+    final results = <DiskSmart>[];
+
+    final jsonBlocks = raw.split('\n\n').where((s) => s.trim().isNotEmpty);
+
+    for (final jsonStr in jsonBlocks) {
+      try {
+        final data = json.decode(jsonStr.trim()) as Map<String, dynamic>;
+
+        // Basic
+        final device = data['device']?['name']?.toString() ?? '';
+        final healthy = data['smart_status']?['passed'] as bool?;
+
+        // Model and Serial
+        final model =
+            data['model_name']?.toString() ??
+            data['model_family']?.toString() ??
+            data['device']?['model_name']?.toString();
+        final serial = data['serial_number']?.toString() ?? data['device']?['serial_number']?.toString();
+
+        // SMART Attrs
+        final smartAttributes = _parseSmartAttributes(data);
+        final temperature = _extractTemperature(data, smartAttributes);
+        final powerOnHours =
+            data['power_on_time']?['hours'] as int? ?? smartAttributes['Power_On_Hours']?.rawValue as int?;
+        final powerCycleCount =
+            data['power_cycle_count'] as int? ?? smartAttributes['Power_Cycle_Count']?.rawValue as int?;
+
+        results.add(
+          DiskSmart(
+            device: device,
+            healthy: healthy,
+            temperature: temperature,
+            model: model,
+            serial: serial,
+            powerOnHours: powerOnHours,
+            powerCycleCount: powerCycleCount,
+            rawData: data,
+            smartAttributes: smartAttributes,
+          ),
+        );
+      } catch (e, s) {
+        Loggers.app.warning('DiskSmart parse', e, s);
+      }
+    }
+    return results;
+  }
+
+  static Map<String, SmartAttribute> _parseSmartAttributes(Map<String, dynamic> data) {
+    final attributes = <String, SmartAttribute>{};
+
+    final attrTable = data['ata_smart_attributes']?['table'] as List?;
+    if (attrTable == null) return attributes;
+
+    for (final attr in attrTable) {
+      if (attr is Map<String, dynamic>) {
+        final name = attr['name']?.toString();
+        if (name != null) {
+          attributes[name] = SmartAttribute(
+            id: attr['id'] as int?,
+            name: name,
+            value: attr['value'] as int?,
+            worst: attr['worst'] as int?,
+            thresh: attr['thresh'] as int?,
+            whenFailed: attr['when_failed']?.toString(),
+            rawValue: attr['raw']?['value'],
+            rawString: attr['raw']?['string']?.toString(),
+            flags: SmartAttributeFlags.fromMap(attr['flags'] as Map<String, dynamic>? ?? {}),
+          );
+        }
+      }
+    }
+
+    return attributes;
+  }
+
+  static final _tempReg = RegExp(r'^(\d+(?:\.\d+)?)');
+
+  /// Extract temperature from the data
+  static double? _extractTemperature(Map<String, dynamic> data, Map<String, SmartAttribute> attrs) {
+    // Directly
+    final directTemp = data['temperature']?['current'];
+    if (directTemp is num) return directTemp.toDouble();
+
+    // SMART attribute
+    final tempAttr = attrs['Temperature_Celsius'];
+    if (tempAttr != null) {
+      // "35 (Min/Max 14/61)"
+      final rawString = tempAttr.rawString;
+      if (rawString != null) {
+        final match = _tempReg.firstMatch(rawString);
+        if (match != null) {
+          return double.tryParse(match.group(1)!);
+        }
+      }
+
+      // Simple numeric value
+      if (tempAttr.rawValue is num && tempAttr.rawValue! < 150) {
+        return tempAttr.rawValue!.toDouble();
+      }
+    }
+
+    return null;
+  }
+
+  /// Get the specific SMART attribute by name
+  SmartAttribute? getAttribute(String name) => smartAttributes[name];
+
+  int? get ssdLifeLeft => smartAttributes['SSD_Life_Left']?.rawValue as int?;
+  int? get lifetimeWritesGiB => smartAttributes['Lifetime_Writes_GiB']?.rawValue as int?;
+  int? get lifetimeReadsGiB => smartAttributes['Lifetime_Reads_GiB']?.rawValue as int?;
+  int? get unsafeShutdownCount => smartAttributes['Unsafe_Shutdown_Count']?.rawValue as int?;
+  int? get averageEraseCount => smartAttributes['Average_Erase_Count']?.rawValue as int?;
+  int? get maxEraseCount => smartAttributes['Max_Erase_Count']?.rawValue as int?;
+
+  @override
+  String toString() => 'DiskSmart($device)';
+}
+
+@freezed
+class SmartAttribute with _$SmartAttribute {
+  const SmartAttribute._();
+
+  const factory SmartAttribute({
+    int? id,
+    required String name,
+    int? value,
+    int? worst,
+    int? thresh,
+    String? whenFailed,
+    dynamic rawValue,
+    String? rawString,
+    required SmartAttributeFlags flags,
+  }) = _SmartAttribute;
+
+  factory SmartAttribute.fromJson(Map<String, dynamic> json) => _$SmartAttributeFromJson(json);
+
+  @override
+  String toString() {
+    return 'SmartAttribute(id: $id, name: $name)';
+  }
+}
+
+@freezed
+class SmartAttributeFlags with _$SmartAttributeFlags {
+  const SmartAttributeFlags._();
+
+  const factory SmartAttributeFlags({
+    int? value,
+    String? string,
+    @Default(false) bool prefailure,
+    @Default(false) bool updatedOnline,
+    @Default(false) bool performance,
+    @Default(false) bool errorRate,
+    @Default(false) bool eventCount,
+    @Default(false) bool autoKeep,
+  }) = _SmartAttributeFlags;
+
+  factory SmartAttributeFlags.fromJson(Map<String, dynamic> json) => _$SmartAttributeFlagsFromJson(json);
+
+  factory SmartAttributeFlags.fromMap(Map<String, dynamic> map) {
+    return SmartAttributeFlags(
+      value: map['value'] as int?,
+      string: map['string']?.toString(),
+      prefailure: map['prefailure'] == true,
+      updatedOnline: map['updated_online'] == true,
+      performance: map['performance'] == true,
+      errorRate: map['error_rate'] == true,
+      eventCount: map['event_count'] == true,
+      autoKeep: map['auto_keep'] == true,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'SmartAttributeFlags(value: $value, string: $string)';
+  }
+}

lib/data/model/server/disk_smart.g.dart

@@ -0,0 +1,91 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'disk_smart.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$DiskSmartImpl _$$DiskSmartImplFromJson(Map<String, dynamic> json) =>
+    _$DiskSmartImpl(
+      device: json['device'] as String,
+      healthy: json['healthy'] as bool?,
+      temperature: (json['temperature'] as num?)?.toDouble(),
+      model: json['model'] as String?,
+      serial: json['serial'] as String?,
+      powerOnHours: (json['powerOnHours'] as num?)?.toInt(),
+      powerCycleCount: (json['powerCycleCount'] as num?)?.toInt(),
+      rawData: json['rawData'] as Map<String, dynamic>,
+      smartAttributes: (json['smartAttributes'] as Map<String, dynamic>).map(
+        (k, e) =>
+            MapEntry(k, SmartAttribute.fromJson(e as Map<String, dynamic>)),
+      ),
+    );
+
+Map<String, dynamic> _$$DiskSmartImplToJson(_$DiskSmartImpl instance) =>
+    <String, dynamic>{
+      'device': instance.device,
+      'healthy': instance.healthy,
+      'temperature': instance.temperature,
+      'model': instance.model,
+      'serial': instance.serial,
+      'powerOnHours': instance.powerOnHours,
+      'powerCycleCount': instance.powerCycleCount,
+      'rawData': instance.rawData,
+      'smartAttributes': instance.smartAttributes,
+    };
+
+_$SmartAttributeImpl _$$SmartAttributeImplFromJson(Map<String, dynamic> json) =>
+    _$SmartAttributeImpl(
+      id: (json['id'] as num?)?.toInt(),
+      name: json['name'] as String,
+      value: (json['value'] as num?)?.toInt(),
+      worst: (json['worst'] as num?)?.toInt(),
+      thresh: (json['thresh'] as num?)?.toInt(),
+      whenFailed: json['whenFailed'] as String?,
+      rawValue: json['rawValue'],
+      rawString: json['rawString'] as String?,
+      flags: SmartAttributeFlags.fromJson(
+        json['flags'] as Map<String, dynamic>,
+      ),
+    );
+
+Map<String, dynamic> _$$SmartAttributeImplToJson(
+  _$SmartAttributeImpl instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'name': instance.name,
+  'value': instance.value,
+  'worst': instance.worst,
+  'thresh': instance.thresh,
+  'whenFailed': instance.whenFailed,
+  'rawValue': instance.rawValue,
+  'rawString': instance.rawString,
+  'flags': instance.flags,
+};
+
+_$SmartAttributeFlagsImpl _$$SmartAttributeFlagsImplFromJson(
+  Map<String, dynamic> json,
+) => _$SmartAttributeFlagsImpl(
+  value: (json['value'] as num?)?.toInt(),
+  string: json['string'] as String?,
+  prefailure: json['prefailure'] as bool? ?? false,
+  updatedOnline: json['updatedOnline'] as bool? ?? false,
+  performance: json['performance'] as bool? ?? false,
+  errorRate: json['errorRate'] as bool? ?? false,
+  eventCount: json['eventCount'] as bool? ?? false,
+  autoKeep: json['autoKeep'] as bool? ?? false,
+);
+
+Map<String, dynamic> _$$SmartAttributeFlagsImplToJson(
+  _$SmartAttributeFlagsImpl instance,
+) => <String, dynamic>{
+  'value': instance.value,
+  'string': instance.string,
+  'prefailure': instance.prefailure,
+  'updatedOnline': instance.updatedOnline,
+  'performance': instance.performance,
+  'errorRate': instance.errorRate,
+  'eventCount': instance.eventCount,
+  'autoKeep': instance.autoKeep,
+};

lib/data/model/server/dist.dart

@@ -11,6 +11,7 @@ enum Dist {
   alpine,
   rocky,
   deepin,
+  coreelec,
   ;
 }
 

lib/data/model/server/net_speed.dart

@@ -1,6 +1,8 @@
+// ignore_for_file: unintended_html_in_doc_comment
+
 import 'package:fl_lib/fl_lib.dart';
 
-import 'time_seq.dart';
+import 'package:server_box/data/model/server/time_seq.dart';
 
 class NetSpeedPart extends TimeSeqIface<NetSpeedPart> {
   final String device;
@@ -14,6 +16,13 @@ class NetSpeedPart extends TimeSeqIface<NetSpeedPart> {
   bool same(NetSpeedPart other) => device == other.device;
 }
 
+typedef CachedNetVals = ({
+  String sizeIn,
+  String sizeOut,
+  String speedIn,
+  String speedOut,
+});
+
 class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   NetSpeed(super.init1, super.init2);
 
@@ -24,14 +33,14 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
 
     realIfaces.clear();
     realIfaces.addAll(devices
-        .where((e) => realIfacePrefixs.any((prefix) => e.startsWith(prefix)))
-        .toList());
+        .where((e) => realIfacePrefixs.any((prefix) => e.startsWith(prefix))));
 
     final sizeIn = this.sizeIn();
     final sizeOut = this.sizeOut();
     final speedIn = this.speedIn();
     final speedOut = this.speedOut();
-    cachedRealVals = (
+
+    cachedVals = (
       sizeIn: sizeIn,
       sizeOut: sizeOut,
       speedIn: speedIn,
@@ -49,12 +58,7 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   /// Cached non-virtual network device prefix
   final realIfaces = <String>[];
 
-  ({
-    String sizeIn,
-    String sizeOut,
-    String speedIn,
-    String speedOut,
-  }) cachedRealVals =
+  CachedNetVals cachedVals =
       (sizeIn: '0kb', sizeOut: '0kb', speedIn: '0kb/s', speedOut: '0kb/s');
 
   /// Time diff between [pre] and [now]
@@ -67,7 +71,8 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   BigInt sizeOutBytes(int i) => now[i].bytesOut;
 
   String speedIn({String? device}) {
-    if (pre[0].device == '' || now[0].device == '') return '0kb/s';
+    if (pre.isEmpty || now.isEmpty) return 'N/A';
+    if (pre.length != now.length) return 'N/A';
     if (device == null) {
       var speed = 0.0;
       for (final device in devices) {
@@ -84,7 +89,8 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   }
 
   String sizeIn({String? device}) {
-    if (pre[0].device == '' || now[0].device == '') return '0kb';
+    if (pre.isEmpty || now.isEmpty) return 'N/A';
+    if (pre.length != now.length) return 'N/A';
     if (device == null) {
       var size = BigInt.from(0);
       for (final device in devices) {
@@ -101,7 +107,8 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   }
 
   String speedOut({String? device}) {
-    if (pre[0].device == '' || now[0].device == '') return '0kb/s';
+    if (pre.isEmpty || now.isEmpty) return 'N/A';
+    if (pre.length != now.length) return 'N/A';
     if (device == null) {
       var speed = 0.0;
       for (final device in devices) {
@@ -118,7 +125,8 @@ class NetSpeed extends TimeSeq<List<NetSpeedPart>> {
   }
 
   String sizeOut({String? device}) {
-    if (pre[0].device == '' || now[0].device == '') return '0kb';
+    if (pre.isEmpty || now.isEmpty) return 'N/A';
+    if (pre.length != now.length) return 'N/A';
     if (device == null) {
       var size = BigInt.from(0);
       for (final device in devices) {

lib/data/model/server/private_key_info.dart

@@ -1,12 +1,11 @@
-import 'package:hive_flutter/hive_flutter.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'private_key_info.g.dart';
 
-@HiveType(typeId: 1)
+@JsonSerializable()
 class PrivateKeyInfo {
-  @HiveField(0)
   final String id;
-  @HiveField(1)
+  @JsonKey(name: 'private_key')
   final String key;
 
   const PrivateKeyInfo({
@@ -14,6 +13,10 @@ class PrivateKeyInfo {
     required this.key,
   });
 
+  factory PrivateKeyInfo.fromJson(Map<String, dynamic> json) => _$PrivateKeyInfoFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PrivateKeyInfoToJson(this);
+
   String? get type {
     final lines = key.split('\n');
     if (lines.length < 2) {
@@ -26,15 +29,4 @@ class PrivateKeyInfo {
     }
     return splited[1];
   }
-
-  PrivateKeyInfo.fromJson(Map<String, dynamic> json)
-      : id = json["id"].toString(),
-        key = json["private_key"].toString();
-
-  Map<String, dynamic> toJson() {
-    final data = <String, String>{};
-    data["id"] = id;
-    data["private_key"] = key;
-    return data;
-  }
 }

lib/data/model/server/private_key_info.g.dart

@@ -3,42 +3,14 @@
 part of 'private_key_info.dart';
 
 // **************************************************************************
-// TypeAdapterGenerator
+// JsonSerializableGenerator
 // **************************************************************************
 
-class PrivateKeyInfoAdapter extends TypeAdapter<PrivateKeyInfo> {
-  @override
-  final int typeId = 1;
-
-  @override
-  PrivateKeyInfo read(BinaryReader reader) {
-    final numOfFields = reader.readByte();
-    final fields = <int, dynamic>{
-      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
-    };
-    return PrivateKeyInfo(
-      id: fields[0] as String,
-      key: fields[1] as String,
+PrivateKeyInfo _$PrivateKeyInfoFromJson(Map<String, dynamic> json) =>
+    PrivateKeyInfo(
+      id: json['id'] as String,
+      key: json['private_key'] as String,
     );
-  }
 
-  @override
-  void write(BinaryWriter writer, PrivateKeyInfo obj) {
-    writer
-      ..writeByte(2)
-      ..writeByte(0)
-      ..write(obj.id)
-      ..writeByte(1)
-      ..write(obj.key);
-  }
-
-  @override
-  int get hashCode => typeId.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is PrivateKeyInfoAdapter &&
-          runtimeType == other.runtimeType &&
-          typeId == other.typeId;
-}
+Map<String, dynamic> _$PrivateKeyInfoToJson(PrivateKeyInfo instance) =>
+    <String, dynamic>{'id': instance.id, 'private_key': instance.key};

lib/data/model/server/proc.dart

@@ -1,6 +1,6 @@
 import 'package:fl_lib/fl_lib.dart';
 
-import '../../../data/res/misc.dart';
+import 'package:server_box/data/res/misc.dart';
 
 class _ProcValIdxMap {
   final int pid;
@@ -58,7 +58,7 @@ class Proc {
     required this.command,
   });
 
-  factory Proc.parse(String raw, _ProcValIdxMap map) {
+  factory Proc._parse(String raw, _ProcValIdxMap map) {
     final parts = raw.split(RegExp(r'\s+'));
     return Proc(
       user: map.user == null ? null : parts[map.user!],
@@ -139,7 +139,7 @@ class PsResult {
       final line = lines[i];
       if (line.isEmpty) continue;
       try {
-        procs.add(Proc.parse(line, map));
+        procs.add(Proc._parse(line, map));
       } catch (e, trace) {
         errs.add('$line: $e');
         Loggers.app.warning('Process failed', e, trace);

lib/data/model/server/server.dart

@@ -1,11 +1,11 @@
 import 'package:dartssh2/dartssh2.dart';
-import 'package:server_box/data/model/app/error.dart';
+import 'package:fl_lib/fl_lib.dart';
 import 'package:server_box/data/model/app/shell_func.dart';
-import 'package:server_box/data/model/app/tag_pickable.dart';
 import 'package:server_box/data/model/server/battery.dart';
 import 'package:server_box/data/model/server/conn.dart';
 import 'package:server_box/data/model/server/cpu.dart';
 import 'package:server_box/data/model/server/disk.dart';
+import 'package:server_box/data/model/server/disk_smart.dart';
 import 'package:server_box/data/model/server/memory.dart';
 import 'package:server_box/data/model/server/net_speed.dart';
 import 'package:server_box/data/model/server/nvdia.dart';
@@ -14,26 +14,13 @@ import 'package:server_box/data/model/server/server_private_info.dart';
 import 'package:server_box/data/model/server/system.dart';
 import 'package:server_box/data/model/server/temp.dart';
 
-class Server implements TagPickable {
-  ServerPrivateInfo spi;
+class Server {
+  Spi spi;
   ServerStatus status;
   SSHClient? client;
   ServerConn conn;
 
-  Server(
-    this.spi,
-    this.status,
-    this.conn, {
-    this.client,
-  });
-
-  @override
-  bool containsTag(String tag) {
-    return spi.tags?.contains(tag) ?? false;
-  }
-
-  @override
-  String get tagName => spi.id;
+  Server(this.spi, this.status, this.conn, {this.client});
 
   bool get needGenClient => conn < ServerConn.connecting;
 
@@ -53,6 +40,7 @@ class ServerStatus {
   SystemType system;
   Err? err;
   DiskIO diskIO;
+  List<DiskSmart> diskSmart;
   List<NvidiaSmiItem>? nvidia;
   final List<Battery> batteries = [];
   final Map<StatusCmdType, String> more = {};
@@ -70,6 +58,7 @@ class ServerStatus {
     required this.temps,
     required this.system,
     required this.diskIO,
+    this.diskSmart = const [],
     this.err,
     this.nvidia,
     this.diskUsage,
@@ -90,5 +79,5 @@ enum ServerConn {
   /// Status parsing finished
   finished;
 
-  operator <(ServerConn other) => index < other.index;
+  bool operator <(ServerConn other) => index < other.index;
 }