Browse Source

Rename seeker and request services to manager and interface

dev
David Ludwig 4 years ago
parent
commit
ed42d02e6d
78 changed files with 65 additions and 70 deletions
  1. +1
    -1
      api/interface/package.json
  2. +0
    -0
      api/interface/src/index.ts
  3. +0
    -0
      api/interface/src/schema.ts
  4. +0
    -0
      api/interface/src/validation.ts
  5. +0
    -0
      api/interface/src/websocket.ts
  6. +0
    -0
      api/interface/tsconfig.json
  7. +0
    -0
      api/interface/yarn.lock
  8. +1
    -1
      api/manager/package.json
  9. +1
    -1
      api/manager/src/IpcClient.ts
  10. +4
    -0
      api/manager/src/constants.ts
  11. +0
    -0
      api/manager/src/index.ts
  12. +0
    -0
      api/manager/src/schema.ts
  13. +0
    -0
      api/manager/tsconfig.json
  14. +0
    -0
      api/manager/yarn.lock
  15. +0
    -4
      api/seeker/src/constants.ts
  16. +4
    -4
      docker-compose.dev.yml
  17. +2
    -2
      docker-compose.prod.yml
  18. +5
    -9
      docker-compose.yml
  19. +0
    -0
      services/interface/.env.example
  20. +0
    -0
      services/interface/README.md
  21. +0
    -0
      services/interface/nodemon.json
  22. +0
    -0
      services/interface/ormconfig.json
  23. +3
    -3
      services/interface/package.json
  24. +0
    -0
      services/interface/src/Application.ts
  25. +0
    -0
      services/interface/src/common.ts
  26. +0
    -0
      services/interface/src/index.ts
  27. +0
    -0
      services/interface/src/services/DiscordBot.ts
  28. +1
    -1
      services/interface/src/services/MovieSearch.ts
  29. +0
    -0
      services/interface/src/services/WebServer/WebServer.ts
  30. +1
    -1
      services/interface/src/services/WebServer/middleware/auth.ts
  31. +0
    -0
      services/interface/src/services/WebServer/middleware/index.ts
  32. +0
    -0
      services/interface/src/services/WebServer/requests/LinkDiscordRequest.ts
  33. +1
    -1
      services/interface/src/services/WebServer/requests/LoginRequest.ts
  34. +1
    -1
      services/interface/src/services/WebServer/requests/MovieSearchRequest.ts
  35. +1
    -1
      services/interface/src/services/WebServer/requests/RegisterRequest.ts
  36. +0
    -0
      services/interface/src/services/WebServer/requests/RequestImdbMovieRequest.ts
  37. +0
    -0
      services/interface/src/services/WebServer/requests/RequestMovieRequest.ts
  38. +0
    -0
      services/interface/src/services/WebServer/requests/RequestTmdbMovieRequest.ts
  39. +0
    -0
      services/interface/src/services/WebServer/requests/index.ts
  40. +2
    -2
      services/interface/src/services/WebServer/routes/api.ts
  41. +0
    -0
      services/interface/src/services/WebServer/routes/auth.ts
  42. +0
    -0
      services/interface/src/services/WebServer/routes/index.ts
  43. +0
    -0
      services/interface/src/services/WebServer/routes/web.ts
  44. +0
    -0
      services/interface/src/services/WebServer/validators.ts
  45. +6
    -6
      services/interface/src/services/WebSocketServer.ts
  46. +15
    -0
      services/interface/src/services/index.ts
  47. +1
    -1
      services/interface/src/utils.ts
  48. +0
    -0
      services/interface/tsconfig.json
  49. +0
    -0
      services/interface/yarn.lock
  50. +0
    -0
      services/manager/README.md
  51. +0
    -0
      services/manager/nodemon.json
  52. +0
    -0
      services/manager/ormconfig.json
  53. +2
    -3
      services/manager/package.json
  54. +0
    -0
      services/manager/src/index.ts
  55. +1
    -1
      services/manager/src/services/IpcInterface.ts
  56. +0
    -0
      services/manager/src/services/PostProcessor/PostProcessor.ts
  57. +0
    -0
      services/manager/src/services/PostProcessor/index.ts
  58. +0
    -0
      services/manager/src/services/Supervisor.ts
  59. +0
    -0
      services/manager/src/services/TorrentIpc.ts
  60. +0
    -0
      services/manager/src/services/TorrentManager.ts
  61. +0
    -0
      services/manager/src/services/index.ts
  62. +0
    -0
      services/manager/src/typings/node-ipc/index.d.ts
  63. +0
    -0
      services/manager/src/utils.ts
  64. +0
    -0
      services/manager/tsconfig.json
  65. +0
    -0
      services/manager/yarn.lock
  66. +0
    -15
      services/request/src/services/index.ts
  67. +1
    -1
      services/webui/package.json
  68. +1
    -1
      services/webui/src/app/components/MovieList.vue
  69. +1
    -1
      services/webui/src/app/components/mixins/MovieListComponentMixin.ts
  70. +1
    -1
      services/webui/src/app/components/modals/MovieModal.vue
  71. +1
    -1
      services/webui/src/app/store/actions.ts
  72. +1
    -1
      services/webui/src/app/store/getters.ts
  73. +1
    -1
      services/webui/src/app/store/mutations.ts
  74. +1
    -1
      services/webui/src/app/store/state.ts
  75. +1
    -1
      services/webui/src/app/views/Dashboard.vue
  76. +1
    -1
      services/webui/src/app/views/Register.vue
  77. +1
    -1
      services/webui/src/app/views/Search.vue
  78. +1
    -1
      services/webui/src/app/websocket.ts

