Merge branch 'main' into feature/#2011

build/installer_linux.sh

@@ -95,9 +95,12 @@ elif command -v 7zr &> /dev/null; then
 elif command -v 7za &> /dev/null; then
     # CentOS/Fedora
     COMMAND_7Z=7za
+elif command -v 7zz &> /dev/null; then
+    # Official 7zip
+    COMMAND_7Z=7zz
 else
     cat << 'EOS' && exit 1
-[!] Command '7z', '7zr' or '7za' not found
+[!] Command '7z', '7zr', '7za' or '7zz' not found
 
 Required to extract compressed files
 
@@ -115,7 +118,7 @@ Or
     sudo yum install p7zip
 
 Arch Linux:
-    sudo pacman -S p7zip
+    sudo pacman -S 7zip
 
 MacOS:
     brew install p7zip

public/updateInfos.json

@@ -1,4 +1,11 @@
 [
+  {
+    "version": "0.22.4",
+    "descriptions": [
+      "ソング：トークエディタを開かないと保存できない問題を修正"
+    ],
+    "contributors": ["sigprogramming"]
+  },
   {
     "version": "0.22.3",
     "descriptions": ["キャラクター「ぞん子」を追加"],

src/backend/browser/fakePath.ts

@@ -3,7 +3,7 @@ import { uuid4 } from "@/helpers/random";
 
 const fakePathSchema = z
   .string()
-  .regex(/^<browser-dummy-[0-9a-f]+>-.+$/)
+  .regex(/^<browser-dummy-[-0-9a-f]+>-.+$/)
   .brand("FakePath");
 export type FakePath = z.infer<typeof fakePathSchema>;
 

src/backend/browser/fileImpl.ts

@@ -3,7 +3,7 @@ import { openDB } from "./browserConfig";
 import { createFakePath, FakePath, isFakePath } from "./fakePath";
 import { SandboxKey } from "@/type/preload";
 import { failure, success } from "@/type/result";
-import { createLogger } from "@/domain/frontend/log";
+import { createLogger } from "@/helpers/log";
 import { normalizeError } from "@/helpers/normalizeError";
 import path from "@/helpers/path";
 import { ExhaustiveError } from "@/type/utility";

src/backend/electron/engineAndVvppController.ts

@@ -1,7 +1,6 @@
 import path from "path";
 import fs from "fs";
 import { ReadableStream } from "node:stream/web";
-import log from "electron-log/main";
 import { dialog } from "electron";
 
 import { getConfigManager } from "./electronConfig";
@@ -24,6 +23,9 @@ import {
 } from "@/domain/defaultEngine/latetDefaultEngine";
 import { loadEnvEngineInfos } from "@/domain/defaultEngine/envEngineInfo";
 import { UnreachableError } from "@/type/utility";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("EngineAndVvppController");
 
 /**
  * エンジンとVVPP周りの処理の流れを制御するクラス。

src/backend/electron/fileHelper.ts

@@ -1,7 +1,9 @@
 import fs from "fs";
-import log from "electron-log/main";
 import { moveFileSync } from "move-file";
 import { uuid4 } from "@/helpers/random";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("fileHelper");
 
 /**
  * 書き込みに失敗したときにファイルが消えないように、

src/backend/electron/ipc.ts

@@ -4,8 +4,10 @@ import {
   IpcMainInvokeEvent,
   IpcRendererEvent,
 } from "electron";
-import log from "electron-log/main";
 import { IpcIHData, IpcSOData } from "@/type/ipc";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("ipc");
 
 export type IpcRendererInvoke = {
   [K in keyof IpcIHData]: (

src/backend/electron/main.ts

@@ -7,7 +7,7 @@ import { pathToFileURL } from "url";
 import { app, dialog, Menu, nativeTheme, net, protocol, shell } from "electron";
 import installExtension, { VUEJS_DEVTOOLS } from "electron-devtools-installer";
 
-import log from "electron-log/main";
+import electronLog from "electron-log/main";
 import dayjs from "dayjs";
 import { hasSupportedGpu } from "./device";
 import {
@@ -39,6 +39,7 @@ import {
   TextAsset,
 } from "@/type/preload";
 import { isMac } from "@/helpers/platform";
+import { createLogger } from "@/helpers/log";
 
 type SingleInstanceLockData = {
   filePath: string | undefined;
@@ -88,16 +89,18 @@ if (!isDevelopment) {
   configMigration014({ fixedUserDataDir, beforeUserDataDir }); // 以前のファイルがあれば持ってくる
 }
 
-log.initialize({ preload: false });
+electronLog.initialize({ preload: false });
 // silly以上のログをコンソールに出力
-log.transports.console.format = "[{h}:{i}:{s}.{ms}] [{level}] {text}";
-log.transports.console.level = "silly";
+electronLog.transports.console.format = "[{h}:{i}:{s}.{ms}] [{level}] {text}";
+electronLog.transports.console.level = "silly";
 
 // warn以上のログをファイルに出力
 const prefix = dayjs().format("YYYYMMDD_HHmmss");
-log.transports.file.format = "[{h}:{i}:{s}.{ms}] [{level}] {text}";
-log.transports.file.level = "warn";
-log.transports.file.fileName = `${prefix}_error.log`;
+electronLog.transports.file.format = "[{h}:{i}:{s}.{ms}] [{level}] {text}";
+electronLog.transports.file.level = "warn";
+electronLog.transports.file.fileName = `${prefix}_error.log`;
+
+const log = createLogger("main");
 
 if (errorForRemoveBeforeUserDataDir != undefined) {
   log.error(errorForRemoveBeforeUserDataDir);

src/backend/electron/manager/RuntimeInfoManager.ts

@@ -4,11 +4,13 @@
  */
 
 import AsyncLock from "async-lock";
-import log from "electron-log/main";
 import type { AltPortInfos } from "@/store/type";
 import { EngineId, EngineInfo } from "@/type/preload";
 import { writeFileSafely } from "@/backend/electron/fileHelper";
 import { createEngineUrl } from "@/domain/url";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("RuntimeInfoManager");
 
 /**
  * ランタイム情報書き出しに必要なEngineInfo

src/backend/electron/manager/engineInfoManager.ts

@@ -4,8 +4,6 @@ import shlex from "shlex";
 
 import { dialog } from "electron"; // FIXME: ここでelectronをimportするのは良くない
 
-import log from "electron-log/main";
-
 import { getConfigManager } from "../electronConfig";
 import {
   EngineInfo,
@@ -17,6 +15,9 @@ import {
 import { AltPortInfos } from "@/store/type";
 import { loadEnvEngineInfos } from "@/domain/defaultEngine/envEngineInfo";
 import { failure, Result, success } from "@/type/result";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("EngineInfoManager");
 
 /** 利用可能なエンジンの情報を管理するクラス */
 export class EngineInfoManager {
@@ -109,15 +110,15 @@ export class EngineInfoManager {
     for (const dirName of fs.readdirSync(this.vvppEngineDir)) {
       const engineDir = path.join(this.vvppEngineDir, dirName);
       if (!fs.statSync(engineDir).isDirectory()) {
-        log.log(`${engineDir} is not directory`);
+        log.info(`${engineDir} is not directory`);
         continue;
       }
       if (dirName === ".tmp") {
         continue;
       }
       const result = this.loadEngineInfo(engineDir, "vvpp");
       if (!result.ok) {
-        log.log(`Failed to load engine: ${result.code}, ${engineDir}`);
+        log.info(`Failed to load engine: ${result.code}, ${engineDir}`);
         continue;
       }
       engineInfos.push(result.value);
@@ -135,7 +136,7 @@ export class EngineInfoManager {
     for (const engineDir of configManager.get("registeredEngineDirs")) {
       const result = this.loadEngineInfo(engineDir, "path");
       if (!result.ok) {
-        log.log(`Failed to load engine: ${result.code}, ${engineDir}`);
+        log.error(`Failed to load engine: ${result.code}, ${engineDir}`);
         // 動かないエンジンは追加できないので削除
         // FIXME: エンジン管理UIで削除可能にする
         dialog.showErrorBox(

src/backend/electron/manager/engineProcessManager.ts

@@ -4,7 +4,6 @@ import treeKill from "tree-kill";
 
 import { app, dialog } from "electron"; // FIXME: ここでelectronをimportするのは良くない
 
-import log from "electron-log/main";
 import {
   findAltPort,
   getPidFromPort,
@@ -16,6 +15,9 @@ import {
 import { getConfigManager } from "../electronConfig";
 import { getEngineInfoManager } from "./engineInfoManager";
 import { EngineId, EngineInfo } from "@/type/preload";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("EngineProcessManager");
 
 type EngineProcessContainer = {
   willQuitEngine: boolean;

src/backend/electron/manager/vvppManager.ts

@@ -1,7 +1,6 @@
 import fs from "fs";
 import path from "path";
 import { spawn } from "child_process";
-import log from "electron-log/main";
 import { moveFile } from "move-file";
 import { app, dialog } from "electron";
 import MultiStream from "multistream";
@@ -15,6 +14,9 @@ import {
   MinimumEngineManifestType,
 } from "@/type/preload";
 import { errorToMessage } from "@/helpers/errorHelper";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("VvppManager");
 
 const isNotWin = process.platform !== "win32";
 
@@ -40,7 +42,7 @@ async function getArchiveFileParts(
   let archiveFileParts: string[];
   // 名前.数値.vvpppの場合は分割されているとみなして連結する
   if (vvppLikeFilePath.match(/\.[0-9]+\.vvppp$/)) {
-    log.log("vvpp is split, finding other parts...");
+    log.info("vvpp is split, finding other parts...");
     const vvpppPathGlob = vvppLikeFilePath
       .replace(/\.[0-9]+\.vvppp$/, ".*.vvppp")
       .replace(/\\/g, "/"); // node-globはバックスラッシュを使えないので、スラッシュに置換する
@@ -49,7 +51,7 @@ async function getArchiveFileParts(
       if (!p.match(/\.[0-9]+\.vvppp$/)) {
         continue;
       }
-      log.log(`found ${p}`);
+      log.info(`found ${p}`);
       filePaths.push(p);
     }
     filePaths.sort((a, b) => {
@@ -62,7 +64,7 @@ async function getArchiveFileParts(
     });
     archiveFileParts = filePaths;
   } else {
-    log.log("Not a split file");
+    log.info("Not a split file");
     archiveFileParts = [vvppLikeFilePath];
   }
   return archiveFileParts;
@@ -75,12 +77,12 @@ async function concatenateVvppFiles(
 ) {
   // -siオプションでの7z解凍はサポートされていないため、
   // ファイルを連結した一次ファイルを作成し、それを7zで解凍する。
-  log.log(`Concatenating ${archiveFileParts.length} files...`);
+  log.info(`Concatenating ${archiveFileParts.length} files...`);
   const tmpConcatenatedFile = path.join(
     app.getPath("temp"),
     `vvpp-${new Date().getTime()}.${format}`,
   );
-  log.log("Temporary file:", tmpConcatenatedFile);
+  log.info("Temporary file:", tmpConcatenatedFile);
   await new Promise<void>((resolve, reject) => {
     if (!tmpConcatenatedFile) throw new Error("tmpFile is undefined");
     const inputStreams = archiveFileParts.map((f) => fs.createReadStream(f));
@@ -93,7 +95,7 @@ async function concatenateVvppFiles(
       })
       .on("error", reject);
   });
-  log.log("Concatenated");
+  log.info("Concatenated");
   return tmpConcatenatedFile;
 }
 
@@ -123,7 +125,7 @@ async function unarchive(
   if (import.meta.env.PROD) {
     sevenZipPath = path.join(path.dirname(app.getPath("exe")), sevenZipPath);
   }
-  log.log("Spawning 7z:", sevenZipPath, args.join(" "));
+  log.info("Spawning 7z:", sevenZipPath, args.join(" "));
   await new Promise<void>((resolve, reject) => {
     const child = spawn(sevenZipPath, args, {
       stdio: ["pipe", "pipe", "pipe"],
@@ -253,8 +255,8 @@ export class VvppManager {
     if (!format) {
       throw new Error(`Unknown file format: ${archiveFileParts[0]}`);
     }
-    log.log("Format:", format);
-    log.log("Extracting vvpp to", outputDir);
+    log.info("Format:", format);
+    log.info("Extracting vvpp to", outputDir);
     try {
       let tmpConcatenatedFile: string | undefined;
       let archiveFile: string;
@@ -267,13 +269,13 @@ export class VvppManager {
           archiveFile = tmpConcatenatedFile;
         } else {
           archiveFile = archiveFileParts[0];
-          log.log("Single file, not concatenating");
+          log.info("Single file, not concatenating");
         }
 
         await unarchive({ archiveFile, outputDir, format }, callbacks);
       } finally {
         if (tmpConcatenatedFile) {
-          log.log("Removing temporary file", tmpConcatenatedFile);
+          log.info("Removing temporary file", tmpConcatenatedFile);
           await fs.promises.rm(tmpConcatenatedFile);
         }
       }
@@ -292,7 +294,7 @@ export class VvppManager {
       };
     } catch (e) {
       if (fs.existsSync(outputDir)) {
-        log.log("Failed to extract vvpp, removing", outputDir);
+        log.info("Failed to extract vvpp, removing", outputDir);
         await fs.promises.rm(outputDir, { recursive: true });
       }
       throw e;

src/backend/electron/manager/windowManager.ts

@@ -9,13 +9,15 @@ import {
   OpenDialogSyncOptions,
   SaveDialogOptions,
 } from "electron";
-import log from "electron-log/main";
 import windowStateKeeper from "electron-window-state";
 import { getConfigManager } from "../electronConfig";
 import { getEngineAndVvppController } from "../engineAndVvppController";
 import { ipcMainSendProxy } from "../ipc";
 import { isMac } from "@/helpers/platform";
 import { themes } from "@/domain/theme";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("WindowManager");
 
 type WindowManagerOption = {
   appStateGetter: () => { willQuit: boolean };

src/backend/electron/portHelper.ts

@@ -1,6 +1,8 @@
 import { execFileSync } from "child_process";
 import { createServer } from "net";
-import log from "electron-log/main";
+import { createLogger } from "@/helpers/log";
+
+const log = createLogger("portHelper");
 
 const isWindows = process.platform === "win32";
 

src/components/Base/BaseListItem.vue

@@ -36,6 +36,7 @@ defineEmits<{
   border: none;
   padding: vars.$padding-1 vars.$padding-2;
   border-radius: vars.$radius-1;
+  text-align: left;
 
   &:not(.selected):hover {
     background-color: colors.$clear-hovered;