@audiofool/moondog 0.2.2 → 0.3.0-beta.2

package/src/i18n/screen/zh.mjs

@@ -1027,4 +1027,37 @@ export default {
   "Skipped. /service and /model are here when you want them.": "已跳过。需要时随时可以用 /service 和 /model。",
   "Saving your music service...": "正在保存音乐服务...",
   "Choose where Moondog plays music": "选择 Moondog 在哪里放音乐",
+  "Make music on this Mac with Stable Audio 3": "用 Stable Audio 3 在这台 Mac 上做音乐",
+  "Stop making music here": "不再在这里做音乐",
+  "Making music on this Mac": "在这台 Mac 上做音乐",
+  "Made by Moondog": "Moondog 制作",
+  "Stable Audio 3 needs a Mac with Apple silicon, so Moondog can't make music here.": "Stable Audio 3 需要搭载 Apple 芯片的 Mac，所以 Moondog 没法在这里做音乐。",
+  "Moondog makes music on this Mac with Stable Audio 3, powered by Stability AI. Ask for a track. Stable Audio 3 runs offline, and the track stays on this Mac.": "Moondog 用这台 Mac 上的 Stable Audio 3 做音乐，Powered by Stability AI。想听就让它做一首。Stable Audio 3 离线运行，做出的曲子留在这台 Mac 上。",
+  "Making music on this Mac is off. Stable Audio 3 is ready at {folder}; turn it on with /generation on.": "在这台 Mac 上做音乐已关闭。Stable Audio 3 已在 {folder} 准备好，用 /generation on 开启。",
+  "Making music on this Mac is off, and Stable Audio 3 isn't at {folder}. Install Stability AI's MLX build from github.com/Stability-AI/stable-audio-3, then use /generation on with its folder.": "在这台 Mac 上做音乐已关闭，{folder} 里也没有 Stable Audio 3。先从 github.com/Stability-AI/stable-audio-3 安装 Stability AI 的 MLX 版本，再用 /generation on 加上它的文件夹。",
+  "Making music on this Mac is off, and Stable Audio 3 at {folder} isn't fully installed. Run ./install.sh --download medium there, then use /generation on.": "在这台 Mac 上做音乐已关闭，{folder} 里的 Stable Audio 3 也还没装完整。在那里运行 ./install.sh --download medium，然后用 /generation on。",
+  "Stable Audio 3 at {folder} doesn't have the Medium model yet. Run ./install.sh --download medium there, then use /generation again.": "{folder} 里的 Stable Audio 3 还没有 Medium 模型。在那里运行 ./install.sh --download medium，然后再用一次 /generation。",
+  "Stable Audio 3 at {folder} isn't installed yet. Run ./install.sh --download medium there, then use /generation again.": "{folder} 里的 Stable Audio 3 还没装好。在那里运行 ./install.sh --download medium，然后再用一次 /generation。",
+  "Stable Audio 3 isn't at {folder}. Use /generation on with the folder that holds its sa3 script.": "{folder} 里没有 Stable Audio 3。用 /generation on 加上包含 sa3 脚本的文件夹。",
+  "Use /generation, /generation on [folder], or /generation off.": "用 /generation、/generation on [文件夹] 或 /generation off。",
+  "Music making on.": "已开启音乐生成。",
+  "Music making off.": "已关闭音乐生成。",
+  "Music making isn't ready.": "音乐生成还没准备好。",
+  "warming up": "热身中",
+  "reading your taste": "读你的口味",
+  "composing": "作曲中",
+  "pressing the record": "压制唱片",
+  "saving it": "保存中",
+  "Let Moondog make music on this Mac": "让 Moondog 在这台 Mac 上做音乐",
+  "Make a track": "做一首曲子",
+  "Play a track Moondog made": "再放一首 Moondog 做的曲子",
+  "Start a stream": "开始音乐流",
+  "Stop the stream": "停止音乐流",
+  "Go on air: Moondog keeps making music from your taste": "开播：Moondog 照着你的口味一直做音乐",
+  "on air until {time}": "播出到 {time}",
+  "Cutting the next record": "正在刻下一张",
+  "Off air: the next record couldn't be made.": "停播了：下一张没刻成。",
+  "The next record is still being cut.": "下一张还在刻。",
+  "Off air.": "已停播。",
+  "Turn on music making first: /generation on.": "先开启音乐生成：/generation on。",
 };

