Skip to content

Commit

Permalink
strip out old dependencies (#3)
Browse files Browse the repository at this point in the history
* strip out old dependencies

* add fetch polyfill back

* pass fullUrl instead of root

* revert headers as constant, remove brackets for one liner if
  • Loading branch information
nchagrass authored Jun 24, 2021
1 parent e6ae1c0 commit 37ef94f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
17 changes: 7 additions & 10 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
const fetchPonyfill = require('fetch-ponyfill');
const objectAssign = require('es6-object-assign').assign;
const qs = require('qs');
const url = require('url');
const rTracer = require('cls-rtracer');

const { fetch } = fetchPonyfill();
Expand All @@ -20,10 +18,10 @@ function jsonClient(baseUrl, options) {

return function jsonClientRequest(method, path, params, body, options) {
const query = params ? '?' + qs.stringify(params) : '';
const resolved = new url(path + query, resolvedBaseUrl);
const resolved = new URL(path + query, resolvedBaseUrl);
const reqOptions = mergeOptions(baseOptions, options);

return makeRequest(method, resolved, body, reqOptions);
return makeRequest(method, resolved.href, body, reqOptions);
};
}

Expand Down Expand Up @@ -101,13 +99,12 @@ function makeRequest(method, fullUrl, body, options) {

function mergeOptions(baseOptions, newOptions) {
const resolvedNewOptions = newOptions || {};
const headers = objectAssign({}, baseOptions.headers, resolvedNewOptions.headers);
const headers = {...baseOptions.headers, ...resolvedNewOptions.headers};

const reqID = rTracer.id() ?? null;
if (reqID !== null)
headers = objectAssign({}, headers, { 'request-id': reqID })
if (reqID !== null)
headers['request-id'] = reqID


return objectAssign({}, baseOptions, newOptions, {
headers: headers,
});
return {...baseOptions, ...newOptions, ...{headers: headers}};
}
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
},
"dependencies": {
"cls-rtracer": "^2.6.0",
"es6-object-assign": "^1.1.0",
"fetch-ponyfill": "^7.1.0",
"qs": "^6.5.2",
"url": "^0.11.0"
"qs": "^6.5.2"
},
"keywords": [
"json",
Expand Down

0 comments on commit 37ef94f

Please sign in to comment.