@basmilius/apple-devices 0.9.16 → 0.9.18

package/dist/index.mjs

@@ -87,8 +87,8 @@ var Player = class {
 	get elapsedTime() {
 		const npi = this.#nowPlayingInfo;
 		const meta = this.currentItemMetadata;
-		const npiValid = npi?.elapsedTime != null && npi.timestamp;
-		const metaValid = meta?.elapsedTime != null && meta.elapsedTimeTimestamp;
+		const npiValid = npi?.elapsedTime != null && npi.timestamp != null && npi.timestamp !== 0;
+		const metaValid = meta?.elapsedTime != null && meta.elapsedTimeTimestamp != null && meta.elapsedTimeTimestamp !== 0;
 		if (npiValid && metaValid) {
 			if (meta.elapsedTimeTimestamp > npi.timestamp) return extrapolateElapsed(meta.elapsedTime, meta.elapsedTimeTimestamp, meta.playbackRate);
 			return extrapolateElapsed(npi.elapsedTime, npi.timestamp, npi.playbackRate);
@@ -131,11 +131,7 @@ var Player = class {
 		return null;
 	}
 	get currentItemArtworkUrl() {
-		const metadata = this.currentItemMetadata;
-		if (metadata?.artworkURL) return metadata.artworkURL;
-		const item = this.currentItem;
-		if (item?.remoteArtworks.length > 0 && item.remoteArtworks[0].artworkURLString) return item.remoteArtworks[0].artworkURLString;
-		return null;
+		return this.artworkUrl();
 	}
 	get currentItemLyrics() {
 		return this.currentItem?.lyrics ?? null;
@@ -199,8 +195,7 @@ var Client = class {
 		return this.#players;
 	}
 	get activePlayer() {
-		if (this.#activePlayerId) return this.#players.get(this.#activePlayerId) ?? null;
-		return this.#players.get("MediaRemote-DefaultPlayer") ?? null;
+		return this.#players.get(this.#activePlayerId ?? "MediaRemote-DefaultPlayer") ?? null;
 	}
 	get nowPlayingInfo() {
 		return this.activePlayer?.nowPlayingInfo ?? null;
@@ -668,15 +663,11 @@ var state_default = class extends EventEmitter {
 		this.#volumeCapabilities = Proto.VolumeCapabilities_Enum.None;
 	}
 	onDeviceInfo(message) {
-		if (message.clusterID) this.#outputDeviceUID = message.clusterID;
-		else if (message.deviceUID) this.#outputDeviceUID = message.deviceUID;
-		else if (message.uniqueIdentifier) this.#outputDeviceUID = message.uniqueIdentifier;
+		this.#updateOutputDeviceUID(message);
 		this.emit("deviceInfo", message);
 	}
 	onDeviceInfoUpdate(message) {
-		if (message.clusterID) this.#outputDeviceUID = message.clusterID;
-		else if (message.deviceUID) this.#outputDeviceUID = message.deviceUID;
-		else if (message.uniqueIdentifier) this.#outputDeviceUID = message.uniqueIdentifier;
+		this.#updateOutputDeviceUID(message);
 		this.emit("deviceInfoUpdate", message);
 	}
 	onOriginClientProperties(message) {
@@ -777,6 +768,9 @@ var state_default = class extends EventEmitter {
 		this.#volume = message.volume;
 		this.emit("volumeDidChange", message.volume);
 	}
+	#updateOutputDeviceUID(message) {
+		this.#outputDeviceUID = message.clusterID || message.deviceUID || message.uniqueIdentifier || null;
+	}
 	#client(bundleIdentifier, displayName) {
 		if (bundleIdentifier in this.#clients) {
 			const client = this.#clients[bundleIdentifier];
@@ -956,7 +950,9 @@ var device_default = class extends EventEmitter {
 	disconnectSafely() {
 		try {
 			this.disconnect();
-		} catch (_) {}
+		} catch (err) {
+			this.#protocol?.context?.logger?.warn("[device]", "Error during safe disconnect", err);
+		}
 	}
 	async addOutputDevices(deviceUIDs) {
 		await this.#protocol.dataStream.exchange(DataStreamMessage.modifyOutputContext(deviceUIDs));
@@ -1005,21 +1001,26 @@ var device_default = class extends EventEmitter {
 		this.#protocol.controlStream.enableEncryption(keys.accessoryToControllerKey, keys.controllerToAccessoryKey);
 		this.#unsubscribe();
 		if (this.#timingServer) this.#protocol.useTimingServer(this.#timingServer);
-		await this.#protocol.setupEventStream(keys.sharedSecret, keys.pairingId);
-		await this.#protocol.setupDataStream(keys.sharedSecret, () => this.#subscribe());
-		this.#protocol.dataStream.on("error", this.#onError.bind(this));
-		this.#protocol.dataStream.on("timeout", this.#onTimeout.bind(this));
-		this.#protocol.eventStream.on("error", this.#onError.bind(this));
-		this.#protocol.eventStream.on("timeout", this.#onTimeout.bind(this));
-		this.#feedbackInterval = setInterval(async () => await this.#feedback(), FEEDBACK_INTERVAL);
 		try {
+			await this.#protocol.setupEventStream(keys.sharedSecret, keys.pairingId);
+			await this.#protocol.setupDataStream(keys.sharedSecret, () => this.#subscribe());
+			this.#protocol.dataStream.on("error", this.#onError.bind(this));
+			this.#protocol.dataStream.on("timeout", this.#onTimeout.bind(this));
+			this.#protocol.eventStream.on("error", this.#onError.bind(this));
+			this.#protocol.eventStream.on("timeout", this.#onTimeout.bind(this));
+			if (this.#feedbackInterval) clearInterval(this.#feedbackInterval);
+			this.#feedbackInterval = setInterval(async () => await this.#feedback(), FEEDBACK_INTERVAL);
 			await this.#protocol.dataStream.exchange(DataStreamMessage.deviceInfo(keys.pairingId));
 			await this.#protocol.dataStream.exchange(DataStreamMessage.setConnectionState());
 			await this.#protocol.dataStream.exchange(DataStreamMessage.clientUpdatesConfig());
 			this.#protocol.context.logger.info("Protocol ready.");
 		} catch (err) {
-			clearInterval(this.#feedbackInterval);
-			this.#feedbackInterval = void 0;
+			if (this.#feedbackInterval) {
+				clearInterval(this.#feedbackInterval);
+				this.#feedbackInterval = void 0;
+			}
+			this.#protocol.context.logger.error("[device]", "Setup failed, cleaning up", err);
+			this.#protocol.disconnect();
 			throw err;
 		}
 	}

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.16",
+    "version": "0.9.18",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -49,10 +49,10 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-airplay": "0.9.16",
-        "@basmilius/apple-common": "0.9.16",
-        "@basmilius/apple-companion-link": "0.9.16",
-        "@basmilius/apple-encoding": "0.9.16"
+        "@basmilius/apple-airplay": "0.9.18",
+        "@basmilius/apple-common": "0.9.18",
+        "@basmilius/apple-companion-link": "0.9.18",
+        "@basmilius/apple-encoding": "0.9.18"
     },
     "devDependencies": {
         "@types/bun": "^1.3.11",