@haitang-hub/lingyu-island 1.3.0 → 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
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@haitang-hub/lingyu-island",
3
3
  "productName": "灵屿岛",
4
- "version": "1.3.0",
4
+ "version": "1.3.2",
5
5
  "description": "灵动岛式文件屏蔽与恢复工具:拖入文件即可屏蔽个人敏感信息,随时还原",
6
6
  "main": "src/main/main.js",
7
7
  "author": "Haitang-Hub",
@@ -68,6 +68,7 @@
68
68
  },
69
69
  "dependencies": {
70
70
  "adm-zip": "^0.5.16",
71
+ "electron-updater": "^6.8.11",
71
72
  "iconv-lite": "^0.6.3"
72
73
  },
73
74
  "devDependencies": {
@@ -0,0 +1,148 @@
1
+ 'use strict';
2
+ /**
3
+ * 安装版更新后端:基于 electron-updater,更新源为 GitHub Releases。
4
+ *
5
+ * 与 src/main/updater.js(源码直跑后端)保持同一接口:
6
+ * { checkNow, install, apply, getStatus }
7
+ * 广播通道也复用同一组:update:found / update:progress / update:staged / update:error,
8
+ * 面板 UI 不感知后端差异。
9
+ *
10
+ * 说明:electron-updater 只在打包版下可用(dev 下 App 不带 app-update.yml)。
11
+ * 流程:检查更新 → 「立即更新」触发下载(含进度)→ 下载完成 → 「重启完成安装」
12
+ * → quitAndInstall(false, true) 静默安装并重启(before-quit 先持久化映射库)。
13
+ */
14
+
15
+ const { autoUpdater } = require('electron-updater');
16
+
17
+ const RELEASES_PAGE = 'https://github.com/Haitang-Hub/LingyuIsland/releases/latest';
18
+
19
+ function createAutoUpdater({ currentVersion, onBroadcast, feedUrl } = {}) {
20
+ // state: idle → available → downloading → staged(与源码后端状态机一致)
21
+ let state = 'idle';
22
+ let lastCheck = null;
23
+
24
+ const broadcast = (ch, payload) => { try { onBroadcast && onBroadcast(ch, payload); } catch { /* ignore */ } };
25
+ const setState = (s) => { state = s; };
26
+
27
+ // feed 覆盖:ISLAND_UPDATE_FEED 环境变量 / 构造参数(镜像或测试用)
28
+ const override = feedUrl || process.env.ISLAND_UPDATE_FEED;
29
+ if (override) {
30
+ autoUpdater.setFeedURL({ provider: 'generic', url: override });
31
+ }
32
+ autoUpdater.autoDownload = false; // 点「立即更新」才下载
33
+ autoUpdater.autoInstallOnAppQuit = false; // 只走「重启完成安装」按钮
34
+ autoUpdater.allowPrerelease = false;
35
+
36
+ autoUpdater.on('download-progress', (p) => {
37
+ broadcast('update:progress', { phase: 'download', pct: Math.round(p.percent || 0) });
38
+ });
39
+ autoUpdater.on('update-downloaded', (info) => {
40
+ setState('staged');
41
+ broadcast('update:staged', { latest: info.version, depsChanged: false });
42
+ });
43
+ autoUpdater.on('error', (err) => {
44
+ if (state === 'downloading') {
45
+ setState('idle');
46
+ broadcast('update:error', { message: String(err && err.message || err) });
47
+ }
48
+ });
49
+ autoUpdater.on('update-available', (info) => {
50
+ // 事件侧兜底记录 latest(checkForUpdates 的 Promise 也会带)
51
+ lastCheck = {
52
+ ...(lastCheck || {}),
53
+ latest: info.version,
54
+ hasUpdate: true,
55
+ packaged: true,
56
+ releasePage: RELEASES_PAGE,
57
+ };
58
+ });
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
+
70
+ /** 检查更新:返回 { current, latest, hasUpdate, packaged, releasePage } */
71
+ async function checkNow() {
72
+ if (state === 'downloading') return lastCheck || { current: currentVersion, hasUpdate: false, packaged: true };
73
+ setState('idle');
74
+ try {
75
+ const result = await autoUpdater.checkForUpdates();
76
+ const info = result && result.updateInfo;
77
+ const latest = info && info.version;
78
+ const hasUpdate = !!latest && latest !== currentVersion;
79
+ lastCheck = {
80
+ current: currentVersion,
81
+ latest,
82
+ hasUpdate,
83
+ tarball: null, // electron-updater 自管下载,不暴露 tarball
84
+ releasePage: RELEASES_PAGE,
85
+ packaged: true,
86
+ };
87
+ if (hasUpdate) {
88
+ broadcast('update:found', { latest, current: currentVersion, packaged: true });
89
+ }
90
+ return lastCheck;
91
+ } catch (err) {
92
+ setState('idle');
93
+ const message = friendlyError(err);
94
+ // 不广播 update:error:启动时的自动检查应保持静默;手动检查经返回值 error 字段提示
95
+ return { current: currentVersion, latest: null, hasUpdate: false, error: message, packaged: true, releasePage: RELEASES_PAGE };
96
+ }
97
+ }
98
+
99
+ /** 下载新版本(进度经 update:progress 广播),完成后进入 staged */
100
+ async function install() {
101
+ if (!lastCheck || !lastCheck.hasUpdate) {
102
+ return { ok: false, reason: '请先检查更新,确认有新版本后再下载' };
103
+ }
104
+ if (state === 'downloading' || state === 'staged') {
105
+ return { ok: true, staged: state === 'staged', depsChanged: false, packaged: true };
106
+ }
107
+ setState('downloading');
108
+ try {
109
+ await autoUpdater.downloadUpdate(); // update-downloaded 事件负责置 staged 并广播
110
+ if (state !== 'staged') { // 事件竞态兜底
111
+ setState('staged');
112
+ broadcast('update:staged', { latest: lastCheck.latest, depsChanged: false });
113
+ }
114
+ return { ok: true, staged: true, depsChanged: false, packaged: true };
115
+ } catch (err) {
116
+ setState('idle');
117
+ const message = friendlyError(err);
118
+ broadcast('update:error', { message });
119
+ return { ok: false, reason: message, packaged: true };
120
+ }
121
+ }
122
+
123
+ /** 重启并静默安装(NSIS /S + 完成后自动重启;before-quit 先持久化映射库) */
124
+ function apply() {
125
+ if (state !== 'staged') return { ok: false, reason: '没有已下载完成的更新' };
126
+ setImmediate(() => {
127
+ try { autoUpdater.quitAndInstall(false, true); } catch { /* 安装器接管进程 */ }
128
+ });
129
+ return { ok: true, relaunch: true, packaged: true };
130
+ }
131
+
132
+ /** 状态快照(不发网络请求,面板重开时恢复 UI) */
133
+ function getStatus() {
134
+ return {
135
+ state,
136
+ current: currentVersion,
137
+ latest: lastCheck ? lastCheck.latest : null,
138
+ hasUpdate: !!(lastCheck && lastCheck.hasUpdate),
139
+ depsChanged: false,
140
+ releasePage: RELEASES_PAGE,
141
+ packaged: true,
142
+ };
143
+ }
144
+
145
+ return { checkNow, install, apply, getStatus };
146
+ }
147
+
148
+ module.exports = { createAutoUpdater, RELEASES_PAGE };
package/src/main/ipc.js CHANGED
@@ -152,17 +152,18 @@ function register(ctx) {
152
152
  // 当前更新状态快照(不发网络请求,面板重开时恢复 UI)
153
153
  ipc_handle('update:status', () => updater.getStatus());
154
154
  // 下载并暂存新版本(update:progress / update:staged / update:error 广播进度)
155
- ipc_handle('update:install', () => updater.installStaged());
156
- // 应用暂存更新:拷贝覆盖 → 重启(before-quit 会先持久化映射库)
155
+ // 源码后端 = installStaged(npm 包覆盖);安装版 = install(electron-updater 下载 Setup)
156
+ ipc_handle('update:install', () => (updater.install ? updater.install() : updater.installStaged()));
157
+ // 应用更新:源码后端 = 拷贝覆盖 → relaunch;安装版后端 = quitAndInstall(内部自行退出)
157
158
  ipc_handle('update:apply', () => {
158
- const r = updater.applyStaged();
159
- if (r.ok) {
159
+ const r = updater.apply ? updater.apply() : updater.applyStaged();
160
+ if (r.ok && r.relaunch && !updater.install) {
160
161
  electronApp.relaunch();
161
162
  electronApp.exit(0);
162
163
  }
163
164
  return r;
164
165
  });
165
- // 打开 npm 包页(用户选择手动下载时)
166
+ // 打开下载页(手动兜底):源码模式指 npm 包页,安装版指 GitHub Releases
166
167
  ipc_handle('update:open-page', () => { shell.openExternal(updater.getStatus().releasePage); return true; });
167
168
  ipc_handle('app:version', () => app_ref().getVersion());
168
169
  ipc_handle('app:quit', () => app_ref().quit());
package/src/main/main.js CHANGED
@@ -13,6 +13,7 @@ const { Indexer } = require('./indexer');
13
13
  const { ClipboardWatcher } = require('./clipboard');
14
14
  const { register } = require('./ipc');
15
15
  const { createUpdater } = require('./updater');
16
+ const { createAutoUpdater } = require('./electron-updater');
16
17
  const { createTray } = require('./tray');
17
18
 
18
19
  // E2E 跑测试时使用独立 userData:不与正在运行的应用实例争单实例锁/磁盘缓存
@@ -67,12 +68,19 @@ app.whenReady().then(() => {
67
68
  () => island.broadcast('clip:cleared')
68
69
  );
69
70
 
70
- updater = createUpdater({
71
- appDir: path.resolve(__dirname, '..', '..'),
72
- currentVersion: app.getVersion(),
73
- onBroadcast: (ch, payload) => island.broadcast(ch, payload),
74
- isPackaged: app.isPackaged,
75
- });
71
+ // 双后端更新器:安装版(asar 只读)走 electron-updater(GitHub Releases,
72
+ // 下载 Setup 静默安装 + 重启);源码直跑保留 npm 包覆盖机制。接口完全一致。
73
+ updater = app.isPackaged
74
+ ? createAutoUpdater({
75
+ currentVersion: app.getVersion(),
76
+ onBroadcast: (ch, payload) => island.broadcast(ch, payload),
77
+ })
78
+ : createUpdater({
79
+ appDir: path.resolve(__dirname, '..', '..'),
80
+ currentVersion: app.getVersion(),
81
+ onBroadcast: (ch, payload) => island.broadcast(ch, payload),
82
+ isPackaged: app.isPackaged,
83
+ });
76
84
 
77
85
  register({ store, island, indexer, clipboardWatcher, updater });
78
86
 
@@ -784,12 +784,7 @@ function renderUpdateUI() {
784
784
  const st = updateState;
785
785
  els.updateBox.hidden = !(st.hasUpdate || st.state === 'staged');
786
786
  if (els.updateBox.hidden) return;
787
- // 安装版(asar 只读)不支持就地更新:隐藏安装按钮,引导去下载页
788
- els.updateInstallBtn.hidden = !!st.packaged;
789
- if (st.packaged) {
790
- els.updateStatusText.textContent = `发现新版本 v${st.latest}(当前 v${updateCurrentVersion}),请前往下载页获取安装包`;
791
- return;
792
- }
787
+ // 两种后端(源码覆盖 / electron-updater)都支持一键更新,安装按钮恒可用
793
788
  if (st.state === 'downloading') {
794
789
  els.updateStatusText.textContent = '正在下载新版本…';
795
790
  els.updateInstallBtn.disabled = true;
@@ -813,7 +808,10 @@ els.updateCheckBtn.addEventListener('click', async () => {
813
808
  els.updateCheckBtn.textContent = '检查中…';
814
809
  try {
815
810
  const r = await window.island.invoke('update:check');
816
- if (r.hasUpdate) {
811
+ if (r.error) {
812
+ // 检查失败 ≠ 没有新版本:明确报错,不误导用户「已是最新」
813
+ toast('检查更新失败:' + r.error, 'err');
814
+ } else if (r.hasUpdate) {
817
815
  updateState = { state: 'idle', latest: r.latest, depsChanged: false, hasUpdate: true, packaged: !!r.packaged };
818
816
  renderUpdateUI();
819
817
  } else {