Merge pull request #2239 from appbaseio/v3-http-request-timeout

web: V3 http request timeout

Author: mohdashraf010897

packages/maps-native/package.json

@@ -47,11 +47,11 @@
         "react-native": "~0.62.3"
     },
     "dependencies": {
-        "@appbaseio/reactivecore": "9.15.0",
+        "@appbaseio/reactivecore": "9.15.1",
         "@ptomasroos/react-native-multi-slider": "^0.0.13",
         "appbase-js": "^5.2.0",
         "hoist-non-react-statics": "^3.3.0",
         "native-base": "^2.4.2",
         "prop-types": "^15.6.1"
     }
-}
+}

packages/native/package.json

@@ -44,7 +44,7 @@
         "react-native": "~0.62.3"
     },
     "dependencies": {
-        "@appbaseio/reactivecore": "9.15.0",
+        "@appbaseio/reactivecore": "9.15.1",
         "@babel/polyfill": "^7.0.0-rc.3",
         "@ptomasroos/react-native-multi-slider": "^1.0.0",
         "appbase-js": "^5.2.0",
@@ -55,4 +55,4 @@
         "react-native-calendars": "^1.18.2",
         "react-redux": "^5.0.7"
     }
-}
+}

packages/reactivecore

@@ -35,10 +35,10 @@
 	"sideEffects": false,
 	"dependencies": {
 		"@appbaseio/analytics": "^1.1.1",
-		"@appbaseio/reactivecore": "9.15.0",
+		"@appbaseio/reactivecore": "9.15.1",
 		"@appbaseio/vue-emotion": "0.4.4",
 		"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-		"appbase-js": "^5.3.3",
+		"appbase-js": "^5.3.4",
 		"compute-scroll-into-view": "^1.0.11",
 		"emotion": "9.2.12",
 		"gmap-vue": "^3.5.4",

packages/vue/package.json

@@ -38,11 +38,11 @@
 	"license": "Apache-2.0",
 	"dependencies": {
 		"@appbaseio/analytics": "^1.1.1",
-		"@appbaseio/reactivecore": "9.15.0",
+		"@appbaseio/reactivecore": "9.15.1",
 		"@appbaseio/rheostat": "^1.0.0-alpha.15",
 		"@emotion/core": "^10.0.28",
 		"@emotion/styled": "^10.0.27",
-		"appbase-js": "^5.2.0",
+		"appbase-js": "^5.3.4",
 		"cross-env": "^5.2.0",
 		"dayjs": "^1.11.7",
 		"downshift": "^1.31.2",

packages/web/package.json

@@ -74,7 +74,7 @@ class ReactiveBase extends Component {
 			],
 			() => {
 				this.setStore(this.props);
-				this.setState(state => ({
+				this.setState((state) => ({
 					key: `${state.key}-0`,
 				}));
 			},
@@ -104,30 +104,28 @@ class ReactiveBase extends Component {
 	}
 
 	get headers() {
-		const {
-			enableAppbase, headers, appbaseConfig, mongodb, endpoint,
-		} = this.props;
+		const { enableAppbase, headers, appbaseConfig, mongodb, endpoint } = this.props;
 		const { enableTelemetry } = appbaseConfig || {};
 		return {
-			...(enableAppbase
-				&& !mongodb && {
-				'X-Search-Client': X_SEARCH_CLIENT,
-				...(enableTelemetry === false && { 'X-Enable-Telemetry': false }),
-			}),
+			...(enableAppbase &&
+				!mongodb && {
+					'X-Search-Client': X_SEARCH_CLIENT,
+					...(enableTelemetry === false && { 'X-Enable-Telemetry': false }),
+				}),
 			...headers,
-			...(enableAppbase
-				&& endpoint
-				&& endpoint.headers && {
-				...endpoint.headers,
-			}),
+			...(enableAppbase &&
+				endpoint &&
+				endpoint.headers && {
+					...endpoint.headers,
+				}),
 		};
 	}
 
 	setStore = (props) => {
 		this.type = props.type ? props.type : '*';
 
-		const credentials
-			= props.url && props.url.trim() !== '' && !props.credentials ? null : props.credentials;
+		const credentials =
+			props.url && props.url.trim() !== '' && !props.credentials ? null : props.credentials;
 
 		const appbaseConfig = {
 			...props.analyticsConfig, // TODO: remove in 4.0
@@ -157,8 +155,9 @@ class ReactiveBase extends Component {
 			graphQLUrl: props.graphQLUrl,
 			transformResponse: props.transformResponse,
 			mongodb: props.mongodb,
-			...(props.enableAppbase
-				&& props.endpoint instanceof Object && { endpoint: props.endpoint }),
+			...(props.enableAppbase &&
+				props.endpoint instanceof Object && { endpoint: props.endpoint }),
+			httpRequestTimeout: props.httpRequestTimeout * 1000,
 		};
 
 		let queryParams = '';
@@ -220,12 +219,13 @@ class ReactiveBase extends Component {
 			if (this.props.endpoint && this.props.endpoint.url) {
 				// Remove parts between '//' and first '/' in the url
 				analyticsInitConfig.url = this.props.endpoint.url.replace(/\/\/(.*?)\/.*/, '//$1');
-				const headerCredentials = this.props.endpoint.headers
-										&& this.props.endpoint.headers.Authorization;
-				analyticsInitConfig.credentials = headerCredentials && headerCredentials.replace('Basic ', '');
+				const headerCredentials =
+					this.props.endpoint.headers && this.props.endpoint.headers.Authorization;
+				analyticsInitConfig.credentials =
+					headerCredentials && headerCredentials.replace('Basic ', '');
 				// Decode the credentials
-				analyticsInitConfig.credentials = analyticsInitConfig.credentials
-												&& atob(analyticsInitConfig.credentials);
+				analyticsInitConfig.credentials =
+					analyticsInitConfig.credentials && atob(analyticsInitConfig.credentials);
 			}
 		} catch (e) {
 			console.error('Endpoint not set correctly for analytics');
@@ -291,6 +291,7 @@ ReactiveBase.defaultProps = {
 	as: 'div',
 	enableAppbase: false,
 	endpoint: null,
+	httpRequestTimeout: 30,
 };
 
 ReactiveBase.propTypes = {
@@ -322,6 +323,7 @@ ReactiveBase.propTypes = {
 	mongodb: types.mongodb,
 	preferences: types.preferences,
 	endpoint: types.endpoint,
+	httpRequestTimeout: types.number,
 };
 
 export default ReactiveBase;