@widget-js/cli 1.0.13 → 1.0.14

package/lib/index.cjs

@@ -294,7 +294,7 @@ async function copy(dist, src) {
 // src/release/release.ts
 var import_chalk3 = __toESM(require("chalk"), 1);
 
-// src/release/ftp/ftp.ts
+// src/release/ftp.ts
 var import_path2 = __toESM(require("path"), 1);
 var import_fs4 = __toESM(require("fs"), 1);
 var import_ssh_config = __toESM(require("@widget-js/ssh-config"), 1);
@@ -305,6 +305,14 @@ var import_inquirer3 = __toESM(require("inquirer"), 1);
 var import_ora = __toESM(require("ora"), 1);
 var process2 = __toESM(require("process"), 1);
 var console2 = __toESM(require("console"), 1);
+async function checkParentDir(ftpClient, file, onMkdir) {
+  let dir = import_path2.default.dirname(file);
+  const dirExists = await ftpClient.exists(dir);
+  if (!dirExists) {
+    onMkdir(dir);
+    await ftpClient.mkdir(dir, true);
+  }
+}
 function ftpUpload() {
   const file = import_path2.default.join(process2.cwd(), "release.json");
   const releaseConfig = JSON.parse(import_fs4.default.readFileSync(file).toString());
@@ -331,19 +339,31 @@ function ftpUpload() {
         passphrase: answer.password,
         privateKey: key
       });
+      releaseConfig.fileMap.sort((it1, it2) => it1.order - it2.order);
       for (let item of releaseConfig.fileMap) {
         if (typeof item.src == "string") {
-          const localFile = import_path2.default.resolve(process2.cwd(), item.src);
-          if (!import_fs4.default.existsSync(localFile)) {
-            spinner.warn(`Skip not exists file:${localFile}`);
-            continue;
-          }
-          if (import_fs4.default.lstatSync(localFile).isDirectory()) {
-            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
-            await ftpClient.uploadDir(localFile, item.dest);
+          if (item.remoteCopy) {
+            await checkParentDir(ftpClient, item.dest, (dir) => {
+              spinner.warn(`Create Dir: ${dir}`);
+            });
+            spinner.info(`Copying File: ${item.src} -> ${item.dest}`);
+            await ftpClient.rcopy(item.src, item.dest);
           } else {
-            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`);
-            await ftpClient.put(localFile, item.dest);
+            const localFile = import_path2.default.resolve(process2.cwd(), item.src);
+            if (!item.remoteCopy && !import_fs4.default.existsSync(localFile)) {
+              spinner.warn(`Skip not exists file:${localFile}`);
+              continue;
+            }
+            if (import_fs4.default.lstatSync(localFile).isDirectory()) {
+              spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
+              await ftpClient.uploadDir(localFile, item.dest);
+            } else {
+              await checkParentDir(ftpClient, item.dest, (dir) => {
+                spinner.warn(`Create Dir: ${dir}`);
+              });
+              spinner.info(`Uploading File: ${localFile} -> ${item.dest}`);
+              await ftpClient.put(localFile, item.dest);
+            }
           }
         } else {
           await ftpClient.put(Buffer.from(JSON.stringify(item.src), "utf-8"), item.dest);

package/lib/index.js

@@ -273,7 +273,7 @@ async function copy(dist, src) {
 // src/release/release.ts
 import chalk3 from "chalk";
 
-// src/release/ftp/ftp.ts
+// src/release/ftp.ts
 import path2 from "path";
 import fs4 from "fs";
 import SSHConfig from "@widget-js/ssh-config";
@@ -284,6 +284,14 @@ import inquirer3 from "inquirer";
 import ora from "ora";
 import * as process2 from "process";
 import * as console2 from "console";
+async function checkParentDir(ftpClient, file, onMkdir) {
+  let dir = path2.dirname(file);
+  const dirExists = await ftpClient.exists(dir);
+  if (!dirExists) {
+    onMkdir(dir);
+    await ftpClient.mkdir(dir, true);
+  }
+}
 function ftpUpload() {
   const file = path2.join(process2.cwd(), "release.json");
   const releaseConfig = JSON.parse(fs4.readFileSync(file).toString());
@@ -310,19 +318,31 @@ function ftpUpload() {
         passphrase: answer.password,
         privateKey: key
       });
+      releaseConfig.fileMap.sort((it1, it2) => it1.order - it2.order);
       for (let item of releaseConfig.fileMap) {
         if (typeof item.src == "string") {
-          const localFile = path2.resolve(process2.cwd(), item.src);
-          if (!fs4.existsSync(localFile)) {
-            spinner.warn(`Skip not exists file:${localFile}`);
-            continue;
-          }
-          if (fs4.lstatSync(localFile).isDirectory()) {
-            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
-            await ftpClient.uploadDir(localFile, item.dest);
+          if (item.remoteCopy) {
+            await checkParentDir(ftpClient, item.dest, (dir) => {
+              spinner.warn(`Create Dir: ${dir}`);
+            });
+            spinner.info(`Copying File: ${item.src} -> ${item.dest}`);
+            await ftpClient.rcopy(item.src, item.dest);
           } else {
-            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`);
-            await ftpClient.put(localFile, item.dest);
+            const localFile = path2.resolve(process2.cwd(), item.src);
+            if (!item.remoteCopy && !fs4.existsSync(localFile)) {
+              spinner.warn(`Skip not exists file:${localFile}`);
+              continue;
+            }
+            if (fs4.lstatSync(localFile).isDirectory()) {
+              spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`);
+              await ftpClient.uploadDir(localFile, item.dest);
+            } else {
+              await checkParentDir(ftpClient, item.dest, (dir) => {
+                spinner.warn(`Create Dir: ${dir}`);
+              });
+              spinner.info(`Uploading File: ${localFile} -> ${item.dest}`);
+              await ftpClient.put(localFile, item.dest);
+            }
           }
         } else {
           await ftpClient.put(Buffer.from(JSON.stringify(item.src), "utf-8"), item.dest);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",

package/release.json

@@ -1,22 +1,15 @@
 {
   "fileMap": [
     {
-      "src": "./template",
-      "dest": "/www/wwwroot/template/"
-    },
-    {
-      "src": {
-        "version": "0.1.0",
-        "createdAt": "",
-        "releaseNote": "1.增加版本更新",
-        "downloadLink": "https://download.tool-vip.com/youlu/update.zip",
-        "updateElectron": false
-      },
-      "dest": "/www/wwwroot/template/version.json"
+      "src": ".gitignore",
+      "dest": "/www/wwwroot/template/aa/.gitignore",
+      "order": 0
     },
     {
-      "src": ".gitignore",
-      "dest": "/www/wwwroot/template/.gitignore"
+      "src": "/www/wwwroot/template/aa/.gitignore",
+      "dest": "/www/wwwroot/template/bbb/.gitignorexxx",
+      "remoteCopy": true,
+      "order": 1
     }
   ],
   "ftpConfig": {

package/src/index.ts

@@ -8,7 +8,6 @@ import release from './release/release'
 import {fileURLToPath} from 'url'
 import figlet from 'figlet'
 import gradient from 'gradient-string'
-import {ftpUpload} from './release/ftp/ftp'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)

package/src/release/{ftp/ftp.ts → ftp.ts}

@@ -12,6 +12,16 @@ import * as console from 'console'
 interface PasswordAnswer {
   password: string
 }
+
+async function checkParentDir(ftpClient: Client, file: string, onMkdir: (dir: string) => void) {
+  let dir = path.dirname(file)
+  const dirExists = await ftpClient.exists(dir)
+  if (!dirExists) {
+    onMkdir(dir)
+    await ftpClient.mkdir(dir, true)
+  }
+}
+
 export function ftpUpload() {
   // 读取
   const file = path.join(process.cwd(), 'release.json')
@@ -41,20 +51,32 @@ export function ftpUpload() {
           passphrase: answer.password,
           privateKey: key,
         })
+        releaseConfig.fileMap.sort((it1, it2) => it1.order - it2.order)
         // upload files
         for (let item of releaseConfig.fileMap) {
           if (typeof item.src == 'string') {
-            const localFile = path.resolve(process.cwd(), item.src as string)
-            if (!fs.existsSync(localFile)) {
-              spinner.warn(`Skip not exists file:${localFile}`)
-              continue
-            }
-            if (fs.lstatSync(localFile).isDirectory()) {
-              spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`)
-              await ftpClient.uploadDir(localFile, item.dest)
+            if (item.remoteCopy) {
+              await checkParentDir(ftpClient, item.dest, dir => {
+                spinner.warn(`Create Dir: ${dir}`)
+              })
+              spinner.info(`Copying File: ${item.src} -> ${item.dest}`)
+              await ftpClient.rcopy(item.src, item.dest)
             } else {
-              spinner.info(`Uploading File: ${localFile} -> ${item.dest}`)
-              await ftpClient.put(localFile, item.dest)
+              const localFile = path.resolve(process.cwd(), item.src as string)
+              if (!item.remoteCopy && !fs.existsSync(localFile)) {
+                spinner.warn(`Skip not exists file:${localFile}`)
+                continue
+              }
+              if (fs.lstatSync(localFile).isDirectory()) {
+                spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`)
+                await ftpClient.uploadDir(localFile, item.dest)
+              } else {
+                await checkParentDir(ftpClient, item.dest, dir => {
+                  spinner.warn(`Create Dir: ${dir}`)
+                })
+                spinner.info(`Uploading File: ${localFile} -> ${item.dest}`)
+                await ftpClient.put(localFile, item.dest)
+              }
             }
           } else {
             await ftpClient.put(Buffer.from(JSON.stringify(item.src), 'utf-8'), item.dest)
@@ -73,6 +95,8 @@ export interface ReleaseConfig {
   fileMap: {
     src: string | object
     dest: string
+    remoteCopy: boolean
+    order: number
   }[]
   ftpConfig: FTPConfig
 }

package/src/release/release.ts

@@ -4,7 +4,7 @@ import promptChecker from '../promts/promptChecker.js'
 import zipDirectory from './update-zip.js'
 import {copy, put} from './oss.js'
 import chalk from 'chalk'
-import {ftpUpload} from './ftp/ftp'
+import {ftpUpload} from './ftp'
 
 async function delay(time: number) {
   return new Promise<void>((resolve, reject) => {