vite-plugin-deploy-ftp 3.2.0 → 3.3.0

package/dist/index.js

@@ -6,7 +6,6 @@ import cliProgress from "cli-progress";
 import dayjs from "dayjs";
 import fs2 from "fs";
 import { stat } from "fs/promises";
-import os2 from "os";
 import path2 from "path";
 import ora from "ora";
 import { normalizePath as normalizePath2 } from "vite";
@@ -33,10 +32,12 @@ function getAllFiles(dirPath, arrayOfFiles = [], relativePath = "") {
 }
 function createTempDir(basePath) {
   const tempBaseDir = os.tmpdir();
-  const tempPath = path.join(tempBaseDir, "vite-plugin-deploy-ftp", basePath);
-  if (!fs.existsSync(tempPath)) {
-    fs.mkdirSync(tempPath, { recursive: true });
+  const tempParentDir = path.join(tempBaseDir, "vite-plugin-deploy-ftp");
+  const safeBasePath = basePath.replace(/[\\/]+/g, "-").replace(/[^a-zA-Z0-9._-]/g, "-") || "temp";
+  if (!fs.existsSync(tempParentDir)) {
+    fs.mkdirSync(tempParentDir, { recursive: true });
   }
+  const tempPath = fs.mkdtempSync(path.join(tempParentDir, `${safeBasePath}-`));
   return {
     path: tempPath,
     cleanup: () => {
@@ -706,8 +707,10 @@ function vitePluginDeployFtp(option) {
         elapsed: formatDuration(elapsedSeconds).replace(/s$/, "")
       });
       progressBar.stop();
+    } else if (failed > 0) {
+      console.log(`${getLogSymbol("warning")} \u6587\u4EF6\u4E0A\u4F20\u7ED3\u675F\uFF0C\u6210\u529F ${completed - failed}/${totalFiles}\uFF0C\u5931\u8D25 ${failed}`);
     } else {
-      console.log(`${getLogSymbol("success")} \u6240\u6709\u6587\u4EF6\u4E0A\u4F20\u5B8C\u6210 (${totalFiles}/${totalFiles})`);
+      console.log(`${getLogSymbol("success")} \u6587\u4EF6\u4E0A\u4F20\u5B8C\u6210 (${totalFiles}/${totalFiles})`);
     }
     debugEntries.push(
       {
@@ -1035,9 +1038,8 @@ ${getLogSymbol("danger")} \u4E0A\u4F20\u8FC7\u7A0B\u4E2D\u53D1\u751F\u9519\u8BEF
       clearScreen();
       const validationErrors = validateOptions();
       if (validationErrors.length > 0) {
-        console.log(`${chalk5.red("\u2717 \u914D\u7F6E\u9519\u8BEF:")}
+        throw new Error(`\u914D\u7F6E\u9519\u8BEF:
 ${validationErrors.map((err) => `  - ${err}`).join("\n")}`);
-        return;
       }
       upload = true;
       return config;
@@ -1101,13 +1103,10 @@ async function createBackupFile(client, dir, alias, showBackFile = false, useSpi
   const targetUrl = resolveDisplayUrl(alias, dir);
   const backupSpinner = useSpinner ? ora(`\u521B\u5EFA\u5907\u4EFD\u6587\u4EF6\u4E2D ${chalk5.yellow(`==> ${targetUrl}`)}`).start() : null;
   const fileName = `backup_${dayjs().format("YYYYMMDD_HHmmss")}.zip`;
-  const tempDir = createTempDir("backup-zip");
-  const zipFilePath = path2.join(os2.tmpdir(), "vite-plugin-deploy-ftp", fileName);
+  const tempDir = createTempDir("backup-download");
+  const zipTempDir = createTempDir("backup-zip");
+  const zipFilePath = path2.join(zipTempDir.path, fileName);
   try {
-    const zipDir = path2.dirname(zipFilePath);
-    if (!fs2.existsSync(zipDir)) {
-      fs2.mkdirSync(zipDir, { recursive: true });
-    }
     if (backupSpinner) {
       backupSpinner.text = `\u4E0B\u8F7D\u8FDC\u7A0B\u6587\u4EF6\u4E2D ${chalk5.yellow(`==> ${targetUrl}`)}`;
     }
@@ -1147,6 +1146,7 @@ async function createBackupFile(client, dir, alias, showBackFile = false, useSpi
     throw error;
   } finally {
     tempDir.cleanup();
+    zipTempDir.cleanup();
     try {
       if (fs2.existsSync(zipFilePath)) {
         fs2.rmSync(zipFilePath);
@@ -1162,12 +1162,10 @@ async function createSingleBackup(client, dir, alias, singleBackFiles, showBackF
   const tempDir = createTempDir("single-backup");
   let backupProgressSpinner;
   try {
-    const remoteFiles = await client.list(dir);
-    const normalizedSingleBackFiles = singleBackFiles.map((fileName) => normalizeSelectionPath(fileName)).filter(Boolean);
-    const backupTasks = normalizedSingleBackFiles.map((fileName) => {
-      const remoteFile = remoteFiles.find((file) => file.name === fileName);
-      return remoteFile ? { fileName, exists: true } : { fileName, exists: false };
-    }).filter((task) => task.exists);
+    const normalizedSingleBackFiles = singleBackFiles.map((fileName) => normalizeSelectionPath(fileName)).map(
+      (fileName) => fileName.split("/").filter((segment) => segment && segment !== ".").join("/")
+    ).filter((fileName) => !fileName.split("/").includes("..")).filter(Boolean);
+    const backupTasks = normalizedSingleBackFiles.map((fileName) => ({ fileName }));
     if (backupTasks.length === 0) {
       if (backupSpinner) {
         backupSpinner.warn("\u672A\u627E\u5230\u9700\u8981\u5907\u4EFD\u7684\u6587\u4EF6");
@@ -1185,31 +1183,31 @@ async function createSingleBackup(client, dir, alias, singleBackFiles, showBackF
     if (useSpinner) {
       backupProgressSpinner = ora("\u6B63\u5728\u5907\u4EFD\u6587\u4EF6...").start();
     }
-    const concurrencyLimit = 3;
     let backedUpCount = 0;
     const backedUpFiles = [];
-    for (let i = 0; i < backupTasks.length; i += concurrencyLimit) {
-      const batch = backupTasks.slice(i, i + concurrencyLimit);
-      const promises = batch.map(async ({ fileName }) => {
-        try {
-          const localTempPath = path2.join(tempDir.path, fileName);
-          const extIndex = fileName.lastIndexOf(".");
-          const name = extIndex > -1 ? fileName.slice(0, extIndex) : fileName;
-          const ext = extIndex > -1 ? fileName.slice(extIndex) : "";
-          const backupFileName = `${name}.${timestamp}${ext}`;
-          const sourceRemotePath = normalizeRemotePath(dir, fileName);
-          const backupRemotePath = normalizeRemotePath(dir, backupFileName);
-          await client.downloadTo(localTempPath, sourceRemotePath);
-          await client.uploadFrom(localTempPath, backupRemotePath);
-          backedUpFiles.push(resolveDisplayUrl(alias, backupRemotePath));
-          return true;
-        } catch (error) {
-          console.warn(chalk5.yellow(`\u5907\u4EFD\u6587\u4EF6 ${fileName} \u5931\u8D25:`), error instanceof Error ? error.message : error);
-          return false;
+    for (const { fileName } of backupTasks) {
+      try {
+        const localTempPath = path2.join(tempDir.path, fileName);
+        const localTempDir = path2.dirname(localTempPath);
+        if (!fs2.existsSync(localTempDir)) {
+          fs2.mkdirSync(localTempDir, { recursive: true });
         }
-      });
-      const results = await Promise.all(promises);
-      backedUpCount += results.filter(Boolean).length;
+        const fileDir = path2.posix.dirname(fileName);
+        const fileBaseName = path2.posix.basename(fileName);
+        const extIndex = fileBaseName.lastIndexOf(".");
+        const name = extIndex > -1 ? fileBaseName.slice(0, extIndex) : fileBaseName;
+        const ext = extIndex > -1 ? fileBaseName.slice(extIndex) : "";
+        const backupFileName = `${name}.${timestamp}${ext}`;
+        const backupRelativePath = fileDir === "." ? backupFileName : normalizeRemotePath(fileDir, backupFileName);
+        const sourceRemotePath = normalizeRemotePath(dir, fileName);
+        const backupRemotePath = normalizeRemotePath(dir, backupRelativePath);
+        await client.downloadTo(localTempPath, sourceRemotePath);
+        await client.uploadFrom(localTempPath, backupRemotePath);
+        backedUpFiles.push(resolveDisplayUrl(alias, backupRemotePath));
+        backedUpCount++;
+      } catch (error) {
+        console.warn(chalk5.yellow(`\u5907\u4EFD\u6587\u4EF6 ${fileName} \u5931\u8D25:`), error instanceof Error ? error.message : error);
+      }
     }
     if (backedUpCount > 0) {
       backupProgressSpinner?.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-deploy-ftp",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -32,25 +32,25 @@
   "description": "将dist目录下的文件上传到ftp服务器",
   "devDependencies": {
     "@types/cli-progress": "^3.11.6",
-    "@types/node": "^22.15.32",
-    "@types/yazl": "^3.3.0",
-    "prettier": "3.8.1",
-    "tsup": "^8.5.0",
-    "typescript": "^5.8.3"
+    "@types/node": "^25.7.0",
+    "@types/yazl": "^3.3.1",
+    "prettier": "3.8.3",
+    "tsup": "^8.5.1",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "vite": "^6.0.3 || ^7 || ^8"
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.5.3",
-    "basic-ftp": "^5.0.5",
-    "chalk": "^5.4.1",
+    "@inquirer/prompts": "^8.4.3",
+    "basic-ftp": "^6.0.1",
+    "chalk": "^5.6.2",
     "cli-progress": "^3.12.0",
-    "cli-truncate": "^5.2.0",
-    "dayjs": "^1.11.13",
+    "cli-truncate": "^6.0.0",
+    "dayjs": "^1.11.20",
     "log-symbols": "^7.0.1",
-    "ora": "^8.2.0",
-    "string-width": "^8.2.0",
+    "ora": "^9.4.0",
+    "string-width": "^8.2.1",
     "yazl": "^3.3.1"
   },
   "scripts": {

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+allowBuilds:
+  esbuild: false