Converted Seeker uses database package. Adjust environment variables for UID and GID

.env.example

@@ -1,5 +1,5 @@
-UID=1000
-GID=1000
+USER_ID=1000
+GROUP_ID=1000
 
 DOCKER_BUILDKIT=1
 COMPOSE_DOCKER_CLI_BUILD=1

docker-compose.yml

@@ -25,7 +25,7 @@ services:
       - tmdb_key
       - tvdb_key
       - tvdb_pin
-    user: ${UID}:${GID}
+    user: ${USER_ID}:${GROUP_ID}
     volumes:
       - var:/var/autoplex
 
@@ -45,7 +45,7 @@ services:
     restart: unless-stopped
     secrets:
       - mysql_root_password
-    user: ${UID}:${GID}
+    user: ${USER_ID}:${GROUP_ID}
     volumes:
       - var:/var/autoplex
 
@@ -66,7 +66,7 @@ services:
       - 3300:3300
     secrets:
       - mysql_root_password
-    user: ${UID}:${GID}
+    user: ${USER_ID}:${GROUP_ID}
     volumes:
       - var:/var/autoplex
 
@@ -91,7 +91,7 @@ services:
     restart: unless-stopped
     secrets:
       - mysql_root_password
-    user: ${UID}:${GID}
+    user: ${USER_ID}:${GROUP_ID}
     volumes:
       - var:/var/autoplex
 

packages/database/src/entities/MovieTicket.ts

@@ -43,6 +43,14 @@ export class MovieTicket extends BaseEntity
 	@JoinColumn()
 	info!: MovieInfo | null;
 
+	/**
+	 * Fulfill the current ticket instance
+	 */
+	async fulfill() {
+		this.isFulfilled = true;
+		return await this.save();
+	}
+
 	/**
 	 * @TODO This needs to check for fulfilled tickets too, but not there yet
 	 * Fetch all active ticket ID's

services/seeker/package.json

@@ -21,6 +21,8 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
+    "@autoplex/database": "^0.0.0",
+    "@autoplex/utils": "^0.0.0",
     "cheerio": "^1.0.0-rc.6",
     "diskusage": "^1.1.3",
     "mysql": "^2.18.1",

services/seeker/src/database/entities/MovieInfo.ts

@@ -1,23 +0,0 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
-
-@Entity()
-export class MovieInfo extends BaseEntity
-{
-	@PrimaryGeneratedColumn()
-	id!: number;
-
-	@Column({ type: "text", nullable: true })
-	overview!: string | null;
-
-	@Column({ type: "int", nullable: true })
-	runtime!: number | null;
-
-	@Column({ type: "char", length: 10, nullable: true })
-	releaseDate!: string | null;
-
-	@Column({ type: "varchar", length: 32, nullable: true })
-	backdropPath!: string | null;
-
-	@Column({ type: "varchar", length: 32, nullable: true })
-	posterPath!: string | null;
-}

services/seeker/src/database/entities/MovieQuota.ts

@@ -1,11 +0,0 @@
-import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from "typeorm";
-
-@Entity()
-export class MovieQuota extends BaseEntity
-{
-	@PrimaryGeneratedColumn()
-	id!: number;
-
-	@Column({ default: 5 })
-	moviesPerWeek!: number;
-}

services/seeker/src/database/entities/MovieTicket.ts

@@ -1,53 +0,0 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, ManyToOne, OneToMany, OneToOne, JoinColumn, CreateDateColumn, Not, IsNull } from "typeorm";
-import { MovieInfo } from "./MovieInfo";
-import { MovieTorrent } from "./MovieTorrent";
-import { User } from "./User";
-
-@Entity()
-export class MovieTicket extends BaseEntity
-{
-	@PrimaryGeneratedColumn()
-	id!: number;
-
-	@Column({ type: "int", nullable: true })
-	tmdbId!: number | null;
-
-	@Column({ type: "varchar", length: 27, nullable: true })
-	imdbId!: string | null;
-
-	@Column({ type: "varchar" })
-	title!: string;
-
-	@Column({ type: "year", nullable: true })
-	year!: number | null;
-
-	@CreateDateColumn()
-	createdAt!: Date;
-
-	@Column({ default: false })
-	isFulfilled!: boolean;
-
-	@Column({ default: false })
-	isCanceled!: boolean;
-
-	@Column({ default: false })
-	isStale!: boolean;
-
-	@ManyToOne(() => User, user => user.movieTickets)
-	user!: User;
-
-	@OneToMany(() => MovieTorrent, torrent => torrent.movieTicket)
-	torrents!: MovieTorrent[];
-
-	@OneToOne(() => MovieInfo, { nullable: true })
-	@JoinColumn()
-	info!: MovieInfo | null;
-
-	/**
-	 * Fulfill the current ticket instance
-	 */
-	async fulfill() {
-		this.isFulfilled = true;
-		return await this.save();
-	}
-}

