Skip to content

Commit e3dfc54

Browse files
Added optional parameters to upload function
1 parent 75cee84 commit e3dfc54

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

oss/source/custom-code/ossClient.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export class OssClient extends BaseClient {
146146
/**
147147
* @deprecated Use the `uploadObject` method instead.
148148
*/
149-
public async uploadObjectAsync(bucketKey: string, objectKey: string, sourceToUpload: Buffer | string, optionalArgs?: { cancellationToken?: AbortController, requestIdPrefix?: string, accessToken?: string, onProgress?: (percentCompleted: number) => void }): Promise<ObjectDetails> {
149+
public async uploadObjectAsync(bucketKey: string, objectKey: string, sourceToUpload: Buffer | string, optionalArgs?: { cancellationToken?: AbortController, requestIdPrefix?: string, accessToken?: string,xAdsMetaContentType?: string, xAdsMetaContentDisposition?: string, xAdsMetaContentEncoding?: string, xAdsMetaCacheControl?: string, xAdsUserDefinedMetadata?: string, onProgress?: (percentCompleted: number) => void }): Promise<ObjectDetails> {
150150
if (!optionalArgs?.accessToken && !this.authenticationProvider) {
151151
throw new Error("Please provide a valid access token or an authentication provider");
152152
}
@@ -156,10 +156,10 @@ export class OssClient extends BaseClient {
156156
var response;
157157
if (typeof sourceToUpload === 'string') {
158158
var buffer = await fs.readFile(sourceToUpload);
159-
response = await this.ossFileTransfer.upload(bucketKey, objectKey, buffer, optionalArgs?.accessToken, optionalArgs?.cancellationToken || new AbortController, optionalArgs?.requestIdPrefix, optionalArgs?.onProgress);
159+
response = await this.ossFileTransfer.upload(bucketKey, objectKey, buffer, optionalArgs?.accessToken, optionalArgs?.cancellationToken || new AbortController, optionalArgs?.requestIdPrefix, optionalArgs?.xAdsMetaContentType, optionalArgs?.xAdsMetaContentDisposition, optionalArgs?.xAdsMetaContentEncoding, optionalArgs?.xAdsMetaCacheControl, optionalArgs?.xAdsUserDefinedMetadata, optionalArgs?.onProgress);
160160
}
161161
else {
162-
response = await this.ossFileTransfer.upload(bucketKey, objectKey, sourceToUpload, optionalArgs?.accessToken, optionalArgs?.cancellationToken || new AbortController, optionalArgs?.requestIdPrefix, optionalArgs?.onProgress);
162+
response = await this.ossFileTransfer.upload(bucketKey, objectKey, sourceToUpload, optionalArgs?.accessToken, optionalArgs?.cancellationToken || new AbortController, optionalArgs?.requestIdPrefix, optionalArgs?.xAdsMetaContentType, optionalArgs?.xAdsMetaContentDisposition, optionalArgs?.xAdsMetaContentEncoding, optionalArgs?.xAdsMetaCacheControl, optionalArgs?.xAdsUserDefinedMetadata, optionalArgs?.onProgress);
163163
}
164164
return response.content;
165165
}
@@ -177,7 +177,7 @@ export class OssClient extends BaseClient {
177177
* @throws {RequiredError}
178178
* @memberof OSSApiInterface
179179
*/
180-
public async uploadObject(bucketKey: string, objectKey: string, sourceToUpload: Buffer | string, optionalArgs?: { cancellationToken?: AbortController, requestIdPrefix?: string, accessToken?: string, onProgress?: (percentCompleted: number) => void }): Promise<ObjectDetails> {
180+
public async uploadObject(bucketKey: string, objectKey: string, sourceToUpload: Buffer | string, optionalArgs?: { cancellationToken?: AbortController, requestIdPrefix?: string, accessToken?: string, xAdsMetaContentType?: string, xAdsMetaContentDisposition?: string, xAdsMetaContentEncoding?: string, xAdsMetaCacheControl?: string, xAdsUserDefinedMetadata?: string, onProgress?: (percentCompleted: number) => void }): Promise<ObjectDetails> {
181181
if (!optionalArgs?.accessToken && !this.authenticationProvider) {
182182
throw new Error("Please provide a valid access token or an authentication provider");
183183
}
@@ -187,10 +187,10 @@ export class OssClient extends BaseClient {
187187
var response;
188188
if (typeof sourceToUpload === 'string') {
189189
var buffer = await fs.readFile(sourceToUpload);
190-
response = await this.ossFileTransfer.upload(bucketKey, objectKey, buffer, optionalArgs?.accessToken, optionalArgs?.cancellationToken || new AbortController, optionalArgs?.requestIdPrefix, optionalArgs?.onProgress);
190+
response = await this.ossFileTransfer.upload(bucketKey, objectKey, buffer, optionalArgs?.accessToken, optionalArgs?.cancellationToken || new AbortController, optionalArgs?.requestIdPrefix, optionalArgs?.xAdsMetaContentType, optionalArgs?.xAdsMetaContentDisposition, optionalArgs?.xAdsMetaContentEncoding, optionalArgs?.xAdsMetaCacheControl, optionalArgs?.xAdsUserDefinedMetadata, optionalArgs?.onProgress);
191191
}
192192
else {
193-
response = await this.ossFileTransfer.upload(bucketKey, objectKey, sourceToUpload, optionalArgs?.accessToken, optionalArgs?.cancellationToken || new AbortController, optionalArgs?.requestIdPrefix, optionalArgs?.onProgress);
193+
response = await this.ossFileTransfer.upload(bucketKey, objectKey, sourceToUpload, optionalArgs?.accessToken, optionalArgs?.cancellationToken || new AbortController, optionalArgs?.requestIdPrefix, optionalArgs?.xAdsMetaContentType, optionalArgs?.xAdsMetaContentDisposition, optionalArgs?.xAdsMetaContentEncoding, optionalArgs?.xAdsMetaCacheControl, optionalArgs?.xAdsUserDefinedMetadata, optionalArgs?.onProgress);
194194
}
195195
return response.content;
196196
}

oss/source/custom-code/ossFileTransfer.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class OSSFileTransfer implements IOSSFileTransfer {
5252
}
5353
}
5454

55-
public async upload(bucketKey: string, objectKey: string, sourceToUpload: Buffer, accessToken: string, cancellationToken: AbortController,requestIdPrefix: string = '', onProgress?: (percentCompleted: number) => void): Promise<ApiResponse> {
55+
public async upload(bucketKey: string, objectKey: string, sourceToUpload: Buffer, accessToken: string, cancellationToken: AbortController,requestIdPrefix: string = '', xAdsMetaContentType: string = '', xAdsMetaContentDisposition: string = '', xAdsMetaContentEncoding: string = '', xAdsMetaCacheControl: string = '', xAdsUserDefinedMetadata: string = '', onProgress?: (percentCompleted: number) => void): Promise<ApiResponse> {
5656
const requestId: any = await this.handleRequestId(requestIdPrefix, bucketKey, objectKey);
5757
const retryCount: number = this.configuration.getRetryCount();
5858
this.logger.logDebug(`${requestId} Config retry setting was: ${retryCount}`);
@@ -121,7 +121,13 @@ export class OSSFileTransfer implements IOSSFileTransfer {
121121
"application/json",
122122
{
123123
uploadKey: uploadKey
124-
} as Completes3uploadBody);
124+
} as Completes3uploadBody,
125+
xAdsMetaContentType,
126+
xAdsMetaContentDisposition,
127+
xAdsMetaContentEncoding,
128+
xAdsMetaCacheControl,
129+
xAdsUserDefinedMetadata
130+
);
125131
onProgress?.(100);
126132
return completeResponse;
127133
}

0 commit comments

Comments
 (0)