@reftrixmcp/mcp-server 0.1.7 → 0.2.0

package/src/tools/layout/to-code.tool.ts

@@ -17,7 +17,9 @@
  */
 
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import {
   layoutToCodeInputSchema,
   layoutToCodeDataSchema,
@@ -155,21 +157,9 @@ export interface ILayoutToCodeService {
 // サービスファクトリー（DI）
 // =====================================================
 
-let serviceFactory: (() => ILayoutToCodeService) | null = null;
-
-/**
- * サービスファクトリーを設定
- */
-export function setLayoutToCodeServiceFactory(factory: () => ILayoutToCodeService): void {
-  serviceFactory = factory;
-}
-
-/**
- * サービスファクトリーをリセット
- */
-export function resetLayoutToCodeServiceFactory(): void {
-  serviceFactory = null;
-}
+const serviceFactoryDI = createDIFactory<ILayoutToCodeService>("LayoutToCodeService");
+export const setLayoutToCodeServiceFactory = serviceFactoryDI.set;
+export const resetLayoutToCodeServiceFactory = serviceFactoryDI.reset;
 
 // =====================================================
 // エラー生成ヘルパー
@@ -283,11 +273,9 @@ export async function layoutToCodeHandler(input: unknown): Promise<LayoutToCodeO
     if (error instanceof ZodError) {
       const errorMessage = error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
 
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] layout.to_code validation error", {
-          errors: error.errors,
-        });
-      }
+      logger.warn("[MCP Tool] layout.to_code validation error", {
+        errors: error.errors,
+      });
 
       return createErrorResponse(
         LAYOUT_MCP_ERROR_CODES.VALIDATION_ERROR,
@@ -295,18 +283,15 @@ export async function layoutToCodeHandler(input: unknown): Promise<LayoutToCodeO
       ) as LayoutToCodeOutput;
     }
 
-    const errorMessage = error instanceof Error ? error.message : String(error);
     return createErrorResponse(
       LAYOUT_MCP_ERROR_CODES.INTERNAL_ERROR,
-      errorMessage
+      sanitizeErrorMessage(error)
     ) as LayoutToCodeOutput;
   }
 
   // サービスファクトリーチェック
-  if (!serviceFactory) {
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] layout.to_code service factory not set");
-    }
+  if (!serviceFactoryDI.get()) {
+    logger.error("[MCP Tool] layout.to_code service factory not set");
 
     return createErrorResponse(
       "SERVICE_UNAVAILABLE",
@@ -314,7 +299,7 @@ export async function layoutToCodeHandler(input: unknown): Promise<LayoutToCodeO
     ) as LayoutToCodeOutput;
   }
 
-  const service = serviceFactory();
+  const service = serviceFactoryDI.get()!();
 
   try {
     // セクションパターン取得
@@ -351,17 +336,13 @@ export async function layoutToCodeHandler(input: unknown): Promise<LayoutToCodeO
     try {
       generatedCode = await service.generateCode(pattern, options);
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-
-      if (isDevelopment()) {
-        logger.error("[MCP Tool] layout.to_code generation error", {
-          error: errorMessage,
-        });
-      }
+      logger.error("[MCP Tool] layout.to_code generation error", {
+        error: error instanceof Error ? error.message : String(error),
+      });
 
       return createErrorResponse(
         LAYOUT_MCP_ERROR_CODES.CODE_GENERATION_FAILED,
-        `Code generation failed: ${errorMessage}`
+        sanitizeErrorMessage(error)
       ) as LayoutToCodeOutput;
     }
 
@@ -394,14 +375,12 @@ export async function layoutToCodeHandler(input: unknown): Promise<LayoutToCodeO
     const errorMessage = error instanceof Error ? error.message : String(error);
     const errorCode = determineErrorCode(error instanceof Error ? error : errorMessage);
 
-    if (isDevelopment()) {
-      logger.error("[MCP Tool] layout.to_code error", {
-        code: errorCode,
-        error: errorMessage,
-      });
-    }
+    logger.error("[MCP Tool] layout.to_code error", {
+      code: errorCode,
+      error: errorMessage,
+    });
 
-    return createErrorResponse(errorCode, errorMessage) as LayoutToCodeOutput;
+    return createErrorResponse(errorCode, sanitizeErrorMessage(error)) as LayoutToCodeOutput;
   }
 }
 

