fix(core): Fix error handling when sending envelopes

Author: mydea

packages/core/src/client.ts

@@ -415,10 +415,9 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
       env = addItemToEnvelope(env, createAttachmentEnvelopeItem(attachment));
     }
 
-    const promise = this.sendEnvelope(env);
-    if (promise) {
-      promise.then(sendResponse => this.emit('afterSendEvent', event, sendResponse), null);
-    }
+    // sendEnvelope should not throw
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    this.sendEnvelope(env).then(sendResponse => this.emit('afterSendEvent', event, sendResponse));
   }
 
   /**
@@ -876,16 +875,18 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
   public sendEnvelope(envelope: Envelope): PromiseLike<TransportMakeRequestResponse> {
     this.emit('beforeEnvelope', envelope);
 
-    if (this._isEnabled() && this._transport) {
-      return this._transport.send(envelope).then(null, reason => {
-        DEBUG_BUILD && debug.error('Error while sending envelope:', reason);
-        return reason;
-      });
+    if (!this._isEnabled() || !this._transport) {
+      DEBUG_BUILD && debug.error('Transport disabled');
+      return resolvedSyncPromise({});
     }
 
-    DEBUG_BUILD && debug.error('Transport disabled');
-
-    return resolvedSyncPromise({});
+    return this._transport.send(envelope).then(
+      response => response,
+      reason => {
+        DEBUG_BUILD && debug.error('Error while sending envelope:', reason);
+        return {};
+      },
+    );
   }
 
   /* eslint-enable @typescript-eslint/unified-signatures */

packages/core/test/lib/client.test.ts

@@ -2268,7 +2268,7 @@ describe('Client', () => {
 
       expect(mockSend).toBeCalledTimes(1);
       expect(callback).toBeCalledTimes(1);
-      expect(callback).toBeCalledWith(errorEvent, 'send error');
+      expect(callback).toBeCalledWith(errorEvent, {});
     });
 
     it('passes the response to the hook', async () => {