This is an automated email from the ASF dual-hosted git repository. glynnbird pushed a commit to branch 10.1.0 in repository https://gitbox.apache.org/repos/asf/couchdb-nano.git
commit db9c71b216f108eed5d8d77c51c28b7024b74b4e Merge: ea2a508 d6c6c3a Author: Glynn Bird <[email protected]> AuthorDate: Thu Nov 3 11:15:50 2022 +0000 merge main README.md | 2 +- lib/changesreader.js | 8 ++++++++ lib/nano.js | 14 ++++++++++++++ package-lock.json | 11 +++++++++++ package.json | 5 +++-- test/document.changesreader.test.js | 26 ++++++++++++++++++++++++++ 6 files changed, 63 insertions(+), 3 deletions(-) diff --cc lib/nano.js index e5c1499,703946c..26a294f --- a/lib/nano.js +++ b/lib/nano.js @@@ -126,10 -126,20 +126,20 @@@ module.exports = exports = function dbS // let parsed const responseHeaders = Object.assign({ uri: scrubURL(req.url), - statusCode: statusCode + statusCode }, response.headers) if (!response.status) { + if (axios.isCancel(response)) { + if (resolve) { + resolve('canceled') + } + if (callback) { + callback(null, 'canceled', responseHeaders) + } + return + } + - log({ err: 'socket', body: body, headers: responseHeaders }) + log({ err: 'socket', body, headers: responseHeaders }) if (reject) { reject(new Error(`error happened in your connection. Reason: ${response.message}`)) } diff --cc package-lock.json index 114ddf9,68b3ad6..990d716 --- a/package-lock.json +++ b/package-lock.json @@@ -6,24 -6,25 +6,25 @@@ "packages": { "": { "name": "nano", - "version": "10.0.0", + "version": "10.1.0", "license": "Apache-2.0", "dependencies": { - "@types/tough-cookie": "^4.0.0", - "axios": "^0.26.1", - "http-cookie-agent": "^1.0.5", + "@types/tough-cookie": "^4.0.2", + "axios": "^1.1.3", + "http-cookie-agent": "^4.0.2", + "node-abort-controller": "^3.0.1", - "qs": "^6.10.3", - "tough-cookie": "^4.0.0" + "qs": "^6.11.0", + "tough-cookie": "^4.1.2" }, "devDependencies": { - "@types/node": "^17.0.22", - "jest": "^27.5.1", - "nock": "^13.2.4", - "standard": "^16.0.4", - "typescript": "^4.1.3" + "@types/node": "^18.11.9", + "jest": "^29.2.2", + "nock": "^13.2.9", + "standard": "^17.0.0", + "typescript": "^4.8.4" }, "engines": { - "node": ">=10" + "node": ">=14" } }, "node_modules/@ampproject/remapping": { diff --cc package.json index 285eb36,6edfae1..1c6b47c --- a/package.json +++ b/package.json @@@ -17,18 -17,19 +17,19 @@@ "database" ], "dependencies": { - "http-cookie-agent": "^1.0.5", - "@types/tough-cookie": "^4.0.0", - "axios": "^0.26.1", - "node-abort-controller": "^3.0.1", - "qs": "^6.10.3", - "tough-cookie": "^4.0.0" + "http-cookie-agent": "^4.0.2", + "@types/tough-cookie": "^4.0.2", + "axios": "^1.1.3", + "qs": "^6.11.0", - "tough-cookie": "^4.1.2" ++ "tough-cookie": "^4.1.2", ++ "node-abort-controller": "^3.0.1" }, "devDependencies": { - "@types/node": "^17.0.22", - "jest": "^27.5.1", - "nock": "^13.2.4", - "standard": "^16.0.4", - "typescript": "^4.1.3" + "@types/node": "^18.11.9", + "jest": "^29.2.2", + "nock": "^13.2.9", + "standard": "^17.0.0", + "typescript": "^4.8.4" }, "scripts": { "standard": "standard --fix",
