Skip to content

Commit 90d8a6a

Browse files
HazATHazAT
committed
ref: Remove async/await syntax
1 parent be5bee5 commit 90d8a6a

File tree

15 files changed

+38
-52
lines changed

15 files changed

+38
-52
lines changed

‎packages/browser/src/sdk.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export function onLoad(callback: () => void): void {
124124
*
125125
* @param timeout Maximum time in ms the client should wait.
126126
*/
127-
export async function flush(timeout?: number): Promise<boolean> {
127+
export function flush(timeout?: number): Promise<boolean> {
128128
const client = getCurrentHub().getClient<BrowserClient>();
129129
if (client) {
130130
return client.flush(timeout);
@@ -138,7 +138,7 @@ export async function flush(timeout?: number): Promise<boolean> {
138138
*
139139
* @param timeout Maximum time in ms the client should wait.
140140
*/
141-
export async function close(timeout?: number): Promise<boolean> {
141+
export function close(timeout?: number): Promise<boolean> {
142142
const client = getCurrentHub().getClient<BrowserClient>();
143143
if (client) {
144144
return client.close(timeout);

‎packages/browser/src/transports/base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ export abstract class BaseTransport implements Transport {
1919
/**
2020
* @inheritDoc
2121
*/
22-
public async sendEvent(_: Event): Promise<Response> {
22+
public sendEvent(_: Event): Promise<Response> {
2323
throw new SentryError('Transport Class has to implement `sendEvent` method');
2424
}
2525

2626
/**
2727
* @inheritDoc
2828
*/
29-
public async close(timeout?: number): Promise<boolean> {
29+
public close(timeout?: number): Promise<boolean> {
3030
return this._buffer.drain(timeout);
3131
}
3232
}

‎packages/browser/src/transports/fetch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class FetchTransport extends BaseTransport {
1010
/**
1111
* @inheritDoc
1212
*/
13-
public async sendEvent(event: Event): Promise<Response> {
13+
public sendEvent(event: Event): Promise<Response> {
1414
const defaultOptions: RequestInit = {
1515
body: JSON.stringify(event),
1616
method: 'POST',

‎packages/browser/src/transports/xhr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export class XHRTransport extends BaseTransport {
77
/**
88
* @inheritDoc
99
*/
10-
public async sendEvent(event: Event): Promise<Response> {
10+
public sendEvent(event: Event): Promise<Response> {
1111
return this._buffer.add(
1212
new Promise<Response>((resolve, reject) => {
1313
const request = new XMLHttpRequest();

‎packages/browser/test/mocks/simpletransport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Event, Response, Status } from '../../src';
22
import { BaseTransport } from '../../src/transports';
33

44
export class SimpleTransport extends BaseTransport {
5-
public async sendEvent(_: Event): Promise<Response> {
5+
public sendEvent(_: Event): Promise<Response> {
66
return this._buffer.add(
77
Promise.resolve({
88
status: Status.fromHttpCode(200),

‎packages/core/src/baseclient.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,24 +165,26 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
165165
/**
166166
* @inheritDoc
167167
*/
168-
public async flush(timeout?: number): Promise<boolean> {
169-
const clientReady = await this._isClientProcessing(timeout);
170-
if (this._processingInterval) {
171-
clearInterval(this._processingInterval);
172-
}
173-
const transportFlushed = await this._getBackend()
174-
.getTransport()
175-
.close(timeout);
176-
return clientReady && transportFlushed;
168+
public flush(timeout?: number): Promise<boolean> {
169+
return this._isClientProcessing(timeout).then(clientReady => {
170+
if (this._processingInterval) {
171+
clearInterval(this._processingInterval);
172+
}
173+
return this._getBackend()
174+
.getTransport()
175+
.close(timeout)
176+
.then(transportFlushed => clientReady && transportFlushed);
177+
});
177178
}
178179

179180
/**
180181
* @inheritDoc
181182
*/
182-
public async close(timeout?: number): Promise<boolean> {
183-
const result = await this.flush(timeout);
184-
this.getOptions().enabled = false;
185-
return result;
183+
public close(timeout?: number): Promise<boolean> {
184+
return this.flush(timeout).then(result => {
185+
this.getOptions().enabled = false;
186+
return result;
187+
});
186188
}
187189

188190
/**
@@ -205,7 +207,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
205207
}
206208

207209
/** Waits for the client to be done with processing. */
208-
protected async _isClientProcessing(timeout?: number): Promise<boolean> {
210+
protected _isClientProcessing(timeout?: number): Promise<boolean> {
209211
return new Promise<boolean>(resolve => {
210212
let ticked: number = 0;
211213
const tick: number = 1;

‎packages/core/src/transports/noop.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export class NoopTransport implements Transport {
55
/**
66
* @inheritDoc
77
*/
8-
public async sendEvent(_: Event): Promise<Response> {
8+
public sendEvent(_: Event): Promise<Response> {
99
return Promise.resolve({
1010
reason: `NoopTransport: Event has been skipped because no Dsn is configured.`,
1111
status: Status.Skipped,
@@ -15,7 +15,7 @@ export class NoopTransport implements Transport {
1515
/**
1616
* @inheritDoc
1717
*/
18-
public async close(_?: number): Promise<boolean> {
18+
public close(_?: number): Promise<boolean> {
1919
return Promise.resolve(true);
2020
}
2121
}

‎packages/core/test/mocks/transport.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class FakeTransport implements Transport {
1313
public sentCount: number = 0;
1414
public delay: number = 2000;
1515

16-
public async sendEvent(_event: Event): Promise<Response> {
16+
public sendEvent(_event: Event): Promise<Response> {
1717
this.sendCalled += 1;
1818
return this._buffer.add(
1919
new Promise(async res => {
@@ -24,7 +24,7 @@ export class FakeTransport implements Transport {
2424
);
2525
}
2626

27-
public async close(timeout?: number): Promise<boolean> {
27+
public close(timeout?: number): Promise<boolean> {
2828
return this._buffer.drain(timeout);
2929
}
3030
}

‎packages/node/src/transports/base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ export abstract class BaseTransport implements Transport {
108108
/**
109109
* @inheritDoc
110110
*/
111-
public async sendEvent(_: Event): Promise<Response> {
111+
public sendEvent(_: Event): Promise<Response> {
112112
throw new SentryError('Transport Class has to implement `sendEvent` method.');
113113
}
114114

115115
/**
116116
* @inheritDoc
117117
*/
118-
public async close(timeout?: number): Promise<boolean> {
118+
public close(timeout?: number): Promise<boolean> {
119119
return this._buffer.drain(timeout);
120120
}
121121
}

‎packages/node/src/transports/http.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class HTTPTransport extends BaseTransport {
2121
/**
2222
* @inheritDoc
2323
*/
24-
public async sendEvent(event: Event): Promise<Response> {
24+
public sendEvent(event: Event): Promise<Response> {
2525
if (!this.module) {
2626
throw new SentryError('No module available in HTTPTransport');
2727
}

‎packages/node/src/transports/https.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class HTTPSTransport extends BaseTransport {
2121
/**
2222
* @inheritDoc
2323
*/
24-
public async sendEvent(event: Event): Promise<Response> {
24+
public sendEvent(event: Event): Promise<Response> {
2525
if (!this.module) {
2626
throw new SentryError('No module available in HTTPSTransport');
2727
}

‎packages/node/test/helper/settimeouttransport.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎packages/node/test/index.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import {
1414
} from '../src';
1515
import { NodeBackend } from '../src/backend';
1616

17-
import { SetTimeoutTransport } from './helper/settimeouttransport';
18-
1917
const dsn = 'https://[email protected]/4291';
2018

2119
declare var global: any;

‎packages/typescript/tslint.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"no-inferrable-types": false,
1818
"ban-ts-ignore": false,
1919
"increment-decrement": false,
20+
"promise-function-async": false,
21+
"ban-types": [true, ["async", "Use Promises instead, it add a lot to bundle size."]],
2022
// These are too strict in tslint:all
2123
"comment-format": [true, "check-space"],
2224
"completed-docs": [

‎packages/utils/src/promisebuffer.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ export class PromiseBuffer<T> {
2020
* @param task Can be any Promise<T>
2121
* @returns The original promise.
2222
*/
23-
public async add(task: Promise<T>): Promise<T> {
23+
public add(task: Promise<T>): Promise<T> {
2424
if (!this.isReady()) {
2525
return Promise.reject(new SentryError('Not adding Promise due to buffer limit reached.'));
2626
}
2727
if (this._buffer.indexOf(task) === -1) {
2828
this._buffer.push(task);
2929
}
3030
task
31-
.then(async () => this.remove(task))
32-
.catch(async () =>
31+
.then(() => this.remove(task))
32+
.catch(() =>
3333
this.remove(task).catch(() => {
3434
// We have to add this catch here otherwise we have an unhandledPromiseRejection
3535
// because it's a new Promise chain.
@@ -44,7 +44,7 @@ export class PromiseBuffer<T> {
4444
* @param task Can be any Promise<T>
4545
* @returns Removed promise.
4646
*/
47-
public async remove(task: Promise<T>): Promise<T> {
47+
public remove(task: Promise<T>): Promise<T> {
4848
const removedTask = this._buffer.splice(this._buffer.indexOf(task), 1)[0];
4949
return removedTask;
5050
}
@@ -62,7 +62,7 @@ export class PromiseBuffer<T> {
6262
*
6363
* @param timeout Number in ms to wait until it resolves with false.
6464
*/
65-
public async drain(timeout?: number): Promise<boolean> {
65+
public drain(timeout?: number): Promise<boolean> {
6666
return new Promise<boolean>(resolve => {
6767
const capturedSetTimeout = setTimeout(() => {
6868
if (timeout && timeout > 0) {

0 commit comments

Comments
 (0)