Skip gitlab barrier when looking for launcher pre-releases (for now at least... could decide to add support for it to the gitlab).

Updater: Terminate the previous launcher process earlier, since leaving it alive is no longer useful. Delete legacy update exe if found.

Author: ConnorForan

include/shared/launcher_update_checker.h

@@ -42,17 +42,17 @@ namespace Shared {
 	public:
 		/* Check if an update of the launcher is available.
 		 *
-		 *   allowDrafts indicates if a prerelease is considered a valid update.
+		 *   allowPreRelease indicates if a prerelease is considered a valid update.
 		 *   force causes the function to pick the first available release,
-		 * regardless of allowDrafts and regardless of whether said release is
+		 * regardless of allowPreRelease and regardless of whether said release is
 		 * new than the current one.
 		 *   version receives the name of new available version, if any.
 		 *   url receives the url to download the newest available version, if any.
 		 *
 		 * Return true if an update is available, false otherwise. false is
 		 * also returned on error.
 		 */
-		bool IsSelfUpdateAvailable(bool allowDrafts, bool force,
+		bool IsSelfUpdateAvailable(bool allowPreRelease, bool force,
 			std::string& version, std::string& url, curl::DownloadStringResult& fetchReleaseResult, SteamLauncherUpdateStatus& steamUpdateStatus);
 
 		/* Select the target release for a self update.
@@ -61,17 +61,17 @@ namespace Shared {
 		 * the releases and pick the first valid one depending on whether it is
 		 * a prerelease or not, and whether it is newer than the currently
 		 * installed release. This can be controlled through the two
-		 * parameters allowDrafts and force.
+		 * parameters allowPreRelease and force.
 		 *
-		 *   allowDrafts indicates if a prerelease is considered a valid update.
+		 *   allowPreRelease indicates if a prerelease is considered a valid update.
 		 *   force causes the function to pick the first available release,
-		 * regardless of allowDrafts and regardless of wheter said release
+		 * regardless of allowPreRelease and regardless of wheter said release
 		 * if newer than the current one.
 		 *
 		 * The function returns an extended error code that can designate
 		 * multiple points of failure in the entire process.
 		 */
-		SelfUpdateErrorCode SelectReleaseTarget(bool allowDrafts, bool force);
+		SelfUpdateErrorCode SelectReleaseTarget(bool allowPreRelease, bool force);
 
 	private:
 		rapidjson::Document _releasesInfo;

self_updater/self_updater.cpp

@@ -35,6 +35,7 @@ namespace Updater {
 	// The old renamed exe will be deleted the next time the updater runs.
 	static const char* UpdaterExeFilename = "REPENTOGONLauncher.exe";
 	static const char* RenamedUpdaterExeFilename = "REPENTOGONLauncher.exe.bak";
+	static const char* LegacyUpdaterExeFilename = "REPENTOGONLauncherUpdater.exe";
 
 	static const char* LauncherDataFolder = "launcher-data";
 	static const char* LauncherDataBackupFolder = "launcher-data.old";
@@ -276,8 +277,6 @@ void Updater::ProgressBarThread(POINT windowPos) {
 Updater::UpdateLauncherResult Updater::TryUpdateLauncher(int argc, char** argv, HWND mainWindow) {
 	Logger::Info("TryUpdateLauncher started.\n");
 
-	// Open a handle for the active launcher process, if provided by the launcher itself.
-	HANDLE launcherHandle = TryOpenLauncherProcessHandle(argc, argv);
 	// Validate that no other instance of the updater is running.
 	HANDLE lockFile = NULL;
 
@@ -311,6 +310,12 @@ Updater::UpdateLauncherResult Updater::TryUpdateLauncher(int argc, char** argv,
 
 	SetCurrentUpdaterState(UPDATER_CHECKING_FOR_UPDATE);
 
+	// Delete the legacy updater exe, if it exists.
+	if (std::filesystem::exists(LegacyUpdaterExeFilename)) {
+		Logger::Info("Deleting legacy updater exe...\n");
+		std::filesystem::remove(LegacyUpdaterExeFilename);
+	}
+
 	// If the version backup folder exists, and an unfinished/broken update is detected, attempt to roll back.
 	if (std::filesystem::exists(LauncherDataBackupFolder) && (std::filesystem::exists(UnfinishedUpdateMarker) || !std::filesystem::exists(LauncherDllPath))) {
 		Logger::Error("Detected failed update!\n");
@@ -443,19 +448,6 @@ Updater::UpdateLauncherResult Updater::TryUpdateLauncher(int argc, char** argv,
 
 	SetCurrentUpdaterState(UPDATER_DOWNLOADING_UPDATE);
 
-	// If we opened a launcher process handle, terminate it now.
-	if (launcherHandle != INVALID_HANDLE_VALUE) {
-		Logger::Info("Terminating launcher...\n");
-		if (TerminateProcess(launcherHandle, 0)) {
-			WaitForSingleObject(launcherHandle, INFINITE);
-		}
-		else {
-			// We continue on after this error since we'll notice if the launcher exe is locked and prompt the user about it then.
-			Logger::Error("Failed to terminate launcher process (%d)\n", GetLastError());
-		}
-		CloseHandle(launcherHandle);
-	}
-
 	Logger::Info("Starting update download from %s\n", url.c_str());
 
 	std::string updateZipFilename;
@@ -623,6 +615,18 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR cli, int) {
 	int argc = 0;
 	char** argv = Updater::Utils::CommandLineToArgvA(cli, &argc);
 
+	// Open a handle for the prior launcher process, if provided, and kill it.
+	if (HANDLE launcherHandle = Updater::TryOpenLauncherProcessHandle(argc, argv); launcherHandle != INVALID_HANDLE_VALUE) {
+		Logger::Info("Restart detected. Terminating previous launcher instance...\n");
+		if (TerminateProcess(launcherHandle, 0)) {
+			WaitForSingleObject(launcherHandle, INFINITE);
+		} else {
+			// We can continue on after this and hope for the best.
+			Logger::Error("Failed to terminate launcher process (%d)\n", GetLastError());
+		}
+		CloseHandle(launcherHandle);
+	}
+
 	sGithubExecutor->Start();
 
 	// Create a dummy window to use as a parent for popups.

shared/launcher_update_checker.cpp

@@ -43,16 +43,16 @@ namespace Shared {
 		return true;
 	}
 
-	bool SelectTargetRelease(rapidjson::Document const& releases, bool allowPre,
+	bool SelectTargetRelease(rapidjson::Document const& releases, bool allowPreRelease,
 		bool force, std::string& version, std::string& url);
 
-	bool LauncherUpdateChecker::IsSelfUpdateAvailable(bool allowDrafts, bool force,
+	bool LauncherUpdateChecker::IsSelfUpdateAvailable(bool allowPreRelease, bool force,
 		std::string& version, std::string& url, curl::DownloadStringResult& fetchReleasesResult, SteamLauncherUpdateStatus& steamUpdateStatus) {
 
 		steamUpdateStatus = STEAM_LAUNCHER_UPDATE_NOT_USED;
 
 		//GitLab Barrier
-		if (!force && !ShouldDoTimeBasedGitLabSkip()) {
+		if (!force && !allowPreRelease && !ShouldDoTimeBasedGitLabSkip()) {
 			if (RemoteGitLabVersionMatches("versionlauncher", Launcher::LAUNCHER_VERSION)) {
 				fetchReleasesResult = curl::DownloadStringResult::DOWNLOAD_STRING_OK; //I would call this up a level so I dont have to do this hacky, but here is more convenient because I have some things already pre-chewed
 				return false;
@@ -97,10 +97,10 @@ namespace Shared {
 		}
 
 		_hasRelease = true;
-		return SelectTargetRelease(_releasesInfo, allowDrafts, force, version, url) && strcmp(::Launcher::LAUNCHER_VERSION, version.c_str());
+		return SelectTargetRelease(_releasesInfo, allowPreRelease, force, version, url) && strcmp(::Launcher::LAUNCHER_VERSION, version.c_str());
 	}
 
-	bool SelectTargetRelease(rapidjson::Document const& releases, bool allowPre,
+	bool SelectTargetRelease(rapidjson::Document const& releases, bool allowPreRelease,
 		bool, std::string& version, std::string& url) {
 		if (!releases.IsArray()) {
 			rapidjson::StringBuffer buffer;
@@ -112,7 +112,7 @@ namespace Shared {
 
 		auto releaseArray = releases.GetArray();
 		for (auto const& release : releaseArray) {
-			if (!release["prerelease"].IsTrue() || allowPre) {
+			if (!release["prerelease"].IsTrue() || allowPreRelease) {
 				version = release["name"].GetString();
 				url = release["url"].GetString();
 				return true;

src/app.cpp

@@ -148,7 +148,7 @@ bool Launcher::App::OnInit() {
 
 	if (sCLI->CheckSelfUpdate()) {
 		Logger::Info("Self-update startup check requested...\n");
-		HandleSelfUpdate(_mainFrame, sCLI->UnstableLauncher(), false);
+		HandleSelfUpdate(_mainFrame, sCLI->UnstableLauncher(), true);
 	}
 
 	LauncherConfigurationInitialize initializationResult;