Fixed eslint errors

Update docker-image.yml

.github/workflows/docker-image.yml

@@ -0,0 +1,19 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: frishi/threetwo-acquisition-service
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}

Dockerfile

@@ -0,0 +1,29 @@
+FROM node:22.1.0
+LABEL maintainer="Rishi Ghan <rishi.ghan@gmail.com>"
+
+# Set working directory
+WORKDIR /acquisition-service
+
+# Copy package files first for efficient caching
+COPY package.json package-lock.json ./
+
+# Install all dependencies (including devDependencies)
+RUN npm install 
+
+# Copy necessary config files
+COPY moleculer.config.ts tsconfig.json tsconfig.build.json ./
+
+# Copy the rest of the source code
+COPY . .
+
+# Build the application
+RUN npm run build 
+
+# Now remove devDependencies to keep the final image small
+RUN npm prune --omit=dev
+
+# Expose the port
+EXPOSE 3080
+
+# Start the application
+CMD ["npm", "start"]

models/graphql/resolvers.ts

@@ -0,0 +1,23 @@
+export const resolvers = {
+	Query: {
+		_empty: (): null => null,
+	},
+
+	Mutation: {
+		addTorrent: async (_: any, { input }: any, context: any) => {
+			const { broker } = context;
+			if (!broker) throw new Error("Broker not available in context");
+
+			return broker.call("qbittorrent.addTorrent", {
+				torrentToDownload: input.torrentToDownload,
+				comicObjectId: input.comicObjectId,
+			});
+		},
+	},
+
+	JSON: {
+		__parseValue: (value: any) => value,
+		__serialize: (value: any) => value,
+		__parseLiteral: (ast: any) => ast.value,
+	},
+};

models/graphql/typedef.ts

@@ -0,0 +1,25 @@
+import { gql } from "graphql-tag";
+
+export const typeDefs = gql`
+	scalar JSON
+
+	input AddTorrentInput {
+		torrentToDownload: String!
+		comicObjectId: ID!
+	}
+
+	type AddTorrentResult {
+		result: JSON
+	}
+
+	type Query {
+		_empty: String
+	}
+
+	type Mutation {
+		"""
+		Add a torrent to qBittorrent
+		"""
+		addTorrent(input: AddTorrentInput!): AddTorrentResult
+	}
+`;

moleculer.config.ts

@@ -1,5 +1,10 @@
-import type { BrokerOptions, MetricRegistry, ServiceBroker } from "moleculer";
-import { Errors } from "moleculer";
+"use strict";
+import {
+	BrokerOptions,
+	Errors,
+	MetricRegistry,
+	ServiceBroker,
+} from "moleculer";
 
 /**
  * Moleculer ServiceBroker configuration file
@@ -30,7 +35,7 @@ const brokerConfig: BrokerOptions = {
 	// Namespace of nodes to segment your nodes on the same network.
 	namespace: "",
 	// Unique node identifier. Must be unique in a namespace.
-	nodeID: "threetwo-acquistion-service",
+	nodeID: "threetwo-acquisition-service",
 	// Custom metadata store. Store here what you want. Accessing: `this.broker.metadata`
 	metadata: {},
 
@@ -42,7 +47,7 @@ const brokerConfig: BrokerOptions = {
 			// Using colors on the output
 			colors: true,
 			// Print module names with different colors (like docker-compose for containers)
-			moduleColors: false,
+			moduleColors: true,
 			// Line formatter. It can be "json", "short", "simple", "full", a `Function` or a template string like "{timestamp} {level} {nodeID}/{mod}: {msg}"
 			formatter: "full",
 			// Custom object printer. If not defined, it uses the `util.inspect` method.
@@ -59,11 +64,11 @@ const brokerConfig: BrokerOptions = {
 	// More info: https://moleculer.services/docs/0.14/networking.html
 	// Note: During the development, you don't need to define it because all services will be loaded locally.
 	// In production you can set it via `TRANSPORTER=nats://localhost:4222` environment variable.
-	transporter: process.env.REDIS_URI || "redis://localhost:6379",
+	transporter: process.env.REDIS_URI || "redis://localhost:6379", // "NATS"
 
 	// Define a cacher.
 	// More info: https://moleculer.services/docs/0.14/caching.html
-	cacher: "Redis",
+	cacher: "Memory",
 
 	// Define a serializer.
 	// Available values: "JSON", "Avro", "ProtoBuf", "MsgPack", "Notepack", "Thrift".
@@ -86,8 +91,7 @@ const brokerConfig: BrokerOptions = {
 		// Backoff factor for delay. 2 means exponential backoff.
 		factor: 2,
 		// A function to check failed requests.
-		check: (err: Error) =>
-			err && err instanceof Errors.MoleculerRetryableError && !!err.retryable,
+		check: (err: Errors.MoleculerError) => err && !!err.retryable,
 	},
 
 	// Limit of calling level. If it reaches the limit, broker will throw an MaxCallLevelError error. (Infinite loop protection)
@@ -134,7 +138,7 @@ const brokerConfig: BrokerOptions = {
 		// Number of milliseconds to switch from open to half-open state
 		halfOpenTime: 10 * 1000,
 		// A function to check failed requests.
-		check: (err: Error) => err && err instanceof Errors.MoleculerError && err.code >= 500,
+		check: (err: Errors.MoleculerError) => err && err.code >= 500,
 	},
 
 	// Settings of bulkhead feature. More info: https://moleculer.services/docs/0.14/fault-tolerance.html#Bulkhead
@@ -195,16 +199,13 @@ const brokerConfig: BrokerOptions = {
 	middlewares: [],
 
 	// Register custom REPL commands.
-	replCommands: null,
-
+	/*
 	// Called after broker created.
-	// created(broker: ServiceBroker): void {},
-
+	created : (broker: ServiceBroker): void => {},
 	// Called after broker started.
-	// async started(broker: ServiceBroker): Promise<void> {},
-
-	// Called after broker stopped.
-	// async stopped(broker: ServiceBroker): Promise<void> {},
+	started: async (broker: ServiceBroker): Promise<void> => {},
+	stopped: async (broker: ServiceBroker): Promise<void> => {},
+	 */
 };
 
 export = brokerConfig;

