echogarden 0.11.21 → 0.12.0

package/src/codecs/FFMpegTranscoder.ts

@@ -6,6 +6,7 @@ import { Logger } from "../utilities/Logger.js"
 import { commandExists, logToStderr } from "../utilities/Utilities.js"
 import path from "node:path"
 import { loadPackage } from "../utilities/PackageManager.js"
+import { getGlobalOption } from "../api/GlobalOptions.js"
 
 const log = logToStderr
 
@@ -147,25 +148,53 @@ function buildCommandLineArguments(inputFilename: string, outputOptions: FFMpegO
 }
 
 async function getFFMpegExecutablePath() {
-	if (process.platform == "win32") {
-		const ffmpegPackagePath = await loadPackage("ffmpeg-6.0-essentials-win64")
-
-		return path.join(ffmpegPackagePath, "ffmpeg.exe")
+	// If a global option set for the path, use it
+	if (getGlobalOption('ffmpegPath')) {
+		return getGlobalOption('ffmpegPath')
+	}
+
+	// If an 'ffmpeg' command exist in system path, use it
+	if (await commandExists('ffmpeg')) {
+		return 'ffmpeg'
+	}
+
+	// Otherwise, download and use an internal ffmpeg package
+	const platform = process.platform
+	const arch = process.arch
+
+	let packageName: string
+
+	if (platform === 'win32' && arch === 'x64') {
+		packageName = 'ffmpeg-6.0-win32-x64'
+	} else if (platform === 'win32' && arch === 'ia32') {
+		packageName = 'ffmpeg-6.0-win32-ia32'
+	} else if (platform === 'darwin' && arch === 'x64') {
+		packageName = 'ffmpeg-6.0-darwin-x64'
+	} else if (platform === 'darwin' && arch === 'arm64') {
+		packageName = 'ffmpeg-6.0-darwin-arm64'
+	} else if (platform === 'linux' && arch === 'x64') {
+		packageName = 'ffmpeg-6.0-linux-x64'
+	} else if (platform === 'linux' && arch === 'ia32') {
+		packageName = 'ffmpeg-6.0-linux-ia32'
+	} else if (platform === 'linux' && arch === 'arm64') {
+		packageName = 'ffmpeg-6.0-linux-arm64'
+	} else if (platform === 'linux' && arch === 'arm') {
+		packageName = 'ffmpeg-6.0-linux-arm'
+	} else if (platform === 'freebsd' && arch === 'x64') {
+		packageName = 'ffmpeg-6.0-freebsd-x64'
+	} else {
+		return undefined
 	}
-	/* else if (process.platform == "darwin" && process.arch == "x64") {
-		const ffmpegPackagePath = await loadPackage("ffmpeg-6.0-macos64")
 
-		return path.join(ffmpegPackagePath, "ffmpeg")
-	}
-	*/ else if (process.platform == "linux" && process.arch == "x64") {
-		const ffmpegPackagePath = await loadPackage("ffmpeg-6.0-linux-amd64")
+	const ffmpegPackagePath = await loadPackage(packageName)
+
+	let filename = packageName
 
-		return path.join(ffmpegPackagePath, "ffmpeg")
-	} else if (await commandExists("ffmpeg")) {
-		return "ffmpeg"
+	if (platform === 'win32') {
+		filename += '.exe'
 	}
 
-	return undefined
+	return path.join(ffmpegPackagePath, filename)
 }
 
 export function getDefaultFFMpegOptionsForSpeech(fileExtension: string, customBitrate?: number) {

package/src/synthesis/VitsTTS.ts

@@ -293,6 +293,12 @@ export const voiceList: SynthesisVoice[] = [
 		languages: ["de-DE", "de"],
 		gender: "male",
 	},
+	{
+		name: "de_DE-mls-medium",
+		languages: ["de-DE", "de"],
+		gender: "unknown",
+		speakerCount: 236
+	},
 
 	{
 		name: "el_GR-rapunzelina-low",
@@ -353,6 +359,12 @@ export const voiceList: SynthesisVoice[] = [
 		languages: ["en-GB", "en"],
 		gender: "female",
 	},
+	{
+		name: "en_GB-cori-high",
+		languages: ["en-GB", "en"],
+		gender: "female",
+	},
+
 
 	{
 		name: "en_US-amy-low",
@@ -443,6 +455,21 @@ export const voiceList: SynthesisVoice[] = [
 		languages: ["en-US", "en"],
 		gender: "female",
 	},
+	{
+		name: "en_US-kristin-medium",
+		languages: ["en-US", "en"],
+		gender: "female",
+	},
+	{
+		name: "en_US-ljspeech-high",
+		languages: ["en-US", "en"],
+		gender: "female",
+	},
+	{
+		name: "en_US-ljspeech-medium",
+		languages: ["en-US", "en"],
+		gender: "female",
+	},
 
 	{
 		name: "es_ES-carlfm-x_low",
@@ -476,6 +503,23 @@ export const voiceList: SynthesisVoice[] = [
 		languages: ["es-MX", "es"],
 		gender: "male",
 	},
+	{
+		name: "es_MX-claude-high",
+		languages: ["es-MX", "es"],
+		gender: "female",
+	},
+
+	{
+		name: "fa_IR-amir-medium",
+		languages: ["fa_IR", "fa"],
+		gender: "male",
+	},
+	{
+		name: "fa_IR-gyro-medium",
+		languages: ["fa_IR", "fa"],
+		gender: "male",
+	},
+
 
 	{
 		name: "fi_FI-harri-low",
@@ -514,6 +558,17 @@ export const voiceList: SynthesisVoice[] = [
 		gender: "unknown",
 		speakerCount: 2
 	},
+	{
+		name: "fr_FR-mls-medium",
+		languages: ["fr-FR", "fr"],
+		gender: "unknown",
+		speakerCount: 125
+	},
+	{
+		name: "fr_FR-tom-medium",
+		languages: ["fr-FR", "fr"],
+		gender: "male",
+	},
 
 	{
 		name: "hu_HU-anna-medium",
@@ -605,6 +660,12 @@ export const voiceList: SynthesisVoice[] = [
 		languages: ["nl-NL", "nl"],
 		gender: "female",
 	},
+	{
+		name: "nl_NL-mls-medium",
+		languages: ["nl-NL", "nl"],
+		gender: "unknown",
+		speakerCount: 52,
+	},
 
 	{
 		name: "nl_BE-nathalie-x_low",
@@ -705,6 +766,12 @@ export const voiceList: SynthesisVoice[] = [
 		gender: "female",
 	},
 
+	{
+		name: "sl_SI-artur-medium",
+		languages: ["sl_SI", "sl"],
+		gender: "male",
+	},
+
 	{
 		name: "sr_RS-serbski_institut-medium",
 		languages: ["sr-RS", "sr"],
@@ -734,6 +801,11 @@ export const voiceList: SynthesisVoice[] = [
 		languages: ["tr-TR", "tr"],
 		gender: "male",
 	},
+	{
+		name: "tr_TR-fettah-medium",
+		languages: ["tr-TR", "tr"],
+		gender: "male",
+	},
 
 	{
 		name: "uk_UA-lada-x_low",

package/src/utilities/PackageManager.ts

@@ -1,8 +1,8 @@
-import path from "node:path"
-import { downloadAndExtractTarball } from "./FileDownloader.js"
-import { getAppDataDir, getAppTempDir, ensureDir, existsSync, remove } from "./FileSystem.js"
-import { appName } from "../api/Common.js"
-import { GaxiosOptions } from "gaxios"
+import path from 'node:path'
+import { downloadAndExtractTarball } from './FileDownloader.js'
+import { getAppDataDir, getAppTempDir, ensureDir, existsSync, remove } from './FileSystem.js'
+import { appName } from '../api/Common.js'
+import { GaxiosOptions } from 'gaxios'
 
 export async function loadPackage(packageName: string) {
 	packageName = resolveToVersionedPackageNameIfNeeded(packageName)
@@ -48,7 +48,7 @@ export async function removePackage(packageName: string) {
 export async function ensureAndGetPackagesDir() {
 	const dataPath = getAppDataDir(appName)
 
-	const packagesPath = path.join(dataPath, "packages")
+	const packagesPath = path.join(dataPath, 'packages')
 
 	await ensureDir(packagesPath)
 
@@ -75,45 +75,69 @@ export function resolveVersionTagForUnversionedPackageName(unversionedPackageNam
 	return packageVersionTagResolutionLookup[unversionedPackageName] || defaultVersionTag
 }
 
-const basePackageUrl = "https://huggingface.co/echogarden/echogarden-packages/resolve/main/"
+const basePackageUrl = 'https://huggingface.co/echogarden/echogarden-packages/resolve/main/'
 
-const defaultVersionTag = "20230718"
+const defaultVersionTag = '20230718'
 
 const packageVersionTagResolutionLookup: { [packageName: string]: string } = {
-	"sox-14.4.2-linux-minimal": "20230802",
-
-	"vits-de_DE-thorsten_emotional-medium": "20230808",
-	"vits-en_GB-semaine-medium": "20230808",
-	"vits-fr_FR-upmc-medium": "20230808",
-	"vits-lb_LU-marylux-medium": "20230808",
-	"vits-ro_RO-mihai-medium": "20230808",
-	"vits-sr_RS-serbski_institut-medium": "20230808",
-	"vits-tr_TR-dfki-medium": "20230808",
-
-	"vits-cs_CZ-jirka-medium": "20230824",
-	"vits-de_DE-thorsten-high": "20230824",
-	"vits-hu_HU-anna-medium": "20230824",
-	"vits-pt_PT-tugao-medium": "20230824",
-	"vits-sk_SK-lili-medium": "20230824",
-	"vits-tr_TR-fahrettin-medium": "20230824",
-
-	"vits-ar_JO-kareem-medium": "20231022",
-	"vits-cs_CZ-jirka-low": "20231022",
-	"vits-en_US-hfc_male-medium": "20231022",
-	"vits-en_US-libritts_r-medium": "20231022",
-	"vits-hu_HU-imre-medium": "20231022",
-	"vits-pl_PL-mc_speech-medium": "20231022",
-
-	"whisper-tiny": "20231126",
-	"whisper-tiny.en": "20231126",
-	"whisper-base": "20231126",
-	"whisper-base.en": "20231126",
-	"whisper-small": "20231126",
-	"whisper-small.en": "20231126",
-	"whisper-medium": "20231126",
-	"whisper-medium.en": "20231126",
-	"whisper-large-v3": "20231126",
-
-	"vits-ar_JO-kareem-low": "20231126",
-	"vits-en_US-hfc_female-medium": "20231126",
+	'sox-14.4.2-linux-minimal': '20230802',
+
+	'vits-de_DE-thorsten_emotional-medium': '20230808',
+	'vits-en_GB-semaine-medium': '20230808',
+	'vits-fr_FR-upmc-medium': '20230808',
+	'vits-lb_LU-marylux-medium': '20230808',
+	'vits-ro_RO-mihai-medium': '20230808',
+	'vits-sr_RS-serbski_institut-medium': '20230808',
+	'vits-tr_TR-dfki-medium': '20230808',
+
+	'vits-cs_CZ-jirka-medium': '20230824',
+	'vits-de_DE-thorsten-high': '20230824',
+	'vits-hu_HU-anna-medium': '20230824',
+	'vits-pt_PT-tugao-medium': '20230824',
+	'vits-sk_SK-lili-medium': '20230824',
+	'vits-tr_TR-fahrettin-medium': '20230824',
+
+	'vits-ar_JO-kareem-medium': '20231022',
+	'vits-cs_CZ-jirka-low': '20231022',
+	'vits-en_US-hfc_male-medium': '20231022',
+	'vits-en_US-libritts_r-medium': '20231022',
+	'vits-hu_HU-imre-medium': '20231022',
+	'vits-pl_PL-mc_speech-medium': '20231022',
+
+	'whisper-tiny': '20231126',
+	'whisper-tiny.en': '20231126',
+	'whisper-base': '20231126',
+	'whisper-base.en': '20231126',
+	'whisper-small': '20231126',
+	'whisper-small.en': '20231126',
+	'whisper-medium': '20231126',
+	'whisper-medium.en': '20231126',
+	'whisper-large-v3': '20231126',
+
+	'vits-ar_JO-kareem-low': '20231126',
+	'vits-en_US-hfc_female-medium': '20231126',
+
+	'ffmpeg-6.0-win32-x64': '20240316',
+	'ffmpeg-6.0-win32-ia32': '20240316',
+	'ffmpeg-6.0-darwin-x64': '20240316',
+	'ffmpeg-6.0-darwin-arm64': '20240316',
+	'ffmpeg-6.0-linux-x64': '20240316',
+	'ffmpeg-6.0-linux-ia32': '20240316',
+	'ffmpeg-6.0-linux-arm64': '20240316',
+	'ffmpeg-6.0-linux-arm': '20240316',
+	'ffmpeg-6.0-freebsd-x64': '20240316',
+
+	'vits-de_DE-mls-medium': '20240316',
+	'vits-en_GB-cori-high': '20240316',
+	'vits-en_US-kristin-medium': '20240316',
+	'vits-en_US-ljspeech-high': '20240316',
+	'vits-en_US-ljspeech-medium': '20240316',
+	'vits-es_MX-claude-high': '20240316',
+	'vits-fa_IR-amir-medium': '20240316',
+	'vits-fa_IR-gyro-medium': '20240316',
+	'vits-fr_FR-mls-medium': '20240316',
+	'vits-fr_FR-tom-medium': '20240316',
+	'vits-nl_NL-mls-medium': '20240316',
+	'vits-sl_SI-artur-medium': '20240316',
+	'vits-tr_TR-fettah-medium': '20240316',
 }

package/src/utilities/Utilities.ts

@@ -6,6 +6,7 @@ import { RandomGenerator } from './RandomGenerator.js'
 import { randomUUID, randomBytes } from 'node:crypto'
 import { Logger } from './Logger.js'
 import chalk from 'chalk'
+import { shouldCancelCurrentTask } from '../server/Worker.js'
 
 const log = logToStderr
 
@@ -588,6 +589,10 @@ export async function runOperationWithRetries<R>(
 
 			return result
 		} catch (e: any) {
+			if (shouldCancelCurrentTask()) {
+				throw new Error("Canceled")
+			}
+
 			logger.setAsActiveLogger()
 
 			logger.logTitledMessage(`Error`, e.message, chalk.redBright)