fix: Added timeout functionality to website connector to prevent bloc…

…king
plugsy · Jul 2, 2021 · 62bfe04 · 62bfe04
1 parent c95eaee
commit 62bfe04
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/server/connectors/website/index.ts b/server/connectors/website/index.ts
@@ -44,6 +44,7 @@ export interface SiteConfig {
 export interface WebsiteConnectionConfig {
   id?: string;
   interval?: number;
+  timeout?: number;
   sites: SiteConfig[];
 }
 
@@ -52,6 +53,7 @@ export const websiteConnection = (
     id = CONNECTOR_TYPE,
     sites = [],
     interval = 30000,
+    timeout = 30000,
   }: WebsiteConnectionConfig,
   logger: Logger
 ) => {
@@ -81,7 +83,7 @@ export const websiteConnection = (
           tap({
             complete: () => logger.verbose("complete"),
           }),
-          switchMap((i) => {
+          exhaustMap((i) => {
             return of(i).pipe(
               exhaustMap(() => {
                 logger.verbose("createRequest");
@@ -99,9 +101,11 @@ export const websiteConnection = (
                 if (typeof request === "string")
                   return Axios.get(request, {
                     validateStatus,
+                    timeout,
                     responseType: "text",
                   });
                 return Axios.request({
+                  timeout,
                   ...request,
                   validateStatus,
                   responseType: "text",