dsh-oc-desktop 0.3.8 → 0.3.9

package/launcher/updater.js

@@ -122,6 +122,94 @@ function rangeFloor(range) {
   return best || '0.0.0';
 }
 
+// ---------- 范围交集判定(rangeOverlap) ----------
+// 判断两个 semver 范围是否有公共版本(用于引擎 dep 范围 vs 插件 peer 范围)。
+// 避免 rangeFloor 下界误判:引擎 ^4.0.1 实际会装到 4.2.0+,插件要求 ^4.2.0 仍兼容。
+// 范围 → 区间集合(|| 拆并,空格条件取交),再判任意区间交集非空。
+// 区间 {lo, loIn, hi, hiIn}:lo/hi 为版本字符串或 null(null-lo=-∞,null-hi=+∞),In 标记闭开。
+function cmpV(a, b, nullIs) {
+  if (a === null && b === null) return 0;
+  if (a === null) return nullIs === 1 ? 1 : -1;
+  if (b === null) return nullIs === 1 ? -1 : 1;
+  return semverCompare(a, b);
+}
+function singleToIntervals(cond) {
+  const m = cond.match(/^(>=|<=|>|<|=|~|\^)?(.+)$/);
+  const op = m[1] || '=';
+  const raw = (m[2] || '').trim();
+  if (!op && (raw === '*' || raw === 'x' || raw === 'X')) return [{ lo: null, loIn: true, hi: null, hiIn: false }];
+  if (/[xX*]/.test(raw)) {
+    const parts = raw.replace(/[xX*]/g, '0').split('.');
+    const lo = parts.join('.');
+    const hi = parts.length === 1 ? `${Number(parts[0]) + 1}.0.0` : `${parts[0]}.${Number(parts[1]) + 1}.0`;
+    return [{ lo, loIn: true, hi, hiIn: false }];
+  }
+  const pv = parseVersion(raw);
+  if (!pv) return [];
+  switch (op) {
+    case '=': return [{ lo: raw, loIn: true, hi: raw, hiIn: true }];
+    case '>': return [{ lo: raw, loIn: false, hi: null, hiIn: false }];
+    case '>=': return [{ lo: raw, loIn: true, hi: null, hiIn: false }];
+    case '<': return [{ lo: null, loIn: true, hi: raw, hiIn: false }];
+    case '<=': return [{ lo: null, loIn: true, hi: raw, hiIn: true }];
+    case '~': {
+      const parts = raw.split('.');
+      const hi = parts.length >= 2 ? `${pv.num[0]}.${pv.num[1] + 1}.0` : `${pv.num[0] + 1}.0.0`;
+      return [{ lo: raw, loIn: true, hi, hiIn: false }];
+    }
+    case '^': {
+      let hi;
+      if (pv.num[0] > 0) hi = `${pv.num[0] + 1}.0.0`;
+      else if (pv.num[1] > 0) hi = `0.${pv.num[1] + 1}.0`;
+      else hi = `0.0.${pv.num[2] + 1}`;
+      return [{ lo: raw, loIn: true, hi, hiIn: false }];
+    }
+  }
+  return [];
+}
+function intersectIntervals(a, b) {
+  const lo = cmpV(a.lo, b.lo, -1) > 0 ? { v: a.lo, in: a.loIn } : { v: b.lo, in: b.loIn };
+  const hi = cmpV(a.hi, b.hi, 1) < 0 ? { v: a.hi, in: a.hiIn } : { v: b.hi, in: b.hiIn };
+  const c = cmpV(lo.v, hi.v, 1);
+  if (c < 0) return { lo: lo.v, loIn: lo.in, hi: hi.v, hiIn: hi.in };
+  if (c > 0) return null;
+  return lo.in && hi.in ? { lo: lo.v, loIn: true, hi: hi.v, hiIn: true } : null;
+}
+function altToIntervals(alt) {
+  const conds = alt.split(/\s+/).filter(Boolean);
+  let result = [{ lo: null, loIn: true, hi: null, hiIn: false }];
+  for (const c of conds) {
+    const ivs = singleToIntervals(c);
+    if (ivs.length === 0) return [];
+    const next = [];
+    for (const a of result) for (const b of ivs) {
+      const iv = intersectIntervals(a, b);
+      if (iv) next.push(iv);
+    }
+    result = next;
+    if (result.length === 0) return result;
+  }
+  return result;
+}
+function rangeToIntervals(range) {
+  if (range == null || String(range).trim() === '') return [{ lo: null, loIn: true, hi: null, hiIn: false }];
+  const out = [];
+  for (const alt of String(range).trim().split(/\s*\|\|\s*/)) {
+    const t = alt.trim();
+    if (!t || t === '*' || t === 'x' || t === 'X') { out.push({ lo: null, loIn: true, hi: null, hiIn: false }); continue; }
+    const h = t.match(/^(\S+)\s+-\s+(\S+)$/);
+    if (h) { out.push({ lo: h[1], loIn: true, hi: h[2], hiIn: true }); continue; }
+    for (const iv of altToIntervals(t)) out.push(iv);
+  }
+  return out;
+}
+function rangeOverlap(rangeA, rangeB) {
+  const ia = rangeToIntervals(rangeA);
+  const ib = rangeToIntervals(rangeB);
+  for (const x of ia) for (const y of ib) if (intersectIntervals(x, y)) return true;
+  return false;
+}
+
 // GET 一个 JSON(支持 http/https),带超时与体积上限。
 function fetchJson(url, timeoutMs = REQUEST_TIMEOUT_MS) {
   return new Promise((resolve, reject) => {
@@ -310,7 +398,8 @@ async function npmPackageVersions(pkg, registry = 'https://registry.npmjs.org')
 
 // 判定插件(peerDependencies)是否兼容指定引擎。
 // 对插件 peerDeps 中每个 @deepseek-ai/* 包:
-//   - 引擎 deps 含该包 → 用引擎 dep 范围的下界版本测试插件范围
+//   - 引擎 deps 含该包 → 比较引擎 dep 范围与插件范围是否有交集(rangeOverlap)。
+//     不用 rangeFloor 下界(引擎 ^4.0.1 实际装到 4.2.0+,插件 ^4.2.0 仍兼容)。
 //   - 引擎不含 → 通过 fetchVersions(pkg) 查 npm 该包全量版本,存在满足插件范围的版本即兼容
 //     (这些 dsh-client-* 包用 next tag 发 rc 版,latest tag 常停在早期版,不能用 /latest 判断)
 // 全部满足 → 兼容。fetchVersions: async (pkg) => [版本字符串,...]
@@ -320,7 +409,7 @@ async function checkEngineCompat(pluginPeerDeps, engineDeps, fetchVersions) {
   for (const k of scope) {
     const needRange = pluginPeerDeps[k];
     if (engineDeps && engineDeps[k]) {
-      if (!semverRangeMatch(needRange, rangeFloor(engineDeps[k]))) return false;
+      if (!rangeOverlap(needRange, engineDeps[k])) return false;
       continue;
     }
     if (typeof fetchVersions !== 'function') return false;
@@ -332,7 +421,7 @@ async function checkEngineCompat(pluginPeerDeps, engineDeps, fetchVersions) {
 }
 
 module.exports = {
-  parseVersion, semverCompare, semverRangeMatch, rangeFloor, fetchJson, checkForUpdates,
+  parseVersion, semverCompare, semverRangeMatch, rangeFloor, rangeOverlap, fetchJson, checkForUpdates,
   hashFile, diffLocal, downloadFile, downloadUpdate, npmLatestVersion, npmPackageInfo,
   npmPackageVersions, checkNpmUpdates, checkEngineCompat,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-oc-desktop",
   "productName": "DeepSeek Harness Desktop",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "DeepSeek Harness 桌面端插件(Electron 启动器):自绘标题栏/托盘/通知/快捷键/崩溃自愈",
   "main": "launcher/main.js",
   "bin": {

package/scripts/test-updater.mjs

@@ -3,7 +3,7 @@ import assert from "node:assert";
 import http from "node:http";
 import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
-const { npmLatestVersion, npmPackageVersions, checkNpmUpdates, checkEngineCompat, semverRangeMatch, rangeFloor, semverCompare, parseVersion } = require("../launcher/updater.js");
+const { npmLatestVersion, npmPackageVersions, checkNpmUpdates, checkEngineCompat, semverRangeMatch, rangeFloor, rangeOverlap, semverCompare, parseVersion } = require("../launcher/updater.js");
 
 // 1. pure version compare logic
 assert.strictEqual(parseVersion("0.3.6").num.join("."), "0.3.6");
@@ -89,6 +89,9 @@ const fetchVersions = async (p) => (await npmPackageVersions(p, base));
 const engineDeps = { "@deepseek-ai/cordis": "^4.0.1" };
 assert.strictEqual(await checkEngineCompat({ "@deepseek-ai/cordis": "^4.0.1" }, engineDeps, fetchVersions), true);
 assert.strictEqual(await checkEngineCompat({ "@deepseek-ai/cordis": "^3.0.0" }, engineDeps, fetchVersions), false);
+// engine range ^4.0.1 vs plugin ^4.2.0: overlap in [4.2.0,5.0.0) -> compatible (not rangeFloor false-negative)
+assert.strictEqual(await checkEngineCompat({ "@deepseek-ai/cordis": "^4.2.0" }, engineDeps, fetchVersions), true);
+assert.strictEqual(await checkEngineCompat({ "@deepseek-ai/cordis": "^5.0.0" }, engineDeps, fetchVersions), false);
 // latest tag is 0.0.1-rc.1 but the full version list has 0.1.0-rc.6 (next tag) — compatible
 assert.strictEqual(await checkEngineCompat({ "@deepseek-ai/cordis": "^4.0.1", "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6" }, engineDeps, fetchVersions), true);
 // engine-independent package with no satisfying version -> incompatible
@@ -96,5 +99,16 @@ assert.strictEqual(await checkEngineCompat({ "@deepseek-ai/cordis": "^4.0.1", "@
 // package not in engine deps but its versions satisfy the plugin range
 assert.strictEqual(await checkEngineCompat({ "@deepseek-ai/cordis": "^4.0.1" }, {}, fetchVersions), true);
 
+// 4b. rangeOverlap: semver range intersection (engine dep range vs plugin peer range)
+assert.strictEqual(rangeOverlap("^4.0.1", "^4.2.0"), true);
+assert.strictEqual(rangeOverlap("^3.0.0", "^4.0.1"), false);
+assert.strictEqual(rangeOverlap("^4.2.0", ">=4.0.0 <5.0.0"), true);
+assert.strictEqual(rangeOverlap(">=4.0.0 <4.5.0", ">=4.5.0"), false);
+assert.strictEqual(rangeOverlap("~4.0.1", "^4.0.1"), true);
+assert.strictEqual(rangeOverlap("4.0.1", "^4.0.1"), true);
+assert.strictEqual(rangeOverlap("^0.1.0-rc.6", "^0.1.1-rc.2"), true);
+assert.strictEqual(rangeOverlap("1.2.x", ">=1.2.0 <1.3.0"), true);
+assert.strictEqual(rangeOverlap("^4.0.1", "3.x || 4.x"), true);
+
 registry.close();
 console.log("updater tests passed");