From 0706f9444e6cf630cabe55a6ddb35b71693b75e7 Mon Sep 17 00:00:00 2001 From: yhoupert Date: Thu, 7 Dec 2017 14:37:52 +0100 Subject: [PATCH] use request body instead of file --- app.js | 4 +--- lib/controller/speech-enhancement.js | 2 +- lib/webserver/routes.js | 7 ++----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app.js b/app.js index a07adba..86bdbe6 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,6 @@ const https = require('https'); const fs = require('fs'); const app = require('express')(); -const fileUpload = require('express-fileupload'); const bodyParser = require('body-parser'); const config = require('./config.json'); @@ -29,8 +28,7 @@ const routes = require('./lib/webserver/routes'); console.log('starting routes linstt-controller...'); -app.use(bodyParser.raw({type: 'audio/wav', limit: '200mb'})); -app.use(fileUpload()); +app.use(bodyParser.raw({type: 'audio/wave', limit: '200mb'})); app.use('/', routes.routesFactory(config.orchestrator)); app.listen(config.api, () => { diff --git a/lib/controller/speech-enhancement.js b/lib/controller/speech-enhancement.js index be0e7c1..f34ffc4 100644 --- a/lib/controller/speech-enhancement.js +++ b/lib/controller/speech-enhancement.js @@ -29,7 +29,7 @@ module.exports = config => { url, formData: { wavFile: { - value: wavFile.data, + value: wavFile, options: { filename: 'wavFile', contentType: 'audio/x-wav' diff --git a/lib/webserver/routes.js b/lib/webserver/routes.js index 9e92c4f..acf8439 100644 --- a/lib/webserver/routes.js +++ b/lib/webserver/routes.js @@ -26,14 +26,11 @@ const routesFactory = config => { const checker = require('../util/checker'); routes.post('/api/transcript', (req, res) => { - if (!req.files) { + if(!req.body){ return res.status(400).send('No files were uploaded.'); } - if (!checker.isFileValid(req.files.wav)) { - return res.status(400).send('File is not valid.'); - } - enhancer.enhancement(req.files.wav, (err, httpResponse, body) => { + enhancer.enhancement(req.body, (err, httpResponse, body) => { if (err) { return res.status(500).send('Error while enhancing audio.' + err); } -- 2.24.1