Merge remote-tracking branch 'upstream/main' into 指定されているVVPPがなかったら確認…

…後にインストールし、使えるようにするようにする
Hiroshiba · Oct 30, 2024 · e179306 · e179306
2 parents c9d4edf + e1304cc
commit e179306
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/backend/electron/engineAndVvppController.ts b/src/backend/electron/engineAndVvppController.ts
@@ -16,7 +16,7 @@ import {
 } from "@/type/preload";
 import {
   EnginePackage,
-  fetchDefaultEngineUpdateInfo,
+  fetchDefaultEngineInfos,
   getSuitablePackages,
 } from "@/domain/defaultEngine/latetDefaultEngine";
 import {
@@ -157,7 +157,7 @@ export class EngineAndVvppController {
       const latestUrl = envEngineInfo.latestUrl;
       if (latestUrl == undefined) throw new Error("latestUrl is undefined");
 
-      const updateInfo = await fetchDefaultEngineUpdateInfo(latestUrl);
+      const updateInfo = await fetchDefaultEngineInfos(latestUrl);
       if (updateInfo.formatVersion != 1) {
         log.error(`Unsupported format version: ${updateInfo.formatVersion}`);
         continue;

diff --git a/src/domain/defaultEngine/latetDefaultEngine.ts b/src/domain/defaultEngine/latetDefaultEngine.ts
@@ -44,7 +44,7 @@ const defaultEngineUpdateInfoSchema = z.object({
 });
 
 /** デフォルトエンジンの更新情報を取得する */
-export const fetchDefaultEngineUpdateInfo = async (url: string) => {
+export const fetchDefaultEngineInfos = async (url: string) => {
   const response = await fetch(url);
   return defaultEngineUpdateInfoSchema.parse(await response.json());
 };

diff --git a/tests/unit/domain/defaultEngine/defaultEngine.node.spec.ts b/tests/unit/domain/defaultEngine/defaultEngine.node.spec.ts
@@ -2,7 +2,7 @@
 
 import path from "path";
 import fs from "fs";
-import { fetchDefaultEngineUpdateInfo } from "@/domain/defaultEngine/latetDefaultEngine";
+import { fetchDefaultEngineInfos } from "@/domain/defaultEngine/latetDefaultEngine";
 
 const currentDir = "tests/unit/domain/defaultEngine";
 
@@ -14,7 +14,7 @@ test("fetchDefaultEngineInfo", async () => {
   const spy = vi.spyOn(global, "fetch").mockResolvedValue(new Response(json));
 
   // 読み込めることを確認
-  const infos = await fetchDefaultEngineUpdateInfo("https://example.com/");
+  const infos = await fetchDefaultEngineInfos("https://example.com/");
   expect(infos.formatVersion).toBe(1);
 
   spy.mockRestore();