api/request/package.json → api/interface/package.json View File


api/request/src/index.ts → api/interface/src/index.ts View File


api/request/src/schema.ts → api/interface/src/schema.ts View File


api/request/src/validation.ts → api/interface/src/validation.ts View File


api/request/src/websocket.ts → api/interface/src/websocket.ts View File


api/request/tsconfig.json → api/interface/tsconfig.json View File


api/request/yarn.lock → api/interface/yarn.lock View File


api/seeker/package.json → api/manager/package.json View File


api/seeker/src/IpcClient.ts → api/manager/src/IpcClient.ts View File


+ 4
- 0
api/manager/src/constants.ts View File

@ -0,0 +1,4 @@
/**
* The path to the socket file
*/
export const SOCKET_PATH = "/var/autoplex/ipc/manager.sock";

api/seeker/src/index.ts → api/manager/src/index.ts View File


api/seeker/src/schema.ts → api/manager/src/schema.ts View File


api/seeker/tsconfig.json → api/manager/tsconfig.json View File


api/seeker/yarn.lock → api/manager/yarn.lock View File


+ 0
- 4
api/seeker/src/constants.ts View File

@ -1,4 +0,0 @@
/**
* The path to the socket file
*/
export const SOCKET_PATH = "/var/autoplex/ipc/seeker.sock";

+ 4
- 4
docker-compose.dev.yml View File

@ -12,13 +12,13 @@ services:
- ./services/webui:/app/services/webui - ./services/webui:/app/services/webui
tty: true tty: true
request:
interface:
build: build:
target: dev target: dev
volumes: volumes:
- ./api:/app/api - ./api:/app/api
- ./packages:/app/packages - ./packages:/app/packages
- ./services/request:/app/services/request
- ./services/interface:/app/services/interface
tty: true tty: true
plex: plex:
@ -39,13 +39,13 @@ services:
- ./services/search:/app/services/search - ./services/search:/app/services/search
tty: true tty: true
seeker:
manager:
build: build:
target: dev target: dev
volumes: volumes:
- ./api:/app/api - ./api:/app/api
- ./packages:/app/packages - ./packages:/app/packages
- ./services/seeker:/app/services/seeker
- ./services/manager:/app/services/manager
tty: true tty: true
torrent_rest: torrent_rest:


+ 2
- 2
docker-compose.prod.yml View File

