@glissade/narrate 0.8.1-pre.0 → 0.8.1-pre.1

package/dist/providers.d.ts

@@ -71,19 +71,6 @@ declare function piperProvider(opts?: {
 /** PCM16 mono WAV from float samples in [-1, 1]. Round-to-nearest → deterministic. */
 declare function floatToWav(samples: Float32Array, sampleRate: number): Buffer;
 type KokoroDtype = 'fp32' | 'fp16' | 'q8' | 'q4' | 'q4f16';
-/**
- * Apache-2.0 82M neural TTS — markedly more natural than espeak/piper, fully
- * offline on CPU via onnxruntime, no API key. Pure-Node through `kokoro-js`
- * (Transformers.js), so unlike piper there is no `pip install` / external
- * binary; `kokoro-js` is an OPTIONAL peer dep, lazy-loaded here.
- *
- * DETERMINISTIC by construction: inference takes tokenized phonemes + a FIXED
- * voice/style embedding (not diffusion-sampled per call), so the same text →
- * byte-identical PCM — no noise to zero out (piper's trick). `version()` pins
- * the lib version + model + dtype, so any of those moving invalidates the
- * cache. The model (~q8 92MB / fp32 326MB) downloads + caches on first use; it
- * stays out of the bundle and the determinism-critical path.
- */
 declare function kokoroProvider(opts?: {
   model?: string;
   voice?: string;

package/dist/providers.js

@@ -5,6 +5,7 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { homedir, tmpdir } from "node:os";
 import { spawnSync } from "node:child_process";
+import { pathToFileURL } from "node:url";
 //#region src/providers.ts
 /**
 * '@glissade/narrate/providers' — the Node-only prepare side. Provider calls
@@ -264,16 +265,61 @@ const KOKORO_DEFAULT_VOICE = "af_heart";
 * cache. The model (~q8 92MB / fp32 326MB) downloads + caches on first use; it
 * stays out of the bundle and the determinism-critical path.
 */
+/** kokoro-js version read by walking up from its entry (it does not export
+* `./package.json`, so the subpath can't be resolved directly). */
+function kokoroVersionFrom(entry) {
+	let dir = dirname(entry);
+	for (let i = 0; i < 8; i++) {
+		const p = join(dir, "package.json");
+		if (existsSync(p)) try {
+			const j = JSON.parse(readFileSync(p, "utf8"));
+			if (j.name === "kokoro-js" && j.version) return j.version;
+		} catch {}
+		const up = dirname(dir);
+		if (up === dir) break;
+		dir = up;
+	}
+	return "unknown";
+}
+/**
+* Resolve the OPTIONAL peer `kokoro-js` from the USER'S project first. Under
+* pnpm's isolated layout a peer is NOT linked into `@glissade/narrate`'s own
+* store dir, so a bare `import('kokoro-js')` from this module fails; resolving
+* relative to `process.cwd()` (where the user ran `add kokoro-js`) finds it.
+* Falls back to this module for hoisted/global installs. Returns a `file://`
+* entry URL (so the dynamic import is never bundled) + the resolved version.
+* Throws a NarrationError that carries the REAL resolution error.
+*/
+function resolveKokoro() {
+	const bases = [pathToFileURL(join(process.cwd(), "package.json")).href, import.meta.url];
+	let lastErr;
+	for (const base of bases) try {
+		const entry = createRequire(base).resolve("kokoro-js");
+		return {
+			entryUrl: pathToFileURL(entry).href,
+			version: kokoroVersionFrom(entry)
+		};
+	} catch (e) {
+		lastErr = e;
+	}
+	throw new NarrationError(`kokoro-js could not be resolved from ${process.cwd()} (${lastErr?.code ?? "error"}: ${lastErr?.message ?? "not found"}) — install it in your project (npm / pnpm / yarn add kokoro-js; pnpm users must also allow its native build scripts — see the narration docs), or use --provider piper/espeak/openai`);
+}
 function kokoroProvider(opts = {}) {
 	const modelId = opts.model ?? KOKORO_MODEL;
 	const dtype = opts.dtype ?? "q8";
 	let loaded = null;
 	const loadLib = async () => {
+		const { entryUrl } = resolveKokoro();
+		let mod;
 		try {
-			return await import("kokoro-js");
-		} catch {
-			throw new NarrationError("kokoro-js not found — `npm install kokoro-js` (it pulls onnxruntime-node), or use --provider piper/espeak/openai");
+			mod = await import(entryUrl);
+		} catch (e) {
+			const err = e;
+			throw new NarrationError(`kokoro-js failed to load from ${entryUrl} (${err?.code ?? "error"}: ${err?.message ?? String(e)}) — ensure kokoro-js and onnxruntime-node are installed, or use --provider piper/espeak/openai`);
 		}
+		const lib = mod["KokoroTTS"] ? mod : mod["default"];
+		if (!lib?.KokoroTTS) throw new NarrationError(`kokoro-js loaded but exposes no KokoroTTS export (from ${entryUrl})`);
+		return lib;
 	};
 	const getModel = () => loaded ??= loadLib().then((k) => k.KokoroTTS.from_pretrained(modelId, {
 		dtype,
@@ -282,15 +328,8 @@ function kokoroProvider(opts = {}) {
 	return {
 		id: "kokoro",
 		version: () => {
-			let lib = "kokoro-js";
-			try {
-				const req = createRequire(import.meta.url);
-				const pkg = JSON.parse(readFileSync(req.resolve("kokoro-js/package.json"), "utf8"));
-				if (pkg.version) lib = `kokoro-js ${pkg.version}`;
-			} catch {
-				throw new NarrationError("kokoro-js not found — `npm install kokoro-js` (it pulls onnxruntime-node), or use --provider piper/espeak/openai");
-			}
-			return Promise.resolve(`${lib} ${basename(modelId)} dtype=${dtype}`);
+			const { version } = resolveKokoro();
+			return Promise.resolve(`kokoro-js ${version} ${basename(modelId)} dtype=${dtype}`);
 		},
 		synthesize: async (req) => {
 			const tts = await getModel();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glissade/narrate",
-  "version": "0.8.1-pre.0",
+  "version": "0.8.1-pre.1",
   "description": "glissade narration + captions: TTS at prepare time (gs narrate), deterministic caching, narration-anchored timeline beats, and captions as plain tracks. Render stays offline.",
   "license": "Apache-2.0",
   "type": "module",
@@ -19,8 +19,8 @@
     "dist"
   ],
   "dependencies": {
-    "@glissade/core": "0.8.1-pre.0",
-    "@glissade/scene": "0.8.1-pre.0"
+    "@glissade/core": "0.8.1-pre.1",
+    "@glissade/scene": "0.8.1-pre.1"
   },
   "peerDependencies": {
     "kokoro-js": "^1.2.0"