@basmilius/apple-devices 0.9.12 → 0.9.14

package/dist/index.d.mts

@@ -91,7 +91,7 @@ declare const STATE_SUBSCRIBE_SYMBOL: unique symbol;
 declare const STATE_UNSUBSCRIBE_SYMBOL: unique symbol;
 //#endregion
 //#region src/airplay/remote.d.ts
-declare class export_default$8 {
+declare class export_default$1 {
   #private;
   constructor(device: export_default);
   up(): Promise<void>;
@@ -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];
@@ -159,7 +160,7 @@ type EventMap$4 = {
   readonly volumeControlCapabilitiesDidChange: [boolean, Proto.VolumeCapabilities_Enum];
   readonly volumeDidChange: [number];
 };
-declare class export_default$7 extends EventEmitter<EventMap$4> {
+declare class export_default$2 extends EventEmitter<EventMap$4> {
   #private;
   get clients(): Record<string, Client>;
   get nowPlayingClient(): Client | null;
@@ -195,7 +196,7 @@ declare class export_default$7 extends EventEmitter<EventMap$4> {
 }
 //#endregion
 //#region src/airplay/volume.d.ts
-declare class export_default$6 {
+declare class export_default$3 {
   #private;
   constructor(device: export_default);
   down(): Promise<void>;
@@ -215,9 +216,9 @@ declare class export_default extends EventEmitter<EventMap$3> {
   get discoveryResult(): DiscoveryResult;
   set discoveryResult(discoveryResult: DiscoveryResult);
   get isConnected(): boolean;
-  get remote(): export_default$8;
-  get state(): export_default$7;
-  get volume(): export_default$6;
+  get remote(): export_default$1;
+  get state(): export_default$2;
+  get volume(): export_default$3;
   get timingServer(): TimingServer | undefined;
   set timingServer(timingServer: TimingServer | undefined);
   constructor(discoveryResult: DiscoveryResult);
@@ -242,7 +243,7 @@ type EventMap$2 = {
   disconnected: [unexpected: boolean];
   power: [AttentionState];
 };
-declare class export_default$2 extends EventEmitter<EventMap$2> {
+declare class export_default$5 extends EventEmitter<EventMap$2> {
   #private;
   get [PROTOCOL$1](): Protocol$1;
   get discoveryResult(): DiscoveryResult;
@@ -275,13 +276,13 @@ type EventMap$1 = {
   disconnected: [unexpected: boolean];
   power: [AttentionState];
 };
-declare class export_default$1 extends EventEmitter<EventMap$1> {
+declare class export_default$4 extends EventEmitter<EventMap$1> {
   #private;
   get airplay(): export_default;
-  get companionLink(): export_default$2;
-  get remote(): export_default$8;
-  get state(): export_default$7;
-  get volumeControl(): export_default$6;
+  get companionLink(): export_default$5;
+  get remote(): export_default$1;
+  get state(): export_default$2;
+  get volumeControl(): export_default$3;
   get bundleIdentifier(): string | null;
   get displayName(): string | null;
   get isConnected(): boolean;
@@ -323,12 +324,12 @@ type EventMap = {
   connected: [];
   disconnected: [unexpected: boolean];
 };
-declare abstract class export_default$5 extends EventEmitter<EventMap> {
+declare abstract class export_default$8 extends EventEmitter<EventMap> {
   #private;
   get airplay(): export_default;
-  get remote(): export_default$8;
-  get state(): export_default$7;
-  get volumeControl(): export_default$6;
+  get remote(): export_default$1;
+  get state(): export_default$2;
+  get volumeControl(): export_default$3;
   get bundleIdentifier(): string | null;
   get displayName(): string | null;
   get isConnected(): boolean;
@@ -357,9 +358,9 @@ declare abstract class export_default$5 extends EventEmitter<EventMap> {
 }
 //#endregion
 //#region src/model/homepod.d.ts
-declare class export_default$3 extends export_default$5 {}
+declare class export_default$6 extends export_default$8 {}
 //#endregion
 //#region src/model/homepod-mini.d.ts
-declare class export_default$4 extends export_default$5 {}
+declare class export_default$7 extends export_default$8 {}
 //#endregion
-export { PROTOCOL as AIRPLAY, export_default as AirPlayDevice, export_default$1 as AppleTV, PROTOCOL$1 as COMPANION_LINK, export_default$2 as CompanionLinkDevice, export_default$3 as HomePod, export_default$4 as HomePodMini };
+export { PROTOCOL as AIRPLAY, Client as AirPlayClient, export_default as AirPlayDevice, Player as AirPlayPlayer, export_default$1 as AirPlayRemote, export_default$2 as AirPlayState, export_default$3 as AirPlayVolume, export_default$4 as AppleTV, PROTOCOL$1 as COMPANION_LINK, export_default$5 as CompanionLinkDevice, export_default$6 as HomePod, export_default$7 as HomePodMini };

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
@@ -1311,4 +1354,4 @@ var homepod_default = class extends homepod_base_default {};
 var homepod_mini_default = class extends homepod_base_default {};
 
 //#endregion
-export { PROTOCOL as AIRPLAY, device_default as AirPlayDevice, apple_tv_default as AppleTV, PROTOCOL$1 as COMPANION_LINK, device_default$1 as CompanionLinkDevice, homepod_default as HomePod, homepod_mini_default as HomePodMini };
+export { PROTOCOL as AIRPLAY, Client as AirPlayClient, device_default as AirPlayDevice, Player as AirPlayPlayer, remote_default as AirPlayRemote, state_default as AirPlayState, volume_default as AirPlayVolume, apple_tv_default as AppleTV, PROTOCOL$1 as COMPANION_LINK, device_default$1 as CompanionLinkDevice, homepod_default as HomePod, homepod_mini_default as HomePodMini };

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.14",
     "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.14",
+        "@basmilius/apple-common": "0.9.14",
+        "@basmilius/apple-companion-link": "0.9.14",
+        "@basmilius/apple-encoding": "0.9.14"
     },
     "devDependencies": {
         "@types/bun": "^1.3.9",