fix: error message format for backward compatibility

pubnub · Apr 16, 2024 · a20ebf9 · a20ebf9
1 parent 780fa90
commit a20ebf9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/lib/errors/pubnub-api-error.js b/lib/errors/pubnub-api-error.js
@@ -88,12 +88,10 @@ export class PubNubAPIError extends Error {
                             errorData = errorResponse;
                             status = errorResponse.status;
                         }
-                        if ('error' in errorResponse &&
-                            typeof errorResponse.error === 'object' &&
-                            !Array.isArray(errorResponse.error) &&
-                            'message' in errorResponse.error) {
+                        else
+                            errorData = errorResponse;
+                        if ('error' in errorResponse && errorResponse.error instanceof Error)
                             errorData = errorResponse.error;
-                        }
                     }
                 }
                 catch (_) {

diff --git a/src/errors/pubnub-api-error.ts b/src/errors/pubnub-api-error.ts
@@ -124,16 +124,9 @@ export class PubNubAPIError extends Error {
             ) {
               errorData = errorResponse;
               status = errorResponse.status;
-            }
+            } else errorData = errorResponse;
 
-            if (
-              'error' in errorResponse &&
-              typeof errorResponse.error === 'object' &&
-              !Array.isArray(errorResponse.error!) &&
-              'message' in errorResponse.error!
-            ) {
-              errorData = errorResponse.error;
-            }
+            if ('error' in errorResponse && errorResponse.error instanceof Error) errorData = errorResponse.error;
           }
         } catch (_) {
           errorData = decoded;
@@ -164,6 +157,7 @@ export class PubNubAPIError extends Error {
     public readonly errorData?: Error | Payload,
   ) {
     super(message);
+
     this.name = 'PubNubAPIError';
   }