@groovenet/player 0.1.3 → 0.1.5

package/owntone/terminal-v1.patch

@@ -0,0 +1,96 @@
+--- a/src/player.h
++++ b/src/player.h
+@@ -44,0 +45 @@
++  bool gn_connected;
+@@ -72,0 +74,6 @@
++
++  /* Groovenet terminal signal v1; snapshotted on the player thread. */
++  char gn_instance[33];
++  uint32_t gn_sequence;
++  uint32_t gn_item_id;
++  const char *gn_reason;
+--- a/src/player.c
++++ b/src/player.c
+@@ -201,0 +202,3 @@
++  // Never report an input/output failure as natural completion.
++  bool gn_failed;
++
+@@ -341,0 +345,14 @@
++
++// Groovenet terminal signal. All access is confined to the player thread.
++static char gn_instance[33];
++static uint32_t gn_sequence;
++static uint32_t gn_item_id;
++static const char *gn_reason = "none";
++
++static void
++gn_terminal(uint32_t item_id, const char *reason)
++{
++  gn_sequence++;
++  gn_item_id = item_id;
++  gn_reason = reason;
++}
+@@ -1023,0 +1041,2 @@
++  pb_session.reading_now->gn_failed = true;
++  gn_terminal(pb_session.reading_now->item_id, "input_error");
+@@ -1090,0 +1110,3 @@
++
++  gn_terminal(pb_session.playing_now->item_id,
++    pb_session.playing_now->gn_failed ? "failed" : "eof");
+@@ -1499,0 +1522,9 @@
++  if ((!device || status == OUTPUT_STATE_FAILED || (status == OUTPUT_STATE_STOPPED && player_state == PLAY_PLAYING))
++      && pb_session.playing_now)
++    {
++      pb_session.playing_now->gn_failed = true;
++      if (pb_session.reading_now)
++        pb_session.reading_now->gn_failed = true;
++      gn_terminal(pb_session.playing_now->item_id, "output_lost");
++    }
++
+@@ -1516,7 +1547,3 @@
+-      if (!device->resurrect)
+-	goto out;
+-
+-      DPRINTF(E_LOG, L_PLAYER, "Attempting reconnection in %d sec to the %s device '%s'\n", PLAYER_SPEAKER_RESURRECT_TIME, device->type_name, device->name);
+-
+-      // TODO do this internally instead of through the worker
+-      worker_execute(player_speaker_resurrect, &(device->id), sizeof(device->id), PLAYER_SPEAKER_RESURRECT_TIME);
++      // Groovenet never automatically reclaims a failed/taken-over receiver.
++      // A new explicit play/output-selection action is required.
++      goto out;
+@@ -1791,0 +1819,3 @@
++  if (pb_session.playing_now)
++    gn_terminal(pb_session.playing_now->item_id, "interrupted");
++
+@@ -1910,0 +1941,4 @@
++  memcpy(status->gn_instance, gn_instance, sizeof(status->gn_instance));
++  status->gn_sequence = gn_sequence;
++  status->gn_item_id = gn_item_id;
++  status->gn_reason = gn_reason;
+@@ -2564,0 +2599 @@
++  spk->gn_connected = (device->session != NULL);
+@@ -3943 +3978,7 @@
+-  int ret;
++  unsigned char nonce[16];
++  unsigned int i;
++  int ret;
++
++  gcry_create_nonce(nonce, sizeof(nonce));
++  for (i = 0; i < sizeof(nonce); i++)
++    snprintf(gn_instance + i * 2, 3, "%02x", nonce[i]);
+--- a/src/httpd_jsonapi.c
++++ b/src/httpd_jsonapi.c
+@@ -1631,0 +1632,3 @@
++  json_object_object_add(output, "busy", json_object_new_boolean(spk->busy));
++  json_object_object_add(output, "connected", json_object_new_boolean(spk->gn_connected));
++  json_object_object_add(output, "prevent_playback", json_object_new_boolean(spk->prevent_playback));
+@@ -2198,0 +2202,9 @@
++
++  /* Additive, versioned extension: stock OwnTone clients ignore these fields. */
++  json_object *terminal = json_object_new_object();
++  json_object_object_add(terminal, "version", json_object_new_int(1));
++  json_object_object_add(terminal, "instance", json_object_new_string(status.gn_instance));
++  json_object_object_add(terminal, "sequence", json_object_new_int64(status.gn_sequence));
++  json_object_object_add(terminal, "item_id", json_object_new_int64(status.gn_item_id));
++  json_object_object_add(terminal, "reason", json_object_new_string(status.gn_reason));
++  json_object_object_add(reply, "groovenet_terminal", terminal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groovenet/player",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Headless playback core and mpv backend for Groovenet",
   "type": "module",
   "engines": {
@@ -8,6 +8,10 @@
   },
   "main": "build/index.js",
   "types": "build/index.d.ts",
+  "bin": {
+    "groovenet-mpris": "build/mprisBin.js",
+    "groovenet-player-server": "build/server/bin.js"
+  },
   "exports": {
     ".": {
       "import": "./build/index.js",
@@ -20,6 +24,10 @@
     "./testing": {
       "import": "./build/testing.js",
       "types": "./build/testing.d.ts"
+    },
+    "./server": {
+      "types": "./build/server/manager.d.ts",
+      "import": "./build/server/manager.js"
     }
   },
   "scripts": {
@@ -29,16 +37,25 @@
     "test:coverage": "vitest run --coverage"
   },
   "files": [
-    "build/"
+    "build/",
+    "MPRIS.md",
+    "OWNTONE.md",
+    "SERVER_PLAYERS.md",
+    "owntone/",
+    "scripts/mpris-smoke.mjs"
   ],
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@groovenet/client": "^3.4.0"
+    "@groovenet/client": "^3.6.0",
+    "@groovenet/contracts": "1.3.0",
+    "pg": "8.23.1",
+    "zod": "4.6.7"
   },
   "devDependencies": {
-    "@types/node": "^26.6.4",
+    "@types/node": "^26.6.5",
+    "@types/pg": "8.23.1",
     "@vitest/coverage-v8": "^5.0.3",
     "typescript": "^7.0",
     "vitest": "^5.0.0"
@@ -48,5 +65,8 @@
     "type": "git",
     "url": "git+https://github.com/Public-Vinyl-Radio/groovenet.git",
     "directory": "packages/groovenet-player"
+  },
+  "optionalDependencies": {
+    "dbus-next": "0.10.2"
   }
 }

