upnext-adapter-nowplaying 0.2.0 → 0.3.1

package/README.md

@@ -3,13 +3,17 @@
 [![npm](https://img.shields.io/npm/v/upnext-adapter-nowplaying)](https://www.npmjs.com/package/upnext-adapter-nowplaying)
 [![license](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/tothienbao6a0/upnext/blob/main/LICENSE)
 
-**Read and control whatever your Mac is playing — including a browser tab —
-without an extension.**
+**Read and control whatever your machine is playing — including a browser tab —
+without an extension.** macOS and Linux.
 
-macOS keeps a system-wide Now Playing register: the thing Control Center shows,
-and the thing your keyboard's play/pause key talks to. Anything that publishes
-to it is reachable — a YouTube tab in Chrome, a podcast in Safari, VLC, Doppler,
-Music, Spotify.
+Both platforms keep a system-wide register of what is playing: on macOS the one
+Control Center shows and your keyboard's play/pause key talks to, on Linux the
+MPRIS interface players publish on D-Bus. Anything that publishes to it is
+reachable — a YouTube tab in Chrome, a podcast in Safari or Firefox, VLC,
+Doppler, Music, Spotify.
+
+Same entry, same code, either OS. A host should not have to care which one it
+is on, so this package answers that question itself.
 
 ```ts
 import { readNowPlaying, sendTransport } from 'upnext-adapter-nowplaying';
@@ -22,8 +26,17 @@ await readNowPlaying();
 await sendTransport('pause');   // pauses it, whatever it is
 ```
 
+On Linux the same call answers from MPRIS instead, and the reading has the same
+shape — `bundleId` is the player name (`firefox`, `vlc`, `spotify`) rather than
+a bundle identifier.
+
 That works with no browser extension, no accessibility permission, and no
-per-site integration.
+per-site integration. On Linux it needs `playerctl` installed; on macOS it needs
+nothing at all.
+
+If you specifically want one register rather than whichever this machine has,
+`readMediaRemote` / `sendMediaRemote` and `readMpris` / `sendMpris` are exported
+under their own names.
 
 ## As a queue entry
 
@@ -75,6 +88,35 @@ take somebody's podcast away from them.
 
 ## How it works, and the honest caveats
 
+Two registers, one shape. `sourceFor()` picks by platform at `init()`, and
+everything above it — the adapter, the URI, the reading — is identical.
+
+### Linux: MPRIS, through `playerctl`
+
+MPRIS is a D-Bus interface that most Linux players implement: browsers, VLC,
+mpv with a plugin, Spotify's Linux client. `playerctl` is its standard
+command-line client, and this shells out to it for the same reason the macOS
+side shells out to `osascript` — the protocol is somebody else's moving target,
+and a process boundary is the right place to keep it.
+
+One thing makes that safe rather than fragile: **`playerctl` takes a `--format`
+template, so the output shape is ours.** Rather than parsing whatever a tool
+decided to print, this asks for exactly the fields it wants, in exactly the
+order it wants them, separated by ASCII 31 — because real track titles contain
+every printable delimiter worth using.
+
+That is also why it can be tested honestly. CI runs a real `playerctl` against a
+real MPRIS player on a real session bus, so a template typo fails the build
+rather than a user's machine. Without a player on the bus, `playerctl` exits on
+"No players found" before it ever reads the template — which means a green test
+run with no player proves nothing, and this one does not do that. See
+[`scripts/mpris-ci.sh`](../../scripts/mpris-ci.sh).
+
+Install it with `apt install playerctl`, `dnf install playerctl`, or your
+distribution's equivalent. Without it, `init()` says so in a sentence.
+
+### macOS: MediaRemote
+
 It reaches `MediaRemote`, a **private Apple framework**, through JXA's
 Objective-C bridge. Private API is normally a bad trade, so:
 
@@ -92,15 +134,18 @@ Objective-C bridge. Private API is normally a bad trade, so:
   itself unavailable, the registry excludes it, and the rest of your queue
   carries on.
 
-**macOS only.** On any other platform `init()` fails cleanly and
-`getState().adapters` shows `available: false` with the reason.
+**Windows is not implemented.** It has an equivalent — SMTC — and the adapter's
+shape would carry over, but nobody has written it. On any unsupported platform
+`init()` fails cleanly and `getState().adapters` shows `available: false` with
+the reason, rather than the adapter pretending and returning nothing.
 
 ### It filters out things that aren't media
 
-macOS's now-playing client is *whatever last made a sound*. A received voice
+The now-playing client is *whatever last made a sound*. A received voice
 message leaves Messages sitting there as the now-playing app, with no title and
 a seven-second "track". Requiring a title and a real duration is what separates
-*something is playing* from *something made a noise once*.
+*something is playing* from *something made a noise once*. Both platforms get
+the same filter, because both have the same problem.
 
 ## Compared with the other adapters
 

package/dist/src/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,OAAO,EACP,YAAY,EACZ,QAAQ,EACT,MAAM,aAAa,CAAC;AAErB,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE5E,mDAAmD;AACnD,eAAO,MAAM,eAAe,uBAAuB,CAAC;AAEpD,MAAM,WAAW,wBAAwB;IACvC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACxD;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,iBAAkB,YAAW,OAAO;;IAC/C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAcjC;gBAKU,OAAO,GAAE,wBAA6B;IAK5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM;IAItB,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAuBrD,mDAAmD;IAC7C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC;CAwBtC"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,OAAO,EACP,YAAY,EACZ,QAAQ,EACT,MAAM,aAAa,CAAC;AAErB,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE5E,mDAAmD;AACnD,eAAO,MAAM,eAAe,uBAAuB,CAAC;AAEpD,MAAM,WAAW,wBAAwB;IACvC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACxD;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,iBAAkB,YAAW,OAAO;;IAC/C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAcjC;gBAKU,OAAO,GAAE,wBAA6B;IAK5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM;IAItB,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAuBrD,mDAAmD;IAC7C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC;CA0BtC"}

package/dist/src/adapter.js

@@ -1,5 +1,5 @@
 import { defaultCapabilities } from 'upnext-core';
-import { isAvailable, readNowPlaying, sendTransport } from './mediaremote.js';
+import { sourceFor, UNSUPPORTED } from './source.js';
 import { hasEnded, readingUri } from './reading.js';
 /** The one thing this adapter can be asked for. */
 export const NOW_PLAYING_URI = 'nowplaying:current';
@@ -51,8 +51,13 @@ export class NowPlayingAdapter {
     async init() {
         if (this.#options.read)
             return; // Injected: nothing to probe.
-        if (!(await isAvailable())) {
-            throw new Error('macOS Now Playing is unavailable here — this adapter needs macOS and the MediaRemote framework');
+        const source = sourceFor();
+        if (!source)
+            throw new Error(UNSUPPORTED);
+        if (!(await source.available())) {
+            throw new Error(source.platform === 'linux'
+                ? 'playerctl was not found — install it to reach MPRIS on Linux'
+                : 'the MediaRemote framework did not answer here');
         }
     }
     /**
@@ -122,10 +127,14 @@ export class NowPlayingAdapter {
         };
     }
     #read() {
-        return (this.#options.read ?? readNowPlaying)();
+        if (this.#options.read)
+            return this.#options.read();
+        return sourceFor()?.read() ?? Promise.resolve(null);
     }
     #send(command) {
-        return (this.#options.send ?? sendTransport)(command);
+        if (this.#options.send)
+            return this.#options.send(command);
+        return sourceFor()?.send(command) ?? Promise.resolve(false);
     }
 }
 //# sourceMappingURL=adapter.js.map

package/dist/src/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -1,7 +1,13 @@
 export { NowPlayingAdapter, NOW_PLAYING_URI } from './adapter.js';
 export type { NowPlayingAdapterOptions } from './adapter.js';
-export { readNowPlaying, sendTransport, isAvailable, COMMANDS } from './mediaremote.js';
+export { readNowPlaying, sendTransport, isAvailable } from './source.js';
+export { COMMANDS } from './mediaremote.js';
 export type { TransportCommand } from './mediaremote.js';
+export { readNowPlaying as readMediaRemote, sendTransport as sendMediaRemote, isAvailable as mediaRemoteAvailable, } from './mediaremote.js';
 export { parseReading, readingUri, hasEnded } from './reading.js';
 export type { NowPlayingReading } from './reading.js';
+export { sourceFor } from './source.js';
+export type { NowPlayingSource } from './source.js';
+export { parseMpris, readMpris, sendMpris, mprisAvailable, FORMAT as MPRIS_FORMAT } from './mpris.js';
+export type { MprisCommand, Runner as MprisRunner } from './mpris.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAClE,YAAY,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACxF,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAClE,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAClE,YAAY,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAI7D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAIzD,OAAO,EACL,cAAc,IAAI,eAAe,EACjC,aAAa,IAAI,eAAe,EAChC,WAAW,IAAI,oBAAoB,GACpC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAClE,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,YAAY,CAAC;AACtG,YAAY,EAAE,YAAY,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,YAAY,CAAC"}

package/dist/src/index.js

@@ -1,4 +1,12 @@
 export { NowPlayingAdapter, NOW_PLAYING_URI } from './adapter.js';
-export { readNowPlaying, sendTransport, isAvailable, COMMANDS } from './mediaremote.js';
+// The platform-dispatching versions. On macOS these are exactly the
+// MediaRemote ones; on Linux they reach MPRIS. A caller should not have to ask.
+export { readNowPlaying, sendTransport, isAvailable } from './source.js';
+export { COMMANDS } from './mediaremote.js';
+// Still reachable by their platform-specific names, for anyone who genuinely
+// wants one register rather than "whatever this machine has".
+export { readNowPlaying as readMediaRemote, sendTransport as sendMediaRemote, isAvailable as mediaRemoteAvailable, } from './mediaremote.js';
 export { parseReading, readingUri, hasEnded } from './reading.js';
+export { sourceFor } from './source.js';
+export { parseMpris, readMpris, sendMpris, mprisAvailable, FORMAT as MPRIS_FORMAT } from './mpris.js';
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGlE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGxF,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGlE,oEAAoE;AACpE,gFAAgF;AAChF,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,6EAA6E;AAC7E,8DAA8D;AAC9D,OAAO,EACL,cAAc,IAAI,eAAe,EACjC,aAAa,IAAI,eAAe,EAChC,WAAW,IAAI,oBAAoB,GACpC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGlE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,YAAY,CAAC"}

package/dist/src/mpris.d.ts

@@ -0,0 +1,24 @@
+import type { NowPlayingReading } from './reading.js';
+/**
+ * One record, in a shape this file chose.
+ *
+ * `default(…, 0)` guards the two numeric fields: a stream has no length, and a
+ * player that has not started has no position. Without it those come back empty
+ * and the record still parses — but a zero says the same thing more plainly.
+ */
+export declare const FORMAT: string;
+export type Runner = (args: string[]) => Promise<string>;
+export declare const runPlayerctl: Runner;
+/**
+ * Parse one record.
+ *
+ * MPRIS reports position and length in **microseconds**, which is the detail
+ * most likely to be got wrong and the one worth stating twice.
+ */
+export declare function parseMpris(raw: string): NowPlayingReading | null;
+export declare function readMpris(run?: Runner): Promise<NowPlayingReading | null>;
+export type MprisCommand = 'play' | 'pause' | 'togglePlayPause' | 'next' | 'previous';
+export declare function sendMpris(command: MprisCommand, run?: Runner): Promise<boolean>;
+/** Whether `playerctl` is here at all. Nothing needs to be playing. */
+export declare function mprisAvailable(run?: Runner): Promise<boolean>;
+//# sourceMappingURL=mpris.d.ts.map

package/dist/src/mpris.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mpris.d.ts","sourceRoot":"","sources":["../../src/mpris.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AA+BtD;;;;;;GAMG;AACH,eAAO,MAAM,MAAM,QAQP,CAAC;AAEb,MAAM,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEzD,eAAO,MAAM,YAAY,EAAE,MAKvB,CAAC;AAEL;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CA0BhE;AAED,wBAAsB,SAAS,CAAC,GAAG,GAAE,MAAqB,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAQ7F;AAiBD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,iBAAiB,GAAG,MAAM,GAAG,UAAU,CAAC;AAEtF,wBAAsB,SAAS,CAC7B,OAAO,EAAE,YAAY,EACrB,GAAG,GAAE,MAAqB,GACzB,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,uEAAuE;AACvE,wBAAsB,cAAc,CAAC,GAAG,GAAE,MAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQjF"}

package/dist/src/mpris.js

@@ -0,0 +1,132 @@
+import { execFile } from 'node:child_process';
+/**
+ * Linux's answer to the same question: what is this machine playing?
+ *
+ * MPRIS is a D-Bus interface that media players implement — browsers, VLC,
+ * Spotify's Linux client, mpv with a plugin, most of them. `playerctl` is the
+ * standard command-line client for it, and this shells out to that for the same
+ * reason the macOS side shells out to `osascript`: the protocol is somebody
+ * else's moving target, and a process boundary is where it should stay.
+ *
+ * The important difference from the macOS path, and the reason this could be
+ * written safely at all: **the output shape is ours.** `playerctl` takes a
+ * `--format` template, so rather than parsing whatever a tool decided to print
+ * this asks for exactly the fields it wants, in exactly the order it wants
+ * them. There is no guessing at somebody else's serialisation.
+ */
+const TIMEOUT_MS = 4000;
+/**
+ * ASCII 31. Track titles contain every printable delimiter worth using.
+ *
+ * Spelled as an expression rather than written literally: an invisible byte in
+ * source survives a compiler but not always an editor, a copy, or a patch, and
+ * a delimiter that silently becomes the empty string takes every field with it
+ * -- silently, because every record then parses as one field and returns null,
+ * which is indistinguishable from nothing playing.
+ */
+const UNIT = String.fromCharCode(31);
+/**
+ * One record, in a shape this file chose.
+ *
+ * `default(…, 0)` guards the two numeric fields: a stream has no length, and a
+ * player that has not started has no position. Without it those come back empty
+ * and the record still parses — but a zero says the same thing more plainly.
+ */
+export const FORMAT = [
+    '{{playerName}}',
+    '{{status}}',
+    '{{title}}',
+    '{{artist}}',
+    '{{album}}',
+    '{{default(position,0)}}',
+    '{{default(mpris:length,0)}}',
+].join(UNIT);
+export const runPlayerctl = (args) => new Promise((resolve, reject) => {
+    execFile('playerctl', args, { timeout: TIMEOUT_MS }, (error, stdout, stderr) => error ? reject(new Error(stderr.trim() || error.message)) : resolve(stdout));
+});
+/**
+ * Parse one record.
+ *
+ * MPRIS reports position and length in **microseconds**, which is the detail
+ * most likely to be got wrong and the one worth stating twice.
+ */
+export function parseMpris(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return null;
+    const parts = trimmed.split(UNIT);
+    if (parts.length < 7)
+        return null;
+    const [player = '', status = '', title = '', artist = '', album = '', position = '', length = ''] = parts;
+    // Same filter as the macOS side, for the same reason: something that made a
+    // noise is not necessarily something with a transport worth showing.
+    if (!title.trim())
+        return null;
+    const durationMs = micros(length);
+    if (durationMs <= 0)
+        return null;
+    return {
+        bundleId: player.trim(),
+        label: player.trim(),
+        playing: status.trim().toLowerCase() === 'playing',
+        title: title.trim(),
+        artist: artist.trim(),
+        ...(album.trim() ? { album: album.trim() } : {}),
+        elapsedMs: Math.max(0, micros(position)),
+        durationMs,
+    };
+}
+export async function readMpris(run = runPlayerctl) {
+    try {
+        return parseMpris(await run(['metadata', '--format', FORMAT]));
+    }
+    catch {
+        // `playerctl` exits non-zero with "No players found" when nothing is
+        // running, which is an ordinary state rather than a fault.
+        return null;
+    }
+}
+/**
+ * playerctl's names for the transport commands, where they differ from ours.
+ *
+ * Only `play-pause` actually differs, but going through a map means a command
+ * this file has not thought about cannot be passed through to the shell
+ * unchecked.
+ */
+const PLAYERCTL = {
+    play: 'play',
+    pause: 'pause',
+    togglePlayPause: 'play-pause',
+    next: 'next',
+    previous: 'previous',
+};
+export async function sendMpris(command, run = runPlayerctl) {
+    const verb = PLAYERCTL[command];
+    if (!verb)
+        return false;
+    try {
+        await run([verb]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** Whether `playerctl` is here at all. Nothing needs to be playing. */
+export async function mprisAvailable(run = runPlayerctl) {
+    if (process.platform !== 'linux')
+        return false;
+    try {
+        await run(['--version']);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function micros(value) {
+    const n = Number.parseFloat(value);
+    // Microseconds. Getting this wrong by a thousand is the classic MPRIS bug.
+    return Number.isFinite(n) ? Math.round(n / 1000) : 0;
+}
+//# sourceMappingURL=mpris.js.map

package/dist/src/mpris.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mpris.js","sourceRoot":"","sources":["../../src/mpris.ts"],"names":[],"mappings":"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"}

package/dist/src/source.d.ts

@@ -0,0 +1,35 @@
+import type { TransportCommand } from './mediaremote.js';
+import type { NowPlayingReading } from './reading.js';
+/**
+ * Which system register to ask, on this machine.
+ *
+ * macOS and Linux answer the same question through completely different
+ * plumbing — a private Apple framework reached through JXA, and a D-Bus
+ * interface reached through `playerctl`. A host should not have to care, and
+ * neither should the queue: `nowplaying:current` means the same thing on both.
+ *
+ * Windows has an equivalent in SMTC and is not implemented. It would slot in
+ * here, and nothing above this file would change.
+ */
+export interface NowPlayingSource {
+    readonly platform: string;
+    available(): Promise<boolean>;
+    read(): Promise<NowPlayingReading | null>;
+    send(command: TransportCommand): Promise<boolean>;
+}
+/** Null on a platform with no implementation, which the adapter reports. */
+export declare function sourceFor(platform?: string): NowPlayingSource | null;
+export declare const UNSUPPORTED: string;
+/**
+ * The package's public reads and commands, on whichever platform this is.
+ *
+ * These are what a host imports, and what the `upnext` CLI's `now`, `pause`
+ * and `next` are built on. They dispatch rather than reaching for MediaRemote
+ * directly — which they used to, quietly making the CLI macOS-only even after
+ * the Linux register worked.
+ */
+export declare function readNowPlaying(): Promise<NowPlayingReading | null>;
+export declare function sendTransport(command: TransportCommand): Promise<boolean>;
+/** Whether this machine has a register we can reach at all. */
+export declare function isAvailable(): Promise<boolean>;
+//# sourceMappingURL=source.d.ts.map

package/dist/src/source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../src/source.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD;;;;;;;;;;GAUG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,IAAI,IAAI,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAC1C,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACnD;AAgBD,4EAA4E;AAC5E,wBAAgB,SAAS,CAAC,QAAQ,GAAE,MAAyB,GAAG,gBAAgB,GAAG,IAAI,CAItF;AAED,eAAO,MAAM,WAAW,QAEY,CAAC;AAErC;;;;;;;GAOG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAGxE;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAG/E;AAED,+DAA+D;AAC/D,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAGpD"}

package/dist/src/source.js

@@ -0,0 +1,46 @@
+import { isAvailable as macAvailable, readNowPlaying as macRead, sendTransport as macSend } from './mediaremote.js';
+import { mprisAvailable, readMpris, sendMpris } from './mpris.js';
+const MAC = {
+    platform: 'darwin',
+    available: () => macAvailable(),
+    read: () => macRead(),
+    send: (command) => macSend(command),
+};
+const LINUX = {
+    platform: 'linux',
+    available: () => mprisAvailable(),
+    read: () => readMpris(),
+    send: (command) => sendMpris(command),
+};
+/** Null on a platform with no implementation, which the adapter reports. */
+export function sourceFor(platform = process.platform) {
+    if (platform === 'darwin')
+        return MAC;
+    if (platform === 'linux')
+        return LINUX;
+    return null;
+}
+export const UNSUPPORTED = 'no system Now Playing register here — this adapter supports macOS (MediaRemote) ' +
+    'and Linux (MPRIS, via playerctl)';
+/**
+ * The package's public reads and commands, on whichever platform this is.
+ *
+ * These are what a host imports, and what the `upnext` CLI's `now`, `pause`
+ * and `next` are built on. They dispatch rather than reaching for MediaRemote
+ * directly — which they used to, quietly making the CLI macOS-only even after
+ * the Linux register worked.
+ */
+export async function readNowPlaying() {
+    const source = sourceFor();
+    return source ? source.read() : null;
+}
+export async function sendTransport(command) {
+    const source = sourceFor();
+    return source ? source.send(command) : false;
+}
+/** Whether this machine has a register we can reach at all. */
+export async function isAvailable() {
+    const source = sourceFor();
+    return source ? source.available() : false;
+}
+//# sourceMappingURL=source.js.map

package/dist/src/source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source.js","sourceRoot":"","sources":["../../src/source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,cAAc,IAAI,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEpH,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAqBlE,MAAM,GAAG,GAAqB;IAC5B,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE;IAC/B,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE;IACrB,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;CACpC,CAAC;AAEF,MAAM,KAAK,GAAqB;IAC9B,QAAQ,EAAE,OAAO;IACjB,SAAS,EAAE,GAAG,EAAE,CAAC,cAAc,EAAE;IACjC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE;IACvB,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;CACtC,CAAC;AAEF,4EAA4E;AAC5E,MAAM,UAAU,SAAS,CAAC,WAAmB,OAAO,CAAC,QAAQ;IAC3D,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IACtC,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACvC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GACtB,kFAAkF;IAClF,kCAAkC,CAAC;AAErC;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAyB;IAC3D,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/C,CAAC;AAED,+DAA+D;AAC/D,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7C,CAAC"}

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "upnext-adapter-nowplaying",
-  "version": "0.2.0",
-  "description": "Read and control whatever macOS is playing \u2014 a browser tab, VLC, Doppler, anything that publishes to Control Center.",
+  "version": "0.3.1",
+  "description": "Read and control whatever macOS is playing — a browser tab, VLC, Doppler, anything that publishes to Control Center.",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "exports": {
-    ".": "./dist/src/index.js"
+    ".": "./dist/src/index.js",
+    "./package.json": "./package.json"
   },
   "files": [
     "dist/src",
     "src"
   ],
   "dependencies": {
-    "upnext-core": "0.2.0"
+    "upnext-core": "0.3.1"
   },
   "engines": {
     "node": ">=20"

package/src/adapter.ts

@@ -6,7 +6,7 @@ import type {
   Capabilities,
   MediaRef,
 } from 'upnext-core';
-import { isAvailable, readNowPlaying, sendTransport } from './mediaremote.js';
+import { sourceFor, UNSUPPORTED } from './source.js';
 import { hasEnded, readingUri, type NowPlayingReading } from './reading.js';
 
 /** The one thing this adapter can be asked for. */
@@ -70,9 +70,14 @@ export class NowPlayingAdapter implements Adapter {
 
   async init(): Promise<void> {
     if (this.#options.read) return; // Injected: nothing to probe.
-    if (!(await isAvailable())) {
+
+    const source = sourceFor();
+    if (!source) throw new Error(UNSUPPORTED);
+    if (!(await source.available())) {
       throw new Error(
-        'macOS Now Playing is unavailable here — this adapter needs macOS and the MediaRemote framework',
+        source.platform === 'linux'
+          ? 'playerctl was not found — install it to reach MPRIS on Linux'
+          : 'the MediaRemote framework did not answer here',
       );
     }
   }
@@ -153,10 +158,12 @@ export class NowPlayingAdapter implements Adapter {
   }
 
   #read(): Promise<NowPlayingReading | null> {
-    return (this.#options.read ?? readNowPlaying)();
+    if (this.#options.read) return this.#options.read();
+    return sourceFor()?.read() ?? Promise.resolve(null);
   }
 
   #send(command: 'play' | 'pause'): Promise<boolean> {
-    return (this.#options.send ?? sendTransport)(command);
+    if (this.#options.send) return this.#options.send(command);
+    return sourceFor()?.send(command) ?? Promise.resolve(false);
   }
 }

package/src/index.ts

@@ -1,8 +1,24 @@
 export { NowPlayingAdapter, NOW_PLAYING_URI } from './adapter.js';
 export type { NowPlayingAdapterOptions } from './adapter.js';
 
-export { readNowPlaying, sendTransport, isAvailable, COMMANDS } from './mediaremote.js';
+// The platform-dispatching versions. On macOS these are exactly the
+// MediaRemote ones; on Linux they reach MPRIS. A caller should not have to ask.
+export { readNowPlaying, sendTransport, isAvailable } from './source.js';
+export { COMMANDS } from './mediaremote.js';
 export type { TransportCommand } from './mediaremote.js';
 
+// Still reachable by their platform-specific names, for anyone who genuinely
+// wants one register rather than "whatever this machine has".
+export {
+  readNowPlaying as readMediaRemote,
+  sendTransport as sendMediaRemote,
+  isAvailable as mediaRemoteAvailable,
+} from './mediaremote.js';
+
 export { parseReading, readingUri, hasEnded } from './reading.js';
 export type { NowPlayingReading } from './reading.js';
+
+export { sourceFor } from './source.js';
+export type { NowPlayingSource } from './source.js';
+export { parseMpris, readMpris, sendMpris, mprisAvailable, FORMAT as MPRIS_FORMAT } from './mpris.js';
+export type { MprisCommand, Runner as MprisRunner } from './mpris.js';

package/src/mpris.ts

@@ -0,0 +1,149 @@
+import { execFile } from 'node:child_process';
+import type { NowPlayingReading } from './reading.js';
+
+/**
+ * Linux's answer to the same question: what is this machine playing?
+ *
+ * MPRIS is a D-Bus interface that media players implement — browsers, VLC,
+ * Spotify's Linux client, mpv with a plugin, most of them. `playerctl` is the
+ * standard command-line client for it, and this shells out to that for the same
+ * reason the macOS side shells out to `osascript`: the protocol is somebody
+ * else's moving target, and a process boundary is where it should stay.
+ *
+ * The important difference from the macOS path, and the reason this could be
+ * written safely at all: **the output shape is ours.** `playerctl` takes a
+ * `--format` template, so rather than parsing whatever a tool decided to print
+ * this asks for exactly the fields it wants, in exactly the order it wants
+ * them. There is no guessing at somebody else's serialisation.
+ */
+
+const TIMEOUT_MS = 4000;
+
+/**
+ * ASCII 31. Track titles contain every printable delimiter worth using.
+ *
+ * Spelled as an expression rather than written literally: an invisible byte in
+ * source survives a compiler but not always an editor, a copy, or a patch, and
+ * a delimiter that silently becomes the empty string takes every field with it
+ * -- silently, because every record then parses as one field and returns null,
+ * which is indistinguishable from nothing playing.
+ */
+const UNIT = String.fromCharCode(31);
+
+/**
+ * One record, in a shape this file chose.
+ *
+ * `default(…, 0)` guards the two numeric fields: a stream has no length, and a
+ * player that has not started has no position. Without it those come back empty
+ * and the record still parses — but a zero says the same thing more plainly.
+ */
+export const FORMAT = [
+  '{{playerName}}',
+  '{{status}}',
+  '{{title}}',
+  '{{artist}}',
+  '{{album}}',
+  '{{default(position,0)}}',
+  '{{default(mpris:length,0)}}',
+].join(UNIT);
+
+export type Runner = (args: string[]) => Promise<string>;
+
+export const runPlayerctl: Runner = (args) =>
+  new Promise((resolve, reject) => {
+    execFile('playerctl', args, { timeout: TIMEOUT_MS }, (error, stdout, stderr) =>
+      error ? reject(new Error(stderr.trim() || error.message)) : resolve(stdout),
+    );
+  });
+
+/**
+ * Parse one record.
+ *
+ * MPRIS reports position and length in **microseconds**, which is the detail
+ * most likely to be got wrong and the one worth stating twice.
+ */
+export function parseMpris(raw: string): NowPlayingReading | null {
+  const trimmed = raw.trim();
+  if (!trimmed) return null;
+
+  const parts = trimmed.split(UNIT);
+  if (parts.length < 7) return null;
+
+  const [player = '', status = '', title = '', artist = '', album = '', position = '', length = ''] =
+    parts;
+
+  // Same filter as the macOS side, for the same reason: something that made a
+  // noise is not necessarily something with a transport worth showing.
+  if (!title.trim()) return null;
+  const durationMs = micros(length);
+  if (durationMs <= 0) return null;
+
+  return {
+    bundleId: player.trim(),
+    label: player.trim(),
+    playing: status.trim().toLowerCase() === 'playing',
+    title: title.trim(),
+    artist: artist.trim(),
+    ...(album.trim() ? { album: album.trim() } : {}),
+    elapsedMs: Math.max(0, micros(position)),
+    durationMs,
+  };
+}
+
+export async function readMpris(run: Runner = runPlayerctl): Promise<NowPlayingReading | null> {
+  try {
+    return parseMpris(await run(['metadata', '--format', FORMAT]));
+  } catch {
+    // `playerctl` exits non-zero with "No players found" when nothing is
+    // running, which is an ordinary state rather than a fault.
+    return null;
+  }
+}
+
+/**
+ * playerctl's names for the transport commands, where they differ from ours.
+ *
+ * Only `play-pause` actually differs, but going through a map means a command
+ * this file has not thought about cannot be passed through to the shell
+ * unchecked.
+ */
+const PLAYERCTL: Record<MprisCommand, string> = {
+  play: 'play',
+  pause: 'pause',
+  togglePlayPause: 'play-pause',
+  next: 'next',
+  previous: 'previous',
+};
+
+export type MprisCommand = 'play' | 'pause' | 'togglePlayPause' | 'next' | 'previous';
+
+export async function sendMpris(
+  command: MprisCommand,
+  run: Runner = runPlayerctl,
+): Promise<boolean> {
+  const verb = PLAYERCTL[command];
+  if (!verb) return false;
+  try {
+    await run([verb]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/** Whether `playerctl` is here at all. Nothing needs to be playing. */
+export async function mprisAvailable(run: Runner = runPlayerctl): Promise<boolean> {
+  if (process.platform !== 'linux') return false;
+  try {
+    await run(['--version']);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function micros(value: string): number {
+  const n = Number.parseFloat(value);
+  // Microseconds. Getting this wrong by a thousand is the classic MPRIS bug.
+  return Number.isFinite(n) ? Math.round(n / 1000) : 0;
+}

package/src/source.ts

@@ -0,0 +1,71 @@
+import { isAvailable as macAvailable, readNowPlaying as macRead, sendTransport as macSend } from './mediaremote.js';
+import type { TransportCommand } from './mediaremote.js';
+import { mprisAvailable, readMpris, sendMpris } from './mpris.js';
+import type { NowPlayingReading } from './reading.js';
+
+/**
+ * Which system register to ask, on this machine.
+ *
+ * macOS and Linux answer the same question through completely different
+ * plumbing — a private Apple framework reached through JXA, and a D-Bus
+ * interface reached through `playerctl`. A host should not have to care, and
+ * neither should the queue: `nowplaying:current` means the same thing on both.
+ *
+ * Windows has an equivalent in SMTC and is not implemented. It would slot in
+ * here, and nothing above this file would change.
+ */
+export interface NowPlayingSource {
+  readonly platform: string;
+  available(): Promise<boolean>;
+  read(): Promise<NowPlayingReading | null>;
+  send(command: TransportCommand): Promise<boolean>;
+}
+
+const MAC: NowPlayingSource = {
+  platform: 'darwin',
+  available: () => macAvailable(),
+  read: () => macRead(),
+  send: (command) => macSend(command),
+};
+
+const LINUX: NowPlayingSource = {
+  platform: 'linux',
+  available: () => mprisAvailable(),
+  read: () => readMpris(),
+  send: (command) => sendMpris(command),
+};
+
+/** Null on a platform with no implementation, which the adapter reports. */
+export function sourceFor(platform: string = process.platform): NowPlayingSource | null {
+  if (platform === 'darwin') return MAC;
+  if (platform === 'linux') return LINUX;
+  return null;
+}
+
+export const UNSUPPORTED =
+  'no system Now Playing register here — this adapter supports macOS (MediaRemote) ' +
+  'and Linux (MPRIS, via playerctl)';
+
+/**
+ * The package's public reads and commands, on whichever platform this is.
+ *
+ * These are what a host imports, and what the `upnext` CLI's `now`, `pause`
+ * and `next` are built on. They dispatch rather than reaching for MediaRemote
+ * directly — which they used to, quietly making the CLI macOS-only even after
+ * the Linux register worked.
+ */
+export async function readNowPlaying(): Promise<NowPlayingReading | null> {
+  const source = sourceFor();
+  return source ? source.read() : null;
+}
+
+export async function sendTransport(command: TransportCommand): Promise<boolean> {
+  const source = sourceFor();
+  return source ? source.send(command) : false;
+}
+
+/** Whether this machine has a register we can reach at all. */
+export async function isAvailable(): Promise<boolean> {
+  const source = sourceFor();
+  return source ? source.available() : false;
+}