Merge pull request #5428 from MugeSo/export-rsmq-worker-client

rsmq-worker: export Client interface and fix option interface

rsmq-worker/rsmq-worker-tests.ts

@@ -1,7 +1,9 @@
 
 import RSMQWorker = require('rsmq-worker');
 
-var worker = new RSMQWorker("my-queue");
+var worker: RSMQWorker.Client;
+
+worker = new RSMQWorker("my-queue");
 worker.changeInterval(1);
 worker.changeInterval([0, 1, 5, 10]);
 

rsmq-worker/rsmq-worker.d.ts

@@ -1,6 +1,6 @@
 // Type definitions for rsmq-worker 0.3.5
 // Project: http://smrchy.github.io/rsmq/rsmq-worker/
-// Definitions by: Qubo <https://github.com/MugeSo>
+// Definitions by: TANAKA Koichi <https://github.com/MugeSo>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path='../rsmq/rsmq.d.ts'/>
@@ -9,44 +9,45 @@ declare module "rsmq-worker" {
     import redis = require('redis');
     import events = require('events');
 
-    interface CallbackT<R> {
-        (e?:Error, res?:R): void;
+    module RSMQWorker {
+        export interface Client extends events.EventEmitter {
+            start(): Client;
+            stop(): Client;
+            send(message: string, delay?: number, cb?: CallbackT<string>): Client;
+            send(message: string, cb: CallbackT<string>): Client;
+            del(id: string, cb?: CallbackT<void>): Client;
+            changeInterval(interval: number|number[]): Client;
+        }
+
+        export interface Options {
+            interval?: number;
+            maxReceiveCount?: number;
+            invisibletime?: number;
+            defaultDelay?: number;
+            autostart?: boolean;
+            timeout?: number;
+            customExceedCheck?: CustomExceedCheckCallback;
+            rsmq?: RedisSMQ.Client;
+            redis?: redis.RedisClient;
+            redisPrefix?: string;
+            host?: string;
+            port?: number;
+            options?: redis.ClientOpts;
+        }
+
+        export interface CustomExceedCheckCallback {
+            (message: RedisSMQ.Message): boolean;
+        }
+
+        export interface CallbackT<R> {
+            (e?:Error, res?:R): void;
+        }
     }
 
     interface RSMQWorkerStatic {
-        new(queuename: string, options?: WorkerOptions): RSMQWorker;
+        new(queuename: string, options?: RSMQWorker.Options): RSMQWorker.Client;
     }
 
-    interface WorkerOptions {
-        interval?: number;
-        maxReceiveCount?: number;
-        invisibletime?: number;
-        defaultDelay?: number;
-        autostart?: boolean;
-        timeout: number;
-        customExceedCheck?: CustomExceedCheckCallback;
-        rsmq?: RedisSMQ.Client;
-        redis?: redis.RedisClient;
-        redisPrefix?: string;
-        host?: string;
-        port?: number;
-        options?: redis.ClientOpts;
-    }
-
-    interface CustomExceedCheckCallback {
-        (message: RedisSMQ.Message): boolean;
-    }
-
-
-    interface RSMQWorker extends events.EventEmitter {
-        start(): RSMQWorker;
-        stop(): RSMQWorker;
-        send(message: string, delay?: number, cb?: CallbackT<string>): RSMQWorker;
-        send(message: string, cb: CallbackT<string>): RSMQWorker;
-        del(id: string, cb?: CallbackT<void>): RSMQWorker;
-        changeInterval(interval: number|number[]): RSMQWorker;
-    }
-
-    var worker: RSMQWorkerStatic;
-    export = worker;
+    var RSMQWorker: RSMQWorkerStatic;
+    export = RSMQWorker;
 }