wwt-platform 1.1.6 → 1.1.8

package/package.json

@@ -1,18 +1,18 @@
-{
-  "name": "wwt-platform",
-  "version": "1.1.6",
-  "description": "WWT 工作平台 - 平台本体与工具清单分发",
-  "files": [
-    "platform.html",
-    "tools.json",
-    "README.md"
-  ],
-  "keywords": [
-    "wwt",
-    "platform",
-    "tools"
-  ],
-  "author": "mrhu1988",
-  "license": "UNLICENSED",
-  "private": false
-}
+{
+  "name": "wwt-platform",
+  "version": "1.1.8",
+  "description": "WWT 工作平台 - 平台本体与工具清单分发",
+  "files": [
+    "platform.html",
+    "tools.json",
+    "README.md"
+  ],
+  "keywords": [
+    "wwt",
+    "platform",
+    "tools"
+  ],
+  "author": "mrhu1988",
+  "license": "UNLICENSED",
+  "private": false
+}

package/platform.html

@@ -1357,7 +1357,7 @@ function doAddMod(){
 // ═══════════════════════════════════════════════════════════
 //  平台更新（方案B：平台 + 内置工具统一检查）
 // ═══════════════════════════════════════════════════════════
-const PLATFORM_VER = '1.1.6';
+const PLATFORM_VER = '1.1.8';
 const NPM_PKG = 'wwt-platform';                 // NPM 包名（主力分发源）
 const GITEE_TOKEN_KEY  = 'wwt_gitee_token';
 const GITEE_TOKEN_DEF  = 'e45883b9c89b8d9689746ce42bbc2b0b';
@@ -1366,20 +1366,23 @@ const GITEE_PLATFORM_REPO = 'wwtmrhu/wwt-platform';
 
 // ── 分发源：按优先级依次尝试，任一成功即用 ────────────────────────────
 // npmmirror 国内最快；npmjs 官方源兜底；Gitee 作为最终备用
+// 注：npmmirror 的 /files/ 接口有白名单限制，新包取不到；
+//     改用 tarball 接口 + 浏览器原生解压（DecompressionStream），国内速度最快
 const SOURCES = [
   { id:'npmmirror', label:'NPM镜像',
     verUrl : () => `https://registry.npmmirror.com/${NPM_PKG}/latest`,
-    fileUrl: (v,f) => `https://registry.npmmirror.com/${NPM_PKG}/${v}/files/${f}` },
+    file   : async (v,f) => await tarFile(
+                `https://registry.npmmirror.com/${NPM_PKG}/-/${NPM_PKG}-${v}.tgz`, f) },
   { id:'npmjs', label:'NPM官方',
     verUrl : () => `https://registry.npmjs.org/${NPM_PKG}/latest`,
-    fileUrl: (v,f) => `https://cdn.jsdelivr.net/npm/${NPM_PKG}@${v}/${f}` },
-  { id:'gitee', label:'Gitee', verUrl:null, fileUrl:null }   // 走 API，单独处理
+    file   : async (v,f) => await fetchText(`https://cdn.jsdelivr.net/npm/${NPM_PKG}@${v}/${f}`) },
+  { id:'gitee', label:'Gitee', verUrl:null, file:null }   // 走 API，单独处理
 ];
 
 // 更新清单：每个条目 = 一个可更新对象（平台或工具）
 // 这是「离线兜底种子」——联网时会与远程 tools.json 合并，远程为准
 const UPD_REG_DEF = [
-  {key:'platform',    name:'WWT 工作平台',        cur:'1.1.6', repo:GITEE_PLATFORM_REPO,               verFile:'version.js',       appFile:'app.js',            pat:'__WWT_PLATFORM_VER',   kind:'platform'},
+  {key:'platform',    name:'WWT 工作平台',        cur:'1.1.8', repo:GITEE_PLATFORM_REPO,               verFile:'version.js',       appFile:'app.js',            pat:'__WWT_PLATFORM_VER',   kind:'platform'},
   {key:'erp-recon',   name:'ERP 对账工具',         cur:'V1.0.2',repo:'wwtmrhu/erp-recon',               verFile:'version.js',       appFile:'app.js',            pat:'__ERP_LATEST_VER'},
   {key:'erp-tool',    name:'ERP 对账单生成匹配',   cur:'1.0.0', repo:'wwtmrhu/erp-tool',                verFile:'version.js',       appFile:'app.js',            pat:'__ERP_LATEST_VER'},
   {key:'voucher',     name:'WWT 凭证工具',         cur:'P1.2.12',repo:'wwtmrhu/certificate-generation', verFile:'dist/version.json', appFile:'',               pat:'ver', appUrl:true}
@@ -1447,6 +1450,21 @@ async function fetchText(url, timeoutMs) {
   } finally { clearTimeout(timer); }
 }
 
