dsh-remote-plugin 0.4.8 → 0.4.9

package/README.md

@@ -1,5 +1,7 @@
 # dsh-remote-plugin
 
+[![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin)
+
 DSH Remote 的 DSH bundle 插件：在 DSH 左侧原生边栏注册入口，点击从右侧滑出管理抽屉；插件**内置网关程序并随 DSH 自动启停**（独立 systemd 单元），抽屉直显令牌、主机 IP 与设备监控，配合 [dsh-Remote](https://github.com/Blank-not-black/dsh-Remote) 的 Android App 实现手机远程操控与文件互传（`/fs/list`、`/fs/file`、`/fs/upload`）。
 
 ## 安装

package/gateway.cjs

@@ -873,6 +873,168 @@ function fsUploadMultipart(req, res, url, dirLex, dirReal, boundary) {
   })
 }
 
+/* ---------- /fs/upload 断点续传 ----------
+ * 分块模式: POST /fs/upload?path=..&name=..&session=<uuid>&offset=N[&finish=1][&overwrite=1]
+ *   - 每一块是 raw body, 服务端写到 .<name>.dsh-remote-part-<session> 的 offset 处
+ *   - offset=0 重开; offset<已有大小 = 回卷重写; offset>已有大小 = 409 offset-mismatch
+ *   - finish=1 时原子 rename 到目标名; 否则返回 {partial:true,size,offset}
+ * 查询进度: GET /fs/upload-probe?path=..&name=..&session=<uuid>
+ */
+function fsPartPath(dirReal, name, session) {
+  const s = String(session || 'default').replace(/[^A-Za-z0-9._-]/g, '').slice(0, 64) || 'default'
+  return path.join(dirReal, `.${name}.dsh-remote-part-${s}`)
+}
+
+function fsTargetState(target) {
+  try {
+    const st = fs.lstatSync(target)
+    if (st.isSymbolicLink()) return { status: 403, error: 'symlink-forbidden', detail: '拒绝覆盖符号链接' }
+    return { exists: true }
+  } catch (err) {
+    if (err.code === 'ENOENT') return { exists: false }
+    return { status: 403, error: 'permission-denied', detail: err.message }
+  }
+}
+
+function fsUploadProbe(req, res, url) {
+  if (req.method !== 'GET') {
+    res.writeHead(405, { allow: 'GET' })
+    res.end()
+    return
+  }
+  if (!fsAuthorized(req, url, res)) return
+  touchDevice(req)
+  const resolved = fsResolve(url.searchParams.get('path') ?? '')
+  if (resolved.error) return fsJson(res, resolved.error === 'forbidden' ? 403 : 404, { error: resolved.error })
+  const checked = fsRealChecked(resolved.abs)
+  if (checked.error) return fsJson(res, checked.error === 'forbidden' ? 403 : 404, { error: checked.error })
+  const name = url.searchParams.get('name') || ''
+  if (!fsValidName(name)) return fsJson(res, 400, { error: 'bad-name' })
+  const part = fsPartPath(checked.abs, name, url.searchParams.get('session') || 'default')
+  let partialSize = 0, partExists = false
+  try {
+    const st = fs.statSync(part)
+    if (st.isFile()) { partialSize = st.size; partExists = true }
+  } catch {}
+  const target = fsTargetState(path.join(checked.abs, name))
+  let targetSize = 0
+  if (target.exists) {
+    try { targetSize = fs.statSync(path.join(checked.abs, name)).size } catch {}
+  }
+  fsJson(res, 200, {
+    ok: true,
+    name,
+    partialSize,
+    partExists,
+    targetExists: !!target.exists,
+    targetSize
+  })
+}
+
+function fsUploadResumable(req, res, url, dirLex, dirReal) {
+  const name = url.searchParams.get('name') || ''
+  if (!fsValidName(name)) return fsJson(res, 400, { error: 'bad-name', detail: '文件名不能为空且不能包含路径分隔符' })
+  const session = url.searchParams.get('session') || ''
+  if (!session) return fsJson(res, 400, { error: 'missing-session', detail: '断点续传需要 session 参数' })
+  const offsetRaw = url.searchParams.get('offset')
+  const offset = Number(offsetRaw)
+  if (!Number.isSafeInteger(offset) || offset < 0) {
+    return fsJson(res, 400, { error: 'bad-offset', detail: 'offset 必须是非负整数' })
+  }
+  const finish = url.searchParams.get('finish') === '1' || url.searchParams.get('complete') === '1'
+  const overwrite = url.searchParams.get('overwrite') === '1' || url.searchParams.get('overwrite') === 'true'
+  const part = fsPartPath(dirReal, name, session)
+  const target = path.join(dirReal, name)
+
+  // 已有分片尺寸对齐: 回卷重写允许, 越界/缺洞拒绝
+  let existing = 0
+  try {
+    const st = fs.statSync(part)
+    if (!st.isFile()) return fsJson(res, 409, { error: 'part-conflict', detail: '分片路径被占用' })
+    existing = st.size
+  } catch (err) {
+    if (err.code !== 'ENOENT') return fsJson(res, 403, { error: 'permission-denied', detail: err.message })
+  }
+  if (offset === 0) {
+    try { if (existing > 0) fs.truncateSync(part, 0) } catch (err) {
+      return fsJson(res, 403, { error: 'permission-denied', detail: err.message })
+    }
+  } else {
+    if (offset > existing) return fsJson(res, 409, { error: 'offset-mismatch', partialSize: existing, detail: 'offset 超过已有分片大小, 请先 probe' })
+    if (offset < existing) {
+      try { fs.truncateSync(part, offset) } catch (err) {
+        return fsJson(res, 403, { error: 'permission-denied', detail: err.message })
+      }
+    }
+  }
+
+  if (finish) {
+    const st = fsTargetState(target)
+    if (st.status) return fsJson(res, st.status, { error: st.error, detail: st.detail })
+    if (st.exists && !overwrite) {
+      return fsJson(res, 409, { error: 'conflict', detail: '文件已存在, overwrite=1 可覆盖' })
+    }
+  }
+
+  let stream
+  try {
+    stream = fs.createWriteStream(part, { flags: offset === 0 ? 'w' : 'r+', start: offset, mode: 0o600 })
+  } catch (err) {
+    return fsJson(res, 403, { error: 'permission-denied', detail: err.message })
+  }
+
+  let bytes = 0
+  let finished = false
+  const abort = (status, msg, extra = {}) => {
+    if (finished) return
+    finished = true
+    try { stream.destroy() } catch {}
+    // 网络中断时保留分片, 客户端 probe 后续传; 只有超限/写失败才删
+    if (status === 413 || status === 500) { try { fs.unlinkSync(part) } catch {} }
+    if (!res.headersSent) fsJson(res, status, { error: msg, ...extra })
+    else try { res.destroy() } catch {}
+  }
+
+  stream.on('error', (err) => {
+    abort(500, err.code === 'ENOENT' ? 'part-missing' : 'write-failed', { detail: err.message })
+  })
+  req.on('aborted', () => abort(400, 'client-aborted', { partialSize: offset + bytes }))
+  req.on('error', () => abort(400, 'client-aborted', { partialSize: offset + bytes }))
+  req.on('data', (chunk) => {
+    if (finished) return
+    bytes += chunk.length
+    if (offset + bytes > FS_MAX_UPLOAD) {
+      abort(413, 'too-large', { limit: FS_MAX_UPLOAD })
+      return
+    }
+    stream.write(chunk)
+  })
+  req.on('end', () => {
+    if (finished) return
+    finished = true
+    stream.end(() => {
+      const total = offset + bytes
+      try {
+        const st = fs.statSync(part)
+        if (!st.isFile() || st.size !== total) throw new Error('part-size-mismatch')
+        if (!finish) {
+          fsJson(res, 200, { ok: true, partial: true, name, size: total, offset: total, session })
+          return
+        }
+        const ts = fsTargetState(target)
+        if (ts.status) return fsJson(res, ts.status, { error: ts.error, detail: ts.detail })
+        if (ts.exists && !overwrite) return fsJson(res, 409, { error: 'conflict', detail: '文件已存在, overwrite=1 可覆盖' })
+        if (ts.exists) fs.rmSync(target, { force: true })
+        fs.renameSync(part, target)
+        fsJson(res, 201, { ok: true, name, path: path.join(dirLex, name), size: total, resumed: offset > 0, session })
+      } catch (err) {
+        if (!res.headersSent) fsJson(res, 403, { error: 'write-failed', detail: err.message })
+        else try { res.destroy() } catch {}
+      }
+    })
+  })
+}
+
 function serveFs(req, res, url) {
   const sub = url.pathname.slice('/fs'.length)
 
@@ -886,6 +1048,7 @@ function serveFs(req, res, url) {
 
   if (sub === '/list') return fsList(req, res, url)
   if (sub === '/file') return fsFile(req, res, url)
+  if (sub === '/upload-probe') return fsUploadProbe(req, res, url)
 
   if (sub === '/upload') {
     if (req.method !== 'POST') {
@@ -909,6 +1072,10 @@ function serveFs(req, res, url) {
     if (Number.isFinite(contentLength) && contentLength > FS_MAX_UPLOAD) {
       return fsJson(res, 413, { error: 'too-large', limit: FS_MAX_UPLOAD })
     }
+    // 带 session/offset 进入分块续传模式; 不带则保持 raw/multipart 一次性上传
+    if (url.searchParams.has('session') || url.searchParams.has('offset')) {
+      return fsUploadResumable(req, res, url, resolved.abs, checked.abs)
+    }
     const contentType = String(req.headers['content-type'] || '')
     if (contentType.startsWith('multipart/form-data')) {
       const m = /boundary=(?:"([^"]+)"|([^;]+))/i.exec(contentType)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-plugin",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "DSH Remote 官方 bundle 插件：DSH 左侧原生边栏入口 + 右侧抽屉内嵌管理控制台；内置网关随 DSH 自动启停(systemd 独立单元)，抽屉直显令牌与设备监控；网关提供 /fs/* 文件传输端点(列表/断点下载/上传)，配合 Android App 远程操控会话/审批/提问/goal 与文件互传(多服务器测速切换、聊天记录离线缓存)。",
   "type": "module",
   "main": "./index.mjs",

package/public/app.js

@@ -50,7 +50,7 @@ const state = {
   history: emptyHistory(),
   errCount: 0,
   refreshTimer: null,
-  fs: { path: null, initial: null, loaded: false }
+  fs: { path: null, initial: null, loaded: false, upload: null }
 }
 
 const $ = (id) => document.getElementById(id)
@@ -1229,35 +1229,103 @@ function uploadFsFile(file) {
   if (!state.token) { toast('请先到「设置」页设置令牌', 'err'); showView('view-settings'); return }
   if (file.size > 2 * 1024 * 1024 * 1024) { toast('单文件超过 2GB 上限', 'err'); return }
 
-  const doUpload = (overwrite) => {
-    const params = { path: state.fs.path, name: file.name }
-    if (overwrite) params.overwrite = '1'
+  const FS_CHUNK_SIZE = 4 * 1024 * 1024 // 4MB/块, 断线后重选同一文件自动续传
+
+  const uploadChunk = (params, blob, up) => new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest()
     xhr.open('POST', fsApiUrl('/upload', params))
     xhr.setRequestHeader('authorization', 'Bearer ' + state.token)
     xhr.setRequestHeader('x-dsh-remote-client', CAP?.isNativePlatform?.() ? 'app' : 'web')
-    showFsProgress(0, 0, file.size)
     xhr.upload.onprogress = (e) => {
-      if (e.lengthComputable) showFsProgress(Math.round(e.loaded / Math.max(1, e.total) * 100), e.loaded, e.total)
+      if (e.lengthComputable) {
+        const loaded = up.offset + Math.min(e.loaded, e.total)
+        showFsProgress(Math.round(loaded / Math.max(1, up.size) * 100), loaded, up.size)
+      }
     }
     xhr.onload = () => {
-      hideFsProgress()
-      if (xhr.status === 201 || xhr.status === 200) {
+      let json = {}
+      try { json = JSON.parse(xhr.responseText || '{}') } catch {}
+      resolve({ status: xhr.status, json })
+    }
+    xhr.onerror = () => reject(new Error('网络错误'))
+    xhr.upload.onerror = () => reject(new Error('网络中断'))
+    xhr.onabort = () => reject(new Error('已取消'))
+    xhr.send(blob)
+  })
+
+  const probe = async (up) => {
+    const res = await fetch(fsApiUrl('/upload-probe', { path: up.path, name: up.name, session: up.session }), { headers: fsHeaders() })
+    if (res.status === 401) { fsAuthError(401); return null }
+    const json = await res.json().catch(() => ({}))
+    if (json.ok) up.offset = json.partialSize || 0
+    return json
+  }
+
+  ;(async () => {
+    let up = state.fs.upload
+    if (!up || up.path !== state.fs.path || up.name !== file.name || up.size !== file.size) {
+      up = { session: uuid(), path: state.fs.path, name: file.name, size: file.size, offset: 0 }
+      state.fs.upload = up
+    }
+    let overwrite = false
+    let wasResumed = false
+    try {
+      const info = await probe(up)
+      if (info === null) return
+      if (info.partialSize > 0) wasResumed = true
+      if (info.targetExists && info.targetSize === up.size && !overwrite) {
+        if (!confirm('文件已存在（大小相同），覆盖它？')) { state.fs.upload = null; return }
+        overwrite = true
+      }
+      showFsProgress(Math.round(up.offset / Math.max(1, up.size) * 100), up.offset, up.size)
+
+      while (up.offset < up.size) {
+        const end = Math.min(up.offset + FS_CHUNK_SIZE, up.size)
+        const params = { path: up.path, name: up.name, session: up.session, offset: String(up.offset) }
+        if (end >= up.size) params.finish = '1'
+        if (overwrite) params.overwrite = '1'
+        const r = await uploadChunk(params, file.slice(up.offset, end), up)
+        if (r.status === 401) { fsAuthError(401); return }
+        if (r.status === 200 && r.json.offset != null) { up.offset = r.json.offset; continue }
+        if (r.status === 201) {
+          hideFsProgress()
+          state.fs.upload = null
+          toast(`已上传 ${file.name}${wasResumed ? '（断点续传完成）' : ''}`, 'ok')
+          loadFs()
+          return
+        }
+        if (r.status === 409 && r.json.error === 'conflict') {
+          if (!confirm('文件已存在，覆盖它？')) { state.fs.upload = null; return }
+          overwrite = true
+          continue // 同一 offset 带 overwrite=1 重发
+        }
+        if (r.status === 409 && r.json.error === 'offset-mismatch') {
+          await probe(up)
+          continue
+        }
+        throw new Error(r.json.error || ('HTTP ' + r.status))
+      }
+
+      // 0 字节文件: 循环不执行, 发一个空 finish 块
+      if (up.size === 0 && up.offset === 0) {
+        const params = { path: up.path, name: up.name, session: up.session, offset: '0', finish: '1' }
+        if (overwrite) params.overwrite = '1'
+        const r = await uploadChunk(params, new Blob([]), up)
+        if (r.status === 401) { fsAuthError(401); return }
+        if (r.status !== 201) throw new Error(r.json.error || ('HTTP ' + r.status))
+        hideFsProgress()
+        state.fs.upload = null
         toast(`已上传 ${file.name}`, 'ok')
         loadFs()
         return
       }
-      if (xhr.status === 401) { fsAuthError(401); return }
-      let err = 'HTTP ' + xhr.status
-      try { err = JSON.parse(xhr.responseText || '{}').error || err } catch {}
-      if (xhr.status === 409 && confirm('文件已存在，覆盖它？')) { doUpload(true); return }
-      toast('上传失败：' + err, 'err')
+
+      hideFsProgress()
+    } catch (e) {
+      hideFsProgress()
+      toast(`上传中断：${e.message}（重选同一文件可断点续传）`, 'err')
     }
-    xhr.onerror = () => { hideFsProgress(); toast('上传失败：网络错误', 'err') }
-    xhr.upload.onerror = () => { hideFsProgress(); toast('上传失败：网络中断', 'err') }
-    xhr.send(file) // raw body, 网关直接流式落盘
-  }
-  doUpload(false)
+  })()
 }
 
 function fsUp() {

package/public/update.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.4.8",
+  "version": "0.4.9",
   "apkUrl": "dsh-remote.apk",
-  "releasedAt": "2026-08-15T16:19:06.176Z",
-  "notes": "新增文件传输: /fs/list /fs/file /fs/upload, 局域网/Tailscale 直传大小文件; 多服务器地址自动测速切换; 聊天记录本地缓存离线可看; 下载统一到 Downloads/dsh-remote; 修复从会话页切出后顶栏消失"
+  "releasedAt": "2026-08-16T03:05:53.903Z",
+  "notes": "上传支持分块断点续传(断网重选同一文件接着传); APK 固定签名, 各版本可原地覆盖升级; 发版全自动: tag 后 CI 构建 Release 资产 + npm + 独立仓库"
 }

package/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.4.8"
+  "version": "0.4.9"
 }