Use SyncPromise static methods everywhere

kamilogorek · kamilogorek · commit fc7c397b4ddd · 2019-10-03T10:38:04.000+02:00
diff --git a/packages/browser/src/sdk.ts b/packages/browser/src/sdk.ts
@@ -1,5 +1,5 @@
 import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
-import { getGlobalObject } from '@sentry/utils';
+import { getGlobalObject, SyncPromise } from '@sentry/utils';
 
 import { BrowserOptions } from './backend';
 import { BrowserClient, ReportDialogOptions } from './client';
@@ -138,7 +138,7 @@ export function flush(timeout?: number): Promise<boolean> {
   if (client) {
     return client.flush(timeout);
   }
-  return Promise.reject(false);
+  return SyncPromise.reject(false);
 }
 
 /**
@@ -152,7 +152,7 @@ export function close(timeout?: number): Promise<boolean> {
   if (client) {
     return client.close(timeout);
   }
-  return Promise.reject(false);
+  return SyncPromise.reject(false);
 }
 
 /**
diff --git a/packages/browser/src/transports/xhr.ts b/packages/browser/src/transports/xhr.ts
@@ -1,4 +1,5 @@
 import { Event, Response, Status } from '@sentry/types';
+import { SyncPromise } from '@sentry/utils';
 
 import { BaseTransport } from './base';
 
@@ -9,7 +10,7 @@ export class XHRTransport extends BaseTransport {
    */
   public sendEvent(event: Event): Promise<Response> {
     return this._buffer.add(
-      new Promise<Response>((resolve, reject) => {
+      new SyncPromise<Response>((resolve, reject) => {
         const request = new XMLHttpRequest();
 
         request.onreadystatechange = () => {
diff --git a/packages/browser/test/unit/mocks/simpletransport.ts b/packages/browser/test/unit/mocks/simpletransport.ts
@@ -1,10 +1,12 @@
+import { SyncPromise } from '@sentry/utils';
+
 import { Event, Response, Status } from '../../../src';
 import { BaseTransport } from '../../../src/transports';
 
 export class SimpleTransport extends BaseTransport {
   public sendEvent(_: Event): Promise<Response> {
     return this._buffer.add(
-      Promise.resolve({
+      SyncPromise.resolve({
         status: Status.fromHttpCode(200),
       }),
     );
diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
@@ -205,7 +205,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
 
   /** Waits for the client to be done with processing. */
   protected _isClientProcessing(timeout?: number): Promise<{ ready: boolean; interval: number }> {
-    return new Promise<{ ready: boolean; interval: number }>(resolve => {
+    return new SyncPromise<{ ready: boolean; interval: number }>(resolve => {
       let ticked: number = 0;
       const tick: number = 1;
 
diff --git a/packages/core/src/transports/noop.ts b/packages/core/src/transports/noop.ts
@@ -1,12 +1,13 @@
 import { Event, Response, Status, Transport } from '@sentry/types';
+import { SyncPromise } from '@sentry/utils';
 
 /** Noop transport */
 export class NoopTransport implements Transport {
   /**
    * @inheritDoc
    */
   public sendEvent(_: Event): Promise<Response> {
-    return Promise.resolve({
+    return SyncPromise.resolve({
       reason: `NoopTransport: Event has been skipped because no Dsn is configured.`,
       status: Status.Skipped,
     });
@@ -16,6 +17,6 @@ export class NoopTransport implements Transport {
    * @inheritDoc
    */
   public close(_?: number): Promise<boolean> {
-    return Promise.resolve(true);
+    return SyncPromise.resolve(true);
   }
 }
diff --git a/packages/core/test/mocks/transport.ts b/packages/core/test/mocks/transport.ts
@@ -1,8 +1,8 @@
 import { Event, Response, Status, Transport } from '@sentry/types';
-import { PromiseBuffer } from '@sentry/utils';
+import { PromiseBuffer, SyncPromise } from '@sentry/utils';
 
 async function sleep(delay: number): Promise<void> {
-  return new Promise(resolve => setTimeout(resolve, delay));
+  return new SyncPromise(resolve => setTimeout(resolve, delay));
 }
 
 export class FakeTransport implements Transport {
@@ -16,7 +16,7 @@ export class FakeTransport implements Transport {
   public sendEvent(_event: Event): Promise<Response> {
     this.sendCalled += 1;
     return this._buffer.add(
-      new Promise(async res => {
+      new SyncPromise(async res => {
         await sleep(this.delay);
         this.sentCount += 1;
         res({ status: Status.Success });
diff --git a/packages/utils/src/promisebuffer.ts b/packages/utils/src/promisebuffer.ts
@@ -1,4 +1,5 @@
 import { SentryError } from './error';
+import { SyncPromise } from './syncpromise';
 
 /** A simple queue that holds promises. */
 export class PromiseBuffer<T> {
@@ -22,7 +23,7 @@ export class PromiseBuffer<T> {
    */
   public add(task: Promise<T>): Promise<T> {
     if (!this.isReady()) {
-      return Promise.reject(new SentryError('Not adding Promise due to buffer limit reached.'));
+      return SyncPromise.reject(new SentryError('Not adding Promise due to buffer limit reached.'));
     }
     if (this._buffer.indexOf(task) === -1) {
       this._buffer.push(task);
@@ -63,7 +64,7 @@ export class PromiseBuffer<T> {
    * @param timeout Number in ms to wait until it resolves with false.
    */
   public drain(timeout?: number): Promise<boolean> {
-    return new Promise<boolean>(resolve => {
+    return new SyncPromise<boolean>(resolve => {
       const capturedSetTimeout = setTimeout(() => {
         if (timeout && timeout > 0) {
           resolve(false);
diff --git a/packages/utils/src/syncpromise.ts b/packages/utils/src/syncpromise.ts
@@ -78,7 +78,6 @@ export class SyncPromise<T> implements Promise<T> {
             if (counter !== 0) {
               return;
             }
-
             resolve(resolvedCollection);
           })
           .catch(reject);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';`
`2`		`-import { getGlobalObject } from '@sentry/utils';`
	`2`	`+import { getGlobalObject, SyncPromise } from '@sentry/utils';`
`3`	`3`
`4`	`4`	`import { BrowserOptions } from './backend';`
`5`	`5`	`import { BrowserClient, ReportDialogOptions } from './client';`
`@@ -138,7 +138,7 @@ export function flush(timeout?: number): Promise<boolean> {`
`138`	`138`	`if (client) {`
`139`	`139`	`return client.flush(timeout);`
`140`	`140`	`}`
`141`		`- return Promise.reject(false);`
	`141`	`+ return SyncPromise.reject(false);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`/**`
`@@ -152,7 +152,7 @@ export function close(timeout?: number): Promise<boolean> {`
`152`	`152`	`if (client) {`
`153`	`153`	`return client.close(timeout);`
`154`	`154`	`}`
`155`		`- return Promise.reject(false);`
	`155`	`+ return SyncPromise.reject(false);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ export class SyncPromise<T> implements Promise<T> {`
`78`	`78`	`if (counter !== 0) {`
`79`	`79`	`return;`
`80`	`80`	`}`
`81`		`-`
`82`	`81`	`resolve(resolvedCollection);`
`83`	`82`	`})`
`84`	`83`	`.catch(reject);`