dsh-life-pack 0.3.0 → 0.3.2
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/dist/client.js +199 -63
- package/dist/client.js.map +1 -1
- package/dist/health-fetch.d.ts +9 -2
- package/dist/health-fetch.d.ts.map +1 -1
- package/dist/health-fetch.js +9 -2
- package/dist/health-fetch.js.map +1 -1
- package/dist/update-client.d.ts +7 -1
- package/dist/update-client.d.ts.map +1 -1
- package/dist/update-client.js +7 -1
- package/dist/update-client.js.map +1 -1
- package/dist/update-contract.d.ts.map +1 -1
- package/dist/update-contract.js +29 -18
- package/dist/update-contract.js.map +1 -1
- package/dist/update-env.d.ts.map +1 -1
- package/dist/update-env.js +7 -11
- package/dist/update-env.js.map +1 -1
- package/dist/update-view.d.ts +41 -6
- package/dist/update-view.d.ts.map +1 -1
- package/dist/update-view.js +88 -21
- package/dist/update-view.js.map +1 -1
- package/package.json +1 -1
package/dist/health-fetch.d.ts
CHANGED
|
@@ -4,8 +4,15 @@ import type { CallFace } from './update-client.js';
|
|
|
4
4
|
export type HealthCallFace = CallFace;
|
|
5
5
|
/** 一家的电话名：通道名去掉前导斜杠那一段（各家宿主半注册在 `/api` ＋ 通道名，信封 `method` 就是它）。 */
|
|
6
6
|
export declare function phoneOf(channel: string): string;
|
|
7
|
-
/**
|
|
8
|
-
|
|
7
|
+
/** 整批取数的时限（毫秒），**不是**一家一份：六家的活是在**同一个宿主线程**上排队干的。
|
|
8
|
+
*
|
|
9
|
+
* 为什么不是「技能侧 spawn 上限 20 s ＋ 一点余量」（票 #740 对抗式审查第二轮逮到）：
|
|
10
|
+
* 各家的宿主半用的是 `spawnSync`（各单品的 `src/bridge.ts` 里 `SPAWN_TIMEOUT_MS = 20_000`），
|
|
11
|
+
* 它**阻塞**宿主的事件循环——六通电话同时打进来，真正干活的是一个接一个串起来的。
|
|
12
|
+
* 于是「六家之和」才是这一批的真实上界：按一家 20 s 算最坏 120 s，常见情形（一家 1～3 s）约 10 s。
|
|
13
|
+
* 60 s 取两者之间：给常见情形留足余量，又不至于让一次卡死把按钮按成两分钟不动。
|
|
14
|
+
* 单家的错照样逐家报（那家页签里的体检表会写「体检超时（60s）…」）。 */
|
|
15
|
+
export declare const HEALTH_TIMEOUT_MS: 60000;
|
|
9
16
|
/** 一家的一行：报告取到了就是 `report`，取不到就是 `error`（缺席的包不进这张表）。 */
|
|
10
17
|
export interface HealthFetchRow {
|
|
11
18
|
/** 该家插件包名（＝爱生活页签槽 id，也是缺席判定的那个 join 键）。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-fetch.d.ts","sourceRoot":"","sources":["../src/health-fetch.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,0EAA0E;AAC1E,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;AAEtC,kEAAkE;AAClE,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED
|
|
1
|
+
{"version":3,"file":"health-fetch.d.ts","sourceRoot":"","sources":["../src/health-fetch.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,0EAA0E;AAC1E,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;AAEtC,kEAAkE;AAClE,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED;;;;;;;yCAOyC;AACzC,eAAO,MAAM,iBAAiB,EAAG,KAAe,CAAC;AAEjD,uDAAuD;AACvD,MAAM,WAAW,cAAc;IAC7B,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,6BAA6B;AAC7B,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,SAAS,cAAc,EAAE,CAAC;IACzC,iCAAiC;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,uCAAuC;AACvC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAiCD,oCAAoC;AACpC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,EAAE,IAAI,EAAE,SAAS,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAO9H"}
|
package/dist/health-fetch.js
CHANGED
|
@@ -17,8 +17,15 @@ import { CARRIER_BASE } from './update-contract.js';
|
|
|
17
17
|
export function phoneOf(channel) {
|
|
18
18
|
return channel.startsWith('/') ? channel.slice(1) : channel;
|
|
19
19
|
}
|
|
20
|
-
/**
|
|
21
|
-
|
|
20
|
+
/** 整批取数的时限（毫秒），**不是**一家一份：六家的活是在**同一个宿主线程**上排队干的。
|
|
21
|
+
*
|
|
22
|
+
* 为什么不是「技能侧 spawn 上限 20 s ＋ 一点余量」（票 #740 对抗式审查第二轮逮到）：
|
|
23
|
+
* 各家的宿主半用的是 `spawnSync`（各单品的 `src/bridge.ts` 里 `SPAWN_TIMEOUT_MS = 20_000`），
|
|
24
|
+
* 它**阻塞**宿主的事件循环——六通电话同时打进来，真正干活的是一个接一个串起来的。
|
|
25
|
+
* 于是「六家之和」才是这一批的真实上界：按一家 20 s 算最坏 120 s，常见情形（一家 1～3 s）约 10 s。
|
|
26
|
+
* 60 s 取两者之间：给常见情形留足余量，又不至于让一次卡死把按钮按成两分钟不动。
|
|
27
|
+
* 单家的错照样逐家报（那家页签里的体检表会写「体检超时（60s）…」）。 */
|
|
28
|
+
export const HEALTH_TIMEOUT_MS = 60_000;
|
|
22
29
|
function timeoutText() {
|
|
23
30
|
return '体检超时（' + String(Math.round(HEALTH_TIMEOUT_MS / 1000)) + 's）：技能没在时限内回话。';
|
|
24
31
|
}
|
package/dist/health-fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-fetch.js","sourceRoot":"","sources":["../src/health-fetch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAMpD,kEAAkE;AAClE,MAAM,UAAU,OAAO,CAAC,OAAe;IACrC,OAAO,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AAC9D,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"health-fetch.js","sourceRoot":"","sources":["../src/health-fetch.ts"],"names":[],"mappings":"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"}
|
package/dist/update-client.d.ts
CHANGED
|
@@ -40,6 +40,12 @@ export declare function installAbsent(call: CallFace | null, target: TargetInfo,
|
|
|
40
40
|
packageName: string;
|
|
41
41
|
version: string;
|
|
42
42
|
}>>;
|
|
43
|
-
/** 装上更新：查新版 → 提交安装 → 有界轮询查状态到任务收尾；凭证过期重查一次再提交。
|
|
43
|
+
/** 装上更新：查新版 → 提交安装 → 有界轮询查状态到任务收尾；凭证过期重查一次再提交。
|
|
44
|
+
*
|
|
45
|
+
* **第一句那次 `checkTarget` 不是多余的**（票 #740 第四轮）：凭证是「这一刻的安装态」的凭据，
|
|
46
|
+
* 更新包提交时拿它跟当时读到的安装态比（`service.js:309`／`:325`），不一样就拒。
|
|
47
|
+
* 而面板**从来只提交这一刻现签的凭证**——这就是「刚在本面板装过别家，这一家照样点得动
|
|
48
|
+
* 「装上更新」」的全部依据：旧快照只用来显示版本，不参与提交。（第四轮以前面板还把别家整行
|
|
49
|
+
* 换成「重新检查」——那是白挡一次本来会成功的点击，已删。） */
|
|
44
50
|
export declare function updateInstalled(call: CallFace | null, target: TargetInfo, pollMs: number): Promise<CallOutcome<CheckOutcome>>;
|
|
45
51
|
//# sourceMappingURL=update-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-client.d.ts","sourceRoot":"","sources":["../src/update-client.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEjE,yDAAyD;AACzD,MAAM,MAAM,QAAQ,GAAG,CACrB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CACR;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAC9C;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAA;CAAE,CACzI,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,kDAAkD;IAClD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,WAAW,CAAC;AA8CpF,+CAA+C;AAC/C,wBAAsB,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;IAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAMxH;AAED;;;iCAGiC;AACjC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAK/E;AAED,gEAAgE;AAChE,wBAAsB,WAAW,CAC/B,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,MAAM,EAAE,UAAU,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAIpC;AAED,6CAA6C;AAC7C,wBAAsB,aAAa,CACjC,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAEhE;AAED
|
|
1
|
+
{"version":3,"file":"update-client.d.ts","sourceRoot":"","sources":["../src/update-client.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEjE,yDAAyD;AACzD,MAAM,MAAM,QAAQ,GAAG,CACrB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CACR;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAC9C;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAA;CAAE,CACzI,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,kDAAkD;IAClD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,WAAW,CAAC;AA8CpF,+CAA+C;AAC/C,wBAAsB,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;IAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAMxH;AAED;;;iCAGiC;AACjC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAK/E;AAED,gEAAgE;AAChE,wBAAsB,WAAW,CAC/B,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,MAAM,EAAE,UAAU,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAIpC;AAED,6CAA6C;AAC7C,wBAAsB,aAAa,CACjC,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAEhE;AAED;;;;;;mCAMmC;AACnC,wBAAsB,eAAe,CACnC,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAyCpC"}
|
package/dist/update-client.js
CHANGED
|
@@ -83,7 +83,13 @@ export async function checkTarget(call, target, phoneName) {
|
|
|
83
83
|
export async function installAbsent(call, target, version) {
|
|
84
84
|
return callManager(call, MANAGER_ACTIONS.install, { packageName: target.packageName, version });
|
|
85
85
|
}
|
|
86
|
-
/** 装上更新：查新版 → 提交安装 → 有界轮询查状态到任务收尾；凭证过期重查一次再提交。
|
|
86
|
+
/** 装上更新：查新版 → 提交安装 → 有界轮询查状态到任务收尾；凭证过期重查一次再提交。
|
|
87
|
+
*
|
|
88
|
+
* **第一句那次 `checkTarget` 不是多余的**（票 #740 第四轮）：凭证是「这一刻的安装态」的凭据，
|
|
89
|
+
* 更新包提交时拿它跟当时读到的安装态比（`service.js:309`／`:325`），不一样就拒。
|
|
90
|
+
* 而面板**从来只提交这一刻现签的凭证**——这就是「刚在本面板装过别家，这一家照样点得动
|
|
91
|
+
* 「装上更新」」的全部依据：旧快照只用来显示版本，不参与提交。（第四轮以前面板还把别家整行
|
|
92
|
+
* 换成「重新检查」——那是白挡一次本来会成功的点击，已删。） */
|
|
87
93
|
export async function updateInstalled(call, target, pollMs) {
|
|
88
94
|
if (!target.phones)
|
|
89
95
|
return failure('bad-request', { target: target.key });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-client.js","sourceRoot":"","sources":["../src/update-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update-client.js","sourceRoot":"","sources":["../src/update-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-contract.d.ts","sourceRoot":"","sources":["../src/update-contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD;;;;;wDAKwD;AACxD,eAAO,MAAM,eAAe,EAAG,kBAA2B,CAAC;AAE3D;;;;;wDAKwD;AACxD,eAAO,MAAM,YAAY,EAAG,MAAe,CAAC;AAE5C,gFAAgF;AAChF,eAAO,MAAM,WAAW;IACtB,kEAAkE;;IAElE,2DAA2D;;IAE3D,gCAAgC;;IAEhC,wCAAwC;;CAEhC,CAAC;AAEX,wDAAwD;AACxD,eAAO,MAAM,eAAe;IAC1B,wEAAwE;;IAExE;;;;;qBAKiB;;IAEjB;;;;6DAIyD;;CAEjD,CAAC;AAEX;;;kDAGkD;AAClD,eAAO,MAAM,eAAe,EAAG,SAAkB,CAAC;AAElD,+CAA+C;AAC/C,eAAO,MAAM,gBAAgB,EAAG,6BAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"update-contract.d.ts","sourceRoot":"","sources":["../src/update-contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD;;;;;wDAKwD;AACxD,eAAO,MAAM,eAAe,EAAG,kBAA2B,CAAC;AAE3D;;;;;wDAKwD;AACxD,eAAO,MAAM,YAAY,EAAG,MAAe,CAAC;AAE5C,gFAAgF;AAChF,eAAO,MAAM,WAAW;IACtB,kEAAkE;;IAElE,2DAA2D;;IAE3D,gCAAgC;;IAEhC,wCAAwC;;CAEhC,CAAC;AAEX,wDAAwD;AACxD,eAAO,MAAM,eAAe;IAC1B,wEAAwE;;IAExE;;;;;qBAKiB;;IAEjB;;;;6DAIyD;;CAEjD,CAAC;AAEX;;;kDAGkD;AAClD,eAAO,MAAM,eAAe,EAAG,SAAkB,CAAC;AAElD,+CAA+C;AAC/C,eAAO,MAAM,gBAAgB,EAAG,6BAAsC,CAAC;AAiCvE,uCAAuC;AACvC,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,iDAAiD;AACjD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IAC1C,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,GAAG,IAAI,CAQhB;AAED,kDAAkD;AAClD,eAAO,MAAM,eAAe,EAAE,SAAS,aAAa,EASnD,CAAC"}
|
package/dist/update-contract.js
CHANGED
|
@@ -48,28 +48,39 @@ export const MANAGER_ACTIONS = {
|
|
|
48
48
|
export const VERSION_UNKNOWN = 'unknown';
|
|
49
49
|
/** 更新包默认官方源（`config.ts:20`，总管侧拼手工命令时用同一个值）。 */
|
|
50
50
|
export const DEFAULT_REGISTRY = 'https://registry.npmjs.org/';
|
|
51
|
-
/** 装不了 / 装不成的人话原因表：八种 `blockedReason` ＋ 过程错误码（更新包 README 第 8、12 节）。
|
|
51
|
+
/** 装不了 / 装不成的人话原因表：八种 `blockedReason` ＋ 过程错误码（更新包 README 第 8、12 节）。
|
|
52
|
+
*
|
|
53
|
+
* 每条都要三段齐全（票 #740 的文案判据）：**事实**（哪里对不上）→ **后果**（这家现在能不能装）
|
|
54
|
+
* → **动作**（用户做得到、且面板上真有的那一步；面板代劳不了的走「下面这条命令」）。
|
|
55
|
+
* 禁用口语与自造词：「半截任务」「电话没接上」「回执异常」「还出现就重装」「查宿主日志」一律不写。
|
|
56
|
+
*
|
|
57
|
+
* 点名的按钮必须是**这一行上真够得着**的那颗（票 #740 第三轮）：结果浮层一开就盖住题头的
|
|
58
|
+
* 「检查更新」，所以「改完再读一次」这类下一步一律写「重新检查」（画在那一行上）；
|
|
59
|
+
* 只有发生在**重启之后**的下一步才写「检查更新」。反过来，凡是写着「下面这条命令」的那几句，
|
|
60
|
+
* 那一行的命令块必须真出来（判据 `Verdict.manualHint`）——两处都由门禁守着。 */
|
|
52
61
|
const REASON_TEXT = {
|
|
53
|
-
'unknown-profile': '
|
|
54
|
-
'source-install': '
|
|
55
|
-
'invalid-installation': '
|
|
56
|
-
'installation-changed': '
|
|
57
|
-
'pending-restart': '
|
|
58
|
-
'registry-conflict': '
|
|
59
|
-
'incompatible-node': '
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
'
|
|
63
|
-
'check-
|
|
64
|
-
'
|
|
65
|
-
'
|
|
66
|
-
'
|
|
67
|
-
'
|
|
68
|
-
|
|
62
|
+
'unknown-profile': '认不出这台机器上的安装位置（使用范围的目录不存在，或名字不合法）。把使用范围目录建好，再点「重新检查」。',
|
|
63
|
+
'source-install': '这一份不是从 npm 发行包装的（源码装），面板不能更新它。要更新，照下面这条命令重装，装完再点「重新检查」。',
|
|
64
|
+
'invalid-installation': '磁盘上这一份装得不完整（包名或版本对不上、入口文件缺失）。照下面这条命令重装，装完再点「重新检查」。',
|
|
65
|
+
'installation-changed': '这台机器的安装清单变了（在别处装过、或清单被手工改过），这一家现在不能装。点「重新检查」重新读一次，再点「装上更新」。',
|
|
66
|
+
'pending-restart': '新版已装到磁盘，正在运行的是旧版本。重启 DSH（退出后重新打开）后生效。',
|
|
67
|
+
'registry-conflict': '使用范围清单里写的版本与磁盘上的实际版本对不上。打开使用范围的 `package.json`，把这一行改成磁盘上的版本号，再点「重新检查」。',
|
|
68
|
+
'incompatible-node': '新版本要求 Node 22 或更高，当前运行的是更低版本。升级 Node、重启 DSH 后，再点「检查更新」。',
|
|
69
|
+
// 这条只在「磁盘上的版本与正在运行的一致（或磁盘那份读不到）」时才会印出来——「磁盘 ≠ 运行中」
|
|
70
|
+
// 那一态被事实判据先截走，印的是 `restartLine`。故这里**不许**再教人去重启（那在眼下没用）。
|
|
71
|
+
'recovery-required': '上次安装没有收尾。点「重试安装」再跑一次；还出现这一条，就用下面这条命令重装。',
|
|
72
|
+
'check-failed': '查不到最新版本：联网失败，或官方源（registry.npmjs.org）不可达。确认网络与源地址后，再点「重新检查」。',
|
|
73
|
+
'invalid-release': '官方源上这个版本的元数据不完整（包名或版本不合法、包地址或校验值缺失）。换一个版本，或稍后重试。',
|
|
74
|
+
'check-expired': '上次检查的结果已过期。点「重新检查」重查一次，再点「装上更新」。',
|
|
75
|
+
'update-busy': '同一时间只能安装一个插件。等这次装完，再点「装上更新」。',
|
|
76
|
+
'install-failed': '安装没有完成。在终端里执行下面这条命令把它装完，装完再点「重新检查」。',
|
|
77
|
+
'manager-unreachable': '面板连不上总管插件（宿主里没注册，或版本对不上）。重启 DSH 后重试；仍不行就在 DSH 日志里找 `[dsh-life-pack]` 的报错。',
|
|
78
|
+
'bad-request': '面板与总管之间的请求出错了（属程序缺陷）。请在 DSH 日志里找 `[dsh-life-pack]` 的报错，连同这家插件的名字报到本仓 issue。',
|
|
79
|
+
internal: '面板与总管之间的请求出错了（属程序缺陷）。请在 DSH 日志里找 `[dsh-life-pack]` 的报错，连同这家插件的名字报到本仓 issue。',
|
|
69
80
|
};
|
|
70
81
|
/** 原因码 → 人话（认不出的码不猜、原样回码并说明这是未知原因）。 */
|
|
71
82
|
export function reasonText(code) {
|
|
72
|
-
return REASON_TEXT[code] ?? '
|
|
83
|
+
return REASON_TEXT[code] ?? '面板不认识这个原因码（' + code + '）。请在 DSH 日志里找同一处报错，报到本仓 issue。';
|
|
73
84
|
}
|
|
74
85
|
/** 手工兜底命令（更新包 README 第 9 节形状）：使用范围名含特殊字符时加引号。 */
|
|
75
86
|
export function manualInstallCommand(input) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-contract.js","sourceRoot":"","sources":["../src/update-contract.ts"],"names":[],"mappings":"AAaA;;;;;wDAKwD;AACxD,MAAM,CAAC,MAAM,eAAe,GAAG,kBAA2B,CAAC;AAE3D;;;;;wDAKwD;AACxD,MAAM,CAAC,MAAM,YAAY,GAAG,MAAe,CAAC;AAE5C,gFAAgF;AAChF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,kEAAkE;IAClE,IAAI,EAAE,YAAY;IAClB,2DAA2D;IAC3D,OAAO,EAAE,gBAAgB;IACzB,gCAAgC;IAChC,QAAQ,EAAE,eAAe;IACzB,wCAAwC;IACxC,IAAI,EAAE,oBAAoB;CAClB,CAAC;AAEX,wDAAwD;AACxD,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,wEAAwE;IACxE,OAAO,EAAE,uBAAuB;IAChC;;;;;qBAKiB;IACjB,OAAO,EAAE,uBAAuB;IAChC;;;;6DAIyD;IACzD,OAAO,EAAE,uBAAuB;CACxB,CAAC;AAEX;;;kDAGkD;AAClD,MAAM,CAAC,MAAM,eAAe,GAAG,SAAkB,CAAC;AAElD,+CAA+C;AAC/C,MAAM,CAAC,MAAM,gBAAgB,GAAG,6BAAsC,CAAC;AAEvE
|
|
1
|
+
{"version":3,"file":"update-contract.js","sourceRoot":"","sources":["../src/update-contract.ts"],"names":[],"mappings":"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"}
|
package/dist/update-env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-env.d.ts","sourceRoot":"","sources":["../src/update-env.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAG1E,6DAA6D;AAC7D,eAAO,MAAM,uBAAuB,EAAG,OAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"update-env.d.ts","sourceRoot":"","sources":["../src/update-env.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAG1E,6DAA6D;AAC7D,eAAO,MAAM,uBAAuB,EAAG,OAAgB,CAAC;AA0DxD,MAAM,WAAW,gBAAgB;IAC/B,oBAAoB;IACpB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,sBAAsB;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,6DAA6D;IAC7D,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,6BAA6B;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,qDAAqD;IACrD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,yCAAyC;AACzC,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CA+EpH;AAED,iDAAiD;AACjD,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQ3G;AAUD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAuCnG;AAED,6DAA6D;AAC7D,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAY1D;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAkChF"}
|
package/dist/update-env.js
CHANGED
|
@@ -28,8 +28,6 @@ import { CONFIG_TAB_SLOT } from './update-contract.js';
|
|
|
28
28
|
export const MISSING_RUNNING_VERSION = '0.0.0';
|
|
29
29
|
/** 使用范围的落盘清单与锁文件（与更新包读的四处同名，`reader.ts:20`）。 */
|
|
30
30
|
const PROFILE_STATE_FILES = ['pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package-lock.json'];
|
|
31
|
-
/** 指纹绑定：第一次读到自洽的环境就把指纹记下来，之后再变即 `installation-changed`（同更新包语义）。 */
|
|
32
|
-
const boundKeys = new Map();
|
|
33
31
|
async function packageAt(directory) {
|
|
34
32
|
const contents = await readFile(join(directory, 'package.json'), 'utf8');
|
|
35
33
|
const manifest = JSON.parse(contents);
|
|
@@ -149,15 +147,13 @@ export async function readTargetEnvironment(packageName, options) {
|
|
|
149
147
|
...stateFiles,
|
|
150
148
|
]))
|
|
151
149
|
.digest('hex');
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
view.blockedReason = 'installation-changed';
|
|
160
|
-
}
|
|
150
|
+
// 这里**故意不**在进程里留一份「第一次读到的安装态」做比对（票 #740 对抗式审查逮到的）：
|
|
151
|
+
// 那份绑定一旦落定就不会刷新，于是「装成一家之后」其余各家在本进程里**永久**判 installation-changed
|
|
152
|
+
// ——面板给的「重新检查」点了也没用，用户只能重启宿主才能接着装下一家（真机就是这么卡住的）。
|
|
153
|
+
// 真正管 TOCTOU 的那道守卫在更新包自己手里，而且**按凭证**：`service.js:309`／`:325` 在装之前重读一次，
|
|
154
|
+
// `env.installationKey !== checked.installationKey` 就抛 installation-changed；它的口径是
|
|
155
|
+
// 「这一次检查到这一次安装之间有没有变」，比「本进程第一次读到的样子」准，也不会卡住后续安装。
|
|
156
|
+
// 故本处只如实投影安装态，不做二次拦截。
|
|
161
157
|
if (view.blockedReason === null) {
|
|
162
158
|
if (!view.packageValid)
|
|
163
159
|
view.blockedReason = 'invalid-installation';
|
package/dist/update-env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-env.js","sourceRoot":"","sources":["../src/update-env.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEnF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,6DAA6D;AAC7D,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAgB,CAAC;AAExD,gDAAgD;AAChD,MAAM,mBAAmB,GAAG,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,mBAAmB,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"update-env.js","sourceRoot":"","sources":["../src/update-env.ts"],"names":[],"mappings":"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"}
|
package/dist/update-view.d.ts
CHANGED
|
@@ -45,17 +45,52 @@ export type SlotState = 'connected' | 'absent' | 'unregistered-product' | 'not-c
|
|
|
45
45
|
/** 一家页签此刻的状态：账本里已注册 → `connected`（面板显示它自己的设置页），否则按宿主装机读数分三态。 */
|
|
46
46
|
export declare function slotStateOf(target: TargetInfo | null, inLedger: boolean): SlotState;
|
|
47
47
|
export type VerdictKind = 'unknown' | 'up-to-date' | 'update-available' | 'blocked';
|
|
48
|
+
/** 这一行给的按钮（票 #740）：装上／装上更新／重试安装／重新检查。
|
|
49
|
+
* 前两个是「做新的事」，后两个是**把卡住的状态推回可做**——拦截态不许没有出路。 */
|
|
50
|
+
export type VerdictAction = 'install' | 'update' | 'retry' | 'recheck';
|
|
48
51
|
export interface Verdict {
|
|
49
52
|
readonly kind: VerdictKind;
|
|
50
|
-
/**
|
|
53
|
+
/** 一句话结论（面板那行正文）：事实 ＋ 后果 ＋ 动作，三段齐全。 */
|
|
51
54
|
readonly text: string;
|
|
52
|
-
|
|
53
|
-
|
|
55
|
+
readonly action: VerdictAction | null;
|
|
56
|
+
/** 这句话是否指着「下面这条命令」：指着就必须真把命令块摊出来（票 #740 第三轮）。
|
|
57
|
+
* 没有这一格时出现过失配：`recovery-required` 那句写着「就用下面这条命令重装」，
|
|
58
|
+
* 而命令块只在「拦截态且没按钮」时才画，那句下面什么都没有。 */
|
|
59
|
+
readonly manualHint?: boolean;
|
|
54
60
|
}
|
|
55
|
-
/**
|
|
61
|
+
/** 这一家是不是「装好了、只差重启」——判据是**事实**（磁盘版本 ≠ 正在跑的版本），不是原因码。
|
|
62
|
+
*
|
|
63
|
+
* 为什么不许按原因码判（票 #740 真机）：同一种事实在更新核心里可能报成两种码——
|
|
64
|
+
* `pending-restart`，或者被上一次中断的任务盖成 `recovery-required`。按码判会把「该重启」
|
|
65
|
+
* 漏成一句「装不上」，用户看到的正是那种读不懂的屏。 */
|
|
66
|
+
export declare function restartPendingOf(snapshot: UpdateSnapshot): boolean;
|
|
67
|
+
/** 待重启那一句（三段齐全：事实 → 后果 → 动作）。
|
|
68
|
+
*
|
|
69
|
+
* 措辞不写「新版」：磁盘上那份也可能比正在跑的**低**（手工降级），「新版」就不实了；
|
|
70
|
+
* 只照事实说「磁盘上装的是 X、正在运行的是 Y」。
|
|
71
|
+
* 动作只给「重启 DSH」：这一态下面板**做不了别的**——更新包的可装判据要求最新版严格高于
|
|
72
|
+
* **正在运行**的版本（`service.js:219`），而凭证只发在可装态（`service.js:256`：`receipt` 只在
|
|
73
|
+
* `canInstall` 时给），所以这一态里「重试安装」点了也是白点。 */
|
|
74
|
+
export declare function restartLine(snapshot: UpdateSnapshot): string;
|
|
75
|
+
/** 这一行此刻该画哪颗按钮：结论自带的动作优先，**失败的行一律给「重新检查」**（票 #740 第三轮）。
|
|
76
|
+
*
|
|
77
|
+
* 失败的行（查不到最新版／检查过期／装失败）没有快照、也就没有结论，原先一颗按钮都不画：
|
|
78
|
+
* 屏上写着「再点「检查更新」」，那颗按钮却在浮层底下 ⇒ 无路可走。重新查一次对每一种失败都成立。 */
|
|
79
|
+
export declare function cardActionOf(verdict: Verdict | null, phase: 'idle' | 'checking' | 'ready' | 'installing' | 'failed'): VerdictAction | null;
|
|
80
|
+
/** 这一行要不要摊出那条手工命令（票 #740 第三轮定的形状，第四轮补的这一格）。
|
|
81
|
+
*
|
|
82
|
+
* 三种情形摊：① 上一次装失败（`failed`）；② 这句话自己指着「下面这条命令」（`manualHint`）。
|
|
83
|
+
* **待重启**与 `incompatible-node` 不摊：它们那时该做的是**重启**（或升级 Node），不是重装一次。
|
|
84
|
+
* （第四轮维护者真机截图逮到：待重启那张卡下面挂着一条「dsh plugin … add」——点它等于把刚装好的
|
|
85
|
+
* 那一版再装一遍，纯噪声，还会让人以为状态不对。） */
|
|
86
|
+
export declare function showManualOf(verdict: Verdict | null, phase: 'idle' | 'checking' | 'ready' | 'installing' | 'failed'): boolean;
|
|
87
|
+
/** 把快照翻成一行结论：还没查 / 已是最新 / 有新版 / 待重启 / 装不了（附人话原因与下一步）。 */
|
|
56
88
|
export declare function verdictOf(target: TargetInfo, snapshot: UpdateSnapshot): Verdict;
|
|
57
|
-
/**
|
|
58
|
-
|
|
89
|
+
/** 待重启横幅：**一行总账**，只点名哪几家要做「重启 DSH」这件事。
|
|
90
|
+
*
|
|
91
|
+
* 为什么不再逐家重复那句话（票 #740 对抗式审查第三轮的朗读表逮到）：同一句「重启 DSH…后生效」
|
|
92
|
+
* 会同时出现在横幅和那家卡片上，一屏两遍。分工定死：**横幅答「谁要重启」，卡片答「为什么、怎么做」**。 */
|
|
93
|
+
export declare function restartBannerText(titles: readonly string[]): string | null;
|
|
59
94
|
/** 面板展示的那条可复制命令（用户会照着敲的那一条）。
|
|
60
95
|
*
|
|
61
96
|
* 缺席包给人人都会用的**单命令双包**口径（#674 冻结的装入口径：不带版本号、不带任何开关）；
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-view.d.ts","sourceRoot":"","sources":["../src/update-view.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,YAAY,EAAiB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIrF,mDAAmD;AACnD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACtG,sCAAsC;IACtC,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC;sDACkD;IAClD,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,qDAAqD;IACrD,QAAQ,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACnF;AAED,qDAAqD;AACrD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;CACvC;AAED,wEAAwE;AACxE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAEpD;AAED;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,sBAAsB,GAAG,eAAe,CAAC;AAE1F,gEAAgE;AAChE,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,GAAG,SAAS,CAKnF;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,YAAY,GAAG,kBAAkB,GAAG,SAAS,CAAC;AAEpF,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,
|
|
1
|
+
{"version":3,"file":"update-view.d.ts","sourceRoot":"","sources":["../src/update-view.ts"],"names":[],"mappings":"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"}
|
package/dist/update-view.js
CHANGED
|
@@ -14,42 +14,109 @@ export function slotStateOf(target, inLedger) {
|
|
|
14
14
|
return 'unregistered-product';
|
|
15
15
|
return 'not-connected';
|
|
16
16
|
}
|
|
17
|
-
/**
|
|
17
|
+
/** 这一家是不是「装好了、只差重启」——判据是**事实**（磁盘版本 ≠ 正在跑的版本），不是原因码。
|
|
18
|
+
*
|
|
19
|
+
* 为什么不许按原因码判（票 #740 真机）：同一种事实在更新核心里可能报成两种码——
|
|
20
|
+
* `pending-restart`，或者被上一次中断的任务盖成 `recovery-required`。按码判会把「该重启」
|
|
21
|
+
* 漏成一句「装不上」，用户看到的正是那种读不懂的屏。 */
|
|
22
|
+
export function restartPendingOf(snapshot) {
|
|
23
|
+
const installed = snapshot.installedVersion;
|
|
24
|
+
return installed !== null && installed !== snapshot.runningVersion;
|
|
25
|
+
}
|
|
26
|
+
/** 待重启那一句（三段齐全：事实 → 后果 → 动作）。
|
|
27
|
+
*
|
|
28
|
+
* 措辞不写「新版」：磁盘上那份也可能比正在跑的**低**（手工降级），「新版」就不实了；
|
|
29
|
+
* 只照事实说「磁盘上装的是 X、正在运行的是 Y」。
|
|
30
|
+
* 动作只给「重启 DSH」：这一态下面板**做不了别的**——更新包的可装判据要求最新版严格高于
|
|
31
|
+
* **正在运行**的版本（`service.js:219`），而凭证只发在可装态（`service.js:256`：`receipt` 只在
|
|
32
|
+
* `canInstall` 时给），所以这一态里「重试安装」点了也是白点。 */
|
|
33
|
+
export function restartLine(snapshot) {
|
|
34
|
+
const installed = snapshot.installedVersion ?? snapshot.job?.targetVersion ?? '新版本';
|
|
35
|
+
return '磁盘上装的是 ' + String(installed) + '；正在运行的是 ' + snapshot.runningVersion + '。重启 DSH（退出后重新打开）后生效。';
|
|
36
|
+
}
|
|
37
|
+
/** 「条件在别处（目录／清单／别处装的），改完回来重读一次」的原因码：面板能给的下一步就是「重新检查」。
|
|
38
|
+
*
|
|
39
|
+
* 为什么要逐码列（票 #740 第三轮的朗读表）：`unknown-profile`／`registry-conflict`／`invalid-installation`／
|
|
40
|
+
* `source-install` 这四态原先一个动作都不给，屏上那句却写着「再点「检查更新」」——那颗按钮住在面板题头，
|
|
41
|
+
* 结果浮层一开（点「检查更新」就开）就被浮层盖住，够不着。跟两张「还没查过」的卡是同一类病。 */
|
|
42
|
+
const RECHECK_REASONS = new Set(['installation-changed', 'unknown-profile', 'registry-conflict', 'invalid-installation', 'source-install']);
|
|
43
|
+
/** 「这一步面板代劳不了、得照下面那条命令做」的原因码：这些话下面必须真有命令块。 */
|
|
44
|
+
const NEEDS_MANUAL = new Set(['source-install', 'invalid-installation', 'recovery-required']);
|
|
45
|
+
/** 拦截态各自给得出的下一步：面板能代劳的给按钮，代劳不了的给 null（那种走手工命令块）。 */
|
|
46
|
+
function actionForBlocked(reason) {
|
|
47
|
+
if (RECHECK_REASONS.has(reason))
|
|
48
|
+
return 'recheck';
|
|
49
|
+
if (reason === 'recovery-required')
|
|
50
|
+
return 'retry';
|
|
51
|
+
// `incompatible-node`（要升级 Node 并重启 DSH）与 `pending-restart`（要重启，且已被上面那条事实判据截走）
|
|
52
|
+
// 这两态面板一步也做不了，按定义给 null；它们那句里点名的「检查更新」发生在重启之后，那时浮层早已关掉。
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
/** 这一行此刻该画哪颗按钮：结论自带的动作优先，**失败的行一律给「重新检查」**（票 #740 第三轮）。
|
|
56
|
+
*
|
|
57
|
+
* 失败的行（查不到最新版／检查过期／装失败）没有快照、也就没有结论，原先一颗按钮都不画：
|
|
58
|
+
* 屏上写着「再点「检查更新」」，那颗按钮却在浮层底下 ⇒ 无路可走。重新查一次对每一种失败都成立。 */
|
|
59
|
+
export function cardActionOf(verdict, phase) {
|
|
60
|
+
if (verdict?.action)
|
|
61
|
+
return verdict.action;
|
|
62
|
+
return phase === 'failed' ? 'recheck' : null;
|
|
63
|
+
}
|
|
64
|
+
/** 这一行要不要摊出那条手工命令（票 #740 第三轮定的形状，第四轮补的这一格）。
|
|
65
|
+
*
|
|
66
|
+
* 三种情形摊：① 上一次装失败（`failed`）；② 这句话自己指着「下面这条命令」（`manualHint`）。
|
|
67
|
+
* **待重启**与 `incompatible-node` 不摊：它们那时该做的是**重启**（或升级 Node），不是重装一次。
|
|
68
|
+
* （第四轮维护者真机截图逮到：待重启那张卡下面挂着一条「dsh plugin … add」——点它等于把刚装好的
|
|
69
|
+
* 那一版再装一遍，纯噪声，还会让人以为状态不对。） */
|
|
70
|
+
export function showManualOf(verdict, phase) {
|
|
71
|
+
return phase === 'failed' || verdict?.manualHint === true;
|
|
72
|
+
}
|
|
73
|
+
/** 把快照翻成一行结论：还没查 / 已是最新 / 有新版 / 待重启 / 装不了（附人话原因与下一步）。 */
|
|
18
74
|
export function verdictOf(target, snapshot) {
|
|
19
75
|
const absent = isAbsent(target);
|
|
20
76
|
const latest = snapshot.latestVersion;
|
|
21
77
|
if (absent && latest === null) {
|
|
22
|
-
|
|
78
|
+
// 动作给「重新检查」而不是让人去点面板顶上那颗「检查更新」：浮层开着的时候，顶上那颗被盖住了
|
|
79
|
+
// （票 #740 对抗式审查第三轮的朗读表逮到）⇒ **每张卡自己的动作必须在这张卡上够得着**。
|
|
80
|
+
return { kind: 'unknown', text: '未安装。点「重新检查」查最新版本，再点「装上」。', action: 'recheck' };
|
|
23
81
|
}
|
|
24
82
|
if (absent) {
|
|
25
|
-
return { kind: 'update-available', text: '未安装；最新版本 ' + String(latest) + '
|
|
83
|
+
return { kind: 'update-available', text: '未安装；最新版本 ' + String(latest) + '。点「装上」安装。', action: 'install' };
|
|
26
84
|
}
|
|
27
|
-
|
|
85
|
+
// ① 装了没重启：先说这件事——它压过一切「装不上」（那时用户该做的只有重启）。
|
|
86
|
+
if (restartPendingOf(snapshot)) {
|
|
87
|
+
return { kind: 'blocked', text: restartLine(snapshot), action: null };
|
|
88
|
+
}
|
|
89
|
+
// ② 有东西可装、却被守卫或环境拦下：说清原因 ＋ 给一个能执行的下一步。
|
|
90
|
+
// 「没东西可装」的那些拦截不在这里说——那时守卫与用户无关，不该在屏上占一行（真机实测：
|
|
91
|
+
// 已经是最新的一家挂着「安装清单变了」＋一条重装命令，纯噪声）。
|
|
92
|
+
const installed = snapshot.installedVersion;
|
|
93
|
+
const hasNewer = latest !== null && latest !== installed;
|
|
94
|
+
if (snapshot.blockedReason !== null && hasNewer) {
|
|
28
95
|
const blocked = snapshot.blockedReason;
|
|
29
|
-
|
|
30
|
-
return { kind: 'blocked', text: reasonText(blocked), action: null };
|
|
31
|
-
}
|
|
32
|
-
return { kind: 'blocked', text: reasonText(blocked), action: null };
|
|
96
|
+
return { kind: 'blocked', text: reasonText(blocked), action: actionForBlocked(blocked), manualHint: NEEDS_MANUAL.has(blocked) };
|
|
33
97
|
}
|
|
34
98
|
if (latest === null) {
|
|
35
|
-
return { kind: 'unknown', text: '
|
|
99
|
+
return { kind: 'unknown', text: '还没查过最新版本。点「重新检查」。', action: 'recheck' };
|
|
36
100
|
}
|
|
37
101
|
if (snapshot.canInstall) {
|
|
38
|
-
|
|
102
|
+
// 把「正在运行的是哪个版本」写进同一行：用户不必回头去版本行里找。
|
|
103
|
+
return { kind: 'update-available', text: '有新版本 ' + String(latest) + '（正在运行 ' + snapshot.runningVersion + '）。点「装上更新」。', action: 'update' };
|
|
104
|
+
}
|
|
105
|
+
if (hasNewer) {
|
|
106
|
+
// 有新版、却没有可用凭证（这一通的凭证过期，或压根没签发）⇒ **不许说「已是最新」**：
|
|
107
|
+
// 那是假话（最新版就在官方源上、磁盘上还是旧的），正确答案是重新检查一次拿新凭证。
|
|
108
|
+
return { kind: 'update-available', text: '有新版本 ' + String(latest) + '（正在运行 ' + snapshot.runningVersion + '）。点「重新检查」，再点「装上更新」。', action: 'recheck' };
|
|
39
109
|
}
|
|
40
|
-
return { kind: 'up-to-date', text: '
|
|
110
|
+
return { kind: 'up-to-date', text: '已是最新版本 ' + String(latest) + '。', action: null };
|
|
41
111
|
}
|
|
42
|
-
/**
|
|
43
|
-
|
|
44
|
-
|
|
112
|
+
/** 待重启横幅：**一行总账**，只点名哪几家要做「重启 DSH」这件事。
|
|
113
|
+
*
|
|
114
|
+
* 为什么不再逐家重复那句话（票 #740 对抗式审查第三轮的朗读表逮到）：同一句「重启 DSH…后生效」
|
|
115
|
+
* 会同时出现在横幅和那家卡片上，一屏两遍。分工定死：**横幅答「谁要重启」，卡片答「为什么、怎么做」**。 */
|
|
116
|
+
export function restartBannerText(titles) {
|
|
117
|
+
if (titles.length === 0)
|
|
45
118
|
return null;
|
|
46
|
-
|
|
47
|
-
const running = snapshot.runningVersion;
|
|
48
|
-
if (installed === null)
|
|
49
|
-
return '⚠️ 新版已装好，重启宿主后生效。';
|
|
50
|
-
if (installed === running)
|
|
51
|
-
return '⚠️ 新版 ' + installed + ' 已装好，重启宿主后生效。';
|
|
52
|
-
return '⚠️ 新版 ' + installed + ' 已装好，正在跑的还是 ' + running + '，重启宿主后生效。';
|
|
119
|
+
return '⚠️ 待重启 DSH（退出后重新打开）：' + titles.join('、');
|
|
53
120
|
}
|
|
54
121
|
/** 面板展示的那条可复制命令（用户会照着敲的那一条）。
|
|
55
122
|
*
|
package/dist/update-view.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-view.js","sourceRoot":"","sources":["../src/update-view.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAyBlD,wEAAwE;AACxE,MAAM,UAAU,QAAQ,CAAC,MAAkB;IACzC,OAAO,MAAM,CAAC,cAAc,KAAK,IAAI,IAAI,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAC;AAC5E,CAAC;AAUD,gEAAgE;AAChE,MAAM,UAAU,WAAW,CAAC,MAAyB,EAAE,QAAiB;IACtE,IAAI,QAAQ;QAAE,OAAO,WAAW,CAAC;IACjC,IAAI,MAAM,KAAK,IAAI,IAAI,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,QAAQ,CAAC;IACzD,IAAI,MAAM,CAAC,eAAe,KAAK,KAAK;QAAE,OAAO,sBAAsB,CAAC;IACpE,OAAO,eAAe,CAAC;AACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"update-view.js","sourceRoot":"","sources":["../src/update-view.ts"],"names":[],"mappings":"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"}
|