Merge branch 'master' into 396-link-catching-post-vs-get

Author: bogenpirat

README.md

@@ -17,6 +17,7 @@ It supports the following BitTorrent clients:
 - Transmission
 - Porla (new!)
 - Tixati
+- QNAP DownloadStation
 
 ## How do i get it running?
 

src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.0.1",
+    "version": "2.0.2",
     "name": "Remote Torrent Adder",
     "short_name": "RTA",
     "icons": {

src/util/action.ts

@@ -1,11 +1,12 @@
 import { TorrentWebUI } from "../models/webui";
+import { addTrailingSlash } from "./utils";
 
 
 export function registerClickActionForIcon(webUi: TorrentWebUI | null): (tab: chrome.tabs.Tab) => Promise<void> {
     const clickActionListener = async (tab: chrome.tabs.Tab) => {
         if (webUi) {
             await chrome.tabs.create({
-                url: webUi.createBaseUrl(),
+                url: addTrailingSlash(webUi.createBaseUrl()),
                 active: true,
             });
         }

src/util/download.ts

@@ -23,13 +23,13 @@ export async function downloadTorrent(url: string): Promise<Torrent> {
 
             const torrentBlob: Blob = await response.blob();
             const torrentData: string = await convertBlobToString(torrentBlob);
+            let decodedTorrentData: any;
             try {
-                validateTorrentData(response, torrentData);
+                decodedTorrentData = decodeTorrentDataAndValidate(response, torrentData);
             } catch (error) {
                 reject(error);
                 return;
-            }
-            const decodedTorrentData = bencode.decode(Buffer.from(torrentData, 'ascii'));
+            };
 
             resolve({
                 data: torrentBlob,
@@ -43,15 +43,20 @@ export async function downloadTorrent(url: string): Promise<Torrent> {
     });
 }
 
-function validateTorrentData(response: Response, data: string): void {
-    if (!data || data.length < 10 || !data.startsWith("d8:announce")) {
+function decodeTorrentDataAndValidate(response: Response, torrentData: string): any {
+    try {
+        return bencode.decode(Buffer.from(torrentData, 'ascii'));
+    } catch (error) {
         let contentType = response.headers.get("Content-Type");
         if (contentType) {
             const semicolonPos = contentType.indexOf(";");
             contentType = contentType.slice(0, semicolonPos).trim();
         } else {
             contentType = "unknown"
         }
-        throw new Error("Received " + contentType + " content instead of a .torrent file");
+
+        console.error("Invalid torrent data received", torrentData);
+
+        throw new Error("Received " + contentType + " instead of a torrent file. Please check the devtools view for details.");
     }
 }

src/util/messaging.ts

@@ -13,7 +13,6 @@ import {
     IUpdateActionBadgeTextMessage,
     TestNotificationMessage
 } from "../models/messages";
-import { RTASettings } from "../models/settings";
 import { SerializedTorrent, Torrent, TorrentUploadConfig } from "../models/torrent";
 import { TorrentAddingResult, TorrentWebUI, WebUISettings } from "../models/webui";
 import { updateBadgeText } from "./action";
@@ -22,6 +21,7 @@ import { downloadTorrent } from "./download";
 import { showNotification } from "./notifications";
 import { serializeSettings, convertTorrentToSerialized, convertSerializedToTorrent, deserializeSettings } from "./serializer";
 import { Settings } from "./settings";
+import { addTrailingSlash } from "./utils";
 import { initiateWebUis } from "./webuis";
 
 
@@ -212,7 +212,7 @@ function downloadAndAddTorrentToWebUi(webUi: TorrentWebUI, url: string, config:
                             true,
                             settings.notificationsDurationMs,
                             settings.notificationsSoundEnabled,
-                            webUi.createBaseUrl());
+                            addTrailingSlash(webUi.createBaseUrl()));
             });
         } else {
             console.error("No WebUI found for addTorrentMessage:", message);
@@ -221,7 +221,7 @@ function downloadAndAddTorrentToWebUi(webUi: TorrentWebUI, url: string, config:
                         true,
                         settings.notificationsDurationMs,
                         settings.notificationsSoundEnabled,
-                        webUi.createBaseUrl());
+                        addTrailingSlash(webUi.createBaseUrl()));
         }
     });
 }
@@ -259,7 +259,7 @@ function getAutoLabelDirResultForConfig(torrent: Torrent, webUiSettings: WebUISe
 
 function sendTorrentToWebUi(webUi: TorrentWebUI, torrent: Torrent, config: TorrentUploadConfig | null) {
     new Settings().loadSettings().then(settings => {
-        const webUiUrl = webUi.createBaseUrl();
+        const webUiUrl = addTrailingSlash(webUi.createBaseUrl());
         webUi.sendTorrent(torrent, config).then((torrentAddingResult: TorrentAddingResult) => {
             console.log(`Torrent sent successfully: ${torrent.name} to -> ${webUi.name}`);
             if (settings.notificationsEnabled) {

src/util/utils.ts

@@ -23,3 +23,10 @@ export function getBaseUrl(url: string): string {
         return '';
     }
 }
+
+export function addTrailingSlash(url: string): string {
+    if (!url.endsWith("/")) {
+        return url + "/";
+    }
+    return url;
+}