demofly 0.2.7 → 0.2.9
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/README.md +154 -0
- package/dist/commands/analyze.d.ts +3 -0
- package/dist/commands/analyze.d.ts.map +1 -0
- package/dist/commands/analyze.js +163 -0
- package/dist/commands/analyze.js.map +1 -0
- package/dist/commands/demos/get.d.ts.map +1 -1
- package/dist/commands/demos/get.js +3 -1
- package/dist/commands/demos/get.js.map +1 -1
- package/dist/commands/demos/open.d.ts.map +1 -1
- package/dist/commands/demos/open.js +3 -1
- package/dist/commands/demos/open.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +575 -49
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +50 -6
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/push.d.ts.map +1 -1
- package/dist/commands/push.js +23 -3
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/render.d.ts.map +1 -1
- package/dist/commands/render.js +5 -2
- package/dist/commands/render.js.map +1 -1
- package/dist/commands/tts.d.ts.map +1 -1
- package/dist/commands/tts.js +127 -12
- package/dist/commands/tts.js.map +1 -1
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +19 -0
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/voices/select.d.ts.map +1 -1
- package/dist/commands/voices/select.js +66 -11
- package/dist/commands/voices/select.js.map +1 -1
- package/dist/lib/audio-probe.d.ts +23 -0
- package/dist/lib/audio-probe.d.ts.map +1 -0
- package/dist/lib/audio-probe.js +59 -0
- package/dist/lib/audio-probe.js.map +1 -0
- package/dist/lib/demo-config.d.ts +7 -0
- package/dist/lib/demo-config.d.ts.map +1 -1
- package/dist/lib/demo-config.js +9 -0
- package/dist/lib/demo-config.js.map +1 -1
- package/dist/lib/edit-proposals.d.ts +48 -1
- package/dist/lib/edit-proposals.d.ts.map +1 -1
- package/dist/lib/edit-proposals.js +49 -0
- package/dist/lib/edit-proposals.js.map +1 -1
- package/dist/lib/push-project.d.ts +37 -0
- package/dist/lib/push-project.d.ts.map +1 -0
- package/dist/lib/push-project.js +194 -0
- package/dist/lib/push-project.js.map +1 -0
- package/dist/lib/resolve-demo.d.ts +9 -0
- package/dist/lib/resolve-demo.d.ts.map +1 -0
- package/dist/lib/resolve-demo.js +10 -0
- package/dist/lib/resolve-demo.js.map +1 -0
- package/dist/lib/retiming.js +47 -0
- package/dist/lib/retiming.js.map +1 -1
- package/dist/lib/scene-assembler.d.ts +29 -0
- package/dist/lib/scene-assembler.d.ts.map +1 -0
- package/dist/lib/scene-assembler.js +202 -0
- package/dist/lib/scene-assembler.js.map +1 -0
- package/dist/lib/voice-resolver.d.ts +4 -0
- package/dist/lib/voice-resolver.d.ts.map +1 -1
- package/dist/lib/voice-resolver.js +5 -2
- package/dist/lib/voice-resolver.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
import { execSync } from "node:child_process";
|
|
2
|
+
import { existsSync, mkdirSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { resolve } from "node:path";
|
|
4
|
+
import { probeAudioDuration, computeOverflow, } from "./audio-probe.js";
|
|
5
|
+
const COLORS = {
|
|
6
|
+
reset: "\x1b[0m",
|
|
7
|
+
yellow: "\x1b[33m",
|
|
8
|
+
red: "\x1b[31m",
|
|
9
|
+
dim: "\x1b[2m",
|
|
10
|
+
};
|
|
11
|
+
const ATEMPO_CAP = 1.25;
|
|
12
|
+
function findSceneAudioFile(audioDir, sceneId) {
|
|
13
|
+
const extensions = [".wav", ".mp3", ".aac", ".m4a", ".ogg"];
|
|
14
|
+
for (const ext of extensions) {
|
|
15
|
+
const filePath = resolve(audioDir, `${sceneId}${ext}`);
|
|
16
|
+
if (existsSync(filePath))
|
|
17
|
+
return filePath;
|
|
18
|
+
}
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
function emitWarning(info) {
|
|
22
|
+
const overflowStr = `${(info.overflowMs / 1000).toFixed(1)}s`;
|
|
23
|
+
const method = info.correction === "atempo"
|
|
24
|
+
? `atempo ${info.atempoRatio.toFixed(2)}x applied`
|
|
25
|
+
: "freeze-frame applied";
|
|
26
|
+
if (info.severity === "critical") {
|
|
27
|
+
console.warn(` ${COLORS.red}${info.sceneId}: audio ${overflowStr} over window (${method}) — consider shortening transcript${COLORS.reset}`);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
console.warn(` ${COLORS.yellow}${info.sceneId}: audio ${overflowStr} over window (${method})${COLORS.reset}`);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Assemble a final video from per-scene video clips and audio files.
|
|
35
|
+
*
|
|
36
|
+
* Pipeline:
|
|
37
|
+
* 1. Split source video into per-scene clips
|
|
38
|
+
* 2. For each scene, probe audio duration vs video duration
|
|
39
|
+
* 3. Apply correction if overflow (freeze-frame or atempo)
|
|
40
|
+
* 4. Mux each scene's video + audio
|
|
41
|
+
* 5. Concatenate all scenes into final.mp4
|
|
42
|
+
*/
|
|
43
|
+
export function assembleScenes(videoPath, timingData, audioDir, recordingsDir, options = {}) {
|
|
44
|
+
const scenesDir = resolve(recordingsDir, "scenes");
|
|
45
|
+
const corrections = [];
|
|
46
|
+
const muxedPaths = [];
|
|
47
|
+
// Step 1: Split video into per-scene clips
|
|
48
|
+
for (const scene of timingData.scenes) {
|
|
49
|
+
const sceneDir = resolve(scenesDir, scene.sceneId);
|
|
50
|
+
mkdirSync(sceneDir, { recursive: true });
|
|
51
|
+
const startSec = scene.startMs / 1000;
|
|
52
|
+
const durationSec = (scene.endMs - scene.startMs) / 1000;
|
|
53
|
+
const clipPath = resolve(sceneDir, "video.webm");
|
|
54
|
+
try {
|
|
55
|
+
execSync(`ffmpeg -y -i "${videoPath}" -ss ${startSec} -t ${durationSec} -c copy "${clipPath}"`, { encoding: "utf-8", timeout: 300_000, stdio: ["pipe", "pipe", "pipe"] });
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
const execError = error;
|
|
59
|
+
console.warn(`Warning: Failed to split ${scene.sceneId}:`);
|
|
60
|
+
if (execError.stderr)
|
|
61
|
+
console.warn(execError.stderr);
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
// Step 2–4: Probe, correct, mux
|
|
65
|
+
const audioPath = findSceneAudioFile(audioDir, scene.sceneId);
|
|
66
|
+
const muxedPath = resolve(sceneDir, "muxed.mp4");
|
|
67
|
+
if (audioPath) {
|
|
68
|
+
const sceneWindowMs = scene.endMs - scene.startMs;
|
|
69
|
+
const audioDurationMs = probeAudioDuration(audioPath);
|
|
70
|
+
const { overflowMs, severity } = computeOverflow(audioDurationMs, sceneWindowMs);
|
|
71
|
+
const correctionInfo = muxWithCorrection(clipPath, audioPath, muxedPath, overflowMs, severity, sceneWindowMs, audioDurationMs, scene.sceneId, options);
|
|
72
|
+
corrections.push(correctionInfo);
|
|
73
|
+
if (correctionInfo.correction !== "none") {
|
|
74
|
+
emitWarning(correctionInfo);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
// No audio — transcode video only
|
|
79
|
+
try {
|
|
80
|
+
execSync(`ffmpeg -y -i "${clipPath}" -c:v libx264 -preset fast -crf 23 -pix_fmt yuv420p -an "${muxedPath}"`, { encoding: "utf-8", timeout: 300_000, stdio: ["pipe", "pipe", "pipe"] });
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
const execError = error;
|
|
84
|
+
console.warn(`Warning: Failed to transcode ${scene.sceneId}:`);
|
|
85
|
+
if (execError.stderr)
|
|
86
|
+
console.warn(execError.stderr);
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
if (existsSync(muxedPath)) {
|
|
91
|
+
muxedPaths.push(muxedPath);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
// Step 5: Concatenate all per-scene clips
|
|
95
|
+
const finalPath = resolve(recordingsDir, "final.mp4");
|
|
96
|
+
if (muxedPaths.length === 0) {
|
|
97
|
+
throw new Error("No scene clips were produced for concatenation");
|
|
98
|
+
}
|
|
99
|
+
if (muxedPaths.length === 1) {
|
|
100
|
+
execSync(`cp "${muxedPaths[0]}" "${finalPath}"`, { stdio: "pipe" });
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
const concatList = muxedPaths.map((p) => `file '${p}'`).join("\n");
|
|
104
|
+
const concatFile = resolve(recordingsDir, "concat.txt");
|
|
105
|
+
writeFileSync(concatFile, concatList, "utf-8");
|
|
106
|
+
try {
|
|
107
|
+
execSync(`ffmpeg -y -f concat -safe 0 -i "${concatFile}" -c copy -movflags +faststart "${finalPath}"`, { encoding: "utf-8", timeout: 600_000, stdio: ["pipe", "pipe", "pipe"] });
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
const execError = error;
|
|
111
|
+
console.error("ffmpeg concat failed:");
|
|
112
|
+
if (execError.stderr)
|
|
113
|
+
console.error(execError.stderr);
|
|
114
|
+
throw new Error("Failed to concatenate scene clips");
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
// Compute adjusted total duration
|
|
118
|
+
const totalFreeze = corrections
|
|
119
|
+
.filter((c) => c.correction === "freeze-frame" || c.correction === "freeze-frame-fallback")
|
|
120
|
+
.reduce((sum, c) => sum + Math.max(0, c.overflowMs), 0);
|
|
121
|
+
const adjustedTotalDurationMs = timingData.totalDuration + totalFreeze;
|
|
122
|
+
return { finalPath, corrections, adjustedTotalDurationMs };
|
|
123
|
+
}
|
|
124
|
+
function muxWithCorrection(clipPath, audioPath, muxedPath, overflowMs, severity, sceneWindowMs, audioDurationMs, sceneId, options) {
|
|
125
|
+
if (overflowMs <= 0) {
|
|
126
|
+
// Audio fits — simple mux
|
|
127
|
+
try {
|
|
128
|
+
execSync(`ffmpeg -y -i "${clipPath}" -i "${audioPath}" ` +
|
|
129
|
+
`-map 0:v -map 1:a ` +
|
|
130
|
+
`-c:v libx264 -preset fast -crf 23 -pix_fmt yuv420p ` +
|
|
131
|
+
`-c:a aac -b:a 128k ` +
|
|
132
|
+
`-movflags +faststart "${muxedPath}"`, { encoding: "utf-8", timeout: 300_000, stdio: ["pipe", "pipe", "pipe"] });
|
|
133
|
+
}
|
|
134
|
+
catch (error) {
|
|
135
|
+
const execError = error;
|
|
136
|
+
console.warn(`Warning: Failed to mux ${sceneId}:`);
|
|
137
|
+
if (execError.stderr)
|
|
138
|
+
console.warn(execError.stderr);
|
|
139
|
+
}
|
|
140
|
+
return { sceneId, overflowMs, severity, correction: "none" };
|
|
141
|
+
}
|
|
142
|
+
// Audio overflows — decide correction method
|
|
143
|
+
if (options.useAtempo) {
|
|
144
|
+
const ratio = audioDurationMs / sceneWindowMs;
|
|
145
|
+
if (ratio <= ATEMPO_CAP) {
|
|
146
|
+
// Apply atempo
|
|
147
|
+
return applyAtempo(clipPath, audioPath, muxedPath, sceneId, overflowMs, severity, ratio);
|
|
148
|
+
}
|
|
149
|
+
// Exceeds cap — fall back to freeze-frame
|
|
150
|
+
console.warn(` ${COLORS.yellow}${sceneId}: atempo ratio ${ratio.toFixed(2)}x exceeds cap ${ATEMPO_CAP}x, using freeze-frame${COLORS.reset}`);
|
|
151
|
+
return applyFreezeFrame(clipPath, audioPath, muxedPath, sceneId, overflowMs, severity, true);
|
|
152
|
+
}
|
|
153
|
+
// Default: freeze-frame
|
|
154
|
+
return applyFreezeFrame(clipPath, audioPath, muxedPath, sceneId, overflowMs, severity, false);
|
|
155
|
+
}
|
|
156
|
+
function applyFreezeFrame(clipPath, audioPath, muxedPath, sceneId, overflowMs, severity, isFallback) {
|
|
157
|
+
const padSec = Math.ceil(overflowMs / 1000) + 2;
|
|
158
|
+
try {
|
|
159
|
+
execSync(`ffmpeg -y -i "${clipPath}" -i "${audioPath}" ` +
|
|
160
|
+
`-filter_complex "[0:v]tpad=stop_mode=clone:stop_duration=${padSec}[v]" ` +
|
|
161
|
+
`-map "[v]" -map 1:a ` +
|
|
162
|
+
`-c:v libx264 -preset fast -crf 23 -pix_fmt yuv420p ` +
|
|
163
|
+
`-c:a aac -b:a 128k -shortest ` +
|
|
164
|
+
`-movflags +faststart "${muxedPath}"`, { encoding: "utf-8", timeout: 300_000, stdio: ["pipe", "pipe", "pipe"] });
|
|
165
|
+
}
|
|
166
|
+
catch (error) {
|
|
167
|
+
const execError = error;
|
|
168
|
+
console.warn(`Warning: Failed to freeze-frame mux ${sceneId}:`);
|
|
169
|
+
if (execError.stderr)
|
|
170
|
+
console.warn(execError.stderr);
|
|
171
|
+
}
|
|
172
|
+
return {
|
|
173
|
+
sceneId,
|
|
174
|
+
overflowMs,
|
|
175
|
+
severity,
|
|
176
|
+
correction: isFallback ? "freeze-frame-fallback" : "freeze-frame",
|
|
177
|
+
};
|
|
178
|
+
}
|
|
179
|
+
function applyAtempo(clipPath, audioPath, muxedPath, sceneId, overflowMs, severity, ratio) {
|
|
180
|
+
try {
|
|
181
|
+
execSync(`ffmpeg -y -i "${clipPath}" -i "${audioPath}" ` +
|
|
182
|
+
`-filter_complex "[1:a]atempo=${ratio.toFixed(6)}[a]" ` +
|
|
183
|
+
`-map 0:v -map "[a]" ` +
|
|
184
|
+
`-c:v libx264 -preset fast -crf 23 -pix_fmt yuv420p ` +
|
|
185
|
+
`-c:a aac -b:a 128k ` +
|
|
186
|
+
`-movflags +faststart "${muxedPath}"`, { encoding: "utf-8", timeout: 300_000, stdio: ["pipe", "pipe", "pipe"] });
|
|
187
|
+
}
|
|
188
|
+
catch (error) {
|
|
189
|
+
const execError = error;
|
|
190
|
+
console.warn(`Warning: Failed to atempo mux ${sceneId}:`);
|
|
191
|
+
if (execError.stderr)
|
|
192
|
+
console.warn(execError.stderr);
|
|
193
|
+
}
|
|
194
|
+
return {
|
|
195
|
+
sceneId,
|
|
196
|
+
overflowMs,
|
|
197
|
+
severity,
|
|
198
|
+
correction: "atempo",
|
|
199
|
+
atempoRatio: ratio,
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
//# sourceMappingURL=scene-assembler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scene-assembler.js","sourceRoot":"","sources":["../../src/lib/scene-assembler.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,5 +78,9 @@ export declare function resolveVoiceFromFlags(voiceName: string | undefined, pro
|
|
|
78
78
|
createApiClient: (token: string) => {
|
|
79
79
|
get<T>(path: string): Promise<T>;
|
|
80
80
|
};
|
|
81
|
+
demoVoicePreference?: {
|
|
82
|
+
name: string;
|
|
83
|
+
provider: string;
|
|
84
|
+
} | null;
|
|
81
85
|
}): Promise<ResolvedVoice>;
|
|
82
86
|
//# sourceMappingURL=voice-resolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"voice-resolver.d.ts","sourceRoot":"","sources":["../../src/lib/voice-resolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,8DAA8D;AAC9D,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;EAQhB,CAAC;AAEX,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,sFAAsF;IACtF,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,CAAC,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,GACnH,cAAc,EAAE,CAsBlB;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,eAAe,EAAE,cAAc,EAAE,GAChC,aAAa,GAAG,IAAI,CAwBtB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAE1D;AAED,6CAA6C;AAC7C,eAAO,MAAM,oBAAoB,EAAE,aAKlC,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,EAAE;IACJ,eAAe,EAAE,MAAM;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACvC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK;QAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"voice-resolver.d.ts","sourceRoot":"","sources":["../../src/lib/voice-resolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,8DAA8D;AAC9D,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;EAQhB,CAAC;AAEX,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,sFAAsF;IACtF,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,CAAC,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,GACnH,cAAc,EAAE,CAsBlB;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,eAAe,EAAE,cAAc,EAAE,GAChC,aAAa,GAAG,IAAI,CAwBtB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAE1D;AAED,6CAA6C;AAC7C,eAAO,MAAM,oBAAoB,EAAE,aAKlC,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,EAAE;IACJ,eAAe,EAAE,MAAM;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACvC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK;QAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC;IACzE,mBAAmB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACjE,GACA,OAAO,CAAC,aAAa,CAAC,CA6BxB"}
|
|
@@ -84,8 +84,11 @@ export const KOKORO_DEFAULT_VOICE = {
|
|
|
84
84
|
*/
|
|
85
85
|
export async function resolveVoiceFromFlags(voiceName, providerName, deps) {
|
|
86
86
|
const defaultVoice = deps.getDefaultVoice();
|
|
87
|
-
|
|
88
|
-
const
|
|
87
|
+
// Resolution order: CLI flags → demo preference → system default
|
|
88
|
+
const demoVoice = deps.demoVoicePreference;
|
|
89
|
+
const effectiveDefault = demoVoice ?? defaultVoice;
|
|
90
|
+
const name = voiceName ?? effectiveDefault.name;
|
|
91
|
+
const provider = providerName ?? (voiceName ? undefined : effectiveDefault.provider);
|
|
89
92
|
const token = await deps.getToken();
|
|
90
93
|
let apiVoices;
|
|
91
94
|
if (token) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"voice-resolver.js","sourceRoot":"","sources":["../../src/lib/voice-resolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"voice-resolver.js","sourceRoot":"","sources":["../../src/lib/voice-resolver.ts"],"names":[],"mappings":"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"}
|