Merge pull request #126 from Masutayunikon/release-please--branches--main

chore(main): release 3.18.3

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.18.3](https://github.com/Masutayunikon/FanKarr/compare/v3.18.2...v3.18.3) (2026-05-27)
+
+
+### Bug Fixes
+
+* **synology:** double prefix dbid_ et fallback hash ([2587768](https://github.com/Masutayunikon/FanKarr/commit/25877685eaf02b3b1c02ff06db618a37aebf0e6b))
+
+## [3.18.2](https://github.com/Masutayunikon/FanKarr/compare/v3.18.1...v3.18.2) (2026-05-27)
+
+
+### Bug Fixes
+
+* **client:** synology use default savepath when 403 ([63f6c12](https://github.com/Masutayunikon/FanKarr/commit/63f6c1276bd48a14e5806ff997b6be63c458d94c))
+
 ## [3.18.1](https://github.com/Masutayunikon/FanKarr/compare/v3.18.0...v3.18.1) (2026-05-27)
 
 

server/torrent-clients/synology-ds.ts

@@ -116,11 +116,13 @@ const DS: TorrentClientDriver = {
                 const dl       = transfer.size_downloaded ?? 0
 
                 // Synology expose le hash BT dans additional.detail.hash
-                // Fallback sur dbid_ pour les tâches non-BT (DDL, etc.)
-                const rawHash  = detail.hash
-                const hash     = (typeof rawHash === 'string' && rawHash.length > 0)
+                // Fallback sur l'ID Synology natif (déjà au format "dbid_X")
+                const rawHash = String(detail.hash ?? '').trim()
+                const hash    = rawHash.length > 0
                     ? rawHash.toLowerCase()
-                    : `dbid_${t.id}`
+                    : String(t.id ?? '').toLowerCase()
+
+                if (!rawHash) logger.debug('synology-ds', `Hash BT absent pour "${t.title}" — matching par titre (ID: ${t.id})`)
 
                 return {
                     hash,
@@ -144,22 +146,36 @@ const DS: TorrentClientDriver = {
         if (options?.file_index != null) logger.warn('synology-ds', 'Sélection de fichier non supportée — téléchargement complet')
         const sid = await dsLogin(config)
 
-        const body = new URLSearchParams({
-            api    : 'SYNO.DownloadStation.Task',
-            version: '1',
-            method : 'create',
-            _sid   : sid,
-            uri    : url,
-        })
-        if (config.savePath) body.append('destination', String(config.savePath))
+        const makeBody = (withDestination: boolean) => {
+            const body = new URLSearchParams({
+                api    : 'SYNO.DownloadStation.Task',
+                version: '1',
+                method : 'create',
+                _sid   : sid,
+                uri    : url,
+            })
+            if (withDestination && config.savePath) body.append('destination', String(config.savePath))
+            return body
+        }
+
+        const doRequest = async (body: URLSearchParams) => {
+            const res = await fetch(`${config.url}/webapi/DownloadStation/task.cgi`, {
+                method : 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body   : body.toString(),
+            })
+            if (!res.ok) throw new Error(`HTTP ${res.status}`)
+            return res.json()
+        }
+
+        let data = await doRequest(makeBody(true))
+
+        // Code 403 = destination inexistante sur le NAS → réessai sans destination
+        if (!data.success && data.error?.code === 403 && config.savePath) {
+            logger.warn('synology-ds', `Dossier cible "${config.savePath}" introuvable (code 403) — ajout sans destination`)
+            data = await doRequest(makeBody(false))
+        }
 
-        const res = await fetch(`${config.url}/webapi/DownloadStation/task.cgi`, {
-            method : 'POST',
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            body   : body.toString(),
-        })
-        if (!res.ok) throw new Error(`HTTP ${res.status}`)
-        const data = await res.json()
         if (!data.success) throw new Error(`Ajout échoué : ${JSON.stringify(data.error)}`)
 
         logger.info('synology-ds', `Torrent ajouté avec succès${config.savePath ? ` (dossier: ${config.savePath})` : ''}`)

version.txt

@@ -1 +1 @@
-3.18.1
+3.18.3