@widget-js/cli 1.0.12 → 1.0.14

package/lib/index.cjs

@@ -238,8 +238,8 @@ async function createWidget() {
 }
 
 // src/release/release.ts
-var import_fs4 = __toESM(require("fs"), 1);
-var import_path2 = __toESM(require("path"), 1);
+var import_fs5 = __toESM(require("fs"), 1);
+var import_path3 = __toESM(require("path"), 1);
 
 // src/release/update-zip.ts
 var import_fs2 = __toESM(require("fs"), 1);
@@ -293,54 +293,11 @@ async function copy(dist, src) {
 
 // src/release/release.ts
 var import_chalk3 = __toESM(require("chalk"), 1);
-var release = async () => {
-  const packageJSON = JSON.parse(import_fs4.default.readFileSync("package.json", "utf-8"));
-  const changelogJSON = JSON.parse(import_fs4.default.readFileSync("changelog.json", "utf-8"));
-  const version = packageJSON["version"];
-  const changelog = changelogJSON[version];
-  let needUpdateElectron = await promptChecker_default({
-    type: "confirm",
-    name: "electron",
-    message: import_chalk3.default.blue("\u7528\u6237\u662F\u5426\u9700\u8981\u66F4\u65B0Electron?")
-  });
-  const versionInfo = {
-    version,
-    releaseNote: changelog,
-    updateElectron: needUpdateElectron,
-    updateNodeModule: false,
-    updateWindowsApi: false,
-    downloadLink: ""
-  };
-  let installerPath = import_path2.default.join(`./packaged/widgets-${version}-setup-win-x64.exe`);
-  if (!import_fs4.default.existsSync(installerPath)) {
-    installerPath = import_path2.default.join(`./packaged/electron-${version}-setup-win-x64.exe`);
-  }
-  const updateZipPath = import_path2.default.join(`./packaged/update.zip`);
-  console.log(import_chalk3.default.blue("\u538B\u7F29\u66F4\u65B0\u6587\u4EF6\u4E2D"));
-  await update_zip_default("./release", updateZipPath);
-  console.log(import_chalk3.default.blue("\u4E0A\u4F20installer.exe\u5230OSS"));
-  await put("version/installer.exe", installerPath);
-  console.log(import_chalk3.default.blue("\u4E0A\u4F20update.zip\u5230OSS"));
-  await put("version/update.zip", updateZipPath);
-  console.log(import_chalk3.default.blue("\u66F4\u65B0\u7248\u672C\u4FE1\u606F"));
-  versionInfo.downloadLink = "https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip";
-  const versionJSON = JSON.stringify(versionInfo, null, 2);
-  await put("version/version.json", Buffer.from(versionJSON));
-  copy(`version/history/${version}.exe`, "version/installer.exe");
-  copy(`version/history/update-${version}.zip`, "version/update.zip");
-  console.log(import_chalk3.default.yellow(versionJSON));
-};
-var release_default = release;
-
-// src/index.ts
-var import_url2 = require("url");
-var import_figlet = __toESM(require("figlet"), 1);
-var import_gradient_string = __toESM(require("gradient-string"), 1);
 
-// src/ftp/ftp.ts
-var import_path3 = __toESM(require("path"), 1);
-var import_fs5 = __toESM(require("fs"), 1);
-var import_ssh_config = __toESM(require("ssh-config"), 1);
+// 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);
 var import_os = __toESM(require("os"), 1);
 var import_ssh2_sftp_client = __toESM(require("ssh2-sftp-client"), 1);
 var import_consola2 = __toESM(require("consola"), 1);
@@ -348,12 +305,20 @@ 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_path3.default.join(process2.cwd(), "release.json");
-  const releaseConfig = JSON.parse(import_fs5.default.readFileSync(file).toString());
-  const sshConfigFile = import_path3.default.resolve(import_os.default.homedir(), ".ssh/config");
+  const file = import_path2.default.join(process2.cwd(), "release.json");
+  const releaseConfig = JSON.parse(import_fs4.default.readFileSync(file).toString());
+  const sshConfigFile = import_path2.default.resolve(import_os.default.homedir(), ".ssh/config");
   console2.log("SSH Config file:", sshConfigFile);
-  const sshConfigs = import_ssh_config.default.parse(import_fs5.default.readFileSync(sshConfigFile).toString());
+  const sshConfigs = import_ssh_config.default.parse(import_fs4.default.readFileSync(sshConfigFile).toString());
   let sshConfig = sshConfigs.compute(releaseConfig.ftpConfig.host);
   if (!sshConfig) {
     import_consola2.default.error(`SSH config ${releaseConfig.ftpConfig.host} not found`);
@@ -363,7 +328,7 @@ function ftpUpload() {
   import_inquirer3.default.prompt([{ type: "password", name: "password", mask: "*", message: "Enter key pair password" }]).then(async (answer) => {
     let ftpClient = new import_ssh2_sftp_client.default();
     const port = sshConfig["Port"];
-    const key = import_fs5.default.readFileSync(import_path3.default.resolve(import_os.default.homedir(), ".ssh/id_rsa"));
+    const key = import_fs4.default.readFileSync(import_path2.default.resolve(import_os.default.homedir(), ".ssh/id_rsa"));
     const spinner = (0, import_ora.default)("Connecting");
     try {
       spinner.start();
@@ -374,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_path3.default.resolve(process2.cwd(), item.src);
-          if (!import_fs5.default.existsSync(localFile)) {
-            spinner.warn(`Skip not exists file:${localFile}`);
-            continue;
-          }
-          if (import_fs5.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);
@@ -401,7 +378,55 @@ function ftpUpload() {
   });
 }
 
+// src/release/release.ts
+var release = async (options) => {
+  console.log();
+  if (options.type == "ftp") {
+    await ftpUpload();
+    return;
+  }
+  const packageJSON = JSON.parse(import_fs5.default.readFileSync("package.json", "utf-8"));
+  const changelogJSON = JSON.parse(import_fs5.default.readFileSync("changelog.json", "utf-8"));
+  const version = packageJSON["version"];
+  const changelog = changelogJSON[version];
+  let needUpdateElectron = await promptChecker_default({
+    type: "confirm",
+    name: "electron",
+    message: import_chalk3.default.blue("\u7528\u6237\u662F\u5426\u9700\u8981\u66F4\u65B0Electron?")
+  });
+  const versionInfo = {
+    version,
+    releaseNote: changelog,
+    updateElectron: needUpdateElectron,
+    updateNodeModule: false,
+    updateWindowsApi: false,
+    downloadLink: ""
+  };
+  let installerPath = import_path3.default.join(`./packaged/widgets-${version}-setup-win-x64.exe`);
+  if (!import_fs5.default.existsSync(installerPath)) {
+    installerPath = import_path3.default.join(`./packaged/electron-${version}-setup-win-x64.exe`);
+  }
+  const updateZipPath = import_path3.default.join(`./packaged/update.zip`);
+  console.log(import_chalk3.default.blue("\u538B\u7F29\u66F4\u65B0\u6587\u4EF6\u4E2D"));
+  await update_zip_default("./release", updateZipPath);
+  console.log(import_chalk3.default.blue("\u4E0A\u4F20installer.exe\u5230OSS"));
+  await put("version/installer.exe", installerPath);
+  console.log(import_chalk3.default.blue("\u4E0A\u4F20update.zip\u5230OSS"));
+  await put("version/update.zip", updateZipPath);
+  console.log(import_chalk3.default.blue("\u66F4\u65B0\u7248\u672C\u4FE1\u606F"));
+  versionInfo.downloadLink = "https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip";
+  const versionJSON = JSON.stringify(versionInfo, null, 2);
+  await put("version/version.json", Buffer.from(versionJSON));
+  copy(`version/history/${version}.exe`, "version/installer.exe");
+  copy(`version/history/update-${version}.zip`, "version/update.zip");
+  console.log(import_chalk3.default.yellow(versionJSON));
+};
+var release_default = release;
+
 // src/index.ts
+var import_url2 = require("url");
+var import_figlet = __toESM(require("figlet"), 1);
+var import_gradient_string = __toESM(require("gradient-string"), 1);
 var import_meta2 = {};
 var __filename = (0, import_url2.fileURLToPath)(import_meta2.url);
 var __dirname = import_path4.default.dirname(__filename);
@@ -412,10 +437,9 @@ import_commander.program.version(`@widget-js/cli ${cliPackage.version}`).usage("
 import_commander.program.command("create").description("\u521B\u5EFA\u65B0\u7684\u7EC4\u4EF6").action(async () => {
   await createWidget();
 });
-import_commander.program.command("release").description("\u901A\u8FC7OSS\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
-  await release_default();
-});
-import_commander.program.command("ftp").description("\u901A\u8FC7FTP\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
-  await ftpUpload();
+var typeOption = new import_commander.Option("-t, --type <type>").choices(["ftp", "oss"]);
+import_commander.program.command("release").description("\u901A\u8FC7FTP/OSS\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").addOption(typeOption).action(async (options, command) => {
+  console.log(options);
+  await release_default(options);
 });
 import_commander.program.parse(process3.argv);

package/lib/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import { program } from "commander";
+import { Option, program } from "commander";
 import fs6 from "fs";
 import path4 from "path";
 import * as process3 from "process";
@@ -217,8 +217,8 @@ async function createWidget() {
 }
 
 // src/release/release.ts
-import fs4 from "fs";
-import path2 from "path";
+import fs5 from "fs";
+import path3 from "path";
 
 // src/release/update-zip.ts
 import fs2 from "fs";
@@ -272,54 +272,11 @@ async function copy(dist, src) {
 
 // src/release/release.ts
 import chalk3 from "chalk";
-var release = async () => {
-  const packageJSON = JSON.parse(fs4.readFileSync("package.json", "utf-8"));
-  const changelogJSON = JSON.parse(fs4.readFileSync("changelog.json", "utf-8"));
-  const version = packageJSON["version"];
-  const changelog = changelogJSON[version];
-  let needUpdateElectron = await promptChecker_default({
-    type: "confirm",
-    name: "electron",
-    message: chalk3.blue("\u7528\u6237\u662F\u5426\u9700\u8981\u66F4\u65B0Electron?")
-  });
-  const versionInfo = {
-    version,
-    releaseNote: changelog,
-    updateElectron: needUpdateElectron,
-    updateNodeModule: false,
-    updateWindowsApi: false,
-    downloadLink: ""
-  };
-  let installerPath = path2.join(`./packaged/widgets-${version}-setup-win-x64.exe`);
-  if (!fs4.existsSync(installerPath)) {
-    installerPath = path2.join(`./packaged/electron-${version}-setup-win-x64.exe`);
-  }
-  const updateZipPath = path2.join(`./packaged/update.zip`);
-  console.log(chalk3.blue("\u538B\u7F29\u66F4\u65B0\u6587\u4EF6\u4E2D"));
-  await update_zip_default("./release", updateZipPath);
-  console.log(chalk3.blue("\u4E0A\u4F20installer.exe\u5230OSS"));
-  await put("version/installer.exe", installerPath);
-  console.log(chalk3.blue("\u4E0A\u4F20update.zip\u5230OSS"));
-  await put("version/update.zip", updateZipPath);
-  console.log(chalk3.blue("\u66F4\u65B0\u7248\u672C\u4FE1\u606F"));
-  versionInfo.downloadLink = "https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip";
-  const versionJSON = JSON.stringify(versionInfo, null, 2);
-  await put("version/version.json", Buffer.from(versionJSON));
-  copy(`version/history/${version}.exe`, "version/installer.exe");
-  copy(`version/history/update-${version}.zip`, "version/update.zip");
-  console.log(chalk3.yellow(versionJSON));
-};
-var release_default = release;
-
-// src/index.ts
-import { fileURLToPath as fileURLToPath2 } from "url";
-import figlet from "figlet";
-import gradient from "gradient-string";
 
-// src/ftp/ftp.ts
-import path3 from "path";
-import fs5 from "fs";
-import SSHConfig from "ssh-config";
+// src/release/ftp.ts
+import path2 from "path";
+import fs4 from "fs";
+import SSHConfig from "@widget-js/ssh-config";
 import os from "os";
 import Client from "ssh2-sftp-client";
 import consola2 from "consola";
@@ -327,12 +284,20 @@ 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 = path3.join(process2.cwd(), "release.json");
-  const releaseConfig = JSON.parse(fs5.readFileSync(file).toString());
-  const sshConfigFile = path3.resolve(os.homedir(), ".ssh/config");
+  const file = path2.join(process2.cwd(), "release.json");
+  const releaseConfig = JSON.parse(fs4.readFileSync(file).toString());
+  const sshConfigFile = path2.resolve(os.homedir(), ".ssh/config");
   console2.log("SSH Config file:", sshConfigFile);
-  const sshConfigs = SSHConfig.parse(fs5.readFileSync(sshConfigFile).toString());
+  const sshConfigs = SSHConfig.parse(fs4.readFileSync(sshConfigFile).toString());
   let sshConfig = sshConfigs.compute(releaseConfig.ftpConfig.host);
   if (!sshConfig) {
     consola2.error(`SSH config ${releaseConfig.ftpConfig.host} not found`);
@@ -342,7 +307,7 @@ function ftpUpload() {
   inquirer3.prompt([{ type: "password", name: "password", mask: "*", message: "Enter key pair password" }]).then(async (answer) => {
     let ftpClient = new Client();
     const port = sshConfig["Port"];
-    const key = fs5.readFileSync(path3.resolve(os.homedir(), ".ssh/id_rsa"));
+    const key = fs4.readFileSync(path2.resolve(os.homedir(), ".ssh/id_rsa"));
     const spinner = ora("Connecting");
     try {
       spinner.start();
@@ -353,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 = path3.resolve(process2.cwd(), item.src);
-          if (!fs5.existsSync(localFile)) {
-            spinner.warn(`Skip not exists file:${localFile}`);
-            continue;
-          }
-          if (fs5.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);
@@ -380,7 +357,55 @@ function ftpUpload() {
   });
 }
 
+// src/release/release.ts
+var release = async (options) => {
+  console.log();
+  if (options.type == "ftp") {
+    await ftpUpload();
+    return;
+  }
+  const packageJSON = JSON.parse(fs5.readFileSync("package.json", "utf-8"));
+  const changelogJSON = JSON.parse(fs5.readFileSync("changelog.json", "utf-8"));
+  const version = packageJSON["version"];
+  const changelog = changelogJSON[version];
+  let needUpdateElectron = await promptChecker_default({
+    type: "confirm",
+    name: "electron",
+    message: chalk3.blue("\u7528\u6237\u662F\u5426\u9700\u8981\u66F4\u65B0Electron?")
+  });
+  const versionInfo = {
+    version,
+    releaseNote: changelog,
+    updateElectron: needUpdateElectron,
+    updateNodeModule: false,
+    updateWindowsApi: false,
+    downloadLink: ""
+  };
+  let installerPath = path3.join(`./packaged/widgets-${version}-setup-win-x64.exe`);
+  if (!fs5.existsSync(installerPath)) {
+    installerPath = path3.join(`./packaged/electron-${version}-setup-win-x64.exe`);
+  }
+  const updateZipPath = path3.join(`./packaged/update.zip`);
+  console.log(chalk3.blue("\u538B\u7F29\u66F4\u65B0\u6587\u4EF6\u4E2D"));
+  await update_zip_default("./release", updateZipPath);
+  console.log(chalk3.blue("\u4E0A\u4F20installer.exe\u5230OSS"));
+  await put("version/installer.exe", installerPath);
+  console.log(chalk3.blue("\u4E0A\u4F20update.zip\u5230OSS"));
+  await put("version/update.zip", updateZipPath);
+  console.log(chalk3.blue("\u66F4\u65B0\u7248\u672C\u4FE1\u606F"));
+  versionInfo.downloadLink = "https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip";
+  const versionJSON = JSON.stringify(versionInfo, null, 2);
+  await put("version/version.json", Buffer.from(versionJSON));
+  copy(`version/history/${version}.exe`, "version/installer.exe");
+  copy(`version/history/update-${version}.zip`, "version/update.zip");
+  console.log(chalk3.yellow(versionJSON));
+};
+var release_default = release;
+
 // src/index.ts
+import { fileURLToPath as fileURLToPath2 } from "url";
+import figlet from "figlet";
+import gradient from "gradient-string";
 var __filename = fileURLToPath2(import.meta.url);
 var __dirname = path4.dirname(__filename);
 var packageJsonPath = path4.join(__dirname, "../package.json");
@@ -390,10 +415,9 @@ program.version(`@widget-js/cli ${cliPackage.version}`).usage("<command> [option
 program.command("create").description("\u521B\u5EFA\u65B0\u7684\u7EC4\u4EF6").action(async () => {
   await createWidget();
 });
-program.command("release").description("\u901A\u8FC7OSS\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
-  await release_default();
-});
-program.command("ftp").description("\u901A\u8FC7FTP\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
-  await ftpUpload();
+var typeOption = new Option("-t, --type <type>").choices(["ftp", "oss"]);
+program.command("release").description("\u901A\u8FC7FTP/OSS\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").addOption(typeOption).action(async (options, command) => {
+  console.log(options);
+  await release_default(options);
 });
 program.parse(process3.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -26,6 +26,7 @@
     "@types/gradient-string": "^1.1.2",
     "@vue/cli-shared-utils": "^5.0.8",
     "@widget-js/core": "^0.1.14",
+    "@widget-js/ssh-config": "^4.2.1",
     "ali-oss": "^6.17.1",
     "archiver": "^5.3.1",
     "chalk": "^5.2.0",
@@ -38,7 +39,6 @@
     "inquirer": "^9.1.4",
     "ora": "^6.2.0",
     "shelljs": "^0.8.5",
-    "ssh-config": "file://D:\\workspace\\ssh-config",
     "ssh2-sftp-client": "^9.0.4",
     "ws": "^8.11.0"
   },

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

@@ -1,4 +1,4 @@
-import {program} from 'commander'
+import {Option, program} from 'commander'
 import fs from 'fs'
 import path from 'path'
 import * as process from 'process'
@@ -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 './ftp/ftp'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -24,17 +23,16 @@ program
   .action(async () => {
     await createWidget()
   })
+
+let typeOption = new Option('-t, --type <type>').choices(['ftp', 'oss'])
 program
   .command('release')
-  .description('通过OSS发布文件，仅内部使用')
-  .action(async () => {
-    await release()
-  })
-program
-  .command('ftp')
-  .description('通过FTP发布文件，仅内部使用')
-  .action(async () => {
-    await ftpUpload()
+  .description('通过FTP/OSS发布文件，仅内部使用')
+  .addOption(typeOption)
+  .action(async (options, command) => {
+    // @ts-ignore
+    console.log(options)
+    await release(options)
   })
 
 //TODO init 初始化项目

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

@@ -1,6 +1,6 @@
 import path from 'path'
 import fs from 'fs'
-import SSHConfig from 'ssh-config'
+import SSHConfig from '@widget-js/ssh-config'
 import os from 'os'
 import Client from 'ssh2-sftp-client'
 import consola from 'consola'
@@ -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

@@ -1,69 +1,75 @@
-import fs from "fs";
-import path from "path";
-import promptChecker from "../promts/promptChecker.js";
-import zipDirectory from "./update-zip.js";
-import {copy, put} from "./oss.js";
-import chalk from "chalk";
-
-async function delay(time:number) {
-    return new Promise<void>((resolve, reject) => {
-        setTimeout(() => {
-            resolve();
-        }, time);
-    });
-}
-
-const release = async () => {
-    const packageJSON = JSON.parse(fs.readFileSync('package.json', 'utf-8'))
-    const changelogJSON = JSON.parse(fs.readFileSync('changelog.json', 'utf-8'))
-    const version = packageJSON["version"]
-    const changelog = changelogJSON[version]
-
-    let needUpdateElectron = await promptChecker({
-        type: "confirm",
-        name: 'electron',
-        message: chalk.blue("用户是否需要更新Electron?")
-    });
-    //
-    // let needUpdateNodeModule = await promptChecker({
-    //     type: "confirm",
-    //     name: 'electron',
-    //     message: chalk.blue("用户是否需要更新node_module?")
-    // });
-
-    const versionInfo = {
-        version: version,
-        releaseNote: changelog,
-        updateElectron: needUpdateElectron,
-        updateNodeModule: false,
-        updateWindowsApi: false,
-        downloadLink: ''
-    };
-
-    let installerPath = path.join(`./packaged/widgets-${version}-setup-win-x64.exe`);
-    if (!fs.existsSync(installerPath)) {
-        installerPath = path.join(`./packaged/electron-${version}-setup-win-x64.exe`);
-    }
-    const updateZipPath = path.join(`./packaged/update.zip`)
-
-    console.log(chalk.blue("压缩更新文件中"))
-    await zipDirectory("./release", updateZipPath);
-
-    console.log(chalk.blue("上传installer.exe到OSS"))
-    await put("version/installer.exe", installerPath)
-
-    console.log(chalk.blue("上传update.zip到OSS"))
-    await put("version/update.zip", updateZipPath)
-
-    console.log(chalk.blue("更新版本信息"))
-    versionInfo.downloadLink = "https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip"
-    const versionJSON = JSON.stringify(versionInfo, null, 2)
-    await put("version/version.json", Buffer.from(versionJSON))
-
-    copy(`version/history/${version}.exe`, "version/installer.exe")
-    copy(`version/history/update-${version}.zip`, "version/update.zip")
-
-    console.log(chalk.yellow(versionJSON))
-}
-
-export default release;
+import fs from 'fs'
+import path from 'path'
+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'
+
+async function delay(time: number) {
+  return new Promise<void>((resolve, reject) => {
+    setTimeout(() => {
+      resolve()
+    }, time)
+  })
+}
+
+const release = async (options: any) => {
+  console.log()
+  if (options.type == 'ftp') {
+    await ftpUpload()
+    return
+  }
+  const packageJSON = JSON.parse(fs.readFileSync('package.json', 'utf-8'))
+  const changelogJSON = JSON.parse(fs.readFileSync('changelog.json', 'utf-8'))
+  const version = packageJSON['version']
+  const changelog = changelogJSON[version]
+
+  let needUpdateElectron = await promptChecker({
+    type: 'confirm',
+    name: 'electron',
+    message: chalk.blue('用户是否需要更新Electron?'),
+  })
+  //
+  // let needUpdateNodeModule = await promptChecker({
+  //     type: "confirm",
+  //     name: 'electron',
+  //     message: chalk.blue("用户是否需要更新node_module?")
+  // });
+
+  const versionInfo = {
+    version: version,
+    releaseNote: changelog,
+    updateElectron: needUpdateElectron,
+    updateNodeModule: false,
+    updateWindowsApi: false,
+    downloadLink: '',
+  }
+
+  let installerPath = path.join(`./packaged/widgets-${version}-setup-win-x64.exe`)
+  if (!fs.existsSync(installerPath)) {
+    installerPath = path.join(`./packaged/electron-${version}-setup-win-x64.exe`)
+  }
+  const updateZipPath = path.join(`./packaged/update.zip`)
+
+  console.log(chalk.blue('压缩更新文件中'))
+  await zipDirectory('./release', updateZipPath)
+
+  console.log(chalk.blue('上传installer.exe到OSS'))
+  await put('version/installer.exe', installerPath)
+
+  console.log(chalk.blue('上传update.zip到OSS'))
+  await put('version/update.zip', updateZipPath)
+
+  console.log(chalk.blue('更新版本信息'))
+  versionInfo.downloadLink = 'https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip'
+  const versionJSON = JSON.stringify(versionInfo, null, 2)
+  await put('version/version.json', Buffer.from(versionJSON))
+
+  copy(`version/history/${version}.exe`, 'version/installer.exe')
+  copy(`version/history/update-${version}.zip`, 'version/update.zip')
+
+  console.log(chalk.yellow(versionJSON))
+}
+
+export default release