dsh-remote 0.8.36 → 0.8.38

package/lib/client.js

@@ -187,6 +187,45 @@ window.__ModuleLoader__.load({
         'settings.modeAuto': '自动',
         'settings.modeOff': '关闭',
         'settings.modeManual': '手动',
+        // ── 工作区备份（rw_backup / rw_restore）────────────────────────────
+        'settings.backup': '工作区备份（.tar.gz）',
+        'settings.backupHint': '把远程工作区打包成 .tar.gz。默认**全部收录**；需要更小的归档时再填排除项。归档可留在远端、拉到本机、或两边都留。',
+        'settings.backupCreate': '立即备份',
+        'settings.backupCreating': '备份中…',
+        'settings.backupExcludes': '排除项（每行一个）',
+        'settings.backupExcludesPlaceholder': 'node_modules\n/build/\n*.log',
+        'settings.backupDest': '存放位置',
+        'settings.backupDestRemote': '仅远端',
+        'settings.backupDestLocal': '仅本机',
+        'settings.backupDestBoth': '两边都留',
+        'settings.backupDirLabel': '远端备份目录：{dir}',
+        'settings.backupDirUnknown': '（无法确定远端备份目录）',
+        'settings.backupNone': '还没有备份。点「立即备份」创建第一个。',
+        'settings.backupCount': '{n} 个备份',
+        'settings.backupWhereRemote': '远端',
+        'settings.backupWhereLocal': '本机',
+        'settings.backupRestore': '恢复',
+        'settings.backupDownload': '下载',
+        'settings.backupUpload': '传回远端',
+        'settings.backupDelete': '删除',
+        'settings.backupVerify': '校验',
+        'settings.backupRestoreConfirm': '要用 {file} 覆盖恢复远程工作区吗？归档里没有的文件会被删除（合并模式不删）。',
+        'settings.backupDeleteConfirm': '删除备份 {file}？此操作不可撤销。',
+        'settings.backupModeReplace': '整树替换',
+        'settings.backupModeMerge': '合并（不删除）',
+        'settings.backupVerified': '校验通过：sha256 {sha}',
+        'settings.backupVerifyMismatch': '校验失败：哈希与记录不一致（归档可能已损坏）',
+        'settings.backupNoSidecar': '无 sidecar（早期归档，元数据未知）',
+        'settings.backupRestored': '已恢复 {file} → {target}',
+        'settings.backupCreated': '已创建 {file}',
+        'settings.backupDownloaded': '已下载到本机：{path}',
+        'settings.backupUploaded': '已传回远端：{path}',
+        'settings.backupDeleted': '已删除 {file}',
+        'settings.backupRefresh': '刷新列表',
+        'settings.backupFailed': '备份操作失败：{msg}',
+        'settings.backupOverCap': '归档超过搬运上限，未传输（可用 maxBackupTransferBytes 放宽）',
+        'settings.backupMachine': '机器',
+        'settings.backupPickMachine': '— 选择机器 —',
         'picker.title': '选择工作目录',
         'picker.close': '关闭 ✕',
         'picker.tabLocal': '本机',
@@ -445,6 +484,45 @@ window.__ModuleLoader__.load({
         'settings.modeAuto': 'Auto',
         'settings.modeOff': 'Off',
         'settings.modeManual': 'Manual',
+        // ── workspace backup (rw_backup / rw_restore) ──────────────────────
+        'settings.backup': 'Workspace backup (.tar.gz)',
+        'settings.backupHint': 'Archive the remote workspace to a .tar.gz. **Everything is included by default**; add excludes only when you want a smaller archive. The archive can stay on the remote, be pulled here, or both.',
+        'settings.backupCreate': 'Back up now',
+        'settings.backupCreating': 'Backing up…',
+        'settings.backupExcludes': 'Excludes (one per line)',
+        'settings.backupExcludesPlaceholder': 'node_modules\n/build/\n*.log',
+        'settings.backupDest': 'Store in',
+        'settings.backupDestRemote': 'Remote only',
+        'settings.backupDestLocal': 'Local only',
+        'settings.backupDestBoth': 'Both',
+        'settings.backupDirLabel': 'Remote backup directory: {dir}',
+        'settings.backupDirUnknown': '(cannot determine the remote backup directory)',
+        'settings.backupNone': 'No backups yet. Click "Back up now" to create the first one.',
+        'settings.backupCount': '{n} backup(s)',
+        'settings.backupWhereRemote': 'Remote',
+        'settings.backupWhereLocal': 'Local',
+        'settings.backupRestore': 'Restore',
+        'settings.backupDownload': 'Download',
+        'settings.backupUpload': 'Upload',
+        'settings.backupDelete': 'Delete',
+        'settings.backupVerify': 'Verify',
+        'settings.backupRestoreConfirm': 'Overwrite the remote workspace with {file}? Files not present in the archive will be removed (merge mode deletes nothing).',
+        'settings.backupDeleteConfirm': 'Delete the backup {file}? This cannot be undone.',
+        'settings.backupModeReplace': 'Replace tree',
+        'settings.backupModeMerge': 'Merge (keep extra)',
+        'settings.backupVerified': 'Verified: sha256 {sha}',
+        'settings.backupVerifyMismatch': 'Verification FAILED: the digest does not match the recorded one (the archive may be corrupt)',
+        'settings.backupNoSidecar': 'No sidecar (older archive; metadata unknown)',
+        'settings.backupRestored': 'Restored {file} → {target}',
+        'settings.backupCreated': 'Created {file}',
+        'settings.backupDownloaded': 'Downloaded locally: {path}',
+        'settings.backupUploaded': 'Uploaded to the remote: {path}',
+        'settings.backupDeleted': 'Deleted {file}',
+        'settings.backupRefresh': 'Refresh list',
+        'settings.backupFailed': 'Backup action failed: {msg}',
+        'settings.backupOverCap': 'The archive is over the transfer cap, so it was not transferred (raise maxBackupTransferBytes to allow it)',
+        'settings.backupMachine': 'Machine',
+        'settings.backupPickMachine': '— choose a machine —',
         'picker.title': 'Select working directory',
         'picker.close': 'Close ✕',
         'picker.tabLocal': 'Local',
@@ -860,6 +938,21 @@ window.__ModuleLoader__.load({
       const [deployBusy, setDeployBusy] = React.useState('')
       const [deployErr, setDeployErr] = React.useState('')
       const [deployOpen, setDeployOpen] = React.useState(false)
+      // ── workspace backup (rw_backup / rw_restore) ──────────────────────────
+      // Machine-scoped like the deploy card: `backupMachine` empty means "this
+      // session's machine", which the host resolves from the session binding.
+      const [backupOpen, setBackupOpen] = React.useState(false)
+      const [backupData, setBackupData] = React.useState(null)
+      const [backupBusy, setBackupBusy] = React.useState('')
+      const [backupMsg, setBackupMsg] = React.useState('')
+      const [backupErr, setBackupErr] = React.useState('')
+      const [backupExcludes, setBackupExcludes] = React.useState('')
+      const [backupDest, setBackupDest] = React.useState('remote')
+      // Restore mode is a panel-level choice rather than a per-row prompt: the
+      // two modes differ in whether files absent from the archive are DELETED,
+      // so it is worth showing which one is armed before clicking Restore.
+      const [backupRestoreMode, setBackupRestoreMode] = React.useState('replace')
+      const [backupMachine, setBackupMachine] = React.useState('')
       React.useEffect(() => { ensureChromeCss() }, [])
 
       const testConn = () => {
@@ -949,6 +1042,43 @@ window.__ModuleLoader__.load({
       const refreshForwards = () => api('GET', '/dsh-remote/forwards').then((r) => setForwards(r.forwards || [])).catch(() => {})
       React.useEffect(() => { refreshForwards(); api('GET', '/dsh-remote/audit?limit=30').then((r) => setAuditLines(r.lines || [])).catch(() => {}) }, [])
 
+      // ── 工作区备份 ────────────────────────────────────────────────────────
+      // Reads/writes go through /dsh-remote/backup. The list carries BOTH the
+      // remote archives and any pulled locally, so one refresh answers the panel.
+      const backupQuery = (extra) => {
+        const q = backupMachine ? 'machineId=' + encodeURIComponent(backupMachine) : ''
+        return q ? (extra ? q + '&' + extra : q) : (extra || '')
+      }
+      const refreshBackups = () => api('GET', '/dsh-remote/backup' + (backupQuery('') ? '?' + backupQuery('') : ''))
+        .then((r) => { setBackupData(r); setBackupErr('') })
+        .catch((e) => setBackupErr(String((e && e.message) || e)))
+      React.useEffect(() => { refreshBackups() }, [backupMachine])
+      const backupAction = (action, body) => {
+        setBackupBusy(action); setBackupMsg(''); setBackupErr('')
+        return api('POST', '/dsh-remote/backup', Object.assign({ action }, backupMachine ? { machineId: backupMachine } : {}, body || {}))
+          .then((r) => {
+            if (r) setBackupData(r)
+            if (action === 'create' && r && r.created) {
+              setBackupMsg(tr('settings.backupCreated', { file: r.created.name }) + (r.pullError ? ' — ' + tr('settings.backupOverCap') + ' (' + r.pullError + ')' : ''))
+            } else if (action === 'restore' && r && r.restored) {
+              setBackupMsg(tr('settings.backupRestored', { file: r.restored.file, target: r.restored.target }))
+            } else if (action === 'delete') {
+              setBackupMsg(tr('settings.backupDeleted', { file: body.file }))
+            } else if (action === 'download' && r && r.localPath) {
+              setBackupMsg(tr('settings.backupDownloaded', { path: r.localPath }))
+            } else if (action === 'upload' && r && r.remotePath) {
+              setBackupMsg(tr('settings.backupUploaded', { path: r.remotePath }))
+            } else if (action === 'verify' && r) {
+              setBackupMsg(r.matches === false || r.verified === false
+                ? tr('settings.backupVerifyMismatch')
+                : tr('settings.backupVerified', { sha: String(r.sha256 || '').slice(0, 16) }))
+            }
+            return r
+          })
+          .catch((e) => { setBackupErr(tr('settings.backupFailed', { msg: String((e && e.message) || e) })); return null })
+          .then((r) => { setBackupBusy(''); return r })
+      }
+
       // ── 远程 DSH 界面（issue #46）─────────────────────────────────────────
       // The remote never opens an inbound port; we SSH out and carry the remote
       // loopback web UI back to a local port. One tunnel per machine.
@@ -1330,6 +1460,96 @@ window.__ModuleLoader__.load({
             deployErr ? React.createElement('div', { style: { color: T.danger, fontSize: 12, marginTop: 6, wordBreak: 'break-all' } }, deployErr) : null,
           ) : React.createElement('div', { style: { fontSize: 11, opacity: 0.55 } }, deploy && deploy.verdict ? (deploy.verdict.ok ? tr('settings.deployOk') : tr('settings.deployBlocked')) : ''),
         ),
+        // 工作区备份（rw_backup / rw_backup_list / rw_restore）
+        React.createElement('div', { style: boxS },
+          sectionToggle(backupOpen, setBackupOpen, tr('settings.backup'),
+            backupData ? React.createElement('span', { style: { marginLeft: 'auto', fontSize: 11, opacity: 0.6 } },
+              tr('settings.backupCount', { n: (backupData.entries || []).length + ((backupData.local && backupData.local.entries) || []).length })) : null),
+          backupOpen ? React.createElement(React.Fragment, null,
+            React.createElement('div', { style: { opacity: 0.65, fontSize: 11, lineHeight: 1.5, marginBottom: 6 } }, tr('settings.backupHint')),
+            React.createElement('div', { style: { fontSize: 11, opacity: 0.7, marginBottom: 6, wordBreak: 'break-all' } },
+              backupData && backupData.backupDir ? tr('settings.backupDirLabel', { dir: backupData.backupDir }) : tr('settings.backupDirUnknown')),
+            // Machine selector: empty means "this session's machine", which the
+            // host resolves from the session binding (the panel is reachable from
+            // a local session too, hence an explicit choice is always available).
+            React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center', marginBottom: 6, flexWrap: 'wrap' } },
+              React.createElement('span', { style: { fontSize: 12, opacity: 0.8 } }, tr('settings.backupMachine') + ':'),
+              React.createElement('select', { className: 'dsh-rw-input', value: backupMachine, onChange: (e) => setBackupMachine(e.target.value), style: { ...inputS, maxWidth: 200 } },
+                React.createElement('option', { value: '' }, tr('settings.backupPickMachine')),
+                machines.map((m) => React.createElement('option', { key: m.id, value: m.id }, `${m.name || m.host} (${m.username}@${m.host})`))),
+              React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 10px' },
+                disabled: !!backupBusy, onClick: () => refreshBackups() }, tr('settings.backupRefresh')),
+              // Which restore mode the Restore button will use.
+              React.createElement('span', { style: { fontSize: 12, opacity: 0.8, marginLeft: 4 } }, tr('settings.backupRestore') + ':'),
+              React.createElement('select', {
+                className: 'dsh-rw-input', value: backupRestoreMode,
+                onChange: (e) => setBackupRestoreMode(e.target.value),
+                style: { ...inputS, maxWidth: 170 },
+              },
+                React.createElement('option', { value: 'replace' }, tr('settings.backupModeReplace')),
+                React.createElement('option', { value: 'merge' }, tr('settings.backupModeMerge')))),
+            // Excludes + destination, then the create button.
+            React.createElement('div', { style: { display: 'flex', gap: 8, alignItems: 'flex-start', flexWrap: 'wrap', marginBottom: 6 } },
+              React.createElement('div', { style: { flex: '1 1 260px', minWidth: 220 } },
+                React.createElement('div', { style: { fontSize: 11, opacity: 0.75, marginBottom: 2 } }, tr('settings.backupExcludes')),
+                React.createElement('textarea', {
+                  className: 'dsh-rw-input', value: backupExcludes,
+                  onChange: (e) => setBackupExcludes(e.target.value),
+                  placeholder: tr('settings.backupExcludesPlaceholder'),
+                  rows: 3, style: { ...inputS, width: '100%', fontFamily: 'monospace', resize: 'vertical' },
+                })),
+              React.createElement('div', null,
+                React.createElement('div', { style: { fontSize: 11, opacity: 0.75, marginBottom: 2 } }, tr('settings.backupDest')),
+                React.createElement('select', { className: 'dsh-rw-input', value: backupDest, onChange: (e) => setBackupDest(e.target.value), style: { ...inputS, maxWidth: 160 } },
+                  React.createElement('option', { value: 'remote' }, tr('settings.backupDestRemote')),
+                  React.createElement('option', { value: 'local' }, tr('settings.backupDestLocal')),
+                  React.createElement('option', { value: 'both' }, tr('settings.backupDestBoth'))),
+                React.createElement('button', {
+                  type: 'button', className: 'dsh-rw-btn dsh-rw-primary',
+                  style: { ...primaryBtnS, marginTop: 6, display: 'block' },
+                  disabled: !!backupBusy,
+                  onClick: () => backupAction('create', { excludes: backupExcludes, dest: backupDest }),
+                }, backupBusy === 'create' ? tr('settings.backupCreating') : tr('settings.backupCreate')))),
+            // The list: remote archives then local copies. A sidecar-less archive
+            // is labelled instead of showing invented metadata.
+            (backupData && (backupData.entries || []).length) || (backupData && backupData.local && (backupData.local.entries || []).length)
+              ? React.createElement('div', { style: { maxHeight: 280, overflowY: 'auto' } },
+                  (backupData.entries || []).map((e) => React.createElement('div', { key: 'r-' + e.name, className: 'dsh-rw-row', style: { display: 'flex', gap: 6, alignItems: 'center', padding: '5px 0', borderBottom: '1px solid ' + T.border, fontSize: 12, flexWrap: 'wrap' } },
+                    React.createElement('span', { style: { fontFamily: 'monospace', flex: '1 1 220px', wordBreak: 'break-all' } }, e.name),
+                    React.createElement('span', { style: { opacity: 0.7, minWidth: 60 } }, humanSize(e.bytes)),
+                    React.createElement('span', { style: { opacity: 0.7 } }, e.createdAt || e.mtime || ''),
+                    React.createElement('span', { style: { opacity: 0.55, fontSize: 11 } }, tr('settings.backupWhereRemote')),
+                    e.hasMeta ? null : React.createElement('span', { style: { color: T.warn, fontSize: 11 } }, tr('settings.backupNoSidecar')),
+                    React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 8px' }, disabled: !!backupBusy,
+                      onClick: () => backupAction('verify', { file: e.name }) }, tr('settings.backupVerify')),
+                    React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 8px' }, disabled: !!backupBusy,
+                      onClick: () => backupAction('download', { file: e.name }) }, tr('settings.backupDownload')),
+                    // Restore is destructive, so it asks first and sends the
+                    // explicit confirmation the host requires.
+                    React.createElement('button', { type: 'button', className: 'dsh-rw-btn dsh-rw-primary', style: { ...primaryBtnS, padding: '2px 8px' }, disabled: !!backupBusy,
+                      onClick: () => {
+                        if (!window.confirm(tr('settings.backupRestoreConfirm', { file: e.name }))) return
+                        backupAction('restore', { file: e.name, confirm: true, mode: backupRestoreMode })
+                      } }, tr('settings.backupRestore')),
+                    React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 8px', color: T.dangerText }, disabled: !!backupBusy,
+                      onClick: () => { if (window.confirm(tr('settings.backupDeleteConfirm', { file: e.name }))) backupAction('delete', { file: e.name }) } }, tr('settings.backupDelete')))),
+                  ((backupData.local && backupData.local.entries) || []).map((e) => React.createElement('div', { key: 'l-' + e.name, className: 'dsh-rw-row', style: { display: 'flex', gap: 6, alignItems: 'center', padding: '5px 0', borderBottom: '1px solid ' + T.border, fontSize: 12, opacity: 0.92, flexWrap: 'wrap' } },
+                    React.createElement('span', { style: { fontFamily: 'monospace', flex: '1 1 220px', wordBreak: 'break-all' } }, e.name),
+                    React.createElement('span', { style: { opacity: 0.7, minWidth: 60 } }, humanSize(e.bytes)),
+                    React.createElement('span', { style: { opacity: 0.7 } }, e.createdAt || e.mtime || ''),
+                    React.createElement('span', { style: { opacity: 0.55, fontSize: 11 } }, tr('settings.backupWhereLocal')),
+                    React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 8px' }, disabled: !!backupBusy,
+                      onClick: () => backupAction('verify', { file: e.name, where: 'local' }) }, tr('settings.backupVerify')),
+                    React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 8px' }, disabled: !!backupBusy,
+                      onClick: () => backupAction('upload', { file: e.name }) }, tr('settings.backupUpload')),
+                    React.createElement('button', { type: 'button', className: 'dsh-rw-btn', style: { ...buttonS, padding: '2px 8px', color: T.dangerText }, disabled: !!backupBusy,
+                      onClick: () => { if (window.confirm(tr('settings.backupDeleteConfirm', { file: e.name }))) backupAction('delete', { file: e.name, where: 'local' }) } }, tr('settings.backupDelete')))))
+              : React.createElement('div', { style: { opacity: 0.6, fontSize: 12 } }, tr('settings.backupNone')),
+            backupMsg ? React.createElement('div', { style: { marginTop: 6, fontSize: 12, color: T.ok, wordBreak: 'break-all' } }, backupMsg) : null,
+            backupErr ? React.createElement('div', { style: { marginTop: 6, fontSize: 12, color: T.danger, wordBreak: 'break-all' } }, backupErr) : null,
+          ) : backupData ? React.createElement('div', { style: { fontSize: 11, opacity: 0.55 } },
+              tr('settings.backupCount', { n: (backupData.entries || []).length + ((backupData.local && backupData.local.entries) || []).length })) : null,
+        ),
         // 端口转发面板
         React.createElement('div', { style: boxS },
           sectionToggle(fwdOpen, setFwdOpen, tr('settings.forwards')),

package/lib/errors.js

@@ -66,6 +66,15 @@ export function classifyError(err, opts = {}) {
       raw: msg,
     }
   }
+  // ssh2 throws these SYNCHRONOUSLY from Client.connect (issue #48) — the most
+  // common one is an encrypted OpenSSH key without a passphrase.
+  if (/no passphrase given|cannot parse privatekey|does not contain a \(valid\) private key/i.test(msg)) {
+    return {
+      category: 'credentials',
+      hint: `私钥解析失败${where}：私钥已加密但未提供 passphrase，或私钥格式不受支持。请为该机器填写 passphrase，或改用未加密/受支持格式（OpenSSH/PEM）的私钥。`,
+      raw: msg,
+    }
+  }
   return { category: 'other', hint: msg, raw: msg }
 }