From 9c10347d38b33e119234164012ba8f74e69b28ce Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Thu, 7 Sep 2023 10:04:29 -0400 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=AF=20Added=20a=20prowlarr=20api?= =?UTF-8?q?=20test=20endpoint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 72 +++++++++++++++++++++++++++++++++ package.json | 1 + services/prowlarr.service.ts | 39 ++++++++++++++++++ services/qbittorrent.service.ts | 38 +++++++++-------- 4 files changed, 134 insertions(+), 16 deletions(-) create mode 100644 services/prowlarr.service.ts diff --git a/package-lock.json b/package-lock.json index e4db549..a78b85e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "dependencies": { "@robertklep/qbittorrent": "^1.0.1", + "axios": "^1.5.0", "ioredis": "^5.0.0", "moleculer": "^0.14.27", "moleculer-web": "^0.10.5" @@ -2037,6 +2038,11 @@ "node": ">=8" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -2049,6 +2055,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/axios": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz", + "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/babel-jest": { "version": "29.6.4", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.4.tgz", @@ -2569,6 +2585,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "9.5.0", "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", @@ -2781,6 +2808,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/denque": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", @@ -3734,6 +3769,25 @@ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -3743,6 +3797,19 @@ "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -6260,6 +6327,11 @@ "node": ">=6" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", diff --git a/package.json b/package.json index b95c72b..686c071 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ }, "dependencies": { "@robertklep/qbittorrent": "^1.0.1", + "axios": "^1.5.0", "ioredis": "^5.0.0", "moleculer": "^0.14.27", "moleculer-web": "^0.10.5" diff --git a/services/prowlarr.service.ts b/services/prowlarr.service.ts new file mode 100644 index 0000000..137e6fb --- /dev/null +++ b/services/prowlarr.service.ts @@ -0,0 +1,39 @@ +"use strict"; +import { Context, Service, ServiceBroker, ServiceSchema, Errors } from "moleculer"; +import { qBittorrentClient } from "@robertklep/qbittorrent"; +const { MoleculerError } = require("moleculer").Errors; + +export default class QBittorrentService extends Service { + // @ts-ignore + public constructor( + public broker: ServiceBroker, + schema: ServiceSchema<{}> = { name: "qbittorrent" }, + ) { + super(broker); + this.parseServiceSchema({ + name: "qbittorrent", + mixins: [], + hooks: {}, + actions: { + + getList: { + rest: "GET /getTorrents", + handler: async (ctx: Context<{}>) => { + return await this.torrentClient.torrents.info() + } + } + }, methods: {}, + async started(): Promise { + try { + this.torrentClient = new qBittorrentClient("http://192.168.1.183:8089", "admin", "adminadmin"); + + } catch (err) { + throw new MoleculerError(err, 500, "QBITTORRENT_CONNECTION_ERROR", { + data: err, + }); + } + + } + }); + } +} diff --git a/services/qbittorrent.service.ts b/services/qbittorrent.service.ts index 137e6fb..3ac771f 100644 --- a/services/qbittorrent.service.ts +++ b/services/qbittorrent.service.ts @@ -1,37 +1,43 @@ "use strict"; import { Context, Service, ServiceBroker, ServiceSchema, Errors } from "moleculer"; -import { qBittorrentClient } from "@robertklep/qbittorrent"; const { MoleculerError } = require("moleculer").Errors; +import axios from "axios"; -export default class QBittorrentService extends Service { +export default class ProwlarrService extends Service { // @ts-ignore public constructor( public broker: ServiceBroker, - schema: ServiceSchema<{}> = { name: "qbittorrent" }, + schema: ServiceSchema<{}> = { name: "prowlarr" }, ) { super(broker); this.parseServiceSchema({ - name: "qbittorrent", + name: "prowlarr", mixins: [], hooks: {}, actions: { - - getList: { - rest: "GET /getTorrents", + testConnection: { + rest: "GET /testConnection", handler: async (ctx: Context<{}>) => { - return await this.torrentClient.torrents.info() + try { + const result = await axios.request({ + url: `http://192.168.1.183:9696/api/`, + method: `GET`, + headers: { Accept: "application/json" }, + params: { + apiKey: "163ef9a683874f65b53c7be87354b38b", + } + }); + + return result.data; + } catch(err) { + console.log(err); + } } - } + }, + }, methods: {}, async started(): Promise { - try { - this.torrentClient = new qBittorrentClient("http://192.168.1.183:8089", "admin", "adminadmin"); - } catch (err) { - throw new MoleculerError(err, 500, "QBITTORRENT_CONNECTION_ERROR", { - data: err, - }); - } } }); -- 2.49.1 From 011293376c6365a4d6f6570e211b89ac50836fe8 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Mon, 11 Sep 2023 16:04:06 -0400 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9D=20Fixed=20the=20endpoint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/qbittorrent.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/qbittorrent.service.ts b/services/qbittorrent.service.ts index 3ac771f..50270ce 100644 --- a/services/qbittorrent.service.ts +++ b/services/qbittorrent.service.ts @@ -20,14 +20,14 @@ export default class ProwlarrService extends Service { handler: async (ctx: Context<{}>) => { try { const result = await axios.request({ - url: `http://192.168.1.183:9696/api/`, + url: `http://192.168.1.183:9696/api/v1/history`, method: `GET`, headers: { Accept: "application/json" }, params: { - apiKey: "163ef9a683874f65b53c7be87354b38b", + apikey: "163ef9a683874f65b53c7be87354b38b", } }); - + console.log(result); return result.data; } catch(err) { console.log(err); -- 2.49.1