@inventec/dsh-onetree-log 0.1.2 → 0.1.3

package/lib/client.js

@@ -231,7 +231,7 @@ window.__ModuleLoader__.load({
           },
         }, data.content),
         data && data.truncated && h('div', { style: { fontSize: '11px', opacity: 0.6, marginTop: '4px' } },
-          `（仅显示前 ${humanBytes(data.content ? data.content.length : 0)}，完整内容请到服务器查看解压目录）`),
+          `（仅显示前 ${humanBytes(data.previewBytes ?? (data.content ? data.content.length : 0))}，完整内容请到服务器查看解压目录）`),
       )
     }
 

package/lib/index.js

@@ -20,7 +20,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { pipeline } from 'node:stream/promises'
-import { Readable } from 'node:stream'
 import { DumpStore } from './store.js'
 
 export const name = '@inventec/dsh-onetree-log'
@@ -62,7 +61,6 @@ function readJsonBody(req) {
 /** 上传字节流 → 临时文件（限额流式落盘，不进内存）。 */
 async function saveUpload(req, destPath) {
   let received = 0
-  const counter = new Readable().wrap(req) // 仅用于错误传播；直接流 req
   const out = fs.createWriteStream(destPath)
   await new Promise((resolve, reject) => {
     req.on('data', chunk => {
@@ -82,7 +80,6 @@ async function saveUpload(req, destPath) {
     req.on('error', reject)
     out.on('error', reject)
   })
-  void counter
 }
 
 function sanitizeUploadName(raw) {
@@ -151,11 +148,14 @@ function previewFile(absPath) {
     if (looksBinary(buf)) {
       return { binary: true, size: stat.size, truncated: stat.size > len }
     }
+    const content = buf.toString('utf8')
     return {
       binary: false,
       size: stat.size,
       truncated: stat.size > len,
-      content: buf.toString('utf8'),
+      content,
+      // UTF-8 实际字节数（content.length 是 UTF-16 字符数，中文日志会偏小）
+      previewBytes: Buffer.byteLength(content, 'utf8'),
     }
   } finally {
     fs.closeSync(handle)
@@ -188,7 +188,8 @@ async function dispatch(req, res, log) {
       return writeJson(res, 200, detail)
     }
     if (method === 'DELETE') {
-      return writeJson(res, store.remove(id) ? 200 : 404, { ok: true })
+      const removed = store.remove(id)
+      return writeJson(res, removed ? 200 : 404, removed ? { ok: true } : { ok: false, error: 'dump 不存在' })
     }
     return writeJson(res, 405, { error: 'method not allowed' })
   }

package/lib/store.js

@@ -77,7 +77,7 @@ export class DumpStore {
     return this.cache.get(key)
   }
 
-  /** ingest 完成后的完整详情：meta + 现算的文件清单（带内存缓存）。 */
+  /** ingest 完成后的完整详情：meta + 现算的文件清单（每次调用全量重建）。 */
   detail(id) {
     const meta = this.get(id)
     if (!meta) return undefined
@@ -167,13 +167,10 @@ export class DumpStore {
   remove(id) {
     const meta = this.get(id)
     if (!meta) return false
-    // path-dir：rootDir 是用户目录，绝不能删；只清登记目录（里面只有 meta.json）
+    // path-dir：rootDir 是用户目录，绝不能删；登记目录里只有 meta.json，
+    // 与其他类型一样整体清掉即可
     const home = path.join(this.dumpsDir, id)
-    if (meta.sourceKind === 'path-dir') {
-      fs.rmSync(home, { recursive: true, force: true })
-    } else {
-      fs.rmSync(home, { recursive: true, force: true })
-    }
+    fs.rmSync(home, { recursive: true, force: true })
     this.cache.delete(id)
     return true
   }
@@ -183,7 +180,9 @@ export class DumpStore {
     const meta = this.get(id)
     if (!meta) throw new Error('dump 不存在')
     const rel = String(relPath ?? '')
-    if (rel.includes('..') || rel.startsWith('/') || rel.includes('\0')) {
+    // 只按路径段拒绝 '..'（'a..b.log' 这类合法文件名不误伤）；越界仍由下方
+    // 前缀包含检查兜底，fail-safe 方向不变
+    if (rel.split(/[\\/]+/).includes('..') || rel.startsWith('/') || rel.includes('\0')) {
       throw new Error('非法的文件路径')
     }
     const target = path.resolve(meta.rootDir, ...rel.split('/').filter(s => s !== '' && s !== '.'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inventec/dsh-onetree-log",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "AMI MegaRAC OneTree 一键日志（OpenBMC dreport dump）上传与分析框架：设置面板「OneTree 日志」上传压缩包或登记服务器本地路径，安全解包、自动探测 dump 根、文件清单分类，为第二阶段逐域解析提供内核。",
   "type": "module",
   "main": "./lib/index.js",