Mabey fix linux playback

Author: 2latemc

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "just-another-music-client",
   "private": true,
-  "version": "1.2.71",
+  "version": "1.2.72",
   "type": "module",
   "scripts": {
     "dev": "vite",

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "just-another-music-client"
-version = "1.2.71"
+version = "1.2.72"
 description = "A desktop music client"
 authors = ["you"]
 edition = "2021"

src-tauri/Cargo.lock

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Just Another Music Client",
-  "version": "1.2.71",
+  "version": "1.2.72",
   "identifier": "com.justanothermusicclient.desktop",
   "build": {
     "beforeDevCommand": "npm run dev",

src-tauri/Cargo.toml

@@ -58,9 +58,8 @@ let playbackClaimId = 0;
 let playbackOwner: AudioEngine | null = null;
 
 function shouldUseNativeAudio(): boolean {
-  // Native audio playback is disabled on macOS/Linux because the backend
-  // download path (getStreamData) can fail with 403 errors. The iframe-based
-  // YouTube player is more reliable across all platforms.
+  // The maintained playback path is the YouTube iframe player. Native audio is
+  // kept as an explicit fallback for player errors that are specific to a webview.
   return false;
 }
 
@@ -141,6 +140,7 @@ export class AudioEngine {
     }
 
     const requestId = ++this.loadRequestId;
+    this.releaseNativeAudio();
     const player = await this.ensurePlayer();
     if (requestId !== this.loadRequestId) return;
     if (this.currentVideoId === videoId) return;
@@ -155,18 +155,34 @@ export class AudioEngine {
       videoId,
     );
     player.cueVideoById(videoId);
-    await cued;
+    try {
+      await cued;
+    } catch (error) {
+      if (requestId === this.loadRequestId && this.currentVideoId === videoId) {
+        this.currentVideoId = null;
+      }
+      throw error;
+    }
     if (requestId !== this.loadRequestId || this.currentVideoId !== videoId) return;
     logInternalInfo("AudioEngine.loadTrack cued", { videoId });
   }
 
+  async loadNativeFallback(
+    videoId: string,
+    audioData: ArrayBuffer,
+    mimeType?: string,
+  ): Promise<void> {
+    this.player?.stopVideo();
+    await this.loadNativeAudio(videoId, audioData, mimeType);
+  }
+
   setOnEnded(listener: (() => void) | null): void {
     this.onEnded = listener;
   }
 
   async play(): Promise<boolean> {
     const claimId = this.claimPlayback();
-    if (this.useNativeAudio) {
+    if (this.useNativeAudio || this.audio) {
       if (!this.audio || !this.currentVideoId) {
         throw new Error("No audio track is loaded.");
       }
@@ -401,6 +417,7 @@ export class AudioEngine {
   }
 
   private pauseForPlaybackClaim(): void {
+    this.audio?.pause();
     this.player?.pauseVideo();
   }
 

src-tauri/tauri.conf.json

@@ -36,6 +36,11 @@ export interface PlayerSession {
 
 type Listener = () => void;
 
+function isYouTubePlayerError5(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : String(error);
+  return /\bYouTube player error 5\b/.test(message);
+}
+
 function normalizePlaybackOrderMode(mode: unknown): PlaybackOrderMode {
   if (mode === "shuffle") return "shuffle";
   if (mode === "repeat-one" || mode === "repeat-all") return "repeat-one";
@@ -608,7 +613,24 @@ export class PlayerController {
       if (this.audioEngine.usesNativeAudio() && !audioData) {
         throw new Error("The data source does not support native audio playback.");
       }
-      await this.audioEngine.loadTrack(track.id, audioData?.bytes, audioData?.mimeType);
+      try {
+        await this.audioEngine.loadTrack(track.id, audioData?.bytes, audioData?.mimeType);
+      } catch (error) {
+        if (!isYouTubePlayerError5(error) || !this.dataSource.getStreamData) {
+          throw error;
+        }
+
+        logInternalWarn("PlayerController.ensureTrackLoaded falling back to native audio", {
+          trackId: track.id,
+          error: error instanceof Error ? error.message : String(error),
+        });
+        const fallbackAudioData = await this.dataSource.getStreamData(track);
+        await this.audioEngine.loadNativeFallback(
+          track.id,
+          fallbackAudioData.bytes,
+          fallbackAudioData.mimeType,
+        );
+      }
 
       this.loadedTrackId = track.id;
       if (this.pendingSeekTime !== null) {