Merge pull request #130 from PagerDuty/fixNetworkCatch

Fix missing catch statements on network errors.

src/api.test.ts

@@ -304,3 +304,16 @@ test('API `delete` calls with shorthand `get` should succeed', async done => {
  expect(response.data).toEqual(EMPTY_BODY);
  done();
 });
+
+test('API catches ETIMEDOUT error', async done => {
+ nock('https://api.pagerduty.com')
+ .get('/incidents')
+ .replyWithError({code: 'ETIMEDOUT'});
+
+ const pd = api({token: 'someToken1234567890'});
+
+ await expect(pd.get('/incidents')).rejects.toThrow(
+ 'request to https://api.pagerduty.com/incidents failed, reason: undefined'
+ );
+ done();
+});

src/common.ts

@@ -45,21 +45,23 @@ function fetch_retry(
  options: RequestOptions
 ): Promise<Response> {
  return new Promise((resolve, reject) => {
- fetch(url, options).then(response => {
- // We don't want to `reject` when retries have finished
- // Instead simply stop trying and return.
- if (retries === 0) return resolve(response);
- if (response.status === 429) {
- const {retryTimeout = 20000} = options;
- retryTimeoutPromise(retryTimeout).then(() => {
- fetch_retry(url, retries - 1, options)
- .then(resolve)
- .catch(reject);
- });
- } else {
- resolve(response);
- }
- });
+ fetch(url, options)
+ .then(response => {
+ // We don't want to `reject` when retries have finished
+ // Instead simply stop trying and return.
+ if (retries === 0) return resolve(response);
+ if (response.status === 429) {
+ const {retryTimeout = 20000} = options;
+ retryTimeoutPromise(retryTimeout).then(() => {
+ fetch_retry(url, retries - 1, options)
+ .then(resolve)
+ .catch(reject);
+ });
+ } else {
+ resolve(response);
+ }
+ })
+ .catch(reject);
  });
 }