Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Content-length on httpApiCall #250

Merged
merged 10 commits into from
Apr 26, 2024
Merged

Fix Content-length on httpApiCall #250

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd9dadf
Decompose httpApiCall and fix Content-length
timursevimli Feb 17, 2024
e37ca80
Add test compare to Content-length
timursevimli Feb 17, 2024
f1f1564
Remove unused async-await
timursevimli Feb 17, 2024
08375d2
Remove custom headers and unnecessary adjustment of content-length
timursevimli Feb 18, 2024
dd25417
Add tests for the httpApiCall
timursevimli Feb 18, 2024
837e26b
Fix typo
timursevimli Feb 18, 2024
aa4c888
Update tests style
timursevimli Feb 18, 2024
805c311
Fix change headers argument
timursevimli Mar 8, 2024
cddeea3
Apply suggestions from code review
tshemsedinov Apr 26, 2024
a917864
Merge branch 'master' into fix-custom-headers
tshemsedinov Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions lib/network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,19 @@ const intToIp = (int) => {
return octets.join('.');
};

const httpApiCall = async (url, { method = 'POST', headers = {}, body }) => {
const customHeaders = ({ headers = {}, body }) => {
const mimeType = 'application/json';
const custom = { 'Content-Type': mimeType, ...headers };
if (body) headers['Content-Length'] = Buffer.byteLength(body);
if (body) custom['Content-Length'] = Buffer.byteLength(body);
return custom;
};

const httpApiCall = async (url, { method = 'POST', headers = {}, body }) => {
const custom = customHeaders({ headers, body });
const options = { method, headers: custom, body };
return await fetch(url, options).then(async (res) => {
return await fetch(url, options).then((res) => {
const code = res.status;
if (code === 200) return await res.json();
if (code === 200) return res.json();
const dest = `for ${method} ${url}`;
throw new Error(`HTTP status code ${code} ${dest}`);
});
Expand All @@ -51,4 +56,5 @@ module.exports = {
ipToInt,
intToIp,
httpApiCall,
customHeaders,
};
14 changes: 14 additions & 0 deletions test/network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,17 @@ metatests.test('Newtork: httpApiCall', async (test) => {

test.end();
});

metatests.test('Network: customHeaders', (test) => {
const body = '{"key": "value"}';
const headers = { 'Custom-Header': 'custom-value' };

const custom = metautil.customHeaders({ headers, body });

test.strictSame(typeof custom, 'object');
test.strictSame(custom['Content-Type'], 'application/json');
test.strictSame(custom['Custom-Header'], 'custom-value');
test.strictSame(custom['Content-Length'], Buffer.byteLength(body));

test.end();
});
Loading