@widget-js/cli 1.0.10 → 1.0.11

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

package/.prettierrc

@@ -0,0 +1,21 @@
+{
+  "printWidth": 120,
+  "semi": false,
+  "singleQuote": true,
+  "overrides": [
+    {
+      "files": ["**/*.css", "**/*.scss", "**/*.html"],
+      "options": {
+        "singleQuote": false
+      }
+    }
+  ],
+  "trailingComma": "all",
+  "bracketSpacing": false,
+  "arrowParens": "avoid",
+  "proseWrap": "never",
+  "htmlWhitespaceSensitivity": "strict",
+  "vueIndentScriptAndStyle": false,
+  "endOfLine": "lf",
+  "singleAttributePerLine": true
+}

package/lib/index.cjs

@@ -20,9 +20,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/index.ts
 var import_commander = require("commander");
-var import_fs5 = __toESM(require("fs"), 1);
-var import_path3 = __toESM(require("path"), 1);
-var process2 = __toESM(require("process"), 1);
+var import_fs6 = __toESM(require("fs"), 1);
+var import_path4 = __toESM(require("path"), 1);
+var process3 = __toESM(require("process"), 1);
 
 // src/createWidget.ts
 var import_path = __toESM(require("path"), 1);
@@ -336,21 +336,89 @@ var release_default = release;
 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);
+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);
+var import_inquirer3 = __toESM(require("inquirer"), 1);
+var import_nanospinner = require("nanospinner");
+var process2 = __toESM(require("process"), 1);
+var console2 = __toESM(require("console"), 1);
+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");
+  console2.log("SSH Config file:", sshConfigFile);
+  const sshConfigs = import_ssh_config.default.parse(import_fs5.default.readFileSync(sshConfigFile).toString());
+  let sshConfig = sshConfigs.compute(releaseConfig.ftpConfig.host);
+  if (!sshConfig) {
+    import_consola2.default.error(`SSH config ${releaseConfig.ftpConfig.host} not found`);
+    return;
+  }
+  import_consola2.default.info(sshConfig);
+  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 spinner = (0, import_nanospinner.createSpinner)("Connecting");
+    try {
+      spinner.start();
+      await ftpClient.connect({
+        host: sshConfig["HostName"],
+        port: port ? parseInt(port) : 22,
+        username: sshConfig["User"],
+        passphrase: answer.password,
+        privateKey: key
+      });
+      ftpClient.on("upload", (info) => {
+        spinner.update({ text: `Uploading: ${info.source}` });
+      });
+      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({ text: `Skip not exists file:${localFile}` });
+            continue;
+          }
+          if (import_fs5.default.lstatSync(localFile).isDirectory()) {
+            spinner.update({ text: `Uploading Dir: ${localFile} -> ${item.dest}` });
+            await ftpClient.uploadDir(localFile, item.dest);
+          } else {
+            spinner.update({ text: `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);
+        }
+      }
+      spinner.success({ text: "Files uploaded!" });
+      await ftpClient.end();
+    } catch (e) {
+      spinner.error({ text: `Connection error:${e}` });
+      await ftpClient.end();
+    }
+  });
+}
+
+// src/index.ts
 var import_meta2 = {};
 var __filename = (0, import_url2.fileURLToPath)(import_meta2.url);
-var __dirname = import_path3.default.dirname(__filename);
-var packageJsonPath = import_path3.default.join(__dirname, "../package.json");
-var cliPackage = JSON.parse(import_fs5.default.readFileSync(packageJsonPath).toString());
-console.log(
-  import_gradient_string.default.pastel.multiline(
-    import_figlet.default.textSync("widget-cli", { horizontalLayout: "full" })
-  )
-);
+var __dirname = import_path4.default.dirname(__filename);
+var packageJsonPath = import_path4.default.join(__dirname, "../package.json");
+var cliPackage = JSON.parse(import_fs6.default.readFileSync(packageJsonPath).toString());
+console.log(import_gradient_string.default.pastel.multiline(import_figlet.default.textSync("widget-cli", { horizontalLayout: "full" })));
 import_commander.program.version(`@widget-js/cli ${cliPackage.version}`).usage("<command> [options]");
 import_commander.program.command("create").description("\u521B\u5EFA\u65B0\u7684\u7EC4\u4EF6").action(async () => {
   await createWidget();
 });
-import_commander.program.command("release").description("\u53D1\u5E03\u5E94\u7528\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
+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.parse(process2.argv);
+import_commander.program.command("ftp").description("\u901A\u8FC7FTP\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
+  await ftpUpload();
+});
+import_commander.program.parse(process3.argv);

package/lib/index.js

@@ -1,8 +1,8 @@
 // src/index.ts
 import { program } from "commander";
-import fs5 from "fs";
-import path3 from "path";
-import * as process2 from "process";
+import fs6 from "fs";
+import path4 from "path";
+import * as process3 from "process";
 
 // src/createWidget.ts
 import path from "path";
@@ -315,20 +315,88 @@ var release_default = release;
 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";
+import os from "os";
+import Client from "ssh2-sftp-client";
+import consola2 from "consola";
+import inquirer3 from "inquirer";
+import { createSpinner } from "nanospinner";
+import * as process2 from "process";
+import * as console2 from "console";
+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");
+  console2.log("SSH Config file:", sshConfigFile);
+  const sshConfigs = SSHConfig.parse(fs5.readFileSync(sshConfigFile).toString());
+  let sshConfig = sshConfigs.compute(releaseConfig.ftpConfig.host);
+  if (!sshConfig) {
+    consola2.error(`SSH config ${releaseConfig.ftpConfig.host} not found`);
+    return;
+  }
+  consola2.info(sshConfig);
+  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 spinner = createSpinner("Connecting");
+    try {
+      spinner.start();
+      await ftpClient.connect({
+        host: sshConfig["HostName"],
+        port: port ? parseInt(port) : 22,
+        username: sshConfig["User"],
+        passphrase: answer.password,
+        privateKey: key
+      });
+      ftpClient.on("upload", (info) => {
+        spinner.update({ text: `Uploading: ${info.source}` });
+      });
+      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({ text: `Skip not exists file:${localFile}` });
+            continue;
+          }
+          if (fs5.lstatSync(localFile).isDirectory()) {
+            spinner.update({ text: `Uploading Dir: ${localFile} -> ${item.dest}` });
+            await ftpClient.uploadDir(localFile, item.dest);
+          } else {
+            spinner.update({ text: `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);
+        }
+      }
+      spinner.success({ text: "Files uploaded!" });
+      await ftpClient.end();
+    } catch (e) {
+      spinner.error({ text: `Connection error:${e}` });
+      await ftpClient.end();
+    }
+  });
+}
+
+// src/index.ts
 var __filename = fileURLToPath2(import.meta.url);