package/src/tools/motion/analyze-frames.handler.ts

@@ -18,7 +18,9 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { ZodError } from "zod";
+import { createDIFactory } from "../../utils/di-factory";
 import { logger, isDevelopment } from "../../utils/logger";
+import { sanitizeErrorMessage } from "../../utils/sanitize-error";
 import {
   analyzeFramesInputSchema,
   analyzeFramesMcpTool,
@@ -114,39 +116,20 @@ export interface IFrameAnalysisService {
 // Service Factory (DI Pattern)
 // ============================================================================
 
-/**
- * サービスファクトリ型
- */
-type FrameAnalysisServiceFactory = () => IFrameAnalysisService;
-
 /**
  * デフォルトサービスファクトリ
  * 実際の画像処理を行うサービスを返す（将来実装）
  */
-let serviceFactory: FrameAnalysisServiceFactory | null = null;
-
-/**
- * サービスファクトリを設定
- * テスト時にモックサービスを注入するために使用
- */
-export function setFrameAnalysisServiceFactory(factory: FrameAnalysisServiceFactory): void {
-  serviceFactory = factory;
-}
-
-/**
- * サービスファクトリをリセット
- * テスト後にクリーンアップするために使用
- */
-export function resetFrameAnalysisServiceFactory(): void {
-  serviceFactory = null;
-}
+const serviceFactoryDI = createDIFactory<IFrameAnalysisService>("FrameAnalysisService");
+export const setFrameAnalysisServiceFactory = serviceFactoryDI.set;
+export const resetFrameAnalysisServiceFactory = serviceFactoryDI.reset;
 
 /**
  * サービスインスタンスを取得
  */
 function getFrameAnalysisService(): IFrameAnalysisService | null {
-  if (serviceFactory) {
-    return serviceFactory();
+  if (serviceFactoryDI.get()) {
+    return serviceFactoryDI.get()!();
   }
   // デフォルトサービスは未実装（将来的にPixelmatch+Sharpで実装）
   return null;
@@ -239,16 +222,12 @@ export async function motionAnalyzeFramesHandler(input: unknown): Promise<Analyz
     parsedInput = analyzeFramesInputSchema.parse(input);
   } catch (error) {
     if (error instanceof ZodError) {
-      const errorMessage = error.issues
-        .map((issue) => `${issue.path.join(".")}: ${issue.message}`)
-        .join(", ");
-      if (isDevelopment()) {
-        logger.error("[motion.analyze_frames] Validation error", { error: errorMessage });
-      }
+      logger.warn("[motion.analyze_frames] Validation error", {
+        error: error.issues.map((issue) => `${issue.path.join(".")}: ${issue.message}`).join(", "),
+      });
       return createErrorResponse(
         ANALYZE_FRAMES_ERROR_CODES.VALIDATION_ERROR,
-        `入力バリデーションエラー: ${errorMessage}`,
-        error.issues
+        "Invalid input parameters"
       );
     }
     throw error;
@@ -292,9 +271,12 @@ export async function motionAnalyzeFramesHandler(input: unknown): Promise<Analyz
   try {
     framePaths = await getFrameFiles(frame_dir, frame_pattern, effectiveOptions.max_frames);
   } catch (error) {
+    logger.warn("[motion.analyze_frames] Frame file retrieval failed", {
+      error: (error as Error).message,
+    });
     return createErrorResponse(
       ANALYZE_FRAMES_ERROR_CODES.INTERNAL_ERROR,
-      `フレームファイルの取得に失敗しました: ${(error as Error).message}`
+      sanitizeErrorMessage(error)
     );
   }
 
@@ -356,12 +338,12 @@ export async function motionAnalyzeFramesHandler(input: unknown): Promise<Analyz
       processing_time_ms: result.processing_time_ms,
     });
   } catch (error) {
-    if (isDevelopment()) {
-      logger.error("[motion.analyze_frames] Analysis error", { error });
-    }
+    logger.warn("[motion.analyze_frames] Analysis error", {
+      error: (error as Error).message,
+    });
     return createErrorResponse(
       ANALYZE_FRAMES_ERROR_CODES.ANALYSIS_ERROR,
-      `解析エラー: ${(error as Error).message}`
+      sanitizeErrorMessage(error)
     );
   }
 }