@coeiro-operator/audio 1.2.5 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coeiro-operator/audio",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Audio synthesis and playback module for COEIRO Operator",
   "type": "module",
   "main": "dist/index.js",

package/dist/voice-resolver.d.ts

@@ -1,26 +0,0 @@
-/**
- * voice-resolver.ts: 音声設定の解決を担当
- */
-import { OperatorManager, ConfigManager, CharacterInfoService } from '@coeiro-operator/core';
-import { AudioSynthesizer } from './audio-synthesizer.js';
-import type { VoiceConfig } from './types.js';
-export declare class VoiceResolver {
-    private configManager;
-    private operatorManager;
-    private characterInfoService;
-    private audioSynthesizer;
-    constructor(configManager: ConfigManager, operatorManager: OperatorManager, characterInfoService: CharacterInfoService, audioSynthesizer: AudioSynthesizer);
-    /**
-     * 現在のオペレータの音声設定を取得
-     */
-    getCurrentVoiceConfig(styleName?: string | null): Promise<VoiceConfig | null>;
-    /**
-     * CharacterIdからVoiceConfigを生成
-     */
-    resolveCharacterToConfig(characterId: string, styleName?: string | null): Promise<VoiceConfig>;
-    /**
-     * 音声設定を解決
-     */
-    resolveVoiceConfig(voice: string | VoiceConfig | null | undefined, style?: string, allowFallback?: boolean): Promise<VoiceConfig>;
-}
-//# sourceMappingURL=voice-resolver.d.ts.map

package/dist/voice-resolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"voice-resolver.d.ts","sourceRoot":"","sources":["../src/voice-resolver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,qBAAa,aAAa;IAEtB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,gBAAgB;gBAHhB,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe,EAChC,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB;IAG5C;;OAEG;IACG,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAwEnF;;OAEG;IACG,wBAAwB,CAC5B,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAAC,WAAW,CAAC;IA0EvB;;OAEG;IACG,kBAAkB,CACtB,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,GAAG,SAAS,EAC9C,KAAK,CAAC,EAAE,MAAM,EACd,aAAa,GAAE,OAAc,GAC5B,OAAO,CAAC,WAAW,CAAC;CAuDxB"}

package/dist/voice-resolver.js

