Fix macos & linux playback

Author: 2latemc

.github/workflows/release.yml

@@ -12,6 +12,9 @@ on:
 permissions:
   contents: write
 
+env:
+  RELEASE_TAG: ${{ inputs.release_tag || github.event.release.tag_name }}
+
 jobs:
   release:
     name: Build ${{ matrix.platform.name }}
@@ -47,40 +50,36 @@ jobs:
         run: gh release view "$RELEASE_TAG" --repo "$GITHUB_REPOSITORY"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_TAG: ${{ inputs.release_tag }}
 
-      - name: Read release notification marker
+      - name: Read release type
         id: release_metadata
         shell: bash
         run: |
           set -euo pipefail
-          gh release view "$RELEASE_TAG" \
+          is_prerelease="$(gh release view "$RELEASE_TAG" \
             --repo "$GITHUB_REPOSITORY" \
-            --json body \
-            --jq .body > "$RUNNER_TEMP/release-body.txt"
+            --json isPrerelease \
+            --jq .isPrerelease)"
 
-          if grep -Fqi '[notify-update]' "$RUNNER_TEMP/release-body.txt"; then
-            echo "notify_update=true" >> "$GITHUB_OUTPUT"
+          if test "$is_prerelease" = "true"; then
+            echo "publish_update=false" >> "$GITHUB_OUTPUT"
           else
-            echo "notify_update=false" >> "$GITHUB_OUTPUT"
+            echo "publish_update=true" >> "$GITHUB_OUTPUT"
           fi
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_TAG: ${{ inputs.release_tag }}
 
       - name: Check out repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.release_tag }}
+          ref: ${{ env.RELEASE_TAG }}
           fetch-depth: 0
 
       - name: Verify checked out tag
         shell: bash
         run: |
           set -euo pipefail
           test "$(git describe --tags --exact-match)" = "$RELEASE_TAG"
-        env:
-          RELEASE_TAG: ${{ inputs.release_tag }}
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
@@ -130,9 +129,10 @@ jobs:
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
         with:
-          tagName: ${{ inputs.release_tag }}
+          tagName: ${{ env.RELEASE_TAG }}
           releaseDraft: false
-          uploadUpdaterJson: ${{ steps.release_metadata.outputs.notify_update }}
+          uploadUpdaterJson: ${{ steps.release_metadata.outputs.publish_update }}
+          uploadUpdaterSignatures: false
           updaterJsonPreferNsis: true
           args: ${{ matrix.platform.build_args }}
 
@@ -146,7 +146,6 @@ jobs:
             --clobber
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_TAG: ${{ inputs.release_tag }}
 
       - name: Verify macOS DMG and app signature
         if: startsWith(matrix.platform.name, 'macOS')
@@ -180,30 +179,29 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.release_tag }}
+          ref: ${{ env.RELEASE_TAG }}
           fetch-depth: 0
 
-      - name: Read release notification marker
+      - name: Read release type
         id: release_metadata
         shell: bash
         run: |
           set -euo pipefail
-          gh release view "$RELEASE_TAG" \
+          is_prerelease="$(gh release view "$RELEASE_TAG" \
             --repo "$GITHUB_REPOSITORY" \
-            --json body \
-            --jq .body > "$RUNNER_TEMP/release-body.txt"
+            --json isPrerelease \
+            --jq .isPrerelease)"
 
-          if grep -Fqi '[notify-update]' "$RUNNER_TEMP/release-body.txt"; then
-            echo "notify_update=true" >> "$GITHUB_OUTPUT"
+          if test "$is_prerelease" = "true"; then
+            echo "publish_update=false" >> "$GITHUB_OUTPUT"
           else
-            echo "notify_update=false" >> "$GITHUB_OUTPUT"
+            echo "publish_update=true" >> "$GITHUB_OUTPUT"
           fi
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_TAG: ${{ inputs.release_tag }}
 
       - name: Download generated updater metadata
-        if: steps.release_metadata.outputs.notify_update == 'true'
+        if: steps.release_metadata.outputs.publish_update == 'true'
         shell: bash
         run: |
           set -euo pipefail
@@ -214,10 +212,9 @@ jobs:
           test -s "$RUNNER_TEMP/updater-channel/latest.json"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_TAG: ${{ inputs.release_tag }}
 
       - name: Publish updater channel
