Merge pull request #14 from hapinessjs/next

Next

Author: fauvillej

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@hapiness/redis",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "description": "Hapiness module for redis",
     "main": "commonjs/index.js",
     "types": "index.d.ts",

package.json

@@ -3,4 +3,5 @@ import { ClientOpts } from 'redis';
 export interface RedisConfig extends ClientOpts {
     reconnect_interval?: number;
     ping_keepalive_interval?: number; // In seconds
+    command_timeout?: number;
 }

src/module/interfaces/redis.config.ts

@@ -4,7 +4,7 @@ import * as redis_commands from 'redis-commands';
 
 import * as EventEmitter from 'events';
 
-import { Observable } from 'rxjs';
+import { Observable, TimeoutError } from 'rxjs';
 import { URL } from 'url';
 
 import { RedisConfig } from '../interfaces';
@@ -148,7 +148,17 @@ export class RedisClientManager {
                     observer.complete();
                 }
             });
-        });
+        }).timeout((this._config.command_timeout || 2) * 1000).retryWhen(e =>
+            e.flatMap(err => {
+                if (err instanceof TimeoutError) {
+                    this._client.end(true);
+                    debug(`Got a timeout on ${command}`);
+                    return this.createClient();
+                } else {
+                    return Observable.throw(err);
+                }
+            })
+        );
     }
 
     public get client(): RedisClient {

src/module/managers/redis-client.manager.ts

@@ -32,4 +32,6 @@ export class FakeRedisClient extends EventEmitter {
         cb(null, null);
         return true;
     }
+
+    end() {}
 }

test/mocks/redis.mock.ts

@@ -168,4 +168,29 @@ export class RedisClientManagerTest {
                 }
             );
     }
+
+    // @test.only('- ')
+    // test(done) {
+    //     const fakeInst = new FakeRedisClient();
+
+    //     const redisStub = mockRedisCreateConnection();
+    //     redisStub.returns(<any>fakeInst);
+
+    //     Observable
+    //         .of(fakeInst)
+    //         .delay(new Date(Date.now() + 1500))
+    //         .map(_ => fakeInst.emit('ready'))
+    //         .subscribe();
+
+    //     const manager = new RedisClientManager(
+    //         {
+    //             url: '//toto',
+    //             password: 'pass_redis',
+    //             db: '2'
+    //         }
+    //     );
+
+    //     manager.createClient().flatMap(_ => manager.sendCommand('get', []))
+    //         .subscribe(_ => { console.log('NEXT'); done() }, e => { console.log(e); done(e) });
+    // }
 }