Desktop: Resolves #8467: Auto-update to ARM64 version on Apple M1 hardware

.eslintignore

@@ -368,6 +368,7 @@ packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/tools/notarizeMacApp.js
 packages/app-desktop/utils/checkForUpdatesUtils.test.js
 packages/app-desktop/utils/checkForUpdatesUtils.js
+packages/app-desktop/utils/checkForUpdatesUtilsTestData.js
 packages/app-desktop/utils/markupLanguageUtils.js
 packages/app-mobile/PluginAssetsLoader.js
 packages/app-mobile/components/ActionButton.js

.gitignore

@@ -353,6 +353,7 @@ packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/tools/notarizeMacApp.js
 packages/app-desktop/utils/checkForUpdatesUtils.test.js
 packages/app-desktop/utils/checkForUpdatesUtils.js
+packages/app-desktop/utils/checkForUpdatesUtilsTestData.js
 packages/app-desktop/utils/markupLanguageUtils.js
 packages/app-mobile/PluginAssetsLoader.js
 packages/app-mobile/components/ActionButton.js

packages/app-desktop/checkForUpdates.ts

@@ -77,7 +77,7 @@ export default async function checkForUpdates(inBackground: boolean, parentWindo
 
 	try {
 		const releases = await fetchLatestRelease();
-		const release = extractVersionInfo(releases, process.platform, options);
+		const release = extractVersionInfo(releases, process.platform, process.arch, shim.isPortable(), options);
 
 		logger.info(`Current version: ${packageInfo.version}`);
 		logger.info(`Latest version: ${release.version}`);

packages/app-desktop/utils/checkForUpdatesUtils.ts

@@ -1,22 +1,23 @@
 import { fileExtension } from '@joplin/lib/path-utils';
-import shim from '@joplin/lib/shim';
 
 export interface CheckForUpdateOptions {
 	includePreReleases?: boolean;
 }
 
+interface GitHubReleaseAsset {
+	name: string;
+	browser_download_url: string;
+}
+
 export interface GitHubRelease {
 	tag_name: string;
 	prerelease: boolean;
 	body: string;
-	assets: {
+	assets: GitHubReleaseAsset[];
-		name: string;
-		browser_download_url: string;
-	}[];
 	html_url: string;
 }
 
-interface Release {
+export interface Release {
 	version: string;
 	prerelease: boolean;
 	downloadUrl: string;
@@ -24,13 +25,17 @@ interface Release {
 	pageUrl: string;
 }
 
+export type Platform = typeof process.platform;
+
+export type Architecture = typeof process.arch;
+
 function getMajorMinorTagName(tagName: string) {
 	const s = tagName.split('.');
 	s.pop();
 	return s.join('.');
 }
 
-export const extractVersionInfo = (releases: GitHubRelease[], platform: typeof process.platform, options: CheckForUpdateOptions) => {
+export const extractVersionInfo = (releases: GitHubRelease[], platform: Platform, arch: Architecture, portable: boolean, options: CheckForUpdateOptions) => {
 	options = { includePreReleases: false, ...options };
 
 	if (!releases.length) throw new Error('Cannot get latest release info (JSON)');
@@ -67,28 +72,43 @@ export const extractVersionInfo = (releases: GitHubRelease[], platform: typeof p
 		}
 	}
 
-	let downloadUrl = null;
+	let foundAsset: GitHubReleaseAsset = null;
-	for (let i = 0; i < release.assets.length; i++) {
-		const asset = release.assets[i];
-		let found = false;
-		const ext = fileExtension(asset.name);
-		if (platform === 'win32' && ext === 'exe') {
-			if (shim.isPortable()) {
-				found = asset.name === 'JoplinPortable.exe';
-			} else {
-				found = !!asset.name.match(/^Joplin-Setup-[\d.]+\.exe$/);
-			}
-		} else if (platform === 'darwin' && ext === 'dmg' && !asset.name.endsWith('arm64.dmg')) { // We don't return the arm64 version for now
-			found = true;
-		} else if (platform === 'linux' && ext === '.AppImage') {
-			found = true;
-		}
 
-		if (found) {
+	if (platform === 'win32' && portable) {
-			downloadUrl = asset.browser_download_url.replace('github.com/laurent22/joplin/releases/download', 'objects.joplinusercontent.com');
+		foundAsset = release.assets.find(asset => {
-			downloadUrl.concat('?source=DesktopApp&type=Update');
+			return asset.name === 'JoplinPortable.exe';
-			break;
+		});
-		}
+	}
+
+	if (!foundAsset && platform === 'win32') {
+		foundAsset = release.assets.find(asset => {
+			return !!asset.name.match(/^Joplin-Setup-[\d.]+\.exe$/);
+		});
+	}
+
+	if (platform === 'darwin' && arch === 'arm64') {
+		foundAsset = release.assets.find(asset => {
+			return asset.name.endsWith('arm64.dmg');
+		});
+	}
+
+	if (!foundAsset && platform === 'darwin') {
+		foundAsset = release.assets.find(asset => {
+			return fileExtension(asset.name) === 'dmg' && !asset.name.endsWith('arm64.dmg');
+		});
+	}
+
+	if (platform === 'linux') {
+		foundAsset = release.assets.find(asset => {
+			return fileExtension(asset.name) === 'AppImage';
+		});
+	}
+
+	let downloadUrl: string = null;
+
+	if (foundAsset) {
+		downloadUrl = foundAsset.browser_download_url.replace('github.com/laurent22/joplin/releases/download', 'objects.joplinusercontent.com');
+		downloadUrl.concat('?source=DesktopApp&type=Update');
 	}
 
 	function cleanUpReleaseNotes(releaseNotes: string[]) {