Merge pull request 'feat: add web share target support and implement catalog search API' (#109 ) from push-vsvqwqmmouro into main

Reviewed-on: #109
feat: add web share target support and implement catalog search API
2026-06-28 23:50:33 +02:00 · 2026-06-28 23:40:35 +02:00 · 2026-06-28 12:37:33 +02:00 · 2026-06-28 12:37:09 +02:00 · 2026-06-28 12:14:43 +02:00 · 2026-06-28 12:04:32 +02:00
19 changed files with 5130 additions and 36 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = 4

 [[package]]
 name = "PMOMusic"
-version = "0.3.55"
+version = "0.3.61"
 dependencies = [
 "axum 0.8.7",
 "console-subscriber",
--- a/PMOMusic-A-192.png
+++ b/PMOMusic-A-192.png
--- a/PMOMusic-A-512.png
+++ b/PMOMusic-A-512.png
--- a/PMOMusic/Cargo.toml
+++ b/PMOMusic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "PMOMusic"
-version = "0.3.55"
+version = "0.3.61"
 edition = "2024"

 [dependencies]
--- a/PMOMusic/src/main.rs
+++ b/PMOMusic/src/main.rs
@@ -15,14 +15,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
    // #[cfg(tokio_unstable)]
    // console_subscriber::init();

-    let server = Server::create_upnp_server().await?; // Routes personnalisées de l'application
-    server
-        .write()
-        .await
-        .add_route("/info", || async {
-            serde_json::json!({"version": "1.0.0"})
-        })
-        .await;
+    let server = Server::create_upnp_server().await?;

    // Initialiser le système de gestion des sources musicales avec API REST
    info!("📡 Initializing music sources management system...");
@@ -91,6 +84,21 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
    // Initialiser les ProtocolInfo du MediaServer
    server_instance.init_protocol_info();

+    let local_server_id = server_instance.udn().to_string();
+
+    // Exposer les informations de base de l'instance locale
+    {
+        let local_server_id_clone = local_server_id.clone();
+        server
+            .write()
+            .await
+            .add_route("/info", move || {
+                let id = local_server_id_clone.clone();
+                async move { serde_json::json!({"version": "1.0.0", "local_server_id": id}) }
+            })
+            .await;
+    }
+
    info!(
        "✅ MediaServer ready at {}{}",
        server_instance.base_url(),
--- a/pmoapp/webapp/index.html
+++ b/pmoapp/webapp/index.html
@@ -2,9 +2,15 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/png" sizes="192x192" href="/app/icons/icon-192.png" />
+    <link rel="apple-touch-icon" href="/app/icons/icon-192.png" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
-    <title>webapp</title>
+    <meta name="theme-color" content="#111827" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+    <meta name="apple-mobile-web-app-title" content="PMOMusic" />
+    <title>PMOMusic</title>
  </head>
  <body>
    <div id="app"></div>
--- a/pmoapp/webapp/package-lock.json
+++ b/pmoapp/webapp/package-lock.json
--- a/pmoapp/webapp/package.json
+++ b/pmoapp/webapp/package.json
@@ -25,6 +25,7 @@
    "@vue/tsconfig": "^0.8.1",
    "typescript": "~5.8.3",
    "vite": "^7.1.7",
+    "vite-plugin-pwa": "^1.3.0",
    "vue-tsc": "^3.0.7"
  }
 }
--- a/pmoapp/webapp/public/icons/icon-192.png
+++ b/pmoapp/webapp/public/icons/icon-192.png
--- a/pmoapp/webapp/public/icons/icon-512.png
+++ b/pmoapp/webapp/public/icons/icon-512.png
--- a/pmoapp/webapp/src/App.vue
+++ b/pmoapp/webapp/src/App.vue
@@ -10,7 +10,17 @@
 </template>

 <script setup lang="ts">
+import { watch } from 'vue'
 import NotificationToast from '@/components/NotificationToast.vue'
+import { useShareTarget } from '@/composables/useShareTarget'
+import { useUIStore } from '@/stores/ui'
+
+const ui = useUIStore()
+const { shareError } = useShareTarget()
+
+watch(shareError, (err) => {
+  if (err) ui.notifyError(err)
+})
 </script>

 <style scoped>
--- a/pmoapp/webapp/src/composables/useRenderers.ts
+++ b/pmoapp/webapp/src/composables/useRenderers.ts
@@ -579,6 +579,8 @@ export function useRenderers() {
    volumeUp,
    volumeDown,
    toggleMute,
+    // Selection
+    selectedRendererId,
    // Playlist binding
    attachPlaylist,
    detachPlaylist,
--- a/pmoapp/webapp/src/composables/useShareTarget.ts
+++ b/pmoapp/webapp/src/composables/useShareTarget.ts
@@ -0,0 +1,90 @@
+import { ref, onMounted } from 'vue'
+import { searchSource } from '@/services/pmosource'
+import { useRenderers } from '@/composables/useRenderers'
+
+export interface ShareTargetResult {
+  url: string
+  title: string | null
+  containerId: string
+}
+
+const pendingShare = ref<ShareTargetResult | null>(null)
+const shareError = ref<string | null>(null)
+
+let localServerId: string | null = null
+
+async function fetchLocalServerId(): Promise<string | null> {
+  if (localServerId) return localServerId
+  try {
+    const resp = await fetch('/api/info')
+    if (!resp.ok) return null
+    const data = await resp.json()
+    localServerId = data.local_server_id ?? null
+    return localServerId
+  } catch {
+    return null
+  }
+}
+
+export function useShareTarget() {
+  const { selectedRendererId, attachAndPlayPlaylist } = useRenderers()
+
+  async function handleShareIfPresent() {
+    const params = new URLSearchParams(window.location.search)
+    const sharedUrl = params.get('share_url') ?? params.get('share_text') ?? null
+    const sharedTitle = params.get('share_title')
+
+    if (!sharedUrl) return
+
+    const clean = new URL(window.location.href)
+    clean.searchParams.delete('share_url')
+    clean.searchParams.delete('share_title')
+    clean.searchParams.delete('share_text')
+    window.history.replaceState({}, '', clean.toString())
+
+    try {
+      shareError.value = null
+      const result = await searchSource('url', sharedUrl)
+      if (result.total === 0) {
+        shareError.value = `Aucun contenu trouvé pour : ${sharedUrl}`
+        return
+      }
+
+      const container = result.containers[0] ?? null
+      const containerId = container?.id ?? result.items[0]?.id
+
+      if (!containerId) {
+        shareError.value = 'Contenu résolu mais sans identifiant jouable'
+        return
+      }
+
+      const serverId = await fetchLocalServerId()
+      const rendererId = selectedRendererId.value
+
+      if (!serverId || !rendererId) {
+        // Pas de renderer sélectionné ou serveur inconnu : stocker pour affichage manuel
+        pendingShare.value = { url: sharedUrl, title: sharedTitle, containerId }
+        return
+      }
+
+      await attachAndPlayPlaylist(rendererId, serverId, containerId)
+    } catch (e) {
+      shareError.value = e instanceof Error ? e.message : 'Erreur lors de la résolution'
+    }
+  }
+
+  function clearShare() {
+    pendingShare.value = null
+    shareError.value = null
+  }
+
+  onMounted(() => {
+    handleShareIfPresent()
+  })
+
+  return {
+    pendingShare,
+    shareError,
+    clearShare,
+  }
+}
--- a/pmoapp/webapp/src/services/pmosource.ts
+++ b/pmoapp/webapp/src/services/pmosource.ts
@@ -171,6 +171,18 @@ export function getSourceImageUrl(sourceId: string): string {
  return `${API_BASE}/${sourceId}/image`
 }

+/**
+ * Recherche dans une source musicale (URL, texte libre…)
+ */
+export async function searchSource(sourceId: string, query: string): Promise<BrowseResponse> {
+  const params = new URLSearchParams({ q: query })
+  const response = await fetch(`${API_BASE}/${sourceId}/search?${params.toString()}`)
+  if (!response.ok) {
+    throw new Error(`Search failed: ${response.status} ${response.statusText}`)
+  }
+  return response.json()
+}
+
 /**
 * Récupère les capacités d'une source
 */
--- a/pmoapp/webapp/vite.config.ts
+++ b/pmoapp/webapp/vite.config.ts
@@ -1,10 +1,67 @@
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
+import { VitePWA } from 'vite-plugin-pwa'
 import { fileURLToPath, URL } from 'node:url'

 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [vue()],
+  plugins: [
+    vue(),
+    VitePWA({
+      registerType: 'autoUpdate',
+      base: '/app/',
+      manifest: {
+        name: 'PMOMusic',
+        short_name: 'PMOMusic',
+        description: 'Contrôleur UPnP/DLNA pour votre musique',
+        start_url: '/app/',
+        display: 'standalone',
+        orientation: 'any',
+        theme_color: '#111827',
+        background_color: '#111827',
+        icons: [
+          {
+            src: '/app/icons/icon-192.png',
+            sizes: '192x192',
+            type: 'image/png',
+          },
+          {
+            src: '/app/icons/icon-512.png',
+            sizes: '512x512',
+            type: 'image/png',
+            purpose: 'any maskable',
+          },
+        ],
+        share_target: {
+          action: '/app/',
+          method: 'GET',
+          params: {
+            url: 'share_url',
+            title: 'share_title',
+            text: 'share_text',
+          },
+        },
+      },
+      workbox: {
+        navigateFallback: '/app/index.html',
+        globPatterns: ['**/*.{js,css,html,ico,png,svg,woff2}'],
+        runtimeCaching: [
+          {
+            urlPattern: /^\/api\//,
+            handler: 'NetworkFirst',
+            options: {
+              cacheName: 'api-cache',
+              networkTimeoutSeconds: 5,
+            },
+          },
+          {
+            urlPattern: /^\/audio\//,
+            handler: 'NetworkOnly',
+          },
+        ],
+      },
+    }),
+  ],
  base: '/app/',  // Base path pour le déploiement
  resolve: {
    alias: {
--- a/pmoserver/src/serve_embed.rs
+++ b/pmoserver/src/serve_embed.rs
@@ -50,10 +50,17 @@ impl<E: RustEmbed> ServeEmbed<E> {

        for candidate in candidates {
            if let Some(content) = E::get(candidate) {
-                let mime = mime_guess::from_path(candidate).first_or_octet_stream();
+                // mime_guess ne connaît pas .webmanifest (trop récent)
+                let mime = if candidate.ends_with(".webmanifest") {
+                    "application/manifest+json".to_string()
+                } else {
+                    mime_guess::from_path(candidate)
+                        .first_or_octet_stream()
+                        .to_string()
+                };
                return Some(
                    (
-                        [(header::CONTENT_TYPE, mime.as_ref())],
+                        [(header::CONTENT_TYPE, mime.as_str())],
                        content.data.into_owned(),
                    )
                        .into_response(),
--- a/pmosource/src/api.rs
+++ b/pmosource/src/api.rs
@@ -1179,6 +1179,88 @@ async fn unregister_source_handler(Path(id): Path<String>) -> impl IntoResponse
    }
 }

+/// Paramètres pour la recherche dans une source
+#[cfg(feature = "server")]
+#[derive(Debug, serde::Deserialize, utoipa::IntoParams)]
+struct SearchParams {
+    /// Texte de recherche (URL ou termes)
+    q: String,
+}
+
+/// Recherche dans une source musicale
+#[cfg(feature = "server")]
+#[utoipa::path(
+    get,
+    path = "/{id}/search",
+    params(
+        ("id" = String, Path, description = "ID de la source"),
+        SearchParams
+    ),
+    responses(
+        (status = 200, description = "Résultats de la recherche", body = SourceBrowseResponse),
+        (status = 404, description = "Source introuvable", body = ErrorResponse),
+        (status = 500, description = "Erreur lors de la recherche", body = ErrorResponse),
+    ),
+    tag = "sources"
+)]
+async fn search_source(
+    Path(id): Path<String>,
+    Query(params): Query<SearchParams>,
+) -> impl IntoResponse {
+    match get_source(&id).await {
+        Some(source) => {
+            let query = crate::SearchQuery {
+                text: params.q,
+                media_type: crate::MediaSearchType::All,
+                scope: crate::SearchScope::Catalog,
+                limit: 50,
+                offset: 0,
+            };
+            match source.search(&query).await {
+                Ok(result) => {
+                    let (containers_raw, items_raw) = match result {
+                        crate::BrowseResult::Containers(c) => (c, Vec::new()),
+                        crate::BrowseResult::Items(i) => (Vec::new(), i),
+                        crate::BrowseResult::Mixed { containers, items } => (containers, items),
+                    };
+                    let containers: Vec<BrowseContainerInfo> =
+                        containers_raw.iter().map(BrowseContainerInfo::from).collect();
+                    let items: Vec<BrowseItemInfo> =
+                        items_raw.iter().map(BrowseItemInfo::from).collect();
+                    let returned_containers = containers.len();
+                    let returned_items = items.len();
+                    let total = returned_containers + returned_items;
+                    let update_id = source.update_id().await;
+                    let response = SourceBrowseResponse {
+                        object_id: source.id().to_string(),
+                        containers,
+                        items,
+                        returned_containers,
+                        returned_items,
+                        total,
+                        update_id,
+                    };
+                    (StatusCode::OK, Json(response)).into_response()
+                }
+                Err(e) => (
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    Json(ErrorResponse {
+                        error: format!("Search failed: {}", e),
+                    }),
+                )
+                    .into_response(),
+            }
+        }
+        None => (
+            StatusCode::NOT_FOUND,
+            Json(ErrorResponse {
+                error: format!("Source '{}' not found", id),
+            }),
+        )
+            .into_response(),
+    }
+}
+
 /// Crée le router pour l'API des sources (endpoints de lecture uniquement)
 ///
 /// # Returns
@@ -1216,6 +1298,7 @@ pub fn create_sources_router() -> Router {
        .route("/{id}/cache/status", get(get_source_cache_status))
        .route("/{id}/cache", post(request_source_cache))
        .route("/{id}/formats", get(get_source_formats))
+        .route("/{id}/search", get(search_source))
 }

 /// Structure pour la documentation OpenAPI de base
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.3.55
+0.3.61
Author	SHA1	Message	Date
Eric Coissac	884b092af8	Merge pull request 'feat: add web share target support and implement catalog search API' (#109 ) from push-vsvqwqmmouro into main All checks were successful Build and Push Docker Image / build (push) Successful in 8m58s Details Reviewed-on: #109	2026-06-28 23:50:33 +02:00
Eric Coissac	472211012b	feat: add web share target support and implement catalog search API This patch release bumps the version to 0.3.61 and introduces several key improvements across the stack. The backend `/info` route registration is deferred until after UPnP initialization to ensure the local server ID is correctly exposed. A new `GET /{id}/search` endpoint has been added to the pmosource API for querying music catalogs. On the frontend, Web Share Target support is enabled via Vite configuration and a dedicated composable that handles incoming URL parameters, playback state, and error notifications. Renderer selection state is also now exposed for UI synchronization.	2026-06-28 23:40:35 +02:00
Eric Coissac	ce9c779bb2	Merge pull request 'chore: bump version to 0.3.60 and handle webmanifest MIME types' (#108 ) from push-oywlvnwootxq into main All checks were successful Build and Push Docker Image / build (push) Successful in 9m57s Details Reviewed-on: #108	2026-06-28 12:37:33 +02:00
Eric Coissac	070ca8f3e0	chore: bump version to 0.3.60 and handle webmanifest MIME types Update PMOMusic/Cargo.toml and version.txt from 0.3.59 to 0.3.60. Add explicit application/manifest+json detection for .webmanifest files in serve_embed.rs to compensate for mime_guess limitations, converting the MIME value to an owned String and updating the CONTENT_TYPE header reference accordingly.	2026-06-28 12:37:09 +02:00
Eric Coissac	01f49670e9	Merge pull request 'feat: add PWA support and bump project version to 0.3.59' (#107 ) from push-qmqrwyqslsxn into main All checks were successful Build and Push Docker Image / build (push) Successful in 10m33s Details Reviewed-on: #107	2026-06-28 12:14:43 +02:00
Eric Coissac	ed9b8046e4	feat: add PWA support and bump project version to 0.3.59 Integrate vite-plugin-pwa to enable service worker generation, offline caching, and standalone display mode. Configure manifest metadata, 192px/512px icons, theme color, and iOS status bar styling. Bump project version to 0.3.59 across Cargo.toml, Cargo.lock, and version.txt, and regenerate package-lock.json.	2026-06-28 12:04:32 +02:00
Eric Coissac	f5d9e2590e	Merge pull request 'push-nlvvpvkumokx' (#105 ) from push-nlvvpvkumokx into main All checks were successful Build and Push Docker Image / build (push) Successful in 9m50s Details Reviewed-on: #105	2026-06-21 19:22:52 +02:00
Eric Coissac	ad45e40900	chore: resolve merge conflicts and update version to 0.3.56 Updates Cargo.toml, Cargo.lock, and version.txt from 0.3.53 to 0.3.56. Resolves divergent branch changes across configuration files and preserves the macOS .DS_Store binary structure during integration.	2026-06-21 19:22:32 +02:00
Eric Coissac	da4d9008ad	Merge pull request 'push-zwznsplyvnyp' (#103 ) from push-zwznsplyvnyp into main Some checks failed Build and Push Docker Image / build (push) Failing after 3m27s Details Reviewed-on: #103	2026-06-21 18:41:46 +02:00
Eric Coissac	f757e10734	chore: bump version to 0.3.54 and configure Serena project Update PMOMusic crate version in Cargo.toml and the project version.txt from 0.3.53 to 0.3.54. Add Serena project configuration by introducing .serena/.gitignore to exclude local cache files, and create .serena/project.yml to set Rust as the language server target with UTF-8 encoding.	2026-06-21 18:05:13 +02:00
@@ -1 +1 @@
 .3.55
 .3.61