@basmilius/apple-devices 0.9.7 → 0.9.9

package/dist/index.d.mts

@@ -18,6 +18,12 @@ declare class Client {
   get title(): string;
   get artist(): string;
   get album(): string;
+  get genre(): string;
+  get seriesName(): string;
+  get seasonNumber(): number;
+  get episodeNumber(): number;
+  get mediaType(): Proto.ContentItemMetadata_MediaType;
+  get contentIdentifier(): string;
   get duration(): number;
   get playbackRate(): number;
   get isPlaying(): boolean;

package/dist/index.mjs

@@ -1926,6 +1926,13 @@ var merge = createAssigner(function(object, source, srcIndex) {
 
 //#endregion
 //#region src/airplay/client.ts
+const COCOA_EPOCH_OFFSET = 978307200;
+const extrapolateElapsed = (elapsed, cocoaTimestamp, rate, isPlaying) => {
+	if (!rate || !isPlaying) return elapsed;
+	const timestampUnix = cocoaTimestamp + COCOA_EPOCH_OFFSET;
+	const delta = (Date.now() / 1e3 - timestampUnix) * rate;
+	return Math.max(0, elapsed + delta);
+};
 var Client = class {
 	get bundleIdentifier() {
 		return this.#bundleIdentifier;
@@ -1957,6 +1964,24 @@ var Client = class {
 	get album() {
 		return this.#nowPlayingInfo?.album || this.currentItemMetadata?.albumName || "";
 	}
+	get genre() {
+		return this.currentItemMetadata?.genre || "";
+	}
+	get seriesName() {
+		return this.currentItemMetadata?.seriesName || "";
+	}
+	get seasonNumber() {
+		return this.currentItemMetadata?.seasonNumber || 0;
+	}
+	get episodeNumber() {
+		return this.currentItemMetadata?.episodeNumber || 0;
+	}
+	get mediaType() {
+		return this.currentItemMetadata?.mediaType ?? Proto.ContentItemMetadata_MediaType.UnknownMediaType;
+	}
+	get contentIdentifier() {
+		return this.currentItemMetadata?.contentIdentifier || "";
+	}
 	get duration() {
 		return this.#nowPlayingInfo?.duration || this.currentItemMetadata?.duration || 0;
 	}
@@ -1973,15 +1998,17 @@ var Client = class {
 		return this.#supportedCommands.find((c) => c.command === Proto.Command.ChangeRepeatMode)?.repeatMode ?? Proto.RepeatMode_Enum.Unknown;
 	}
 	get elapsedTime() {
-		const meta = this.currentItemMetadata;
 		const npi = this.#nowPlayingInfo;
-		const elapsedTimestamp = meta?.elapsedTimeTimestamp || 0;
-		const elapsed = meta?.elapsedTime || npi?.elapsedTime || 0;
-		if (!elapsedTimestamp) return elapsed;
-		if ((meta?.playbackRate ?? npi?.playbackRate ?? 0) === 0 || !this.isPlaying) return elapsed;
-		const timestampUnix = elapsedTimestamp + 978307200;
-		const diff = Date.now() / 1e3 - timestampUnix;
-		return Math.max(0, elapsed + diff);
+		const meta = this.currentItemMetadata;
+		const npiValid = npi?.elapsedTime != null && npi.timestamp;
+		const metaValid = meta?.elapsedTime != null && meta.elapsedTimeTimestamp;
+		if (npiValid && metaValid) {
+			if (meta.elapsedTimeTimestamp > npi.timestamp) return extrapolateElapsed(meta.elapsedTime, meta.elapsedTimeTimestamp, meta.playbackRate ?? npi.playbackRate, this.isPlaying);
+			return extrapolateElapsed(npi.elapsedTime, npi.timestamp, npi.playbackRate, this.isPlaying);
+		}
+		if (npiValid) return extrapolateElapsed(npi.elapsedTime, npi.timestamp, npi.playbackRate, this.isPlaying);
+		if (metaValid) return extrapolateElapsed(meta.elapsedTime, meta.elapsedTimeTimestamp, meta.playbackRate, this.isPlaying);
+		return npi?.elapsedTime || meta?.elapsedTime || 0;
 	}
 	get currentItem() {
 		if (!this.#playbackQueue || this.#playbackQueue.contentItems.length === 0) return null;
@@ -2606,22 +2633,10 @@ var device_default = class extends EventEmitter {
 		this.#protocol.eventStream.on("timeout", this.#onTimeout.bind(this));
 		this.#feedbackInterval = setInterval(async () => await this.#feedback(), FEEDBACK_INTERVAL);
 		try {
-			await this.#protocol.dataStream.exchange(DataStreamMessage.setConnectionState(Proto.SetConnectionStateMessage_ConnectionState.Connecting));
-			await waitFor(500);
-			const gid = this.#discoveryResult.txt.gid;
-			if (gid) await this.#protocol.dataStream.exchange(DataStreamMessage.configureConnection(gid));
-			if (!await Promise.race([new Promise(async (resolve) => {
-				this.#protocol.dataStream.once("deviceInfo", async () => {
-					await this.#protocol.dataStream.exchange(DataStreamMessage.setConnectionState());
-					await this.#protocol.dataStream.exchange(DataStreamMessage.clientUpdatesConfig());
-					resolve(true);
-				});
-				await this.#protocol.dataStream.exchange(DataStreamMessage.deviceInfo(keys.pairingId));
-			}), async () => {
-				await waitFor(3e3);
-				return false;
-			}])) this.#onError(/* @__PURE__ */ new Error("Device did not respond in time with its info."));
-			else this.#protocol.context.logger.info("Device info received successfully, protocol should be ready.");
+			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;
@@ -2754,7 +2769,9 @@ var device_default$1 = class extends EventEmitter {
 			await this.#protocol.tvrcSessionStart();
 			await this.#protocol.touchStart();
 			await this.#protocol.tiStart();
-			await this.#protocol.unsubscribe("_iMC");
+			await this.#protocol.subscribe("_iMC", (data) => {
+				this.emit("mediaControl", data);
+			});
 			this.#heartbeatInterval = setInterval(async () => await this.#heartbeat(), 15e3);
 			await this.#subscribe();
 		} catch (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.7",
+    "version": "0.9.9",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -49,10 +49,10 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-airplay": "0.9.7",
-        "@basmilius/apple-common": "0.9.7",
-        "@basmilius/apple-companion-link": "0.9.7",
-        "@basmilius/apple-encoding": "0.9.7"
+        "@basmilius/apple-airplay": "0.9.9",
+        "@basmilius/apple-common": "0.9.9",
+        "@basmilius/apple-companion-link": "0.9.9",
+        "@basmilius/apple-encoding": "0.9.9"
     },
     "devDependencies": {
         "@types/bun": "^1.3.9",