server: rTorrent: properly handle method call response data types

server/services/rTorrent/clientGatewayService.ts

@@ -301,12 +301,9 @@ class RTorrentClientGatewayService extends ClientGatewayService {
           }),
         ])
         .then(this.processClientRequestSuccess, this.processRTorrentRequestError)
-        .then((responses: string[][]) => {
-          return responses.map((response) => {
-            const [value] = response;
-            return value === '1';
-          });
-        })
+        .then((responses: string[][]) =>
+          responses.map((response) => (typeof response === 'number' ? response : response?.[0])),
+        )
         .catch(() => undefined);
 
       if (isMultiFile == null || isMultiFile.length !== hashes.length) {

server/services/rTorrent/constants/methodCallConfigs/clientSetting.ts

@@ -1,11 +1,15 @@
-import {numberTransformer, stringArrayTransformer} from '../../util/rTorrentMethodCallUtil';
+import {numberTransformer} from '../../util/rTorrentMethodCallUtil';
 
 const clientSettingMethodCallConfigs = {
   dht: {
     methodCall: 'dht.statistics',
     transformValue: (value: unknown): boolean => {
-      const [stats] = value as Array<Record<string, string>>;
-      return stats.dht !== 'disable';
+      if (Array.isArray(value)) {
+        const [stats] = value as Array<Record<string, string>>;
+        return stats.dht !== 'disable';
+      } else {
+        return (value as {dht: string})?.dht !== 'disable';
+      }
     },
   },
   dhtPort: {
@@ -14,9 +18,8 @@ const clientSettingMethodCallConfigs = {
   },
   directoryDefault: {
     methodCall: 'directory.default',
-    transformValue: (value: unknown) => {
-      const [directory] = value as Array<string>;
-      return directory;
+    transformValue: (value: unknown): string => {
+      return typeof value === 'string' ? value : (value as Array<string>)?.[0];
     },
   },
   networkHttpMaxOpen: {
@@ -25,7 +28,9 @@ const clientSettingMethodCallConfigs = {
   },
   networkLocalAddress: {
     methodCall: 'network.local_address',
-    transformValue: stringArrayTransformer,
+    transformValue: (value: unknown): string[] => {
+      return [typeof value === 'string' ? value : (value as Array<string>)?.[0]];
+    },
   },
   networkMaxOpenFiles: {
     methodCall: 'network.max_open_files',
@@ -33,30 +38,26 @@ const clientSettingMethodCallConfigs = {
   },
   networkPortOpen: {
     methodCall: 'network.port_open',
-    transformValue: (value: unknown) => {
-      const [portOpen] = value as Array<string>;
-      return portOpen === '1';
+    transformValue: (value: unknown): boolean => {
+      return value == 1 || (value as Array<string>)?.[0] === '1';
     },
   },
   networkPortRandom: {
     methodCall: 'network.port_random',
-    transformValue: (value: unknown) => {
-      const [portRandom] = value as Array<string>;
-      return portRandom === '1';
+    transformValue: (value: unknown): boolean => {
+      return value == 1 || (value as Array<string>)?.[0] === '1';
     },
   },
   networkPortRange: {
     methodCall: 'network.port_range',
-    transformValue: (value: unknown) => {
-      const [portRange] = value as Array<string>;
-      return portRange;
+    transformValue: (value: unknown): string => {
+      return typeof value === 'string' ? value : (value as Array<string>)?.[0];
     },
   },
   piecesHashOnCompletion: {
     methodCall: 'pieces.hash.on_completion',
-    transformValue: (value: unknown) => {
-      const [hashOnCompletion] = value as Array<string>;
-      return hashOnCompletion === '1';
+    transformValue: (value: unknown): boolean => {
+      return value == 1 || (value as Array<string>)?.[0] === '1';
     },
   },
   piecesMemoryMax: {
@@ -67,9 +68,8 @@ const clientSettingMethodCallConfigs = {
   },
   protocolPex: {
     methodCall: 'protocol.pex',
-    transformValue: (value: unknown) => {
-      const [protocolPex] = value as Array<string>;
-      return protocolPex === '1';
+    transformValue: (value: unknown): boolean => {
+      return value == 1 || (value as Array<string>)?.[0] === '1';
     },
   },
   throttleGlobalDownSpeed: {

server/services/rTorrent/constants/methodCallConfigs/torrentList.ts

@@ -16,7 +16,7 @@ const torrentListMethodCallConfigs = {
   },
   state: {
     methodCall: 'd.state=',
-    transformValue: stringTransformer,
+    transformValue: booleanTransformer,
   },
   isActive: {
     methodCall: 'd.is_active=',
@@ -46,9 +46,7 @@ const torrentListMethodCallConfigs = {
   },
   isHashing: {
     methodCall: 'd.hashing=',
-    transformValue: (value: unknown): boolean => {
-      return value !== '0';
-    },
+    transformValue: booleanTransformer,
   },
   priority: {
     methodCall: 'd.priority=',

server/services/rTorrent/util/rTorrentMethodCallUtil.ts

@@ -21,7 +21,7 @@ export const stringArrayTransformer = (value: unknown): string[] => {
 };
 
 export const booleanTransformer = (value: unknown): boolean => {
-  return value === '1';
+  return value === 1 || value === '1';
 };
 
 export const numberTransformer = (value: unknown): number => {

server/services/rTorrent/util/torrentPropertiesUtil.ts

@@ -49,17 +49,17 @@ export const getTorrentStatusFromProperties = (
 
   if (isHashing) {
     torrentStatus.push('checking');
-  } else if (isComplete && isOpen && state === '1') {
+  } else if (isComplete && isOpen && state) {
     torrentStatus.push('complete');
     torrentStatus.push('seeding');
-  } else if (isComplete && isOpen && state === '0') {
+  } else if (isComplete && isOpen && !state) {
     torrentStatus.push('stopped');
   } else if (isComplete && !isOpen) {
     torrentStatus.push('stopped');
     torrentStatus.push('complete');
-  } else if (!isComplete && isOpen && state === '1') {
+  } else if (!isComplete && isOpen && state) {
     torrentStatus.push('downloading');
-  } else if (!isComplete && isOpen && state === '0') {
+  } else if (!isComplete && isOpen && !state) {
     torrentStatus.push('stopped');
   } else if (!isComplete && !isOpen) {
     torrentStatus.push('stopped');