Added download and reencoding progress to mongo

package-lock.json

@@ -22,6 +22,7 @@
         "webtorrent": "^1.5.8"
       },
       "devDependencies": {
+        "@types/handbrake-js": "^5.0.1",
         "@types/koa": "^2.13.4",
         "@types/koa__cors": "^3.1.1",
         "@types/koa-bodyparser": "^4.3.5",
@@ -290,6 +291,15 @@
         "@types/range-parser": "*"
       }
     },
+    "node_modules/@types/handbrake-js": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/handbrake-js/-/handbrake-js-5.0.1.tgz",
+      "integrity": "sha512-e9hUk3kSYYGeUCE4VjMPI6SKHUF3Y43PVPNwGgBhDcRJBFokhdx9YiHEgt28krJfb7pnerReasObRzHP0qI4vA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/http-assert": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.3.tgz",
@@ -7008,6 +7018,15 @@
         "@types/range-parser": "*"
       }
     },
+    "@types/handbrake-js": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/handbrake-js/-/handbrake-js-5.0.1.tgz",
+      "integrity": "sha512-e9hUk3kSYYGeUCE4VjMPI6SKHUF3Y43PVPNwGgBhDcRJBFokhdx9YiHEgt28krJfb7pnerReasObRzHP0qI4vA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/http-assert": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.3.tgz",

package.json

@@ -25,6 +25,7 @@
     "webtorrent": "^1.5.8"
   },
   "devDependencies": {
+    "@types/handbrake-js": "^5.0.1",
     "@types/koa": "^2.13.4",
     "@types/koa__cors": "^3.1.1",
     "@types/koa-bodyparser": "^4.3.5",

src/index.ts

@@ -34,11 +34,22 @@ router.post('/room', async (ctx) => {
           syncedAt: new Date(),
         };
         const doc = new RoomModel(room);
+
+        async function setDownloadProg() {
+          await RoomModel.updateOne({ id: room.id }, { 
+            downloadedProg: torrent.progress,
+          });
+        }
   
-        torrent.on('done', function () {
+        torrent
-          torrent.destroy();
+          .on('download', async () => {
-          processDownloaded(torrent, room.id);
+            setDownloadProg();
-        });
+          })
+          .on('done', async () => {
+            setDownloadProg();
+            torrent.destroy();
+            processDownloaded(torrent, room.id);
+          });
   
         await doc.save();
         ctx.body = room;
@@ -84,22 +95,11 @@ router.get('/status', async (ctx) => {
   const room = await RoomModel.findOne({ id: ctx.request.query.id }).exec();
 
   if (room) {
-    if (room.downloaded) {
+    ctx.body = {
-      ctx.body = {
+      downloadedProg: room.downloadedProg,
-        progress: 1,
+      reencodedProg: room.reencodedProg,
-        downloaded: room.downloaded,
+      downloaded: room.downloaded,
-      };
+    };
-    } else {
-      const torrent = tCli.get(room.magnet);
-      if (torrent) {
-        ctx.body = {
-          progress: (torrent as WebTorrent.Torrent).progress,
-          downloaded: room.downloaded,
-        };
-      } else {
-        ({ status: ctx.status, body: ctx.body } = errorResponse('status-00', 'No torrent found'));
-      }
-    }
   } else {
     ({ status: ctx.status, body: ctx.body } = errorResponse('status-01', 'No room found'));
   }

src/interfaces.ts

@@ -6,6 +6,8 @@ export interface Room {
   createdAt: Date;
   movie?: string;
   filename?: string;
+  downloadedProg?: number;
+  reencodedProg?: number;
   downloaded?: boolean;
   downloadedAt?: Date;
   position: number;
@@ -19,6 +21,8 @@ export const roomSchema = new Schema<Room>({
   movie: { type: String, required: false },
   filename: { type: String, required: false },
   downloaded: { type: Boolean, required: false },
+  downloadedProg: { type: Number, required: false },
+  reencodedProg: { type: Number, required: false },
   downloadedAt: { type: Date, required: false },
   position: { type: Number, required: true },
   syncedAt: { type: Date, required: true },

src/processDownloaded.ts

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import mv from 'mv';
+import { spawn } from 'handbrake-js';
 import type short from 'short-uuid';
 import type WebTorrent from 'webtorrent';
 import { model } from 'mongoose';
@@ -8,18 +9,38 @@ import { Room, roomSchema } from './interfaces';
 
 const RoomModel = model<Room>('Room', roomSchema);
 
+function deleteTemp(torrent: WebTorrent.Torrent) {
+  fs.rmSync(__dirname + '/../' + torrent.path + '/' + torrent.name, { recursive: true });
+}
+
 export default function (torrent: WebTorrent.Torrent, id: short.SUUID) {
-  const extensionsRegEx = /(\.mp4|\.mkv)$/;
+  const extensionsRegEx = /(\.mp4|\.mkv|\.avi)$/;
-  findInDir(torrent.path, extensionsRegEx, (filename: string) => {
+  findInDir(torrent.path, extensionsRegEx, async (filename: string) => {
-    const extension = filename.split('.').pop();
+    const originalExtension = filename.split('.').pop();
-    mv(`./${filename}`, `${process.env.FILES}/${id}.${extension}`, async () => {
+    const extension = '.mp4';
-      await RoomModel.updateOne({ id: id }, { 
+    const outputLocation = `${process.env.FILES}/${id}.${extension}`;
-        filename: id + '.' + extension,
+
-        downloaded: true,
+    if (originalExtension !== 'mp4') {
-        downloadedAt: new Date(),
+      spawn({ input: filename, output: outputLocation })
+        .on('error', console.error)
+        .on('progress', async (progress) => {
+          await RoomModel.updateOne({ id: id }, { 
+            reencodedProg: progress.percentComplete / 100,
+          });
+        })
+        .on('complete', () => {
+          deleteTemp(torrent);
+        });
+    } else {
+      mv(filename, outputLocation, async () => {
+        await RoomModel.updateOne({ id: id }, { 
+          filename: id + '.' + extension,
+          downloaded: true,
+          downloadedAt: new Date(),
+        });
+        
+        deleteTemp(torrent);
       });
-      
+    }
-      fs.rmSync(__dirname + '/../' + torrent.path + '/' + torrent.name, { recursive: true });
-    });
   });
 }