feat: add LAN discovery, DAV, and transfer controls

Author: zengyufei

CHANGELOG.en.md

@@ -2,6 +2,14 @@
 
 All notable changes to `ii` are documented here. The default Chinese version is [CHANGELOG.md](CHANGELOG.md).
 
+## 0.3.0 - 2026-08-05
+
+### Added
+
+- `ii send` now supports mixed file/folder sends, `--include`/`--exclude` filters, a global `--rate` cap, and JSON Lines events with `--json`.
+- Added `ii discover` LAN discovery and `--bind` IPv4/IPv6 listeners for `ii web`, `ii dav`, and `ii send --web`.
+- Added a read-write `ii dav` LAN WebDAV service with desktop-client methods, Range, chunked PUT, and process-local locks.
+
 ## 0.2.9 - 2026-08-04
 
 ### Changed

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 本文件记录 `ii` 的重要变更。默认中文版本在这里，英文版本见 [CHANGELOG.en.md](CHANGELOG.en.md)。
 
+## 0.3.0 - 2026-08-05
+
+### 新增
+
+- `ii send` 支持多文件/目录混合发送、`--include`/`--exclude` 筛选、`--rate` 总带宽限制和 `--json` JSON Lines 事件。
+- 新增 `ii discover` 局域网发现，以及 `ii web`、`ii dav`、`ii send --web` 的 `--bind` IPv4/IPv6 监听。
+- 新增读写 `ii dav` 局域网 WebDAV 服务，支持桌面客户端常用请求、Range、chunked PUT 和进程内锁。
+
 ## 0.2.9 - 2026-08-04
 
 ### 变更

Cargo.lock

@@ -4,7 +4,7 @@ exclude = ["vendor/iroh", "vendor/suppaftp"]
 resolver = "3"
 
 [workspace.package]
-version = "0.2.9"
+version = "0.3.0"
 edition = "2024"
 rust-version = "1.91"
 license = "MIT"
@@ -28,6 +28,7 @@ anyhow = "1"
 attohttpc = { version = "0.31", default-features = false, features = ["tls-rustls-webpki-roots-ring"] }
 base64 = "0.22"
 futures-util = "0.3"
+glob = "0.3.3"
 hmac = "0.12"
 iroh = { path = "vendor/iroh/iroh", default-features = false, features = ["tls-ring"] }
 iroh-relay = { path = "vendor/iroh/iroh-relay", default-features = false, features = ["server-minimal"] }