+// 查询任意 NPM 包的最新版本号（兼容 npmmirror → npmjs）
+async function npmLatestVer(pkg) {
+  for (const urls of [
+    `https://registry.npmmirror.com/${pkg}/latest`,
+    `https://registry.npmjs.org/${pkg}/latest`
+  ]) {
+    try {
+      const j = await fetchText(urls);
+      const v = (JSON.parse(j) || {}).version;
+      if (v) return v;
+    } catch(e) {}
+  }
+  throw new Error('未取到 ' + pkg + ' 的版本号');
+}
+
 // 某个源上的平台版本号
 async function sourceVersion(s) {
   if (s.id === 'gitee') {
@@ -1457,10 +1475,36 @@ async function sourceVersion(s) {
   return (JSON.parse(j) || {}).version || null;
 }
 
+// 从 NPM tarball（.tgz）中解出指定文件：gzip 解压 + tar 解析
+// 浏览器原生 DecompressionStream，无需任何第三方库
+async function tarFile(tgzUrl, wantName) {
+  const resp = await fetch(tgzUrl, { cache:'no-store' });
+  if (!resp.ok) throw new Error('HTTP ' + resp.status);
+  const stream = resp.body.pipeThrough(new DecompressionStream('gzip'));
+  const buf = new Uint8Array(await new Response(stream).arrayBuffer());
+  const dec = new TextDecoder('utf-8');
+  let off = 0;
+  while (off + 512 <= buf.length) {
+    const header = buf.subarray(off, off + 512);
+    // 全零块 = 归档结束
+    let zero = true;
+    for (let i = 0; i < 512; i++) { if (header[i] !== 0) { zero = false; break; } }
+    if (zero) break;
+    const name = dec.decode(header.subarray(0, 100)).replace(/\0[\s\S]*$/, '');
+    const size = parseInt(dec.decode(header.subarray(124, 136)).replace(/\0[\s\S]*$/, '').trim(), 8) || 0;
+    const start = off + 512;
+    if (name.replace(/^package\//, '') === wantName) {
+      return dec.decode(buf.subarray(start, start + size));
+    }
+    off = start + Math.ceil(size / 512) * 512;
+  }
+  throw new Error('压缩包中未找到 ' + wantName);
+}
+
 // 某个源上的文件内容
 async function sourceFile(s, ver, name) {
   if (s.id === 'gitee') return await fetchGiteeFile(GITEE_PLATFORM_REPO, name);
-  return await fetchText(s.fileUrl(ver, name));
+  return await s.file(ver, name);
 }
 
 // 依次尝试所有源
@@ -1552,9 +1596,13 @@ async function downloadToolContent(it) {
   const src = SOURCES.find(s => s.id === 'npmmirror');
   let b64;
   if (it.npmPkg && it.npmFile) {
-    // NPM 托管的工具：直接取文件
-    const ver = await sourceVersion(src);
-    return await fetchText(`https://registry.npmmirror.com/${it.npmPkg}/${ver}/files/${it.npmFile}`);
+    // NPM 托管的工具：从 tarball 里取文件（npmmirror 的 /files/ 有白名单限制）
+    const ver = it.npmVer || (await npmLatestVer(it.npmPkg));
+    try {
+      return await tarFile(`https://registry.npmmirror.com/${it.npmPkg}/-/${it.npmPkg}-${ver}.tgz`, it.npmFile);
+    } catch(e) {
+      return await fetchText(`https://cdn.jsdelivr.net/npm/${it.npmPkg}@${ver}/${it.npmFile}`);
+    }
   }
   if (it.appUrl) {
     const vc = await fetchGiteeFile(it.repo, it.verFile);
@@ -1649,10 +1697,20 @@ async function checkOneUpd(it, token) {
   // 没有远程更新源的工具：不做版本比对
   if (it.noSrc) { r.latest = it.cur; r.note = '本地工具（无远程更新源）'; return r; }
 
+  // ① 优先用 NPM 清单里声明的版本号——版本检查不再频繁请求 Gitee，避免被限流
+  if (it.manifestVer) {
+    r.latest = it.manifestVer;
+    r.srcLabel = 'NPM清单';
+    r.hasNew = verGt(r.latest, r.cur);
+    return r;
+  }
+
+  // ② 清单未声明版本时，才回退去读工具自身仓库
   try {
     const vc = await fetchGiteeFile(it.repo, it.verFile, token);
     r.latest = parseVer(vc, it.pat);
     if (!r.latest) { r.error = '版本文件中未找到版本号'; return r; }
+    r.srcLabel = 'Gitee';
     r.hasNew = verGt(r.latest, r.cur);
   } catch(e) { r.error = e.message; }
   return r;

package/tools.json

@@ -1,82 +1,82 @@
-{
-  "schema": 1,
-  "platform": "1.1.6",
-  "updatedAt": "2026-09-10",
-  "note": "WWT 工作平台工具清单。新增/修改工具只需改这个文件并发布新版本，用户端自动同步，无需重新分发平台。",
-  "tools": [
-    {
-      "key": "ledger-clear",
-      "name": "往来款项两清工具",
-      "module": "fin",
-      "desc": "自动对账核销，支持 Excel 导入",
-      "ver": "1.0.0",
-      "type": "html",
-      "tag": "HTML",
-      "path": "C:/Users/Administrator/Desktop/往来款项两清工具.html",
-      "src": null
-    },
-    {
-      "key": "erp-recon",
-      "name": "ERP对账工具",
-      "module": "fin",
-      "desc": "ERP 系统多模块对账比对",
-      "ver": "1.1.10",
-      "type": "html",
-      "tag": "HTML",
-      "path": "C:/Users/Administrator/Desktop/ERP对账工具更新版.html",
-      "src": {
-        "type": "gitee",
-        "repo": "wwtmrhu/erp-recon",
-        "verFile": "version.js",
-        "appFile": "app.js",
-        "pat": "__ERP_LATEST_VER"
-      }
-    },
-    {
-      "key": "erp-tool",
-      "name": "ERP对账单生成匹配",
-      "module": "fin",
-      "desc": "对账单自动生成与匹配",
-      "ver": "2.0.45",
-      "type": "html",
-      "tag": "HTML",
-      "path": "C:/Users/Administrator/Desktop/ERP对账单生成匹配工具更新版.html",
-      "src": {
-        "type": "gitee",
-        "repo": "wwtmrhu/erp-tool",
-        "verFile": "version.js",
-        "appFile": "app.js",
-        "pat": "__ERP_LATEST_VER"
-      }
-    },
-    {
-      "key": "kkd",
-      "name": "WWT快快对",
-      "module": "fin",
-      "desc": "往来账双向自动对账",
-      "ver": "1.0.0",
-      "type": "html",
-      "tag": "HTML",
-      "path": "C:/Users/Administrator/WorkBuddy/2026-08-12-10-53-10/WWT快快对.html",
-      "src": null
-    },
-    {
-      "key": "voucher",
-      "name": "WWT凭证工具",
-      "module": "fin",
-      "desc": "自动生成记账凭证，支持规则配置、凭证审核、导出金蝶",
-      "ver": "P1.2.36",
-      "type": "html",
-      "tag": "HTML",
-      "path": "C:/Users/Administrator/Desktop/WWT凭证工具_P1.2.36.html",
-      "src": {
-        "type": "gitee",
-        "repo": "wwtmrhu/certificate-generation",
-        "verFile": "dist/version.json",
-        "appFile": "",
-        "pat": "ver",
-        "appUrl": true
-      }
-    }
-  ]
-}
+{
+  "schema": 1,
+  "platform": "1.1.8",
+  "updatedAt": "2026-09-10",
+  "note": "WWT 工作平台工具清单。新增/修改工具只需改这个文件并发布新版本，用户端自动同步，无需重新分发平台。",
+  "tools": [
+    {
+      "key": "ledger-clear",
+      "name": "往来款项两清工具",
+      "module": "fin",
+      "desc": "自动对账核销，支持 Excel 导入",
+      "ver": "1.0.0",
+      "type": "html",
+      "tag": "HTML",
+      "path": "C:/Users/Administrator/Desktop/往来款项两清工具.html",
+      "src": null
+    },
+    {
+      "key": "erp-recon",
+      "name": "ERP对账工具",
+      "module": "fin",
+      "desc": "ERP 系统多模块对账比对",
+      "ver": "1.1.10",
+      "type": "html",
+      "tag": "HTML",
+      "path": "C:/Users/Administrator/Desktop/ERP对账工具更新版.html",
+      "src": {
+        "type": "gitee",
+        "repo": "wwtmrhu/erp-recon",
+        "verFile": "version.js",
+        "appFile": "app.js",
+        "pat": "__ERP_LATEST_VER"
+      }
+    },
+    {
+      "key": "erp-tool",
+      "name": "ERP对账单生成匹配",
+      "module": "fin",
+      "desc": "对账单自动生成与匹配",
+      "ver": "2.0.45",
+      "type": "html",
+      "tag": "HTML",
+      "path": "C:/Users/Administrator/Desktop/ERP对账单生成匹配工具更新版.html",
+      "src": {
+        "type": "gitee",
+        "repo": "wwtmrhu/erp-tool",
+        "verFile": "version.js",
+        "appFile": "app.js",
+        "pat": "__ERP_LATEST_VER"
+      }
+    },
+    {
+      "key": "kkd",
+      "name": "WWT快快对",
+      "module": "fin",
+      "desc": "往来账双向自动对账",
+      "ver": "1.0.0",
+      "type": "html",
+      "tag": "HTML",
+      "path": "C:/Users/Administrator/WorkBuddy/2026-08-12-10-53-10/WWT快快对.html",
+      "src": null
+    },
+    {
+      "key": "voucher",
+      "name": "WWT凭证工具",
+      "module": "fin",
+      "desc": "自动生成记账凭证，支持规则配置、凭证审核、导出金蝶",
+      "ver": "P1.2.36",
+      "type": "html",
+      "tag": "HTML",
+      "path": "C:/Users/Administrator/Desktop/WWT凭证工具_P1.2.36.html",
+      "src": {
+        "type": "gitee",
+        "repo": "wwtmrhu/certificate-generation",
+        "verFile": "dist/version.json",
+        "appFile": "",
+        "pat": "ver",
+        "appUrl": true
+      }
+    }
+  ]
+}