feat(rTorrent): enhance method call handling and improve error reporting (#953)

Author: trim21

README.md

@@ -25,8 +25,6 @@ If you are using rakshasa/rtorrent>0.15.1 (upstream rtorrent with json-rpc suppo
 you will need to add these options to your config:
 
 ```ini
-method.redirect=load.throw,load.normal
-method.redirect=load.start_throw,load.start
 method.insert=d.down.sequential,value|const,0
 method.insert=d.down.sequential.set,value|const,0
 ```

server/services/rTorrent/clientGatewayService.ts

@@ -57,7 +57,19 @@ import {
 
 class RTorrentClientGatewayService extends ClientGatewayService {
   clientRequestManager = new ClientRequestManager(this.user.client as RTorrentConnectionSettings);
-  availableMethodCalls = this.fetchAvailableMethodCalls(true);
+  availableMethodCalls = this.fetchAvailableMethodCalls();
+
+  async getPreferredMethod(methods: string[]): Promise<string> {
+    const {methodList} = await this.availableMethodCalls;
+
+    const matchedMethod = methods.find((method) => methodList.includes(method));
+
+    if (!matchedMethod) {
+      throw new Error(`None of the requested methods are available: ${methods.join(', ')}`);
+    }
+
+    return matchedMethod;
+  }
 
   async appendTorrentCommentCall(file: string, additionalCalls: string[]) {
     const comment = await getComment(Buffer.from(file, 'base64'));
@@ -106,11 +118,15 @@ class RTorrentClientGatewayService extends ClientGatewayService {
     const result: string[] = [];
 
     if (this.clientRequestManager.isJSONCapable) {
+      const methodName = await this.getPreferredMethod(
+        start ? ['load.start_throw', 'load.start'] : ['load.throw', 'load.normal'],
+      );
+
       await this.clientRequestManager
         .methodCall('system.multicall', [
           await Promise.all(
             processedFiles.map(async (file) => ({
-              methodName: start ? 'load.start' : 'load.normal',
+              methodName,
               params: [
                 '',
                 `data:applications/x-bittorrent;base64,${file}`,
@@ -159,13 +175,9 @@ class RTorrentClientGatewayService extends ClientGatewayService {
     const result: string[] = [];
 
     if (urls[0]) {
-      const methodName = start ? 'load.start' : 'load.normal';
-
-      // if (this.clientRequestManager.isJSONCapable) {
-      // methodName = start ? 'load.start_throw' : 'load.throw';
-      // } else {
-      // methodName = start ? 'load.start' : 'load.normal';
-      // }
+      const methodName = await this.getPreferredMethod(
+        start ? ['load.start_throw', 'load.start'] : ['load.throw', 'load.normal'],
+      );
 
       await this.clientRequestManager
         .methodCall('system.multicall', [
@@ -789,6 +801,7 @@ class RTorrentClientGatewayService extends ClientGatewayService {
   }
 
   async fetchAvailableMethodCalls(fallback = false): Promise<{
+    methodList: string[];
     clientSetting: string[];
     torrentContent: string[];
     torrentList: string[];
@@ -828,6 +841,7 @@ class RTorrentClientGatewayService extends ClientGatewayService {
         : (methodCalls: Array<string>) => methodCalls;
 
     return {
+      methodList,
       clientSetting: getAvailableMethodCalls(getMethodCalls(clientSettingMethodCallConfigs)),
       torrentContent: getAvailableMethodCalls(getMethodCalls(torrentContentMethodCallConfigs)),
       torrentList: getAvailableMethodCalls(getMethodCalls(torrentListMethodCallConfigs)),