@ -7,7 +7,7 @@ services:
environment: environment:
NODE_ENV: production NODE_ENV: production
request:
interface:
build: build:
target: prod target: prod
environment: environment:
@ -25,7 +25,7 @@ services:
environment: environment:
NODE_ENV: production NODE_ENV: production
seeker:
manager:
build: build:
target: prod target: prod
environment: environment:


+ 5
- 9
docker-compose.yml View File

@ -10,17 +10,17 @@ services:
./services/webui/.env ./services/webui/.env
restart: unless-stopped restart: unless-stopped
request:
interface:
build: build:
context: . context: .
args: args:
SERVICE: request
SERVICE: interface
depends_on: depends_on:
- "database" - "database"
- "torrent" - "torrent"
- "webui" - "webui"
env_file: env_file:
- ./services/request/.env
- ./services/interface/.env
environment: environment:
DATABASE: "autoplex" DATABASE: "autoplex"
links: links:
@ -34,10 +34,6 @@ services:
- app_key - app_key
- discord_bot_key - discord_bot_key
- mysql_root_password - mysql_root_password
- plex_token
- tmdb_key
- tvdb_key
- tvdb_pin
user: ${USER_ID}:${GROUP_ID} user: ${USER_ID}:${GROUP_ID}
volumes: volumes:
- var:/var/autoplex - var:/var/autoplex
@ -75,11 +71,11 @@ services:
volumes: volumes:
- var:/var/autoplex - var:/var/autoplex
seeker:
manager:
build: build:
context: . context: .
args: args:
SERVICE: seeker
SERVICE: manager
depends_on: depends_on:
- "database" - "database"
- "torrent" - "torrent"


services/request/.env.example → services/interface/.env.example View File


services/request/README.md → services/interface/README.md View File


services/request/nodemon.json → services/interface/nodemon.json View File


services/request/ormconfig.json → services/interface/ormconfig.json View File


services/request/package.json → services/interface/package.json View File


services/request/src/Application.ts → services/interface/src/Application.ts View File


services/request/src/common.ts → services/interface/src/common.ts View File


services/request/src/index.ts → services/interface/src/index.ts View File


services/request/src/services/DiscordBot.ts → services/interface/src/services/DiscordBot.ts View File


services/request/src/services/MovieSearch.ts → services/interface/src/services/MovieSearch.ts View File


services/request/src/services/WebServer/WebServer.ts → services/interface/src/services/WebServer/WebServer.ts View File


services/request/src/services/WebServer/middleware/auth.ts → services/interface/src/services/WebServer/middleware/auth.ts View File


services/request/src/services/WebServer/middleware/index.ts → services/interface/src/services/WebServer/middleware/index.ts View File


services/request/src/services/WebServer/requests/LinkDiscordRequest.ts → services/interface/src/services/WebServer/requests/LinkDiscordRequest.ts View File


services/request/src/services/WebServer/requests/LoginRequest.ts → services/interface/src/services/WebServer/requests/LoginRequest.ts View File


services/request/src/services/WebServer/requests/MovieSearchRequest.ts → services/interface/src/services/WebServer/requests/MovieSearchRequest.ts View File


services/request/src/services/WebServer/requests/RegisterRequest.ts → services/interface/src/services/WebServer/requests/RegisterRequest.ts View File


services/request/src/services/WebServer/requests/RequestImdbMovieRequest.ts → services/interface/src/services/WebServer/requests/RequestImdbMovieRequest.ts View File


services/request/src/services/WebServer/requests/RequestMovieRequest.ts → services/interface/src/services/WebServer/requests/RequestMovieRequest.ts View File


services/request/src/services/WebServer/requests/RequestTmdbMovieRequest.ts → services/interface/src/services/WebServer/requests/RequestTmdbMovieRequest.ts View File


services/request/src/services/WebServer/requests/index.ts → services/interface/src/services/WebServer/requests/index.ts View File


services/request/src/services/WebServer/routes/api.ts → services/interface/src/services/WebServer/routes/api.ts View File


services/request/src/services/WebServer/routes/auth.ts → services/interface/src/services/WebServer/routes/auth.ts View File


