Merge pull request #16 from pct-org/improvements

Improvements

Author: TriPSs

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

@@ -5,6 +5,8 @@ import { Controller, Get, Res, Req, Param, Logger, Inject } from '@nestjs/common
 import { ConfigService } from '../shared/config/config.service'
 import { TorrentService } from '../shared/torrent/torrent.service'
 
+export type Files = [{ stats: fs.Stats, fileName: string }]
+
 @Controller()
 export class WatchController {
 
@@ -24,14 +26,17 @@ export class WatchController {
     const filesInDirectory = fs.readdirSync(dir, { withFileTypes: true })
 
     const files = filesInDirectory.map((file) => {
-      const res = path.resolve(dir, file.name)
+      const fileName = path.resolve(dir, file.name)
 
       return file.isDirectory()
-        ? this.getFiles(res)
-        : res
+        ? this.getFiles(fileName)
+        : {
+          stats: fs.statSync(fileName),
+          fileName
+        }
     })
 
-    return Array.prototype.concat(...files)
+    return Array.prototype.concat(...files) as Files
   }
 
   @Get('watch/:_id')
@@ -57,13 +62,13 @@ export class WatchController {
     }
 
     // Get the correct media file
-    const mediaFile = files.reduce((previous, current, index) => {
-      const formatIsSupported = !!this.torrentService.supportedFormats.find(format => (
-        current.includes(format) && !current.includes('transcoding')
+    const mediaFile = files.reduce((previous, current) => {
+      const formatIsSupported = !!this.torrentService.supportedFormats.find((format) => (
+        current.fileName.includes(format)
       ))
 
       if (formatIsSupported) {
-        if (!previous || current.length > previous.length) {
+        if (!previous || current.stats.size > previous.stats.size) {
           return current
         }
       }
@@ -84,7 +89,7 @@ export class WatchController {
     const isChromeCast = req?.query?.device === 'chromecast' ?? false
 
     // Get the size of the media file
-    let { size: mediaSize } = fs.statSync(mediaFile)
+    let mediaSize = mediaFile.stats.size
 
     // If it its Chromecast and we have a torrent then use the file size from that
     if (isChromeCast && torrent) {
@@ -135,7 +140,7 @@ export class WatchController {
       torrent.file.createReadStream(streamOptions)
     }
 
-    res.send(fs.createReadStream(mediaFile, streamOptions))
+    res.send(fs.createReadStream(mediaFile.fileName, streamOptions))
   }
 
 }

package.json

@@ -42,11 +42,6 @@
     "update": "nx migrate latest",
     "workspace-schematic": "nx workspace-schematic"
   },
-  "resolutions": {
-    "webtorrent": "0.111.0",
-    "webtorrent-cli": "3.0.7",
-    "wrtc": "0.4.5"
-  },
   "dependencies": {
     "@hapi/joi": "17.1.1",
     "@nestjs/cli": "7.5.4",
@@ -63,23 +58,23 @@
     "class-transformer": "^0.3.1",
     "class-validator": "0.12.2",
     "cron-parser": "^2.18.0",
-    "debug": "^4.3.1",
+    "debug": "^4.3.2",
     "diskusage": "^1.1.3",
     "dotenv": "8.2.0",
     "fanart.tv-api": "^2.0.1",
     "fastify-static": "2.7.0",
     "get-folder-size": "^2.0.1",
-    "got": "^11.8.1",
-    "graphql": "15.4.0",
-    "graphql-subscriptions": "^1.1.0",
+    "got": "^11.8.2",
+    "graphql": "15.5.1",
+    "graphql-subscriptions": "^1.2.1",
     "ical-generator": "^1.15.3",
     "mongoose": "5.10.15",
     "node-tvdb": "^4.1.0",
     "omdb-api-pt": "^2.0.1",
     "opensubtitles-api": "^5.1.2",
     "p-map": "^4.0.0",
     "p-times": "^3.0.0",
-    "pm2": "^4.5.1",
+    "pm2": "^5.1.1",
     "reflect-metadata": "^0.1.12",
     "rimraf": "3.0.2",
     "rxjs": "6.6.3",
@@ -88,7 +83,7 @@
     "tmdb": "^2.6.0",
     "trakt.tv": "^8.0.0",
     "url": "^0.11.0",
-    "webtorrent-hybrid": "^4.0.3",
+    "webtorrent-hybrid": "^4.1.3",
     "xtorrent": "^1.0.0",
     "yts-api-pt": "^2.0.0"
   },
@@ -104,17 +99,17 @@
     "@types/jest": "26.0.19",
     "@types/mongoose": "^5.10.3",
     "@types/node": "~14.14.14",
-    "@types/webtorrent": "^0.109.0",
-    "@typescript-eslint/eslint-plugin": "4.11.0",
-    "@typescript-eslint/parser": "4.11.0",
+    "@types/webtorrent": "^0.109.1",
+    "@typescript-eslint/eslint-plugin": "4.29.3",
+    "@typescript-eslint/parser": "4.29.3",
     "dotenv": "6.2.0",
-    "eslint": "7.16.0",
+    "eslint": "7.32.0",
     "eslint-config-prettier": "7.1.0",
     "jest": "26.6.3",
     "prettier": "2.2.1",
     "ts-jest": "26.4.4",
     "ts-node": "~9.1.1",
     "tslint": "~6.1.3",
-    "typescript": "~4.1.3"
+    "typescript": "~4.3.5"
   }
 }