services/seeker/src/database/entities/MovieTorrent.ts

@@ -1,18 +0,0 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, ManyToOne } from "typeorm";
-import { MovieTicket } from "./MovieTicket";
-
-@Entity()
-export class MovieTorrent extends BaseEntity
-{
-	@PrimaryGeneratedColumn()
-	id!: number;
-
-	@Column()
-	infoHash!: string;
-
-	@Column()
-	diskName!: string;
-
-	@ManyToOne(() => MovieTicket, ticket => ticket.torrents)
-	movieTicket!: MovieTicket;
-}

services/seeker/src/database/entities/RegisterToken.ts

@@ -1,39 +0,0 @@
-import { randomBytes } from "crypto";
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
-
-@Entity()
-export class RegisterToken extends BaseEntity
-{
-	@PrimaryGeneratedColumn()
-	id!: number;
-
-	@Column()
-	token!: string
-
-	/**
-	 * Check if the provided token is valid
-	 */
-	public static async isValid(token: string) {
-		if (typeof token !== "string") {
-			return false;
-		}
-		return Boolean(token) && await RegisterToken.count({token}) > 0;
-	}
-
-	/**
-	 * Create a new registration token and insert it into the database
-	 */
-	public static generate() {
-		return new Promise<RegisterToken>((resolve, reject) => {
-			randomBytes(48, async (err, result) => {
-				if (err) {
-					reject(err);
-				} else {
-					let token = new RegisterToken();
-					token.token = result.toString("hex");
-					resolve(await token.save());
-				}
-			});
-		});
-	}
-}

services/seeker/src/database/entities/User.ts

@@ -1,32 +0,0 @@
-import { Entity, PrimaryGeneratedColumn, Column, BaseEntity, OneToMany, OneToOne, JoinColumn, CreateDateColumn, MoreThanOrEqual } from "typeorm";
-import { MovieTicket } from "./MovieTicket";
-import { MovieQuota } from "./MovieQuota";
-
-@Entity()
-export class User extends BaseEntity
-{
-	@PrimaryGeneratedColumn()
-	id!: number;
-
-	@Column()
-	isAdmin!: boolean;
-
-	@Column({ length: 50 })
-	name!: string;
-
-	@Column({ length: 255 })
-	email!: string;
-
-	@Column({ type: "char", length: 60 })
-	password!: string;
-
-	@CreateDateColumn()
-	createdAt!: Date;
-
-	@OneToOne(() => MovieQuota, { nullable: true })
-	@JoinColumn()
-	quota!: MovieQuota | null;
-
-	@OneToMany(() => User, user => user.movieTickets)
-	movieTickets!: MovieTicket[];
-}

services/seeker/src/database/entities/index.ts

@@ -1,6 +0,0 @@
-export * from "./MovieInfo";
-export * from "./MovieQuota";
-export * from "./MovieTicket";
-export * from "./MovieTorrent";
-export * from "./RegisterToken";
-export * from "./User";

services/seeker/src/services/Database.ts

@@ -1,7 +1,7 @@
-import { Connection, createConnection } from "typeorm";
-import * as entities from "../database/entities";
+import { Connection } from "typeorm";
+import connectToDatabase from "@autoplex/database";
+import { env, secret } from "@autoplex/utils";
 import Service from "./Service";
-import { readFile } from "fs/promises";
 import Application from "../Application";
 
 export default class Database extends Service
