From ed42d02e6d76a3bade42d69e5bf4c56e28391be1 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Tue, 22 Jun 2021 13:08:58 -0500 Subject: [PATCH] Rename seeker and request services to manager and interface --- api/{request => interface}/package.json | 2 +- api/{request => interface}/src/index.ts | 0 api/{request => interface}/src/schema.ts | 0 api/{request => interface}/src/validation.ts | 0 api/{request => interface}/src/websocket.ts | 0 api/{request => interface}/tsconfig.json | 0 api/{request => interface}/yarn.lock | 0 api/{seeker => manager}/package.json | 2 +- api/{seeker => manager}/src/IpcClient.ts | 2 +- api/manager/src/constants.ts | 4 ++++ api/{seeker => manager}/src/index.ts | 0 api/{seeker => manager}/src/schema.ts | 0 api/{seeker => manager}/tsconfig.json | 0 api/{seeker => manager}/yarn.lock | 0 api/seeker/src/constants.ts | 4 ---- docker-compose.dev.yml | 8 ++++---- docker-compose.prod.yml | 4 ++-- docker-compose.yml | 14 +++++--------- services/{request => interface}/.env.example | 0 services/{request => interface}/README.md | 0 services/{request => interface}/nodemon.json | 0 services/{request => interface}/ormconfig.json | 0 services/{request => interface}/package.json | 6 +++--- .../{request => interface}/src/Application.ts | 0 services/{request => interface}/src/common.ts | 0 services/{request => interface}/src/index.ts | 0 .../src/services/DiscordBot.ts | 0 .../src/services/MovieSearch.ts | 2 +- .../src/services/WebServer/WebServer.ts | 0 .../src/services/WebServer/middleware/auth.ts | 2 +- .../src/services/WebServer/middleware/index.ts | 0 .../WebServer/requests/LinkDiscordRequest.ts | 0 .../services/WebServer/requests/LoginRequest.ts | 2 +- .../WebServer/requests/MovieSearchRequest.ts | 2 +- .../WebServer/requests/RegisterRequest.ts | 2 +- .../WebServer/requests/RequestImdbMovieRequest.ts | 0 .../WebServer/requests/RequestMovieRequest.ts | 0 .../WebServer/requests/RequestTmdbMovieRequest.ts | 0 .../src/services/WebServer/requests/index.ts | 0 .../src/services/WebServer/routes/api.ts | 4 ++-- .../src/services/WebServer/routes/auth.ts | 0 .../src/services/WebServer/routes/index.ts | 0 .../src/services/WebServer/routes/web.ts | 0 .../src/services/WebServer/validators.ts | 0 .../src/services/WebSocketServer.ts | 12 ++++++------ services/interface/src/services/index.ts | 15 +++++++++++++++ services/{request => interface}/src/utils.ts | 2 +- services/{request => interface}/tsconfig.json | 0 services/{request => interface}/yarn.lock | 0 services/{seeker => manager}/README.md | 0 services/{seeker => manager}/nodemon.json | 0 services/{seeker => manager}/ormconfig.json | 0 services/{seeker => manager}/package.json | 5 ++--- services/{seeker => manager}/src/index.ts | 0 .../src/services/IpcInterface.ts | 2 +- .../src/services/PostProcessor/PostProcessor.ts | 0 .../src/services/PostProcessor/index.ts | 0 .../src/services/Supervisor.ts | 0 .../src/services/TorrentIpc.ts | 0 .../src/services/TorrentManager.ts | 0 .../{seeker => manager}/src/services/index.ts | 0 .../src/typings/node-ipc/index.d.ts | 0 services/{seeker => manager}/src/utils.ts | 0 services/{seeker => manager}/tsconfig.json | 0 services/{seeker => manager}/yarn.lock | 0 services/request/src/services/index.ts | 15 --------------- services/webui/package.json | 2 +- services/webui/src/app/components/MovieList.vue | 2 +- .../components/mixins/MovieListComponentMixin.ts | 2 +- .../src/app/components/modals/MovieModal.vue | 2 +- services/webui/src/app/store/actions.ts | 2 +- services/webui/src/app/store/getters.ts | 2 +- services/webui/src/app/store/mutations.ts | 2 +- services/webui/src/app/store/state.ts | 2 +- services/webui/src/app/views/Dashboard.vue | 2 +- services/webui/src/app/views/Register.vue | 2 +- services/webui/src/app/views/Search.vue | 2 +- services/webui/src/app/websocket.ts | 2 +- 78 files changed, 65 insertions(+), 70 deletions(-) rename api/{request => interface}/package.json (90%) rename api/{request => interface}/src/index.ts (100%) rename api/{request => interface}/src/schema.ts (100%) rename api/{request => interface}/src/validation.ts (100%) rename api/{request => interface}/src/websocket.ts (100%) rename api/{request => interface}/tsconfig.json (100%) rename api/{request => interface}/yarn.lock (100%) rename api/{seeker => manager}/package.json (89%) rename api/{seeker => manager}/src/IpcClient.ts (96%) create mode 100644 api/manager/src/constants.ts rename api/{seeker => manager}/src/index.ts (100%) rename api/{seeker => manager}/src/schema.ts (100%) rename api/{seeker => manager}/tsconfig.json (100%) rename api/{seeker => manager}/yarn.lock (100%) delete mode 100644 api/seeker/src/constants.ts rename services/{request => interface}/.env.example (100%) rename services/{request => interface}/README.md (100%) rename services/{request => interface}/nodemon.json (100%) rename services/{request => interface}/ormconfig.json (100%) rename services/{request => interface}/package.json (91%) rename services/{request => interface}/src/Application.ts (100%) rename services/{request => interface}/src/common.ts (100%) rename services/{request => interface}/src/index.ts (100%) rename services/{request => interface}/src/services/DiscordBot.ts (100%) rename services/{request => interface}/src/services/MovieSearch.ts (99%) rename services/{request => interface}/src/services/WebServer/WebServer.ts (100%) rename services/{request => interface}/src/services/WebServer/middleware/auth.ts (96%) rename services/{request => interface}/src/services/WebServer/middleware/index.ts (100%) rename services/{request => interface}/src/services/WebServer/requests/LinkDiscordRequest.ts (100%) rename services/{request => interface}/src/services/WebServer/requests/LoginRequest.ts (97%) rename services/{request => interface}/src/services/WebServer/requests/MovieSearchRequest.ts (96%) rename services/{request => interface}/src/services/WebServer/requests/RegisterRequest.ts (97%) rename services/{request => interface}/src/services/WebServer/requests/RequestImdbMovieRequest.ts (100%) rename services/{request => interface}/src/services/WebServer/requests/RequestMovieRequest.ts (100%) rename services/{request => interface}/src/services/WebServer/requests/RequestTmdbMovieRequest.ts (100%) rename services/{request => interface}/src/services/WebServer/requests/index.ts (100%) rename services/{request => interface}/src/services/WebServer/routes/api.ts (96%) rename services/{request => interface}/src/services/WebServer/routes/auth.ts (100%) rename services/{request => interface}/src/services/WebServer/routes/index.ts (100%) rename services/{request => interface}/src/services/WebServer/routes/web.ts (100%) rename services/{request => interface}/src/services/WebServer/validators.ts (100%) rename services/{request => interface}/src/services/WebSocketServer.ts (75%) create mode 100644 services/interface/src/services/index.ts rename services/{request => interface}/src/utils.ts (94%) rename services/{request => interface}/tsconfig.json (100%) rename services/{request => interface}/yarn.lock (100%) rename services/{seeker => manager}/README.md (100%) rename services/{seeker => manager}/nodemon.json (100%) rename services/{seeker => manager}/ormconfig.json (100%) rename services/{seeker => manager}/package.json (84%) rename services/{seeker => manager}/src/index.ts (100%) rename services/{seeker => manager}/src/services/IpcInterface.ts (97%) rename services/{seeker => manager}/src/services/PostProcessor/PostProcessor.ts (100%) rename services/{seeker => manager}/src/services/PostProcessor/index.ts (100%) rename services/{seeker => manager}/src/services/Supervisor.ts (100%) rename services/{seeker => manager}/src/services/TorrentIpc.ts (100%) rename services/{seeker => manager}/src/services/TorrentManager.ts (100%) rename services/{seeker => manager}/src/services/index.ts (100%) rename services/{seeker => manager}/src/typings/node-ipc/index.d.ts (100%) rename services/{seeker => manager}/src/utils.ts (100%) rename services/{seeker => manager}/tsconfig.json (100%) rename services/{seeker => manager}/yarn.lock (100%) delete mode 100644 services/request/src/services/index.ts diff --git a/api/request/package.json b/api/interface/package.json similarity index 90% rename from api/request/package.json rename to api/interface/package.json index 4471ab8..dbe5db5 100644 --- a/api/request/package.json +++ b/api/interface/package.json @@ -1,5 +1,5 @@ { - "name": "@autoplex-api/request", + "name": "@autoplex-api/interface", "version": "0.0.0", "main": "dist/lib/index.js", "types": "dist/typings", diff --git a/api/request/src/index.ts b/api/interface/src/index.ts similarity index 100% rename from api/request/src/index.ts rename to api/interface/src/index.ts diff --git a/api/request/src/schema.ts b/api/interface/src/schema.ts similarity index 100% rename from api/request/src/schema.ts rename to api/interface/src/schema.ts diff --git a/api/request/src/validation.ts b/api/interface/src/validation.ts similarity index 100% rename from api/request/src/validation.ts rename to api/interface/src/validation.ts diff --git a/api/request/src/websocket.ts b/api/interface/src/websocket.ts similarity index 100% rename from api/request/src/websocket.ts rename to api/interface/src/websocket.ts diff --git a/api/request/tsconfig.json b/api/interface/tsconfig.json similarity index 100% rename from api/request/tsconfig.json rename to api/interface/tsconfig.json diff --git a/api/request/yarn.lock b/api/interface/yarn.lock similarity index 100% rename from api/request/yarn.lock rename to api/interface/yarn.lock diff --git a/api/seeker/package.json b/api/manager/package.json similarity index 89% rename from api/seeker/package.json rename to api/manager/package.json index 122a142..a597bfb 100644 --- a/api/seeker/package.json +++ b/api/manager/package.json @@ -1,5 +1,5 @@ { - "name": "@autoplex-api/seeker", + "name": "@autoplex-api/manager", "version": "0.0.0", "main": "dist/lib/index.js", "types": "dist/typings", diff --git a/api/seeker/src/IpcClient.ts b/api/manager/src/IpcClient.ts similarity index 96% rename from api/seeker/src/IpcClient.ts rename to api/manager/src/IpcClient.ts index d27ae27..9dda662 100644 --- a/api/seeker/src/IpcClient.ts +++ b/api/manager/src/IpcClient.ts @@ -7,7 +7,7 @@ export class IpcClient extends IpcClientS /** * The service name */ - public readonly NAME = "Seeker"; + public readonly NAME = "Manager"; /** * The path to the socket file diff --git a/api/manager/src/constants.ts b/api/manager/src/constants.ts new file mode 100644 index 0000000..d1497b9 --- /dev/null +++ b/api/manager/src/constants.ts @@ -0,0 +1,4 @@ +/** + * The path to the socket file + */ +export const SOCKET_PATH = "/var/autoplex/ipc/manager.sock"; diff --git a/api/seeker/src/index.ts b/api/manager/src/index.ts similarity index 100% rename from api/seeker/src/index.ts rename to api/manager/src/index.ts diff --git a/api/seeker/src/schema.ts b/api/manager/src/schema.ts similarity index 100% rename from api/seeker/src/schema.ts rename to api/manager/src/schema.ts diff --git a/api/seeker/tsconfig.json b/api/manager/tsconfig.json similarity index 100% rename from api/seeker/tsconfig.json rename to api/manager/tsconfig.json diff --git a/api/seeker/yarn.lock b/api/manager/yarn.lock similarity index 100% rename from api/seeker/yarn.lock rename to api/manager/yarn.lock diff --git a/api/seeker/src/constants.ts b/api/seeker/src/constants.ts deleted file mode 100644 index b21887a..0000000 --- a/api/seeker/src/constants.ts +++ /dev/null @@ -1,4 +0,0 @@ -/** - * The path to the socket file - */ -export const SOCKET_PATH = "/var/autoplex/ipc/seeker.sock"; diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a0d4d98..be4f8cc 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -12,13 +12,13 @@ services: - ./services/webui:/app/services/webui tty: true - request: + interface: build: target: dev volumes: - ./api:/app/api - ./packages:/app/packages - - ./services/request:/app/services/request + - ./services/interface:/app/services/interface tty: true plex: @@ -39,13 +39,13 @@ services: - ./services/search:/app/services/search tty: true - seeker: + manager: build: target: dev volumes: - ./api:/app/api - ./packages:/app/packages - - ./services/seeker:/app/services/seeker + - ./services/manager:/app/services/manager tty: true torrent_rest: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 6c67288..c12c508 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -7,7 +7,7 @@ services: environment: NODE_ENV: production - request: + interface: build: target: prod environment: @@ -25,7 +25,7 @@ services: environment: NODE_ENV: production - seeker: + manager: build: target: prod environment: diff --git a/docker-compose.yml b/docker-compose.yml index 89053af..a64dffc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,17 +10,17 @@ services: ./services/webui/.env restart: unless-stopped - request: + interface: build: context: . args: - SERVICE: request + SERVICE: interface depends_on: - "database" - "torrent" - "webui" env_file: - - ./services/request/.env + - ./services/interface/.env environment: DATABASE: "autoplex" links: @@ -34,10 +34,6 @@ services: - app_key - discord_bot_key - mysql_root_password - - plex_token - - tmdb_key - - tvdb_key - - tvdb_pin user: ${USER_ID}:${GROUP_ID} volumes: - var:/var/autoplex @@ -75,11 +71,11 @@ services: volumes: - var:/var/autoplex - seeker: + manager: build: context: . args: - SERVICE: seeker + SERVICE: manager depends_on: - "database" - "torrent" diff --git a/services/request/.env.example b/services/interface/.env.example similarity index 100% rename from services/request/.env.example rename to services/interface/.env.example diff --git a/services/request/README.md b/services/interface/README.md similarity index 100% rename from services/request/README.md rename to services/interface/README.md diff --git a/services/request/nodemon.json b/services/interface/nodemon.json similarity index 100% rename from services/request/nodemon.json rename to services/interface/nodemon.json diff --git a/services/request/ormconfig.json b/services/interface/ormconfig.json similarity index 100% rename from services/request/ormconfig.json rename to services/interface/ormconfig.json diff --git a/services/request/package.json b/services/interface/package.json similarity index 91% rename from services/request/package.json rename to services/interface/package.json index abc4535..675534f 100644 --- a/services/request/package.json +++ b/services/interface/package.json @@ -1,5 +1,5 @@ { - "name": "@autoplex-service/request", + "name": "@autoplex-service/interface", "version": "0.0.0", "keywords": [], "author": "David Ludwig", @@ -12,10 +12,10 @@ "start:dev": "nodemon" }, "dependencies": { + "@autoplex-api/interface": "^0.0.0", + "@autoplex-api/manager": "^0.0.0", "@autoplex-api/plex": "^0.0.0", - "@autoplex-api/request": "^0.0.0", "@autoplex-api/search": "^0.0.0", - "@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/Application.ts b/services/interface/src/Application.ts similarity index 100% rename from services/request/src/Application.ts rename to services/interface/src/Application.ts diff --git a/services/request/src/common.ts b/services/interface/src/common.ts similarity index 100% rename from services/request/src/common.ts rename to services/interface/src/common.ts diff --git a/services/request/src/index.ts b/services/interface/src/index.ts similarity index 100% rename from services/request/src/index.ts rename to services/interface/src/index.ts diff --git a/services/request/src/services/DiscordBot.ts b/services/interface/src/services/DiscordBot.ts similarity index 100% rename from services/request/src/services/DiscordBot.ts rename to services/interface/src/services/DiscordBot.ts diff --git a/services/request/src/services/MovieSearch.ts b/services/interface/src/services/MovieSearch.ts similarity index 99% rename from services/request/src/services/MovieSearch.ts rename to services/interface/src/services/MovieSearch.ts index 888ad12..972b3e6 100644 --- a/services/request/src/services/MovieSearch.ts +++ b/services/interface/src/services/MovieSearch.ts @@ -1,6 +1,6 @@ import { MovieTicket } from "@autoplex/database"; import { IpcClient as PlexIpc } from "@autoplex-api/plex"; -import { IMovie, IMovieDetails, IPaginatedResponse } from "@autoplex-api/request"; +import { IMovie, IMovieDetails, IPaginatedResponse } from "@autoplex-api/interface"; import { IpcClient as SearchIpc } from "@autoplex-api/search"; import { InternalService } from "@autoplex/microservice"; import Application from "../Application"; diff --git a/services/request/src/services/WebServer/WebServer.ts b/services/interface/src/services/WebServer/WebServer.ts similarity index 100% rename from services/request/src/services/WebServer/WebServer.ts rename to services/interface/src/services/WebServer/WebServer.ts diff --git a/services/request/src/services/WebServer/middleware/auth.ts b/services/interface/src/services/WebServer/middleware/auth.ts similarity index 96% rename from services/request/src/services/WebServer/middleware/auth.ts rename to services/interface/src/services/WebServer/middleware/auth.ts index b40ec85..0ee07ed 100644 --- a/services/request/src/services/WebServer/middleware/auth.ts +++ b/services/interface/src/services/WebServer/middleware/auth.ts @@ -1,4 +1,4 @@ -import { ITokenSchema } from "@autoplex-api/request"; +import { ITokenSchema } from "@autoplex-api/interface"; import { User } from "@autoplex/database"; import { IteratorNext, MiddlewareRequest, FastifyReply } from "@autoplex/webserver"; import jwt from "jsonwebtoken"; diff --git a/services/request/src/services/WebServer/middleware/index.ts b/services/interface/src/services/WebServer/middleware/index.ts similarity index 100% rename from services/request/src/services/WebServer/middleware/index.ts rename to services/interface/src/services/WebServer/middleware/index.ts diff --git a/services/request/src/services/WebServer/requests/LinkDiscordRequest.ts b/services/interface/src/services/WebServer/requests/LinkDiscordRequest.ts similarity index 100% rename from services/request/src/services/WebServer/requests/LinkDiscordRequest.ts rename to services/interface/src/services/WebServer/requests/LinkDiscordRequest.ts diff --git a/services/request/src/services/WebServer/requests/LoginRequest.ts b/services/interface/src/services/WebServer/requests/LoginRequest.ts similarity index 97% rename from services/request/src/services/WebServer/requests/LoginRequest.ts rename to services/interface/src/services/WebServer/requests/LoginRequest.ts index e0c0037..54db8be 100644 --- a/services/request/src/services/WebServer/requests/LoginRequest.ts +++ b/services/interface/src/services/WebServer/requests/LoginRequest.ts @@ -1,4 +1,4 @@ -import { ValidationConstraints as constraints } from "@autoplex-api/request"; +import { ValidationConstraints as constraints } from "@autoplex-api/interface"; import { Request } from "@autoplex/webserver"; import { FastifyRequest } from "fastify"; import validate from "validate.js"; diff --git a/services/request/src/services/WebServer/requests/MovieSearchRequest.ts b/services/interface/src/services/WebServer/requests/MovieSearchRequest.ts similarity index 96% rename from services/request/src/services/WebServer/requests/MovieSearchRequest.ts rename to services/interface/src/services/WebServer/requests/MovieSearchRequest.ts index ff45e06..2a37870 100644 --- a/services/request/src/services/WebServer/requests/MovieSearchRequest.ts +++ b/services/interface/src/services/WebServer/requests/MovieSearchRequest.ts @@ -1,4 +1,4 @@ -import { ValidationConstraints as constraints } from "@autoplex-api/request"; +import { ValidationConstraints as constraints } from "@autoplex-api/interface"; import { Request } from "@autoplex/webserver"; import { FastifyRequest } from "fastify"; import validate from "validate.js"; diff --git a/services/request/src/services/WebServer/requests/RegisterRequest.ts b/services/interface/src/services/WebServer/requests/RegisterRequest.ts similarity index 97% rename from services/request/src/services/WebServer/requests/RegisterRequest.ts rename to services/interface/src/services/WebServer/requests/RegisterRequest.ts index 4a08170..0554724 100644 --- a/services/request/src/services/WebServer/requests/RegisterRequest.ts +++ b/services/interface/src/services/WebServer/requests/RegisterRequest.ts @@ -1,4 +1,4 @@ -import { ValidationConstraints as constraints } from "@autoplex-api/request"; +import { ValidationConstraints as constraints } from "@autoplex-api/interface"; import { Request } from "@autoplex/webserver"; import { FastifyRequest } from "fastify"; import validate from "validate.js"; diff --git a/services/request/src/services/WebServer/requests/RequestImdbMovieRequest.ts b/services/interface/src/services/WebServer/requests/RequestImdbMovieRequest.ts similarity index 100% rename from services/request/src/services/WebServer/requests/RequestImdbMovieRequest.ts rename to services/interface/src/services/WebServer/requests/RequestImdbMovieRequest.ts diff --git a/services/request/src/services/WebServer/requests/RequestMovieRequest.ts b/services/interface/src/services/WebServer/requests/RequestMovieRequest.ts similarity index 100% rename from services/request/src/services/WebServer/requests/RequestMovieRequest.ts rename to services/interface/src/services/WebServer/requests/RequestMovieRequest.ts diff --git a/services/request/src/services/WebServer/requests/RequestTmdbMovieRequest.ts b/services/interface/src/services/WebServer/requests/RequestTmdbMovieRequest.ts similarity index 100% rename from services/request/src/services/WebServer/requests/RequestTmdbMovieRequest.ts rename to services/interface/src/services/WebServer/requests/RequestTmdbMovieRequest.ts diff --git a/services/request/src/services/WebServer/requests/index.ts b/services/interface/src/services/WebServer/requests/index.ts similarity index 100% rename from services/request/src/services/WebServer/requests/index.ts rename to services/interface/src/services/WebServer/requests/index.ts diff --git a/services/request/src/services/WebServer/routes/api.ts b/services/interface/src/services/WebServer/routes/api.ts similarity index 96% rename from services/request/src/services/WebServer/routes/api.ts rename to services/interface/src/services/WebServer/routes/api.ts index 5fc1e50..9797898 100644 --- a/services/request/src/services/WebServer/routes/api.ts +++ b/services/interface/src/services/WebServer/routes/api.ts @@ -1,4 +1,4 @@ -import { IpcClient as SeekerIpc } from "@autoplex-api/seeker"; +import { IpcClient as ManagerIpc } from "@autoplex-api/manager"; import { MovieInfo, MovieTicket } from "@autoplex/database"; import { handleRequest, RouteRegisterFactory, MiddlewareMethod, Status, respond } from "@autoplex/webserver"; import Application from "../../../Application"; @@ -119,7 +119,7 @@ export default function register(factory: RouteRegisterFactory("Seeker").notifyMovieRequested(ticket.id); + app.service("Manager").notifyMovieRequested(ticket.id); respond(reply, Status.Ok, { ticketId: ticket.id }); })); }); diff --git a/services/request/src/services/WebServer/routes/auth.ts b/services/interface/src/services/WebServer/routes/auth.ts similarity index 100% rename from services/request/src/services/WebServer/routes/auth.ts rename to services/interface/src/services/WebServer/routes/auth.ts diff --git a/services/request/src/services/WebServer/routes/index.ts b/services/interface/src/services/WebServer/routes/index.ts similarity index 100% rename from services/request/src/services/WebServer/routes/index.ts rename to services/interface/src/services/WebServer/routes/index.ts diff --git a/services/request/src/services/WebServer/routes/web.ts b/services/interface/src/services/WebServer/routes/web.ts similarity index 100% rename from services/request/src/services/WebServer/routes/web.ts rename to services/interface/src/services/WebServer/routes/web.ts diff --git a/services/request/src/services/WebServer/validators.ts b/services/interface/src/services/WebServer/validators.ts similarity index 100% rename from services/request/src/services/WebServer/validators.ts rename to services/interface/src/services/WebServer/validators.ts diff --git a/services/request/src/services/WebSocketServer.ts b/services/interface/src/services/WebSocketServer.ts similarity index 75% rename from services/request/src/services/WebSocketServer.ts rename to services/interface/src/services/WebSocketServer.ts index 8422666..1694d3e 100644 --- a/services/request/src/services/WebSocketServer.ts +++ b/services/interface/src/services/WebSocketServer.ts @@ -1,6 +1,6 @@ import { WebSocketServerService } from "@autoplex/websocket-server"; -import { WebSocketMethod } from "@autoplex-api/request"; -import { IpcClient as SeekerIpc } from "@autoplex-api/seeker"; +import { WebSocketMethod } from "@autoplex-api/interface"; +import { IpcClient as ManagerIpc } from "@autoplex-api/manager"; import Application from "../Application"; export default class WebSocketServer extends WebSocketServerService @@ -11,16 +11,16 @@ export default class WebSocketServer extends WebSocketServerService public readonly NAME = "WebSocket Server"; /** - * Reference to the Seeker IPC service + * Reference to the Manager IPC service */ - protected seeker!: SeekerIpc; + protected manager!: ManagerIpc; /** * Boot the service */ public override async boot() { super.boot(); - this.seeker = this.app.service("Seeker"); + this.manager = this.app.service("Manager"); } /** @@ -44,7 +44,7 @@ export default class WebSocketServer extends WebSocketServerService */ protected async ticketProgress(ticketIds: number[]) { // let result: { [ticketId: number]: { plexLink?: string, progress?: number } } = {}; - let response = await this.seeker.getMovieTicketStates(ticketIds); + let response = await this.manager.getMovieTicketStates(ticketIds); return response; } } diff --git a/services/interface/src/services/index.ts b/services/interface/src/services/index.ts new file mode 100644 index 0000000..2d5e799 --- /dev/null +++ b/services/interface/src/services/index.ts @@ -0,0 +1,15 @@ +export { IpcClient as ManagerIpc } from "@autoplex-api/manager"; +export { IpcClient as PlexIpc } from "@autoplex-api/plex"; +export { IpcClient as SearchIpc } from "@autoplex-api/search"; +export { DatabaseService } from "@autoplex/database"; +import DiscordBot from "./DiscordBot"; +import MovieSearch from "./MovieSearch"; +import WebServer from "./WebServer/WebServer"; +import WebSocketServer from "./WebSocketServer"; + +export { + // DiscordBot, + MovieSearch, + WebServer, + WebSocketServer +} diff --git a/services/request/src/utils.ts b/services/interface/src/utils.ts similarity index 94% rename from services/request/src/utils.ts rename to services/interface/src/utils.ts index 5c53b02..6738b27 100644 --- a/services/request/src/utils.ts +++ b/services/interface/src/utils.ts @@ -1,4 +1,4 @@ -import { IMovie } from "@autoplex-api/request"; +import { IMovie } from "@autoplex-api/interface"; import { MovieTicket } from "@autoplex/database"; import { PlexIpc } from "services"; import Application from "./Application"; diff --git a/services/request/tsconfig.json b/services/interface/tsconfig.json similarity index 100% rename from services/request/tsconfig.json rename to services/interface/tsconfig.json diff --git a/services/request/yarn.lock b/services/interface/yarn.lock similarity index 100% rename from services/request/yarn.lock rename to services/interface/yarn.lock diff --git a/services/seeker/README.md b/services/manager/README.md similarity index 100% rename from services/seeker/README.md rename to services/manager/README.md diff --git a/services/seeker/nodemon.json b/services/manager/nodemon.json similarity index 100% rename from services/seeker/nodemon.json rename to services/manager/nodemon.json diff --git a/services/seeker/ormconfig.json b/services/manager/ormconfig.json similarity index 100% rename from services/seeker/ormconfig.json rename to services/manager/ormconfig.json diff --git a/services/seeker/package.json b/services/manager/package.json similarity index 84% rename from services/seeker/package.json rename to services/manager/package.json index 0273534..64e5968 100644 --- a/services/seeker/package.json +++ b/services/manager/package.json @@ -1,8 +1,7 @@ { - "name": "@autoplex-service/seeker", + "name": "@autoplex-service/manager", "version": "1.0.0", "main": "./dist/index.js", - "repository": "ssh://git@git.dlii.tech:222/Autoplex/seeker.git", "author": "David Ludwig ", "license": "MIT", "scripts": { @@ -17,7 +16,7 @@ "@types/xml2js": "^0.4.8" }, "dependencies": { - "@autoplex-api/seeker": "^0.0.0", + "@autoplex-api/manager": "^0.0.0", "@autoplex-api/torrent": "^0.0.0", "@autoplex-api/torrent-search": "^0.0.0", "@autoplex/database": "^0.0.0", diff --git a/services/seeker/src/index.ts b/services/manager/src/index.ts similarity index 100% rename from services/seeker/src/index.ts rename to services/manager/src/index.ts diff --git a/services/seeker/src/services/IpcInterface.ts b/services/manager/src/services/IpcInterface.ts similarity index 97% rename from services/seeker/src/services/IpcInterface.ts rename to services/manager/src/services/IpcInterface.ts index d40fcaf..44568f9 100644 --- a/services/seeker/src/services/IpcInterface.ts +++ b/services/manager/src/services/IpcInterface.ts @@ -1,4 +1,4 @@ -import { SOCKET_PATH } from "@autoplex-api/seeker"; +import { SOCKET_PATH } from "@autoplex-api/manager"; import { IpcServerService } from "@autoplex/ipc"; import { MovieTicket } from "@autoplex/database"; import Supervisor from "./Supervisor"; diff --git a/services/seeker/src/services/PostProcessor/PostProcessor.ts b/services/manager/src/services/PostProcessor/PostProcessor.ts similarity index 100% rename from services/seeker/src/services/PostProcessor/PostProcessor.ts rename to services/manager/src/services/PostProcessor/PostProcessor.ts diff --git a/services/seeker/src/services/PostProcessor/index.ts b/services/manager/src/services/PostProcessor/index.ts similarity index 100% rename from services/seeker/src/services/PostProcessor/index.ts rename to services/manager/src/services/PostProcessor/index.ts diff --git a/services/seeker/src/services/Supervisor.ts b/services/manager/src/services/Supervisor.ts similarity index 100% rename from services/seeker/src/services/Supervisor.ts rename to services/manager/src/services/Supervisor.ts diff --git a/services/seeker/src/services/TorrentIpc.ts b/services/manager/src/services/TorrentIpc.ts similarity index 100% rename from services/seeker/src/services/TorrentIpc.ts rename to services/manager/src/services/TorrentIpc.ts diff --git a/services/seeker/src/services/TorrentManager.ts b/services/manager/src/services/TorrentManager.ts similarity index 100% rename from services/seeker/src/services/TorrentManager.ts rename to services/manager/src/services/TorrentManager.ts diff --git a/services/seeker/src/services/index.ts b/services/manager/src/services/index.ts similarity index 100% rename from services/seeker/src/services/index.ts rename to services/manager/src/services/index.ts diff --git a/services/seeker/src/typings/node-ipc/index.d.ts b/services/manager/src/typings/node-ipc/index.d.ts similarity index 100% rename from services/seeker/src/typings/node-ipc/index.d.ts rename to services/manager/src/typings/node-ipc/index.d.ts diff --git a/services/seeker/src/utils.ts b/services/manager/src/utils.ts similarity index 100% rename from services/seeker/src/utils.ts rename to services/manager/src/utils.ts diff --git a/services/seeker/tsconfig.json b/services/manager/tsconfig.json similarity index 100% rename from services/seeker/tsconfig.json rename to services/manager/tsconfig.json diff --git a/services/seeker/yarn.lock b/services/manager/yarn.lock similarity index 100% rename from services/seeker/yarn.lock rename to services/manager/yarn.lock diff --git a/services/request/src/services/index.ts b/services/request/src/services/index.ts deleted file mode 100644 index 70629fe..0000000 --- a/services/request/src/services/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -export { IpcClient as PlexIpc } from "@autoplex-api/plex"; -export { IpcClient as SeekerIpc } from "@autoplex-api/seeker"; -export { IpcClient as SearchIpc } from "@autoplex-api/search"; -export { DatabaseService } from "@autoplex/database"; -import DiscordBot from "./DiscordBot"; -import MovieSearch from "./MovieSearch"; -import WebServer from "./WebServer/WebServer"; -import WebSocketServer from "./WebSocketServer"; - -export { - // DiscordBot, - MovieSearch, - WebServer, - WebSocketServer -} diff --git a/services/webui/package.json b/services/webui/package.json index 3581007..a3f6d50 100644 --- a/services/webui/package.json +++ b/services/webui/package.json @@ -14,7 +14,7 @@ "start:dev": "vite --host" }, "dependencies": { - "@autoplex-api/request": "^0.0.0", + "@autoplex-api/interface": "^0.0.0", "@autoplex/restful": "^0.0.0", "@autoplex/websocket-client": "^0.0.0", "@fortawesome/fontawesome-free": "^5.15.3", diff --git a/services/webui/src/app/components/MovieList.vue b/services/webui/src/app/components/MovieList.vue index 62dbc7e..8ea1bd7 100644 --- a/services/webui/src/app/components/MovieList.vue +++ b/services/webui/src/app/components/MovieList.vue @@ -8,7 +8,7 @@ import { defineComponent } from "vue"; import MovieListItem from "./MovieListItem.vue"; import MovieListComponentMixin from "./mixins/MovieListComponentMixin"; -import { IMovie } from "@autoplex-api/request"; +import { IMovie } from "@autoplex-api/interface"; export default defineComponent({ components: { diff --git a/services/webui/src/app/components/mixins/MovieListComponentMixin.ts b/services/webui/src/app/components/mixins/MovieListComponentMixin.ts index 7c5c7c2..8d55e2c 100644 --- a/services/webui/src/app/components/mixins/MovieListComponentMixin.ts +++ b/services/webui/src/app/components/mixins/MovieListComponentMixin.ts @@ -1,4 +1,4 @@ -import { IMovie } from "@autoplex-api/request"; +import { IMovie } from "@autoplex-api/interface"; import { Action, Mutation } from "../../store"; import { defineComponent } from "vue"; diff --git a/services/webui/src/app/components/modals/MovieModal.vue b/services/webui/src/app/components/modals/MovieModal.vue index 7c8dfa3..2a1a767 100644 --- a/services/webui/src/app/components/modals/MovieModal.vue +++ b/services/webui/src/app/components/modals/MovieModal.vue @@ -64,7 +64,7 @@