package.json

@@ -26,9 +26,9 @@
     "@types/lodash": "^4.17.4",
     "@types/node": "^18.11.9",
     "@types/parse-torrent": "^5.8.7",
+    "@types/qs": "^6.9.18",
     "@typescript-eslint/eslint-plugin": "^5.44.0",
     "@typescript-eslint/parser": "^5.44.0",
-    "axios": "^1.5.0",
     "concurrently": "^7.6.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.28.0",
@@ -46,14 +46,18 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "lodash": "^4.17.21",
+    "@graphql-tools/schema": "^10.0.31",
     "@robertklep/qbittorrent": "^1.0.1",
+    "axios": "^1.7.9",
+    "graphql": "^16.13.1",
+    "graphql-tag": "^2.12.6",
     "ioredis": "^5.0.0",
     "kafkajs": "^2.2.4",
-    "socket.io-client": "^4.7.5",
+    "lodash": "^4.17.21",
     "moleculer": "^0.14.34",
     "moleculer-web": "^0.10.7",
     "parse-torrent": "^9.1.5",
+    "socket.io-client": "^4.7.5",
     "string-similarity-alg": "^1.3.2"
   },
   "engines": {

services/api.service.ts

@@ -1,9 +1,30 @@
-import fs from "fs";
-import { Service, ServiceBroker } from "moleculer";
+import type { IncomingMessage, ServerResponse } from "http";
+import type { ServiceBroker } from "moleculer";
+import { Service } from "moleculer";
 import ApiGateway from "moleculer-web";
 
+interface GraphQLRequest extends IncomingMessage {
+	body: {
+		query: string;
+		variables?: Record<string, unknown>;
+		operationName?: string;
+	};
+	$params: {
+		query?: string;
+		variables?: string;
+		operationName?: string;
+	};
+	$ctx: {
+		broker: ServiceBroker;
+	};
+}
+
+interface GraphQLError {
+	message: string;
+}
+
 export default class ApiService extends Service {
-	public constructor(broker: ServiceBroker) {
+	constructor(broker: ServiceBroker) {
 		super(broker);
 		this.parseServiceSchema({
 			name: "api",
@@ -46,9 +67,61 @@ export default class ApiService extends Service {
 					},
 
 					{
-						path: "/logs",
-						use: [ApiGateway.serveStatic("logs")],
+					path: "/acquisition-graphql",
+					whitelist: ["acquisition-graphql.query"],
+					cors: {
+						origin: "*",
+						methods: ["GET", "POST", "OPTIONS"],
+						allowedHeaders: ["*"],
+						credentials: false,
+						maxAge: 3600,
 					},
+					aliases: {
+						// eslint-disable-next-line @typescript-eslint/naming-convention
+						"POST /": async (req: GraphQLRequest, res: ServerResponse) => {
+							try {
+								const { query, variables, operationName } = req.body;
+								const result = await req.$ctx.broker.call("acquisition-graphql.query", {
+									query,
+									variables,
+									operationName,
+								});
+								res.setHeader("Content-Type", "application/json");
+								res.end(JSON.stringify(result));
+							} catch (error: unknown) {
+								res.statusCode = 500;
+								res.setHeader("Content-Type", "application/json");
+								res.end(JSON.stringify({ errors: [{ message: (error as GraphQLError).message }] }));
+							}
+						},
+						// eslint-disable-next-line @typescript-eslint/naming-convention
+						"GET /": async (req: GraphQLRequest, res: ServerResponse) => {
+							try {
+								const { query, variables: variablesStr, operationName } = req.$params;
+								const variables = variablesStr ? JSON.parse(variablesStr) : undefined;
+								const result = await req.$ctx.broker.call("acquisition-graphql.query", {
+									query,
+									variables,
+									operationName,
+								});
+								res.setHeader("Content-Type", "application/json");
+								res.end(JSON.stringify(result));
+							} catch (error: unknown) {
+								res.statusCode = 500;
+								res.setHeader("Content-Type", "application/json");
+								res.end(JSON.stringify({ errors: [{ message: (error as GraphQLError).message }] }));
+							}
+						},
+					},
+					bodyParsers: { json: { strict: false, limit: "1MB" } },
+					mappingPolicy: "restrict",
+					logging: true,
+				},
+
+				{
+					path: "/logs",
+					use: [ApiGateway.serveStatic("logs")],
+				},
 				],
 				log4XXResponses: false,
 				logRequestParams: true,
@@ -62,7 +135,7 @@ export default class ApiService extends Service {
 			events: {},
 
 			methods: {},
-			started(): any {},
+			started(): void {},
 		});
 	}
 }

services/autodownload.service.ts

@@ -1,12 +1,17 @@
-"use strict";
+import type { Producer } from "kafkajs";
 import { Kafka } from "kafkajs";
-import type { Context, ServiceBroker, ServiceSchema } from "moleculer";
+import type { Context, ServiceBroker } from "moleculer";
 import { Errors, Service } from "moleculer";
 
+interface Issue {
+	id: string;
+	number: number;
+}
+
 interface Comic {
 	wanted: {
 		markEntireVolumeWanted?: boolean;
-		issues?: any[];
+		issues?: Issue[];
 		volume: {
 			id: string;
 			name: string;
@@ -15,22 +20,20 @@ interface Comic {
 }
 
 export default class AutoDownloadService extends Service {
-	private kafkaProducer: any;
+	private kafkaProducer!: Producer;
 
-	private readonly BATCH_SIZE = 100; // Adjust based on your system capacity
+	private readonly BATCH_SIZE = 100;
 
-	// @ts-ignore
-	constructor(
-		public broker: ServiceBroker,
-		schema: ServiceSchema<{}> = { name: "autodownload" },
-	) {
+	// @ts-ignore -- Moleculer requires this constructor signature for service instantiation
+	constructor(broker: ServiceBroker) {
 		super(broker);
 		this.parseServiceSchema({
 			name: "autodownload",
 			actions: {
 				searchWantedComics: {
 					rest: "POST /searchWantedComics",
-					handler: async (ctx: Context<{}>) => {
+					// eslint-disable-next-line @typescript-eslint/no-unused-vars
+					handler: async (ctx: Context<Record<string, never>>) => {
 						try {
 							/* eslint-disable no-await-in-loop */
 							let page = 1;
@@ -99,7 +102,7 @@ export default class AutoDownloadService extends Service {
 			async started() {
 				const kafka = new Kafka({
 					clientId: "comic-search-service",
-					brokers: ["localhost:9092"],
+					brokers: [process.env.KAFKA_BROKER_URI || "localhost:9092"],
 				});
 				this.kafkaProducer = kafka.producer();
 				await this.kafkaProducer.connect();

services/comicprocessor.service.ts

@@ -1,35 +1,90 @@
-import type { EachMessagePayload } from "kafkajs";
+import type { Consumer, EachMessagePayload, Producer } from "kafkajs";
 import { Kafka, logLevel } from "kafkajs";
-import { isNil, isUndefined } from "lodash";
+import { isNil } from "lodash";
 import type { ServiceBroker, ServiceSchema } from "moleculer";
 import { Service } from "moleculer";
+import type { Socket } from "socket.io-client";
 import io from "socket.io-client";
 import stringSimilarity from "string-similarity-alg";
 
+interface SearchPayload {
+	id: string;
+	name: string;
+}
+
 interface SearchResult {
-	groupedResult: { entityId: number; payload: any };
-	updatedResult: { entityId: number; payload: any };
+	groupedResult: { entityId: number; payload: SearchPayload };
+	updatedResult: { entityId: number; payload: SearchPayload };
+}
+
+interface Issue {
+	issueNumber?: string;
+	issue_number?: string;
+	coverDate?: string;
+	year?: number;
+}
+
+interface Volume {
+	id: string;
+	name: string;
+}
+
+interface Comic {
+	wanted: {
+		volume: Volume;
+		issues?: Issue[];
+		markEntireVolumeWanted?: boolean;
+	};
+}
+
+interface Job {
+	comic: Comic;
+}
+
+interface Hub {
+	value: string;
+}
+
+interface DirectConnectSettings {
+	client: {
+		hubs: Hub[];
+	};
+}
+
+interface SearchInfo {
+	query: {
+		pattern: string;
+	};
+}
+
+interface SearchesSentData {
+	searchInfo: SearchInfo;
+}
+
+interface RankedResult extends SearchPayload {
+	similarity: number;
 }
 
 export default class ComicProcessorService extends Service {
-	private kafkaConsumer: any;
+	private kafkaConsumer!: Consumer;
 
-	private socketIOInstance: any;
+	private socketIOInstance!: Socket;
 
-	private kafkaProducer: any;
+	private kafkaProducer!: Producer;
 
-	private prowlarrResultsMap: Map<string, any> = new Map();
+	private prowlarrResultsMap: Map<string, unknown> = new Map();
 
-	private airDCPPSearchResults: Map<number, any[]> = new Map();
+	private airDCPPSearchResults: Map<number, SearchPayload[]> = new Map();
 
-	private issuesToSearch: any = [];
+	private issuesToSearch: Issue[] = [];
 
-	// @ts-ignore: schema parameter is required by Service constructor
+	// @ts-ignore -- Moleculer requires this constructor signature for service instantiation
 	constructor(
-		public broker: ServiceBroker,
+		broker: ServiceBroker,
+		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		schema: ServiceSchema<object> = { name: "comicProcessor" },
 	) {
-		super(broker, schema);
+		super(broker);
 		this.parseServiceSchema({
 			name: "comicProcessor",
 			methods: {
@@ -41,9 +96,9 @@ export default class ComicProcessorService extends Service {
 						day: date.getDate(),
 					};
 				},
-				rankSearchResults: async (results: Map<number, any[]>, query: string) => {
+				rankSearchResults: (results: Map<number, SearchPayload[]>, query: string): RankedResult | null => {
 					// Find the highest-ranked response based on similarity to the search string
-					let highestRankedResult = null;
+					let highestRankedResult: RankedResult | null = null;
 					let highestSimilarity = -1;
 
 					results.forEach((resultArray) => {
@@ -61,24 +116,25 @@ export default class ComicProcessorService extends Service {
 
 					return highestRankedResult;
 				},
-				processJob: async (job: any) => {
+				processJob: async (job: Job) => {
 					try {
 						this.logger.info("Processing job:", JSON.stringify(job, null, 2));
 						// Get the hub to search on
-						const settings: any = await this.broker.call("settings.getSettings", {
+						const settings: DirectConnectSettings = await this.broker.call("settings.getSettings", {
 							settingsKey: "directConnect",
 						});
-						const hubs = settings.client.hubs.map((hub: any) => hub.value);
+						const hubs = settings.client.hubs.map((hub: Hub) => hub.value);
 
 						const { comic } = job;
 						const { volume, issues, markEntireVolumeWanted } = comic.wanted;
 
 						// If entire volume is marked as wanted, get their details from CV
 						if (markEntireVolumeWanted) {
-							this.issuesToSearch = await this.broker.call(
+							const fetchedIssues: Issue[] = await this.broker.call(
 								"comicvine.getIssuesForVolume",
 								{ volumeId: volume.id },
 							);
+							this.issuesToSearch = fetchedIssues;
 							this.logger.info(
 								`The entire volume with id: ${volume.id} was marked as wanted.`,
 							);
@@ -86,17 +142,18 @@ export default class ComicProcessorService extends Service {
 							this.logger.info(`${this.issuesToSearch.length} issues to search`);
 						} else {
 							// Or proceed with `issues` from the wanted object.
-							this.issuesToSearch = issues;
+							this.issuesToSearch = issues || [];
 						}
 
+						/* eslint-disable no-await-in-loop */
 						for (const issue of this.issuesToSearch) {
 							// Query builder for DC++
 							// 1. issue number
-							const inferredIssueNumber =
+							const issueNumber =
 								issue.issueNumber || issue.issue_number || "";
 							// 2. year
-							const { year } = this.parseStringDate(issue.coverDate);
-							const inferredYear = year || issue.year || "";
+							const { year } = this.parseStringDate(issue.coverDate || "");
+							const issueYear = year || issue.year || "";
 
 							// 3. Orchestrate the query
 							const dcppSearchQuery = {
@@ -114,6 +171,7 @@ export default class ComicProcessorService extends Service {
 								"DC++ search query:",
 								JSON.stringify(dcppSearchQuery, null, 4),
 							);
+							this.logger.debug(`Issue number: ${issueNumber}, Year: ${issueYear}`);
 
 							await this.broker.call("socket.search", {
 								query: dcppSearchQuery,
@@ -125,40 +183,18 @@ export default class ComicProcessorService extends Service {
 								},
 								namespace: "/automated",
 							});
-
-							// 							const prowlarrResults = await this.broker.call("prowlarr.search", {
-							// 								prowlarrQuery: {
-							// 									port: "9696",
-							// 									apiKey: "c4f42e265fb044dc81f7e88bd41c3367",
-							// 									offset: 0,
-							// 									categories: [7030],
-							// 									query: `${volume.name} ${issue.issueNumber} ${year}`,
-							// 									host: "localhost",
-							// 									limit: 100,
-							// 									type: "search",
-							// 									indexerIds: [2],
-							// 								},
-							// 							});
-							//
-							// 							this.logger.info(
-							// 								"Prowlarr search results:",
-							// 								JSON.stringify(prowlarrResults, null, 4),
-							// 							);
-
-							// Store prowlarr results in map using unique key
-							// const key = `${volume.name}-${issue.issueNumber}-${year}`;
-							// this.prowlarrResultsMap.set(key, prowlarrResults);
 						}
+						/* eslint-enable no-await-in-loop */
 					} catch (error) {
 						this.logger.error("Error processing job:", error);
 					}
 				},
-				produceResultsToKafka: async (query: string, result: any[]): Promise<void> => {
+				produceResultsToKafka: async (query: string): Promise<void> => {
 					try {
 						/*
 							Match and rank
 						*/
-						const finalResult = await this.rankSearchResults(
+						const finalResult = this.rankSearchResults(
 							this.airDCPPSearchResults,
 							query,
 						);
@@ -196,13 +232,13 @@ export default class ComicProcessorService extends Service {
 			async started() {
 				const kafka = new Kafka({
 					clientId: "comic-processor-service",
-					brokers: ["localhost:9092"],
+					brokers: [process.env.KAFKA_BROKER_URI || "localhost:9092"],
 					logLevel: logLevel.INFO,
 				});
 				this.kafkaConsumer = kafka.consumer({ groupId: "comic-processor-group" });
 				this.kafkaProducer = kafka.producer();
 
-				this.kafkaConsumer.on("consumer.crash", (event: any) => {
+				this.kafkaConsumer.on("consumer.crash", (event: { payload: Error }) => {
 					this.logger.error("Consumer crash:", event);
 				});
 				this.kafkaConsumer.on("consumer.connect", () => {
@@ -224,9 +260,9 @@ export default class ComicProcessorService extends Service {
 				});
 
 				await this.kafkaConsumer.run({
-					eachMessage: async ({ topic, partition, message }: EachMessagePayload) => {
+					eachMessage: async ({ message }: EachMessagePayload) => {
 						if (message.value) {
-							const job = JSON.parse(message.value.toString());
+							const job = JSON.parse(message.value.toString()) as Job;
 							await this.processJob(job);
 						} else {
 							this.logger.warn("Received message with null value");
@@ -255,14 +291,17 @@ export default class ComicProcessorService extends Service {
 						this.airDCPPSearchResults.set(entityId, []);
 					}
 					if (!isNil(payload)) {
-						this.airDCPPSearchResults.get(entityId).push(payload);
+						const results = this.airDCPPSearchResults.get(entityId);
+						if (results) {
+							results.push(payload);
+						}
 					}
 
-					console.log(
+					this.logger.info(
 						"Updated airDCPPSearchResults:",
 						JSON.stringify(Array.from(this.airDCPPSearchResults.entries()), null, 4),
 					);
-					console.log(JSON.stringify(payload, null, 4));
+					this.logger.info(JSON.stringify(payload, null, 4));
 				});
 
 				// Handle searchResultUpdated event
@@ -273,7 +312,7 @@ export default class ComicProcessorService extends Service {
 					const resultsForInstance = this.airDCPPSearchResults.get(entityId);
 
 					if (resultsForInstance) {
-						const toReplaceIndex = resultsForInstance.findIndex((element: any) => {
+						const toReplaceIndex = resultsForInstance.findIndex((element: SearchPayload) => {
 							this.logger.info("search result updated!");
 							this.logger.info(JSON.stringify(element, null, 4));
 							return element.id === payload.id;
@@ -282,7 +321,6 @@ export default class ComicProcessorService extends Service {
 						if (toReplaceIndex !== -1) {
 							// Replace the existing result with the updated result
 							resultsForInstance[toReplaceIndex] = payload;
-rty6j
 							// Optionally, update the map with the modified array
 							this.airDCPPSearchResults.set(entityId, resultsForInstance);
 						}
@@ -290,7 +328,7 @@ rty6j
 				});
 
 				// Handle searchComplete event
-				this.socketIOInstance.on("searchesSent", async (data: any) => {
+				this.socketIOInstance.on("searchesSent", async (data: SearchesSentData) => {
 					this.logger.info(
 						`Search complete for query: "${data.searchInfo.query.pattern}"`,
 					);

services/graphql.service.ts

@@ -0,0 +1,49 @@
+import { makeExecutableSchema } from "@graphql-tools/schema";
+import type { GraphQLSchema } from "graphql";
+import { graphql } from "graphql";
+import type { Context, ServiceBroker } from "moleculer";
+import { Service } from "moleculer";
+import { resolvers } from "../models/graphql/resolvers";
+import { typeDefs } from "../models/graphql/typedef";
+
+interface GraphQLParams {
+	query: string;
+	variables?: Record<string, unknown>;
+	operationName?: string;
+}
+
+export default class GraphQLService extends Service {
+	private graphqlSchema!: GraphQLSchema;
+
+	constructor(broker: ServiceBroker) {
+		super(broker);
+		this.parseServiceSchema({
+			name: "acquisition-graphql",
+
+			actions: {
+				query: {
+					params: {
+						query: "string",
+						variables: { type: "object", optional: true },
+						operationName: { type: "string", optional: true },
+					},
+					async handler(ctx: Context<GraphQLParams>) {
+						const { query, variables, operationName } = ctx.params;
+						return graphql({
+							schema: this.graphqlSchema,
+							source: query,
+							variableValues: variables,
+							operationName,
+							contextValue: { broker: this.broker, ctx },
+						});
+					},
+				},
+			},
+
+			started() {
+				this.graphqlSchema = makeExecutableSchema({ typeDefs, resolvers });
+				this.logger.info("Acquisition GraphQL service started");
+			},
+		});
+	}
+}

services/prowlarr.service.ts

@@ -1,13 +1,32 @@
-"use strict";
-import { Context, Service, ServiceBroker, ServiceSchema, Errors } from "moleculer";
 import axios from "axios";
+import type { Context, ServiceBroker } from "moleculer";
+import { Service } from "moleculer";
+
+interface ConnectParams {
+	host: string;
+	port: string;
+	apiKey: string;
+}
+
+interface ProwlarrQuery {
+	host: string;
+	port: string;
+	apiKey: string;
+	query: string;
+	type: string;
+	indexerIds: number[];
+	categories: number[];
+	limit: number;
+	offset: number;
+}
+
+interface SearchParams {
+	prowlarrQuery: ProwlarrQuery;
+}
 
 export default class ProwlarrService extends Service {
-	// @ts-ignore
-	public constructor(
-		public broker: ServiceBroker,
-		schema: ServiceSchema<{}> = { name: "prowlarr" },
-	) {
+	// @ts-ignore -- Moleculer requires this constructor signature for service instantiation
+	constructor(broker: ServiceBroker) {
 		super(broker);
 		this.parseServiceSchema({
 			name: "prowlarr",
@@ -16,13 +35,7 @@ export default class ProwlarrService extends Service {
 			actions: {
 				connect: {
 					rest: "POST /connect",
-					handler: async (
-						ctx: Context<{
-							host: string;
-							port: string;
-							apiKey: string;
-						}>,
-					) => {
+					handler: async (ctx: Context<ConnectParams>) => {
 						const { host, port, apiKey } = ctx.params;
 						const result = await axios.request({
 							url: `http://${host}:${port}/api`,
@@ -31,14 +44,12 @@ export default class ProwlarrService extends Service {
 								"X-Api-Key": apiKey,
 							},
 						});
-						console.log(result.data);
+						this.logger.info(result.data);
 					},
 				},
 				getIndexers: {
 					rest: "GET /indexers",
-					handler: async (
-						ctx: Context<{ host: string; port: string; apiKey: string }>,
-					) => {
+					handler: async (ctx: Context<ConnectParams>) => {
 						const { host, port, apiKey } = ctx.params;
 						const result = await axios.request({
 							url: `http://${host}:${port}/api/v1/indexer`,
@@ -52,21 +63,7 @@ export default class ProwlarrService extends Service {
 				},
 				search: {
 					rest: "GET /search",
-					handler: async (
-						ctx: Context<{
-							prowlarrQuery: {
-								host: string;
-								port: string;
-								apiKey: string;
-								query: string;
-								type: string;
-								indexerIds: [number];
-								categories: [number];
-								limit: number;
-								offset: number;
-							};
-						}>,
-					) => {
+					handler: async (ctx: Context<SearchParams>) => {
 						const {
 							prowlarrQuery: {
 								indexerIds,
@@ -103,7 +100,8 @@ export default class ProwlarrService extends Service {
 				},
 				ping: {
 					rest: "GET /ping",
-					handler: async (ctx: Context<{}>) => {
+					// eslint-disable-next-line @typescript-eslint/no-unused-vars
+					handler: async (ctx: Context<Record<string, never>>) => {
 						const foo = await axios.request({
 							url: "http://192.168.1.183:9696/ping",
 							method: "GET",
@@ -112,7 +110,7 @@ export default class ProwlarrService extends Service {
 								"X-Api-Key": "163ef9a683874f65b53c7be87354b38b",
 							},
 						});
-						console.log(foo.data);
+						this.logger.info(foo.data);
 						return true;
 					},
 				},

services/qbittorrent.service.ts

@@ -1,12 +1,67 @@
 import { readFileSync, writeFileSync } from "fs";
 import { qBittorrentClient } from "@robertklep/qbittorrent";
-import type { Context, ServiceBroker, ServiceSchema } from "moleculer";
-import { Errors, Service } from "moleculer";
+import type { Context, ServiceBroker } from "moleculer";
+import { Service } from "moleculer";
 import parseTorrent from "parse-torrent";
 
+interface QBittorrentCredentials {
+	client: {
+		host: {
+			username: string;
+			password: string;
+			hostname: string;
+			port: string;
+			protocol: string;
+		};
+	};
+}
+
+interface ConnectParams {
+	username: string;
+	password: string;
+	hostname: string;
+	port: string;
+	protocol: string;
+	name?: string;
+}
+
+interface AddTorrentParams {
+	torrentToDownload: string;
+	comicObjectId: string;
+}
+
+interface InfoHashesParams {
+	infoHashes: string[];
+}
+
+interface TorrentRealTimeStatsParams {
+	infoHashes: { _id: string; infoHashes: string[] }[];
+}
+
+interface TorrentDetail {
+	torrent: Record<string, unknown>;
+}
+
+interface TorrentDetailsGroup {
+	_id: string;
+	details: TorrentDetail[];
+}
+
+interface SyncMaindata {
+	torrents: Record<string, Record<string, unknown>>;
+	rid?: number;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type QBittorrentMeta = any;
+
 export default class QBittorrentService extends Service {
-	// @ts-ignore
-	constructor(public broker: ServiceBroker, schema: ServiceSchema<{}> = { name: "qbittorrent" }) {
+	private meta!: QBittorrentMeta;
+
+	private rid = 0;
+
+	// @ts-ignore -- Moleculer requires this constructor signature for service instantiation
+	constructor(broker: ServiceBroker) {
 		super(broker);
 		this.parseServiceSchema({
 			name: "qbittorrent",
@@ -16,42 +71,35 @@ export default class QBittorrentService extends Service {
 			actions: {
 				fetchQbittorrentCredentials: {
 					rest: "GET /fetchQbittorrentCredentials",
-					handler: async (ctx: Context<{}>) => {
-						return await this.broker.call("settings.getSettings", {
+					// eslint-disable-next-line @typescript-eslint/no-unused-vars
+					handler: async (ctx: Context<Record<string, never>>) => this.broker.call("settings.getSettings", {
 							settingsKey: "bittorrent",
-						});
-					},
+						}),
 				},
 				connect: {
 					rest: "POST /connect",
-					handler: async (
-						ctx: Context<{
-							username: string;
-							password: string;
-							hostname: string;
-							port: string;
-							protocol: string;
-							name?: string;
-						}>,
-					) => {
+					handler: (ctx: Context<ConnectParams>) => {
 						const { username, password, hostname, port, protocol } = ctx.params;
 
+						// eslint-disable-next-line new-cap
 						this.meta = new qBittorrentClient(
 							`${protocol}://${hostname}:${port}`,
 							`${username}`,
 							`${password}`,
 						);
-						console.log(this.meta);
+						this.logger.info(this.meta);
 						if (this.meta) {
 							return { success: true, message: "Logged in successfully" };
 						}
+						return { success: false, message: "Failed to connect" };
 					},
 				},
 				loginWithStoredCredentials: {
 					rest: "POST /loginWithStoredCredentials",
-					handler: async (ctx: Context<{}>) => {
+					// eslint-disable-next-line @typescript-eslint/no-unused-vars
+					handler: async (ctx: Context<Record<string, never>>) => {
 						try {
-							const result: any = await this.broker.call(
+							const result: QBittorrentCredentials | undefined = await this.broker.call(
 								"qbittorrent.fetchQbittorrentCredentials",
 								{},
 							);
@@ -69,10 +117,14 @@ export default class QBittorrentService extends Service {
 									port,
 									protocol,
 								});
-								console.log("qbittorrent connection details:");
-								console.log(JSON.stringify(connection, null, 4));
+								this.logger.info("qbittorrent connection details:");
+								this.logger.info(JSON.stringify(connection, null, 4));
 								return connection;
 							}
+							return {
+								error: null,
+								message: "Qbittorrent credentials not found.",
+							};
 						} catch (err) {
 							return {
 								error: err,
@@ -85,7 +137,8 @@ export default class QBittorrentService extends Service {
 
 				getClientInfo: {
 					rest: "GET /getClientInfo",
-					handler: async (ctx: Context<{}>) => {
+					// eslint-disable-next-line @typescript-eslint/no-unused-vars
+					handler: async (ctx: Context<Record<string, never>>) => {
 						await this.broker.call("qbittorrent.loginWithStoredCredentials", {});
 						return {
 							buildInfo: await this.meta.app.buildInfo(),
@@ -96,22 +149,17 @@ export default class QBittorrentService extends Service {
 				},
 				addTorrent: {
 					rest: "POST /addTorrent",
-					handler: async (
-						ctx: Context<{
-							torrentToDownload: any;
-							comicObjectId: string;
-						}>,
-					) => {
+					handler: async (ctx: Context<AddTorrentParams>) => {
 						try {
 							await this.broker.call("qbittorrent.loginWithStoredCredentials", {});
 							const { torrentToDownload, comicObjectId } = ctx.params;
-							console.log(torrentToDownload);
+							this.logger.info(torrentToDownload);
 							const response = await fetch(torrentToDownload, {
 								method: "GET",
 							});
 							// Read the buffer to a file
 							const buffer = await response.arrayBuffer();
-							writeFileSync(`mithrandir.torrent`, Buffer.from(buffer));
+							writeFileSync(`mithrandir.torrent`, new Uint8Array(buffer));
 							// Add the torrent to qbittorrent's queue, paused.
 							const result = await this.meta.torrents.add({
 								torrents: {
@@ -134,28 +182,33 @@ export default class QBittorrentService extends Service {
 								result,
 							};
 						} catch (err) {
-							console.error(err);
+							this.logger.error(err);
+							return {
+								error: err,
+								message: "Failed to add torrent",
+							};
 						}
 					},
 				},
 				getTorrents: {
 					rest: "POST /getTorrents",
-					handler: async (ctx: Context<{}>) => {
+					// eslint-disable-next-line @typescript-eslint/no-unused-vars
+					handler: async (ctx: Context<Record<string, never>>) => {
 						await this.broker.call("qbittorrent.loginWithStoredCredentials", {});
-						return await this.meta.torrents.info();
+						return this.meta.torrents.info();
 					},
 				},
 				getTorrentProperties: {
 					rest: "POST /getTorrentProperties",
-					handler: async (ctx: Context<{ infoHashes: string[] }>) => {
+					handler: async (ctx: Context<InfoHashesParams>) => {
 						try {
 							const { infoHashes } = ctx.params;
 							await this.broker.call("qbittorrent.loginWithStoredCredentials", {});
-							return await this.meta.torrents.info({
+							return this.meta.torrents.info({
 								hashes: infoHashes,
 							});
 						} catch (err) {
-							console.error("An error occurred:", err);
+							this.logger.error("An error occurred:", err);
 							// Consider handling the error more gracefully here, possibly returning an error response
 							throw err; // or return a specific error object/message
 						}
@@ -163,23 +216,21 @@ export default class QBittorrentService extends Service {
 				},
 				getTorrentRealTimeStats: {
 					rest: "POST /getTorrentRealTimeStats",
-					handler: async (
-						ctx: Context<{ infoHashes: { _id: string; infoHashes: string[] }[] }>,
-					) => {
+					handler: async (ctx: Context<TorrentRealTimeStatsParams>) => {
 						const { infoHashes } = ctx.params;
 						await this.broker.call("qbittorrent.loginWithStoredCredentials", {});
 
 						try {
 							// Increment rid for each call
 							this.rid = typeof this.rid === "number" ? this.rid + 1 : 0;
-							const data = await this.meta.sync.maindata(this.rid);
-							const torrentDetails: any = [];
+							const data: SyncMaindata = await this.meta.sync.maindata(this.rid);
+							const torrentDetails: TorrentDetailsGroup[] = [];
 
-							infoHashes.forEach(({ _id, infoHashes }) => {
+							infoHashes.forEach(({ _id, infoHashes: hashes }) => {
 								// Initialize an object to hold details for this _id
-								const details: any = [];
+								const details: TorrentDetail[] = [];
 
-								infoHashes.forEach((hash) => {
+								hashes.forEach((hash) => {
 									// Assuming 'data.torrents[hash]' retrieves the details for the hash
 									const torrent = data.torrents[hash];
 									if (torrent) {
@@ -201,9 +252,9 @@ export default class QBittorrentService extends Service {
 							// Assuming `data.rid` contains the latest rid from the server
 							if (data.rid !== undefined) {
 								this.rid = data.rid;
-								console.log(`rid is ${this.rid}`);
+								this.logger.info(`rid is ${this.rid}`);
 							}
-							console.log(JSON.stringify(torrentDetails, null, 4));
+							this.logger.info(JSON.stringify(torrentDetails, null, 4));
 							return torrentDetails;
 						} catch (err) {
 							this.logger.error(err);
@@ -213,24 +264,23 @@ export default class QBittorrentService extends Service {
 				},
 				determineDownloadApps: {
 					rest: "",
-					handler: async () => {
-						// 1. Parse the incoming search query
-						// to make sure that it is well-formed
-						// At the very least, it should have name, year, number
-						// 2. Choose between download mediums based on user-preference?
-						// possible choices are: DC++, Torrent
-						// 3. Perform the search on those media with the aforementioned search query
-						// 4. Choose a subset of relevant search results,
-						// and score them
-						// 5. Download the highest-scoring, relevant result
-					},
+					// 1. Parse the incoming search query
+					// to make sure that it is well-formed
+					// At the very least, it should have name, year, number
+					// 2. Choose between download mediums based on user-preference?
+					// possible choices are: DC++, Torrent
+					// 3. Perform the search on those media with the aforementioned search query
+					// 4. Choose a subset of relevant search results,
+					// and score them
+					// 5. Download the highest-scoring, relevant result
+					handler: () => undefined,
 				},
 			},
 			methods: {},
-			async started() {
-				console.log(`Initializing rid...`);
+			started() {
+				this.logger.info(`Initializing rid...`);
 				this.rid = 0;
-				console.log(`rid is ${this.rid}`);
+				this.logger.info(`rid is ${this.rid}`);
 			},
 		});
 	}

tsconfig.eslint.json

@@ -1,12 +1,14 @@
 {
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "allowJs": true
-  },
-  "include": [
-    "./.*.cjs", // root commonjs files
-    "./.*.js", // root javascript config files
-    "**/*.js", // javascript files
-    "**/*.ts" // typescript files
-  ]
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"noEmit": true
+	},
+	"include": [
+		"./**/*.ts",
+		"./**/*.js"
+	],
+	"exclude": [
+		"node_modules",
+		"dist"
+	]
 }

tsconfig.json

@@ -1,103 +1,18 @@
 {
-  "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig to read more about this file */
-
-    /* Projects */
-    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
-    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
-    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
-    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
-    /* Language and Environment */
-    "target": "es2021",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
-    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
-    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
-    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
-    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
-    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
-
-    /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
-    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "node",                          /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
-    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
-    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
-    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
-
-    /* JavaScript Support */
-    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
-    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
-    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
-
-    /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
-    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    "outDir": "./dist",                                   /* Specify an output folder for all emitted files. */
-    // "removeComments": true,                           /* Disable emitting comments. */
-    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
-    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
-    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
-    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
-    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
-    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
-    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
-    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
-
-    /* Interop Constraints */
-    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
-    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
-    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
-
-    /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
-    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
-    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
-    "useUnknownInCatchVariables": false,               /* Default catch clause variables as 'unknown' instead of 'any'. */
-    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
-    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
-    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
-    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
-    /* Completeness */
-    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true,                                 /* Skip type checking all .d.ts files. */
-  }
+	"compilerOptions": {
+		"module": "commonjs",
+		"esModuleInterop": true,
+		"noImplicitAny": true,
+		"removeComments": true,
+		"preserveConstEnums": true,
+		"sourceMap": true,
+		"pretty": true,
+		"target": "es6",
+		"outDir": "dist"
+	},
+	"include": ["./**/*"],
+	"exclude": [
+		"node_modules/**/*",
+		"test"
+	]
 }