dsh-app-updater 1.0.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -0
- package/CONTRACT.md +19 -6
- package/README.en.md +38 -8
- package/README.md +34 -8
- package/RELEASING.md +63 -0
- package/lib/client.js +67 -9
- package/lib/engine.js +324 -36
- package/lib/index.js +64 -10
- package/lib/platform.js +198 -0
- package/lib/state.js +6 -2
- package/lib/version.js +3 -0
- package/lib/winget.js +65 -20
- package/package.json +4 -3
- package/test/fixture-winget-list-zh.txt +133 -0
- package/test/fixture-winget-upgrade-zh.txt +8 -0
- package/test/render.mjs +1 -1
- package/test/unit.mjs +94 -1
package/lib/engine.js
CHANGED
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
*/
|
|
11
11
|
|
|
12
12
|
import { mkdir, readdir, stat, readFile, rm } from "node:fs/promises";
|
|
13
|
+
import { lstatSync } from "node:fs";
|
|
13
14
|
import { join, basename, isAbsolute } from "node:path";
|
|
14
15
|
import { homedir } from "node:os";
|
|
15
16
|
|
|
@@ -24,8 +25,16 @@ import {
|
|
|
24
25
|
} from "./winget.js";
|
|
25
26
|
import { readRegistryApps, normalizeName } from "./registry.js";
|
|
26
27
|
import { compareVersions, isNewer, looksLikeVersion } from "./version.js";
|
|
28
|
+
import { detectEnvironment, describeEnvironment, engineFor, ENGINE_BREW, ENGINE_WINGET } from "./platform.js";
|
|
27
29
|
|
|
28
|
-
const INSTALLER_EXT = /\.(exe|msi|msix|appx|msixbundle)$/i;
|
|
30
|
+
const INSTALLER_EXT = /\.(exe|msi|msix|appx|msixbundle|pkg|dmg)$/i;
|
|
31
|
+
|
|
32
|
+
/** 当前环境(进程级缓存:同一次运行里平台/架构不会变)。 */
|
|
33
|
+
let cachedEnv = null;
|
|
34
|
+
export function currentEnvironment() {
|
|
35
|
+
if (!cachedEnv) cachedEnv = detectEnvironment();
|
|
36
|
+
return cachedEnv;
|
|
37
|
+
}
|
|
29
38
|
|
|
30
39
|
/* ------------------------------------------------------------------ *
|
|
31
40
|
* 清单解析(只取我们需要的字段,不引第三方 YAML 库)
|
|
@@ -208,6 +217,26 @@ function isStoreId(id) {
|
|
|
208
217
|
export async function scanApps({ settings, log, signal }) {
|
|
209
218
|
const startedAt = Date.now();
|
|
210
219
|
const warnings = [];
|
|
220
|
+
const env = currentEnvironment();
|
|
221
|
+
|
|
222
|
+
log("info", `运行环境:${describeEnvironment(env)}(引擎:${engineFor(env.family)})`);
|
|
223
|
+
|
|
224
|
+
if (env.family === "macos") {
|
|
225
|
+
return scanMacos({ settings, log, signal, env, startedAt, warnings });
|
|
226
|
+
}
|
|
227
|
+
if (env.family !== "windows") {
|
|
228
|
+
log("warn", `当前系统 ${env.platform} 没有可用的更新引擎,本插件支持 Windows 与 macOS`);
|
|
229
|
+
return {
|
|
230
|
+
env,
|
|
231
|
+
engine: { id: engineFor(env.family), available: false, version: "", path: "" },
|
|
232
|
+
scannedAt: Date.now(),
|
|
233
|
+
startedAt,
|
|
234
|
+
stats: { total: 0, upgradable: 0, unsupported: 0 },
|
|
235
|
+
items: [],
|
|
236
|
+
warnings: [`当前系统 ${env.platform} 暂不支持(本插件面向 Windows 与 macOS)`],
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
|
|
211
240
|
const wingetPath = findWinget();
|
|
212
241
|
|
|
213
242
|
/** @type {Map<string, any>} */
|
|
@@ -381,6 +410,13 @@ export async function scanApps({ settings, log, signal }) {
|
|
|
381
410
|
log("success", `扫描完成:${stats.total} 个应用,${stats.upgradable} 个可更新`);
|
|
382
411
|
|
|
383
412
|
return {
|
|
413
|
+
env,
|
|
414
|
+
engine: {
|
|
415
|
+
id: ENGINE_WINGET,
|
|
416
|
+
available: Boolean(wingetInfo.available),
|
|
417
|
+
version: wingetInfo.version || "",
|
|
418
|
+
path: wingetInfo.path || "",
|
|
419
|
+
},
|
|
384
420
|
winget: wingetInfo,
|
|
385
421
|
scannedAt: Date.now(),
|
|
386
422
|
startedAt,
|
|
@@ -423,27 +459,35 @@ async function snapshotDir(dir) {
|
|
|
423
459
|
* 下载官网全量安装包。
|
|
424
460
|
* @returns {Promise<{ok:boolean, installer?:string, manifest?:string, info?:object, error?:string}>}
|
|
425
461
|
*/
|
|
426
|
-
async function downloadInstaller(wingetPath, id, dir, log, signal) {
|
|
462
|
+
async function downloadInstaller(wingetPath, id, dir, log, signal, opts = {}) {
|
|
427
463
|
await mkdir(dir, { recursive: true });
|
|
428
464
|
const before = await snapshotDir(dir);
|
|
465
|
+
const env = opts.env || currentEnvironment();
|
|
466
|
+
const archFlag = opts.matchArch === false ? "" : env.wingetArch || "";
|
|
467
|
+
if (archFlag) log("info", `按本机架构选择安装包:${env.archLabel}(--architecture ${archFlag})`);
|
|
468
|
+
else log("info", `未指定架构,交给 winget 自动匹配(${env.archLabel})`);
|
|
429
469
|
log("info", `下载官网全量安装包:${id}`);
|
|
430
|
-
const
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
{ timeoutMs: 30 * 60 * 1000, signal }
|
|
443
|
-
);
|
|
470
|
+
const args = [
|
|
471
|
+
"download",
|
|
472
|
+
"--id",
|
|
473
|
+
id,
|
|
474
|
+
"--download-directory",
|
|
475
|
+
dir,
|
|
476
|
+
"--accept-package-agreements",
|
|
477
|
+
"--accept-source-agreements",
|
|
478
|
+
"--disable-interactivity",
|
|
479
|
+
];
|
|
480
|
+
if (archFlag) args.push("--architecture", archFlag);
|
|
481
|
+
const res = await runWinget(wingetPath, args, { timeoutMs: 30 * 60 * 1000, signal });
|
|
444
482
|
const text = outputText(res);
|
|
445
483
|
if (!res.ok) {
|
|
446
|
-
|
|
484
|
+
const err = classifyWingetError(text) || `winget download 退出码 ${res.code}`;
|
|
485
|
+
// 指定架构失败(清单里没有这一架构的安装包)时,退回让 winget 自己挑,并如实记录
|
|
486
|
+
if (archFlag && /architecture|no applicable installer|not applicable|没有适用/i.test(text)) {
|
|
487
|
+
log("warn", `${id}:清单里没有 ${archFlag} 架构的安装包,改为自动匹配`);
|
|
488
|
+
return downloadInstaller(wingetPath, id, dir, log, signal, { ...opts, matchArch: false });
|
|
489
|
+
}
|
|
490
|
+
return { ok: false, error: err };
|
|
447
491
|
}
|
|
448
492
|
|
|
449
493
|
// 从输出里取落盘路径;取不到就按目录差异找
|
|
@@ -507,22 +551,22 @@ async function runInstaller(installer, info, log, signal) {
|
|
|
507
551
|
}
|
|
508
552
|
|
|
509
553
|
/** 用 winget upgrade 兜底(同样是官网全量包,安装由 winget 执行)。 */
|
|
510
|
-
async function wingetUpgradeFallback(wingetPath, id, log, signal) {
|
|
511
|
-
|
|
512
|
-
const
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
);
|
|
554
|
+
async function wingetUpgradeFallback(wingetPath, id, log, signal, opts = {}) {
|
|
555
|
+
const env = opts.env || currentEnvironment();
|
|
556
|
+
const archFlag = opts.matchArch === false ? "" : env.wingetArch || "";
|
|
557
|
+
log("warn", `改用 winget upgrade 兜底:${id}${archFlag ? "(--architecture " + archFlag + ")" : ""}`);
|
|
558
|
+
const args = [
|
|
559
|
+
"upgrade",
|
|
560
|
+
"--id",
|
|
561
|
+
id,
|
|
562
|
+
"--exact",
|
|
563
|
+
"--silent",
|
|
564
|
+
"--accept-package-agreements",
|
|
565
|
+
"--accept-source-agreements",
|
|
566
|
+
"--disable-interactivity",
|
|
567
|
+
];
|
|
568
|
+
if (archFlag) args.push("--architecture", archFlag);
|
|
569
|
+
const res = await runWinget(wingetPath, args, { timeoutMs: 60 * 60 * 1000, signal });
|
|
526
570
|
const text = outputText(res);
|
|
527
571
|
if (res.ok) return { ok: true };
|
|
528
572
|
const code = res.code;
|
|
@@ -570,13 +614,20 @@ function classifyWingetError(text) {
|
|
|
570
614
|
* @param {AbortSignal} p.signal
|
|
571
615
|
*/
|
|
572
616
|
export async function runUpdates({ ids, settings, log, onProgress, signal }) {
|
|
617
|
+
const env = currentEnvironment();
|
|
618
|
+
const matchArch = settings.matchSystemArch !== false;
|
|
619
|
+
|
|
620
|
+
if (env.family === "macos") {
|
|
621
|
+
return runMacosUpdates({ ids, settings, log, onProgress, signal, env });
|
|
622
|
+
}
|
|
623
|
+
|
|
573
624
|
const wingetPath = findWinget();
|
|
574
625
|
const dir = resolveDownloadDir(settings);
|
|
575
626
|
const results = [];
|
|
576
627
|
const queue = [...new Set(ids.filter(Boolean))];
|
|
577
628
|
|
|
578
629
|
onProgress({ running: true, total: queue.length, done: 0, current: null, results: [], error: null, startedAt: Date.now() });
|
|
579
|
-
log("info", `开始更新 ${queue.length}
|
|
630
|
+
log("info", `开始更新 ${queue.length} 个应用(${describeEnvironment(env)},按架构匹配:${matchArch ? "是" : "否"})`);
|
|
580
631
|
|
|
581
632
|
let index = 0;
|
|
582
633
|
for (const id of queue) {
|
|
@@ -596,7 +647,7 @@ export async function runUpdates({ ids, settings, log, onProgress, signal }) {
|
|
|
596
647
|
if (!wingetPath) {
|
|
597
648
|
entry.error = "未找到 winget,无法下载官网安装包";
|
|
598
649
|
} else {
|
|
599
|
-
const dl = await downloadInstaller(wingetPath, id, dir, log, signal);
|
|
650
|
+
const dl = await downloadInstaller(wingetPath, id, dir, log, signal, { env, matchArch });
|
|
600
651
|
if (!dl.ok) {
|
|
601
652
|
entry.error = dl.error;
|
|
602
653
|
} else if (settings.dryRun) {
|
|
@@ -620,7 +671,7 @@ export async function runUpdates({ ids, settings, log, onProgress, signal }) {
|
|
|
620
671
|
// 下载失败或安装失败 → winget upgrade 兜底(同样是官网全量包)
|
|
621
672
|
if (!entry.ok && !entry.dryRun && settings.hashFallbackUpgrade !== false && !signal.aborted) {
|
|
622
673
|
log("warn", `${id}:${entry.error},尝试 winget upgrade 兜底`);
|
|
623
|
-
const fb = await wingetUpgradeFallback(wingetPath, id, log, signal);
|
|
674
|
+
const fb = await wingetUpgradeFallback(wingetPath, id, log, signal, { env, matchArch });
|
|
624
675
|
if (fb.ok) {
|
|
625
676
|
entry.ok = true;
|
|
626
677
|
entry.error = null;
|
|
@@ -661,3 +712,240 @@ export async function runUpdates({ ids, settings, log, onProgress, signal }) {
|
|
|
661
712
|
log(okCount === results.length ? "success" : "warn", `更新结束:成功 ${okCount} / ${results.length}`);
|
|
662
713
|
return results;
|
|
663
714
|
}
|
|
715
|
+
|
|
716
|
+
/* ------------------------------------------------------------------ *
|
|
717
|
+
* macOS:Homebrew cask 引擎
|
|
718
|
+
*
|
|
719
|
+
* Homebrew 自己会按当前 Mac 的架构取对应的 cask(Apple Silicon 走 arm64,
|
|
720
|
+
* Intel 走 x86_64),所以这里不需要再拼下载地址;我们只负责把「已装版本 →
|
|
721
|
+
* 可升级版本」读出来,并在用户确认后执行 upgrade / fetch。
|
|
722
|
+
* ------------------------------------------------------------------ */
|
|
723
|
+
|
|
724
|
+
export function findBrew(env = process.env) {
|
|
725
|
+
const candidates = [];
|
|
726
|
+
if (env.HOMEBREW_PREFIX) candidates.push(join(env.HOMEBREW_PREFIX, "bin", "brew"));
|
|
727
|
+
candidates.push("/opt/homebrew/bin/brew", "/usr/local/bin/brew", "/home/linuxbrew/.linuxbrew/bin/brew");
|
|
728
|
+
const pathValue = env.PATH || env.Path || "";
|
|
729
|
+
for (const entry of String(pathValue).split(":")) {
|
|
730
|
+
const dir = entry.trim();
|
|
731
|
+
if (dir.startsWith("/")) candidates.push(join(dir, "brew"));
|
|
732
|
+
}
|
|
733
|
+
for (const file of candidates) {
|
|
734
|
+
try {
|
|
735
|
+
if (lstatSync(file).isFile()) return file;
|
|
736
|
+
} catch {
|
|
737
|
+
/* 不可访问的候选路径 */
|
|
738
|
+
}
|
|
739
|
+
}
|
|
740
|
+
return null;
|
|
741
|
+
}
|
|
742
|
+
|
|
743
|
+
async function runBrew(brewPath, args, opts = {}) {
|
|
744
|
+
return runProcess(brewPath, args, {
|
|
745
|
+
timeoutMs: opts.timeoutMs || 20 * 60 * 1000,
|
|
746
|
+
signal: opts.signal,
|
|
747
|
+
});
|
|
748
|
+
}
|
|
749
|
+
|
|
750
|
+
/** `brew list --cask --versions` → Map(token → version)。 */
|
|
751
|
+
export function parseBrewCaskVersions(text) {
|
|
752
|
+
const out = new Map();
|
|
753
|
+
for (const line of String(text || "").split("\n")) {
|
|
754
|
+
const parts = line.trim().split(/\s+/);
|
|
755
|
+
if (parts.length < 2) continue;
|
|
756
|
+
out.set(parts[0], parts.slice(1).join(" "));
|
|
757
|
+
}
|
|
758
|
+
return out;
|
|
759
|
+
}
|
|
760
|
+
|
|
761
|
+
/** `brew outdated --json=v2 --cask --greedy` → Map(token → 可用版本)。 */
|
|
762
|
+
export function parseBrewOutdated(text) {
|
|
763
|
+
const out = new Map();
|
|
764
|
+
let json = null;
|
|
765
|
+
try {
|
|
766
|
+
json = JSON.parse(String(text || "").trim() || "{}");
|
|
767
|
+
} catch {
|
|
768
|
+
return out;
|
|
769
|
+
}
|
|
770
|
+
const casks = Array.isArray(json && json.casks) ? json.casks : [];
|
|
771
|
+
for (const c of casks) {
|
|
772
|
+
if (!c || !c.name) continue;
|
|
773
|
+
const current = c.current_version || (Array.isArray(c.current_versions) ? c.current_versions[0] : "") || "";
|
|
774
|
+
out.set(String(c.name), String(current));
|
|
775
|
+
}
|
|
776
|
+
return out;
|
|
777
|
+
}
|
|
778
|
+
|
|
779
|
+
async function scanMacos({ settings, log, signal, env, startedAt, warnings }) {
|
|
780
|
+
const brewPath = findBrew();
|
|
781
|
+
const items = [];
|
|
782
|
+
|
|
783
|
+
if (!brewPath) {
|
|
784
|
+
warnings.push("未找到 Homebrew,macOS 上无法检测/更新应用(安装 Homebrew 后重新检测即可)");
|
|
785
|
+
log("warn", warnings[warnings.length - 1]);
|
|
786
|
+
return {
|
|
787
|
+
env,
|
|
788
|
+
engine: { id: ENGINE_BREW, available: false, version: "", path: "" },
|
|
789
|
+
scannedAt: Date.now(),
|
|
790
|
+
startedAt,
|
|
791
|
+
stats: { total: 0, upgradable: 0, unsupported: 0 },
|
|
792
|
+
items,
|
|
793
|
+
warnings,
|
|
794
|
+
};
|
|
795
|
+
}
|
|
796
|
+
|
|
797
|
+
const verRes = await runBrew(brewPath, ["--version"], { timeoutMs: 30000 });
|
|
798
|
+
const brewVersion = firstLine(outputText(verRes)).replace(/^Homebrew\s+/i, "");
|
|
799
|
+
log("info", `Homebrew ${brewVersion}(${brewPath})· ${env.archLabel}`);
|
|
800
|
+
|
|
801
|
+
const listRes = await runBrew(brewPath, ["list", "--cask", "--versions"], { signal });
|
|
802
|
+
const installed = parseBrewCaskVersions(listRes.stdout);
|
|
803
|
+
log("info", `Homebrew 报告 ${installed.size} 个已安装 cask 应用`);
|
|
804
|
+
|
|
805
|
+
const outRes = await runBrew(brewPath, ["outdated", "--json=v2", "--cask", "--greedy"], { signal });
|
|
806
|
+
const outdated = parseBrewOutdated(outRes.stdout);
|
|
807
|
+
log("info", `其中 ${outdated.size} 个有新版本`);
|
|
808
|
+
|
|
809
|
+
for (const [token, version] of installed) {
|
|
810
|
+
const available = outdated.get(token) || "";
|
|
811
|
+
const hasUpdate = Boolean(available) && (!version || isNewer(available, version));
|
|
812
|
+
items.push({
|
|
813
|
+
id: `brew:${token}`,
|
|
814
|
+
name: token,
|
|
815
|
+
version: version || "",
|
|
816
|
+
available: hasUpdate ? available : "",
|
|
817
|
+
publisher: "Homebrew cask",
|
|
818
|
+
source: "homebrew",
|
|
819
|
+
installLocation: "",
|
|
820
|
+
hasUpdate,
|
|
821
|
+
updateSupported: hasUpdate,
|
|
822
|
+
reason: hasUpdate ? null : null,
|
|
823
|
+
kind: "cask",
|
|
824
|
+
});
|
|
825
|
+
}
|
|
826
|
+
|
|
827
|
+
// 有更新但没在「已安装」列表里露出的(例如 --greedy 强制升级项)也补进来
|
|
828
|
+
for (const [token, available] of outdated) {
|
|
829
|
+
if (installed.has(token)) continue;
|
|
830
|
+
items.push({
|
|
831
|
+
id: `brew:${token}`,
|
|
832
|
+
name: token,
|
|
833
|
+
version: "",
|
|
834
|
+
available,
|
|
835
|
+
publisher: "Homebrew cask",
|
|
836
|
+
source: "homebrew",
|
|
837
|
+
installLocation: "",
|
|
838
|
+
hasUpdate: true,
|
|
839
|
+
updateSupported: true,
|
|
840
|
+
reason: null,
|
|
841
|
+
kind: "cask",
|
|
842
|
+
});
|
|
843
|
+
}
|
|
844
|
+
|
|
845
|
+
items.sort((a, b) => {
|
|
846
|
+
if (a.hasUpdate !== b.hasUpdate) return a.hasUpdate ? -1 : 1;
|
|
847
|
+
return String(a.name).localeCompare(String(b.name));
|
|
848
|
+
});
|
|
849
|
+
|
|
850
|
+
const stats = {
|
|
851
|
+
total: items.length,
|
|
852
|
+
upgradable: items.filter((i) => i.hasUpdate).length,
|
|
853
|
+
unsupported: 0,
|
|
854
|
+
};
|
|
855
|
+
log("success", `扫描完成:${stats.total} 个应用,${stats.upgradable} 个可更新`);
|
|
856
|
+
if (settings.includeStoreApps) {
|
|
857
|
+
warnings.push("macOS 的应用商店(App Store)应用不在 Homebrew 覆盖范围内,本插件不会更新它们");
|
|
858
|
+
}
|
|
859
|
+
|
|
860
|
+
return {
|
|
861
|
+
env,
|
|
862
|
+
engine: { id: ENGINE_BREW, available: true, version: brewVersion, path: brewPath },
|
|
863
|
+
scannedAt: Date.now(),
|
|
864
|
+
startedAt,
|
|
865
|
+
stats,
|
|
866
|
+
items,
|
|
867
|
+
warnings,
|
|
868
|
+
};
|
|
869
|
+
}
|
|
870
|
+
|
|
871
|
+
async function runMacosUpdates({ ids, settings, log, onProgress, signal, env }) {
|
|
872
|
+
const brewPath = findBrew();
|
|
873
|
+
const results = [];
|
|
874
|
+
const queue = [...new Set((ids || []).filter(Boolean))];
|
|
875
|
+
|
|
876
|
+
onProgress({ running: true, total: queue.length, done: 0, current: null, results: [], error: null, startedAt: Date.now() });
|
|
877
|
+
log("info", `开始更新 ${queue.length} 个应用(${describeEnvironment(env)},引擎:Homebrew)`);
|
|
878
|
+
|
|
879
|
+
if (!brewPath) {
|
|
880
|
+
for (const id of queue) {
|
|
881
|
+
results.push({ id, ok: false, error: "未找到 Homebrew,无法更新;请先安装 Homebrew" });
|
|
882
|
+
log("error", `${id} 更新失败:未找到 Homebrew`);
|
|
883
|
+
}
|
|
884
|
+
onProgress({ running: false, total: queue.length, done: results.length, current: null, results, finishedAt: Date.now(), error: null });
|
|
885
|
+
return results;
|
|
886
|
+
}
|
|
887
|
+
|
|
888
|
+
let index = 0;
|
|
889
|
+
for (const rawId of queue) {
|
|
890
|
+
if (signal.aborted) {
|
|
891
|
+
results.push({ id: rawId, ok: false, error: "已取消" });
|
|
892
|
+
log("warn", `已取消:${rawId}`);
|
|
893
|
+
break;
|
|
894
|
+
}
|
|
895
|
+
index += 1;
|
|
896
|
+
const token = String(rawId).replace(/^brew:/, "");
|
|
897
|
+
onProgress({ running: true, total: queue.length, done: index - 1, current: token });
|
|
898
|
+
log("info", `(${index}/${queue.length})开始处理 ${token}`);
|
|
899
|
+
|
|
900
|
+
const startedAt = Date.now();
|
|
901
|
+
const entry = { id: rawId, ok: false, error: null, installer: null, note: null, verified: null, durationMs: 0 };
|
|
902
|
+
try {
|
|
903
|
+
if (settings.dryRun) {
|
|
904
|
+
// 演练模式:只下载该 cask 对应的安装包(Homebrew 按本机架构取),不安装
|
|
905
|
+
log("warn", `${token}:演练模式,只下载安装包不安装`);
|
|
906
|
+
const fetchRes = await runBrew(brewPath, ["fetch", "--cask", token], { signal, timeoutMs: 60 * 60 * 1000 });
|
|
907
|
+
if (fetchRes.ok) {
|
|
908
|
+
entry.ok = true;
|
|
909
|
+
entry.dryRun = true;
|
|
910
|
+
entry.note = "演练模式:已下载该应用对应的安装包,未安装";
|
|
911
|
+
} else {
|
|
912
|
+
entry.error = firstLine(outputText(fetchRes)) || `brew fetch 退出码 ${fetchRes.code}`;
|
|
913
|
+
}
|
|
914
|
+
} else {
|
|
915
|
+
log("info", `brew upgrade --cask ${token}`);
|
|
916
|
+
const upRes = await runBrew(brewPath, ["upgrade", "--cask", token], { signal, timeoutMs: 2 * 60 * 60 * 1000 });
|
|
917
|
+
if (upRes.ok) {
|
|
918
|
+
entry.ok = true;
|
|
919
|
+
} else {
|
|
920
|
+
entry.error = firstLine(outputText(upRes)) || `brew upgrade 退出码 ${upRes.code}`;
|
|
921
|
+
}
|
|
922
|
+
}
|
|
923
|
+
|
|
924
|
+
if (entry.ok) {
|
|
925
|
+
const listRes = await runBrew(brewPath, ["list", "--cask", "--versions", token], { signal, timeoutMs: 60000 });
|
|
926
|
+
const now = parseBrewCaskVersions(listRes.stdout).get(token) || "";
|
|
927
|
+
if (now) {
|
|
928
|
+
entry.verified = now;
|
|
929
|
+
log("success", `${token} 更新完成,当前版本 ${now}`);
|
|
930
|
+
} else {
|
|
931
|
+
log("success", `${token} 更新完成`);
|
|
932
|
+
}
|
|
933
|
+
} else {
|
|
934
|
+
log("error", `${token} 更新失败:${entry.error}`);
|
|
935
|
+
}
|
|
936
|
+
} catch (err) {
|
|
937
|
+
entry.ok = false;
|
|
938
|
+
entry.error = String((err && err.message) || err);
|
|
939
|
+
log("error", `${token} 更新异常:${entry.error}`);
|
|
940
|
+
}
|
|
941
|
+
|
|
942
|
+
entry.durationMs = Date.now() - startedAt;
|
|
943
|
+
results.push(entry);
|
|
944
|
+
onProgress({ running: true, total: queue.length, done: index, current: null, results });
|
|
945
|
+
}
|
|
946
|
+
|
|
947
|
+
const okCount = results.filter((r) => r.ok).length;
|
|
948
|
+
onProgress({ running: false, total: queue.length, done: results.length, current: null, results, finishedAt: Date.now(), error: null });
|
|
949
|
+
log(okCount === results.length ? "success" : "warn", `更新结束:成功 ${okCount} / ${results.length}`);
|
|
950
|
+
return results;
|
|
951
|
+
}
|
package/lib/index.js
CHANGED
|
@@ -12,14 +12,25 @@ import { homedir } from "node:os";
|
|
|
12
12
|
import { join } from "node:path";
|
|
13
13
|
import { existsSync } from "node:fs";
|
|
14
14
|
import { spawn } from "node:child_process";
|
|
15
|
+
import { createRequire } from "node:module";
|
|
15
16
|
|
|
16
17
|
import { Store } from "./state.js";
|
|
17
|
-
import { scanApps, runUpdates, resolveDownloadDir } from "./engine.js";
|
|
18
|
+
import { scanApps, runUpdates, resolveDownloadDir, findBrew, currentEnvironment } from "./engine.js";
|
|
18
19
|
import { findWinget } from "./winget.js";
|
|
20
|
+
import { describeEnvironment, engineFor, capabilitiesFor, ENGINE_WINGET, ENGINE_BREW } from "./platform.js";
|
|
19
21
|
|
|
20
22
|
const PREFIX = "/dsh-app-updater";
|
|
21
23
|
const MAX_BODY_BYTES = 256 * 1024;
|
|
22
24
|
|
|
25
|
+
/** 版本号只有 package.json 一个来源,避免两处写死对不上。 */
|
|
26
|
+
const PLUGIN_VERSION = (() => {
|
|
27
|
+
try {
|
|
28
|
+
return createRequire(import.meta.url)("../package.json").version || "";
|
|
29
|
+
} catch {
|
|
30
|
+
return "";
|
|
31
|
+
}
|
|
32
|
+
})();
|
|
33
|
+
|
|
23
34
|
const store = new Store();
|
|
24
35
|
|
|
25
36
|
/** 当前任务的控制面。同一时刻只允许一个扫描 + 一个更新。 */
|
|
@@ -96,11 +107,31 @@ function phaseOf(state) {
|
|
|
96
107
|
return "idle";
|
|
97
108
|
}
|
|
98
109
|
|
|
110
|
+
/**
|
|
111
|
+
* 平台闸门:Windows 与 macOS 通过;其它系统明确拒绝,而不是让引擎跑到一半才报错。
|
|
112
|
+
* @returns {object|null} 通过时返回环境对象,否则已写出 400 响应并返回 null
|
|
113
|
+
*/
|
|
114
|
+
function platformGuard(res) {
|
|
115
|
+
const env = currentEnvironment();
|
|
116
|
+
if (env.family === "windows" || env.family === "macos") return env;
|
|
117
|
+
json(res, 400, {
|
|
118
|
+
ok: false,
|
|
119
|
+
error: `当前系统 ${env.platform} 暂不支持(本插件面向 Windows 与 macOS)`,
|
|
120
|
+
});
|
|
121
|
+
return null;
|
|
122
|
+
}
|
|
123
|
+
|
|
99
124
|
function buildStatePayload() {
|
|
100
125
|
const s = store.state;
|
|
126
|
+
const env = s.env || currentEnvironment();
|
|
127
|
+
const engine = s.engine && s.engine.id ? s.engine : defaultEngine(env);
|
|
101
128
|
return {
|
|
102
129
|
ok: true,
|
|
103
|
-
platform:
|
|
130
|
+
platform: env.platform,
|
|
131
|
+
env,
|
|
132
|
+
envSummary: describeEnvironment(env),
|
|
133
|
+
engine,
|
|
134
|
+
capabilities: capabilitiesFor(env, Boolean(engine.available)),
|
|
104
135
|
winget: s.winget || detectWingetSync(),
|
|
105
136
|
phase: phaseOf(s),
|
|
106
137
|
scan: s.scan,
|
|
@@ -112,6 +143,23 @@ function buildStatePayload() {
|
|
|
112
143
|
};
|
|
113
144
|
}
|
|
114
145
|
|
|
146
|
+
/** 还没扫描过时,也把引擎探测出来,界面不必等到扫描完才显示环境。 */
|
|
147
|
+
let cachedDefaultEngine = null;
|
|
148
|
+
function defaultEngine(env) {
|
|
149
|
+
const id = engineFor(env.family);
|
|
150
|
+
if (cachedDefaultEngine && cachedDefaultEngine.id === id) return cachedDefaultEngine;
|
|
151
|
+
if (id === ENGINE_WINGET) {
|
|
152
|
+
const file = findWinget();
|
|
153
|
+
cachedDefaultEngine = { id, available: Boolean(file), version: "", path: file || "" };
|
|
154
|
+
} else if (id === ENGINE_BREW) {
|
|
155
|
+
const file = findBrew();
|
|
156
|
+
cachedDefaultEngine = { id, available: Boolean(file), version: "", path: file || "" };
|
|
157
|
+
} else {
|
|
158
|
+
cachedDefaultEngine = { id, available: false, version: "", path: "" };
|
|
159
|
+
}
|
|
160
|
+
return cachedDefaultEngine;
|
|
161
|
+
}
|
|
162
|
+
|
|
115
163
|
let cachedWinget = null;
|
|
116
164
|
function detectWingetSync() {
|
|
117
165
|
if (cachedWinget) return cachedWinget;
|
|
@@ -144,11 +192,14 @@ async function startScan(force) {
|
|
|
144
192
|
log: (level, text) => store.log(level, text),
|
|
145
193
|
signal: abort.signal,
|
|
146
194
|
});
|
|
147
|
-
store.state.
|
|
195
|
+
store.state.env = result.env || store.state.env;
|
|
196
|
+
store.state.engine = result.engine || store.state.engine;
|
|
197
|
+
if (result.winget) store.state.winget = result.winget;
|
|
148
198
|
store.state.apps = {
|
|
149
199
|
scannedAt: result.scannedAt,
|
|
150
200
|
stats: result.stats,
|
|
151
201
|
items: result.items,
|
|
202
|
+
engine: result.engine ? result.engine.id : "",
|
|
152
203
|
};
|
|
153
204
|
store.state.scan = {
|
|
154
205
|
running: false,
|
|
@@ -276,9 +327,7 @@ export default {
|
|
|
276
327
|
const body = await writeGate(req, res);
|
|
277
328
|
if (!body) return;
|
|
278
329
|
await store.load();
|
|
279
|
-
if (
|
|
280
|
-
return json(res, 400, { ok: false, error: "只支持 Windows" });
|
|
281
|
-
}
|
|
330
|
+
if (!platformGuard(res)) return;
|
|
282
331
|
const r = await startScan(body.force !== false);
|
|
283
332
|
json(res, 200, { ok: true, ...r });
|
|
284
333
|
});
|
|
@@ -287,9 +336,7 @@ export default {
|
|
|
287
336
|
const body = await writeGate(req, res);
|
|
288
337
|
if (!body) return;
|
|
289
338
|
await store.load();
|
|
290
|
-
if (
|
|
291
|
-
return json(res, 400, { ok: false, error: "只支持 Windows" });
|
|
292
|
-
}
|
|
339
|
+
if (!platformGuard(res)) return;
|
|
293
340
|
const r = await startUpdate(body.ids);
|
|
294
341
|
if (r.error) return json(res, 400, { ok: false, ...r });
|
|
295
342
|
json(res, 200, { ok: true, ...r });
|
|
@@ -345,10 +392,17 @@ export default {
|
|
|
345
392
|
|
|
346
393
|
register("/health.json", async (req, res) => {
|
|
347
394
|
await store.load();
|
|
395
|
+
const env = store.state.env || currentEnvironment();
|
|
396
|
+
const engine = store.state.engine && store.state.engine.id ? store.state.engine : defaultEngine(env);
|
|
348
397
|
json(res, 200, {
|
|
349
398
|
ok: true,
|
|
350
399
|
plugin: "dsh-app-updater",
|
|
351
|
-
|
|
400
|
+
version: PLUGIN_VERSION,
|
|
401
|
+
platform: env.platform,
|
|
402
|
+
env,
|
|
403
|
+
envSummary: describeEnvironment(env),
|
|
404
|
+
engine,
|
|
405
|
+
capabilities: capabilitiesFor(env, Boolean(engine.available)),
|
|
352
406
|
routes: routes.length,
|
|
353
407
|
dataDir: join(process.env.DSH_HOME || join(homedir(), ".dsh"), "dsh-app-updater"),
|
|
354
408
|
});
|