Fix guaranteedCommand

spotware · Mar 2, 2017 · f791b31 · f791b31
1 parent 7c80c83
commit f791b31
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 5 deletions.
diff --git a/lib/connect.d.ts b/lib/connect.d.ts
@@ -64,6 +64,7 @@ export declare class Connect extends EventEmitter {
     sendCommandWithoutResponse(payloadType: number, payload: Object): void;
     sendMultiresponseCommand(multiResponseParams: IMultiResponseParams): void;
     sendCommandWithPayloadtype(payloadType: number, payload: Object): Promise<IMessageWOMsgId>;
+    sendGuaranteedMultiresponseCommand(payloadType: number, payload: Object): Promise<IMessageWOMsgId>;
     sendGuaranteedCommandWithPayloadtype(payloadType: number, payload: Object): Promise<IMessageWOMsgId>;
     onConnect(): void;
     onEnd(e: any): void;

diff --git a/lib/connect.js b/lib/connect.js
@@ -175,15 +175,36 @@ var Connect = (function (_super) {
             });
         });
     };
+    Connect.prototype.sendGuaranteedMultiresponseCommand = function (payloadType, payload) {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            _this.sendMultiresponseCommand({
+                payloadType: payloadType,
+                payload: payload,
+                onMessage: function (result) {
+                    if (_this.isError(result.payloadType)) {
+                        reject(result);
+                    }
+                    else {
+                        resolve(result);
+                    }
+                    return true;
+                },
+                onError: function (err) {
+                    _this.sendGuaranteedMultiresponseCommand(payloadType, payload).then(resolve, reject);
+                }
+            });
+        });
+    };
     Connect.prototype.sendGuaranteedCommandWithPayloadtype = function (payloadType, payload) {
         var _this = this;
         if (this.isConnected()) {
-            return this.sendCommandWithPayloadtype(payloadType, payload);
+            return this.sendGuaranteedMultiresponseCommand(payloadType, payload);
         }
         else {
             return new Promise(function (resolve, reject) {
                 _this.callbacksOnConnect.push(function () {
-                    _this.sendCommandWithPayloadtype(payloadType, payload)
+                    _this.sendGuaranteedMultiresponseCommand(payloadType, payload)
                         .then(resolve, reject);
                 });
             });

diff --git a/lib/connect.ts b/lib/connect.ts
@@ -246,13 +246,33 @@ export class Connect extends EventEmitter {
         });
     }
 
+    public sendGuaranteedMultiresponseCommand(payloadType: number, payload: Object): Promise<IMessageWOMsgId> {
+        return new Promise((resolve, reject) => {
+            this.sendMultiresponseCommand({
+                payloadType,
+                payload,
+                onMessage: result => {
+                    if (this.isError(result.payloadType)) {
+                        reject(result);
+                    } else {
+                        resolve(result);
+                    }
+                    return true;
+                },
+                onError: (err) => {
+                    this.sendGuaranteedMultiresponseCommand(payloadType, payload).then(resolve, reject);
+                }
+            });
+        });
+    }
+
     public sendGuaranteedCommandWithPayloadtype(payloadType: number, payload: Object): Promise<IMessageWOMsgId> {
         if (this.isConnected()) {
-            return this.sendCommandWithPayloadtype(payloadType, payload);
+            return this.sendGuaranteedMultiresponseCommand(payloadType, payload);
         } else {
             return new Promise((resolve, reject) => {
                 this.callbacksOnConnect.push(() => {
-                    this.sendCommandWithPayloadtype(payloadType, payload)
+                    this.sendGuaranteedMultiresponseCommand(payloadType, payload)
                         .then(resolve, reject);
                 });
             });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "connect-ts-api",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "main": "lib/connect.js",
   "scripts": {
     "lint": "tslint **/*.ts",