Issue #SB-20154 merge: Merge pull request #4822 from anoophm/player-memory-issue

Issue #SB-20154 fix: reverting timeout config

src/app/proxy/contentEditorProxy.js

@@ -18,7 +18,6 @@ module.exports = function (app) {
   }
   app.use('/plugins/v1/search', proxy(contentServiceBaseUrl, {
     preserveHostHdr: true,
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentServiceBaseUrl),
     proxyReqPathResolver: function (req) {
       var originalUrl = req.originalUrl
@@ -29,28 +28,24 @@ module.exports = function (app) {
 
   app.use('/content-plugins/*', proxy(contentProxyUrl, {
     preserveHostHdr: true,
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentProxyUrl),
     proxyReqPathResolver: proxyReqPathResolverMethod
   }))
 
   app.use('/plugins/*', proxy(contentProxyUrl, {
     preserveHostHdr: true,
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentProxyUrl),
     proxyReqPathResolver: proxyReqPathResolverMethod
   }))
 
   app.use('/assets/public/*', proxy(contentProxyUrl, {
     preserveHostHdr: true,
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentProxyUrl),
     proxyReqPathResolver: proxyReqPathResolverMethod
   }))
 
   app.use('/content/preview/*', proxy(contentProxyUrl, {
     preserveHostHdr: true,
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentProxyUrl),
     proxyReqPathResolver: proxyReqPathResolverMethod
   }))
@@ -63,7 +58,6 @@ module.exports = function (app) {
       preserveHostHdr: true,
       limit: reqDataLimitOfContentUpload,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentProxyUrl),