services/request/src/services/WebServer/routes/index.ts → services/interface/src/services/WebServer/routes/index.ts View File


services/request/src/services/WebServer/routes/web.ts → services/interface/src/services/WebServer/routes/web.ts View File


services/request/src/services/WebServer/validators.ts → services/interface/src/services/WebServer/validators.ts View File


services/request/src/services/WebSocketServer.ts → services/interface/src/services/WebSocketServer.ts View File


+ 15
- 0
services/interface/src/services/index.ts View File

@ -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
}

services/request/src/utils.ts → services/interface/src/utils.ts View File


services/request/tsconfig.json → services/interface/tsconfig.json View File


services/request/yarn.lock → services/interface/yarn.lock View File


services/seeker/README.md → services/manager/README.md View File


services/seeker/nodemon.json → services/manager/nodemon.json View File


services/seeker/ormconfig.json → services/manager/ormconfig.json View File


services/seeker/package.json → services/manager/package.json View File


services/seeker/src/index.ts → services/manager/src/index.ts View File


services/seeker/src/services/IpcInterface.ts → services/manager/src/services/IpcInterface.ts View File


services/seeker/src/services/PostProcessor/PostProcessor.ts → services/manager/src/services/PostProcessor/PostProcessor.ts View File


services/seeker/src/services/PostProcessor/index.ts → services/manager/src/services/PostProcessor/index.ts View File


services/seeker/src/services/Supervisor.ts → services/manager/src/services/Supervisor.ts View File


services/seeker/src/services/TorrentIpc.ts → services/manager/src/services/TorrentIpc.ts View File


services/seeker/src/services/TorrentManager.ts → services/manager/src/services/TorrentManager.ts View File


services/seeker/src/services/index.ts → services/manager/src/services/index.ts View File


services/seeker/src/typings/node-ipc/index.d.ts → services/manager/src/typings/node-ipc/index.d.ts View File


services/seeker/src/utils.ts → services/manager/src/utils.ts View File


services/seeker/tsconfig.json → services/manager/tsconfig.json View File


services/seeker/yarn.lock → services/manager/yarn.lock View File


+ 0
- 15
services/request/src/services/index.ts View File

@ -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
}

+ 1
- 1
services/webui/package.json View File

