Merge pull request #8 from spirinvladimir/master

v1.2.2

lib/command.d.ts

@@ -1,8 +1,8 @@
 export declare class Command {
-    private msg;
+    clientMsgId: string;
     promise: JQueryDeferred<any>;
-    constructor(msg: any);
+    constructor(params: any);
     done(respond: any): void;
-    fail(): void;
+    fail(respond: any): void;
     private destroy();
 }

lib/command.ts

@@ -1,10 +1,9 @@
 export class Command {
-
-    private msg: any;
+    public clientMsgId: string;
     public promise: JQueryDeferred<any>;
 
-    constructor(msg: any) {
-        this.msg = msg;
+    constructor(params) {
+        this.clientMsgId = params.clientMsgId;
         this.promise = $.Deferred();
     }
 
@@ -19,6 +18,6 @@ export class Command {
     }
 
     private destroy() {
-        delete this.msg;
+        delete this.clientMsgId;
     }
 }

lib/commands.d.ts

@@ -1,11 +1,10 @@
+import { Command } from './command';
 export declare class Commands {
     private state;
     private send;
     private openCommands;
     constructor(params: any);
-    create(msg: any): JQueryDeferred<any>;
-    findAndResolve(msg: any, clientMsgId: string): boolean;
+    create(params: any): JQueryDeferred<any>;
     fail(): void;
-    private find(clientMsgId);
-    private delete(command);
+    extract(clientMsgId: string): Command;
 }

lib/commands.ts

@@ -5,18 +5,23 @@ export class Commands {
 
     private state: State;
     private send: any;
-    private openCommands: any;
+    private openCommands: Command[];
 
     constructor(params: any) {
         this.state = params.state;
         this.send = params.send;
         this.openCommands = [];
     }
 
-    public create(msg: any): JQueryDeferred<any> {
+    public create(params): JQueryDeferred<any> {
+        var clientMsgId = params.clientMsgId;
+        var msg = params.msg;
+
         var openCommands = this.openCommands;
 
-        var command = new Command(msg);
+        var command = new Command({
+            clientMsgId: clientMsgId
+        });
 
         openCommands.push(command);
 
@@ -38,18 +43,16 @@ export class Commands {
         }
     }
 
-    public extract(clientMsgId: string): any {
+    public extract(clientMsgId: string): Command {
         var openCommands = this.openCommands;
         var openCommandsLength = openCommands.length;
         var command;
-        var index = 0;
-        while (index < openCommandsLength) {
-            var command = openCommands[index];
-            if (command.msg.clientMsgId === clientMsgId) {
-                openCommands.splice(index, 1);
+        for (var i = 0; i < openCommandsLength; i += 1) {
+            command = openCommands[i];
+            if (command.clientMsgId === clientMsgId) {
+                openCommands.splice(i, 1);
                 return command;
             }
-            index += 1;
         }
     }
 

lib/connect.d.ts

@@ -1,40 +1,5 @@
 import { EventEmitter } from 'events';
-export declare class GuaranteedCommand {
-    private msg;
-    promise: JQueryDeferred<any>;
-    constructor(msg: any);
-    done(msg: any): void;
-    fail(msg: any): void;
-    private destroy();
-}
-export declare class GuaranteedCommands {
-    private state;
-    private send;
-    private openCommands;
-    constructor(params: any);
-    create(msg: any): JQueryDeferred<any>;
-    resend(): void;
-    extract(clientMsgId: string): any;
-}
-export declare class Command {
-    private msg;
-    promise: JQueryDeferred<any>;
-    constructor(msg: any);
-    done(respond: any): void;
-    fail(respond: any): void;
-    private destroy();
-}
-export declare class Commands {
-    private state;
-    private send;
-    private openCommands;
-    constructor(params: any);
-    create(msg: any): JQueryDeferred<any>;
-    fail(): void;
-    extract(clientMsgId: string): any;
-}
 export interface IConnectionParams {
-    adapter: any;
     encodeDecode: any;
     protocol: any;
 }
@@ -46,17 +11,20 @@ export declare class Connect extends EventEmitter {
     private guaranteedCommands;
     private commands;
     constructor(params: IConnectionParams);
+    getAdapter(): any;
     setAdapter(adapter: any): void;
     private initialization();
-    start(): JQueryDeferred<{}>;
+    start(): JQueryPromise<void>;
     private onData(data);
     private onOpen();
-    sendGuaranteedCommand(payloadType: any, params: any): JQueryDeferred<any>;
-    sendCommand(payloadType: any, params: any): JQueryDeferred<any>;
-    private send(msg);
+    sendGuaranteedCommand(payloadType: number, params: any): JQueryDeferred<any>;
+    sendCommand(payloadType: number, params: any): JQueryDeferred<any>;
+    private send(data);
     private onMessage(data);
+    private processData(clientMsgId, payloadType, msg);
+    private extractCommand(clientMsgId);
     protected isError(payloadType: any): boolean;
-    protected processMessage(msg: any, clientMsgId: string, payloadType: number): void;
+    protected processMessage(command: any, msg: any, payloadType: any): void;
     protected processPushEvent(msg: any, payloadType: any): void;
     private _onEnd(e);
     isDisconnected(): boolean;