fix(ssh): must queue upload

Author: warmthsea

src/index.ts

@@ -67,7 +67,7 @@ client.connect({
     spinner.start(`Upload files`)
 
     await utilAwaitTime(800)
-    await uploadFiles(sftp, localDir, config.wwwPath)
+    await uploadFiles(spinner, sftp, localDir, config.wwwPath)
 
     spinner.succeed('Upload success all')
     client.end()

src/www-fs.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-async-promise-executor */
 import path from 'node:path'
 import type { Client, FileEntryWithStats, SFTPWrapper, Stats } from 'ssh2'
+import type { Ora } from 'ora'
 import { getLoaclDirStat, readLoaclDir } from './local-fs'
 
 export function getSftp(client: Client) {
@@ -97,33 +98,37 @@ export function deleteWWWDirAllConetents(sftp: SFTPWrapper, wwwPath: string, fil
   })
 }
 
-export function uploadFiles(sftp: SFTPWrapper, localDir: string, wwwPath: string) {
-  return new Promise(async (resolve, reject) => {
-    const files = await readLoaclDir(localDir)
-
-    const uploadPromises = files.map((file) => {
-      const localFilePath = path.join(localDir, file)
-      const remoteFilePath = path.posix.join(wwwPath, file)
-
-      return new Promise<void>(async (resolve, reject) => {
-        const stats = await getLoaclDirStat(localFilePath)
-
-        if (stats.isDirectory()) {
-          await createWWWDir(sftp, remoteFilePath)
-          uploadFiles(sftp, localFilePath, remoteFilePath).then(() => resolve()).catch(reject)
-        }
-        else {
-          sftp.fastPut(localFilePath, remoteFilePath, (err) => {
-            if (err)
-              throw err
-            resolve()
-          })
-        }
-      })
-    })
+export function sendLocaWWWfile(sftp: SFTPWrapper, localFilePath: string, remoteFilePath: string) {
+  return new Promise<void>((resolve) => {
+    sftp.fastPut(localFilePath, remoteFilePath, async (err) => {
+      if (err) {
+        console.log(localFilePath)
+        console.log(remoteFilePath)
+        throw err
+      }
 
-    Promise.all(uploadPromises)
-      .then(resolve)
-      .catch(reject)
+      resolve()
+    })
   })
 }
+
+export async function uploadFiles(spinner: Ora, sftp: SFTPWrapper, localDir: string, wwwPath: string) {
+  const files = await readLoaclDir(localDir)
+
+  for (const [index, file] of files.entries()) {
+    const localFilePath = path.join(localDir, file)
+    const remoteFilePath = path.posix.join(wwwPath, file)
+
+    const stats = await getLoaclDirStat(localFilePath)
+
+    if (stats.isDirectory()) {
+      await createWWWDir(sftp, remoteFilePath)
+      spinner.start(`Create folder ${localFilePath}`)
+      await uploadFiles(spinner, sftp, localFilePath, remoteFilePath)
+    }
+    else {
+      await sendLocaWWWfile(sftp, localFilePath, remoteFilePath)
+      spinner.start(`Upload files [${index + 1}/${files.length}] ${localFilePath}`)
+    }
+  }
+}