実装：MinimumEngineManifest格納時の検証をZodで行う

src/background/engineManager.ts

@@ -14,6 +14,7 @@ import {
   ElectronStoreType,
   EngineDirValidationResult,
   MinimumEngineManifest,
+  minimumEngineManifest,
 } from "@/type/preload";
 
 import log from "electron-log";
@@ -94,8 +95,8 @@ export class EngineManager {
       }
       let manifest: MinimumEngineManifest;
       try {
-        manifest = JSON.parse(
-          fs.readFileSync(manifestPath, { encoding: "utf8" })
+        manifest = minimumEngineManifest.parse(
+          JSON.parse(fs.readFileSync(manifestPath, { encoding: "utf8" }))
         );
       } catch (e) {
         return "manifestParseError";
@@ -447,19 +448,11 @@ export class EngineManager {
     );
     let manifestContent: MinimumEngineManifest;
     try {
-      manifestContent = JSON.parse(manifest);
+      manifestContent = minimumEngineManifest.parse(JSON.parse(manifest));
     } catch (e) {
       return "invalidManifest";
     }
 
-    if (
-      ["name", "uuid", "port", "command", "icon"].some(
-        (key) => !(key in manifestContent)
-      )
-    ) {
-      return "invalidManifest";
-    }
-
     const engineInfos = this.fetchEngineInfos();
     if (
       engineInfos.some((engineInfo) => engineInfo.uuid === manifestContent.uuid)

src/background/vvppManager.ts

@@ -4,7 +4,11 @@ import log from "electron-log";
 import { moveFile } from "move-file";
 import { Extract } from "unzipper";
 import { dialog } from "electron";
-import { EngineInfo, MinimumEngineManifest } from "@/type/preload";
+import {
+  EngineInfo,
+  minimumEngineManifest,
+  MinimumEngineManifest,
+} from "@/type/preload";
 import MultiStream from "multistream";
 import glob, { glob as callbackGlob } from "glob";
 
@@ -147,13 +151,14 @@ export class VvppManager {
         .on("close", resolve)
         .on("error", reject);
     });
-    // FIXME: バリデーションをかけるか、`validateEngineDir`で検査する
-    const manifest = JSON.parse(
-      await fs.promises.readFile(
-        path.join(outputDir, "engine_manifest.json"),
-        "utf-8"
+    const manifest: MinimumEngineManifest = minimumEngineManifest.parse(
+      JSON.parse(
+        await fs.promises.readFile(
+          path.join(outputDir, "engine_manifest.json"),
+          "utf-8"
+        )
       )
-    ) as MinimumEngineManifest;
+    );
     return {
       outputDir,
       manifest,

src/type/preload.ts

@@ -1,6 +1,7 @@
 import { IpcRenderer, IpcRendererEvent, nativeTheme } from "electron";
 import { IpcSOData } from "./ipc";
 import { z } from "zod";
+import { EngineManifest } from "@/openapi";
 
 export const isMac = process.platform === "darwin";
 // ホットキーを追加したときは設定のマイグレーションが必要
@@ -280,12 +281,23 @@ export type DefaultStyleId = {
   defaultStyleId: number;
 };
 
-export type MinimumEngineManifest = {
-  name: string;
-  uuid: string;
-  command: string;
-  port: string;
-};
+export const supportedFeaturesItemSchema = z.object({
+  type: z.string(),
+  value: z.boolean(),
+  name: z.string(),
+});
+
+export const minimumEngineManifest = z
+  .object({
+    name: z.string(),
+    uuid: z.string(),
+    command: z.string(),
+    port: z.number(),
+    supported_features: z.record(z.string(), supportedFeaturesItemSchema), // FIXME:JSON側はsnake_caseなので合わせているが、camelCaseに修正する
+  })
+  .passthrough();
+
+export type MinimumEngineManifest = z.infer<typeof minimumEngineManifest>;
 
 export type EngineInfo = {
   uuid: string;