echogarden 0.12.2 → 1.0.0

package/src/tests/Test.ts

@@ -1,12 +1,12 @@
-import { getRepetitionScoreRelativeToFirstSubstring, logToStderr, setupProgramTerminationListeners } from "../utilities/Utilities.js"
-import { makeTarballsForInstalledPackages } from "../utilities/TarballMaker.js"
-import { testEspeakSynthesisWithPrePhonemizedInputs, testKirshenbaumPhonemization } from "../synthesis/EspeakTTS.js"
+import { getRepetitionScoreRelativeToFirstSubstring, logToStderr, setupProgramTerminationListeners } from '../utilities/Utilities.js'
+import { makeTarballsForInstalledPackages } from '../utilities/TarballMaker.js'
+import { testEspeakSynthesisWithPrePhonemizedInputs, testKirshenbaumPhonemization } from '../synthesis/EspeakTTS.js'
 
 const log = logToStderr
 
 setupProgramTerminationListeners()
 //process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
-//process.env.http_proxy = "http://localhost:8080"
+//process.env.http_proxy = 'http://localhost:8080'
 
 //const testText = `After a while, finding that nothing more happened, she decided on going into the garden at once; but, alas for poor Alice! when she got to the door, she found she had forgotten the little golden key, and when she went back to the table for it, she found she could not possibly reach it: she could see it quite plainly through the glass, and she tried her best to climb up one of the legs of the table, but it was too slippery; and when she had tired herself out with trying, the poor little thing sat down and cried.`
 

package/src/utilities/Compression.ts

@@ -2,7 +2,7 @@ import path from 'node:path'
 import { Logger } from './Logger.js'
 import { readdir, stat } from './FileSystem.js'
 
