From 7bcc214955c523c7de1960f15d1853458edc6e39 Mon Sep 17 00:00:00 2001 From: Uttam Krishna Ukkoji Date: Wed, 20 Jan 2021 12:34:35 +0530 Subject: [PATCH 1/4] Unhandle promise issue --- src/core/lib/request.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/lib/request.js b/src/core/lib/request.js index 09d8908d..1813aafe 100755 --- a/src/core/lib/request.js +++ b/src/core/lib/request.js @@ -57,7 +57,9 @@ function wait(retryDelay) { setTimeout(resolve, retryDelay) }); } - +async function safeParseJSON(response) { + const body = await response.text(); +} function fetchRetry(url, headers, retryDelay = 300, retryLimit = 5, fetchOptions, resolve, reject) { var option = Object.assign({ method: 'GET', @@ -87,7 +89,8 @@ function fetchRetry(url, headers, retryDelay = 300, retryLimit = 5, fetchOptions } } fetch(url, option) - .then(function(response) { + .then(function(response) { + let body = response.text() let data = response.json(); if (response.ok && response.status === 200) { resolve(data); @@ -98,6 +101,10 @@ function fetchRetry(url, headers, retryDelay = 300, retryLimit = 5, fetchOptions } else { reject(json) } + }).catch((error) => { + body.then((res) => { + reject({error_message: res, status: response.status, statusText: response.statusText}) + }) }); } }).catch((error) => { From 3fd63b07824f99ee4be3522a1574a7aa2dfb1ff1 Mon Sep 17 00:00:00 2001 From: Uttam Krishna Ukkoji Date: Thu, 21 Jan 2021 12:09:26 +0530 Subject: [PATCH 2/4] Unhandle promise rejectiopn issue fixed --- src/core/lib/request.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/lib/request.js b/src/core/lib/request.js index 1813aafe..6b7c23f8 100755 --- a/src/core/lib/request.js +++ b/src/core/lib/request.js @@ -90,7 +90,6 @@ function fetchRetry(url, headers, retryDelay = 300, retryLimit = 5, fetchOptions } fetch(url, option) .then(function(response) { - let body = response.text() let data = response.json(); if (response.ok && response.status === 200) { resolve(data); @@ -101,10 +100,8 @@ function fetchRetry(url, headers, retryDelay = 300, retryLimit = 5, fetchOptions } else { reject(json) } - }).catch((error) => { - body.then((res) => { - reject({error_message: res, status: response.status, statusText: response.statusText}) - }) + }).catch(() => { + reject({status: response.status, statusText: response.statusText}) }); } }).catch((error) => { From 1970784c9036836b013e06685cab00de248b5df2 Mon Sep 17 00:00:00 2001 From: Uttam Krishna Ukkoji Date: Thu, 21 Jan 2021 12:16:23 +0530 Subject: [PATCH 3/4] Version upate and changelog added --- CHANGELOG.md | 8 +++++++- package-lock.json | 19 ++++++++++++++----- package.json | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aef29281..71a12197 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ + +### Version: 3.12.1 +#### Date: Jan-22-2020 + +##### Bug fix: + - Fixed Unhandled promise rejection on HTML response body. ### Version: 3.12.0 -#### Date: Desc-05-2020 +#### Date: Dec-05-2020 ##### New Features: - [Entry] - Publish fallback method added diff --git a/package-lock.json b/package-lock.json index efa3bdf9..e18470c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "contentstack", - "version": "3.12.0", + "version": "3.12.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5073,7 +5073,8 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", - "dev": true + "dev": true, + "optional": true }, "har-schema": { "version": "2.0.0", @@ -5720,6 +5721,7 @@ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, + "optional": true, "requires": { "is-docker": "^2.0.0" } @@ -8224,6 +8226,7 @@ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz", "integrity": "sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==", "dev": true, + "optional": true, "requires": { "growly": "^1.3.0", "is-wsl": "^2.2.0", @@ -8238,6 +8241,7 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "optional": true, "requires": { "yallist": "^4.0.0" } @@ -8247,6 +8251,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", "dev": true, + "optional": true, "requires": { "lru-cache": "^6.0.0" } @@ -8256,6 +8261,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "optional": true, "requires": { "isexe": "^2.0.0" } @@ -8264,7 +8270,8 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "optional": true } } }, @@ -9595,7 +9602,8 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", - "dev": true + "dev": true, + "optional": true }, "signal-exit": { "version": "3.0.3", @@ -11068,7 +11076,8 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==", - "dev": true + "dev": true, + "optional": true }, "v8-compile-cache": { "version": "2.1.1", diff --git a/package.json b/package.json index 62dba9ec..f0b83ac9 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "contentstack", - "version": "3.12.0", + "version": "3.12.1", "description": "Contentstack Javascript SDK", "homepage": "https://www.contentstack.com/", "author": { From c78263567a22733538c5bb0d462872b9140f9599 Mon Sep 17 00:00:00 2001 From: Uttam Krishna Ukkoji Date: Thu, 21 Jan 2021 12:20:33 +0530 Subject: [PATCH 4/4] Version upate and changelog added --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71a12197..fb7675d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### Version: 3.12.1 -#### Date: Jan-22-2020 +#### Date: Jan-22-2021 ##### Bug fix: - Fixed Unhandled promise rejection on HTML response body.