edgeone 1.0.32 → 1.0.34

package/edgeone-dist/cli.js

@@ -164695,7 +164695,7 @@ var yargs_default = Yargs;
 // package.json
 var package_default = {
   name: "edgeone",
-  version: "1.0.32",
+  version: "1.0.34",
   description: "Command-line interface for TencentCloud Pages Functions",
   bin: {
     edgeone: "./edgeone-bin/edgeone.js"
@@ -175165,6 +175165,16 @@ if (proxyUrl) {
 } else {
 }
 import_dotenv2.default.config();
+var UPLOAD_CONFIG = {
+  // 文件并发数，可通过环境变量调整
+  FILE_PARALLEL_LIMIT: parseInt(process.env.COS_FILE_PARALLEL_LIMIT || "10"),
+  // 分片并发数
+  CHUNK_PARALLEL_LIMIT: parseInt(process.env.COS_CHUNK_PARALLEL_LIMIT || "8"),
+  // 分片大小 (MB)
+  CHUNK_SIZE_MB: parseInt(process.env.COS_CHUNK_SIZE_MB || "8"),
+  // 分片重试次数
+  CHUNK_RETRY_TIMES: parseInt(process.env.COS_CHUNK_RETRY_TIMES || "2")
+};
 var BASE_API_URL1 = "https://pages-api.cloud.tencent.com/v1";
 var BASE_API_URL2 = "https://pages-api.edgeone.ai/v1";
 var BASE_API_URL = "";
@@ -175443,7 +175453,7 @@ var describePagesProjects = async (opts) => {
     };
   }
 };
-var describePagesDeployments = async (projectId) => {
+var describePagesDeployments = async (projectId, throwOnError = true) => {
   return await callApi({
     action: "DescribePagesDeployments",
     data: {
@@ -175452,7 +175462,8 @@ var describePagesDeployments = async (projectId) => {
       Limit: 50,
       OrderBy: "CreatedOn",
       Order: "Desc"
-    }
+    },
+    throwOnError
   });
 };
 var describePagesEncipherToken = async (url2) => {
@@ -175502,7 +175513,19 @@ var getCosInstance = async () => {
   const cos = new import_cos_nodejs_sdk_v5.default({
     SecretId: credentials.TmpSecretId,
     SecretKey: credentials.TmpSecretKey,
-    SecurityToken: credentials.Token
+    SecurityToken: credentials.Token,
+    FileParallelLimit: UPLOAD_CONFIG.FILE_PARALLEL_LIMIT,
+    // 文件并发数
+    ChunkParallelLimit: UPLOAD_CONFIG.CHUNK_PARALLEL_LIMIT,
+    // 分片并发数
+    ChunkRetryTimes: UPLOAD_CONFIG.CHUNK_RETRY_TIMES,
+    // 分片重试次数
+    ChunkSize: 1024 * 1024 * UPLOAD_CONFIG.CHUNK_SIZE_MB,
+    // 分片大小
+    SliceSize: 1024 * 1024 * UPLOAD_CONFIG.CHUNK_SIZE_MB,
+    // 触发分片上传的阈值
+    ProgressInterval: 1e3
+    // 进度回调间隔1秒
   });
   tokenCache.cos = cos;
   return cos;
@@ -175558,16 +175581,50 @@ var getFiles = (list, localFolder, bucket, region, targetPath) => {
 };
 var uploadFiles = async (files) => {
   const cos = await getCosInstance();
+  progressLog(`[uploadFiles] Starting upload of ${files.length} files with optimized settings...`);
+  const BATCH_SIZE = 100;
+  if (files.length > BATCH_SIZE) {
+    progressLog(`[uploadFiles] Large file count detected (${files.length}), processing in batches of ${BATCH_SIZE}...`);
+    const results = [];
+    for (let i2 = 0; i2 < files.length; i2 += BATCH_SIZE) {
+      const batch = files.slice(i2, i2 + BATCH_SIZE);
+      progressLog(`[uploadFiles] Processing batch ${Math.floor(i2 / BATCH_SIZE) + 1}/${Math.ceil(files.length / BATCH_SIZE)} (${batch.length} files)...`);
+      const batchResult = await uploadFilesBatch(cos, batch);
+      results.push(batchResult);
+    }
+    return { files: results.flat() };
+  } else {
+    return uploadFilesBatch(cos, files);
+  }
+};
+var uploadFilesBatch = async (cos, files) => {
   return new Promise((resolve5, reject) => {
     cos.uploadFiles(
       {
         files,
-        SliceSize: 1024 * 1024
+        SliceSize: 1024 * 1024 * UPLOAD_CONFIG.CHUNK_SIZE_MB,
+        // 分片大小，提升大文件上传效率
+        onProgress: function(progressData) {
+          if (progressData.percent) {
+            const percent = Math.round(progressData.percent * 100);
+          }
+        },
+        onFileFinish: function(err2, data, options) {
+          if (err2) {
+            errorLog(`[uploadFilesBatch] File upload failed: ${options.Key} - ${err2.message}`);
+          } else {
+            if (process.env.DEBUG_UPLOAD) {
+              progressLog(`[uploadFilesBatch] File uploaded successfully: ${options.Key}`);
+            }
+          }
+        }
       },
       function(err2, data) {
         if (err2) {
+          errorLog(`[uploadFilesBatch] Batch upload failed: ${err2.message}`);
           reject(err2);
         } else {
+          progressLog(`[uploadFilesBatch] Batch uploaded successfully (${files.length} files)`);
           resolve5(data);
         }
       }
@@ -175660,18 +175717,29 @@ var pollProjectStatus = async (projectId, deploymentId) => {
   let isProcessing = true;
   let deployment = null;
   while (isProcessing) {
-    const deploymentsResult = await describePagesDeployments(projectId);
-    deployment = deploymentsResult.Data.Response.Deployments.find(
-      (deploy) => deploy.DeploymentId === deploymentId
-    );
-    if (!deployment) {
-      throw new Error(`Deployment with ID ${deploymentId} not found`);
-    }
-    progressLog(`[pollProjectStatus] Deployment status: ${deployment.Status}`);
-    if (deployment.Status !== "Process") {
-      isProcessing = false;
-    } else {
+    try {
+      const deploymentsResult = await describePagesDeployments(projectId, false);
+      if (deploymentsResult.Code !== 0) {
+        progressLog(`[pollProjectStatus] Polling failed, retrying in 5 seconds...`);
+        await sleep(5e3);
+        continue;
+      }
+      deployment = deploymentsResult.Data.Response.Deployments.find(
+        (deploy) => deploy.DeploymentId === deploymentId
+      );
+      if (!deployment) {
+        throw new Error(`Deployment with ID ${deploymentId} not found`);
+      }
+      progressLog(`[pollProjectStatus] Deployment status: ${deployment.Status}`);
+      if (deployment.Status !== "Process") {
+        isProcessing = false;
+      } else {
+        await sleep(5e3);
+      }
+    } catch (error3) {
+      progressLog(`[pollProjectStatus] Polling failed, retrying in 5 seconds...`);
       await sleep(5e3);
+      continue;
     }
   }
   return deployment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edgeone",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Command-line interface for TencentCloud Pages Functions",
   "bin": {
     "edgeone": "./edgeone-bin/edgeone.js"