@basmilius/apple-devices 0.9.6 → 0.9.8

package/dist/index.d.mts

@@ -21,6 +21,8 @@ declare class Client {
   get duration(): number;
   get playbackRate(): number;
   get isPlaying(): boolean;
+  get shuffleMode(): Proto.ShuffleMode_Enum;
+  get repeatMode(): Proto.RepeatMode_Enum;
   get elapsedTime(): number;
   get currentItem(): Proto.ContentItem | null;
   get currentItemMetadata(): Proto.ContentItemMetadata | null;

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;
@@ -1966,16 +1973,18 @@ var Client = class {
 	get isPlaying() {
 		return this.#playbackState === Proto.PlaybackState_Enum.Playing;
 	}
+	get shuffleMode() {
+		return this.#supportedCommands.find((c) => c.command === Proto.Command.ChangeShuffleMode)?.shuffleMode ?? Proto.ShuffleMode_Enum.Unknown;
+	}
+	get repeatMode() {
+		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;
+		if (npi?.elapsedTime != null && npi.timestamp) return extrapolateElapsed(npi.elapsedTime, npi.timestamp, npi.playbackRate, this.isPlaying);
+		if (meta?.elapsedTime != null && meta.elapsedTimeTimestamp) 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;

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