@haitang-hub/lingyu-island 1.3.1 → 1.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/package.json
CHANGED
|
@@ -57,6 +57,16 @@ function createAutoUpdater({ currentVersion, onBroadcast, feedUrl } = {}) {
|
|
|
57
57
|
};
|
|
58
58
|
});
|
|
59
59
|
|
|
60
|
+
/** 把 electron-updater 的网络错误翻译成用户能看懂的中文 */
|
|
61
|
+
function friendlyError(err) {
|
|
62
|
+
const raw = String(err && err.message || err);
|
|
63
|
+
if (/ERR_CONNECTION_RESET|ERR_CONNECTION_TIMED_OUT|ERR_CONNECTION_REFUSED|ERR_NAME_NOT_RESOLVED|ERR_INTERNET_DISCONNECTED|ENOTFOUND|ECONNRESET|ETIMEDOUT|timeout/i.test(raw)) {
|
|
64
|
+
return '无法连接更新服务器(GitHub)。请检查网络或代理后重试,也可点「打开下载页」手动下载安装包。';
|
|
65
|
+
}
|
|
66
|
+
if (/404/.test(raw)) return '更新服务器上暂时没有找到版本信息,请稍后重试。';
|
|
67
|
+
return '检查更新失败:' + raw.slice(0, 80);
|
|
68
|
+
}
|
|
69
|
+
|
|
60
70
|
/** 检查更新:返回 { current, latest, hasUpdate, packaged, releasePage } */
|
|
61
71
|
async function checkNow() {
|
|
62
72
|
if (state === 'downloading') return lastCheck || { current: currentVersion, hasUpdate: false, packaged: true };
|
|
@@ -80,9 +90,9 @@ function createAutoUpdater({ currentVersion, onBroadcast, feedUrl } = {}) {
|
|
|
80
90
|
return lastCheck;
|
|
81
91
|
} catch (err) {
|
|
82
92
|
setState('idle');
|
|
83
|
-
const message =
|
|
84
|
-
|
|
85
|
-
return { current: currentVersion, latest: null, hasUpdate: false,
|
|
93
|
+
const message = friendlyError(err);
|
|
94
|
+
// 不广播 update:error:启动时的自动检查应保持静默;手动检查经返回值 error 字段提示
|
|
95
|
+
return { current: currentVersion, latest: null, hasUpdate: false, error: message, packaged: true, releasePage: RELEASES_PAGE };
|
|
86
96
|
}
|
|
87
97
|
}
|
|
88
98
|
|
|
@@ -104,7 +114,7 @@ function createAutoUpdater({ currentVersion, onBroadcast, feedUrl } = {}) {
|
|
|
104
114
|
return { ok: true, staged: true, depsChanged: false, packaged: true };
|
|
105
115
|
} catch (err) {
|
|
106
116
|
setState('idle');
|
|
107
|
-
const message =
|
|
117
|
+
const message = friendlyError(err);
|
|
108
118
|
broadcast('update:error', { message });
|
|
109
119
|
return { ok: false, reason: message, packaged: true };
|
|
110
120
|
}
|
package/src/renderer/panel.js
CHANGED
|
@@ -808,7 +808,10 @@ els.updateCheckBtn.addEventListener('click', async () => {
|
|
|
808
808
|
els.updateCheckBtn.textContent = '检查中…';
|
|
809
809
|
try {
|
|
810
810
|
const r = await window.island.invoke('update:check');
|
|
811
|
-
if (r.
|
|
811
|
+
if (r.error) {
|
|
812
|
+
// 检查失败 ≠ 没有新版本:明确报错,不误导用户「已是最新」
|
|
813
|
+
toast('检查更新失败:' + r.error, 'err');
|
|
814
|
+
} else if (r.hasUpdate) {
|
|
812
815
|
updateState = { state: 'idle', latest: r.latest, depsChanged: false, hasUpdate: true, packaged: !!r.packaged };
|
|
813
816
|
renderUpdateUI();
|
|
814
817
|
} else {
|