@zengenti/contensis-react-base 4.0.0-beta.56 → 4.0.0-beta.58

package/cjs/contensis-react-base.js

@@ -662,6 +662,7 @@ const servers$1 = SERVERS; /* global SERVERS */
 const project = PROJECT; /* global PROJECT */
 const alias$1 = ALIAS; /* global ALIAS */
 const deliveryApiHostname = urls.url(alias$1, project).api;
+const proxyTimeoutMs = 45_000;
 const assetProxy = httpProxy__default.default.createProxyServer();
 const deliveryProxy = httpProxy__default.default.createProxyServer();
 const reverseProxies = (app, reverseProxyPaths = []) => {
@@ -669,15 +670,17 @@ const reverseProxies = (app, reverseProxyPaths = []) => {
   app.all(reverseProxyPaths.map(proxyPath =>
   // Patch to update paths for express v5
   proxyPath.endsWith('/*') ? `${proxyPath.slice(0, -2)}/{*splat}` : proxyPath.endsWith('/**') ? `${proxyPath.slice(0, -3)}/{*splat}` : proxyPath), (req, res) => {
-    const target = req.hostname.indexOf('preview-') || req.hostname.indexOf('preview.') || req.hostname === 'localhost' ? servers$1.previewIis || servers$1.iis : servers$1.iis;
+    const target = req.hostname.includes('preview-') || req.hostname.includes('preview.') || req.hostname === 'localhost' ? servers$1.previewIis || servers$1.iis : servers$1.iis;
     assetProxy.web(req, res, {
       target,
-      changeOrigin: true
-    });
-    assetProxy.on('error', e => {
-      console.log(`Proxy Request for ${req.path} HostName:${req.hostname} failed with ${e}`);
+      changeOrigin: true,
+      proxyTimeout: proxyTimeoutMs,
+      timeout: proxyTimeoutMs
     });
   });
+  assetProxy.on('error', (e, req) => {
+    console.log(`Proxy request for ${req.url} HostName:${req.headers.host} failed with ${e}`);
+  });
 };
 const deliveryApiProxy = (apiProxy, app) => {
   // This is just here to stop cors requests on localhost. In Production this is mapped using varnish.
@@ -685,12 +688,14 @@ const deliveryApiProxy = (apiProxy, app) => {
     console.log(`Proxying api request to ${servers$1.alias}`);
     apiProxy.web(req, res, {
       target: deliveryApiHostname,
-      changeOrigin: true
-    });
-    apiProxy.on('error', e => {
-      console.log(`Proxy request for ${req.path} HostName:${req.hostname} failed with ${e}`);
+      changeOrigin: true,
+      proxyTimeout: proxyTimeoutMs,
+      timeout: proxyTimeoutMs
     });
   });
+  apiProxy.on('error', (e, req) => {
+    console.log(`Proxy request for ${req.url} HostName:${req.headers.host} failed with ${e}`);
+  });
 };
 
 const CacheDuration = {