fix: Avoid throwing an exception if needle can't connect to the mock …

…service during polling (may fix #314)
pact-foundation · Aug 11, 2021 · 74a2cde · 74a2cde
1 parent 76f6db1
commit 74a2cde
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/src/service.ts b/src/service.ts
@@ -311,30 +311,28 @@ export abstract class AbstractService extends events.EventEmitter {
   }
 
   private __call(options: ServiceOptions): Promise<unknown> {
-    return new Promise<void>((resolve, reject) => {
-      const config: HTTPConfig = {
-        method: 'GET',
-        headers: {
-          'X-Pact-Mock-Service': 'true',
-          'Content-Type': 'application/json',
-        },
-      };
+    const config: HTTPConfig = {
+      method: 'GET',
+      headers: {
+        'X-Pact-Mock-Service': 'true',
+        'Content-Type': 'application/json',
+      },
+    };
 
-      if (options.ssl) {
-        process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-        config.rejectUnauthorized = false;
-        config.agent = false;
-      }
+    if (options.ssl) {
+      process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+      config.rejectUnauthorized = false;
+      config.agent = false;
+    }
 
-      needle.get(
-        `http${options.ssl ? 's' : ''}://${options.host}:${options.port}`,
-        config,
-        (err: Error | null, res) => {
-          !err && res.statusCode === 200
-            ? resolve()
-            : reject(`HTTP Error: '${JSON.stringify(err ? err : res)}'`);
-        }
-      );
+    return needle(
+      'get',
+      `http${options.ssl ? 's' : ''}://${options.host}:${options.port}`,
+      config
+    ).then((res) => {
+      if (res.statusCode !== 200) {
+        throw new Error(`HTTP Error: '${JSON.stringify(res)}'`);
+      }
     });
   }
 }