fix(spotify): GoLibrespotBackend start() cleanup on failure + unhandled-error guard

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
saopig1andClaude Opus 4.8 committed 2026-07-02 21:04:42 +08:00
1 parent 9d55bea240
commit 641da086e5
2 files changed
+65 -2

No files matched your search

+40
View File
@@ -219,3 +219,43 @@ describe("GoLibrespotBackend.stop", () => {
expect(h.backend.isReady()).toBe(false); expect(h.backend.isReady()).toBe(false);
}); });
}); });
describe("GoLibrespotBackend.start failure cleanup", () => {
it("tears down ffmpeg, go-librespot, and the FIFO when readiness polling never succeeds", async () => {
const h = makeHarness();
// ping() never returns true → waitUntilReady() times out → start() rejects
// AFTER both processes were spawned and the FIFO was created.
h.rest.ping.mockResolvedValue(false);
// FIFO present so the cleanup path unlinks it.
h.existsSync.mockReturnValue(true);
await expect(h.backend.start()).rejects.toThrow(/did not become ready/);
expect(h.ffmpegChild.kill).toHaveBeenCalled(); // ffmpeg killed on failed startup
expect(h.gliChild.kill).toHaveBeenCalled(); // go-librespot killed on failed startup
expect(h.unlinkSync).toHaveBeenCalledWith("/tmp/work/go-librespot.fifo"); // FIFO removed
expect(h.backend.isReady()).toBe(false);
});
});
describe("GoLibrespotBackend child-process error handling", () => {
it("does not throw when a child 'error' is emitted with no backend 'error' listener attached", async () => {
const h = makeHarness();
await h.backend.start();
// No "error" listener on the backend: an unhandled 'error' event would crash
// Node, so the backend must swallow+log it instead of re-emitting.
expect(h.backend.listenerCount("error")).toBe(0);
expect(() => h.ffmpegChild.emit("error", new Error("ffmpeg boom"))).not.toThrow();
expect(() => h.gliChild.emit("error", new Error("gli boom"))).not.toThrow();
});
it("re-emits a child 'error' to an attached backend 'error' listener", async () => {
const h = makeHarness();
await h.backend.start();
const onErr = vi.fn();
h.backend.on("error", onErr);
const err = new Error("ffmpeg boom");
h.ffmpegChild.emit("error", err);
expect(onErr).toHaveBeenCalledWith(err);
});
});
+25 -2
View File
@@ -105,6 +105,11 @@ export class GoLibrespotBackend extends EventEmitter implements SpotifyAudioBack
if (existsSync(this.fifoPath)) unlinkSync(this.fifoPath); if (existsSync(this.fifoPath)) unlinkSync(this.fifoPath);
execFileSync("mkfifo", [this.fifoPath]); execFileSync("mkfifo", [this.fifoPath]);
// Everything past this point spawns processes / opens sockets. If any step
// throws (e.g. the readiness poll times out), tear down whatever was already
// created via stop() (kill ffmpeg + go-librespot, close WS, remove FIFO) so
// we don't leak child processes or leave the FIFO on disk, then rethrow.
try {
// 3. Spawn ffmpeg FIRST so the PCM reader is attached to the FIFO before // 3. Spawn ffmpeg FIRST so the PCM reader is attached to the FIFO before
// go-librespot (the writer) starts pushing raw 44.1k s16le into it. // go-librespot (the writer) starts pushing raw 44.1k s16le into it.
// Opening the FIFO for writing before a reader exists errors with ENXIO. // Opening the FIFO for writing before a reader exists errors with ENXIO.
@@ -120,7 +125,7 @@ export class GoLibrespotBackend extends EventEmitter implements SpotifyAudioBack
this.ffmpeg.stderr?.on("data", (b: Buffer) => this.ffmpeg.stderr?.on("data", (b: Buffer) =>
this.log.debug({ ffmpeg: b.toString().trim() }, "ffmpeg"), this.log.debug({ ffmpeg: b.toString().trim() }, "ffmpeg"),
); );
this.ffmpeg.on("error", (err) => this.emit("error", err)); this.ffmpeg.on("error", (err) => this.emitError(err));
// 4. Render + write config.yml into the config dir. // 4. Render + write config.yml into the config dir.
const yml = renderConfigYml({ const yml = renderConfigYml({
@@ -142,7 +147,7 @@ export class GoLibrespotBackend extends EventEmitter implements SpotifyAudioBack
const onLog = (b: Buffer) => this.log.info({ golibrespot: b.toString().trim() }, "go-librespot"); const onLog = (b: Buffer) => this.log.info({ golibrespot: b.toString().trim() }, "go-librespot");
this.proc.stdout?.on("data", onLog); this.proc.stdout?.on("data", onLog);
this.proc.stderr?.on("data", onLog); this.proc.stderr?.on("data", onLog);
this.proc.on("error", (err) => this.emit("error", err)); this.proc.on("error", (err) => this.emitError(err));
this.proc.on("exit", (code, signal) => { this.proc.on("exit", (code, signal) => {
this.ready = false; this.ready = false;
this.log.warn({ code, signal }, "go-librespot exited"); this.log.warn({ code, signal }, "go-librespot exited");
@@ -165,6 +170,24 @@ export class GoLibrespotBackend extends EventEmitter implements SpotifyAudioBack
this.ready = true; this.ready = true;
this.emit("ready"); this.emit("ready");
} catch (e) {
this.stop();
throw e;
}
}
/**
* Re-emit a child-process "error" only when a consumer is listening; Node
* throws on an unhandled "error" event (can crash the process), so with no
* listener we log via the injected logger instead. Mirrors the WS client's
* listenerCount("error") gate in go-librespot-api.ts.
*/
private emitError(err: unknown): void {
if (this.listenerCount("error") > 0) {
this.emit("error", err);
} else {
this.log.error({ err }, "go-librespot backend error (no listener)");
}
} }
private async waitUntilReady(): Promise<void> { private async waitUntilReady(): Promise<void> {