@@ -22,22 +22,12 @@ export default class Database extends Service
 	 * Boot the database service
 	 */
 	public async boot() {
-		// Fetch the database password from the secret file
-		let password = (await readFile(<string>process.env["DB_PASSWORD_FILE"])).toString().trim();
-
-		// Create the database connection
-		await createConnection({
-			type       : <"mysql" | "mariadb">process.env["DB_TYPE"],
-			host       : process.env["DB_HOST"],
-			port       : parseInt(<string>process.env["DB_PORT"]),
-			username   : process.env["DB_USER"],
-			password   : password,
-			database   : process.env["DB_DATABASE"],
-			// synchronize: process.env["NODE_ENV"] != "production",
-			synchronize: false,
-			entities   : Object.values(entities),
-			migrations : ["src/migrations/*.ts"]
-		});
+		let host     = env("DB_HOST");
+		let port     = parseInt(env("DB_PORT"));
+		let username = env("DB_USER");
+		let password = await secret(env("DB_PASSWORD_FILE"));
+		let database = env("DB_DATABASE");
+		this.connection = await connectToDatabase(host, port, username, password, database);
 	}
 
 	/**

services/seeker/src/services/IpcInterface.ts

@@ -4,9 +4,8 @@ import { mkdir } from "fs/promises";
 import { dirname } from "path";
 import Service from "./Service";
 import Application from "../Application";
-import MovieSearch from "./MovieSearch";
 import Supervisor from "./Supervisor";
-import { MovieTicket } from "../database/entities";
+import { MovieTicket } from "@autoplex/database";
 
 export default class IpcInterface extends Service
 {

services/seeker/src/services/MovieSearch.ts

@@ -1,5 +1,5 @@
 import Application from "../Application";
-import { MovieTicket } from "../database/entities";
+import { MovieTicket } from "@autoplex/database";
 import * as providerClasses from "../torrents";
 import Provider, { MediaType } from "../torrents/providers/Provider";
 import Torrent from "../torrents/Torrent";

services/seeker/src/services/PostProcessor/PostProcessor.ts

@@ -1,7 +1,7 @@
 import { link, mkdir } from "fs/promises";
 import { dirname, extname } from "path";
 import Application from "../../Application";
-import { MovieTicket, MovieTorrent } from "../../database/entities";
+import { MovieTicket, MovieTorrent } from "@autoplex/database";
 import Service from "../Service";
 import { ISerializedTorrent } from "../TorrentManager/TorrentClientIpc";
 import { safeTitleFileName } from "../../utils";

services/seeker/src/services/Supervisor.ts

@@ -1,5 +1,5 @@
 import Application from "../Application";
-import { MovieTicket, MovieTorrent } from "../database/entities";
+import { MovieTicket, MovieTorrent } from "@autoplex/database";
 import MovieSearch from "./MovieSearch";
 import PostProcessor from "./PostProcessor";
 import Service from "./Service";

services/seeker/src/services/TorrentManager/TorrentManager.ts

@@ -1,7 +1,7 @@
 import diskusage from "diskusage";
 import { readdir } from "fs/promises";
 import Application from "../../Application"
-import { MovieTicket, MovieTorrent } from "../../database/entities";
+import { MovieTicket, MovieTorrent } from "@autoplex/database";
 import Supervisor from "../Supervisor";
 import TorrentClientIpc, { TorrentClientConnectionError } from "./TorrentClientIpc"
 

services/seeker/src/torrents/Torrent.ts

@@ -1,4 +1,4 @@
-import { MovieTicket } from "../database/entities";
+import { MovieTicket } from "@autoplex/database";
 import { ITorrentMetaInfo, parseMovieTorrentName } from "./parsing";
 
 export default class Torrent

services/seeker/src/torrents/providers/Provider.ts

@@ -1,4 +1,4 @@
-import { MovieTicket } from "../../database/entities";
+import { MovieTicket } from "@autoplex/database";
 import Torrent from "../Torrent";
 
 /**

services/seeker/src/torrents/providers/torrentgalaxy/index.ts

@@ -1,4 +1,4 @@
-import { MovieTicket } from "../../../database/entities";
+import { MovieTicket } from "@autoplex/database";
 import Provider, { MediaType } from "../Provider";
 import Torrent from "../../Torrent";
 import { search, Sort } from "./search";