package/src/integrations/apple-music/terminal-preview-player.mjs

@@ -1,5 +1,6 @@
 // Plays the agent's Apple Music previews from the terminal. Each 30-second preview is
 // downloaded to a temporary file and played by the system's own player, one after another.
+// A track Moondog made on this Mac plays the same way, from its own folder.
 import { spawn } from "node:child_process";
 import { mkdtempSync, rmSync } from "node:fs";
 import { access, constants, rm, stat, writeFile } from "node:fs/promises";
@@ -102,22 +103,24 @@ export async function createTerminalPreviewPlayer({
     return file;
   };
 
+  // Resolves "ended" when the song played to its end, "stopped" when /skip or /stop ended it, and
+  // "failed" when the player could not play it (no audio device, an unreadable file).
   const playFile = (file) => new Promise((resolve) => {
     const playing = spawn(player.command, [...player.args, file], { stdio: "ignore" });
     child = playing;
-    const finish = () => {
+    const finish = (how) => {
       if (child === playing) child = null;
-      resolve();
+      resolve(how);
     };
-    playing.once("error", finish);
-    playing.once("exit", finish);
+    playing.once("error", () => finish("failed"));
+    playing.once("exit", (code, signal) => finish(code === 0 ? "ended" : signal ? "stopped" : "failed"));
   });
 
   const start = (tracks) => {
     const controller = new AbortController();
     const downloads = new Map();
     // skip() ends the song playing, or the download of the song about to play.
-    const current = { controller, skipDownload: null };
+    const current = { controller, skipDownload: null, tracks };
     queue = current;
     const fetchFile = (index) => {
       if (!downloads.has(index)) {
@@ -133,24 +136,32 @@ export async function createTerminalPreviewPlayer({
     void (async () => {
       try {
         for (let index = 0; index < tracks.length; index += 1) {
-          const { title, artist_credit, catalog_url } = tracks[index];
-          const song = { track: { title, artist_credit, catalog_url }, position: index + 1, count: tracks.length };
-          const pending = fetchFile(index);
+          const { title, artist_credit, catalog_url, generated, id } = tracks[index];
+          const song = { track: generated ? { title, artist_credit, generated: true, id } : { title, artist_credit, catalog_url }, position: index + 1, count: tracks.length };
+          // A track Moondog made plays from its own folder, which outlives the queue.
+          const pending = tracks[index].file
+            ? { ready: true, file: Promise.resolve(tracks[index].file), abort: () => {}, skipped: () => false }
+            : fetchFile(index);
           if (!pending.ready) emit({ type: "loading", ...song });
           current.skipDownload = pending.abort;
           const file = await pending.file;
           current.skipDownload = null;
           if (controller.signal.aborted) break;
           // The next preview downloads while this one plays.
-          if (index + 1 < tracks.length) void fetchFile(index + 1);
+          if (index + 1 < tracks.length && !tracks[index + 1].file) void fetchFile(index + 1);
           if (!file) {
             // An error, a timeout, or an oversized file; a listener's /skip is not a failure.
             if (!pending.skipped()) emit({ type: "failed", ...song });
             continue;
           }
           emit({ type: "playing", ...song });
-          await playFile(file);
-          await rm(file, { force: true });
+          // A listener may stop the queue as the song starts, as Moondog's stream does past its time limit.
+          if (controller.signal.aborted) break;
+          const how = await playFile(file);
+          // A made track that played to its end, that /skip ended, or that could not play, as the loop
+          // back from listening and Moondog's stream count it; /stop aborts the queue first.
+          if (generated && !controller.signal.aborted) emit({ type: { ended: "finished", stopped: "skipped", failed: "failed" }[how], ...song });
+          if (!tracks[index].file) await rm(file, { force: true });
           if (controller.signal.aborted) break;
         }
       } finally {
@@ -197,6 +208,22 @@ export async function createTerminalPreviewPlayer({
       });
       start(accepted);
     },
+    // A track Moondog made on this Mac: { id, title, file }, played whole and kept after it ends.
+    playGenerated({ id, title, file } = {}) {
+      const name = String(title ?? "").trim();
+      if (closed || !name || typeof file !== "string" || !path.isAbsolute(file)) return;
+      stop();
+      const track = { title: name, artist_credit: "", generated: true, id: String(id ?? "") };
+      emit({ type: "queue", tracks: [{ title: track.title, artist_credit: "", generated: true }], album: null });
+      start([{ ...track, file }]);
+    },
+    // A made track queued behind the one playing, as Moondog's stream does; with nothing playing, it plays now.
+    enqueueGenerated({ id, title, file } = {}) {
+      const name = String(title ?? "").trim();
+      if (closed || !name || typeof file !== "string" || !path.isAbsolute(file)) return;
+      if (!queue || !queue.tracks.every((track) => track.generated)) return this.playGenerated({ id, title, file });
+      queue.tracks.push({ title: name, artist_credit: "", generated: true, id: String(id ?? ""), file });
+    },
     // Ends the song now playing, or still loading; the next one starts after it.
     skip() {
       if (!queue) return false;
@@ -205,6 +232,8 @@ export async function createTerminalPreviewPlayer({
       return true;
     },
     stop,
+    // Leaving Apple Music stops its previews here, never the tracks Moondog made.
+    holdsCatalogSongs: () => Boolean(queue?.tracks.some((track) => !track.generated)),
     subscribe(listener) {
       listeners.add(listener);
       return () => listeners.delete(listener);

package/src/integrations/netease/ncm-cli-player.mjs

@@ -245,9 +245,10 @@ export function createNeteasePlayer({
      * up. mode "play" replaces the queue and starts the first; "queue" adds after what is
      * playing. Songs NetEase marks as not playable are never sent to the player, nor songs
      * allow(song) refuses, such as the listener's Avoids; those are only counted. Before a lookup,
-     * allow gets the title and artist asked for, as { title, artist_credit }.
+     * allow gets the title and artist asked for, as { title, artist_credit }. beforePlay runs just
+     * before a song starts, which a queue with nothing loaded does too.
      */
-    async play({ items = [], mode = "play", intent, allow = () => true } = {}) {
+    async play({ items = [], mode = "play", intent, allow = () => true, beforePlay } = {}) {
       const found = [];
       const unplayable = [];
       const notFound = [];
@@ -278,6 +279,7 @@ export function createNeteasePlayer({
           queue = [...queue, ...songs];
           outcome = "queued";
         } else {
+          await beforePlay?.();
           queue = songs;
           await playAt(0);
           outcome = "playing";
@@ -297,15 +299,19 @@ export function createNeteasePlayer({
       checked(await run(["resume"]), "resume");
       stayConnected();
     },
-    async next() {
+    // beforePlay runs just before a song starts, so the other players go quiet only for one.
+    async next({ beforePlay } = {}) {
       if (index + 1 >= queue.length) throw failure("netease_failed", "Nothing is queued after this song.");
+      await beforePlay?.();
       await playAt(index + 1);
     },
     // Back to the start of the song, or to the one before when it has only just begun.
-    async previous() {
+    async previous({ beforePlay } = {}) {
       const now = await state();
-      if (index > 0 && (Number(now.position) || 0) <= 3) await playAt(index - 1);
-      else checked(await run(["seek", "0"]), "go back to the start");
+      if (index > 0 && (Number(now.position) || 0) <= 3) {
+        await beforePlay?.();
+        await playAt(index - 1);
+      } else checked(await run(["seek", "0"]), "go back to the start");
     },
     async seek({ positionMs = 0 } = {}) {
       checked(await run(["seek", String(Math.max(0, Math.round(positionMs / 1000)))]), "move in the song");