@coeiro-operator/audio 1.2.4 → 1.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/audio-stream-controller.d.ts +4 -5
- package/dist/audio-stream-controller.d.ts.map +1 -1
- package/dist/audio-stream-controller.js +11 -10
- package/dist/audio-stream-controller.js.map +1 -1
- package/dist/audio-synthesizer.d.ts +4 -5
- package/dist/audio-synthesizer.d.ts.map +1 -1
- package/dist/audio-synthesizer.js +20 -9
- package/dist/audio-synthesizer.js.map +1 -1
- package/dist/chunk-generation-manager.d.ts +5 -10
- package/dist/chunk-generation-manager.d.ts.map +1 -1
- package/dist/chunk-generation-manager.js +7 -17
- package/dist/chunk-generation-manager.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +104 -8
- package/dist/index.js.map +1 -1
- package/dist/queue/task-queue.d.ts.map +1 -1
- package/dist/queue/task-queue.js +6 -0
- package/dist/queue/task-queue.js.map +1 -1
- package/dist/speed-utils.d.ts +9 -3
- package/dist/speed-utils.d.ts.map +1 -1
- package/dist/speed-utils.js +14 -11
- package/dist/speed-utils.js.map +1 -1
- package/dist/synthesis-processor.d.ts +6 -5
- package/dist/synthesis-processor.d.ts.map +1 -1
- package/dist/synthesis-processor.js +18 -43
- package/dist/synthesis-processor.js.map +1 -1
- package/dist/test-helpers.d.ts.map +1 -1
- package/dist/test-helpers.js +5 -3
- package/dist/test-helpers.js.map +1 -1
- package/dist/types.d.ts +25 -17
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/dist/voice-resolver.d.ts +0 -25
- package/dist/voice-resolver.d.ts.map +0 -1
- package/dist/voice-resolver.js +0 -186
- package/dist/voice-resolver.js.map +0 -1
package/dist/index.js
CHANGED
|
@@ -2,26 +2,30 @@
|
|
|
2
2
|
* index-new.ts: 簡素化されたSayCoeiroinkクラス
|
|
3
3
|
* 音声合成ライブラリのファサード
|
|
4
4
|
*/
|
|
5
|
-
import { OperatorManager } from '@coeiro-operator/core';
|
|
5
|
+
import { OperatorManager, CharacterInfoService } from '@coeiro-operator/core';
|
|
6
6
|
import { SpeechQueue } from './speech-queue.js';
|
|
7
7
|
import { AudioPlayer } from './audio-player.js';
|
|
8
8
|
import { AudioSynthesizer } from './audio-synthesizer.js';
|
|
9
|
-
import { VoiceResolver } from './voice-resolver.js';
|
|
10
9
|
import { SynthesisProcessor } from './synthesis-processor.js';
|
|
11
10
|
import { logger } from '@coeiro-operator/common';
|
|
11
|
+
import { convertToSpeed, validateSpeedParameters } from './speed-utils.js';
|
|
12
12
|
export class SayCoeiroink {
|
|
13
13
|
configManager;
|
|
14
14
|
config;
|
|
15
15
|
operatorManager;
|
|
16
|
+
characterInfoService;
|
|
16
17
|
speechQueue = null;
|
|
17
18
|
audioPlayer = null;
|
|
18
19
|
audioSynthesizer = null;
|
|
19
|
-
voiceResolver = null;
|
|
20
20
|
synthesisProcessor = null;
|
|
21
21
|
constructor(configManager) {
|
|
22
22
|
this.configManager = configManager;
|
|
23
23
|
this.config = {};
|
|
24
|
-
|
|
24
|
+
// CharacterInfoServiceを初期化
|
|
25
|
+
this.characterInfoService = new CharacterInfoService();
|
|
26
|
+
this.characterInfoService.initialize(configManager);
|
|
27
|
+
// OperatorManagerを初期化（DI）
|
|
28
|
+
this.operatorManager = new OperatorManager(configManager, this.characterInfoService);
|
|
25
29
|
}
|
|
26
30
|
async initialize() {
|
|
27
31
|
try {
|
|
@@ -30,12 +34,13 @@ export class SayCoeiroink {
|
|
|
30
34
|
// 基本コンポーネントを初期化
|
|
31
35
|
this.audioPlayer = new AudioPlayer(this.config);
|
|
32
36
|
this.audioSynthesizer = new AudioSynthesizer(this.config);
|
|
33
|
-
//
|
|
34
|
-
this.
|
|
35
|
-
this.synthesisProcessor = new SynthesisProcessor(this.config, this.audioPlayer, this.audioSynthesizer, this.voiceResolver);
|
|
37
|
+
// 音声合成処理を初期化
|
|
38
|
+
this.synthesisProcessor = new SynthesisProcessor(this.config, this.audioPlayer, this.audioSynthesizer);
|
|
36
39
|
// SpeechQueueを初期化
|
|
37
40
|
this.speechQueue = new SpeechQueue(async (task) => {
|
|
38
|
-
|
|
41
|
+
// CLISynthesizeOptions → SpeakSettings + ProcessingOptionsに変換
|
|
42
|
+
const { speakSettings, processingOptions } = await this.resolveCharacterOptions(task.options);
|
|
43
|
+
await this.synthesisProcessor.process(task.text, speakSettings, processingOptions);
|
|
39
44
|
});
|
|
40
45
|
await this.operatorManager.initialize();
|
|
41
46
|
}
|
|
@@ -59,6 +64,97 @@ export class SayCoeiroink {
|
|
|
59
64
|
}
|
|
60
65
|
}
|
|
61
66
|
// ========================================================================
|
|
67
|
+
// 内部ヘルパーメソッド
|
|
68
|
+
// ========================================================================
|
|
69
|
+
/**
|
|
70
|
+
* CLISynthesizeOptionsをSpeakSettings + ProcessingOptionsに変換
|
|
71
|
+
* voice文字列→Character解決、style文字列→styleId解決、rate/factor→speed計算
|
|
72
|
+
*/
|
|
73
|
+
async resolveCharacterOptions(options) {
|
|
74
|
+
// Characterを解決
|
|
75
|
+
let character;
|
|
76
|
+
const allowFallback = options.allowFallback ?? true;
|
|
77
|
+
if (!options.voice) {
|
|
78
|
+
// voiceが未指定 → Operator経由でアサイン
|
|
79
|
+
const session = await this.operatorManager.getCurrentOperatorSession();
|
|
80
|
+
if (!session) {
|
|
81
|
+
throw new Error('No operator assigned. Please assign an operator first.');
|
|
82
|
+
}
|
|
83
|
+
const assignedCharacter = await this.characterInfoService.getCharacterInfo(session.characterId);
|
|
84
|
+
if (!assignedCharacter) {
|
|
85
|
+
throw new Error(`Assigned character not found: ${session.characterId}`);
|
|
86
|
+
}
|
|
87
|
+
character = assignedCharacter;
|
|
88
|
+
logger.debug(`Character assigned: ${character.characterId}`);
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
// voiceが指定済み → CharacterInfoServiceから取得
|
|
92
|
+
const resolvedCharacter = await this.characterInfoService.getCharacterInfo(options.voice);
|
|
93
|
+
if (!resolvedCharacter) {
|
|
94
|
+
if (allowFallback) {
|
|
95
|
+
logger.warn(`Character not found: ${options.voice}, falling back to assignment`);
|
|
96
|
+
const session = await this.operatorManager.getCurrentOperatorSession();
|
|
97
|
+
if (!session) {
|
|
98
|
+
throw new Error('No operator assigned and character not found.');
|
|
99
|
+
}
|
|
100
|
+
const assignedCharacter = await this.characterInfoService.getCharacterInfo(session.characterId);
|
|
101
|
+
if (!assignedCharacter) {
|
|
102
|
+
throw new Error(`Assigned character not found: ${session.characterId}`);
|
|
103
|
+
}
|
|
104
|
+
character = assignedCharacter;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
throw new Error(`Character not found: ${options.voice}`);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
character = resolvedCharacter;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
// selectedStyleIdを解決
|
|
115
|
+
let selectedStyleId = character.defaultStyleId;
|
|
116
|
+
if (options.style) {
|
|
117
|
+
// style名からstyleIdを検索
|
|
118
|
+
const styleEntry = Object.entries(character.styles).find(([_, styleConfig]) => styleConfig.styleName === options.style);
|
|
119
|
+
if (styleEntry) {
|
|
120
|
+
selectedStyleId = parseInt(styleEntry[0]);
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
logger.warn(`Style not found: ${options.style}, using default style`);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
const styleConfig = character.styles[selectedStyleId];
|
|
127
|
+
if (!styleConfig) {
|
|
128
|
+
throw new Error(`Style ${selectedStyleId} not found for character ${character.characterId}`);
|
|
129
|
+
}
|
|
130
|
+
// speed計算
|
|
131
|
+
const speedSpec = {
|
|
132
|
+
rate: typeof options.rate === 'number' ? options.rate : undefined,
|
|
133
|
+
factor: options.factor
|
|
134
|
+
};
|
|
135
|
+
validateSpeedParameters(speedSpec);
|
|
136
|
+
const speed = convertToSpeed(speedSpec, {
|
|
137
|
+
styleMorasPerSecond: styleConfig.morasPerSecond
|
|
138
|
+
});
|
|
139
|
+
// SpeakSettings作成
|
|
140
|
+
const speakSettings = {
|
|
141
|
+
characterId: character.characterId,
|
|
142
|
+
speakerId: character.speakerId,
|
|
143
|
+
styleId: selectedStyleId,
|
|
144
|
+
speed,
|
|
145
|
+
styleMorasPerSecond: styleConfig.morasPerSecond,
|
|
146
|
+
};
|
|
147
|
+
// ProcessingOptions作成
|
|
148
|
+
const processingOptions = {
|
|
149
|
+
outputFile: options.outputFile,
|
|
150
|
+
chunkMode: options.chunkMode,
|
|
151
|
+
bufferSize: options.bufferSize,
|
|
152
|
+
};
|
|
153
|
+
logger.debug('SpeakSettings作成完了:', speakSettings);
|
|
154
|
+
logger.debug('ProcessingOptions作成完了:', processingOptions);
|
|
155
|
+
return { speakSettings, processingOptions };
|
|
156
|
+
}
|
|
157
|
+
// ========================================================================
|
|
62
158
|
// 主要API
|
|
63
159
|
// ========================================================================
|
|
64
160
|
/**
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAiB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-queue.d.ts","sourceRoot":"","sources":["../../src/queue/task-queue.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGpF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED;;;GAGG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,QAAQ,CAAE,SAAQ,YAAY;IAQ3D,OAAO,CAAC,eAAe;IAPzB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,qBAAqB,CAA8B;IAC3D,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,MAAM,CAA6C;gBAGjD,eAAe,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAKrD;;;OAGG;IACH,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAC,GAAG,aAAa;IAuChG;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,KAAK,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,KAAK,CAAA;SAAC,CAAC,CAAA;KAAE,CAAC;IA0BnF;;OAEG;YACW,YAAY;
|
|
1
|
+
{"version":3,"file":"task-queue.d.ts","sourceRoot":"","sources":["../../src/queue/task-queue.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGpF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED;;;GAGG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,QAAQ,CAAE,SAAQ,YAAY;IAQ3D,OAAO,CAAC,eAAe;IAPzB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,qBAAqB,CAA8B;IAC3D,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,MAAM,CAA6C;gBAGjD,eAAe,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAKrD;;;OAGG;IACH,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAC,GAAG,aAAa;IAuChG;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,KAAK,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,KAAK,CAAA;SAAC,CAAC,CAAA;KAAE,CAAC;IA0BnF;;OAEG;YACW,YAAY;IAyG1B;;OAEG;YACW,WAAW;IAIzB;;OAEG;IACH,SAAS,IAAI,WAAW;IASxB;;;;OAIG;IACG,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAmFrD;;;;OAIG;IACG,kBAAkB,CAAC,YAAY,GAAE,MAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,KAAK,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,KAAK,CAAA;SAAC,CAAC,CAAA;KAAE,CAAC;CA+C/G"}
|
package/dist/queue/task-queue.js
CHANGED
|
@@ -157,6 +157,12 @@ export class TaskQueue extends EventEmitter {
|
|
|
157
157
|
if (task.reject) {
|
|
158
158
|
logger.debug(`[TaskQueue] タスクのPromiseをreject`);
|
|
159
159
|
task.reject(error);
|
|
160
|
+
// Unhandled rejectionを防ぐためにPromiseをcatch
|
|
161
|
+
if (task.promise) {
|
|
162
|
+
task.promise.catch(() => {
|
|
163
|
+
// エラーは既にrejectで通知済み、かつerrorsリストに保存済みなので、ここでは何もしない
|
|
164
|
+
});
|
|
165
|
+
}
|
|
160
166
|
}
|
|
161
167
|
}
|
|
162
168
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-queue.js","sourceRoot":"","sources":["../../src/queue/task-queue.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"task-queue.js","sourceRoot":"","sources":["../../src/queue/task-queue.ts"],"names":[],"mappings":"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"}
|
package/dist/speed-utils.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* speed-utils.ts: 速度変換ユーティリティ
|
|
3
3
|
*/
|
|
4
|
-
import type { VoiceConfig } from './types.js';
|
|
5
4
|
/**
|
|
6
5
|
* 速度指定の内部表現（数値のみ）
|
|
7
6
|
*/
|
|
@@ -9,13 +8,20 @@ export interface SpeedSpecification {
|
|
|
9
8
|
rate?: number;
|
|
10
9
|
factor?: number;
|
|
11
10
|
}
|
|
11
|
+
/**
|
|
12
|
+
* 話速情報（速度計算用）
|
|
13
|
+
*/
|
|
14
|
+
export interface SpeakerRateInfo {
|
|
15
|
+
baseMorasPerSecond?: number;
|
|
16
|
+
styleMorasPerSecond?: number;
|
|
17
|
+
}
|
|
12
18
|
/**
|
|
13
19
|
* 速度指定をCOEIROINKのspeedScale値に変換
|
|
14
20
|
* @param spec - 速度指定
|
|
15
|
-
* @param
|
|
21
|
+
* @param rateInfo - 話速情報（スタイル別の話速情報を含む）
|
|
16
22
|
* @returns COEIROINKのspeed値（0.5〜2.0）
|
|
17
23
|
*/
|
|
18
|
-
export declare function convertToSpeed(spec: SpeedSpecification,
|
|
24
|
+
export declare function convertToSpeed(spec: SpeedSpecification, rateInfo: SpeakerRateInfo): number;
|
|
19
25
|
/**
|
|
20
26
|
* rateとfactorの両方が指定された場合の検証
|
|
21
27
|
* @param spec - 速度指定
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speed-utils.d.ts","sourceRoot":"","sources":["../src/speed-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"speed-utils.d.ts","sourceRoot":"","sources":["../src/speed-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAyCD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,eAAe,GAAG,MAAM,CA8B1F;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAItE"}
|
package/dist/speed-utils.js
CHANGED
|
@@ -10,19 +10,22 @@ const BASE_MORAS_PER_SECOND = 7.5; // 200 WPM時のモーラ/秒
|
|
|
10
10
|
/**
|
|
11
11
|
* WPMからCOEIROINKのspeed値を計算
|
|
12
12
|
* @param wpm - Words Per Minute
|
|
13
|
-
* @param
|
|
13
|
+
* @param rateInfo - 話速情報（スタイル別の話速情報を含む）
|
|
14
14
|
* @returns COEIROINKのspeed値
|
|
15
15
|
*/
|
|
16
|
-
function calculateSpeedFromWPM(wpm,
|
|
16
|
+
function calculateSpeedFromWPM(wpm, rateInfo) {
|
|
17
17
|
const targetMorasPerSecond = BASE_MORAS_PER_SECOND * (wpm / BASE_RATE_WPM);
|
|
18
18
|
// 話者の実測速度を取得
|
|
19
19
|
let speakerMorasPerSecond = BASE_MORAS_PER_SECOND;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
// styleMorasPerSecondが設定されていればそれを使用
|
|
21
|
+
if (rateInfo.styleMorasPerSecond) {
|
|
22
|
+
speakerMorasPerSecond = rateInfo.styleMorasPerSecond;
|
|
23
|
+
logger.debug(`話者固有速度を使用: ${speakerMorasPerSecond} モーラ/秒`);
|
|
24
|
+
}
|
|
25
|
+
// baseMorasPerSecondフォールバック
|
|
26
|
+
else if (rateInfo.baseMorasPerSecond) {
|
|
27
|
+
speakerMorasPerSecond = rateInfo.baseMorasPerSecond;
|
|
28
|
+
logger.debug(`基準速度を使用: ${speakerMorasPerSecond} モーラ/秒`);
|
|
26
29
|
}
|
|
27
30
|
else {
|
|
28
31
|
logger.debug(`デフォルト速度を使用: ${BASE_MORAS_PER_SECOND} モーラ/秒`);
|
|
@@ -34,10 +37,10 @@ function calculateSpeedFromWPM(wpm, voiceConfig) {
|
|
|
34
37
|
/**
|
|
35
38
|
* 速度指定をCOEIROINKのspeedScale値に変換
|
|
36
39
|
* @param spec - 速度指定
|
|
37
|
-
* @param
|
|
40
|
+
* @param rateInfo - 話速情報（スタイル別の話速情報を含む）
|
|
38
41
|
* @returns COEIROINKのspeed値（0.5〜2.0）
|
|
39
42
|
*/
|
|
40
|
-
export function convertToSpeed(spec,
|
|
43
|
+
export function convertToSpeed(spec, rateInfo) {
|
|
41
44
|
logger.debug(`convertToSpeed入力 - spec: ${JSON.stringify(spec)}`);
|
|
42
45
|
logger.debug(`convertToSpeed入力 - spec.rate type: ${typeof spec.rate}, value: ${spec.rate}`);
|
|
43
46
|
logger.debug(`convertToSpeed入力 - spec.factor type: ${typeof spec.factor}, value: ${spec.factor}`);
|
|
@@ -49,7 +52,7 @@ export function convertToSpeed(spec, voiceConfig) {
|
|
|
49
52
|
}
|
|
50
53
|
// rateをWPMとして処理
|
|
51
54
|
else if (spec.rate !== undefined) {
|
|
52
|
-
speed = calculateSpeedFromWPM(spec.rate,
|
|
55
|
+
speed = calculateSpeedFromWPM(spec.rate, rateInfo);
|
|
53
56
|
logger.debug(`絶対速度: rate=${spec.rate} WPM → speed=${speed.toFixed(2)}`);
|
|
54
57
|
}
|
|
55
58
|
// 未指定
|
package/dist/speed-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"speed-utils.js","sourceRoot":"","sources":["../src/speed-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"speed-utils.js","sourceRoot":"","sources":["../src/speed-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,22 +3,23 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { AudioPlayer } from './audio-player.js';
|
|
5
5
|
import { AudioSynthesizer } from './audio-synthesizer.js';
|
|
6
|
-
import {
|
|
7
|
-
import type { Config, SynthesizeOptions, SynthesizeResult } from './types.js';
|
|
6
|
+
import type { Config, ProcessingOptions, SynthesizeResult, SpeakSettings } from './types.js';
|
|
8
7
|
export declare class SynthesisProcessor {
|
|
9
8
|
private config;
|
|
10
9
|
private audioPlayer;
|
|
11
10
|
private audioSynthesizer;
|
|
12
|
-
|
|
13
|
-
constructor(config: Config, audioPlayer: AudioPlayer, audioSynthesizer: AudioSynthesizer, voiceResolver: VoiceResolver);
|
|
11
|
+
constructor(config: Config, audioPlayer: AudioPlayer, audioSynthesizer: AudioSynthesizer);
|
|
14
12
|
/**
|
|
15
13
|
* AudioPlayerの初期化と設定
|
|
16
14
|
*/
|
|
17
15
|
initializeAudioPlayer(): Promise<boolean>;
|
|
18
16
|
/**
|
|
19
17
|
* 音声合成処理のメインメソッド
|
|
18
|
+
* @param text 合成するテキスト
|
|
19
|
+
* @param speakSettings 音声生成パラメータ
|
|
20
|
+
* @param processingOptions 処理制御オプション
|
|
20
21
|
*/
|
|
21
|
-
process(text: string,
|
|
22
|
+
process(text: string, speakSettings: SpeakSettings, processingOptions?: ProcessingOptions): Promise<SynthesizeResult>;
|
|
22
23
|
/**
|
|
23
24
|
* オプション解析
|
|
24
25
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synthesis-processor.d.ts","sourceRoot":"","sources":["../src/synthesis-processor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"synthesis-processor.d.ts","sourceRoot":"","sources":["../src/synthesis-processor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EACV,MAAM,EACN,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,gBAAgB;gBAFhB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB;IAG5C;;OAEG;IACG,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;IAyB/C;;;;;OAKG;IACG,OAAO,CACX,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,aAAa,EAC5B,iBAAiB,GAAE,iBAAsB,GACxC,OAAO,CAAC,gBAAgB,CAAC;IA+B5B;;OAEG;IACH,OAAO,CAAC,cAAc;IAsBtB;;OAEG;YACW,wBAAwB;IAStC;;OAEG;YACW,iBAAiB;IAwC/B;;OAEG;YACW,sBAAsB;CA4BrC"}
|
|
@@ -3,17 +3,14 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { logger } from '@coeiro-operator/common';
|
|
5
5
|
import { BUFFER_SIZES, FILTER_SETTINGS } from './constants.js';
|
|
6
|
-
import { convertToSpeed, validateSpeedParameters } from './speed-utils.js';
|
|
7
6
|
export class SynthesisProcessor {
|
|
8
7
|
config;
|
|
9
8
|
audioPlayer;
|
|
10
9
|
audioSynthesizer;
|
|
11
|
-
|
|
12
|
-
constructor(config, audioPlayer, audioSynthesizer, voiceResolver) {
|
|
10
|
+
constructor(config, audioPlayer, audioSynthesizer) {
|
|
13
11
|
this.config = config;
|
|
14
12
|
this.audioPlayer = audioPlayer;
|
|
15
13
|
this.audioSynthesizer = audioSynthesizer;
|
|
16
|
-
this.voiceResolver = voiceResolver;
|
|
17
14
|
}
|
|
18
15
|
/**
|
|
19
16
|
* AudioPlayerの初期化と設定
|
|
@@ -39,40 +36,24 @@ export class SynthesisProcessor {
|
|
|
39
36
|
}
|
|
40
37
|
/**
|
|
41
38
|
* 音声合成処理のメインメソッド
|
|
39
|
+
* @param text 合成するテキスト
|
|
40
|
+
* @param speakSettings 音声生成パラメータ
|
|
41
|
+
* @param processingOptions 処理制御オプション
|
|
42
42
|
*/
|
|
43
|
-
async process(text,
|
|
43
|
+
async process(text, speakSettings, processingOptions = {}) {
|
|
44
44
|
logger.info(`音声合成開始: テキスト="${text.substring(0, 50)}${text.length > 50 ? '...' : ''}"`);
|
|
45
|
-
logger.debug(`
|
|
46
|
-
|
|
47
|
-
const resolvedOptions = this.resolveOptions(options);
|
|
48
|
-
logger.debug(`process - resolved rate: ${resolvedOptions.rate} (type: ${typeof resolvedOptions.rate})`);
|
|
45
|
+
logger.debug(`SpeakSettings:`, speakSettings);
|
|
46
|
+
logger.debug(`ProcessingOptions:`, processingOptions);
|
|
49
47
|
// サーバー接続確認を最初に行う
|
|
50
48
|
await this.validateServerConnection();
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
'resolvedOptions.voice': resolvedOptions.voice,
|
|
54
|
-
'resolvedOptions.style': resolvedOptions.style,
|
|
55
|
-
'resolvedOptions.allowFallback': resolvedOptions.allowFallback,
|
|
56
|
-
});
|
|
57
|
-
const voiceConfig = await this.voiceResolver.resolveVoiceConfig(resolvedOptions.voice, resolvedOptions.style || undefined, resolvedOptions.allowFallback);
|
|
58
|
-
logger.debug('SynthesisProcessor.process() - VoiceConfig解決完了', {
|
|
59
|
-
speaker: voiceConfig.speaker.speakerName,
|
|
60
|
-
selectedStyleId: voiceConfig.selectedStyleId,
|
|
61
|
-
});
|
|
62
|
-
// 速度指定を変換（シンプルに両方渡す）
|
|
63
|
-
const speedSpec = {
|
|
64
|
-
rate: typeof resolvedOptions.rate === 'number' ? resolvedOptions.rate : undefined,
|
|
65
|
-
factor: resolvedOptions.factor
|
|
66
|
-
};
|
|
67
|
-
validateSpeedParameters(speedSpec);
|
|
68
|
-
const speed = convertToSpeed(speedSpec, voiceConfig);
|
|
69
|
-
logger.debug(`process - converted speed: ${speed} (type: ${typeof speed})`);
|
|
49
|
+
// オプション解析
|
|
50
|
+
const resolvedOptions = this.resolveOptions(processingOptions);
|
|
70
51
|
// 出力モードに応じた処理
|
|
71
52
|
if (resolvedOptions.outputFile) {
|
|
72
|
-
return await this.processFileOutput(text,
|
|
53
|
+
return await this.processFileOutput(text, speakSettings, resolvedOptions.chunkMode, resolvedOptions.outputFile);
|
|
73
54
|
}
|
|
74
55
|
else {
|
|
75
|
-
return await this.processStreamingOutput(text,
|
|
56
|
+
return await this.processStreamingOutput(text, speakSettings, resolvedOptions.chunkMode, resolvedOptions.bufferSize);
|
|
76
57
|
}
|
|
77
58
|
}
|
|
78
59
|
/**
|
|
@@ -80,21 +61,15 @@ export class SynthesisProcessor {
|
|
|
80
61
|
*/
|
|
81
62
|
resolveOptions(options) {
|
|
82
63
|
const resolved = {
|
|
83
|
-
voice: options.voice || null,
|
|
84
|
-
rate: options.rate ?? this.config.audio?.defaultRate,
|
|
85
|
-
factor: options.factor,
|
|
86
64
|
outputFile: options.outputFile || null,
|
|
87
|
-
style: options.style || null,
|
|
88
65
|
chunkMode: options.chunkMode || this.config.audio?.splitMode || 'punctuation',
|
|
89
66
|
bufferSize: options.bufferSize || this.config.audio?.bufferSize || BUFFER_SIZES.DEFAULT,
|
|
90
|
-
allowFallback: options.allowFallback ?? true,
|
|
91
67
|
};
|
|
92
|
-
logger.debug('===
|
|
68
|
+
logger.debug('=== PROCESSING OPTIONS DEBUG ===');
|
|
93
69
|
logger.debug(`Resolved options:`);
|
|
94
70
|
logger.debug(` chunkMode: ${resolved.chunkMode} (from: ${options.chunkMode ? 'options' : 'config.audio.splitMode fallback'})`);
|
|
95
71
|
logger.debug(` config.audio.splitMode: ${this.config.audio?.splitMode || 'undefined'}`);
|
|
96
72
|
logger.debug(` bufferSize: ${resolved.bufferSize}`);
|
|
97
|
-
logger.debug(` allowFallback: ${resolved.allowFallback}`);
|
|
98
73
|
return resolved;
|
|
99
74
|
}
|
|
100
75
|
/**
|
|
@@ -111,12 +86,12 @@ export class SynthesisProcessor {
|
|
|
111
86
|
/**
|
|
112
87
|
* ファイル出力処理
|
|
113
88
|
*/
|
|
114
|
-
async processFileOutput(text,
|
|
89
|
+
async processFileOutput(text, speakSettings, chunkMode, outputFile) {
|
|
115
90
|
logger.info(`ファイル出力モード: ${outputFile}`);
|
|
116
91
|
// Step 1: 音声合成（データ生成のみ）
|
|
117
92
|
logger.info('音声データ生成開始...');
|
|
118
|
-
logger.debug(`合成パラメータ - chunkMode: ${chunkMode}, speed: ${speed}`);
|
|
119
|
-
const generator = this.audioSynthesizer.synthesizeStream(text,
|
|
93
|
+
logger.debug(`合成パラメータ - chunkMode: ${chunkMode}, speed: ${speakSettings.speed}`);
|
|
94
|
+
const generator = this.audioSynthesizer.synthesizeStream(text, speakSettings, chunkMode);
|
|
120
95
|
// Step 2: データ収集（フラットな処理）
|
|
121
96
|
logger.info('音声データ収集中...');
|
|
122
97
|
const audioChunks = [];
|
|
@@ -142,12 +117,12 @@ export class SynthesisProcessor {
|
|
|
142
117
|
/**
|
|
143
118
|
* ストリーミング再生処理
|
|
144
119
|
*/
|
|
145
|
-
async processStreamingOutput(text,
|
|
120
|
+
async processStreamingOutput(text, speakSettings, chunkMode, bufferSize) {
|
|
146
121
|
logger.info('ストリーミング再生モード');
|
|
147
122
|
// Step 1: 音声合成（データ生成のみ）
|
|
148
123
|
logger.info('音声合成開始...');
|
|
149
|
-
logger.debug(`合成パラメータ - chunkMode: ${chunkMode}, speed: ${speed}`);
|
|
150
|
-
const generator = this.audioSynthesizer.synthesizeStream(text,
|
|
124
|
+
logger.debug(`合成パラメータ - chunkMode: ${chunkMode}, speed: ${speakSettings.speed}`);
|
|
125
|
+
const generator = this.audioSynthesizer.synthesizeStream(text, speakSettings, chunkMode);
|
|
151
126
|
// Step 2: 音声再生（再生のみ） - フラットな呼び出し
|
|
152
127
|
logger.info('音声再生開始...');
|
|
153
128
|
// AudioPlayerの初期化
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synthesis-processor.js","sourceRoot":"","sources":["../src/synthesis-processor.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"synthesis-processor.js","sourceRoot":"","sources":["../src/synthesis-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-helpers.d.ts","sourceRoot":"","sources":["../src/test-helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,GAAE,OAAO,CAAC,MAAM,CAAM,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"test-helpers.d.ts","sourceRoot":"","sources":["../src/test-helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,SAAS,GAAE,OAAO,CAAC,MAAM,CAAM,GAAG,aAAa,CAmEtF"}
|
package/dist/test-helpers.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* テスト用ヘルパー関数とモックファクトリ
|
|
3
3
|
*/
|
|
4
|
+
import { vi } from 'vitest';
|
|
4
5
|
/**
|
|
5
6
|
* テスト用のConfigManagerモックを作成
|
|
6
7
|
*/
|
|
@@ -62,9 +63,10 @@ export function createMockConfigManager(overrides = {}) {
|
|
|
62
63
|
};
|
|
63
64
|
},
|
|
64
65
|
getAvailableCharacterIds: async () => ['test-speaker-1', 'tsukuyomi'],
|
|
65
|
-
getOperatorConfig:
|
|
66
|
-
getAudioConfig:
|
|
67
|
-
getConnectionConfig:
|
|
66
|
+
getOperatorConfig: vi.fn().mockResolvedValue(mergedConfig.operator),
|
|
67
|
+
getAudioConfig: vi.fn().mockResolvedValue(mergedConfig.audio),
|
|
68
|
+
getConnectionConfig: vi.fn().mockResolvedValue(mergedConfig.connection),
|
|
69
|
+
getStateDir: () => '/tmp/test-state',
|
|
68
70
|
};
|
|
69
71
|
return mockConfigManager;
|
|
70
72
|
}
|
package/dist/test-helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-helpers.js","sourceRoot":"","sources":["../src/test-helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"test-helpers.js","sourceRoot":"","sources":["../src/test-helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAI5B;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,YAA6B,EAAE;IACrE,MAAM,aAAa,GAAW;QAC5B,UAAU,EAAE;YACV,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,OAAO;SACd;QACD,QAAQ,EAAE;YACR,OAAO,EAAE,QAAQ;YACjB,kBAAkB,EAAE,QAAQ;SAC7B;QACD,KAAK,EAAE;YACL,WAAW,EAAE,UAAU;YACvB,SAAS,EAAE,aAAa;YACxB,UAAU,EAAE,GAAG;YACf,kBAAkB,EAAE;gBAClB,cAAc,EAAE,CAAC;gBACjB,oBAAoB,EAAE,EAAE;gBACxB,gBAAgB,EAAE,CAAC;gBACnB,uBAAuB,EAAE,IAAI;aAC9B;SACF;QACD,UAAU,EAAE,EAAE;KACf,CAAC;IAEF,kBAAkB;IAClB,MAAM,YAAY,GAAG,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAEzD,6BAA6B;IAC7B,MAAM,iBAAiB,GAAG;QACxB,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC,YAAY;QACvC,kBAAkB,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;QAClC,kBAAkB,EAAE,KAAK,EAAE,WAAmB,EAAE,EAAE;YAChD,mBAAmB;YACnB,sCAAsC;YACtC,IAAI,WAAW,KAAK,gBAAgB,IAAI,WAAW,KAAK,mBAAmB,EAAE,CAAC;gBAC5E,OAAO;oBACL,SAAS,EAAE,gBAAgB,EAAG,gBAAgB;oBAC9C,IAAI,EAAE,WAAW;oBACjB,YAAY,EAAE,MAAM;oBACpB,eAAe,EAAE,CAAC,MAAM,CAAC;iBAC1B,CAAC;YACJ,CAAC;YACD,yBAAyB;YACzB,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;gBAChC,OAAO;oBACL,SAAS,EAAE,sCAAsC,EAAE,yBAAyB;oBAC5E,IAAI,EAAE,SAAS;oBACf,YAAY,EAAE,MAAM;oBACpB,eAAe,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;iBAC1C,CAAC;YACJ,CAAC;YACD,iBAAiB;YACjB,OAAO;gBACL,SAAS,EAAE,WAAW,GAAG,OAAO;gBAChC,IAAI,EAAE,WAAW;gBACjB,YAAY,EAAE,MAAM;gBACpB,eAAe,EAAE,CAAC,MAAM,CAAC;aAC1B,CAAC;QACJ,CAAC;QACD,wBAAwB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,gBAAgB,EAAE,WAAW,CAAC;QACrE,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,QAAQ,CAAC;QACnE,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC;QAC7D,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,UAAU,CAAC;QACvE,WAAW,EAAE,GAAG,EAAE,CAAC,iBAAiB;KACT,CAAC;IAE9B,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAI,MAAS,EAAE,MAAkB;IACjD,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IAE7B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YAC9B,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC3F,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CACrB,MAAM,CAAC,GAAG,CAAQ,EAClB,MAAM,CAAC,GAAG,CAAQ,CACnB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAQ,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|