Slightly improved handling of character selection

Author: daydreamer-json

src/cmd.ts

@@ -268,6 +268,7 @@ async function parseCommand() {
     .usage('$0 <command> [argument] [option]')
     .help()
     .alias('help', 'h')
+    .alias('help', '?')
     .alias('version', 'V')
     .demandCommand(1)
     .strict()

src/utils/audioGenerate.ts

@@ -140,30 +140,33 @@ async function askToUserCharaId(
       .filter((el) => el[1])
       .map((el) => el[0]);
     const selectedCharaArray: number[] = [];
-    const questionBuilder = async (position: string) => {
+    const questionBuilder = async (position: string, canBack: boolean = false) => {
       return (
         await prompts({
           type: 'select',
           name: 'value',
           message: `Select singing chara for '${position}' position`,
-          choices: liveCanUseCharaArray
-            // .filter((entry) => selectedCharaArray.includes(entry) === false) // to eliminate duplicates
-            .map((entry) => ({
-              title:
-                entry +
-                ': ' +
-                db.masterDb.text_data.find(
-                  (texEntry: any) => texEntry.id === 6 && texEntry.category === 6 && texEntry.index === entry,
-                ).text,
-              description:
-                'CV: ' +
-                db.masterDb.text_data.find(
-                  (texEntry: any) => texEntry.id === 7 && texEntry.category === 7 && texEntry.index === entry,
-                ).text,
-              value: entry,
-              disabled: false,
-              selected: false,
-            })),
+          choices: [
+            ...liveCanUseCharaArray
+              // .filter((entry) => selectedCharaArray.includes(entry) === false) // to eliminate duplicates
+              .map((entry) => ({
+                title:
+                  entry +
+                  ': ' +
+                  db.masterDb.text_data.find(
+                    (texEntry: any) => texEntry.id === 6 && texEntry.category === 6 && texEntry.index === entry,
+                  ).text,
+                description:
+                  'CV: ' +
+                  db.masterDb.text_data.find(
+                    (texEntry: any) => texEntry.id === 7 && texEntry.category === 7 && texEntry.index === entry,
+                  ).text,
+                value: entry,
+                disabled: false,
+                selected: false,
+              })),
+            { title: '=== Go Back ===', value: -1, disabled: !canBack, selected: false },
+          ],
         })
       ).value;
     };
@@ -198,7 +201,6 @@ async function askToUserCharaId(
         retObj[position] = argParsed[i]!;
         selectedCharaArray.push(argParsed[i]!);
       }
-
       return retObj;
     } else {
       console.log(`Available positions: ${availablePositionArray.map((el) => chalk.bold.green(el)).join(', ')}`);
@@ -212,9 +214,14 @@ async function askToUserCharaId(
         right3: null,
       };
       for (let i = 0; i < availablePositionArray.length; i++) {
-        const rsp = await questionBuilder(availablePositionArray[i]!);
-        selectedCharaArray.push(rsp);
-        retObj[availablePositionArray[i]!] = rsp;
+        const rsp = await questionBuilder(availablePositionArray[i]!, i > 0);
+        if (rsp !== -1) {
+          selectedCharaArray.push(rsp);
+          retObj[availablePositionArray[i]!] = rsp;
+        } else {
+          i -= 2;
+          process.stdout.write('\x1b[1A\x1b[2K\x1b[1A\x1b[2K');
+        }
       }
       return retObj;
     }

src/utils/exit.ts

@@ -22,16 +22,16 @@ async function pressAnyKeyToExit(errorCode: number): Promise<void> {
   });
 }
 
-async function pressAnyKeyToContinue(): Promise<void> {
-  process.stdout.write('Press any key to continue ...');
+async function pressAnyKeyToContinue(printText: boolean = true): Promise<void> {
+  printText ? process.stdout.write('Press any key to continue ...') : null;
   return new Promise((resolve) => {
     readline.emitKeypressEvents(process.stdin);
     process.stdin.setRawMode(true);
     process.stdin.resume();
     process.stdin.once('data', () => {
       process.stdin.setRawMode(false);
       process.stdin.pause();
-      process.stdout.write(`\n`);
+      printText ? process.stdout.write(`\n`) : null;
       resolve(); // Promiseを解決
     });
   });

src/utils/httpServer.ts

@@ -11,20 +11,13 @@ async function main() {
   const app = new Hono();
   const port = 54348;
 
-  // カスタム静的ファイルミドルウェア
   app.use('/*', async (c, next) => {
     const requestPath = c.req.path;
     const normalizedPath = requestPath.replace(/^\/+/, '').replace(/\/+/g, '/');
     const filePath = path.join('./output', normalizedPath);
-
     if (await bun.file(filePath).exists()) {
       try {
-        const file = bun.file(filePath);
-        if (await file.exists()) {
-          const mimeType = getMimeType(path.extname(filePath)) || 'text/plain';
-          // logger.trace(file, mimeType);
-          return new Response(file);
-        }
+        return new Response(bun.file(filePath));
       } catch (error) {
         logger.warn(`Error serving file: ${filePath}`, error);
       }
@@ -34,17 +27,15 @@ async function main() {
     return c.notFound();
   });
 
-  // サーバー起動
   const server = bun.serve({
     port,
     fetch: app.fetch,
   });
 
-  const targetUrl = `http://localhost:${port}/db/handbook.html`;
-  logger.debug(`HTTP server running at ${targetUrl}`);
-  await open(targetUrl);
+  logger.debug(`HTTP server running at localhost:${port}`);
+  await open(`http://localhost:${port}/db/handbook.html`);
   logger.debug('Press any key to close the server...');
-  await exitUtils.pressAnyKeyToContinue();
+  await exitUtils.pressAnyKeyToContinue(false);
   server.stop();
 }
 

src/utils/reaper.ts

@@ -217,8 +217,6 @@ async function tr5StealthLimiter_runPlugin(
   await tr5StealthLimiter_preparePost(preparePreResult);
 }
 
-function showDoNotTouchText() {}
-
 export default {
   reaperCleaning,
   tr5StealthLimiter_runPlugin,