vod-js-sdk-v6 1.7.4 → 1.8.0

package/lib/package.json

@@ -31,7 +31,8 @@
     },
     "homepage": "https://github.com/tencentyun/vod-js-sdk-v6#readme",
     "dependencies": {
-        "aws-sdk": "^2.1693.0",
+        "@aws-sdk/client-s3": "^3.1010.0",
+        "@aws-sdk/lib-storage": "^3.1010.0",
         "axios": "^0.21.1",
         "eventemitter3": "^4.0.7",
         "js-sha1": "^0.6.0",

package/lib/src/uploader.d.ts

@@ -119,8 +119,8 @@ declare class Uploader extends EventEmitter implements UploaderOptions {
     commitRequestRetryCount: number;
     retryDelay: number;
     targetAccelerate: boolean;
-    expireTime: string;
     storageType: string;
+    expireTime: string;
     static host: HOST;
     constructor(params: UploaderOptions);
     getCosStrategy(params: UploaderOptions): {};

package/lib/src/uploader.js

@@ -66,14 +66,24 @@ exports.UploaderEvent = exports.vodAxios = void 0;
 var sha1 = require("js-sha1");
 var COS = require("./base.js");
 var eventemitter3_1 = require("eventemitter3");
-var aws_sdk_1 = require("aws-sdk");
+var client_s3_1 = require("@aws-sdk/client-s3");
+var lib_storage_1 = require("@aws-sdk/lib-storage");
 var axios_1 = require("axios");
 var util_1 = require("./util");
 var vod_reporter_1 = require("./vod_reporter");
 var uuidv4 = require("uuid/v4");
 exports.vodAxios = axios_1.default.create();
-var hostList = ["vod-upload-accelerate2", "vod-upload-accelerate", "vod-upload-proxy", "vod-quic"];
-var targetHostList = ["vod-upload-accelerate2", "vod-upload-proxy", "vod-quic"];
+var hostList = [
+    "vod-upload-accelerate2",
+    "vod-upload-accelerate",
+    "vod-upload-proxy",
+    "vod-quic"
+];
+var targetHostList = [
+    "vod-upload-accelerate2",
+    "vod-upload-proxy",
+    "vod-quic"
+];
 var trimPrefix = function (str, prefix) {
     return str.startsWith(prefix) ? str.substring(prefix.length) : str;
 };
@@ -151,9 +161,8 @@ var Uploader = /** @class */ (function (_super) {
             CopyChunkSize: params.copyChunkSize,
             CopySliceSize: params.copySliceSize,
             ProgressInterval: params.progressInterval,
-            DynamicAccelerate: params.dynamicAccelerate,
+            DynamicAccelerate: params.dynamicAccelerate
         };
-        // console.log('sourceData', params, sourceData);
         var cosStrategy = Object.keys(sourceData)
             .filter(function (key) { return sourceData[key] !== undefined; })
             .reduce(function (acc, key) {
@@ -280,7 +289,9 @@ var Uploader = /** @class */ (function (_super) {
                         if (prepareData.code === 0) {
                             self.appId = self.appId || prepareData.data.appId;
                             // 如果只有一个园区就不用竞速了
-                            if (!prepareData.data.cosRegionList || (prepareData.data.cosRegionList && prepareData.data.cosRegionList.length <= 1)) {
+                            if (!prepareData.data.cosRegionList ||
+                                (prepareData.data.cosRegionList &&
+                                    prepareData.data.cosRegionList.length <= 1)) {
                                 return [2 /*return*/, callback()];
                             }
                             return [2 /*return*/, self.regionRace(prepareData.data.cosRegionList, function (res) {
@@ -607,7 +618,7 @@ var Uploader = /** @class */ (function (_super) {
     // 使用s3 sdk上传
     Uploader.prototype.uploadToS3 = function (applyData) {
         return __awaiter(this, void 0, void 0, function () {
-            var self, uploadCosParams, cosParam, s3, cosVideoParam, cosCoverParam, requestStartTime, uploadPromises;
+            var self, uploadCosParams, cosParam, s3ClientOptions, s3, sharedController, cosVideoParam, cosCoverParam, requestStartTime, uploadPromises, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -616,14 +627,7 @@ var Uploader = /** @class */ (function (_super) {
                         cosParam = {
                             bucket: applyData.storageBucket + "-" + applyData.storageAppId
                         };
-                        // aws全局配置
-                        aws_sdk_1.config.update({
-                            s3: {
-                                maxRetries: 3,
-                                computeChecksums: false
-                            }
-                        });
-                        s3 = new aws_sdk_1.S3({
+                        s3ClientOptions = {
                             endpoint: "https://cos.".concat(applyData.StorageRegionV5, ".myqcloud.com"), // 标准版cos上传域名
                             credentials: {
                                 accessKeyId: applyData.tempCertificate.secretId,
@@ -631,9 +635,16 @@ var Uploader = /** @class */ (function (_super) {
                                 sessionToken: applyData.tempCertificate.token
                             },
                             region: applyData.StorageRegionV5,
-                            s3ForcePathStyle: false // 不使用路径风格
-                        });
+                            maxAttempts: self.cosStrategy.ChunkRetryTimes, // 重试次数
+                            forcePathStyle: false // 不使用路径风格
+                        };
+                        s3 = new client_s3_1.S3Client(s3ClientOptions);
+                        sharedController = new AbortController();
                         self.cos = s3;
+                        // 为s3添加cancelTask函数，以兼容cos的对应功能
+                        self.cos.cancelTask = function () {
+                            sharedController.abort();
+                        };
                         if (self.videoFile) {
                             cosVideoParam = __assign(__assign({}, cosParam), { file: self.videoFile, key: trimPrefix(applyData.video.storagePath, "/"), onProgress: function (data) {
                                     self.emit(UploaderEvent.video_progress, data);
@@ -657,51 +668,74 @@ var Uploader = /** @class */ (function (_super) {
                         requestStartTime = new Date();
                         uploadPromises = uploadCosParams.map(function (uploadCosParam) {
                             return new Promise(function (resolve, reject) {
-                                var singleUpload = self.cos.upload({
-                                    Bucket: uploadCosParam.bucket,
-                                    Key: uploadCosParam.key,
-                                    Body: uploadCosParam.file
-                                }, function (err, data) {
-                                    // only report video file
+                                var singleUpload = new lib_storage_1.Upload({
+                                    client: s3,
+                                    params: {
+                                        Bucket: uploadCosParam.bucket,
+                                        Key: uploadCosParam.key,
+                                        Body: uploadCosParam.file
+                                    },
+                                    abortController: sharedController, // 共享中断控制器
+                                    partSize: self.cosStrategy.ChunkSize, // 配置分片大小
+                                    queueSize: self.cosStrategy.ChunkParallelLimit // 配置并发数
+                                });
+                                singleUpload
+                                    .done()
+                                    .then(function (info) {
                                     if (uploadCosParam.file === self.videoFile) {
                                         self.emit(vod_reporter_1.VodReportEvent.report_cos_upload, {
-                                            err: err,
+                                            err: null,
                                             requestStartTime: requestStartTime
                                         });
                                     }
-                                    if (!err) {
-                                        uploadCosParam.onUpload(data);
-                                        return resolve();
+                                    // 和cos的upload事件对齐
+                                    var evtData = {
+                                        Location: info.Location ? info.Location.replace(/^https?:\/\//, "") : '', // 包含域名和路径，无协议头
+                                        Bucket: "".concat(info.Bucket, "-").concat(applyData.storageAppId), // 包含 APPID (BucketName-APPID 格式)
+                                        Key: info.Key || '',
+                                        ETag: info.ETag || ''
+                                    };
+                                    uploadCosParam.onUpload(evtData);
+                                    return resolve();
+                                })
+                                    .catch(function (err) {
+                                    if (uploadCosParam.file === self.videoFile) {
+                                        self.emit(vod_reporter_1.VodReportEvent.report_cos_upload, {
+                                            err: err,
+                                            requestStartTime: requestStartTime
+                                        });
                                     }
                                     self.delStorage(self.sessionName);
-                                    reject(err);
+                                    return reject(err);
                                 });
                                 // 进度条事件
                                 singleUpload.on("httpUploadProgress", function (info) {
-                                    var percent = info.loaded / info.total; // 直接得到 0-1
+                                    var loaded = info.loaded || 0;
+                                    var total = info.total || 0;
+                                    var percent = loaded ? loaded / total : 0; // 直接得到 0-1
                                     var evtData = {
-                                        loaded: info.loaded,
-                                        total: info.total,
+                                        loaded: loaded,
+                                        total: total,
                                         speed: 0, // aws sdk没有提供上传速度，这里设置为0
                                         percent: parseFloat(percent.toFixed(2)) // cos sdk的percent取值是0-1，为了和cos sdk保持一致，这里也转换成0-1，并保留两位小数
                                     };
                                     uploadCosParam.onProgress(evtData);
                                 });
-                                // 上传完成事件
-                                singleUpload.on("complete", function (info) {
-                                    // 和cos的upload事件对齐
-                                    var evtData = {
-                                        Location: info.Location.replace(/^https?:\/\//, ""), // 包含域名和路径，无协议头
-                                        Bucket: "".concat(info.Bucket, "-").concat(applyData.storageAppId), // 包含 APPID (BucketName-APPID 格式)
-                                        Key: info.Key,
-                                        ETag: info.ETag
-                                    };
-                                    uploadCosParam.onUpload(evtData);
-                                });
                             });
                         });
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, Promise.all(uploadPromises)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        err_1 = _a.sent();
+                        if (err_1 instanceof Error && err_1.name === "AbortError") {
+                            // SDK 内部已自动调用 AbortMultipartUpload 清理碎片
+                            console.log("本次上传任务已取消并清理");
+                        }
+                        return [2 /*return*/, Promise.reject(err_1)];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -855,7 +889,8 @@ var Uploader = /** @class */ (function (_super) {
         return this.donePromise;
     };
     Uploader.prototype.cancel = function () {
-        this.cos.cancelTask(this.taskId);
+        var _a;
+        (_a = this.cos) === null || _a === void 0 ? void 0 : _a.cancelTask(this.taskId);
     };
     // domain
     // static host = "43.156.222.23" || HOST.MAIN;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vod-js-sdk-v6",
-  "version": "1.7.4",
+  "version": "1.8.0",
   "description": "tencent cloud vod js sdk v6",
   "main": "lib/src/tc_vod.js",
   "unpkg": "dist/vod-js-sdk-v6.js",
@@ -31,7 +31,8 @@
   },
   "homepage": "https://github.com/tencentyun/vod-js-sdk-v6#readme",
   "dependencies": {
-    "aws-sdk": "^2.1693.0",
+    "@aws-sdk/client-s3": "^3.1010.0",
+    "@aws-sdk/lib-storage": "^3.1010.0",
     "axios": "^0.21.1",
     "eventemitter3": "^4.0.7",
     "js-sha1": "^0.6.0",

package/src/uploader.ts

@@ -2,7 +2,8 @@ const sha1 = require("js-sha1");
 const COS = require("./base.js");
 
 import { EventEmitter } from "eventemitter3";
-import { S3, config as AWSConfig } from "aws-sdk";
+import { S3Client } from "@aws-sdk/client-s3";
+import { Upload } from "@aws-sdk/lib-storage";
 import axios from "axios";
 import util, { HOST } from "./util";
 import { vodError } from "./types";
@@ -10,8 +11,17 @@ import { VodReportEvent } from "./vod_reporter";
 import * as uuidv4 from "uuid/v4";
 
 export const vodAxios = axios.create();
-const hostList = ["vod-upload-accelerate2", "vod-upload-accelerate", "vod-upload-proxy", "vod-quic"];
-const targetHostList = ["vod-upload-accelerate2", "vod-upload-proxy", "vod-quic"];
+const hostList = [
+  "vod-upload-accelerate2",
+  "vod-upload-accelerate",
+  "vod-upload-proxy",
+  "vod-quic"
+];
+const targetHostList = [
+  "vod-upload-accelerate2",
+  "vod-upload-proxy",
+  "vod-quic"
+];
 
 const trimPrefix = (str: string, prefix: string) =>
   str.startsWith(prefix) ? str.substring(prefix.length) : str;
@@ -19,10 +29,10 @@ const trimPrefix = (str: string, prefix: string) =>
 let hostIndex = 2;
 
 vodAxios.interceptors.response.use(
-  function(response) {
+  function (response) {
     return response;
   },
-  function(error) {
+  function (error) {
     if (isNaN(error.code)) {
       error.code = 500;
     }
@@ -138,7 +148,8 @@ export interface UploaderOptions {
   progressInterval?: number;
   dynamicAccelerate?: boolean;
 
-  expireTime?: string
+  expireTime?: string;
+
   storageType?: string;
 }
 
@@ -194,8 +205,9 @@ class Uploader extends EventEmitter implements UploaderOptions {
   // 重试请求的等待时间
   retryDelay = 1000;
   targetAccelerate = false;
-  expireTime: string;
+
   storageType = "cos";
+  expireTime: string;
 
   // domain
   // static host = "43.156.222.23" || HOST.MAIN;
@@ -243,11 +255,9 @@ class Uploader extends EventEmitter implements UploaderOptions {
       CopyChunkSize: params.copyChunkSize,
       CopySliceSize: params.copySliceSize,
       ProgressInterval: params.progressInterval,
-      DynamicAccelerate: params.dynamicAccelerate,
+      DynamicAccelerate: params.dynamicAccelerate
     };
 
-    // console.log('sourceData', params, sourceData);
-
     const cosStrategy = Object.keys(sourceData)
       .filter(key => sourceData[key] !== undefined)
       .reduce((acc, key) => ({ ...acc, [key]: sourceData[key] }), {});
@@ -264,7 +274,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
     const cname = "webugc_" + sha1(name);
     try {
       localStorage.setItem(cname, value);
-    } catch (e) {}
+    } catch (e) { }
   }
 
   // get storage
@@ -276,7 +286,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
     let result = null;
     try {
       result = localStorage.getItem(cname);
-    } catch (e) {}
+    } catch (e) { }
 
     return result;
   }
@@ -289,7 +299,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
     const cname = "webugc_" + sha1(name);
     try {
       localStorage.removeItem(cname);
-    } catch (e) {}
+    } catch (e) { }
   }
 
   // validate init params
@@ -373,10 +383,14 @@ class Uploader extends EventEmitter implements UploaderOptions {
       self.appId = self.appId || prepareData.data.appId;
       // 如果只有一个园区就不用竞速了
 
-      if (!prepareData.data.cosRegionList || (prepareData.data.cosRegionList && prepareData.data.cosRegionList.length <= 1)) {
+      if (
+        !prepareData.data.cosRegionList ||
+        (prepareData.data.cosRegionList &&
+          prepareData.data.cosRegionList.length <= 1)
+      ) {
         return callback();
       }
-      return self.regionRace(prepareData.data.cosRegionList, function(
+      return self.regionRace(prepareData.data.cosRegionList, function (
         res: any
       ) {
         self.emit(VodReportEvent.report_prepare, {
@@ -525,7 +539,6 @@ class Uploader extends EventEmitter implements UploaderOptions {
         return applyData.StorageRegionV5 === item;
       });
 
-
       this.emit(VodReportEvent.report_apply, {
         data: applyData,
         requestStartTime: requestStartTime
@@ -557,7 +570,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
         {
           ForceSignHost: false,
           // UseRawKey: true,
-          getAuthorization: async function(
+          getAuthorization: async function (
             options: object,
             callback: Function
           ) {
@@ -589,9 +602,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
     );
     this.cos = cos;
 
-
-
-    cos.on("before-send", function(opt: any) {
+    cos.on("before-send", function (opt: any) {
       var url = opt.url;
       // console.log("self", url, self.cosStrategy.DynamicAccelerate);
 
@@ -631,15 +642,15 @@ class Uploader extends EventEmitter implements UploaderOptions {
         ...cosParam,
         file: this.videoFile,
         key: applyData.video.storagePath,
-        onProgress: function(data: any) {
+        onProgress: function (data: any) {
           self.emit(UploaderEvent.video_progress, data);
           self.emit(UploaderEvent.media_progress, data);
         },
-        onUpload: function(data: any) {
+        onUpload: function (data: any) {
           self.emit(UploaderEvent.video_upload, data);
           self.emit(UploaderEvent.media_upload, data);
         },
-        onTaskReady: function(taskId: string) {
+        onTaskReady: function (taskId: string) {
           self.taskId = taskId;
         }
       };
@@ -651,10 +662,10 @@ class Uploader extends EventEmitter implements UploaderOptions {
         ...cosParam,
         file: this.coverFile,
         key: applyData.cover.storagePath,
-        onProgress: function(data: any) {
+        onProgress: function (data: any) {
           self.emit(UploaderEvent.cover_progress, data);
         },
-        onUpload: function(data: any) {
+        onUpload: function (data: any) {
           self.emit(UploaderEvent.cover_upload, data);
         },
         onTaskReady: util.noop
@@ -663,7 +674,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
     }
     const requestStartTime = new Date();
     const uploadPromises = uploadCosParams.map(uploadCosParam => {
-      return new Promise<void>(function(resolve, reject) {
+      return new Promise<void>(function (resolve, reject) {
         cos.sliceUploadFile(
           {
             Bucket: uploadCosParam.bucket,
@@ -673,7 +684,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
             onTaskReady: uploadCosParam.onTaskReady,
             onProgress: uploadCosParam.onProgress
           },
-          function(err: any, data: any) {
+          function (err: any, data: any) {
             // only report video file
             if (uploadCosParam.file === self.videoFile) {
               self.emit(VodReportEvent.report_cos_upload, {
@@ -707,15 +718,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
       bucket: applyData.storageBucket + "-" + applyData.storageAppId
     };
 
-    // aws全局配置
-    AWSConfig.update({
-      s3: {
-        maxRetries: 3,
-        computeChecksums: false
-      }
-    });
-
-    const s3 = new S3({
+    const s3ClientOptions = {
       endpoint: `https://cos.${applyData.StorageRegionV5}.myqcloud.com`, // 标准版cos上传域名
       credentials: {
         accessKeyId: applyData.tempCertificate.secretId,
@@ -723,21 +726,30 @@ class Uploader extends EventEmitter implements UploaderOptions {
         sessionToken: applyData.tempCertificate.token
       },
       region: applyData.StorageRegionV5,
-      s3ForcePathStyle: false // 不使用路径风格
-    });
+      maxAttempts: self.cosStrategy.ChunkRetryTimes, // 重试次数
+      forcePathStyle: false // 不使用路径风格
+    };
+
+    const s3 = new S3Client(s3ClientOptions);
+    const sharedController = new AbortController();
 
     self.cos = s3;
 
+    // 为s3添加cancelTask函数，以兼容cos的对应功能
+    self.cos.cancelTask = function() {
+      sharedController.abort();
+    };
+
     if (self.videoFile) {
       const cosVideoParam = {
         ...cosParam,
         file: self.videoFile,
         key: trimPrefix(applyData.video.storagePath, "/"),
-        onProgress: function(data: IS3UploadProcessEvtData) {
+        onProgress: function (data: IS3UploadProcessEvtData) {
           self.emit(UploaderEvent.video_progress, data);
           self.emit(UploaderEvent.media_progress, data);
         },
-        onUpload: function(data: IS3UploadCompleteEvtData) {
+        onUpload: function (data: IS3UploadCompleteEvtData) {
           self.emit(UploaderEvent.video_upload, data);
           self.emit(UploaderEvent.media_upload, data);
         },
@@ -751,10 +763,10 @@ class Uploader extends EventEmitter implements UploaderOptions {
         ...cosParam,
         file: self.coverFile,
         key: trimPrefix(applyData.cover.storagePath, "/"),
-        onProgress: function(data: IS3UploadProcessEvtData) {
+        onProgress: function (data: IS3UploadProcessEvtData) {
           self.emit(UploaderEvent.cover_progress, data);
         },
-        onUpload: function(data: IS3UploadCompleteEvtData) {
+        onUpload: function (data: IS3UploadCompleteEvtData) {
           self.emit(UploaderEvent.cover_upload, data);
         },
         onTaskReady: util.noop // aws sdk没有提供taskId，先占位一个空函数
@@ -764,57 +776,78 @@ class Uploader extends EventEmitter implements UploaderOptions {
 
     const requestStartTime = new Date();
     const uploadPromises = uploadCosParams.map(uploadCosParam => {
-      return new Promise<void>(function(resolve, reject) {
-        const singleUpload = self.cos.upload(
-          {
+      return new Promise<void>(function (resolve, reject) {
+        const singleUpload = new Upload({
+          client: s3,
+          params: {
             Bucket: uploadCosParam.bucket,
             Key: uploadCosParam.key,
             Body: uploadCosParam.file
           },
-          function(err: Error | null, data: IS3UploadCompleteEvtData) {
-            // only report video file
+          abortController: sharedController, // 共享中断控制器
+          partSize: self.cosStrategy.ChunkSize, // 配置分片大小
+          queueSize: self.cosStrategy.ChunkParallelLimit // 配置并发数
+        });
+
+        singleUpload
+          .done()
+          .then(info => {
             if (uploadCosParam.file === self.videoFile) {
               self.emit(VodReportEvent.report_cos_upload, {
-                err: err,
+                err: null,
                 requestStartTime: requestStartTime
               });
             }
-            if (!err) {
-              uploadCosParam.onUpload(data);
-              return resolve();
+            // 和cos的upload事件对齐
+            const evtData: IS3UploadCompleteEvtData = {
+              Location: info.Location ? info.Location.replace(/^https?:\/\//, "") : '', // 包含域名和路径，无协议头
+              Bucket: `${info.Bucket}-${applyData.storageAppId}`, // 包含 APPID (BucketName-APPID 格式)
+              Key: info.Key || '',
+              ETag: info.ETag || ''
+            };
+            uploadCosParam.onUpload(evtData);
+
+            return resolve();
+          })
+          .catch((err: Error | null) => {
+            if (uploadCosParam.file === self.videoFile) {
+              self.emit(VodReportEvent.report_cos_upload, {
+                err: err,
+                requestStartTime: requestStartTime
+              });
             }
             self.delStorage(self.sessionName);
+            return reject(err);
+          });
 
-            reject(err);
+        // 进度条事件
+        singleUpload.on(
+          "httpUploadProgress",
+          (info) => {
+            const loaded = info.loaded || 0
+            const total = info.total || 0
+            const percent = loaded ? loaded / total : 0; // 直接得到 0-1
+            const evtData: IS3UploadProcessEvtData = {
+              loaded: loaded,
+              total: total,
+              speed: 0, // aws sdk没有提供上传速度，这里设置为0
+              percent: parseFloat(percent.toFixed(2)) // cos sdk的percent取值是0-1，为了和cos sdk保持一致，这里也转换成0-1，并保留两位小数
+            };
+            uploadCosParam.onProgress(evtData);
           }
         );
-
-        // 进度条事件
-        singleUpload.on("httpUploadProgress", (info: IS3UploadProcessEvtData) => {
-          const percent = info.loaded / info.total; // 直接得到 0-1
-          const evtData = {
-            loaded: info.loaded,
-            total: info.total,
-            speed: 0, // aws sdk没有提供上传速度，这里设置为0
-            percent: parseFloat(percent.toFixed(2)) // cos sdk的percent取值是0-1，为了和cos sdk保持一致，这里也转换成0-1，并保留两位小数
-          };
-          uploadCosParam.onProgress(evtData);
-        });
-        // 上传完成事件
-        singleUpload.on("complete", (info: IS3UploadCompleteEvtData) => {
-          // 和cos的upload事件对齐
-          const evtData = {
-            Location: info.Location.replace(/^https?:\/\//, ""), // 包含域名和路径，无协议头
-            Bucket: `${info.Bucket}-${applyData.storageAppId}`, // 包含 APPID (BucketName-APPID 格式)
-            Key: info.Key,
-            ETag: info.ETag
-          };
-          uploadCosParam.onUpload(evtData);
-        });
       });
     });
 
-    return await Promise.all(uploadPromises);
+    try {
+      return await Promise.all(uploadPromises);
+    } catch (err: unknown) {
+      if (err instanceof Error && err.name === "AbortError") {
+        // SDK 内部已自动调用 AbortMultipartUpload 清理碎片
+        console.log("本次上传任务已取消并清理");
+      }
+      return Promise.reject(err);
+    }
   }
 
   async commitUploadUGC(retryCount: number = 0) {
@@ -870,10 +903,10 @@ class Uploader extends EventEmitter implements UploaderOptions {
       //     "firstFrameStart",
       //     "firstFrameEnd"
       //   );
-        // console.log(
-        //   "duration",
-        //   window.performance.getEntriesByName("firstFrame")[0].duration
-        // );
+      // console.log(
+      //   "duration",
+      //   window.performance.getEntriesByName("firstFrame")[0].duration
+      // );
       // }
       this.emit(VodReportEvent.report_commit, {
         data: {
@@ -921,7 +954,6 @@ class Uploader extends EventEmitter implements UploaderOptions {
       } else {
         await this.uploadToCos(applyData);
       }
-
       return await this.commitUploadUGC();
     };
 
@@ -937,7 +969,7 @@ class Uploader extends EventEmitter implements UploaderOptions {
   }
 
   cancel() {
-    this.cos.cancelTask(this.taskId);
+    this.cos?.cancelTask(this.taskId);
   }
 }