Merge pull request #245 from KSDaemon/conn-abort-handle

fix: rejecting connection promise on ABORT message
KSDaemon · Jan 9, 2023 · 1dc0539 · 1dc0539
2 parents 2f31833 + 58e77ab
commit 1dc0539
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/wampy.js b/src/wampy.js
@@ -946,8 +946,13 @@ class Wampy {
      * @private
      */
     async _onAbortMessage ([, details, error]) {
+        const err = new Errors.AbortError({ error, details });
+        if (this._cache.connectPromise) {
+            this._cache.connectPromise.onError(err);
+            this._cache.connectPromise = null;
+        }
         if (this._options.onError) {
-            await this._options.onError(new Errors.AbortError({ error, details }));
+            await this._options.onError(err);
         }
         this._ws.close();
     }

diff --git a/test/send-data.js b/test/send-data.js
@@ -62,6 +62,16 @@ const WAMP_MSG_SPEC = {
             ],
             ruinMessage: true
         },
+        // reject connection promise if receives ABORT message
+        {
+            data: [
+                WAMP_MSG_SPEC.ABORT,
+                {
+                    info: 'Just testing abort connection',
+                },
+                'wamp.error.not_authorized'
+            ]
+        },
         // passes welcome details to onConnect() callback
         {
             data: [

diff --git a/test/wampy-common-test.js b/test/wampy-common-test.js
@@ -107,6 +107,19 @@ serializers.forEach(function (item) {
                 });
             });
 
+            it('reject connection promise if receives ABORT message', async function () {
+                const wampy = new Wampy(routerUrl, {
+                    realm     : 'AppRealm',
+                    ws,
+                    serializer: new serializer()
+                });
+                try {
+                    await wampy.connect();
+                } catch (e) {
+                    expect(e).to.be.instanceOf(Errors.AbortError);
+                }
+            });
+
             it('passes welcome details to onConnect() callback', async function () {
                 const wampy = new Wampy(routerUrl, {
                     realm     : 'AppRealm',