package/scripts/mpris-smoke.mjs

@@ -0,0 +1,54 @@
+// Run on Linux: dbus-run-session -- node packages/groovenet-player/scripts/mpris-smoke.mjs
+// Requires built workspaces, optional dbus-next dependency, dbus and playerctl.
+import assert from "node:assert/strict";
+import { execFile } from "node:child_process";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { promisify } from "node:util";
+import { PlayerDaemon, PlayerCore, TrackResolver } from "../build/index.js";
+import { TestPlaybackBackend } from "../build/testing.js";
+import { startMpris } from "../build/mpris.js";
+
+const dir = await mkdtemp(join(tmpdir(), "groovenet-mpris-"));
+const backend = new TestPlaybackBackend();
+const player = new PlayerCore(backend, new TrackResolver({}, { apiBase: "http://unused/api" }));
+const paths = { socketPath: join(dir, "player.sock"), pidPath: join(dir, "player.pid") };
+const daemon = new PlayerDaemon({ player, paths });
+const ctl = async (...args) => (await promisify(execFile)("playerctl", ["--player=groovenet", ...args])).stdout.trim();
+let close;
+try {
+  player.add(["First", "Second"].map((title) => ({ title, track_id: title, artist: "Artist", album: "Album", friend_id: 1, local_audio_url: `${title}.mp3` })));
+  await daemon.start();
+  close = await startMpris(paths.socketPath);
+  assert.ok(close, "MPRIS must be enabled in this session");
+  assert.equal(await ctl("status"), "Stopped");
+  await ctl("play");
+  assert.equal(await ctl("status"), "Playing");
+  assert.equal(await ctl("metadata", "xesam:title"), "First");
+  assert.equal(await ctl("metadata", "xesam:artist"), "Artist");
+  assert.equal(await ctl("metadata", "xesam:album"), "Album");
+  await ctl("play-pause");
+  assert.equal(await ctl("status"), "Paused");
+  await ctl("position", "12.5");
+  assert.equal(Number(await ctl("position")), 12.5);
+  await ctl("position", "2+");
+  assert.equal(Number(await ctl("position")), 14.5);
+  await ctl("play-pause");
+  assert.equal(await ctl("status"), "Playing");
+  await ctl("next");
+  assert.equal(await ctl("metadata", "xesam:title"), "Second");
+  await ctl("previous");
+  assert.equal(await ctl("metadata", "xesam:title"), "First");
+  await ctl("stop");
+  assert.equal(await ctl("status"), "Stopped");
+  assert.equal(player.snapshot.queue.length, 2);
+  await close();
+  await player.play();
+  assert.equal(player.snapshot.status, "playing");
+  console.log("MPRIS playerctl smoke test passed.");
+} finally {
+  await close?.();
+  await daemon.stop();
+  await rm(dir, { recursive: true, force: true });
+}