@basmilius/apple-devices 0.9.12 → 0.9.13

package/dist/index.d.mts

@@ -140,6 +140,7 @@ type EventMap$4 = {
   readonly clients: [Record<string, Client>];
   readonly deviceInfo: [Proto.DeviceInfoMessage];
   readonly deviceInfoUpdate: [Proto.DeviceInfoMessage];
+  readonly nowPlayingChanged: [client: Client | null, player: Player | null];
   readonly originClientProperties: [Proto.OriginClientPropertiesMessage];
   readonly playerClientProperties: [Proto.PlayerClientPropertiesMessage];
   readonly removeClient: [Proto.RemoveClientMessage];

package/dist/index.mjs

@@ -482,6 +482,7 @@ var state_default = class extends EventEmitter {
 	#device;
 	#clients;
 	#nowPlayingClientBundleIdentifier;
+	#nowPlayingSnapshot;
 	#outputDeviceUID;
 	#outputDevices = [];
 	#volume;
@@ -561,6 +562,7 @@ var state_default = class extends EventEmitter {
 	clear() {
 		this.#clients = {};
 		this.#nowPlayingClientBundleIdentifier = null;
+		this.#nowPlayingSnapshot = null;
 		this.#outputDeviceUID = null;
 		this.#outputDevices = [];
 		this.#volume = 0;
@@ -587,10 +589,12 @@ var state_default = class extends EventEmitter {
 	}
 	onRemoveClient(message) {
 		if (!(message.client.bundleIdentifier in this.#clients)) return;
+		const wasActive = this.#nowPlayingClientBundleIdentifier === message.client.bundleIdentifier;
 		delete this.#clients[message.client.bundleIdentifier];
-		if (this.#nowPlayingClientBundleIdentifier === message.client.bundleIdentifier) this.#nowPlayingClientBundleIdentifier = null;
+		if (wasActive) this.#nowPlayingClientBundleIdentifier = null;
 		this.emit("removeClient", message);
 		this.emit("clients", this.#clients);
+		if (wasActive) this.#emitNowPlayingChangedIfNeeded();
 	}
 	onSendCommandResult(message) {
 		this.emit("sendCommandResult", message);
@@ -605,6 +609,7 @@ var state_default = class extends EventEmitter {
 	onSetNowPlayingClient(message) {
 		this.#nowPlayingClientBundleIdentifier = message.client?.bundleIdentifier ?? null;
 		this.emit("setNowPlayingClient", message);
+		this.#emitNowPlayingChangedIfNeeded();
 	}
 	onSetNowPlayingPlayer(message) {
 		if (message.playerPath?.client?.bundleIdentifier && message.playerPath?.player?.identifier) {
@@ -613,9 +618,11 @@ var state_default = class extends EventEmitter {
 			client.setActivePlayer(message.playerPath.player.identifier);
 		}
 		this.emit("setNowPlayingPlayer", message);
+		this.#emitNowPlayingChangedIfNeeded();
 	}
 	onSetState(message) {
-		const client = this.#client(message.playerPath.client.bundleIdentifier, message.displayName);
+		const bundleIdentifier = message.playerPath.client.bundleIdentifier;
+		const client = this.#client(bundleIdentifier, message.displayName);
 		const playerIdentifier = message.playerPath?.player?.identifier || "MediaRemote-DefaultPlayer";
 		const player = client.getOrCreatePlayer(playerIdentifier, message.playerPath?.player?.displayName);
 		if (message.nowPlayingInfo) player.setNowPlayingInfo(message.nowPlayingInfo);
@@ -623,13 +630,16 @@ var state_default = class extends EventEmitter {
 		if (message.supportedCommands) player.setSupportedCommands(message.supportedCommands.supportedCommands);
 		if (message.playbackQueue) player.setPlaybackQueue(message.playbackQueue);
 		this.emit("setState", message);
+		if (bundleIdentifier === this.#nowPlayingClientBundleIdentifier) this.#emitNowPlayingChangedIfNeeded();
 	}
 	onUpdateContentItem(message) {
-		const client = this.#client(message.playerPath.client.bundleIdentifier, message.playerPath.client.displayName);
+		const bundleIdentifier = message.playerPath.client.bundleIdentifier;
+		const client = this.#client(bundleIdentifier, message.playerPath.client.displayName);
 		const playerIdentifier = message.playerPath?.player?.identifier || "MediaRemote-DefaultPlayer";
 		const player = client.getOrCreatePlayer(playerIdentifier, message.playerPath?.player?.displayName);
 		for (const item of message.contentItems) player.updateContentItem(item);
 		this.emit("updateContentItem", message);
+		if (bundleIdentifier === this.#nowPlayingClientBundleIdentifier) this.#emitNowPlayingChangedIfNeeded();
 	}
 	onUpdateContentItemArtwork(message) {
 		this.emit("updateContentItemArtwork", message);
@@ -644,6 +654,7 @@ var state_default = class extends EventEmitter {
 			if (client) client.removePlayer(message.playerPath.player.identifier);
 		}
 		this.emit("removePlayer", message);
+		if (message.playerPath?.client?.bundleIdentifier === this.#nowPlayingClientBundleIdentifier) this.#emitNowPlayingChangedIfNeeded();
 	}
 	onUpdateClient(message) {
 		this.#client(message.client.bundleIdentifier, message.client.displayName);
@@ -676,6 +687,38 @@ var state_default = class extends EventEmitter {
 			return client;
 		}
 	}
+	#createNowPlayingSnapshot() {
+		const client = this.nowPlayingClient;
+		const player = client?.activePlayer ?? null;
+		return {
+			bundleIdentifier: client?.bundleIdentifier ?? null,
+			playerIdentifier: player?.identifier ?? null,
+			playbackState: player?.playbackState ?? Proto.PlaybackState_Enum.Unknown,
+			title: player?.title ?? "",
+			artist: player?.artist ?? "",
+			album: player?.album ?? "",
+			genre: player?.genre ?? "",
+			duration: player?.duration ?? 0,
+			shuffleMode: player?.shuffleMode ?? Proto.ShuffleMode_Enum.Unknown,
+			repeatMode: player?.repeatMode ?? Proto.RepeatMode_Enum.Unknown,
+			mediaType: player?.mediaType ?? Proto.ContentItemMetadata_MediaType.UnknownMediaType,
+			seriesName: player?.seriesName ?? "",
+			seasonNumber: player?.seasonNumber ?? 0,
+			episodeNumber: player?.episodeNumber ?? 0,
+			contentIdentifier: player?.contentIdentifier ?? ""
+		};
+	}
+	#emitNowPlayingChangedIfNeeded() {
+		const snapshot = this.#createNowPlayingSnapshot();
+		const previous = this.#nowPlayingSnapshot;
+		if (previous && this.#snapshotsEqual(previous, snapshot)) return;
+		this.#nowPlayingSnapshot = snapshot;
+		const client = this.nowPlayingClient;
+		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.shuffleMode === b.shuffleMode && a.repeatMode === b.repeatMode && a.mediaType === b.mediaType && a.seriesName === b.seriesName && a.seasonNumber === b.seasonNumber && a.episodeNumber === b.episodeNumber && a.contentIdentifier === b.contentIdentifier;
+	}
 };
 
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@basmilius/apple-devices",
     "description": "Exposes various Apple devices to connect with either AirPlay or Companion Link.",
-    "version": "0.9.12",
+    "version": "0.9.13",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -49,10 +49,10 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-airplay": "0.9.12",
-        "@basmilius/apple-common": "0.9.12",
-        "@basmilius/apple-companion-link": "0.9.12",
-        "@basmilius/apple-encoding": "0.9.12"
+        "@basmilius/apple-airplay": "0.9.13",
+        "@basmilius/apple-common": "0.9.13",
+        "@basmilius/apple-companion-link": "0.9.13",
+        "@basmilius/apple-encoding": "0.9.13"
     },
     "devDependencies": {
         "@types/bun": "^1.3.9",