✔ HiH

bifeldy · Oct 11, 2023 · 1bc1c54 · 1bc1c54
1 parent f6b7c4f
commit 1bc1c54
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 24 deletions.
diff --git a/dist/fansubid/browser/ngsw.json b/dist/fansubid/browser/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1697048301473,
+  "timestamp": 1697053038204,
   "index": "/index.html",
   "assetGroups": [
     {

diff --git a/dist/fansubid/server/main.js b/dist/fansubid/server/main.js
diff --git a/src/api/main.ts b/src/api/main.ts
@@ -115,9 +115,9 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
           cluster.on('exit', (worker, code, signal) => {
             let msg = `[WORKER_${worker.id}]`;
             if (signal) {
-              gs.log(`${msg} Killed`, signal);
+              gs.log(`${msg} Killed`, signal, 'error');
             } else {
-              gs.log(`${msg} Exited`, code);
+              gs.log(`${msg} Exited`, code, 'error');
             }
           });
         } else {

diff --git a/src/api/scheduler/rss-feed-tasks.service.ts b/src/api/scheduler/rss-feed-tasks.service.ts
@@ -106,7 +106,7 @@ export class RssFeedTasksService {
   /** */
 
   @Cron(
-    CronExpression.EVERY_30_MINUTES,
+    CronExpression.EVERY_HOUR,
     {
       name: CONSTANTS.cronFansubRssFeed
     }
@@ -128,8 +128,8 @@ export class RssFeedTasksService {
             updated_at: 'DESC'
           }
         });
-        const rgx = new RegExp(CONSTANTS.regexUrl);
         for (const fs of fansubs) {
+          const rgx = new RegExp(CONSTANTS.regexUrl);
           if (fs.rss_feed.match(rgx)) {
             try {
               const feed = await this.getFeedByUrl(fs.rss_feed);
@@ -161,6 +161,8 @@ export class RssFeedTasksService {
       const elapsedTime = endTime.getTime() - startTime.getTime();
       this.gs.log('[CRON_TASK_FANSUB_RSS_FEED-END] 🐾', `${endTime} @ ${elapsedTime} ms`);
       job.start();
+    } else {
+      this.sr.getCronJob(CONSTANTS.cronFansubRssFeed).stop();
     }
   }
 

diff --git a/src/api/scheduler/sitemap-tasks.service.ts b/src/api/scheduler/sitemap-tasks.service.ts
@@ -93,7 +93,7 @@ export class SitemapService {
   }
 
   @Cron(
-    CronExpression.EVERY_HOUR,
+    CronExpression.EVERY_30_MINUTES,
     {
       name: CONSTANTS.cronSitemap
     }
@@ -140,6 +140,8 @@ export class SitemapService {
       const elapsedTime = endTime.getTime() - startTime.getTime();
       this.gs.log('[CRON_TASK_SITEMAP-END] 🐾', `${endTime} @ ${elapsedTime} ms`);
       job.start();
+    } else {
+      this.sr.getCronJob(CONSTANTS.cronSitemap).stop();
     }
   }
 

diff --git a/src/api/scheduler/tracker-statistics-tasks.service.ts b/src/api/scheduler/tracker-statistics-tasks.service.ts
@@ -67,19 +67,21 @@ export class TrackerStatisticsService {
       const startTime = new Date();
       this.gs.log('[CRON_TASK_TRACKER_STATISTICS-START] 🐾', `${startTime}`);
       try {
-        const url = new URL(`http://tracker.${environment.domain}/stats.json`);
+        const url = new URL(`http://tracker.fansub.id/stats.json`);
         const res_raw = await this.api.getData(url, {
           ...environment.nodeJsXhrHeader
         });
         this.torrentTracker = await res_raw.json();
+        this.updateVisitor();
       } catch (error) {
         this.gs.log('[CRON_TASK_TRACKER_STATISTICS-ERROR] 🐾', error, 'error');
       }
-      this.updateVisitor();
       const endTime = new Date();
       const elapsedTime = endTime.getTime() - startTime.getTime();
       this.gs.log('[CRON_TASK_TRACKER_STATISTICS-END] 🐾', `${endTime} @ ${elapsedTime} ms`);
       job.start();
+    } else {
+      this.sr.getCronJob(CONSTANTS.cronTrackerStatistics).stop();
     }
   }
 

diff --git a/src/api/scheduler/upload-task.service.ts b/src/api/scheduler/upload-task.service.ts
@@ -35,7 +35,7 @@ export class UploadService {
     //
   }
 
-  async uploadSubtitleAndFont(mkvAttachment: AttachmentModel) {
+  async uploadSubtitleAndFont(mkvAttachment: AttachmentModel): Promise<void> {
     const files = readdirSync(`${environment.uploadFolder}`, { withFileTypes: true });
     const fIdx = files.findIndex(f => f.name === mkvAttachment.name || f.name === `${mkvAttachment.name}.${mkvAttachment.ext}`);
     if (fIdx >= 0) {
@@ -84,12 +84,13 @@ export class UploadService {
     }
   }
 
-  async extractAndUploadVideoAndZip(attachment: AttachmentModel) {
+  async extractAndUploadVideoAndZip(attachment: AttachmentModel): Promise<void> {
     const files = readdirSync(`${environment.uploadFolder}`, { withFileTypes: true });
     const fIdx = files.findIndex(f => f.name === attachment.name || f.name === `${attachment.name}.${attachment.ext}`);
     if (fIdx >= 0) {
       if (attachment.ext === 'mkv') {
         try {
+          this.gs.log('[FILE_SUBTITLE_FONT-EXTRACT_MULAI] 🎼', attachment.name, 'error');
           const extractedFiles = await this.mkv.mkvExtract(attachment.name, `${environment.uploadFolder}/${files[fIdx].name}`);
           for (const ef of extractedFiles) {
             const fileNameExt = ef.name.split('.');
@@ -250,6 +251,8 @@ export class UploadService {
       const elapsedTime = endTime.getTime() - startTime.getTime();
       this.gs.log('[CRON_TASK_UPLOAD-END] 🐾', `${endTime} @ ${elapsedTime} ms`);
       job.start();
+    } else {
+      this.sr.getCronJob(CONSTANTS.cronUpload).stop();
     }
   }
 

diff --git a/src/api/scheduler/vps-billing-task.service.ts b/src/api/scheduler/vps-billing-task.service.ts
@@ -51,6 +51,8 @@ export class VpsBillingService {
       const elapsedTime = endTime.getTime() - startTime.getTime();
       this.gs.log('[CRON_TASK_VPS_BILLING-END] 🐾', `${endTime} @ ${elapsedTime} ms`);
       job.start();
+    } else {
+      this.sr.getCronJob(CONSTANTS.cronVpsBilling).stop();
     }
   }
 

diff --git a/src/api/services/mkv-extract.service.ts b/src/api/services/mkv-extract.service.ts
@@ -64,8 +64,8 @@ export class MkvExtractService {
     return new Promise((resolve, reject) => {
 
       const startTime = Date.now();
-      this.gs.log(`[MKVEXTRACT_START] 📂 ${fileName} -- ${startTime} 🧬`);
-    
+      this.gs.log(`[MKVEXTRACT_START] 📂 ${fileName} -- ${startTime} 🧬`, null, 'error');
+
       const fileStream = createReadStream(filePath);
       const decoder = new Decoder();
       const tracks = [];
@@ -78,14 +78,15 @@ export class MkvExtractService {
       let trackTypeTemp = 0;
       let trackDataTemp = '';
       let trackIndex = 0;
-  
+
       decoder.on('error', error => {
+        this.gs.log(`[MKVEXTRACT_ERROR] 🌋 ${fileName} 🧬`, error, 'error');
         fileStream.destroy();
         reject(error);
       });
-  
+
       decoder.on('data', chunk => {
-        this.gs.log(`[MKVEXTRACT_CHUNK] ⌛ ${chunk[0]} -- ${chunk[1].name} -- ${chunk[1].dataSize} 🧬`);
+        this.gs.log(`[MKVEXTRACT_CHUNK] ⌛ ${fileName} -- ${chunk[0]} -- ${chunk[1].name} -- ${chunk[1].dataSize} 🧬`, null, 'error');
         switch (chunk[0]) {
           case 'end':
             // if (chunk[1].name === 'Info') {
@@ -148,7 +149,7 @@ export class MkvExtractService {
           currentFile++;
         }
       });
-  
+
       fileStream.on('end', () => {
         for (const [idx, val] of trackData.entries()) {
           const heading = val[0];
@@ -185,14 +186,10 @@ export class MkvExtractService {
           });
         };
         const endTime = Date.now();
-        this.gs.log(`[MKVEXTRACT_END] 🎬 ${fileName} -- ${endTime} -- ${(endTime - startTime) / 1000} seconds 🧬`);
-        if (files.length === 0) {
-          reject(Error('No data found'));
-        } else {
-          resolve(files);
-        }
+        this.gs.log(`[MKVEXTRACT_END] 🎬 ${fileName} -- ${endTime} -- ${(endTime - startTime) / 1000} seconds 🧬`, files, 'error');
+        resolve(files);
       });
-  
+
       fileStream.pipe(decoder as any);
 
     });