Fixed Update-Issues and Tests

open-goal · Dec 27, 2024 · 189f8e3 · 189f8e3
1 parent 33f50f5
commit 189f8e3
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 63 deletions.
diff --git a/src/components/header/Header.svelte b/src/components/header/Header.svelte
@@ -21,11 +21,11 @@
   import { toastStore } from "$lib/stores/ToastStore";
   const appWindow = getCurrentWebviewWindow();
 
-  let launcherVerison = null;
+  let launcherVersion: string | null = null;
 
   onMount(async () => {
     // Get current versions
-    launcherVerison = `v${await getVersion()}`;
+    launcherVersion = `v${await getVersion()}`;
 
     $VersionStore.activeVersionType = await getActiveVersionFolder();
     $VersionStore.activeVersionName = await getActiveVersion();
@@ -36,12 +36,12 @@
 
     if (!isInDebugMode()) {
       const updateResult = await check();
-      if (updateResult.shouldUpdate) {
+      if (updateResult) {
         let changeLog = [];
         try {
-          changeLog = JSON.parse(updateResult.manifest.body);
+          changeLog = JSON.parse(updateResult.body ?? "");
         } catch (e) {
-          exceptionLog(
+          await exceptionLog(
             `Could not parse changelog JSON from release metadata - ${JSON.stringify(
               updateResult,
             )}`,
@@ -50,19 +50,21 @@
         }
         $UpdateStore.launcher = {
           updateAvailable: true,
-          versionNumber: updateResult.manifest.version,
-          date: updateResult.manifest.date,
+          versionNumber: updateResult.version,
+          date: updateResult.date ?? "",
           changeLog: changeLog,
         };
-        infoLog(`Launcher Update Available`);
+        await infoLog(`Launcher Update Available`);
       } else {
         $UpdateStore.launcher = {
           updateAvailable: false,
-          versionNumber: null,
-          date: null,
+          versionNumber: "",
+          date: "",
           changeLog: [],
         };
-        infoLog(`Launcher is up to date - ${JSON.stringify(updateResult)}`);
+        await infoLog(
+          `Launcher is up to date - ${JSON.stringify(updateResult)}`,
+        );
       }
     }
 
@@ -125,7 +127,7 @@
     class="flex flex-col text-neutral-300 mr-2 pointer-events-none max-w-[250px]"
   >
     <p class="font-mono text-sm truncate-text">
-      {launcherVerison === null ? "not set!" : launcherVerison}
+      {launcherVersion === null ? "not set!" : launcherVersion}
     </p>
     <p class="font-mono text-sm truncate-text">
       {$VersionStore.activeVersionName === null

diff --git a/src/lib/stores/AppStore.ts b/src/lib/stores/AppStore.ts
@@ -3,12 +3,12 @@ import { writable } from "svelte/store";
 export const UpdateStore = writable({
   launcher: {
     updateAvailable: false,
-    versionNumber: undefined,
+    versionNumber: "",
     changeLog: [],
-    date: undefined,
+    date: "",
   },
   selectedTooling: {
     updateAvailable: false,
-    versionNumber: undefined,
+    versionNumber: "",
   },
 });
diff --git a/src/lib/utils/github.test.ts b/src/lib/utils/github.test.ts
@@ -1,7 +1,6 @@
 import {
   afterEach,
   beforeAll,
-  beforeEach,
   describe,
   expect,
   it,
@@ -13,7 +12,8 @@ import { listOfficialReleases } from "./github";
 import { init } from "svelte-i18n";
 import { initLocales } from "$lib/i18n/i18n";
 
-vi.mock("@tauri-apps/api/os");
+vi.mock("@tauri-apps/plugin-os");
+
 global.fetch = vi.fn();
 
 function createFetchResponse(data: any) {
@@ -25,7 +25,7 @@ function createFetchResponse(data: any) {
   };
 }
 
-function createFakeGithubReleaseAsset(assetName) {
+function createFakeGithubReleaseAsset(assetName: string) {
   return {
     url: "https://api.github.com/repos/open-goal/jak-project/releases/assets/115111791",
     id: 115111791,
@@ -148,8 +148,8 @@ describe("listOfficialReleases", () => {
   });
 
   it("should retrieve intel macOS releases properly", async () => {
-    vi.mocked(platform).mockResolvedValue("darwin");
-    vi.mocked(arch).mockResolvedValue("x86_64");
+    vi.mocked(platform).mockImplementation(() => "macos");
+    vi.mocked(arch).mockImplementation(() => "x86_64");
     (fetch as Mock).mockResolvedValue(
       createFetchResponse([
         createFakeGithubRelease([
@@ -162,13 +162,13 @@ describe("listOfficialReleases", () => {
     const releases = await listOfficialReleases();
     expect(releases.length).toBe(1);
     expect(
-      releases[0].downloadUrl.endsWith("opengoal-macos-intel-v0.0.1.tar.gz"),
+      releases[0].downloadUrl?.endsWith("opengoal-macos-intel-v0.0.1.tar.gz"),
     ).toBeTruthy();
   });
 
   it("should not retrieve macOS ARM releases", async () => {
-    vi.mocked(platform).mockResolvedValue("darwin");
-    vi.mocked(arch).mockResolvedValue("arm");
+    vi.mocked(platform).mockImplementation(() => "macos");
+    vi.mocked(arch).mockImplementation(() => "arm");
     (fetch as Mock).mockResolvedValue(
       createFetchResponse([
         createFakeGithubRelease([
@@ -184,8 +184,8 @@ describe("listOfficialReleases", () => {
   });
 
   it("should retrieve windows releases properly", async () => {
-    vi.mocked(platform).mockResolvedValue("win32");
-    vi.mocked(arch).mockResolvedValue("x86_64");
+    vi.mocked(platform).mockImplementation(() => "windows");
+    vi.mocked(arch).mockImplementation(() => "x86_64");
     (fetch as Mock).mockResolvedValue(
       createFetchResponse([
         createFakeGithubRelease([
@@ -198,13 +198,13 @@ describe("listOfficialReleases", () => {
     const releases = await listOfficialReleases();
     expect(releases.length).toBe(1);
     expect(
-      releases[0].downloadUrl.endsWith("opengoal-windows-v0.0.1.zip"),
+      releases[0].downloadUrl?.endsWith("opengoal-windows-v0.0.1.zip"),
     ).toBeTruthy();
   });
 
   it("should retrieve linux releases properly", async () => {
-    vi.mocked(platform).mockResolvedValue("linux");
-    vi.mocked(arch).mockResolvedValue("x86_64");
+    vi.mocked(platform).mockImplementation(() => "linux");
+    vi.mocked(arch).mockImplementation(() => "x86_64");
     (fetch as Mock).mockResolvedValue(
       createFetchResponse([
         createFakeGithubRelease([
@@ -217,7 +217,7 @@ describe("listOfficialReleases", () => {
     const releases = await listOfficialReleases();
     expect(releases.length).toBe(1);
     expect(
-      releases[0].downloadUrl.endsWith("opengoal-linux-v0.0.1.tar.gz"),
+      releases[0].downloadUrl?.endsWith("opengoal-linux-v0.0.1.tar.gz"),
     ).toBeTruthy();
   });
 });
@@ -229,8 +229,8 @@ describe("getLatestOfficialRelease", () => {
   });
 
   it("should retrieve intel macOS releases properly", async () => {
-    vi.mocked(platform).mockResolvedValue("darwin");
-    vi.mocked(arch).mockResolvedValue("x86_64");
+    vi.mocked(platform).mockImplementation(() => "macos");
+    vi.mocked(arch).mockImplementation(() => "x86_64");
     (fetch as Mock).mockResolvedValue(
       createFetchResponse([
         createFakeGithubRelease([
@@ -243,13 +243,13 @@ describe("getLatestOfficialRelease", () => {
     const releases = await listOfficialReleases();
     expect(releases.length).toBe(1);
     expect(
-      releases[0].downloadUrl.endsWith("opengoal-macos-intel-v0.0.1.tar.gz"),
+      releases[0].downloadUrl?.endsWith("opengoal-macos-intel-v0.0.1.tar.gz"),
     ).toBeTruthy();
   });
 
   it("should not retrieve macOS ARM releases", async () => {
-    vi.mocked(platform).mockResolvedValue("darwin");
-    vi.mocked(arch).mockResolvedValue("arm");
+    vi.mocked(platform).mockImplementation(() => "macos");
+    vi.mocked(arch).mockImplementation(() => "arm");
     (fetch as Mock).mockResolvedValue(
       createFetchResponse([
         createFakeGithubRelease([
@@ -265,8 +265,8 @@ describe("getLatestOfficialRelease", () => {
   });
 
   it("should retrieve windows releases properly", async () => {
-    vi.mocked(platform).mockResolvedValue("win32");
-    vi.mocked(arch).mockResolvedValue("x86_64");
+    vi.mocked(platform).mockImplementation(() => "windows");
+    vi.mocked(arch).mockImplementation(() => "x86_64");
     (fetch as Mock).mockResolvedValue(
       createFetchResponse([
         createFakeGithubRelease([
@@ -279,13 +279,13 @@ describe("getLatestOfficialRelease", () => {
     const releases = await listOfficialReleases();
     expect(releases.length).toBe(1);
     expect(
-      releases[0].downloadUrl.endsWith("opengoal-windows-v0.0.1.zip"),
+      releases[0].downloadUrl?.endsWith("opengoal-windows-v0.0.1.zip"),
     ).toBeTruthy();
   });
 
   it("should retrieve linux releases properly", async () => {
-    vi.mocked(platform).mockResolvedValue("linux");
-    vi.mocked(arch).mockResolvedValue("x86_64");
+    vi.mocked(platform).mockImplementation(() => "linux");
+    vi.mocked(arch).mockImplementation(() => "x86_64");
     (fetch as Mock).mockResolvedValue(
       createFetchResponse([
         createFakeGithubRelease([
@@ -298,7 +298,7 @@ describe("getLatestOfficialRelease", () => {
     const releases = await listOfficialReleases();
     expect(releases.length).toBe(1);
     expect(
-      releases[0].downloadUrl.endsWith("opengoal-linux-v0.0.1.tar.gz"),
+      releases[0].downloadUrl?.endsWith("opengoal-linux-v0.0.1.tar.gz"),
     ).toBeTruthy();
   });
 });
diff --git a/src/lib/utils/github.ts b/src/lib/utils/github.ts
@@ -21,8 +21,9 @@ function isIntelMacOsRelease(
   architecture: string,
   assetName: string,
 ): boolean {
+  console.log(platform, architecture, assetName);
   return (
-    platform === "darwin" &&
+    platform === "macos" &&
     architecture === "x86_64" &&
     assetName.startsWith("opengoal-macos-intel-v")
   );
@@ -33,22 +34,32 @@ function isWindowsRelease(
   architecture: string,
   assetName: string,
 ): boolean {
-  return platform === "win32" && assetName.startsWith("opengoal-windows-v");
+  return (
+    platform === "windows" &&
+    architecture === "x86_64" &&
+    assetName.startsWith("opengoal-windows-v")
+  );
 }
 
 function isLinuxRelease(
   platform: string,
   architecture: string,
   assetName: string,
 ): boolean {
-  return platform === "linux" && assetName.startsWith("opengoal-linux-v");
+  //TODO: Why testing like this?
+  // Why not assetName.startsWith('opengoal-{platform}-{arch}-...')
+  return (
+    platform === "linux" &&
+    architecture === "x86_64" &&
+    assetName.startsWith("opengoal-linux-v")
+  );
 }
 
 async function getDownloadLinkForCurrentPlatform(
   release: any,
 ): Promise<string | undefined> {
-  const platformName = await platform();
-  const archName = await arch();
+  const platformName = platform();
+  const archName = arch();
   for (const asset of release.assets) {
     if (isIntelMacOsRelease(platformName, archName, asset.name)) {
       return asset.browser_download_url;
@@ -87,14 +98,13 @@ async function parseGithubRelease(githubRelease: any): Promise<ReleaseInfo> {
       releaseInfo.invalidationReasons = ["Release invalid for unknown reasons"];
     }
   }
-
   return releaseInfo;
 }
 
 export async function listOfficialReleases(): Promise<ReleaseInfo[]> {
   const nextUrlPattern = /<([\S]+)>; rel="Next"/i;
   let releases = [];
-  let urlToHit =
+  let urlToHit: string | undefined =
     "https://api.github.com/repos/open-goal/jak-project/releases?per_page=100";
 
   while (urlToHit !== undefined) {
@@ -112,18 +122,17 @@ export async function listOfficialReleases(): Promise<ReleaseInfo[]> {
       releases.push(await parseGithubRelease(release));
     }
 
-    if (
-      resp.headers.has("link") &&
-      resp.headers.get("link").includes(`rel=\"next\"`)
-    ) {
-      // we must paginate!
-      urlToHit = resp.headers.get("link").match(nextUrlPattern)[1];
-    } else {
-      urlToHit = undefined;
-    }
+    urlToHit = resp.headers.get("link")?.includes(`rel="next"`)
+      ? resp.headers.get("link")!.match(nextUrlPattern)?.[1]
+      : undefined;
   }
 
-  return releases.sort((a, b) => b.date.localeCompare(a.date));
+  return releases.sort((a, b) => {
+    if (!a.date && !b.date) return 0;
+    if (!a.date) return 1;
+    if (!b.date) return -1;
+    return b.date.localeCompare(a.date);
+  });
 }
 
 export async function getLatestOfficialRelease(): Promise<

diff --git a/src/routes/Update.svelte b/src/routes/Update.svelte
@@ -62,12 +62,8 @@
         on:click={() => (showChanges = !showChanges)}
         >{$_("update_button_viewChangelog")}</Button
       >
-      <Toggle
-        checked={showDependencyChanges}
-        color="orange"
-        on:change={(evt) => {
-          showDependencyChanges = evt.target.checked;
-        }}>{$_("update_button_hideDependencyChanges")}</Toggle
+      <Toggle color="orange" bind:checked={showDependencyChanges}
+        >{$_("update_button_hideDependencyChanges")}</Toggle
       >
     </div>
     {#if showChanges}