tango-app-api-trax 3.7.13-qid-halfshutter-6 → 3.7.13-qid-halfshutter-8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.13-qid-halfshutter-6",
+    "version": "3.7.13-qid-halfshutter-8",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/mobileTrax.controller.js

@@ -1,4 +1,4 @@
-import { logger, signedUrl, fileUpload, getOtp, sendEmailWithSES, getUuid, insertOpenSearchData } from 'tango-app-api-middleware';
+import { logger, signedUrl, fileUpload, getOtp, sendEmailWithSES, getUuid, insertOpenSearchData, listFileByPath, getObject, deleteFiles } from 'tango-app-api-middleware';
 import * as processedchecklist from '../services/processedchecklist.services.js';
 import * as processedtask from '../services/processedTaskList.service.js';
 import * as PCLconfig from '../services/processedchecklistconfig.services.js';
@@ -19,23 +19,13 @@ import timeZone from 'dayjs/plugin/timezone.js';
 import { findOTP, updateOneOTP } from '../services/otp.service.js';
 import * as clientService from '../services/clients.services.js';
 import { create } from '../services/authentication.service.js';
-import * as fs from 'fs';
-import { join, dirname } from 'path';
+import { join } from 'path';
 import handlebars from 'handlebars';
 dayjs.extend( customParseFormat );
 dayjs.extend( timeZone );
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore.js';
 import * as cameraService from '../services/camera.service.js';
 dayjs.extend( isSameOrBefore );
-import { fileURLToPath } from 'url';
-const fsp = fs.promises;
-
-const __filename = fileURLToPath( import.meta.url );
-const __dirname = dirname( __filename );
-const UPLOAD_DIR = join( __dirname, '/uploads' );
-if ( !fs.existsSync( UPLOAD_DIR ) ) {
-  fs.mkdirSync( UPLOAD_DIR, { recursive: true } );
-}
 
 export async function storeList( req, res ) {
   try {
@@ -3781,7 +3771,7 @@ export async function uploadAnswerImage( req, res ) {
       let imageUrl;
       let filePath = `${folder}/${req.user.clientId}/${date}/${input.checklistId}/${input.sectionName.replace( ' ', '' )}/${input.questionNo}/`;
       let params = {
-        fileName: `${Date.now()}-${Math.floor( 1000 + Math.random() * 9000 )}.${req.files.answerImage.name.split( '.' )[1]}`,
+        fileName: `${Date.now()}-${Math.floor( 1000 + Math.random() * 9000 )}-${req.files.answerImage.name}`,
         Key: filePath,
         Bucket: bucket.sop,
         body: req.files.answerImage.data,
@@ -4402,64 +4392,52 @@ export async function questionListV1( req, res ) {
 export async function chunkUpload( req, res ) {
   try {
     const { chunkIndex, totalChunks } = req.body;
-
-    if ( !req.files || !req.files.answerImage ) {
-      return res.status( 400 ).json( { error: 'No chunk file uploaded' } );
+    if ( chunkIndex === undefined || !totalChunks || !req.files || !req.files.answerImage ) {
+      return res.status( 400 ).json( { error: 'Missing required params or file.' } );
     }
-
-    if ( chunkIndex > totalChunks ) {
-      return res.sendError( 'Chunk index is wrong', 400 );
+    const chunkNum = Number( chunkIndex );
+    const chunkTotal = Number( totalChunks );
+    const chunkFile = req.files.answerImage;
+    const chunkKey = `traxVideoChunks/${req.user._id}/${chunkNum}`;
+    let bucket;
+    try {
+      bucket = JSON.parse( process.env.BUCKET )?.sop;
+    } catch {
+      return res.sendError( 'Bucket config error', 500 );
     }
-
-    const uploadedChunk = req.files.answerImage;
-    const baseName = uploadedChunk.name.split( '.' )[0];
-    const partPath = join( UPLOAD_DIR, `${baseName}.part_${chunkIndex}` );
-
-    fs.rename( uploadedChunk.tempFilePath, partPath, async ( err ) => {
-      if ( err ) {
-        return res.sendError( 'Chunk save failed', 500 );
-      }
-
-      // If not final chunk
-      if ( chunkIndex < totalChunks ) {
-        return res.sendSuccess( { message: 'Chunk received', chunkIndex } );
-      }
-
-      // Final chunk received: Merge now
-      try {
-        const finalPath = join( UPLOAD_DIR, uploadedChunk.name );
-        const writeStream = fs.createWriteStream( finalPath );
-
-        for ( let i = 1; i <= totalChunks; i++ ) {
-          const chunkPath = join( UPLOAD_DIR, `${baseName}.part_${i}` );
-          const data = await fsp.readFile( chunkPath );
-          writeStream.write( data );
-          await fsp.unlink( chunkPath ); // delete part after writing
-        }
-
-        writeStream.end();
-
-        writeStream.on( 'finish', async () => {
-          try {
-            const fileData = await fsp.readFile( finalPath );
-
-            req.files.answerImage = {
-              data: fileData,
-              name: uploadedChunk.name,
-              mimetype: uploadedChunk.mimetype,
-            };
-
-            await fsp.unlink( finalPath );
-
-            uploadAnswerImage( req, res );
-          } catch ( err ) {
-            return res.sendError( 'Final file error', 500 );
-          }
-        } );
-      } catch ( err ) {
-        return res.sendError( 'Chunk merge failed', 500 );
-      }
+    await fileUpload( {
+      fileName: '',
+      Key: chunkKey,
+      Bucket: bucket,
+      ContentType: chunkFile.mimetype,
+      body: chunkFile.data,
+    } );
+    if ( chunkNum < chunkTotal ) {
+      return res.sendSuccess( { message: 'Chunk uploaded to S3', chunkIndex: chunkNum } );
+    }
+    const prefix = `traxVideoChunks/${req.user._id}/`;
+    const s3FilesResp = await listFileByPath( { Bucket: bucket, file_path: prefix, MaxKeys: chunkTotal } );
+    const chunkObjs = s3FilesResp?.data || [];
+    chunkObjs.sort( ( a, b ) => {
+      const ai = Number( a.Key.split( '/' ).pop() );
+      const bi = Number( b.Key.split( '/' ).pop() );
+      return ai - bi;
     } );
+    const buffers = [];
+    for ( const obj of chunkObjs ) {
+      const s3Obj = await getObject( { Bucket: bucket, Key: obj.Key } );
+      buffers.push( Buffer.from( s3Obj.Body ) );
+    }
+    const finalBuffer = Buffer.concat( buffers );
+    try {
+      await deleteFiles( bucket, prefix );
+    } catch ( e ) {}
+    req.files.answerImage = {
+      data: finalBuffer,
+      name: chunkFile.name,
+      mimetype: chunkFile.mimetype,
+    };
+    return uploadAnswerImage( req, res );
   } catch ( e ) {
     logger.error( { functionName: 'chunkUpload', error: e } );
     return res.sendError( e, 500 );