-export async function createTarball(filePath: string, outputFile: string, prefixPath = "") {
+export async function createTarball(filePath: string, outputFile: string, prefixPath = '') {
 	const pathStat = await stat(filePath)
 
 	if (pathStat.isDirectory()) {
@@ -12,12 +12,12 @@ export async function createTarball(filePath: string, outputFile: string, prefix
 	}
 }
 
-export async function createTarballForFile(filePath: string, outputFile: string, prefixPath = "") {
+export async function createTarballForFile(filePath: string, outputFile: string, prefixPath = '') {
 	const logger = new Logger()
 
 	logger.start(`Creating ${prefixPath || path.basename(outputFile)}`)
 
-	const { default: tar } = await import('tar')
+	const { create } = await import('tar')
 
 	const inputFileStat = await stat(filePath)
 
@@ -28,15 +28,17 @@ export async function createTarballForFile(filePath: string, outputFile: string,
 	const filename = path.basename(filePath)
 	const dirname = path.dirname(filePath)
 
-	await tar.create({
-		gzip: { level: 9, memLevel: 9 },
+	await create({
+		gzip: { level: 9 },
 		file: outputFile,
 		cwd: dirname,
 		prefix: prefixPath,
 		mode: 0o775,
 
 		filter: (path, stat) => {
-			stat.mode |= 0o775
+			if (stat.mode) {
+				stat.mode |= 0o775
+			}
 
 			return true
 		}
@@ -46,12 +48,12 @@ export async function createTarballForFile(filePath: string, outputFile: string,
 	logger.end()
 }
 
-export async function createTarballForDir(inputDir: string, outputFile: string, prefixPath = "") {
+export async function createTarballForDir(inputDir: string, outputFile: string, prefixPath = '') {
 	const logger = new Logger()
 
 	logger.start(`Creating ${prefixPath || path.basename(outputFile)}`)
 
-	const { default: tar } = await import('tar')
+	const { create } = await import('tar')
 
 	const inputDirStat = await stat(inputDir)
 
@@ -61,15 +63,17 @@ export async function createTarballForDir(inputDir: string, outputFile: string,
 
 	const filesInBaseDir = await readdir(inputDir)
 
-	await tar.create({
-		gzip: { level: 9, memLevel: 9 },
+	await create({
+		gzip: { level: 9 },
 		file: outputFile,
 		cwd: inputDir,
 		prefix: prefixPath,
 		mode: 0o775,
 
 		filter: (path, stat) => {
-			stat.mode |= 0o775
+			if (stat.mode) {
+				stat.mode |= 0o775
+			}
 
 			return true
 		}
@@ -80,12 +84,29 @@ export async function createTarballForDir(inputDir: string, outputFile: string,
 }
 
 export async function extractTarball(filepath: string, outputDir: string) {
-	const { default: tar } = await import('tar')
+	const { extract } = await import('tar')
 
-	await tar.extract({
+	await extract({
 		file: filepath,
 		cwd: outputDir,
 		preserveOwner: false,
 		//noChmod: true
 	})
 }
+
+export async function getDeflateCompressionMetricsForString(str: string) {
+	const zlib = await import('node:zlib')
+	const { promisify } = await import('node:util')
+
+	const originalStringBytes = Buffer.from(str, 'utf-8')
+
+	const deflateRaw = promisify(zlib.deflateRaw)
+
+	const compressedStringBytes = await deflateRaw(originalStringBytes)
+
+	return {
+		originalSize: originalStringBytes.length,
+		compressedSize: compressedStringBytes.length,
+		ratio: compressedStringBytes.length / originalStringBytes.length
+	}
+}

package/src/utilities/FileDownloader.ts

@@ -1,16 +1,16 @@
-import { GaxiosOptions, request } from "gaxios"
-import { Readable } from "stream"
-import { getRandomHexString, writeToStderr } from "./Utilities.js"
-import { OpenPromise } from "./OpenPromise.js"
-
-import { Timer } from "./Timer.js"
-import { Logger } from "./Logger.js"
-import path from "node:path"
-import { extractTarball } from "./Compression.js"
-import { createWriteStream, move, remove, readdir, ensureDir } from "./FileSystem.js"
-import chalk from "chalk"
-
-export async function downloadAndExtractTarball(options: GaxiosOptions, targetDir: string, baseTempPath: string, displayName = "archive") {
+import { GaxiosOptions, request } from 'gaxios'
+import { Readable } from 'stream'
+import { getRandomHexString, writeToStderr } from './Utilities.js'
+import { OpenPromise } from './OpenPromise.js'
+
+import { Timer } from './Timer.js'
+import { Logger } from './Logger.js'
+import path from 'node:path'
+import { extractTarball } from './Compression.js'
+import { createWriteStream, move, remove, readdir, ensureDir } from './FileSystem.js'
+import chalk from 'chalk'
+
+export async function downloadAndExtractTarball(options: GaxiosOptions, targetDir: string, baseTempPath: string, displayName = 'archive') {
 	const logger = new Logger()
 
 	const randomID = getRandomHexString(16).toLowerCase()
@@ -39,7 +39,7 @@ export async function downloadAndExtractTarball(options: GaxiosOptions, targetDi
 	logger.end()
 }
 
-export async function downloadFile(options: GaxiosOptions, targetFilePath: string, prompt = "Downloading") {
+export async function downloadFile(options: GaxiosOptions, targetFilePath: string, prompt = 'Downloading') {
 	const write = writeToStderr
 
 	const downloadPromise = new OpenPromise<void>()
@@ -140,13 +140,13 @@ export async function downloadFile(options: GaxiosOptions, targetFilePath: strin
 	}
 
 	const partialFilePath = `${targetFilePath}.${getRandomHexString(16)}.partial`
-	const fileWriteStream = createWriteStream(partialFilePath, { encoding: "binary", autoClose: true })
+	const fileWriteStream = createWriteStream(partialFilePath, { encoding: 'binary', autoClose: true })
 
 	let statusInterval = setInterval(() => {
 		updateStatus()
 	}, statusUpdateInterval)
 
-	response.data.on("data", (chunk: Uint8Array) => {
+	response.data.on('data', (chunk: Uint8Array) => {
 		try {
 			const contentLengthString = response.headers['content-length']
 
@@ -168,14 +168,14 @@ export async function downloadFile(options: GaxiosOptions, targetFilePath: strin
 		}
 	})
 
-	response.data.on("end", async () => {
+	response.data.on('end', async () => {
 		try {
 			clearInterval(statusInterval)
 			updateStatus()
 
 			fileWriteStream.end()
 
-			write("\n")
+			write('\n')
 
 			await move(partialFilePath, targetFilePath)
 
@@ -186,7 +186,7 @@ export async function downloadFile(options: GaxiosOptions, targetFilePath: strin
 		}
 	})
 
-	response.data.on("error", async (err: any) => {
+	response.data.on('error', async (err: any) => {
 		try {
 			clearInterval(statusInterval)
 

package/src/utilities/FileSystem.ts

@@ -86,7 +86,7 @@ export async function computeFileSha256Hex(filePath: string) {
 }
 
 export async function readAndParseJsonFile(jsonFilePath: string, useJson5 = false) {
-	const fileContent = await readFile(jsonFilePath, { encoding: "utf-8" })
+	const fileContent = await readFile(jsonFilePath, { encoding: 'utf-8' })
 
 	if (useJson5) {
 		const { default: JSON5 } = await import('json5')
@@ -116,12 +116,12 @@ export function getAppDataDir(appName: string) {
 	const platform = process.platform
 	const homeDir = os.homedir()
 
-	if (platform == "win32") {
-		dataDir = path.join(homeDir, "AppData", "Local", appName)
-	} else if (platform == "darwin") {
-		dataDir = path.join(homeDir, "Library", "Application Support", appName)
-	} else if (platform == "linux") {
-		dataDir = path.join(homeDir, ".local", "share", appName)
+	if (platform == 'win32') {
+		dataDir = path.join(homeDir, 'AppData', 'Local', appName)
+	} else if (platform == 'darwin') {
+		dataDir = path.join(homeDir, 'Library', 'Application Support', appName)
+	} else if (platform == 'linux') {
+		dataDir = path.join(homeDir, '.local', 'share', appName)
 	} else {
 		throw new Error(`Unsupport platform ${platform}`)
 	}

package/src/utilities/Locale.ts

@@ -1,5 +1,5 @@
-import { readAndParseJsonFile } from "./FileSystem.js"
-import { resolveToModuleRootDir } from "./PathUtilities.js"
+import { readAndParseJsonFile } from './FileSystem.js'
+import { resolveToModuleRootDir } from './PathUtilities.js'
 
 export function languageCodeToName(languageCode: string) {
 	const languageNames = new Intl.DisplayNames(['en'], { type: 'language' })
@@ -11,7 +11,7 @@ export function languageCodeToName(languageCode: string) {
 	} catch (e) {
 	}
 
-	return translatedLanguageName || "Unknown"
+	return translatedLanguageName || 'Unknown'
 }
 
 export function formatLanguageCodeWithName(languageCode: string, styleId: 1 | 2 = 1) {
@@ -23,7 +23,7 @@ export function formatLanguageCodeWithName(languageCode: string, styleId: 1 | 2
 }
 
 export function getShortLanguageCode(langCode: string) {
-	const dashIndex = langCode.indexOf("-")
+	const dashIndex = langCode.indexOf('-')
 
 	if (dashIndex == -1) {
 		return langCode
@@ -35,7 +35,7 @@ export function getShortLanguageCode(langCode: string) {
 export function normalizeLanguageCode(langCode: string) {
 	langCode = langCode.trim()
 
-	const parts = langCode.split("-")
+	const parts = langCode.split('-')
 
 	const result = [parts[0].toLowerCase()]
 
@@ -43,7 +43,7 @@ export function normalizeLanguageCode(langCode: string) {
 		result.push(parts[i].toUpperCase())
 	}
 
-	return result.join("-")
+	return result.join('-')
 }
 
 const isoToLcidLookup = new Map<string, number>()
@@ -67,7 +67,7 @@ async function loadLcidLookupIfNeeded() {
 		return lcidEntries
 	}
 
-	const lcidLookup: LCIDLookup = await readAndParseJsonFile(resolveToModuleRootDir("data/tables/lcid-table.json"))
+	const lcidLookup: LCIDLookup = await readAndParseJsonFile(resolveToModuleRootDir('data/tables/lcid-table.json'))
 
 	for (const isoName in lcidLookup) {
 		const lcidEntry = lcidLookup[isoName]
@@ -97,24 +97,24 @@ export function getDefaultDialectForLanguageCodeIfPossible(langCode: string) {
 }
 
 export const defaultDialectForLanguageCode: { [lang: string]: string } = {
-	"en": "en-US",
-	"zh": "zh-CN",
-	"ar": "ar-EG",
-	"fr": "fr-FR",
-	"de": "de-DE",
-	"pt": "pt-BR",
-	"es": "es-ES",
-	"nl": "nl-NL"
+	'en': 'en-US',
+	'zh': 'zh-CN',
+	'ar': 'ar-EG',
+	'fr': 'fr-FR',
+	'de': 'de-DE',
+	'pt': 'pt-BR',
+	'es': 'es-ES',
+	'nl': 'nl-NL'
 }
 
 type LCIDLookup = { [isoLangCode: string]: LCIDEntry }
 
 export interface LCIDEntry {
-	"LCID": number
-	"Name": string
-	"TwoLetterISOLanguageName": string,
-	"ThreeLetterISOLanguageName": string,
-	"ThreeLetterWindowsLanguageName": string,
-	"EnglishName": string
-	"ANSICodePage": string
+	'LCID': number
+	'Name': string
+	'TwoLetterISOLanguageName': string,
+	'ThreeLetterISOLanguageName': string,
+	'ThreeLetterWindowsLanguageName': string,
+	'EnglishName': string
+	'ANSICodePage': string
 }

package/src/utilities/Logger.ts

@@ -1,6 +1,6 @@
-import chalk from "chalk"
-import { Timer } from "./Timer.js"
-import { logToStderr, writeToStderr, yieldToEventLoop } from "./Utilities.js"
+import chalk from 'chalk'
+import { Timer } from './Timer.js'
+import { logToStderr, writeToStderr, yieldToEventLoop } from './Utilities.js'
 
 let currentActiveLogger: Logger | null = null
 
@@ -26,7 +26,7 @@ export class Logger {
 		writeToStderr(`${titleColor(title)}.. `)
 
 		this.setAsActiveLogger()
-		
+
 		this.timer.restart()
 	}
 

package/src/utilities/ObjectUtilities.ts

@@ -30,7 +30,7 @@ export function deepClone<T>(val: T) {
 }
 
 function clone<T>(val: T, deep = true, seenObjects: any[] = []): T {
-	if (val == null || typeof val !== "object") {
+	if (val == null || typeof val !== 'object') {
 		return val
 	}
 
@@ -38,9 +38,9 @@ function clone<T>(val: T, deep = true, seenObjects: any[] = []): T {
 	const prototypeIdentifier = toString.call(obj)
 
 	switch (prototypeIdentifier) {
-		case "[object Array]": {
+		case '[object Array]': {
 			if (seenObjects.includes(obj)) {
-				throw new Error("deepClone: encountered a cyclic object")
+				throw new Error('deepClone: encountered a cyclic object')
 			}
 
 			seenObjects.push(obj)
@@ -60,81 +60,81 @@ function clone<T>(val: T, deep = true, seenObjects: any[] = []): T {
 			return <any>clonedArray
 		}
 
-		case "[object ArrayBuffer]": {
+		case '[object ArrayBuffer]': {
 			const clonedArray = new Uint8Array(obj.byteLength)
 			clonedArray.set(new Uint8Array(obj))
 			return <any>clonedArray.buffer
 		}
 
-		case "[object Int8Array]": {
+		case '[object Int8Array]': {
 			const clonedArray = new Int8Array(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Uint8Array]": {
+		case '[object Uint8Array]': {
 			const clonedArray = new Uint8Array(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Uint8ClampedArray]": {
+		case '[object Uint8ClampedArray]': {
 			const clonedArray = new Uint8ClampedArray(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Int16Array]": {
+		case '[object Int16Array]': {
 			const clonedArray = new Int16Array(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Uint16Array]": {
+		case '[object Uint16Array]': {
 			const clonedArray = new Uint16Array(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Int32Array]": {
+		case '[object Int32Array]': {
 			const clonedArray = new Int32Array(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Uint32Array]": {
+		case '[object Uint32Array]': {
 			const clonedArray = new Uint32Array(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Float32Array]": {
+		case '[object Float32Array]': {
 			const clonedArray = new Float32Array(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Float64Array]": {
+		case '[object Float64Array]': {
 			const clonedArray = new Float64Array(obj.length)
 			clonedArray.set(obj)
 			return <any>clonedArray
 		}
 
-		case "[object Date]": {
+		case '[object Date]': {
 			return <any>new Date(obj.valueOf())
 		}
 
-		case "[object RegExp]": {
+		case '[object RegExp]': {
 			return obj
 		}
 
-		case "[object Function]": {
+		case '[object Function]': {
 			return obj
 		}
 
-		case "[object Object]": {
+		case '[object Object]': {
 			if (seenObjects.includes(obj)) {
-				throw new Error("deepClone: encountered a cyclic object")
+				throw new Error('deepClone: encountered a cyclic object')
 			}
 
 			seenObjects.push(obj)
@@ -165,5 +165,5 @@ function clone<T>(val: T, deep = true, seenObjects: any[] = []): T {
 }
 
 export function isPlainObject(val: any) {
-	return val != null && typeof val === "object" && toString.call(val) === "[object Object]"
+	return val != null && typeof val === 'object' && toString.call(val) === '[object Object]'
 }

package/src/utilities/OpenPromise.ts

@@ -1,8 +1,8 @@
 export class OpenPromise<T = void>
 {
 	promise: Promise<T>
-	resolve: (value: T) => void = () => { throw new Error("OpenPromise resolved before initialization") }
-	reject: (reason?: any) => void = () => { throw new Error("OpenPromise rejected before initialization") }
+	resolve: (value: T) => void = () => { throw new Error('Open promise resolved before initialization') }
+	reject: (reason?: any) => void = () => { throw new Error('Open promise rejected before initialization') }
 
 	constructor() {
 		this.promise = new Promise<T>((resolve, reject) => {

package/src/utilities/PackageManager.ts

@@ -141,4 +141,44 @@ const packageVersionTagResolutionLookup: { [packageName: string]: string } = {
 	'vits-nl_NL-mls-medium': '20240316',
 	'vits-sl_SI-artur-medium': '20240316',
 	'vits-tr_TR-fettah-medium': '20240316',
+
+	'mdxnet-UVR_MDXNET_1_9703': '20240330',
+	'mdxnet-UVR_MDXNET_2_9682': '20240330',
+	'mdxnet-UVR_MDXNET_3_9662': '20240330',
+	'mdxnet-UVR_MDXNET_KARA': '20240330',
+
+	'whisper.cpp-tiny': '20240405',
+	'whisper.cpp-tiny-q5_1': '20240405',
+	'whisper.cpp-tiny.en': '20240405',
+	'whisper.cpp-tiny.en-q5_1': '20240405',
+	'whisper.cpp-tiny.en-q8_0': '20240405',
+
+	'whisper.cpp-base': '20240405',
+	'whisper.cpp-base-q5_1': '20240405',
+	'whisper.cpp-base.en': '20240405',
+	'whisper.cpp-base.en-q5_1': '20240405',
+
+	'whisper.cpp-small': '20240405',
+	'whisper.cpp-small-q5_1': '20240405',
+	'whisper.cpp-small.en': '20240405',
+	'whisper.cpp-small.en-q5_1': '20240405',
+
+	'whisper.cpp-medium': '20240405',
+	'whisper.cpp-medium-q5_0': '20240405',
+	'whisper.cpp-medium.en': '20240405',
+	'whisper.cpp-medium.en-q5_0': '20240405',
+
+	'whisper.cpp-large-v1': '20240405',
+	'whisper.cpp-large-v2': '20240405',
+	'whisper.cpp-large-v2-q5_0': '20240405',
+	'whisper.cpp-large-v3': '20240405',
+	'whisper.cpp-large-v3-q5_0': '20240405',
+
+	'whisper.cpp-binaries-linux-x64-cpu-latest-patched': '20240405',
+	'whisper.cpp-binaries-windows-x64-cpu-latest-patched': '20240409',
+
+	'whisper-tiktoken-data': '20240408',
+
+	'whisper.cpp-binaries-windows-x64-cublas-12.4.0-latest-patched': '20240409',
+	'whisper.cpp-binaries-windows-x64-cublas-11.8.0-latest-patched': '20240409',
 }

package/src/utilities/PathUtilities.ts

@@ -12,10 +12,10 @@ export function resolveToModuleRootDir(relativePath: string) {
 }
 
 export function getLowercaseFileExtension(filename: string) {
-	const fileExtensionIndex = filename.lastIndexOf(".")
+	const fileExtensionIndex = filename.lastIndexOf('.')
 
 	if (fileExtensionIndex == -1) {
-		return ""
+		return ''
 	}
 
 	return filename.substring(fileExtensionIndex + 1).toLowerCase()
@@ -27,12 +27,12 @@ export function getAppTempDir(appName: string) {
 	const platform = process.platform
 	const homeDir = os.homedir()
 
-	if (platform == "win32") {
-		tempDir = path.join(homeDir, "AppData", "Local", "Temp", appName)
-	} else if (platform == "darwin") {
-		tempDir = path.join(homeDir, "Library", "Caches", appName)
-	} else if (platform == "linux") {
-		tempDir = path.join(homeDir, ".cache", appName)
+	if (platform == 'win32') {
+		tempDir = path.join(homeDir, 'AppData', 'Local', 'Temp', appName)
+	} else if (platform == 'darwin') {
+		tempDir = path.join(homeDir, 'Library', 'Caches', appName)
+	} else if (platform == 'linux') {
+		tempDir = path.join(homeDir, '.cache', appName)
 	} else {
 		throw new Error(`Unsupport platform ${platform}`)
 	}

package/src/utilities/RandomGenerator.ts

@@ -1,5 +1,5 @@
-import { sumVector } from "../math/VectorMath.js"
-import { logToStderr } from "./Utilities.js"
+import { sumVector } from '../math/VectorMath.js'
+import { logToStderr } from './Utilities.js'
 
 export abstract class RandomGenerator {
 	getIntInRange(min: number, max: number) {
@@ -85,7 +85,7 @@ export abstract class RandomGenerator {
 		const randomTarget = this.getFloatInRange(0, sum)
 
 		let cumSum = 0
-		
+
 		for (let i = 0; i < distribution.length; i++) {
 			const element = distribution[i]
 

package/src/utilities/SmoothEstimator.ts

@@ -0,0 +1,35 @@
+export class SmoothEstimator {
+	estimate: number
+
+	constructor(
+		public readonly positiveAdaptationRate: number,
+		public readonly negativeAdaptationRate: number,
+		initialEstimate = 0.0) {
+
+		this.estimate = initialEstimate
+	}
+
+	update(target: number, adaptaionRateFactor = 1.0) {
+		const residual = target - this.estimate
+
+		const adaptationRate = residual >= 0 ? this.positiveAdaptationRate : this.negativeAdaptationRate
+
+		const stepSize = residual * adaptationRate * adaptaionRateFactor
+
+		this.estimate += stepSize
+	}
+
+	updateDamped(target: number, dampingReference: number, dampingCurvature: number, adaptationRateFactor = 1.0) {
+		const residual = target - this.estimate
+
+		const scaledResidualMagnitude = Math.abs(residual) * dampingCurvature
+
+		const dampingFactor = (scaledResidualMagnitude) / (scaledResidualMagnitude + dampingReference)
+
+		const adaptationRate = residual >= 0 ? this.positiveAdaptationRate : this.negativeAdaptationRate
+
+		const stepSize = residual * adaptationRate * adaptationRateFactor * dampingFactor
+
+		this.estimate += stepSize
+	}
+}

package/src/utilities/TarballMaker.ts

@@ -1,12 +1,12 @@
-import path from "path"
-import { createTarball } from "./Compression.js"
-import { ensureDir, existsSync, move, readdir, stat } from "./FileSystem.js"
-import { ensureAndGetPackagesDir } from "./PackageManager.js"
-import { appName } from "../api/Common.js"
-import { getRandomHexString } from "./Utilities.js"
-import { getAppTempDir } from "./PathUtilities.js"
-
-const tarballDir = "../resources/tarballs"
+import path from 'path'
+import { createTarball } from './Compression.js'
+import { ensureDir, existsSync, move, readdir, stat } from './FileSystem.js'
+import { ensureAndGetPackagesDir } from './PackageManager.js'
+import { appName } from '../api/Common.js'
+import { getRandomHexString } from './Utilities.js'
+import { getAppTempDir } from './PathUtilities.js'
+
+const tarballDir = '../resources/tarballs'
 
 export async function makeTarballsForInstalledPackages(skipIfExists = false) {
 	const packagesDir = await ensureAndGetPackagesDir()