From 76ba9fc533ea46d2bda97e81808b5d6ecee1664e Mon Sep 17 00:00:00 2001 From: Nairi Date: Wed, 16 May 2018 21:42:16 +0400 Subject: [PATCH 1/3] add request functional --- .eslintrc | 3 ++- src/http/helpers/index.js | 1 + src/http/helpers/request.js | 43 +++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/http/helpers/request.js diff --git a/.eslintrc b/.eslintrc index a38c9c6..225beec 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,7 +4,8 @@ "env": { "node": true, "es6": true, - "mocha": true + "mocha": true, + "browser": true }, "rules": { "semi": ["error", "never"], diff --git a/src/http/helpers/index.js b/src/http/helpers/index.js index 0d681fd..4cbae12 100644 --- a/src/http/helpers/index.js +++ b/src/http/helpers/index.js @@ -1,2 +1,3 @@ +export { default as Request, } from './request' export * from './fetch' export * from './utils' diff --git a/src/http/helpers/request.js b/src/http/helpers/request.js new file mode 100644 index 0000000..4cfbd1b --- /dev/null +++ b/src/http/helpers/request.js @@ -0,0 +1,43 @@ +import { parseOptions, parseResponse, } from './fetch' + +const timeouts = [] +let count = 0 + +export default (options, { timeout, messages, }) => { + const _count = count + count += 1 + const calls = Promise.race([ + fetchAsync(options, messages), + fetchTimeout(_count, timeout, messages), + ]) + return calls +} + + +const fetchAsync = async (options, messages) => { + let response = null + const { requestOptions, url, } = parseOptions(options) + + try { + response = await fetch(url, requestOptions) + clearTimeout(timeouts[count]) + } catch (err) { + throw new Error(messages.def) + } + + try { + const res = await parseResponse(response) + return res.data + } catch (err) { + throw new Error(err.message) + } +} + +const fetchTimeout = (count, timeout, messages) => { + return new Promise((resolve, reject) => { + timeouts[count] = setTimeout(() => { + clearTimeout(timeouts[count]) + reject(new Error(messages.timeout)) + }, timeout) + }) +} From 610797680071b7a779c79719e1e37aeab81ffcd3 Mon Sep 17 00:00:00 2001 From: Nairi Date: Thu, 17 May 2018 17:59:12 +0400 Subject: [PATCH 2/3] add fetch method --- src/http/configs/defaults.js | 4 +++- src/http/helpers/index.js | 2 +- src/http/helpers/request.js | 16 ++++++++-------- src/http/route/index.js | 22 ++++++++++++++++++++-- test/route_from_object.js | 3 ++- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/http/configs/defaults.js b/src/http/configs/defaults.js index 4d00ba6..d662544 100644 --- a/src/http/configs/defaults.js +++ b/src/http/configs/defaults.js @@ -1,7 +1,9 @@ export default { timeout: 5000, path: '', - messages: {}, + messages: { + timeout: 'Timeout Error!', + }, headers: { 'Content-Type' : 'application/json', }, diff --git a/src/http/helpers/index.js b/src/http/helpers/index.js index 4cbae12..b847672 100644 --- a/src/http/helpers/index.js +++ b/src/http/helpers/index.js @@ -1,3 +1,3 @@ -export { default as Request, } from './request' +export * from './request' export * from './fetch' export * from './utils' diff --git a/src/http/helpers/request.js b/src/http/helpers/request.js index 4cfbd1b..ab72669 100644 --- a/src/http/helpers/request.js +++ b/src/http/helpers/request.js @@ -1,20 +1,20 @@ import { parseOptions, parseResponse, } from './fetch' +import { defaults, } from '../configs' const timeouts = [] let count = 0 -export default (options, { timeout, messages, }) => { +export const fetchAsync = (options, { timeout, messages, }) => { const _count = count count += 1 const calls = Promise.race([ - fetchAsync(options, messages), - fetchTimeout(_count, timeout, messages), + request(options, messages), + requestTimeout(_count, timeout, messages), ]) return calls } - -const fetchAsync = async (options, messages) => { +export const request = async (options, messages) => { let response = null const { requestOptions, url, } = parseOptions(options) @@ -22,7 +22,7 @@ const fetchAsync = async (options, messages) => { response = await fetch(url, requestOptions) clearTimeout(timeouts[count]) } catch (err) { - throw new Error(messages.def) + throw new Error(messages.def || err.message) } try { @@ -33,11 +33,11 @@ const fetchAsync = async (options, messages) => { } } -const fetchTimeout = (count, timeout, messages) => { +export const requestTimeout = (count, timeout, messages) => { return new Promise((resolve, reject) => { timeouts[count] = setTimeout(() => { clearTimeout(timeouts[count]) - reject(new Error(messages.timeout)) + reject(new Error(messages.timeout || defaults.messages.timeout)) }, timeout) }) } diff --git a/src/http/route/index.js b/src/http/route/index.js index efa54a9..e26fe7a 100644 --- a/src/http/route/index.js +++ b/src/http/route/index.js @@ -1,5 +1,8 @@ import { defaults, methods, } from '../configs' -import { isNotEmptyString, isRequestMethod, isObject, removeLastSlashSymbol, isARoute, } from '../helpers' +import { + isNotEmptyString, isRequestMethod, isObject, + removeLastSlashSymbol, isARoute, fetchAsync, +} from '../helpers' const _privates = new WeakMap() const addRoute = Symbol('addRoute') @@ -224,7 +227,22 @@ export default class Route { } } - fetch() { + fetch(data) { + const timeout = this.getTimeout() + const messages = this.getMessages() + const url = this.getUrl() + const headers = this.getHeaders() + const method = this.getMethod() + this[clearParams]() + return fetchAsync({ + method, + url, + headers, + data, + }, { + timeout, + messages, + }) } } diff --git a/test/route_from_object.js b/test/route_from_object.js index c38d29c..d7e783a 100644 --- a/test/route_from_object.js +++ b/test/route_from_object.js @@ -81,7 +81,8 @@ describe('check api and signIn params functionality for rest apis', () => { const signInTimeout = restApi.signIn.params(11).getTimeout() assert.equal(signInTimeout, timeout) - restApi.signIn.fetch() + // TODO :: finalise timeout + restApi.signIn.fetch({}) const url = restApi.signIn.getUrl() assert.equal(url, urlWithoutParams) }) From 8782fba53f8e45be6c12679ea4165210f3092f9d Mon Sep 17 00:00:00 2001 From: Nairi Haroutiounian Date: Wed, 31 Oct 2018 22:06:09 +0400 Subject: [PATCH 3/3] resolve #4 --- LICENSE | 201 -------------------------------------------------------- 1 file changed, 201 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License.