mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-19 15:26:59 +08:00
fix: updater not working (#3144)
(cherry picked from commit 0514da9759)
This commit is contained in:
@@ -12,7 +12,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "yarn cross-env DEV_SERVER_URL=http://localhost:8080 node scripts/dev.mjs",
|
"dev": "yarn cross-env DEV_SERVER_URL=http://localhost:8080 node scripts/dev.mjs",
|
||||||
"dev:prod": "yarn node scripts/dev.mjs",
|
"dev:prod": "yarn node scripts/dev.mjs",
|
||||||
"build": "zx scripts/build-layers.mjs",
|
"build": "NODE_ENV=production zx scripts/build-layers.mjs",
|
||||||
"generate-assets": "zx scripts/generate-assets.mjs",
|
"generate-assets": "zx scripts/generate-assets.mjs",
|
||||||
"package": "electron-forge package",
|
"package": "electron-forge package",
|
||||||
"make": "electron-forge make",
|
"make": "electron-forge make",
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@toeverything/plugin-infra": "workspace:*",
|
"@toeverything/plugin-infra": "workspace:*",
|
||||||
"async-call-rpc": "^6.3.1",
|
"async-call-rpc": "^6.3.1",
|
||||||
"electron-updater": "^5.0.0",
|
"electron-updater": "^6.0.0",
|
||||||
"link-preview-js": "^3.0.4",
|
"link-preview-js": "^3.0.4",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"nanoid": "^4.0.2",
|
"nanoid": "^4.0.2",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { app, Menu } from 'electron';
|
import { app, Menu } from 'electron';
|
||||||
|
|
||||||
import { revealLogFile } from '../logger';
|
import { revealLogFile } from '../logger';
|
||||||
import { checkForUpdatesAndNotify } from '../updater';
|
import { checkForUpdates } from '../updater';
|
||||||
import { isMacOS } from '../utils';
|
import { isMacOS } from '../utils';
|
||||||
import { applicationMenuSubjects } from './subject';
|
import { applicationMenuSubjects } from './subject';
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@ export function createApplicationMenu() {
|
|||||||
{
|
{
|
||||||
label: 'Check for Updates',
|
label: 'Check for Updates',
|
||||||
click: async () => {
|
click: async () => {
|
||||||
await checkForUpdatesAndNotify(true);
|
await checkForUpdates(true);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -25,11 +25,11 @@ export const quitAndInstall = async () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let lastCheckTime = 0;
|
let lastCheckTime = 0;
|
||||||
export const checkForUpdatesAndNotify = async (force = true) => {
|
export const checkForUpdates = async (force = true) => {
|
||||||
// check every 30 minutes (1800 seconds) at most
|
// check every 30 minutes (1800 seconds) at most
|
||||||
if (force || lastCheckTime + 1000 * 1800 < Date.now()) {
|
if (force || lastCheckTime + 1000 * 1800 < Date.now()) {
|
||||||
lastCheckTime = Date.now();
|
lastCheckTime = Date.now();
|
||||||
return await autoUpdater.checkForUpdatesAndNotify();
|
return await autoUpdater.checkForUpdates();
|
||||||
}
|
}
|
||||||
return void 0;
|
return void 0;
|
||||||
};
|
};
|
||||||
@@ -100,6 +100,6 @@ export const registerUpdater = async () => {
|
|||||||
autoUpdater.forceDevUpdateConfig = isDev;
|
autoUpdater.forceDevUpdateConfig = isDev;
|
||||||
|
|
||||||
app.on('activate', async () => {
|
app.on('activate', async () => {
|
||||||
await checkForUpdatesAndNotify(false);
|
await checkForUpdates(false);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { app } from 'electron';
|
import { app } from 'electron';
|
||||||
|
|
||||||
import type { NamespaceHandlers } from '../type';
|
import type { NamespaceHandlers } from '../type';
|
||||||
import { checkForUpdatesAndNotify, quitAndInstall } from './electron-updater';
|
import { checkForUpdates, quitAndInstall } from './electron-updater';
|
||||||
|
|
||||||
export const updaterHandlers = {
|
export const updaterHandlers = {
|
||||||
currentVersion: async () => {
|
currentVersion: async () => {
|
||||||
@@ -11,7 +11,7 @@ export const updaterHandlers = {
|
|||||||
return quitAndInstall();
|
return quitAndInstall();
|
||||||
},
|
},
|
||||||
checkForUpdatesAndNotify: async () => {
|
checkForUpdatesAndNotify: async () => {
|
||||||
const res = await checkForUpdatesAndNotify(true);
|
const res = await checkForUpdates(true);
|
||||||
if (res) {
|
if (res) {
|
||||||
const { updateInfo } = res;
|
const { updateInfo } = res;
|
||||||
return {
|
return {
|
||||||
|
|||||||
66
yarn.lock
66
yarn.lock
@@ -235,7 +235,7 @@ __metadata:
|
|||||||
electron: ^25.2.0
|
electron: ^25.2.0
|
||||||
electron-log: ^5.0.0-beta.24
|
electron-log: ^5.0.0-beta.24
|
||||||
electron-squirrel-startup: 1.0.0
|
electron-squirrel-startup: 1.0.0
|
||||||
electron-updater: ^5.0.0
|
electron-updater: ^6.0.0
|
||||||
electron-window-state: ^5.0.3
|
electron-window-state: ^5.0.3
|
||||||
esbuild: ^0.18.11
|
esbuild: ^0.18.11
|
||||||
fs-extra: ^11.1.1
|
fs-extra: ^11.1.1
|
||||||
@@ -12025,7 +12025,7 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.3.6":
|
"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4":
|
||||||
version: 7.5.0
|
version: 7.5.0
|
||||||
resolution: "@types/semver@npm:7.5.0"
|
resolution: "@types/semver@npm:7.5.0"
|
||||||
checksum: 0a64b9b9c7424d9a467658b18dd70d1d781c2d6f033096a6e05762d20ebbad23c1b69b0083b0484722aabf35640b78ccc3de26368bcae1129c87e9df028a22e2
|
checksum: 0a64b9b9c7424d9a467658b18dd70d1d781c2d6f033096a6e05762d20ebbad23c1b69b0083b0484722aabf35640b78ccc3de26368bcae1129c87e9df028a22e2
|
||||||
@@ -14353,13 +14353,13 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"builder-util-runtime@npm:9.1.1":
|
"builder-util-runtime@npm:9.2.1":
|
||||||
version: 9.1.1
|
version: 9.2.1
|
||||||
resolution: "builder-util-runtime@npm:9.1.1"
|
resolution: "builder-util-runtime@npm:9.2.1"
|
||||||
dependencies:
|
dependencies:
|
||||||
debug: ^4.3.4
|
debug: ^4.3.4
|
||||||
sax: ^1.2.4
|
sax: ^1.2.4
|
||||||
checksum: 3458f9c8accad6e934c841cffa93f5d4b342c22b10b9c1a2eb3fd44ca96ea2c662b1048f9a075da9b8a4fada17206887b7e92ebdca331b1071520916e013e245
|
checksum: 6933e086b8ff9902cbd6d4c08d21d4a0437663ac849bc0939ec20a59cb2b084d7ab655c4dc2c71f854e77da152ff1f8e1240372665cb70e7b954afbfbf4d525a
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -16829,20 +16829,19 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"electron-updater@npm:^5.0.0":
|
"electron-updater@npm:^6.0.0":
|
||||||
version: 5.3.0
|
version: 6.1.3
|
||||||
resolution: "electron-updater@npm:5.3.0"
|
resolution: "electron-updater@npm:6.1.3"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@types/semver": ^7.3.6
|
builder-util-runtime: 9.2.1
|
||||||
builder-util-runtime: 9.1.1
|
fs-extra: ^10.1.0
|
||||||
fs-extra: ^10.0.0
|
|
||||||
js-yaml: ^4.1.0
|
js-yaml: ^4.1.0
|
||||||
lazy-val: ^1.0.5
|
lazy-val: ^1.0.5
|
||||||
lodash.escaperegexp: ^4.1.2
|
lodash.escaperegexp: ^4.1.2
|
||||||
lodash.isequal: ^4.5.0
|
lodash.isequal: ^4.5.0
|
||||||
semver: ^7.3.5
|
semver: ^7.3.8
|
||||||
typed-emitter: ^2.1.0
|
tiny-typed-emitter: ^2.1.0
|
||||||
checksum: 975381ffb0d9e17686f7f0b90739320922ca52d06ee548e89ceeb3b56bfc23180c20e7049e5c33ef789b228eb4c960c9886986e1332577866dca2437c315ed4e
|
checksum: 4c983783e24157b85816e868604f8091f6e9f79c45f227c430df5d57f35d3ed2ec17bf9433989d4bfc0a830312c9f1fed2f14d72ec0469d2d5b99447dda8400c
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -27550,15 +27549,6 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"rxjs@npm:*, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0, rxjs@npm:^7.8.1":
|
|
||||||
version: 7.8.1
|
|
||||||
resolution: "rxjs@npm:7.8.1"
|
|
||||||
dependencies:
|
|
||||||
tslib: ^2.1.0
|
|
||||||
checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
|
|
||||||
languageName: node
|
|
||||||
linkType: hard
|
|
||||||
|
|
||||||
"rxjs@npm:^6.6.3":
|
"rxjs@npm:^6.6.3":
|
||||||
version: 6.6.7
|
version: 6.6.7
|
||||||
resolution: "rxjs@npm:6.6.7"
|
resolution: "rxjs@npm:6.6.7"
|
||||||
@@ -27568,6 +27558,15 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
"rxjs@npm:^7.5.5, rxjs@npm:^7.8.0, rxjs@npm:^7.8.1":
|
||||||
|
version: 7.8.1
|
||||||
|
resolution: "rxjs@npm:7.8.1"
|
||||||
|
dependencies:
|
||||||
|
tslib: ^2.1.0
|
||||||
|
checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
|
||||||
|
languageName: node
|
||||||
|
linkType: hard
|
||||||
|
|
||||||
"safe-buffer@npm:5.1.1":
|
"safe-buffer@npm:5.1.1":
|
||||||
version: 5.1.1
|
version: 5.1.1
|
||||||
resolution: "safe-buffer@npm:5.1.1"
|
resolution: "safe-buffer@npm:5.1.1"
|
||||||
@@ -29269,6 +29268,13 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
"tiny-typed-emitter@npm:^2.1.0":
|
||||||
|
version: 2.1.0
|
||||||
|
resolution: "tiny-typed-emitter@npm:2.1.0"
|
||||||
|
checksum: 709bca410054e08df4dc29d5ea0916328bb2900d60245c6a743068ea223887d9fd2c945b6070eb20336275a557a36c2808e5c87d2ed4b60633458632be4a3e10
|
||||||
|
languageName: node
|
||||||
|
linkType: hard
|
||||||
|
|
||||||
"tinybench@npm:^2.5.0":
|
"tinybench@npm:^2.5.0":
|
||||||
version: 2.5.0
|
version: 2.5.0
|
||||||
resolution: "tinybench@npm:2.5.0"
|
resolution: "tinybench@npm:2.5.0"
|
||||||
@@ -29721,18 +29727,6 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"typed-emitter@npm:^2.1.0":
|
|
||||||
version: 2.1.0
|
|
||||||
resolution: "typed-emitter@npm:2.1.0"
|
|
||||||
dependencies:
|
|
||||||
rxjs: "*"
|
|
||||||
dependenciesMeta:
|
|
||||||
rxjs:
|
|
||||||
optional: true
|
|
||||||
checksum: 95821a9e05784b972cc9d152891fd12a56cb4b1a7c57e768c02bea6a8984da7aff8f19404a7b69eea11fae2a3b6c0c510a4c510f575f50162c759ae9059f2520
|
|
||||||
languageName: node
|
|
||||||
linkType: hard
|
|
||||||
|
|
||||||
"typedarray-to-buffer@npm:^3.1.5":
|
"typedarray-to-buffer@npm:^3.1.5":
|
||||||
version: 3.1.5
|
version: 3.1.5
|
||||||
resolution: "typedarray-to-buffer@npm:3.1.5"
|
resolution: "typedarray-to-buffer@npm:3.1.5"
|
||||||
|
|||||||
Reference in New Issue
Block a user