-      timeout: envHelper.sunbird_api_request_timeout,
       proxyReqPathResolver: proxyReqPathResolverMethod,
       proxyReqBodyDecorator: function (bodyContent, srcReq) {
         if (bodyContent && bodyContent.request && bodyContent.request.content) {
@@ -75,7 +69,6 @@ module.exports = function (app) {
 
   app.use('/action/data/v1/page/assemble', proxy(learnerServiceBaseUrl, {
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerServiceBaseUrl),
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqPathResolver: function (req) {
       var originalUrl = req.originalUrl
       originalUrl = originalUrl.replace('/action/', '')
@@ -86,7 +79,6 @@ module.exports = function (app) {
 
   app.use('/action/data/v1/form/read', proxy(contentServiceBaseUrl, {
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentServiceBaseUrl),
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqPathResolver: function (req) {
       var originalUrl = req.originalUrl
       originalUrl = originalUrl.replace('/action/', '')
@@ -109,7 +101,6 @@ module.exports = function (app) {
 
   app.use('/action/review/comment/*', addCorsHeaders,
   proxy(envHelper.PORTAL_EXT_PLUGIN_URL, {
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqPathResolver: req => {
       return req.originalUrl.replace('/action', '/plugin')
     },
@@ -117,7 +108,6 @@ module.exports = function (app) {
   }))
   app.use('/action/textbook/v1/toc/*', addCorsHeaders,
   proxy(learnerURL, {
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL),
     proxyReqPathResolver: (req) => {
       var originalUrl = req.originalUrl
@@ -131,7 +121,6 @@ module.exports = function (app) {
     proxyUtils.verifyToken(),
     permissionsHelper.checkPermission(),
     proxy(learnerURL, {
-      timeout: envHelper.sunbird_api_request_timeout,
       limit: reqDataLimitOfContentUpload,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL),
       proxyReqPathResolver: function (req) {
@@ -143,7 +132,6 @@ module.exports = function (app) {
 
   app.use('/action/*', permissionsHelper.checkPermission(), proxy(contentProxyUrl, {
     preserveHostHdr: true,
-    timeout: envHelper.sunbird_api_request_timeout,
     limit: reqDataLimitOfContentUpload,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentProxyUrl),
     proxyReqPathResolver: proxyReqPathResolverMethod,
@@ -151,7 +139,6 @@ module.exports = function (app) {
   }))
 
   app.use('/v1/url/fetchmeta', proxy(contentProxyUrl, {
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqPathResolver: proxyReqPathResolverMethod
   }))
 }

src/app/routes/accountRecoveryRoute.js

@@ -15,7 +15,6 @@ module.exports = (app) => {
   app.post('/learner/user/v1/fuzzy/search',
   googleService.validateRecaptcha,
   proxy(envHelper.learner_Service_Local_BaseUrl, {
-    timeout: envHelper.sunbird_api_request_timeout,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(envHelper.learner_Service_Local_BaseUrl),
     proxyReqPathResolver: (req) => {
       logger.info({ msg: `${req.url} called`});
@@ -52,7 +51,6 @@ module.exports = (app) => {
       }
     },
     proxy(envHelper.learner_Service_Local_BaseUrl, {
-      timeout: envHelper.sunbird_api_request_timeout,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(envHelper.learner_Service_Local_BaseUrl),
       proxyReqPathResolver: (req) => {
         return '/private/user/v1/password/reset'; // /private/user/v1/reset/password
@@ -62,7 +60,6 @@ module.exports = (app) => {
   app.all('/learner/otp/v1/verify',
     bodyParser.urlencoded({ extended: false }), bodyParser.json({ limit: '10mb' }),
     proxy(envHelper.LEARNER_URL, {
-      timeout: envHelper.sunbird_api_request_timeout,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(envHelper.LEARNER_URL),
       proxyReqPathResolver: (req) => {
         return require('url').parse(envHelper.LEARNER_URL + req.originalUrl.replace('/learner/', '')).path

src/app/routes/certRegRoutes.js

@@ -15,7 +15,6 @@ module.exports = function (app) {
     app.all(`/+${certRegServiceApi.searchCertificate}`,
     permissionsHelper.checkPermission(),
     proxy(certRegURL, {
-      timeout: envHelper.sunbird_api_request_timeout,
       limit: reqDataLimitOfContentUpload,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(certRegURL),
       proxyReqPathResolver: function (req) {

src/app/routes/contentRoutes.js

@@ -20,7 +20,6 @@ module.exports = (app) => {
         healthService.checkDependantServiceHealth(['CONTENT', 'CASSANDRA']),
         permissionsHelper.checkPermission(),
         proxy(contentURL, {
-            timeout: envHelper.sunbird_api_request_timeout,
             limit: reqDataLimitOfContentUpload,
             proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentURL),
             proxyReqPathResolver: (req) => {
@@ -46,7 +45,6 @@ module.exports = (app) => {
     isAPIWhitelisted.isAllowed(),
         permissionsHelper.checkPermission(),
         proxy(contentURL, {
-            timeout: envHelper.sunbird_api_request_timeout,
             limit: reqDataLimitOfContentUpload,
             proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(contentURL),
             proxyReqPathResolver: (req) => {

src/app/routes/learnerRoutes.js

@@ -23,7 +23,6 @@ module.exports = function (app) {
   app.patch('/learner/portal/user/v1/update',
     proxyUtils.verifyToken(),permissionsHelper.checkPermission(),
     proxy(envHelper.learner_Service_Local_BaseUrl, {
-      timeout: envHelper.sunbird_api_request_timeout,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(envHelper.learner_Service_Local_BaseUrl),
       proxyReqPathResolver: (req) => {
         return '/private/user/v1/update';
@@ -65,7 +64,6 @@ module.exports = function (app) {
     permissionsHelper.checkPermission(),
     proxy(learnerURL, {
       limit: reqDataLimitOfContentUpload,
-      timeout: envHelper.sunbird_api_request_timeout,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL),
       proxyReqPathResolver: function (req) {
         return require('url').parse(learnerURL + '/content/v1/media/upload').path
@@ -89,7 +87,6 @@ module.exports = function (app) {
   app.all('/learner/data/v1/role/read',
     permissionsHelper.checkPermission(),
     proxy(learnerURL, {
-      timeout: envHelper.sunbird_api_request_timeout,
       limit: reqDataLimitOfContentUpload,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL),
       proxyReqPathResolver: function (req) {
@@ -141,7 +138,6 @@ module.exports = function (app) {
     isAPIWhitelisted.isAllowed(),
     permissionsHelper.checkPermission(),
     proxy(learnerURL, {
-      timeout: envHelper.sunbird_api_request_timeout,
       limit: reqDataLimitOfContentUpload,
       proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL),
       proxyReqPathResolver: function (req) {
@@ -176,7 +172,6 @@ module.exports = function (app) {
 
 function proxyManagedUserRequest() {
   return proxy(learnerURL, {
-    timeout: envHelper.sunbird_api_request_timeout,
     limit: reqDataLimitOfContentUpload,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL),
     proxyReqPathResolver: function (req) {
@@ -208,7 +203,6 @@ function proxyManagedUserRequest() {
 
 function checkForValidUser (){
   return proxy(learnerURL, {
-    timeout: envHelper.sunbird_api_request_timeout,
     limit: reqDataLimitOfContentUpload,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL),
     proxyReqBodyDecorator: function (bodyContent, srcReq) {
@@ -250,7 +244,6 @@ function checkForValidUser (){
 
 function proxyObj (){
   return proxy(learnerURL, {
-    timeout: envHelper.sunbird_api_request_timeout,
     limit: reqDataLimitOfContentUpload,
     proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(learnerURL),
     proxyReqPathResolver: function (req) {

src/app/routes/reportRoutes.js

@@ -12,7 +12,6 @@ module.exports = function (app) {
         proxyUtils.verifyToken(),
         reportHelper.validateRoles(['REPORT_ADMIN']),
         proxy(REPORT_SERVICE_URL, {
-            timeout: sunbird_api_request_timeout,
             limit: reqDataLimitOfContentUpload,
             proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(REPORT_SERVICE_URL),
             proxyReqPathResolver: function (req) {
@@ -34,7 +33,6 @@ module.exports = function (app) {
         proxyUtils.verifyToken(),
         reportHelper.validateRoles(['REPORT_VIEWER', 'REPORT_ADMIN']),
         proxy(REPORT_SERVICE_URL, {
-            timeout: sunbird_api_request_timeout,
             limit: reqDataLimitOfContentUpload,
             proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(),
             proxyReqPathResolver: function (req) {
@@ -63,7 +61,6 @@ module.exports = function (app) {
         proxyUtils.verifyToken(),
         reportHelper.validateRoles(['REPORT_VIEWER', 'REPORT_ADMIN']),
         proxy(REPORT_SERVICE_URL, {
-            timeout: sunbird_api_request_timeout,
             limit: reqDataLimitOfContentUpload,
             proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(REPORT_SERVICE_URL),
             proxyReqPathResolver: function (req) {

src/app/server.js

@@ -120,7 +120,6 @@ require('./routes/certRegRoutes.js')(app);
 
 app.all(['/content/data/v1/telemetry', '/action/data/v3/telemetry'], proxy(envHelper.TELEMETRY_SERVICE_LOCAL_URL, {
   limit: '50mb',
-  timeout: envHelper.sunbird_api_request_timeout,
   proxyReqOptDecorator: proxyUtils.decorateRequestHeaders(envHelper.TELEMETRY_SERVICE_LOCAL_URL),
   proxyReqPathResolver: req => require('url').parse(envHelper.TELEMETRY_SERVICE_LOCAL_URL + telemetryEventConfig.endpoint).path
 }))