@@ -44,6 +45,7 @@ russh = { version = "0.61.0", default-features = false, features = ["ring", "rsa
 russh-sftp = "2.3.0"
 rcgen = { version = "0.14", default-features = false, features = ["crypto", "pem", "ring"] }
 serde = { version = "1", features = ["derive"] }
+socket2 = "0.6"
 sha2 = "0.10"
 suppaftp = { path = "vendor/suppaftp", default-features = false, features = ["tokio"] }
 tar = { version = "0.4", default-features = false }
@@ -57,6 +59,7 @@ url = { version = "2.5", features = ["serde"] }
 
 [dev-dependencies]
 libunftp = { version = "0.23.0", default-features = false, features = ["ring"] }
+serde_json = "1"
 unftp-sbe-fs = "0.4.0"
 
 [build-dependencies]

Cargo.toml

@@ -22,8 +22,8 @@
 `ii` is built for temporary file transfer:
 
 - The sender serves one successful receive by default, then exits
-- P2P direct / LAN discovery / public relay fallback / optional S3, WebDAV, FTP, and SFTP backends
-- `ii send <file-or-folder> --web` download sharing / `ii web [directory]` directory browsing / `ii webrtc` browser-to-browser transfer / `ii tunnel` TCP port forwarding
+- P2P direct / LAN discovery with `ii discover` / public relay fallback / optional S3, WebDAV, FTP, and SFTP backends
+- `ii send <file-or-folder> --web` download sharing / `ii web [directory]` directory browsing / `ii dav [directory]` WebDAV serving / `ii webrtc` browser-to-browser transfer / `ii tunnel` TCP port forwarding
 - Receives resume automatically by default
 - Existing files with the same MD5 are skipped
 - Folders can be sent directly
@@ -125,7 +125,7 @@ ii web .\shared
 ii webrtc
 ```
 
-All three print LAN URLs, other adapter URLs, and a terminal QR code. Without a directory, `ii web` serves the current directory. `--port 8080` fixes the port; bare `--token` generates a path token, while `--token <value>` supplies one. `ii send --web` and `ii web` are read-only by default; pass `--upload` to enable multi-file uploads and `--path <dir>` to choose the upload directory. These services have no account authentication and are for short-lived, trusted LAN use only. See [ii.md](ii.md) for the full rules and [webrtc.md](webrtc.md) for WebRTC limits.
+All three print LAN URLs, other adapter URLs, and a terminal QR code. Without a directory, `ii web` serves the current directory. `--port 8080` fixes the port; `--bind ::` selects IPv6 only. Bare `--token` generates a path token, while `--token <value>` supplies one. `ii send --web` and `ii web` are read-only by default; pass `--upload` to enable multi-file uploads and `--path <dir>` to choose the upload directory. `ii discover` listens on the local network for three seconds and lists `ii send -t`, `ii web`, and `ii dav` services; discovery exposes tickets or URLs to the LAN and is not access control. These services have no account authentication and are for short-lived, trusted LAN use only. See [ii.md](ii.md) for the full rules and [webrtc.md](webrtc.md) for WebRTC limits.
 
 ### TCP Tunnel
 

README.en.md

@@ -23,9 +23,9 @@
 
 直发目录 / 一次即走 / 持续发送 / 自动复制到粘贴板或落盘
 
-P2P 直连 / 局域网发现 / 公网 relay 回退 / 支持 `--s3` / `--webdav` / `--ftp` / `--sftp` 后端中转
+P2P 直连 / 局域网发现 / `ii discover` / 公网 relay 回退 / 支持 `--s3` / `--webdav` / `--ftp` / `--sftp` 后端中转
 
-`ii send <文件或文件夹> --web` 分享下载 / `ii web [目录]` 浏览目录 / `ii webrtc` 浏览器直传 / `ii tunnel` TCP 端口转发
+`ii send <文件或文件夹> --web` 分享下载 / `ii web [目录]` 浏览目录 / `ii dav [目录]` 挂载目录 / `ii webrtc` 浏览器直传 / `ii tunnel` TCP 端口转发
 
 断点续收 / 秒传跳过 / 冲突覆盖 / 支持传完清理中转
 
@@ -128,7 +128,7 @@ ii web .\shared
 ii webrtc
 ```
 
-三者都会打印 LAN URL、其他网卡 URL 和终端二维码。`ii web` 省略目录时服务当前目录。`--port 8080` 固定端口；裸 `--token` 生成路径令牌，也可用 `--token <value>` 指定。`ii send --web` 与 `ii web` 默认只读，传入 `--upload` 才开放多文件上传；`--path <dir>` 指定上传目录。网页服务没有账号鉴权，只适合临时可信局域网。完整规则见 [ii.md](ii.md)，WebRTC 限制见 [webrtc.md](webrtc.md)。
+三者都会打印 LAN URL、其他网卡 URL 和终端二维码。`ii web` 省略目录时服务当前目录。`--port 8080` 固定端口，`--bind ::` 只监听 IPv6；裸 `--token` 生成路径令牌，也可用 `--token <value>` 指定。`ii send --web` 与 `ii web` 默认只读，传入 `--upload` 才开放多文件上传；`--path <dir>` 指定上传目录。`ii discover` 监听本地网络三秒，列出带 `-t` 的发送端、`ii web` 和 `ii dav`；发现公告会向同一 LAN 暴露 ticket 或 URL，不是访问控制。网页服务没有账号鉴权，只适合临时可信局域网。完整规则见 [ii.md](ii.md)，WebRTC 限制见 [webrtc.md](webrtc.md)。
 
 ### TCP 隧道
 

README.md

@@ -32,6 +32,7 @@ All measurements use `cargo build -p ii --release --locked` followed by UPX
 | Browser WebRTC LAN signalling and direct page | 6,068,736 | 2,189,824 | +9,216 | `cargo test -p ii --locked` (96 tests), `cargo build -p ii --release --locked`, UPX `5.1.0 --best --lzma`, `upx -t` |
 | `ii web` Range, media MIME, and HEAD responses | 6,078,464 | 2,194,432 | +4,608 | `cargo test -p ii --locked` (98 tests), `cargo build -p ii --release --locked`, UPX `5.1.0 --best --lzma`, `upx -t` |
 | `ii webrtc` text messages | 6,124,544 | 2,204,672 | +512 | Compared with the same `0.2.2` tunnel baseline (6,120,448 / 2,204,160); `cargo test -p ii --locked` (104 tests), `cargo build -p ii --release --locked`, UPX `5.1.0 --best --lzma`, `upx -t` |
+| Seven extension plan: multi-send, filters, rate, JSON, discover, bind, DAV | 6,315,008 | 2,265,600 | +60,928 | `cargo test -p ii --offline --no-fail-fast -- --test-threads=1` (121 tests), workspace check, `cargo build -p ii --release --locked`, `cargo bloat --crates`, UPX `5.1.0 --best --lzma`, `upx -t` |
 
 Equivalent release rebuilds have varied by up to `1,536` UPX bytes; the latest
 measurement is recorded with the pinned `5.1.0` packer.

SIZE.md

@@ -609,6 +609,7 @@ fn install_transfer_handlers(
             resume: false,
             local: false,
             trace: false,
+            json: false,
         };
         let sender = background_sender.clone();
         thread::spawn(move || {

gui/src/main.rs

@@ -4,19 +4,21 @@
 
 ## 一句话
 
-`ii send` 发，`ii recv` 收，`ii web` 开局域网目录，`ii webrtc` 开浏览器直传，`ii tunnel` 转发 TCP，`ii relay` 管中继，`ii doctor` 查问题，`ii version` 看版本。
+`ii send` 发，`ii recv` 收，`ii web` 开局域网目录，`ii dav` 开 WebDAV，`ii discover` 找本地服务，`ii webrtc` 开浏览器直传，`ii tunnel` 转发 TCP，`ii relay` 管中继，`ii doctor` 查问题，`ii version` 看版本。
 
 ## 命令总览
 
 ```text
 ii help [<command>]
-ii send [<path>] [--name <name>] [-t] [-c] [-o <path>] [--web [--port <port>] [--token [<value>]] [--upload] [--path <dir>] | --s3 | --webdav | --ftp | --sftp] [--profile <name>] [-d] [-p] [--local] [--relay <url> [-k]] [--no-relay]
-ii web [<目录>] [--port <port>] [--token [<value>]] [--upload] [--path <目录>]
-ii webrtc [--port <port>] [--token [<value>]]
+ii send [<path>...] [--name <name>] [--include <glob>] [--exclude <glob>] [--rate <bytes/s>] [--json] [-t] [-c] [-o <path>] [--web [--port <port>] [--bind <ip>] [--token [<value>]] [--upload] [--path <path>] | --s3 | --webdav | --ftp | --sftp] [--profile <name>] [-d] [-p] [--local] [--relay <url> [-k]] [--no-relay]
+ii web [<目录>] [--port <port>] [--bind <ip>] [--token [<value>]] [--upload] [--path <目录>]
+ii dav [<目录>] [--port <port>] [--bind <ip>] [--token [<value>]] [--read-only]
+ii webrtc [--port <port>] [--bind <ip>] [--token [<value>]]
 ii tunnel -s <target-host:port> [--relay <url> [-k]]
 ii tunnel -c <ticket> [--listen <ip:port>]
 ii recv <ticket> [-o <dir>] [--stdout] [--overwrite] [--resume] [--local] [--trace]
 ii relay [--port <port>] [--tls [--domain <name>] [--cert <path> --key <path>]]
+ii discover [--json]
 ii doctor
 ii version
 ```
@@ -99,6 +101,21 @@ tar czf - .\project | ii send --name project.tar.gz
 `--path <dir>`
 : 仅和 `--web --upload` 同用，指定网页上传文件直接写入的目录。相对路径以启动命令当前目录为基准；目录在首次上传时创建。不提供时仍写入当前目录的 `./ii/`。未提供 `--upload` 时本参数会被忽略。`-p` 仍是 FTP/SFTP/WebDAV 的便携 ticket 参数。
 
+`<path>...`
+: 可一次发送多个文件或文件夹。多个输入使用现有目录 ticket 打包到集合根目录，默认根名为 `ii`，可用 `--name` 覆盖；stdin 不能和路径混用，顶层名称重复会报错。
+
+`--include <glob>` / `--exclude <glob>`
+: 可重复使用，仅作用于目录和多路径归档。glob 按每个输入项内部的 `/` 相对路径匹配，exclude 永远优先；筛选后为空会报错。
+
+`--rate <bytes/s>`
+: 限制发送端总带宽，支持正整数 bytes/s 以及 `KiB`、`MiB`、`GiB` 后缀；多接收端共享同一个上限。
+
+`--json`
+: 输出稳定 JSON Lines；stdout 只输出事件，诊断和错误走 stderr。`recv --stdout --json` 不允许使用；JSON 后端缺 profile 时直接失败，不弹配置提示。
+
+`--bind <ip>`
+: 仅和 `--web` 同用，固定监听 IPv4 或 IPv6 地址。未提供时保持 `0.0.0.0` 并打印主 LAN URL 与 `other:`；显式地址只打印该地址，IPv6 URL 使用方括号。
+
 `--local`
 : 只走局域网优先路径，不走公网发现，不走公网 relay。
 
@@ -160,10 +177,29 @@ ii web .\shared --port 8080 --token A1b2C3d4E5f6G7h8 --upload --path .\uploads
 
 `ii web` 不带路径时服务启动命令当前目录；带路径时必须是已有目录，文件路径会报错。网页默认提供 nginx 风格的递归目录浏览：目录可继续进入、`../` 返回父目录、每项显示名称、修改时间和大小；普通文件直接响应，不强制下载。传入 `--upload` 后网页顶部才显示多文件上传控件，不支持上传目录。
 
-命令行会在主 IPv4 LAN URL 上方打印根页二维码，并在 `other:` 下打印其他物理和虚拟网卡 URL；网页不显示二维码。按 `Ctrl+C` 关闭服务。
+命令行会在主 IPv4 LAN URL 上方打印根页二维码，并在 `other:` 下打印其他物理和虚拟网卡 URL；网页不显示二维码。`--bind <ip>` 可固定 IPv4 或 IPv6 listener；显式 bind 只打印该地址。按 `Ctrl+C` 关闭服务。
 
 `--port <port>` 指定 `1` 到 `65535` 的 HTTP 监听端口，未提供时随机选择。裸 `--token` 自动生成 32 字符路径令牌；`--token <value>` 或 `--token=<value>` 使用指定令牌，把目录、文件和已启用的上传 URL 固定到 `/<value>/` 下；遗漏或写错返回 `404`。显式令牌必须为 16 到 128 个 ASCII 字母、数字、`-` 或 `_`。`--upload` 才显示上传控件并开放上传接口；`--path <目录>` 指定上传文件直接写入的目录，相对路径按启动目录解析，首次上传才创建目录，未指定时写入启动目录下的 `./ii/`，未提供 `--upload` 时会被忽略。`-p` 不适用于 `ii web`，仍仅用于 WebDAV、FTP、SFTP 的便携 ticket。
 
+## `ii dav`
+
+```powershell
+ii dav
+ii dav .\shared --port 8080 --bind 192.168.1.20 --token A1b2C3d4E5f6G7h8
+ii dav .\shared --read-only
+```
+
+`ii dav` 把当前目录或指定目录作为局域网 WebDAV 根目录，默认可读写；支持 `OPTIONS`、`PROPFIND`、`GET`、`HEAD`、Range、`PUT`、`MKCOL`、`DELETE`、`MOVE`、`COPY`、`LOCK`、`UNLOCK`，上传支持 `Content-Length`、chunked body 和 `100-continue`。`--read-only` 禁止所有改写。`--token` 是 URL 路径令牌，不是账户认证；服务默认无 TLS 和 Basic Auth，只适合可信局域网。
+
+## `ii discover`
+
+```powershell
+ii discover
+ii discover --json
+```
+
+在本地网络监听三秒，发现正在运行的 `ii send -t`、`ii web` 和 `ii dav`，并输出可直接使用的 `ii recv <ticket>` 或服务 URL。发现同时使用 IPv4 广播和 IPv6 链路本地 all-nodes 多播；公告会向同一 LAN 暴露 ticket 或 token URL，不是访问控制机制。`--json` 输出 JSON Lines，stdout 不混入其他文本。
+
 ## `ii webrtc`
 
 ```powershell

ii.md

@@ -5,12 +5,12 @@ use crate::{
     ticket::{FtpPortableCredentials, PayloadKind, Ticket},
     transport::{
         p2p::{FilePlan, RecvTrace},
-        progress::{TransferProgress, copy_with_progress},
+        progress::{RateLimiter, TransferProgress, copy_with_progress, copy_with_progress_limited},
         source::{Source, unique_object_id},
     },
 };
 use anyhow::{Context, Result, bail};
-use std::path::PathBuf;
+use std::{path::PathBuf, sync::Arc};
 use suppaftp::tokio::AsyncFtpStream;
 use tempfile::NamedTempFile;
 use tokio::{
@@ -26,6 +26,7 @@ pub(crate) async fn upload(
     source: &Source,
     profile: &storage::FtpProfile,
     show_progress: bool,
+    rate_limiter: Option<Arc<RateLimiter>>,
 ) -> Result<FtpUpload> {
     let object_key = remote_object_key(&profile.remote_dir, source);
     let mut client = connect(profile).await?;
@@ -41,9 +42,14 @@ pub(crate) async fn upload(
         .await
         .with_context(|| format!("upload FTP object {object_key}"))?;
     let mut progress = TransferProgress::new("ii send", show_progress, source.size(), 0);
-    copy_with_progress(&mut source_file, &mut stream, &mut progress)
-        .await
-        .with_context(|| format!("upload FTP object {object_key}"))?;
+    copy_with_progress_limited(
+        &mut source_file,
+        &mut stream,
+        &mut progress,
+        rate_limiter.as_deref(),
+    )
+    .await
+    .with_context(|| format!("upload FTP object {object_key}"))?;
     stream.flush().await.context("flush FTP upload")?;
     progress.finish();
     client
@@ -125,7 +131,11 @@ pub(crate) async fn recv_ftp(
             (profile, Some(save))
         }
         None => {
-            let selection = storage::load_or_prompt_ftp_profile_named(&ftp.profile)?;
+            let selection = if args.json {
+                storage::load_ftp_profile_noninteractive(Some(&ftp.profile))?
+            } else {
+                storage::load_or_prompt_ftp_profile_named(&ftp.profile)?
+            };
             let save = selection
                 .save_after_success
                 .then_some((selection.path.clone(), selection.config.clone()));
@@ -221,6 +231,7 @@ fn portable_ftp_config(
 pub(crate) async fn try_delete_ftp_for_ticket(
     ftp: crate::ticket::FtpTicket,
     trace: &mut RecvTrace,
+    noninteractive: bool,
 ) {
     if !ftp.delete_after_recv {
         return;
@@ -233,7 +244,11 @@ pub(crate) async fn try_delete_ftp_for_ticket(
                 (profile, Some(save))
             }
             None => {
-                let selection = storage::load_or_prompt_ftp_profile_named(&ftp.profile)?;
+                let selection = if noninteractive {
+                    storage::load_ftp_profile_noninteractive(Some(&ftp.profile))?
+                } else {
+                    storage::load_or_prompt_ftp_profile_named(&ftp.profile)?
+                };
                 let save = selection
                     .save_after_success
                     .then_some((selection.path.clone(), selection.config.clone()));
@@ -436,7 +451,7 @@ mod tests {
             password: "pass".to_string(),
             remote_dir: "ii/".to_string(),
         };
-        let upload = upload(&source, &profile, false).await.unwrap();
+        let upload = upload(&source, &profile, false, None).await.unwrap();
 
         let destination = root.path().join("received.txt");
         let mut client = connect(&profile).await.unwrap();