A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
desktop: fix update check gives no feedback in ui
Abdullah Attaec83517dc5fd
diff --git a/apps/desktop/app-update.yml b/apps/desktop/app-update.ymlindex 6996f8654..3bc5dded1 100644--- a/apps/desktop/app-update.yml+++ b/apps/desktop/app-update.yml@@ -1,3 +1,4 @@owner: streetwritersrepo: notesnookprovider: github+updaterCacheDirName: "@notesnookdesktop-updater"\ No newline at end of filediff --git a/apps/desktop/package-lock.json b/apps/desktop/package-lock.jsonindex 38e78fe6d..7fb1e2788 100644--- a/apps/desktop/package-lock.json+++ b/apps/desktop/package-lock.json@@ -15,7 +15,7 @@"@trpc/server": "10.38.3","better-sqlite3-multiple-ciphers": "^9.5.0","electron-trpc": "0.5.2",- "electron-updater": "6.1.4",+ "electron-updater": "^6.2.1","icojs": "^0.17.1","sodium-native": "^4.1.1","typed-emitter": "^2.1.0",@@ -1120,19 +1120,6 @@"electron-builder-squirrel-windows": "24.13.3"}},- "node_modules/app-builder-lib/node_modules/builder-util-runtime": {- "version": "9.2.4",- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",- "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",- "dev": true,- "dependencies": {- "debug": "^4.3.4",- "sax": "^1.2.4"- },- "engines": {- "node": ">=12.0.0"- }- },"node_modules/archiver": {"version": "5.3.2","resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",@@ -1443,22 +1430,9 @@}},"node_modules/builder-util-runtime": {- "version": "9.2.1",- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz",- "integrity": "sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA==",- "dependencies": {- "debug": "^4.3.4",- "sax": "^1.2.4"- },- "engines": {- "node": ">=12.0.0"- }- },- "node_modules/builder-util/node_modules/builder-util-runtime": {"version": "9.2.4","resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz","integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",- "dev": true,"dependencies": {"debug": "^4.3.4","sax": "^1.2.4"@@ -1956,19 +1930,6 @@"dmg-license": "^1.0.11"}},- "node_modules/dmg-builder/node_modules/builder-util-runtime": {- "version": "9.2.4",- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",- "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",- "dev": true,- "dependencies": {- "debug": "^4.3.4",- "sax": "^1.2.4"- },- "engines": {- "node": ">=12.0.0"- }- },"node_modules/dmg-license": {"version": "1.0.11","resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",@@ -2086,19 +2047,6 @@"fs-extra": "^10.1.0"}},- "node_modules/electron-builder/node_modules/builder-util-runtime": {- "version": "9.2.4",- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",- "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",- "dev": true,- "dependencies": {- "debug": "^4.3.4",- "sax": "^1.2.4"- },- "engines": {- "node": ">=12.0.0"- }- },"node_modules/electron-publish": {"version": "24.13.1","resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz",@@ -2114,19 +2062,6 @@"mime": "^2.5.2"}},- "node_modules/electron-publish/node_modules/builder-util-runtime": {- "version": "9.2.4",- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",- "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",- "dev": true,- "dependencies": {- "debug": "^4.3.4",- "sax": "^1.2.4"- },- "engines": {- "node": ">=12.0.0"- }- },"node_modules/electron-trpc": {"version": "0.5.2","resolved": "https://registry.npmjs.org/electron-trpc/-/electron-trpc-0.5.2.tgz",@@ -2141,11 +2076,11 @@}},"node_modules/electron-updater": {- "version": "6.1.4",- "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz",- "integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==",+ "version": "6.2.1",+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",+ "integrity": "sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==","dependencies": {- "builder-util-runtime": "9.2.1",+ "builder-util-runtime": "9.2.4","fs-extra": "^10.1.0","js-yaml": "^4.1.0","lazy-val": "^1.0.5",diff --git a/apps/desktop/package.json b/apps/desktop/package.jsonindex e39bf2a78..35b5c0e5f 100644--- a/apps/desktop/package.json+++ b/apps/desktop/package.json@@ -16,7 +16,7 @@"@trpc/server": "10.38.3","better-sqlite3-multiple-ciphers": "^9.5.0","electron-trpc": "0.5.2",- "electron-updater": "6.1.4",+ "electron-updater": "^6.2.1","icojs": "^0.17.1","sodium-native": "^4.1.1","typed-emitter": "^2.1.0",diff --git a/apps/desktop/scripts/build.mjs b/apps/desktop/scripts/build.mjsindex 4ba01219e..60fb16098 100644--- a/apps/desktop/scripts/build.mjs+++ b/apps/desktop/scripts/build.mjs@@ -46,11 +46,11 @@ if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {// temporary until there's support for prebuilt binaries for linux ARMif (os.platform() === "linux") await patchBetterSQLite3();-if (os.platform() === "win32")- await exec(- `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,- path.join(__dirname, "..", "node_modules", "sodium-native")- );+// if (os.platform() === "win32")+// await exec(+// `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,+// path.join(__dirname, "..", "node_modules", "sodium-native")+// );await fs.cp(path.join(webAppPath, "build"), "build", {recursive: true,diff --git a/apps/desktop/src/api/updater.ts b/apps/desktop/src/api/updater.tsindex 7e37c24be..accd9d2a6 100644--- a/apps/desktop/src/api/updater.ts+++ b/apps/desktop/src/api/updater.ts@@ -61,7 +61,18 @@ export const updaterRouter = t.router({"update-not-available"),onAvailable: createSubscription<"update-available", UpdateInfo>(- "update-available"+ "update-available",+ () => {+ if (!config.automaticUpdates) return false;+ autoUpdater.emit("download-progress", {+ bytesPerSecond: 0,+ delta: 0,+ percent: 0,+ total: 100,+ transferred: 0+ });+ return true;+ }),onError: createSubscription("error")});@@ -69,10 +80,11 @@ export const updaterRouter = t.router({function createSubscription<TName extends keyof AppUpdaterEvents,TReturnType = Parameters<AppUpdaterEvents[TName]>[0]->(eventName: TName) {+>(eventName: TName, handler?: (args: TReturnType) => boolean) {return t.procedure.subscription(() => {return observable<TReturnType>((emit) => {const listener: AppUpdaterEvents[TName] = (...args: any[]) => {+ if (handler?.(args[0])) return;emit.next(args[0]);};autoUpdater.removeAllListeners(eventName);diff --git a/apps/desktop/src/utils/autoupdater.ts b/apps/desktop/src/utils/autoupdater.tsindex ce8cc2426..d4e167994 100644--- a/apps/desktop/src/utils/autoupdater.ts+++ b/apps/desktop/src/utils/autoupdater.ts@@ -35,6 +35,7 @@ async function configureAutoUpdater() {autoUpdater.allowDowngrade = false;autoUpdater.allowPrerelease = false;autoUpdater.autoInstallOnAppQuit = true;+ autoUpdater.disableWebInstaller = true;}export { configureAutoUpdater };diff --git a/apps/web/src/common/desktop-bridge/index.desktop.ts b/apps/web/src/common/desktop-bridge/index.desktop.tsindex 6b6d0fdcb..1774b76c4 100644--- a/apps/web/src/common/desktop-bridge/index.desktop.ts+++ b/apps/web/src/common/desktop-bridge/index.desktop.ts@@ -28,7 +28,10 @@ export const desktop = createTRPCProxyClient<AppRouter>({links: [ipcLink()]});-document.addEventListener("readystatechange", async () => {+attachListeners();+function attachListeners() {+ console.log("attaching listeners");+desktop.updater.onChecking.subscribe(undefined,attachListener(AppEvents.checkingForUpdate)@@ -62,7 +65,7 @@ document.addEventListener("readystatechange", async () => {TaskScheduler.register("updateCheck", "0 0 */12 * * * *", () => {checkForUpdate();});-});+}function attachListener(event: string) {return {