Skip to content

fix(lib-storage): use AbortController interface instead of class as type #5843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 29, 2024
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
8 changes: 4 additions & 4 deletions lib/lib-storage/src/Upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import {
Tag,
UploadPartCommand,
} from "@aws-sdk/client-s3";
import { AbortController, AbortSignal } from "@smithy/abort-controller";
import { AbortController } from "@smithy/abort-controller";
import {
EndpointParameterInstructionsSupplier,
getEndpointFromInstructions,
toEndpointV1,
} from "@smithy/middleware-endpoint";
import { HttpRequest } from "@smithy/protocol-http";
import { extendedEncodeURIComponent } from "@smithy/smithy-client";
import { Endpoint } from "@smithy/types";
import type { AbortController as IAbortController, AbortSignal as IAbortSignal, Endpoint } from "@smithy/types";
import { EventEmitter } from "events";

import { byteLength } from "./bytelength";
Expand Down Expand Up @@ -54,7 +54,7 @@ export class Upload extends EventEmitter {
private bytesUploadedSoFar: number;

// used in the upload.
private abortController: AbortController;
private abortController: IAbortController;
private concurrentUploaders: Promise<void>[] = [];
private createMultiPartPromise?: Promise<CreateMultipartUploadCommandOutput>;

Expand Down Expand Up @@ -362,7 +362,7 @@ export class Upload extends EventEmitter {
}
}

private async __abortTimeout(abortSignal: AbortSignal): Promise<never> {
private async __abortTimeout(abortSignal: IAbortSignal): Promise<never> {
return new Promise((resolve, reject) => {
abortSignal.onabort = () => {
const abortError = new Error("Upload aborted.");
Expand Down
2 changes: 1 addition & 1 deletion lib/lib-storage/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PutObjectCommandInput, S3Client, Tag } from "@aws-sdk/client-s3";
import { AbortController } from "@smithy/abort-controller";
import type { AbortController } from "@smithy/types";

export interface Progress {
loaded?: number;
Expand Down