diff --git a/app/config.example.yml b/app/config.example.yml index 3250654..e969621 100644 --- a/app/config.example.yml +++ b/app/config.example.yml @@ -40,6 +40,13 @@ agent: max_tool_iterations: 50 max_retries: 2 +# 大图上传预处理:图片超过 threshold_kb(默认 1.5M)时,浏览器端询问是否压缩; +# 同意后在用户本地 canvas 压缩(长边 ≤ image_max_dim,JPEG image_quality)再上传。 +upload: + image_compress_threshold_kb: 1536 + image_max_dim: 2000 + image_quality: 0.85 + # 模型保持占用(held)租约:AI 答完后不立即释放模型,用户追问可直接复用。 # 页面无人观看超过 idle_release_ms 释放;有人观看最长保持 active_max_ms;sweep_ms 巡检间隔。 # 新建后从未发言的空闲会话也按同一租约自动释放。 diff --git a/app/server/config.js b/app/server/config.js index e48f9c0..07f86de 100644 --- a/app/server/config.js +++ b/app/server/config.js @@ -10,6 +10,9 @@ const DEFAULTS = { db_path: '', // 默认为 workspace_root/.agent.db terminal: { default_timeout_ms: 30000, max_output_chars: 10000 }, agent: { temperature: 1.0, max_tool_iterations: 50, max_retries: 2 }, + // 大图上传预处理:图片文件超过 threshold_kb 时,浏览器端询问用户后用 canvas 压缩 + // (长边 ≤ max_dim,JPEG quality)再上传,减轻服务器带宽与存储压力。参数经 /api/system/status 下发给前端。 + upload: { image_compress_threshold_kb: 1536, image_max_dim: 2000, image_quality: 0.85 }, // 技能(Skill Manager):skills_root 为技能根目录,所有任务/会话共享(容器内挂我 ./skills → /workspace/skills); // 缺省取 workspace_root 的同级目录 skills(如 /workspace/tasks → /workspace/skills)。timeout_ms 为单个技能执行超时,默认 120000。 skills: { skills_root: '', timeout_ms: 120000 }, diff --git a/app/server/public/index.html b/app/server/public/index.html index b59e919..dd8568d 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -295,10 +295,10 @@ - - - - - + + + + + diff --git a/app/server/public/js/tasks.js b/app/server/public/js/tasks.js index 1a98844..587bf5f 100644 --- a/app/server/public/js/tasks.js +++ b/app/server/public/js/tasks.js @@ -181,6 +181,72 @@ function renderAttach() { } } +// ---------- 大图上传前压缩 ---------- +// 阈值/参数由服务端下发(config.upload,经 /api/system/status 透出)。超过阈值的图片 +// 先询问用户,同意后在浏览器端 canvas 压缩再上传,减轻服务器带宽与存储压力。 +const DEFAULT_UPLOAD_CFG = { image_compress_threshold_kb: 1536, image_max_dim: 2000, image_quality: 0.85 }; +let uploadCfgCache = null; +async function getUploadCfg() { + if (!uploadCfgCache) { + uploadCfgCache = Object.assign({}, DEFAULT_UPLOAD_CFG); + try { + const s = await req('GET', '/api/system/status'); + uploadCfgCache = Object.assign(uploadCfgCache, (s && s.upload) || {}); + } catch (_) { /* 取不到配置就用默认阈值 */ } + } + return uploadCfgCache; +} +function loadImageEl(file) { + return new Promise(function (resolve, reject) { + const fr = new FileReader(); + fr.onload = function () { + const im = new Image(); + im.onload = function () { resolve(im); }; + im.onerror = function () { reject(new Error('图片解码失败')); }; + im.src = fr.result; + }; + fr.onerror = function () { reject(new Error('读取文件失败')); }; + fr.readAsDataURL(file); + }); +} +// 返回待上传的 File:需要时询问并压缩;取消/失败/无收益都按原文件上传。 +async function maybeCompressImage(file) { + const cfg = await getUploadCfg(); + const isImg = /^image\//.test(file.type || '') || /\.(png|jpe?g|gif|bmp|webp)$/i.test(file.name || ''); + const threshold = Number(cfg.image_compress_threshold_kb || 1536) * 1024; + if (!isImg || file.size <= threshold) return file; + const maxDim = Number(cfg.image_max_dim || 2000); + const quality = Number(cfg.image_quality || 0.85); + const ok = await confirmModal('图片文件过大', + '「' + file.name + '」有 ' + fmtSize(file.size) + ',超过 ' + fmtSize(threshold) + + '。建议在浏览器本地压缩为 JPEG(长边≤' + maxDim + 'px)后再上传。是否压缩?', '压缩后上传'); + if (!ok) return file; + try { + const img = await loadImageEl(file); + const iw = img.naturalWidth || img.width, ih = img.naturalHeight || img.height; + if (!iw || !ih) throw new Error('无法读取图片尺寸'); + const scale = Math.min(1, maxDim / Math.max(iw, ih)); + const w = Math.max(1, Math.round(iw * scale)), h = Math.max(1, Math.round(ih * scale)); + const canvas = document.createElement('canvas'); + canvas.width = w; canvas.height = h; + const ctx = canvas.getContext('2d'); + // 透明底(PNG)转 JPEG 前先铺白,避免变黑 + ctx.fillStyle = '#fff'; ctx.fillRect(0, 0, w, h); + ctx.drawImage(img, 0, 0, w, h); + const blob = await new Promise(function (res) { canvas.toBlob(function (b) { res(b); }, 'image/jpeg', quality); }); + if (!blob || blob.size >= file.size) { + toast('压缩无收益,已按原文件上传'); + return file; + } + const newName = String(file.name || 'image').replace(/\.[^.]+$/, '') + '.jpg'; + toast('已压缩 ' + fmtSize(file.size) + ' → ' + fmtSize(blob.size)); + return new File([blob], newName, { type: 'image/jpeg' }); + } catch (e) { + toast('压缩失败(' + (e && e.message || e) + '),按原文件上传'); + return file; + } +} + function startUpload(file) { if (!state.sessionId) return; const item = { name: file.name, size: file.size, pct: 0, status: 'up' }; @@ -686,7 +752,10 @@ const ui = { const files = Array.prototype.slice.call(input.files || []); input.value = ''; if (!files.length || !state.sessionId) return; - for (const f of files) startUpload(f); // 多个文件并行上传,进度在回形针图标上汇总 + // 大图逐个串行询问压缩(模态弹窗不能并行),完成后再并行上传 + const ready = []; + for (const f of files) ready.push(await maybeCompressImage(f)); + for (const f of ready) startUpload(f); // 多个文件并行上传,进度在回形针图标上汇总 }, removeAttach(i) { removeAttach(i); }, async deleteFile(name) { diff --git a/app/server/routes/system.js b/app/server/routes/system.js index a047e10..0dc6c18 100644 --- a/app/server/routes/system.js +++ b/app/server/routes/system.js @@ -45,6 +45,8 @@ router.get('/status', wrap((req, res) => { port: cfg.port, auth_enabled: !!(cfg.auth && cfg.auth.users && cfg.auth.users.length), running_sessions: engine.activeRuns(), + // 前端上传前的大图压缩参数(阈值/尺寸/质量),避免前端写死 + upload: cfg.upload || {}, }); }));