From 0ef6e6a0cb9a2999e785847302cef698413993af Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Fri, 7 May 2021 17:36:05 +0000 Subject: [PATCH] Use Seeker API in Request service --- services/request/package.json | 1 + .../server/services/Ipc/SeekerIpcClient.ts | 27 ------------------- .../server/services/WebServer/routes/api.ts | 10 +++---- services/request/src/server/services/index.ts | 3 +-- 4 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 services/request/src/server/services/Ipc/SeekerIpcClient.ts diff --git a/services/request/package.json b/services/request/package.json index 9aca7c9..cf9386c 100644 --- a/services/request/package.json +++ b/services/request/package.json @@ -12,6 +12,7 @@ "start:dev": "nodemon" }, "dependencies": { + "@autoplex-api/seeker": "^0.0.0", "@autoplex/database": "^0.0.0", "@autoplex/ipc": "^0.0.0", "@autoplex/microservice": "^0.0.0", diff --git a/services/request/src/server/services/Ipc/SeekerIpcClient.ts b/services/request/src/server/services/Ipc/SeekerIpcClient.ts deleted file mode 100644 index 2ba9080..0000000 --- a/services/request/src/server/services/Ipc/SeekerIpcClient.ts +++ /dev/null @@ -1,27 +0,0 @@ -import Application from "@server/Application"; -import { IpcClientService } from "@autoplex/ipc"; -import { env } from "@autoplex/utils"; - -export default class SeekerIpcClient extends IpcClientService -{ - /** - * The service name - */ - public readonly NAME = "Seeker IPC"; - - /** - * The path to the socket file - */ - protected readonly SOCKET_PATH = env("SEEKER_IPC_SOCKET"); - - // Methods ------------------------------------------------------------------------------------- - - /** - * Notify Seeker that a movie was added - */ - public notifyMovieRequested(ticketId: number) { - this.request("movie_ticket_added", ticketId).catch((e) => { - this.log("No response from seeker notifying added movie", e); - }); - } -} diff --git a/services/request/src/server/services/WebServer/routes/api.ts b/services/request/src/server/services/WebServer/routes/api.ts index 0ad80c4..0b6a783 100644 --- a/services/request/src/server/services/WebServer/routes/api.ts +++ b/services/request/src/server/services/WebServer/routes/api.ts @@ -1,15 +1,11 @@ +import { IpcClient as SeekerIpc } from "@autoplex-api/seeker"; import { MovieInfo, MovieTicket } from "@autoplex/database"; -import { handleRequest, RouteRegisterFactory, RouteFactory, MiddlewareMethod } from "@autoplex/webserver"; +import { handleRequest, RouteRegisterFactory, MiddlewareMethod } from "@autoplex/webserver"; import Application from "@server/Application"; -import SeekerIpc from "@server/services/Ipc/SeekerIpcClient"; import MovieSearch from "@server/services/MovieSearch"; import { auth } from "../middleware/auth"; import { RequestTmdbMovieRequest } from "../requests"; -function testFunc(a: A, b: B) { - -} - /** * Register API routes */ @@ -97,7 +93,7 @@ export default function register(factory: RouteRegisterFactory("Seeker IPC").notifyMovieRequested(ticket.id); + app.service("Seeker").notifyMovieRequested(ticket.id); return reply.send({ status: "Success", data: { ticket_id: ticket.id }}); })); diff --git a/services/request/src/server/services/index.ts b/services/request/src/server/services/index.ts index c3f5e95..fa9eef8 100644 --- a/services/request/src/server/services/index.ts +++ b/services/request/src/server/services/index.ts @@ -1,8 +1,8 @@ +export { IpcClient } from "@autoplex-api/seeker"; export { DatabaseService } from "@autoplex/database"; import DiscordBot from "./DiscordBot"; import MovieSearch from "./MovieSearch"; import PlexLibrary from "./PlexLibrary"; -import SeekerIpcClient from "./Ipc/SeekerIpcClient"; import TvDb from "./TvDb"; import WebServer from "./WebServer/WebServer"; @@ -11,7 +11,6 @@ export { MovieSearch, PlexLibrary, // TorrentIpcClient, - SeekerIpcClient, TvDb, WebServer }