-var __dirname = path3.dirname(__filename);
-var packageJsonPath = path3.join(__dirname, "../package.json");
-var cliPackage = JSON.parse(fs5.readFileSync(packageJsonPath).toString());
-console.log(
-  gradient.pastel.multiline(
-    figlet.textSync("widget-cli", { horizontalLayout: "full" })
-  )
-);
+var __dirname = path4.dirname(__filename);
+var packageJsonPath = path4.join(__dirname, "../package.json");
+var cliPackage = JSON.parse(fs6.readFileSync(packageJsonPath).toString());
+console.log(gradient.pastel.multiline(figlet.textSync("widget-cli", { horizontalLayout: "full" })));
 program.version(`@widget-js/cli ${cliPackage.version}`).usage("<command> [options]");
 program.command("create").description("\u521B\u5EFA\u65B0\u7684\u7EC4\u4EF6").action(async () => {
   await createWidget();
 });
-program.command("release").description("\u53D1\u5E03\u5E94\u7528\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
+program.command("release").description("\u901A\u8FC7OSS\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
   await release_default();
 });
-program.parse(process2.argv);
+program.command("ftp").description("\u901A\u8FC7FTP\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").action(async () => {
+  await ftpUpload();
+});
+program.parse(process3.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -10,7 +10,8 @@
   },
   "type": "module",
   "scripts": {
-    "build": "tsup src/index.ts --dts --format esm,cjs ",
+    "build": "tsup src/index.ts --dts --format esm,cjs",
+    "watch": "tsup src/index.ts --dts --format esm,cjs --watch",
     "build:run": "npm run build && npm run widget",
     "widget": "node ./lib/index.js"
   },
@@ -35,7 +36,10 @@
     "figlet": "^1.5.2",
     "gradient-string": "^2.0.2",
     "inquirer": "^9.1.4",
+    "nanospinner": "^1.1.0",
     "shelljs": "^0.8.5",
+    "ssh-config": "file://D:\\workspace\\ssh-config",
+    "ssh2-sftp-client": "^9.0.4",
     "ws": "^8.11.0"
   },
   "devDependencies": {
@@ -50,7 +54,9 @@
     "@types/jest": "^29.2.3",
     "@types/node": "^18.11.13",
     "@types/shelljs": "latest",
+    "@types/ssh2-sftp-client": "^9.0.0",
     "pinst": "^3.0.0",
+    "prettier": "^2.8.4",
     "ts-jest": "^29.0.3",
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",

package/release.json

@@ -0,0 +1,25 @@
+{
+  "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/.gitignore"
+    }
+  ],
+  "ftpConfig": {
+    "host": "youlu"
+  }
+}

package/src/ftp/ftp.ts

