1- import * as axios from 'axios' ;
1+ import * as fetchPonyfill from 'fetch-ponyfill' ;
2+ import * as qs from 'qs' ;
23import { Request } from '../models/request' ;
34import { Navigation , RangeRefinement , Record , RefinementResults , Results } from '../models/response' ;
45import { Query } from './query' ;
@@ -8,6 +9,13 @@ const REFINEMENTS = '/refinements';
89
910const INVALID_QUERY_ERROR = 'query was not of a recognised type' ;
1011
12+ const createTimeoutPromise = ( timeout : number ) =>
13+ new Promise ( ( resolve , reject ) => {
14+ setTimeout ( ( ) => {
15+ reject ( new BridgeTimeout ( `Timed out in ${ timeout } ) ) ;
16+ } , timeout ) ;
17+ } ) ;
18+
1119export interface RawRecord extends Record {
1220 _id : string ;
1321 _u : string ;
@@ -19,6 +27,24 @@ export interface BridgeCallback {
1927 ( err ?: Error , res ?: Results ) : void ;
2028}
2129
30+ export class BridgeTimeout extends Error {
31+ /* istanbul ignore next */
32+ constructor ( err : string ) {
33+ super ( err ) ;
34+ }
35+ }
36+
37+ export class BridgeError extends Error {
38+ /* istanbul ignore next */
39+ constructor ( statusText : string , public status : number , public data : any ) {
40+ super ( statusText ) ;
41+ Object . setPrototypeOf ( this , BridgeError . prototype ) ;
42+ }
43+ get statusText ( ) {
44+ return this . message ;
45+ }
46+ }
47+
2248export type BridgeQuery = string | Query | Request ;
2349
2450export const DEFAULT_CONFIG : BridgeConfig = {
@@ -28,6 +54,7 @@ export const DEFAULT_CONFIG: BridgeConfig = {
2854export abstract class AbstractBridge {
2955
3056 config : BridgeConfig ;
57+ fetch : fetchPonyfill = fetchPonyfill ( ) . fetch ;
3158 headers : any = { } ;
3259 baseUrl : string ;
3360 errorHandler : ( error : Error ) => void ;
@@ -87,18 +114,33 @@ export abstract class AbstractBridge {
87114 }
88115 }
89116
90- private fireRequest ( url : string , body : Request | any , queryParams : any = { } ) : Axios . IPromise < any > {
117+ // tslint:disable-next-line max-line-length
118+ private fireRequest ( url : string , body : Request | any , queryParams : any = { } ) : fetchPonyfill . Promise < any > {
91119 const options = {
92- url,
93- method : 'post' ,
94- params : queryParams ,
95- data : this . augmentRequest ( body ) ,
96- headers : this . headers ,
97- responseType : 'json' ,
98- timeout : this . config . timeout
120+ method : 'POST' ,
121+ headers : {
122+ 'Content-Type' : 'application/json' ,
123+ ...this . headers
124+ } ,
125+ body : JSON . stringify ( this . augmentRequest ( body ) ) ,
99126 } ;
100- return axios ( options )
101- . then ( ( res ) => res . data )
127+
128+ const params = qs . stringify ( queryParams ) ;
129+ url = params ? `${ url } ${ params } : url ;
130+ return Promise . race ( [ this . fetch ( url , options ) , createTimeoutPromise ( this . config . timeout ) ] )
131+ . then ( ( res ) => {
132+ if ( res . ok ) {
133+ return res . json ( ) ;
134+ } else {
135+ return res . json ( ) . then ( ( err ) => {
136+ throw new BridgeError (
137+ res . statusText ,
138+ res . status ,
139+ err
140+ ) ;
141+ } ) ;
142+ }
143+ } )
102144 . catch ( ( err ) => {
103145 if ( this . errorHandler ) {
104146 this . errorHandler ( err ) ;
0 commit comments