Feature/add request timeout

CHANGELOG.md

@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Option for request timeout
 
 
 ## [v0.4.0]

RestExtractor.spec.ts

@@ -179,4 +179,26 @@ describe('RestExtractor', () => {
             });
     });
 
+    it('should set request timeout', done => {
+        extractor = new RestExtractor('url', RestExtractorMethod.Get, undefined, {
+            timeout: 42
+        });
+        (extractor as any).rest = new SelectorMock();
+
+        sinon.spy((extractor as any).rest, 'request');
+
+        extractor
+            .read()
+            .subscribe(() => {}, err => {
+                done(err);
+            }, () => {
+                try {
+                    (extractor as any).rest.request.should.be.calledWith('url', { method: 'get', timeout: 42 });
+                    done();
+                } catch (e) {
+                    done(e);
+                }
+            });
+    });
+
 });

RestExtractor.ts

@@ -7,6 +7,28 @@ export enum RestExtractorMethod {
     Put
 }
 
+type MethodOptions = {
+    method?: string;
+};
+
+export type RestExtractorOptions = {
+    query?: any;
+    data?: string | any;
+    parser?: any;
+    encoding?: string;
+    decoding?: string;
+    headers?: { [name: string]: string };
+    username?: string;
+    password?: string;
+    accessToken?: string;
+    multipart?: any;
+    client?: any;
+    followRedirects?: boolean;
+    timeout?: number;
+    rejectUnauthorized?: boolean;
+    agent?: any;
+};
+
 /**
  *
  */
@@ -18,16 +40,17 @@ export class RestExtractor implements Extractor {
      * @param url
      * @param method
      * @param resultSelector
+     * @param {number} [timeout=120000] Request timeout in milliseconds
      */
-    constructor(private url:string, private method:RestExtractorMethod = RestExtractorMethod.Get, private resultSelector:(obj:any) => any = o => o) {
+    constructor(private url:string, private method:RestExtractorMethod = RestExtractorMethod.Get, private resultSelector:(obj:any) => any = o => o, private restlerOptions: RestExtractorOptions = {}) {
     }
 
-    public read():Observable<any> {
+    public read(): Observable<any> {
         return Observable.create((observer:Observer<any>) => {
+            let options: MethodOptions & RestExtractorOptions = this.restlerOptions;
+            options.method = this.getUrlMethod(); 
             this.rest
-                .request(this.url, {
-                    method: this.getUrlMethod()
-                })
+                .request(this.url, options)
                 .on('error', err => {
                     observer.error(err);
                 })

package.json

@@ -42,6 +42,6 @@
   "dependencies": {
     "proc-that": "^0.4.0",
     "restler": "^3.4.0",
-    "rxjs": "^5.0.0-beta.10"
+    "rxjs": "5.0.0-beta.10"
   }
 }