@corewire/airplay 1.0.0-next.1 → 1.0.0-next.2

package/README.md

@@ -7,7 +7,7 @@ Part of [CoreWire](https://corewire.dev). To control a device without handling s
 ## Install
 
 ```sh
-npm install @corewire/airplay
+npm install @corewire/airplay@next
 ```
 
 Requires Node.js 18.17 or later (20.3 or later on the 20 line).

package/dist/index.mjs

@@ -2064,6 +2064,7 @@ async function transientPairing(control, context) {
 * @throws {PairingError} When the receiver refuses to start pairing.
 */
 async function pair(target, options = {}) {
+	if (options.signal?.aborted) throw new ConnectionClosedError("Pairing was interrupted.");
 	const context = options.context ?? new Context(target.id ?? target.address, options.identity);
 	const control = new ControlChannel(context, target.address, target.port ?? 7e3);
 	const interrupt = () => control.destroy();

package/dist/mrp.mjs

@@ -627,6 +627,11 @@ function getExtension(message, extension) {
 
 //#endregion
 //#region src/mrp/commands.ts
+/**
+* Milliseconds a command waits for its result. The Music app on tvOS answers Play after about
+* 9 s while playback starts within a second, and the receiver handles commands one at a time.
+*/
+const COMMAND_TIMEOUT = 15e3;
 /** The receiver refused a SendCommand. */
 var SendCommandError = class extends CommandError {
 	sendError;
@@ -737,7 +742,7 @@ var Commands = class {
 		await this.#exchange(sendCommandWithSleepTimer(seconds, stopMode));
 	}
 	async #exchange(message) {
-		const response = await this.#channel.exchange(message);
+		const response = await this.#channel.exchange(message, COMMAND_TIMEOUT);
 		let result;
 		try {
 			result = getExtension(response, sendCommandResultMessage);
@@ -1667,29 +1672,29 @@ var MediaRemoteState = class extends EventEmitter {
 		}
 		this.#emitNowPlayingChangedIfNeeded();
 	}
-	/** One SET_STATE can carry playback state, now-playing info, commands and queue at once; only the active client emits. */
+	/** One SET_STATE can carry playback state, now-playing info, commands and queue at once; only the active player of the active client emits. */
 	#onSetState(message) {
 		const bundleIdentifier = message.playerPath?.client?.bundleIdentifier;
 		if (!bundleIdentifier) return;
 		const client = this.#client(bundleIdentifier, message.displayName);
 		const playerIdentifier = message.playerPath?.player?.identifier || "MediaRemote-DefaultPlayer";
 		const player = client.getOrCreatePlayer(playerIdentifier, message.playerPath?.player?.displayName);
-		const isActiveClient = bundleIdentifier === this.#nowPlayingClientBundleIdentifier;
+		const isActive = bundleIdentifier === this.#nowPlayingClientBundleIdentifier && player === client.activePlayer;
 		if (message.playbackState) {
 			const oldState = player.playbackState;
 			player.setPlaybackState(message.playbackState, message.playbackStateTimestamp);
-			if (isActiveClient && oldState !== player.playbackState) this.emit("playbackStateChanged", client, player, oldState, player.playbackState);
+			if (isActive && oldState !== player.playbackState) this.emit("playbackStateChanged", client, player, oldState, player.playbackState);
 		}
 		if (message.nowPlayingInfo) player.setNowPlayingInfo(message.nowPlayingInfo);
 		if (message.supportedCommands) {
 			player.setSupportedCommands(message.supportedCommands.supportedCommands);
-			if (isActiveClient) this.emit("supportedCommandsChanged", client, player, player.supportedCommands);
+			if (isActive) this.emit("supportedCommandsChanged", client, player, player.supportedCommands);
 		}
 		if (message.playbackQueue) {
 			player.setPlaybackQueue(message.playbackQueue);
-			if (isActiveClient) this.emit("playbackQueueChanged", client, player);
+			if (isActive) this.emit("playbackQueueChanged", client, player);
 		}
-		if (isActiveClient) this.#emitNowPlayingChangedIfNeeded();
+		if (isActive) this.#emitNowPlayingChangedIfNeeded();
 	}
 	#onUpdateContentItem(message) {
 		const bundleIdentifier = message.playerPath?.client?.bundleIdentifier;
@@ -1786,12 +1791,15 @@ var MediaRemoteState = class extends EventEmitter {
 	#createNowPlayingSnapshot() {
 		const client = this.nowPlayingClient;
 		const player = client?.activePlayer ?? null;
+		const metadata = player?.currentItemMetadata;
 		return {
 			bundleIdentifier: client?.bundleIdentifier ?? null,
+			displayName: client?.displayName ?? null,
 			playerIdentifier: player?.identifier ?? null,
 			playbackState: player?.playbackState ?? 0,
 			title: player?.title ?? "",
 			artist: player?.artist ?? "",
+			trackArtist: metadata?.trackArtistName ?? "",
 			album: player?.album ?? "",
 			genre: player?.genre ?? "",
 			duration: player?.duration ?? 0,
@@ -1805,6 +1813,8 @@ var MediaRemoteState = class extends EventEmitter {
 			episodeTitle: player?.episodeTitle ?? "",
 			contentRating: player?.contentRating ?? "",
 			contentIdentifier: player?.contentIdentifier ?? "",
+			storeAlbumId: String(metadata?.iTunesStoreAlbumIdentifier ?? ""),
+			lyricsId: String(metadata?.lyricsAdamID ?? ""),
 			artworkId: player?.artworkId ?? null,
 			hasArtworkUrl: player?.artworkUrl() != null,
 			hasArtworkData: player?.currentItemArtwork != null,
@@ -1825,7 +1835,7 @@ var MediaRemoteState = class extends EventEmitter {
 		this.emit("nowPlayingChanged", client, client?.activePlayer ?? null);
 	}
 	#snapshotsEqual(a, b) {
-		return a.bundleIdentifier === b.bundleIdentifier && a.playerIdentifier === b.playerIdentifier && a.playbackState === b.playbackState && a.title === b.title && a.artist === b.artist && a.album === b.album && a.genre === b.genre && a.duration === b.duration && a.playbackRate === b.playbackRate && a.shuffleMode === b.shuffleMode && a.repeatMode === b.repeatMode && a.mediaType === b.mediaType && a.seriesName === b.seriesName && a.seasonNumber === b.seasonNumber && a.episodeNumber === b.episodeNumber && a.episodeTitle === b.episodeTitle && a.contentRating === b.contentRating && a.contentIdentifier === b.contentIdentifier && a.artworkId === b.artworkId && a.hasArtworkUrl === b.hasArtworkUrl && a.hasArtworkData === b.hasArtworkData && a.isAlwaysLive === b.isAlwaysLive && a.isAdvertisement === b.isAdvertisement;
+		return a.bundleIdentifier === b.bundleIdentifier && a.displayName === b.displayName && a.playerIdentifier === b.playerIdentifier && a.playbackState === b.playbackState && a.title === b.title && a.artist === b.artist && a.trackArtist === b.trackArtist && a.album === b.album && a.genre === b.genre && a.duration === b.duration && a.playbackRate === b.playbackRate && a.shuffleMode === b.shuffleMode && a.repeatMode === b.repeatMode && a.mediaType === b.mediaType && a.seriesName === b.seriesName && a.seasonNumber === b.seasonNumber && a.episodeNumber === b.episodeNumber && a.episodeTitle === b.episodeTitle && a.contentRating === b.contentRating && a.contentIdentifier === b.contentIdentifier && a.storeAlbumId === b.storeAlbumId && a.lyricsId === b.lyricsId && a.artworkId === b.artworkId && a.hasArtworkUrl === b.hasArtworkUrl && a.hasArtworkData === b.hasArtworkData && a.isAlwaysLive === b.isAlwaysLive && a.isAdvertisement === b.isAdvertisement;
 	}
 };
 

package/dist/raop.mjs

@@ -855,7 +855,7 @@ var StreamClient = class extends EventEmitter {
 		} finally {
 			this.#packetBacklog.clear();
 			if (transport) {
-				await this.#rtsp.teardown(this.#streamContext.rtspSession);
+				await this.#rtsp.teardown(this.#streamContext.rtspSession).catch((err) => this.#context.logger.warn("TEARDOWN failed.", err));
 				transport.close();
 			}
 			this.#protocol.teardown();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@corewire/airplay",
     "description": "AirPlay 2 client for Node.js, with MRP remote control, URL playback, audio streaming and RAOP.",
-    "version": "1.0.0-next.1",
+    "version": "1.0.0-next.2",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -11,9 +11,13 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/basmilius/apple-protocols",
+        "url": "https://github.com/basmilius/corewire",
         "directory": "packages/airplay"
     },
+    "homepage": "https://corewire.dev",
+    "bugs": {
+        "url": "https://github.com/basmilius/corewire/issues"
+    },
     "keywords": [
         "apple",
         "airplay",
@@ -61,7 +65,7 @@
         }
     },
     "dependencies": {
-        "@corewire/core": "1.0.0-next.1"
+        "@corewire/core": "1.0.0-next.2"
     },
     "devDependencies": {
         "@bufbuild/buf": "^1.70.0",