Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/loader.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { headers, DEFAULT_TIMEOUT } from "./apiHelpers";
import { DEFAULT_TIMEOUT, headers } from "./apiHelpers";
import { EvaluationPayload } from "./config";
import Context from "./context";

Expand Down Expand Up @@ -44,6 +44,8 @@ export default class Loader {

abortController: AbortController | undefined;

isAborted: boolean = false;

constructor({
apiKey,
context,
Expand Down Expand Up @@ -74,6 +76,7 @@ export default class Loader {
) {
this.abortController = new AbortController() as AbortController;
const { signal } = this.abortController;
this.isAborted = false;

const endpoint = this.endpoints[index];
const url = this.url(endpoint);
Expand Down Expand Up @@ -109,12 +112,18 @@ export default class Loader {
index < this.endpoints.length - 1 ? Math.min(this.timeout, EARLY_TIMEOUT) : this.timeout;

this.abortTimeoutId = setTimeout(() => {
this.abortController?.abort();
if (!this.isAborted) {
this.isAborted = true;
this.abortController?.abort();
}
}, timeout);
}

load() {
this.abortController?.abort();
if (!this.isAborted) {
this.isAborted = true;
this.abortController?.abort();
}

const options = {
headers: headers(this.apiKey, this.clientVersion),
Expand Down
8 changes: 6 additions & 2 deletions src/telemetryUploader.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { headers, DEFAULT_TIMEOUT } from "./apiHelpers";
import { DEFAULT_TIMEOUT, headers } from "./apiHelpers";

export type TelemetryUploaderParams = {
apiKey: string;
Expand Down Expand Up @@ -41,6 +41,7 @@ export default class TelemetryUploader {
postToEndpoint(options: object, resolve: (value: any) => void, reject: (value: any) => void) {
const controller = new AbortController() as AbortController;
const signal = controller?.signal;
let isAborted = false;

const url = TelemetryUploader.postUrl(this.apiEndpoint);

Expand Down Expand Up @@ -81,7 +82,10 @@ export default class TelemetryUploader {
});

this.abortTimeoutId = setTimeout(() => {
controller.abort();
if (!isAborted) {
isAborted = true;
controller.abort();
}
}, this.timeout);
}

Expand Down