-        if: steps.release_metadata.outputs.notify_update == 'true'
+        if: steps.release_metadata.outputs.publish_update == 'true'
         shell: bash
         run: |
           set -euo pipefail
@@ -243,5 +240,3 @@ jobs:
 
           git commit -m "Offer $RELEASE_TAG through the updater"
           git push origin updater-channel
-        env:
-          RELEASE_TAG: ${{ inputs.release_tag }}

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "just-another-music-client"
-version = "1.2.32"
+version = "1.2.5"
 description = "A desktop music client"
 authors = ["you"]
 edition = "2021"
@@ -21,6 +21,8 @@ tauri-build = { version = "2", features = [] }
 tauri = { version = "2", features = [] }
 tauri-plugin-autostart = "2"
 tauri-plugin-opener = "2"
+tauri-plugin-localhost = "2"
+portpicker = "0.1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "gzip", "brotli", "deflate"] }

src-tauri/Cargo.lock

@@ -25,7 +25,7 @@
     }
   },
   "remote": {
-    "urls": ["https://**"]
+    "urls": ["https://**", "http://localhost/**", "http://127.0.0.1/**"]
   },
   "command": {
     "allow": [

src-tauri/Cargo.toml

@@ -1,5 +1,7 @@
 // Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
 use base64::{engine::general_purpose::STANDARD, Engine as _};
+#[cfg(not(debug_assertions))]
+use portpicker::pick_unused_port;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::fs;
@@ -8,6 +10,8 @@ use std::path::{Path, PathBuf};
 use std::sync::Mutex;
 use std::thread;
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+use tauri::utils::config::FrontendDist;
+use tauri::utils::config_v1::WindowUrl;
 use tauri::Manager;
 
 #[cfg(target_os = "macos")]
@@ -1693,14 +1697,27 @@ pub fn run() {
         }
     }
 
-    let builder = tauri::Builder::default()
+    let mut context = tauri::generate_context!();
+    let mut builder = tauri::Builder::default()
         .manage(CacheLock(Mutex::new(())))
         .manage(discord_manager)
         .plugin(tauri_plugin_autostart::Builder::new().build())
         .plugin(tauri_plugin_updater::Builder::new().build())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_opener::init());
 
+    #[cfg(not(debug_assertions))]
+    {
+        let port = pick_unused_port().expect("failed to find an unused localhost port");
+        let url: url::Url = format!("http://localhost:{}", port)
+            .parse()
+            .expect("failed to parse localhost url");
+        let _window_url = WindowUrl::External(url.clone());
+
+        context.config_mut().build.frontend_dist = Some(FrontendDist::Url(url));
+        builder = builder.plugin(tauri_plugin_localhost::Builder::new(port).build());
+    }
+
     #[cfg(target_os = "windows")]
     let builder = builder.manage(windows_media::WindowsMediaSession::new());
 
@@ -1740,7 +1757,7 @@ pub fn run() {
             #[cfg(target_os = "windows")]
             windows_media::update_windows_media_session
         ])
-        .run(tauri::generate_context!())
+        .run(context)
         .expect("error while running tauri application");
 }
 

src-tauri/capabilities/default.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Just Another Music Client",
-  "version": "1.2.32",
+  "version": "1.2.5",
   "identifier": "com.justanothermusicclient.desktop",
   "build": {
     "beforeDevCommand": "npm run dev",
@@ -41,6 +41,7 @@
     "updater": {
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEQzMDBGRjQ1OEE5RjYzMzMKUldRelk1K0tSZjhBMDZ5Z1QxN2p4RlRsUi83c0c2M2t4WWVuUEdKTS9lNUVaaGJtNG92TTFTdVIK",
       "endpoints": [
+        "https://github.com/2latemc/JustAnotherMusicClient/releases/latest/download/latest.json",
         "https://raw.githubusercontent.com/2latemc/JustAnotherMusicClient/updater-channel/latest.json"
       ]
     }

src-tauri/src/lib.rs

@@ -32,6 +32,7 @@ export interface Lyrics {
 
 export interface Album {
   id: string;
+  playlistId?: string;
   title: string;
   artist: string;
   artists?: ArtistReference[];