edgeone 1.0.17 → 1.0.18

package/edgeone-dist/cli.js

@@ -99086,25 +99086,25 @@ var require_util6 = __commonJS({
 // node_modules/cos-nodejs-sdk-v5/sdk/event.js
 var require_event = __commonJS({
   "node_modules/cos-nodejs-sdk-v5/sdk/event.js"(exports2, module2) {
-    var initEvent = function(cos2) {
+    var initEvent = function(cos) {
       var listeners = {};
       var getList = function(action) {
         !listeners[action] && (listeners[action] = []);
         return listeners[action];
       };
-      cos2.on = function(action, callback) {
+      cos.on = function(action, callback) {
         if (action === "task-list-update") {
           console.warn('warning: Event "' + action + '" has been deprecated. Please use "list-update" instead.');
         }
         getList(action).push(callback);
       };
-      cos2.off = function(action, callback) {
+      cos.off = function(action, callback) {
         var list = getList(action);
         for (var i3 = list.length - 1; i3 >= 0; i3--) {
           callback === list[i3] && list.splice(i3, 1);
         }
       };
-      cos2.emit = function(action, data) {
+      cos.emit = function(action, data) {
         var list = getList(action).map(function(cb2) {
           return cb2;
         });
@@ -110635,7 +110635,7 @@ var require_task = __commonJS({
         }
       };
     };
-    var initTask = function(cos2) {
+    var initTask = function(cos) {
       var queue = [];
       var tasks = {};
       var uploadingFileCount = 0;
@@ -110663,8 +110663,8 @@ var require_task = __commonJS({
         var timer;
         var emit = function() {
           timer = 0;
-          cos2.emit("task-list-update", { list: util4.map(queue, formatTask) });
-          cos2.emit("list-update", { list: util4.map(queue, formatTask) });
+          cos.emit("task-list-update", { list: util4.map(queue, formatTask) });
+          cos.emit("list-update", { list: util4.map(queue, formatTask) });
         };
         return function() {
           if (!timer)
@@ -110672,11 +110672,11 @@ var require_task = __commonJS({
         };
       }();
       var clearQueue = function() {
-        if (queue.length <= cos2.options.UploadQueueSize)
+        if (queue.length <= cos.options.UploadQueueSize)
           return;
         for (var i3 = 0; i3 < nextUploadIndex && // 小于当前操作的 index 才清理
         i3 < queue.length && // 大于队列才清理
-        queue.length > cos2.options.UploadQueueSize; ) {
+        queue.length > cos.options.UploadQueueSize; ) {
           var isActive = queue[i3].state === "waiting" || queue[i3].state === "checking" || queue[i3].state === "uploading";
           if (!queue[i3] || !isActive) {
             tasks[queue[i3].id] && delete tasks[queue[i3].id];
@@ -110689,7 +110689,7 @@ var require_task = __commonJS({
         emitListUpdate();
       };
       var startNextTask = function() {
-        if (uploadingFileCount >= cos2.options.FileParallelLimit)
+        if (uploadingFileCount >= cos.options.FileParallelLimit)
           return;
         while (queue[nextUploadIndex] && queue[nextUploadIndex].state !== "waiting")
           nextUploadIndex++;
@@ -110702,8 +110702,8 @@ var require_task = __commonJS({
         task.params.onTaskStart && task.params.onTaskStart(formatTask(task));
         !task.params.UploadData && (task.params.UploadData = {});
         var apiParams = util4.formatParams(task.api, task.params);
-        originApiMap[task.api].call(cos2, apiParams, function(err2, data) {
-          if (!cos2._isRunningTask(task.id))
+        originApiMap[task.api].call(cos, apiParams, function(err2, data) {
+          if (!cos._isRunningTask(task.id))
             return;
           if (task.state === "checking" || task.state === "uploading") {
             task.state = err2 ? "error" : "success";
@@ -110738,7 +110738,7 @@ var require_task = __commonJS({
             return;
           }
           task.state = switchToState;
-          cos2.emit("inner-kill-task", { TaskId: id, toState: switchToState });
+          cos.emit("inner-kill-task", { TaskId: id, toState: switchToState });
           try {
             var UploadId = task && task.params && task.params.UploadData.UploadId;
           } catch (e2) {
@@ -110761,14 +110761,14 @@ var require_task = __commonJS({
         }
         clearQueue();
       };
-      cos2._addTasks = function(taskList) {
+      cos._addTasks = function(taskList) {
         util4.each(taskList, function(task) {
-          cos2._addTask(task.api, task.params, task.callback, true);
+          cos._addTask(task.api, task.params, task.callback, true);
         });
         emitListUpdate();
       };
       var isTaskReadyWarning = true;
-      cos2._addTask = function(api, params, callback, ignoreAddEvent) {
+      cos._addTask = function(api, params, callback, ignoreAddEvent) {
         params = util4.formatParams(api, params);
         var id = util4.uuid();
         params.TaskId = id;
@@ -110800,7 +110800,7 @@ var require_task = __commonJS({
         };
         var onHashProgress = params.onHashProgress;
         params.onHashProgress = function(info2) {
-          if (!cos2._isRunningTask(task.id))
+          if (!cos._isRunningTask(task.id))
             return;
           task.hashPercent = info2.percent;
           onHashProgress && onHashProgress(info2);
@@ -110808,7 +110808,7 @@ var require_task = __commonJS({
         };
         var onProgress = params.onProgress;
         params.onProgress = function(info2) {
-          if (!cos2._isRunningTask(task.id))
+          if (!cos._isRunningTask(task.id))
             return;
           task.state === "checking" && (task.state = "uploading");
           task.loaded = info2.loaded;
@@ -110829,20 +110829,20 @@ var require_task = __commonJS({
         });
         return id;
       };
-      cos2._isRunningTask = function(id) {
+      cos._isRunningTask = function(id) {
         var task = tasks[id];
         return !!(task && (task.state === "checking" || task.state === "uploading"));
       };
-      cos2.getTaskList = function() {
+      cos.getTaskList = function() {
         return util4.map(queue, formatTask);
       };
-      cos2.cancelTask = function(id) {
+      cos.cancelTask = function(id) {
         killTask(id, "canceled");
       };
-      cos2.pauseTask = function(id) {
+      cos.pauseTask = function(id) {
         killTask(id, "paused");
       };
-      cos2.restartTask = function(id) {
+      cos.restartTask = function(id) {
         var task = tasks[id];
         if (task && (task.state === "paused" || task.state === "error")) {
           task.state = "waiting";
@@ -110851,7 +110851,7 @@ var require_task = __commonJS({
           startNextTask();
         }
       };
-      cos2.isUploadRunning = function() {
+      cos.isUploadRunning = function() {
         return uploadingFileCount || nextUploadIndex < queue.length;
       };
     };
@@ -180275,7 +180275,7 @@ var yargs_default = Yargs;
 // package.json
 var package_default = {
   name: "edgeone",
-  version: "1.0.17",
+  version: "1.0.18",
   description: "Command-line interface for TencentCloud Pages Functions",
   bin: {
     edgeone: "./edgeone-bin/edgeone.js"
@@ -192130,6 +192130,14 @@ var getAuthorization = () => {
   return `Bearer ${apiKey}`;
 };
 var getProjectName = () => process.env.EDGEONE_PAGES_PROJECT_NAME || "";
+var tokenCache = {
+  token: null,
+  cos: null
+};
+var resetTokenCache = () => {
+  tokenCache.token = null;
+  tokenCache.cos = null;
+};
 var sleep = (ms) => {
   return new Promise((resolve6) => setTimeout(resolve6, ms));
 };
@@ -192173,6 +192181,9 @@ var checkAndSetBaseUrl = async () => {
   }
 };
 var getCosTempToken = async () => {
+  if (tokenCache.token) {
+    return tokenCache.token;
+  }
   let body;
   if (getProjectName()) {
     const result = await describePagesProjects({
@@ -192200,7 +192211,9 @@ var getCosTempToken = async () => {
     const errorText = await res.text();
     throw new Error(`API request failed (${res.status}): ${errorText}`);
   }
-  return await res.json();
+  const tokenResponse = await res.json();
+  tokenCache.token = tokenResponse;
+  return tokenResponse;
 };
 var getOrCreateProject = async () => {
   if (getProjectName()) {
@@ -192355,31 +192368,24 @@ var createPagesDeployment = async (opts) => {
   }
   return data;
 };
-var cos = new import_cos_nodejs_sdk_v5.default({
-  getAuthorization: async function(_options, callback) {
-    try {
-      const result = await getCosTempToken();
-      if (result.Code !== 0 || !result.Data || !result.Data.Response || !result.Data.Response.Credentials) {
-        errorLog("Failed to get COS temp token" + result);
-        return callback({});
-      }
-      const response = result.Data.Response;
-      const credentials = response.Credentials;
-      callback({
-        TmpSecretId: credentials.TmpSecretId,
-        TmpSecretKey: credentials.TmpSecretKey,
-        SecurityToken: credentials.Token,
-        StartTime: Math.floor(Date.now() / 1e3),
-        // Current time in seconds
-        ExpiredTime: response.ExpiredTime,
-        ScopeLimit: true
-      });
-    } catch (error3) {
-      errorLog("Error getting COS temp token: " + error3);
-      callback({});
-    }
-  }
-});
+var getCosInstance = async () => {
+  if (tokenCache.cos) {
+    return tokenCache.cos;
+  }
+  const result = await getCosTempToken();
+  if (result.Code !== 0 || !result.Data || !result.Data.Response || !result.Data.Response.Credentials) {
+    throw new Error("Failed to get COS temp token");
+  }
+  const response = result.Data.Response;
+  const credentials = response.Credentials;
+  const cos = new import_cos_nodejs_sdk_v5.default({
+    SecretId: credentials.TmpSecretId,
+    SecretKey: credentials.TmpSecretKey,
+    SecurityToken: credentials.Token
+  });
+  tokenCache.cos = cos;
+  return cos;
+};
 var fastListFolder = async (rootPath) => {
   const list = [];
   const deep = async (dirPath) => {
@@ -192430,6 +192436,7 @@ var getFiles = (list, localFolder, bucket, region, targetPath) => {
   });
 };
 var uploadFiles = async (files) => {
+  const cos = await getCosInstance();
   return new Promise((resolve6, reject) => {
     cos.uploadFiles(
       {
@@ -192446,7 +192453,7 @@ var uploadFiles = async (files) => {
     );
   });
 };
-var uploadDirectoryToCOS = async (localPath) => {
+var uploadToEdgeOneCOS = async (localPath) => {
   var _a6;
   try {
     const tokenResult = await getCosTempToken();
@@ -192466,11 +192473,12 @@ var uploadDirectoryToCOS = async (localPath) => {
     }
     const isZip = isZipFile(localPath);
     if (isZip) {
-      progressLog(`[uploadDirectoryToCOS] Uploading zip file to COS...`);
+      progressLog(`[uploadToEdgeOneCOS] Uploading zip file to COS with targetPath: ${targetPath}...`);
       const fileName = path7.basename(localPath);
       const key2 = `${targetPath}/${fileName}`;
       const fileBuffer = await fs7.readFile(localPath);
       const fileStats = await fs7.stat(localPath);
+      const cos = await getCosInstance();
       return new Promise((resolve6, reject) => {
         cos.putObject(
           {
@@ -192485,7 +192493,7 @@ var uploadDirectoryToCOS = async (localPath) => {
               errorLog("Error uploading zip file to COS: " + err2);
               reject(err2);
             } else {
-              progressLog(`[uploadDirectoryToCOS] Upload successful.`);
+              progressLog(`[uploadToEdgeOneCOS] Upload successful.`);
               resolve6({
                 success: true,
                 targetPath: key2
@@ -192498,10 +192506,10 @@ var uploadDirectoryToCOS = async (localPath) => {
       const folderList = await fastListFolder(localPath);
       const files = getFiles(folderList, localPath, bucket, region, targetPath);
       progressLog(
-        `[uploadDirectoryToCOS] Uploading ${files.length} files to COS...`
+        `[uploadToEdgeOneCOS] Uploading ${files.length} files to COS with targetPath: ${targetPath}...`
       );
       await uploadFiles(files);
-      progressLog(`[uploadDirectoryToCOS] Upload successful.`);
+      progressLog(`[uploadToEdgeOneCOS] Upload successful.`);
       return {
         success: true,
         targetPath
@@ -192527,7 +192535,7 @@ var pollProjectStatus = async (projectId, deploymentId) => {
     if (deployment.Status !== "Process") {
       isProcessing = false;
     } else {
-      await sleep(2e3);
+      await sleep(5e3);
     }
   }
   return deployment;
@@ -192590,9 +192598,10 @@ var getDeploymentStructuredResult = async (deploymentResult, projectId, env3 = "
 };
 var deployFolderOrZipToEdgeOne = async (localPath, env3 = "Production") => {
   var _a6, _b2, _c2, _d2;
+  resetTokenCache();
   const isZip = await validateFolder(localPath);
   await checkAndSetBaseUrl();
-  const uploadResult = await uploadDirectoryToCOS(localPath);
+  const uploadResult = await uploadToEdgeOneCOS(localPath);
   if (!uploadResult.targetPath) {
     throw new Error("COS upload succeeded but targetPath is missing.");
   }

package/package.json

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