@@ -1,201 +0,0 @@
-/**
- * voice-resolver.ts: 音声設定の解決を担当
- */
-import { logger } from '@coeiro-operator/common';
-export class VoiceResolver {
-    configManager;
-    operatorManager;
-    characterInfoService;
-    audioSynthesizer;
-    constructor(configManager, operatorManager, characterInfoService, audioSynthesizer) {
-        this.configManager = configManager;
-        this.operatorManager = operatorManager;
-        this.characterInfoService = characterInfoService;
-        this.audioSynthesizer = audioSynthesizer;
-    }
-    /**
-     * 現在のオペレータの音声設定を取得
-     */
-    async getCurrentVoiceConfig(styleName) {
-        try {
-            const currentStatus = await this.operatorManager.showCurrentOperator();
-            if (!currentStatus.characterId) {
-                return null;
-            }
-            const character = await this.characterInfoService.getCharacterInfo(currentStatus.characterId);
-            if (character && character.speakerId) {
-                // 保存されたセッション情報からスタイルを取得
-                const session = await this.operatorManager.getCurrentOperatorSession();
-                let selectedStyle;
-                // デバッグ: セッション情報を確認
-                logger.debug('VoiceResolver.getCurrentVoiceConfig()', {
-                    styleName,
-                    session,
-                    'session?.styleId': session?.styleId,
-                    'session?.styleId !== undefined': session?.styleId !== undefined,
-                });
-                if (styleName) {
-                    // 明示的にスタイルが指定された場合はそれを使用
-                    logger.debug('分岐: 明示的スタイル指定');
-                    selectedStyle = this.characterInfoService.selectStyle(character, styleName);
-                }
-                else if (session?.styleId !== undefined) {
-                    // セッションに保存されたスタイルIDがある場合はそれを使用
-                    logger.debug('分岐: セッションからスタイル取得');
-                    const savedStyle = character.styles?.[session.styleId];
-                    if (savedStyle) {
-                        selectedStyle = savedStyle;
-                        logger.debug(`保存されたスタイルを使用: ${savedStyle.styleName} (ID:${session.styleId})`);
-                    }
-                    else {
-                        // 保存されたスタイルが見つからない場合はデフォルトを使用
-                        logger.debug('保存されたスタイルが見つからない、デフォルト使用');
-                        selectedStyle = this.characterInfoService.selectStyle(character, null);
-                    }
-                }
-                else {
-                    // セッション情報がない場合はデフォルトスタイルを使用
-                    logger.debug('分岐: セッション情報なし、デフォルト使用');
-                    selectedStyle = this.characterInfoService.selectStyle(character, null);
-                }
-                // 新しいstyles構造からstyleMorasPerSecondを生成
-                const styleMorasPerSecond = {};
-                if (character.styles) {
-                    Object.entries(character.styles).forEach(([styleId, config]) => {
-                        if (config.morasPerSecond !== undefined) {
-                            styleMorasPerSecond[Number(styleId)] = config.morasPerSecond;
-                        }
-                    });
-                }
-                return {
-                    speaker: null, // 廃止予定: character.speaker は削除されたため
-                    selectedStyleId: selectedStyle.styleId,
-                    speakerId: character.speakerId,
-                    styleMorasPerSecond,
-                };
-            }
-            return null;
-        }
-        catch (error) {
-            logger.error(`オペレータ音声取得エラー: ${error.message}`);
-            return null;
-        }
-    }
-    /**
-     * CharacterIdからVoiceConfigを生成
-     */
-    async resolveCharacterToConfig(characterId, styleName) {
-        try {
-            // ConfigManagerからCharacter設定を取得
-            const characterConfig = await this.configManager.getCharacterConfig(characterId);
-            if (!characterConfig) {
-                throw new Error(`Character not found: ${characterId}`);
-            }
-            // speakerIdからspeaker情報を取得（COEIROINKサーバーから）
-            const speakers = await this.audioSynthesizer.getSpeakers();
-            const speaker = speakers.find(s => s.speakerUuid === characterConfig.speakerId);
-            if (!speaker) {
-                throw new Error(`Speaker '${characterConfig.speakerId}' not found for character '${characterId}'`);
-            }
-            // スタイル選択
-            let selectedStyle;
-            if (styleName) {
-                // スタイル名が指定された場合、characterConfig.stylesから対応するstyleIdを探す
-                const styleEntry = Object.entries(characterConfig.styles).find(([_, config]) => config.styleName === styleName);
-                if (styleEntry) {
-                    const styleId = Number(styleEntry[0]);
-                    selectedStyle = speaker.styles.find(s => s.styleId === styleId);
-                }
-            }
-            // デフォルトスタイルを使用
-            if (!selectedStyle) {
-                selectedStyle = speaker.styles.find(s => s.styleId === characterConfig.defaultStyleId);
-            }
-            // それでも見つからない場合は最初のスタイルを使用
-            if (!selectedStyle) {
-                selectedStyle = speaker.styles[0];
-            }
-            // スタイルが見つからない場合はエラー
-            if (!selectedStyle) {
-                throw new Error(`No valid style found for character '${characterId}'${styleName ? ` with style '${styleName}'` : ''}`);
-            }
-            // speaker-provider.Speakerからoperator.Speakerへ変換
-            const operatorSpeaker = {
-                speakerId: speaker.speakerUuid,
-                speakerName: speaker.speakerName,
-                styles: speaker.styles,
-            };
-            // 新しいstyles構造からstyleMorasPerSecondを生成
-            const styleMorasPerSecond = {};
-            if (characterConfig.styles) {
-                Object.entries(characterConfig.styles).forEach(([styleId, config]) => {
-                    if (config.morasPerSecond !== undefined) {
-                        styleMorasPerSecond[Number(styleId)] = config.morasPerSecond;
-                    }
-                });
-            }
-            return {
-                speaker: operatorSpeaker,
-                selectedStyleId: selectedStyle.styleId,
-                speakerId: characterConfig.speakerId,
-                styleMorasPerSecond,
-            };
-        }
-        catch (error) {
-            logger.error(`Character解決エラー: ${error.message}`);
-            throw new Error(`Failed to resolve character '${characterId}': ${error.message}`);
-        }
-    }
-    /**
-     * 音声設定を解決
-     */
-    async resolveVoiceConfig(voice, style, allowFallback = true) {
-        if (!voice) {
-            // オペレータから音声を取得（スタイル指定も渡す）
-            const operatorVoice = await this.getCurrentVoiceConfig(style);
-            if (operatorVoice) {
-                // ログ出力（speakerがnullの場合はspeakerIdを使用）
-                if (operatorVoice.speaker) {
-                    const selectedStyle = operatorVoice.speaker.styles.find(s => s.styleId === operatorVoice.selectedStyleId);
-                    const styleName = selectedStyle?.styleName || `ID:${operatorVoice.selectedStyleId}`;
-                    logger.info(`オペレータ音声を使用: ${operatorVoice.speaker.speakerName} (スタイル: ${styleName})`);
-                }
-                else {
-                    logger.info(`オペレータ音声を使用: ${operatorVoice.speakerId} (スタイルID: ${operatorVoice.selectedStyleId})`);
-                }
-                return operatorVoice;
-            }
-            else if (allowFallback) {
-                // CLIのみ: デフォルトキャラクターを使用（つくよみちゃん）
-                const defaultCharacterId = 'tsukuyomi';
-                logger.info(`デフォルトキャラクターを使用: ${defaultCharacterId}`);
-                return await this.resolveCharacterToConfig(defaultCharacterId, style);
-            }
-            else {
-                // MCP: オペレータが必須
-                throw new Error('オペレータが割り当てられていません。まず operator_assign を実行してください。');
-            }
-        }
-        else if (typeof voice === 'string') {
-            // string型の場合はCharacterIdとして解決
-            logger.info(`キャラクター解決: ${voice}`);
-            const voiceConfig = await this.resolveCharacterToConfig(voice, style);
-            if (voiceConfig.speaker) {
-                const selectedStyle = voiceConfig.speaker.styles.find(s => s.styleId === voiceConfig.selectedStyleId);
-                const styleName = selectedStyle?.styleName || `ID:${voiceConfig.selectedStyleId}`;
-                logger.info(`  → ${voiceConfig.speaker.speakerName} (スタイル: ${styleName})`);
-            }
-            return voiceConfig;
-        }
-        else {
-            // すでにVoiceConfig型の場合はそのまま使用
-            if (voice.speaker) {
-                const selectedStyle = voice.speaker.styles.find(s => s.styleId === voice.selectedStyleId);
-                const styleName = selectedStyle?.styleName || `ID:${voice.selectedStyleId}`;
-                logger.info(`VoiceConfig使用: ${voice.speaker.speakerName} (スタイル: ${styleName})`);
-            }
-            return voice;
-        }
-    }
-}
-//# sourceMappingURL=voice-resolver.js.map

package/dist/voice-resolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"voice-resolver.js","sourceRoot":"","sources":["../src/voice-resolver.ts"],"names":[],"mappings":"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"}