@@ -0,0 +1,85 @@
+import path from 'path'
+import fs from 'fs'
+import SSHConfig from 'ssh-config'
+import os from 'os'
+import Client from 'ssh2-sftp-client'
+import consola from 'consola'
+import inquirer from 'inquirer'
+import {createSpinner} from 'nanospinner'
+import * as process from 'process'
+import * as console from 'console'
+
+interface PasswordAnswer {
+  password: string
+}
+export function ftpUpload() {
+  // 读取
+  const file = path.join(process.cwd(), 'release.json')
+  const releaseConfig = JSON.parse(fs.readFileSync(file).toString()) as ReleaseConfig
+  const sshConfigFile = path.resolve(os.homedir(), '.ssh/config')
+  console.log('SSH Config file:', sshConfigFile)
+  const sshConfigs = SSHConfig.parse(fs.readFileSync(sshConfigFile).toString())
+  let sshConfig = sshConfigs.compute(releaseConfig.ftpConfig.host)
+  if (!sshConfig) {
+    consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`)
+    return
+  }
+  consola.info(sshConfig)
+  inquirer
+    .prompt<PasswordAnswer>([{type: 'password', name: 'password', mask: '*', message: 'Enter key pair password'}])
+    .then(async (answer: PasswordAnswer) => {
+      let ftpClient = new Client()
+      const port = sshConfig['Port']
+      const key = fs.readFileSync(path.resolve(os.homedir(), '.ssh/id_rsa'))
+      const spinner = createSpinner('Connecting')
+      try {
+        spinner.start()
+        await ftpClient.connect({
+          host: sshConfig['HostName'] as string,
+          port: port ? parseInt(port as string) : 22,
+          username: sshConfig['User'] as string,
+          passphrase: answer.password,
+          privateKey: key,
+        })
+        ftpClient.on('upload', info => {
+          spinner.update({text: `Uploading: ${info.source}`})
+        })
+        // 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({text: `Skip not exists file:${localFile}`})
+              continue
+            }
+            if (fs.lstatSync(localFile).isDirectory()) {
+              spinner.update({text: `Uploading Dir: ${localFile} -> ${item.dest}`})
+              await ftpClient.uploadDir(localFile, item.dest)
+            } else {
+              spinner.update({text: `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)
+          }
+        }
+        spinner.success({text: 'Files uploaded!'})
+        await ftpClient.end()
+      } catch (e) {
+        spinner.error({text: `Connection error:${e}`})
+        await ftpClient.end()
+      }
+    })
+}
+
+export interface ReleaseConfig {
+  fileMap: {
+    src: string | object
+    dest: string
+  }[]
+  ftpConfig: FTPConfig
+}
+
+export interface FTPConfig {
+  host: string
+}

package/src/index.ts

@@ -1,45 +1,42 @@
-import {program} from 'commander';
-import fs from "fs";
-import path from "path";
-import * as process from "process";
-import createWidget from "./createWidget";
-import release from './release/release'
-
-import {fileURLToPath} from 'url';
-import figlet from 'figlet';
-import gradient from "gradient-string";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-//
-const packageJsonPath = path.join(__dirname, '../package.json');
-let cliPackage = JSON.parse(fs.readFileSync(packageJsonPath).toString());
-
-console.log(
-    gradient.pastel.multiline(
-        figlet.textSync('widget-cli', { horizontalLayout: 'full' })
-    )
-);
-program
-    .version(`@widget-js/cli ${cliPackage.version}`)
-    .usage('<command> [options]')
-program
-    .command('create')
-    .description('创建新的组件')
-    .action(async () => {
-        await createWidget()
-    })
-program
-    .command('release')
-    .description('发布应用，仅内部使用')
-    .action(async () => {
-        await release()
-    })
-
-//TODO init 初始化项目
-//TODO publish 发布
-program.parse(process.argv);
-
-
-
-
+import {program} from 'commander'
+import fs from 'fs'
+import path from 'path'
+import * as process from 'process'
+import createWidget from './createWidget'
+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)
+//
+const packageJsonPath = path.join(__dirname, '../package.json')
+let cliPackage = JSON.parse(fs.readFileSync(packageJsonPath).toString())
+
+console.log(gradient.pastel.multiline(figlet.textSync('widget-cli', {horizontalLayout: 'full'})))
+program.version(`@widget-js/cli ${cliPackage.version}`).usage('<command> [options]')
+program
+  .command('create')
+  .description('创建新的组件')
+  .action(async () => {
+    await createWidget()
+  })
+program
+  .command('release')
+  .description('通过OSS发布文件，仅内部使用')
+  .action(async () => {
+    await release()
+  })
+program
+  .command('ftp')
+  .description('通过FTP发布文件，仅内部使用')
+  .action(async () => {
+    await ftpUpload()
+  })
+
+//TODO init 初始化项目
+//TODO publish 发布
+program.parse(process.argv)