Merge pull request #15 from pct-org/improvements

Improvements

Author: TriPSs

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Conventional Changelog Action
+        uses: TriPSs/conventional-changelog-action@v3
+        id: changelog
+        with:
+          github-token: ${{ secrets.github_token }}
+
+      - name: Create Release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.github_token }}
+        with:
+          tag_name: ${{ steps.changelog.outputs.tag }}
+          release_name: ${{ steps.changelog.outputs.tag }}
+          body: ${{ steps.changelog.outputs.clean_changelog }}

apps/api/src/shared/config/config.service.ts

@@ -1,5 +1,6 @@
 import { LogLevel } from '@nestjs/common'
 import * as Joi from '@hapi/joi'
+import { version } from '@pct-org/version'
 
 export interface EnvConfig {
   [key: string]: string;
@@ -38,6 +39,10 @@ export class ConfigService {
     return this.envConfig[key] || ''
   }
 
+  get version(): string {
+    return version
+  }
+
   /**
    * Get the correct formatted database uri
    */
@@ -114,10 +119,13 @@ export class ConfigService {
         .default(1),
 
       [ConfigService.MAX_CONNS]: Joi.number()
-        .default(35),
+        .default(35)
     })
 
-    const { error, value: validatedEnvConfig } = envVarsSchema.validate(envConfig, { stripUnknown: true })
+    const {
+      error,
+      value: validatedEnvConfig
+    } = envVarsSchema.validate(envConfig, { stripUnknown: true })
 
     if (error) {
       throw new Error(`Config validation error: ${error.message}`)

apps/api/src/status/status.service.ts

@@ -41,7 +41,7 @@ export class StatusService {
     const sizePercentage = parseFloat((((disk.total - disk.available - folderSize) / disk.total) * 100).toFixed(2))
 
     return {
-      version: 'unknown', // TODO:: Get git tag
+      version: this.configService.version,
       totalMovies: await this.movieModel.countDocuments(),
       totalShows: await this.showModel.countDocuments(),
       totalEpisodes: await this.episodesModel.countDocuments(),

apps/api/src/watch/watch.controller.ts

@@ -135,9 +135,7 @@ export class WatchController {
       torrent.file.createReadStream(streamOptions)
     }
 
-    const readStream = fs.createReadStream(mediaFile, streamOptions)
-
-    res.send(readStream)
+    res.send(fs.createReadStream(mediaFile, streamOptions))
   }
 
 }

apps/scraper/src/routes/status/status.controller.ts

@@ -2,12 +2,17 @@ import { Controller, Get, Inject, OnApplicationBootstrap } from '@nestjs/common'
 import { SchedulerRegistry } from '@nestjs/schedule'
 import { formatMsToRemaining } from '@pct-org/torrent/utils'
 
+import { ConfigService } from '../../shared/config/config.service'
+
 @Controller()
 export class StatusController implements OnApplicationBootstrap {
 
   @Inject()
   private schedulerRegistry: SchedulerRegistry
 
+  @Inject()
+  private configService: ConfigService
+
   private bootedSince: number
 
   public onApplicationBootstrap(): void {
@@ -20,7 +25,7 @@ export class StatusController implements OnApplicationBootstrap {
 
     return {
       status: 'ok',
-      version: 'beta',
+      version: this.configService.version,
       updated: cron.lastDate() || 'never',
       nextUpdate: cron.nextDates(),
       uptime: formatMsToRemaining(Date.now() - this.bootedSince)

apps/scraper/src/shared/config/config.service.ts

@@ -1,5 +1,6 @@
 import { LogLevel } from '@nestjs/common'
 import * as Joi from '@hapi/joi'
+import { version } from '@pct-org/version'
 
 export interface EnvConfig {
   [key: string]: string;
@@ -37,6 +38,10 @@ export class ConfigService {
     return this.envConfig[key] || ''
   }
 
+  get version(): string {
+    return version
+  }
+
   /**
    * Get the correct formatted database uri
    */
@@ -102,8 +107,7 @@ export class ConfigService {
       [ConfigService.TMDB_KEY]: Joi.string()
         .required(),
 
-      [ConfigService.TVDB_KEY]: Joi.string()
-        .required(),
+      [ConfigService.TVDB_KEY]: Joi.string(),
 
       [ConfigService.OMDB_KEY]: Joi.string()
         .required(),
@@ -114,7 +118,10 @@ export class ConfigService {
       [ConfigService.SCRAPE_ON_START]: Joi.boolean()
     })
 
-    const { error, value: validatedEnvConfig } = envVarsSchema.validate(envConfig, { stripUnknown: true })
+    const {
+      error,
+      value: validatedEnvConfig
+    } = envVarsSchema.validate(envConfig, { stripUnknown: true })
 
     if (error) {
       throw new Error(`Config validation error: ${error.message}`)

ecosystem.config.example.js

@@ -60,12 +60,12 @@ module.exports = {
       error_file: `${logsDir}/api/error.log`,
       out_file: `${logsDir}/api/out.log`,
       log_file: null,
-      env: sharedEnv
+      env: sharedEnv,
     },
     {
       name: 'Scraper',
       script: 'dist/apps/scraper/main.js',
-      args: '-m pretty',
+      node_args: '--max-old-space-size=3072',
       instances: 1,
       max_restarts: 5,
       autorestart: true,
@@ -83,22 +83,5 @@ module.exports = {
         TEMP_DIR: `${logsDir}/`,
       },
     },
-    // Enable this if you want auto updates
-    // {
-    //   name: 'Updater',
-    //   cwd: 'updater',
-    //   script: 'dist/updater.js',
-    //   instances: 1,
-    //   max_restarts: 5,
-    //   autorestart: true,
-    //   watch: false,
-    //   error_file: `${logsDir}/updater.log`,
-    //   out_file: `${logsDir}/updater.log`,
-    //   log_file: null,
-    //   env: {
-    //     // The time between cronjobs.
-    //     CRON_TIME: '0 0 * * *',
-    //   },
-    // },
   ],
 }

install-scripts/ubuntu-server.sh

@@ -4,9 +4,8 @@ set -e
 echo "Installing essential tools..."
 sudo apt-get install -y \
   git \
-  curl
-
-sudo apt install build-essential
+  curl \
+  build-essential
 
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
 export NVM_DIR="$HOME/.nvm"
@@ -32,7 +31,7 @@ sudo systemctl status mongod
 curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
 echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
 
-sudo apt-get update && sudo apt-get install yarn
+sudo apt-get update && sudo apt-get install yarn -y
 
 echo "Create directory..."
 sudo mkdir -p /pct-org

package.json

@@ -50,8 +50,8 @@
   "dependencies": {
     "@hapi/joi": "17.1.1",
     "@nestjs/cli": "7.5.4",
-    "@nestjs/common": "7.6.1",
-    "@nestjs/core": "7.6.1",
+    "@nestjs/common": "7.6.4",
+    "@nestjs/core": "7.6.4",
     "@nestjs/graphql": "^7.7.0",
     "@nestjs/mongoose": "7.2.0",
     "@nestjs/platform-fastify": "7.0.9",
@@ -79,7 +79,7 @@
     "opensubtitles-api": "^5.1.2",
     "p-map": "^4.0.0",
     "p-times": "^3.0.0",
-    "pm2": "^4.5.0",
+    "pm2": "^4.5.1",
     "reflect-metadata": "^0.1.12",
     "rimraf": "3.0.2",
     "rxjs": "6.6.3",
@@ -94,22 +94,22 @@
   },
   "devDependencies": {
     "@nestjs/schematics": "^7.2.5",
-    "@nestjs/testing": "^7.6.1",
-    "@nrwl/eslint-plugin-nx": "11.0.4",
-    "@nrwl/jest": "11.0.4",
-    "@nrwl/nest": "^11.0.4",
-    "@nrwl/node": "11.0.4",
-    "@nrwl/workspace": "11.0.4",
+    "@nestjs/testing": "^7.6.4",
+    "@nrwl/eslint-plugin-nx": "11.0.16",
+    "@nrwl/jest": "11.0.16",
+    "@nrwl/nest": "^11.0.16",
+    "@nrwl/node": "11.0.16",
+    "@nrwl/workspace": "11.0.16",
     "@types/cheerio": "^0.22.23",
     "@types/jest": "26.0.19",
     "@types/mongoose": "^5.10.3",
-    "@types/node": "~14.14.13",
+    "@types/node": "~14.14.14",
     "@types/webtorrent": "^0.109.0",
-    "@typescript-eslint/eslint-plugin": "4.10.0",
-    "@typescript-eslint/parser": "4.10.0",
+    "@typescript-eslint/eslint-plugin": "4.11.0",
+    "@typescript-eslint/parser": "4.11.0",
     "dotenv": "6.2.0",
-    "eslint": "7.15.0",
-    "eslint-config-prettier": "7.0.0",
+    "eslint": "7.16.0",
+    "eslint-config-prettier": "7.1.0",
     "jest": "26.6.3",
     "prettier": "2.2.1",
     "ts-jest": "26.4.4",

tsconfig.base.json

@@ -63,7 +63,8 @@
       "@pct-org/types/shared": ["libs/types/shared/src/index.ts"],
       "@pct-org/types/blacklist": ["libs/types/blacklist/src/index.ts"],
       "@pct-org/types/download": ["libs/types/download/src/index.ts"],
-      "@pct-org/types/image": ["libs/types/image/src/index.ts"]
+      "@pct-org/types/image": ["libs/types/image/src/index.ts"],
+      "@pct-org/version": ["./package.json"]
     }
   },
   "exclude": ["node_modules", "tmp"]