@ -14,7 +14,7 @@
"start:dev": "vite --host" "start:dev": "vite --host"
}, },
"dependencies": { "dependencies": {
"@autoplex-api/request": "^0.0.0",
"@autoplex-api/interface": "^0.0.0",
"@autoplex/restful": "^0.0.0", "@autoplex/restful": "^0.0.0",
"@autoplex/websocket-client": "^0.0.0", "@autoplex/websocket-client": "^0.0.0",
"@fortawesome/fontawesome-free": "^5.15.3", "@fortawesome/fontawesome-free": "^5.15.3",


+ 1
- 1
services/webui/src/app/components/MovieList.vue View File

@ -8,7 +8,7 @@
import { defineComponent } from "vue"; import { defineComponent } from "vue";
import MovieListItem from "./MovieListItem.vue"; import MovieListItem from "./MovieListItem.vue";
import MovieListComponentMixin from "./mixins/MovieListComponentMixin"; import MovieListComponentMixin from "./mixins/MovieListComponentMixin";
import { IMovie } from "@autoplex-api/request";
import { IMovie } from "@autoplex-api/interface";
export default defineComponent({ export default defineComponent({
components: { components: {


+ 1
- 1
services/webui/src/app/components/mixins/MovieListComponentMixin.ts View File

@ -1,4 +1,4 @@
import { IMovie } from "@autoplex-api/request";
import { IMovie } from "@autoplex-api/interface";
import { Action, Mutation } from "../../store"; import { Action, Mutation } from "../../store";
import { defineComponent } from "vue"; import { defineComponent } from "vue";


+ 1
- 1
services/webui/src/app/components/modals/MovieModal.vue View File

@ -64,7 +64,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import type { IMovieDetails } from "@autoplex-api/request";
import type { IMovieDetails } from "@autoplex-api/interface";
import { Status } from "@autoplex/restful"; import { Status } from "@autoplex/restful";
import { defineComponent } from "vue"; import { defineComponent } from "vue";
import { getAverageRgb } from "../../util"; import { getAverageRgb } from "../../util";


+ 1
- 1
services/webui/src/app/store/actions.ts View File

@ -1,4 +1,4 @@
import type { IApiResponse, IApiDataResponse, IMovie, IMovieDetails, IPaginatedResponse } from "@autoplex-api/request";
import type { IApiResponse, IApiDataResponse, IMovie, IMovieDetails, IPaginatedResponse } from "@autoplex-api/interface";
import { ActionTree } from "vuex"; import { ActionTree } from "vuex";
import { Actions } from "./generics"; import { Actions } from "./generics";
import { IState } from "./state"; import { IState } from "./state";


+ 1
- 1
services/webui/src/app/store/getters.ts View File

@ -1,4 +1,4 @@
import { IMovie } from "@autoplex-api/request";
import { IMovie } from "@autoplex-api/interface";
import { GetterTree } from "vuex"; import { GetterTree } from "vuex";
import { IState } from "./state"; import { IState } from "./state";


+ 1
- 1
services/webui/src/app/store/mutations.ts View File

@ -1,4 +1,4 @@
import { IMovie } from "@autoplex-api/request/dist/typings";
import { IMovie } from "@autoplex-api/interface/dist/typings";
import jwtDecode from "jwt-decode"; import jwtDecode from "jwt-decode";
import { MutationTree } from "vuex"; import { MutationTree } from "vuex";
import { IState } from "./state"; import { IState } from "./state";


+ 1
- 1
services/webui/src/app/store/state.ts View File

@ -1,4 +1,4 @@
import { IMovie } from "@autoplex-api/request";
import { IMovie } from "@autoplex-api/interface";
import { IUser } from "./schema"; import { IUser } from "./schema";
import Modal from "../components/modals"; import Modal from "../components/modals";


+ 1
- 1
services/webui/src/app/views/Dashboard.vue View File

@ -7,7 +7,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import type { IMovie, IMovieDetails } from "@autoplex-api/request";
import type { IMovie, IMovieDetails } from "@autoplex-api/interface";
import { Status } from "@autoplex/restful"; import { Status } from "@autoplex/restful";
import { Action } from "../store"; import { Action } from "../store";
import { defineComponent } from "vue"; import { defineComponent } from "vue";


+ 1
- 1
services/webui/src/app/views/Register.vue View File

@ -34,7 +34,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { ValidationConstraints as constraints } from "@autoplex-api/request";
import { ValidationConstraints as constraints } from "@autoplex-api/interface";
import { defineComponent, reactive } from "vue"; import { defineComponent, reactive } from "vue";
import CheckBox from "../components/CheckBox.vue"; import CheckBox from "../components/CheckBox.vue";
import TextBox from "../components/TextBox.vue"; import TextBox from "../components/TextBox.vue";


+ 1
- 1
services/webui/src/app/views/Search.vue View File

@ -14,7 +14,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import type { IMovie } from "@autoplex-api/request";
import type { IMovie } from "@autoplex-api/interface";
import { defineComponent } from "vue"; import { defineComponent } from "vue";
import MovieList from "../components/MovieList.vue"; import MovieList from "../components/MovieList.vue";
import { Action } from "../store"; import { Action } from "../store";


+ 1
- 1
services/webui/src/app/websocket.ts View File

@ -1,5 +1,5 @@
import { WebSocketClient as WSClient } from "@autoplex/websocket-client"; import { WebSocketClient as WSClient } from "@autoplex/websocket-client";
import { IMovieProgressResponse, WebSocketMethod } from "@autoplex-api/request";
import { IMovieProgressResponse, WebSocketMethod } from "@autoplex-api/interface";
import store, { Action } from "./store"; import store, { Action } from "./store";
class WebSocketClient extends WSClient class WebSocketClient extends WSClient


Loading…
Cancel
Save