Skip to content

feat(javascript): add requester-fetch #855

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.

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

Merged
merged 1 commit into from
Jul 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .github/actions/restore-artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ runs:
name: client-javascript-utils-requester-node-http
path: clients/algoliasearch-client-javascript/packages/requester-node-http/

- name: client-javascript-utils-requester-fetch
if: ${{ (inputs.javascript == 'true' && inputs.type == 'all') || inputs.type == 'js_utils' }}
uses: actions/download-artifact@v3
with:
name: client-javascript-utils-requester-fetch
path: clients/algoliasearch-client-javascript/packages/requester-fetch/

# JavaScript
- name: Download clients-javascript artifact
if: ${{ inputs.javascript == 'true' && inputs.type == 'all' }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ jobs:
- client-common
- requester-browser-xhr
- requester-node-http
- requester-fetch
steps:
- uses: actions/checkout@v2

Expand Down
3 changes: 2 additions & 1 deletion clients/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ This folder hosts the generated clients.
- [@algolia/client-query-suggestions](./algoliasearch-client-javascript/packages/client-query-suggestions/): The Algolia query suggestions client.
- [@algolia/client-search](./algoliasearch-client-javascript/packages/client-search/): The Algolia search client.
- [@algolia/recommend](./algoliasearch-client-javascript/packages/recommend/): The Algolia recommend client.
- [@algolia/sources](./algoliasearch-client-javascript/packages/client-sources/): The Algolia sources client.
- [@algolia/client-sources](./algoliasearch-client-javascript/packages/client-sources/): The Algolia sources client.
- [@algolia/predict](./algoliasearch-client-javascript/packages/predict/): The Algolia predict client.
- [@algolia/client-common](./algoliasearch-client-javascript/packages/client-common/): The JavaScript clients common files.
- [@algolia/requester-browser-xhr](./algoliasearch-client-javascript/packages/requester-browser-xhr/): Browser XHR requester for the Algolia JavaScript clients.
- [@algolia/requester-fetch](./algoliasearch-client-javascript/packages/requester-fetch/): Requester for the Algolia JavaScript clients using Fetch.
- [@algolia/requester-node-http](./algoliasearch-client-javascript/packages/requester-node-http/): Node.js HTTP requester for the Algolia JavaScript clients.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ const UTILS = {
external: ['dom'],
dependencies: [`${NPM_ORG}client-common`],
},
'requester-fetch': {
external: ['dom'],
dependencies: [`${NPM_ORG}client-common`],
},
'requester-node-http': {
external: ['https', 'http', 'url'],
dependencies: [`${NPM_ORG}client-common`],
Expand Down
2 changes: 1 addition & 1 deletion clients/algoliasearch-client-javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:all": "./scripts/build_all.sh",
"build:utils": "yarn build utils",
"clean": "rm -rf packages/*/dist || true",
"clean:utils": "yarn workspace @algolia/client-common clean && yarn workspace @algolia/requester-node-http clean && yarn workspace @algolia/requester-browser-xhr clean",
"clean:utils": "yarn workspace @algolia/client-common clean && yarn workspace @algolia/requester-node-http clean && yarn workspace @algolia/requester-browser-xhr clean && yarn workspace @algolia/requester-fetch clean",
"release:bump": "lerna version ${0:-patch} --no-changelog --no-git-tag-version --no-push --exact --force-publish --yes",
"release:publish": "ts-node --project tsconfig.script.json scripts/publish.ts",
"test:lint": "eslint . --ext .js,.ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,41 +1,20 @@
import http from 'http';
import type http from 'http';

import type { EndRequest, Headers } from '@algolia/client-common';
import type { EndRequest } from '@algolia/client-common';
import type { MockRequest, MockResponse } from 'xhr-mock';
import mock from 'xhr-mock';

import { createXhrRequester } from '../..';
import {
BASE_URL,
headers,
timeoutRequest,
requestStub,
getStringifiedBody,
createTestServer,
} from '../../../../tests/utils';

const requester = createXhrRequester();
const BASE_URL = 'https://algolia-dns.net/foo?x-algolia-header=bar';

function getStringifiedBody(
body: Record<string, any> = { foo: 'bar' }
): string {
return JSON.stringify(body);
}

const headers: Headers = {
'content-type': 'text/plain',
};

const timeoutRequest: EndRequest = {
url: 'missing-url-here',
data: '',
headers: {},
method: 'GET',
responseTimeout: 2000,
connectTimeout: 1000,
};

const requestStub: EndRequest = {
url: BASE_URL,
method: 'POST',
headers,
data: getStringifiedBody(),
responseTimeout: 1000,
connectTimeout: 2000,
};

describe('status code handling', () => {
beforeEach(() => mock.setup());
Expand Down Expand Up @@ -123,24 +102,7 @@ describe('timeout handling', () => {
let server: http.Server;
// setup http server to test timeout
beforeAll(() => {
server = http.createServer(function (_req, res) {
res.writeHead(200, {
'content-type': 'text/plain',
'access-control-allow-origin': '*',
'x-powered-by': 'nodejs',
});

res.write('{"foo":');

setTimeout(() => {
res.write(' "bar"');
}, 1000);

setTimeout(() => {
res.write('}');
res.end();
}, 5000);
});
server = createTestServer();

server.listen('1111');
});
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './src/createFetchRequester';
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import type { Config } from '@jest/types';

const config: Config.InitialOptions = {
preset: 'ts-jest',
roots: ['src/__tests__'],
testEnvironment: 'jsdom',
};

export default config;
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "@algolia/requester-fetch",
"version": "5.0.0-alpha.0",
"description": "Promise-based request library using Fetch.",
"repository": "algolia/algoliasearch-client-javascript",
"license": "MIT",
"author": "Algolia",
"main": "dist/requester-fetch.cjs.js",
"module": "dist/requester-fetch.esm.node.js",
"types": "dist/index.d.ts",
"files": [
"dist",
"src",
"index.ts"
],
"scripts": {
"clean": "rm -rf dist/",
"test": "jest"
},
"dependencies": {
"@algolia/client-common": "5.0.0-alpha.0"
},
"devDependencies": {
"@types/jest": "28.1.4",
"@types/node": "16.11.45",
"cross-fetch": "3.1.5",
"jest": "28.1.2",
"nock": "13.2.8",
"ts-jest": "28.0.5",
"typescript": "4.7.4"
},
"engines": {
"node": ">= 14.0.0"
}
}
Loading