@wjwjq/release-helper 0.1.5 → 0.1.7

package/dist/.release/release.conf.yaml

@@ -10,6 +10,8 @@ assetsDir: 'dist'
 # nginx和assets 所属用户和用户组
 user: root
 userGroup: root
+# 安装目录
+installDir: /opt
 
 # 指定安装模式  standalone(supervisor) 、 cluster（agent\systemd) 、 both
 installMode: both

package/dist/cli.js

@@ -16,7 +16,7 @@ cli.command("init", "generate release configuration").action(async (options) =>
   try {
     logger.info("start to generate .release configuration ");
     const { prepare } = await import('./prepare.js');
-    await prepare();
+    await prepare({ callBy: "init" });
     logger.info("done");
   } catch (e) {
     console.error(`release-helper error: `, e);

package/dist/deploy/script/common.sh

@@ -133,34 +133,37 @@ install_assets() {
 }
 
 start() {
-  # 未安装
-  if ((has_nginx_installed == 0)); then
-    install_nginx_binary
-
-    if [[ $? != 0 ]]; then
-      echo "$(tput setaf 1)"failed to install!"$(tput sgr0)"
-      exit 1
+  # 仅静态文件
+  if [[ "${mode}" != 3 ]]; then
+    # 未安装
+    if ((has_nginx_installed == 0)); then
+      install_nginx_binary
+
+      if [[ $? != 0 ]]; then
+        echo "$(tput setaf 1)"failed to install!"$(tput sgr0)"
+        exit 1
+      fi
     fi
-  fi
 
-  # 已安装 询问是否更新nginx
-  if ((has_nginx_installed == 1)); then
-    while true; do
-      read -r -p "Nginx has been installed, re-install it?[Y/N]" yn
-      case $yn in
-      [Yy]*)
-        install_nginx_binary
-        
-        if [[ $? != 0 ]]; then
-          echo "$(tput setaf 1)"failed to install!"$(tput sgr0)"
-          exit 1
-        fi
-        break
-        ;;
-      [Nn]*) break ;;
-      *) echo "Please answer yes or no." ;;
-      esac
-    done
+    # 已安装 询问是否更新nginx
+    if ((has_nginx_installed == 1)); then
+      while true; do
+        read -r -p "Nginx has been installed, re-install it?[Y/N]" yn
+        case $yn in
+        [Yy]*)
+          install_nginx_binary
+          
+          if [[ $? != 0 ]]; then
+            echo "$(tput setaf 1)"failed to install!"$(tput sgr0)"
+            exit 1
+          fi
+          break
+          ;;
+        [Nn]*) break ;;
+        *) echo "Please answer yes or no." ;;
+        esac
+      done
+    fi
   fi
 
   # 创建用户
@@ -179,9 +182,13 @@ start() {
 
   mkdir -p "$install_path"
 
-  copy_nginx_conf_and_write_verison
-  add_nginx_service
-  add_log_rotate
+  # 仅静态文件
+  if [[ "${mode}" != 3 ]]; then
+    copy_nginx_conf_and_write_verison
+    add_nginx_service
+    add_log_rotate
+  fi
+
   install_assets
 
   # 修改所属用户

package/dist/deploy/script/prompt.sh

@@ -12,6 +12,8 @@ if [[ "${mode}" == "standalone" ]]; then
   mode=1
 elif [[ "${mode}" == "cluster" ]]; then
   mode=2
+elif [[ "${mode}" == "static" ]]; then
+  mode=3
 else
   mode=''
 fi
@@ -28,6 +30,10 @@ while [ $# -gt 0 ]; do
     mode=2
     shift
     ;;
+  -SS | -static)
+    mode=3
+    shift
+    ;;
   -h | --help)
     echo "supported parameters: "
     echo "-S, -standalone         install for supervisord startup mode, conflict with -C"

package/dist/pack.js

@@ -1,5 +1,5 @@
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import { resolve } from 'node:path';
 import * as inquirer from '@inquirer/prompts';
 import pc from 'picocolors';
 import * as tar from 'tar';
@@ -23,7 +23,7 @@ async function pack(version) {
       logger.error("\u7248\u672C\u53F7\u4E0D\u80FD\u4E3A\u7A7A\uFF01");
       return;
     }
-    const packageJson = JSON.parse(fs.readFileSync(path.resolve(__work_dir, "package.json"), { "encoding": "utf-8" }));
+    const packageJson = JSON.parse(fs.readFileSync(resolve(__work_dir, "package.json"), { "encoding": "utf-8" }));
     const projectName = packageJson.name;
     if (!projectName) {
       logger.error("\u672A\u5728package.json\u627E\u5230name\u5B9A\u4E49\uFF01");
@@ -31,19 +31,20 @@ async function pack(version) {
     }
     const zipFileName = `${projectName}_${version}.tar.gz`;
     logger.tip(`start to pack`);
-    const projectDir = path.resolve(__releaseDir, projectName);
-    const assetsDir = path.resolve(projectDir, "pkg/assets");
-    const nginxDir = path.resolve(projectDir, "pkg/nginx");
-    fs.cpSync(path.resolve(__dirname, "deploy"), projectDir, { recursive: true });
-    fs.cpSync(path.resolve(__work_dir, releaseConf.assetsDir), assetsDir, { recursive: true });
-    fs.writeFileSync(path.resolve(projectDir, "pkg", "version"), version, { encoding: "utf-8" });
-    fs.writeFileSync(path.resolve(assetsDir, "version"), version, { encoding: "utf-8" });
-    fs.writeFileSync(path.resolve(nginxDir, "version"), version, { encoding: "utf-8" });
+    const projectDir = resolve(__releaseDir, projectName);
+    const assetsDir = resolve(projectDir, "pkg/assets");
+    const nginxDir = resolve(projectDir, "pkg/nginx");
+    fs.cpSync(resolve(__dirname, "deploy"), projectDir, { recursive: true });
+    fs.cpSync(resolve(__work_dir, releaseConf.assetsDir), assetsDir, { recursive: true });
+    fs.writeFileSync(resolve(projectDir, "pkg", "version"), version, { encoding: "utf-8" });
+    fs.writeFileSync(resolve(assetsDir, "version"), version, { encoding: "utf-8" });
+    fs.writeFileSync(resolve(nginxDir, "version"), version, { encoding: "utf-8" });
     logger.info(pc.green(`version: ${version} added`));
-    const assetInstallPath = `/opt/${projectName}/`;
+    const installDir = releaseConf.installDir.endsWith("/") ? releaseConf.installDir.replace(/\/$/, "") : releaseConf.installDir;
+    const assetInstallPath = `${installDir}/${projectName}/`;
     logger.info(pc.green(`start to replace variants in common.sh`));
     replaceFileContent({
-      filePath: path.resolve(projectDir, "script", "common.sh"),
+      filePath: resolve(projectDir, "script", "common.sh"),
       replaced: [
         ["__APP_NAME__", `"${projectName}"`],
         ["__INSTALL_PATH__", assetInstallPath],
@@ -52,25 +53,25 @@ async function pack(version) {
       ]
     });
     replaceFileContent({
-      filePath: path.resolve(projectDir, "script", "prompt.sh"),
+      filePath: resolve(projectDir, "script", "prompt.sh"),
       replaced: [
         ["__INSTALL_MODE__", releaseConf.installMode]
       ]
     });
     logger.info(pc.green(`start to replace version: ${version} in index.html`));
     replaceFileContent({
-      filePath: path.resolve(assetsDir, "index.html"),
+      filePath: resolve(assetsDir, "index.html"),
       replaced: [["__version__", version]]
     });
     logger.info(pc.green(`start to generate nginx.conf`));
-    fs.cpSync(path.resolve(__releaseDir, "nginx"), nginxDir, { recursive: true, force: true });
+    fs.cpSync(resolve(__releaseDir, "nginx"), nginxDir, { recursive: true, force: true });
     replaceFileContent({
-      filePath: path.resolve(nginxDir, "nginx.conf"),
+      filePath: resolve(nginxDir, "nginx.conf"),
       replaced: [["__root__", `${assetInstallPath}assets/`]]
-      // writeToNewFilePath: path.resolve(nginxDir, `${projectName}.conf`)
+      // writeToNewFilePath: resolve(nginxDir, `${projectName}.conf`)
     });
     logger.info(pc.green(`start to generate ${zipFileName}`));
-    const zipFilePath = path.resolve(__releaseDir, zipFileName);
+    const zipFilePath = resolve(__releaseDir, zipFileName);
     await genTarPkg(__releaseDir, projectName, zipFilePath);
     logger.success(`done to pack ${pc.green(`${zipFileName} at: ${__releaseDir}`)}`);
     if (fs.existsSync(projectDir)) {
@@ -88,10 +89,10 @@ async function pack(version) {
   }
 }
 function genTarPkg(releaseDir, projectName, zipFileName) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const zipStream = fs.createWriteStream(zipFileName);
     zipStream.on("close", () => {
-      resolve(true);
+      resolve2(true);
     });
     try {
       tar.create(

package/dist/prepare.js

@@ -1,5 +1,5 @@
-import path, { dirname } from 'path';
-import fs from 'fs';
+import { resolve, dirname } from 'node:path';
+import fs from 'node:fs';
 import YAML from 'yaml';
 import * as inquirer from '@inquirer/prompts';
 import { execa } from 'execa';
@@ -7,13 +7,13 @@ import { fileURLToPath } from 'node:url';
 import { logger } from './logger.js';
 import 'picocolors';
 
-const installMode = ["standalone", "cluster", "both"];
+const installMode = ["standalone", "cluster", "static", "all"];
 const __work_dir = process.env.INIT_CWD || process.cwd();
-const __releaseDir = path.resolve(__work_dir, ".release");
+const __releaseDir = resolve(__work_dir, ".release");
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const releaseConfFileName = "release.conf.yaml";
-const __releaseConfPath = path.resolve(__releaseDir, releaseConfFileName);
+const __releaseConfPath = resolve(__releaseDir, releaseConfFileName);
 function parseConf(file) {
   try {
     const conf = fs.readFileSync(file, "utf-8");
@@ -22,6 +22,11 @@ function parseConf(file) {
     return {};
   }
 }
+function isValidLinuxPath(path) {
+  const absolutePathPattern = /^\//;
+  const relativePathPattern = /^(\.\/|\.\.\/)/;
+  return absolutePathPattern.test(path) || relativePathPattern.test(path);
+}
 const releaseConf = Object.assign({
   host: "",
   token: "",
@@ -31,19 +36,20 @@ const releaseConf = Object.assign({
   assetsDir: "dist",
   user: "root",
   userGroup: "root",
-  installMode: "both"
+  installMode: "both",
+  installDir: "/opt"
 }, parseConf(__releaseConfPath));
 const $ = execa({ encoding: "utf8" });
-async function prepare() {
+async function prepare({ callBy } = { callBy: "postinstall" }) {
   const copyFiles = () => {
-    fs.cpSync(path.resolve(__dirname, ".release"), __releaseDir, { recursive: true });
+    fs.cpSync(resolve(__dirname, ".release"), __releaseDir, { recursive: true });
   };
   if (!fs.existsSync(__releaseDir)) {
     fs.mkdirSync(__releaseDir);
     copyFiles();
     logger.tip(`\u8BF7\u6CE8\u610F\u4FEE\u6539.release/${releaseConfFileName} \u914D\u7F6E\u4FE1\u606F`);
   } else {
-    if (!process.env.INIT_CWD) {
+    if (callBy === "init") {
       const shouldRegenerate = await inquirer.confirm(
         {
           message: ".release\u914D\u7F6E\u5DF2\u5B58\u5728\uFF0C\u662F\u5426\u91CD\u65B0\u751F\u6210\uFF1F"
@@ -61,7 +67,7 @@ async function checkEnvInfo() {
     logger.error("\u5F53\u524D\u9879\u76EE\u4E0D\u662Fgit\u4ED3\u5E93");
     process.exit(1);
   }
-  if (!fs.existsSync(path.resolve(__releaseDir, "nginx/nginx.conf"))) {
+  if (!fs.existsSync(resolve(__releaseDir, "nginx/nginx.conf"))) {
     logger.error(".release\u76EE\u5F55\u4E0B\u4E0D\u5B58\u5728nginx/nginx.conf \u6587\u4EF6\uFF0C \u8BF7\u4F7F\u7528 release-helper init \u521D\u59CB\u5316\u751F\u6210");
     process.exit(1);
   }
@@ -78,6 +84,10 @@ async function checkEnvInfo() {
       logger.error(`The field: [${field}]'s value should be one of ${installMode.join(" | ")}`);
       process.exit(1);
     }
+    if (field === "installDir" && !isValidLinuxPath(value)) {
+      logger.error(`The field: [${field}]'s value is not a legal path`);
+      process.exit(1);
+    }
   }
 }
 

package/dist/publish.js

@@ -1,7 +1,7 @@
-import fs from 'fs';
-import path from 'path';
-import { URL } from 'url';
-import crypto from 'crypto';
+import fs from 'node:fs';
+import { resolve, join } from 'node:path';
+import { URL } from 'node:url';
+import crypto from 'node:crypto';
 import mime from 'mime';
 import * as inquirer from '@inquirer/prompts';
 import { setTimeout } from 'node:timers/promises';
@@ -10,7 +10,6 @@ import { $, releaseConf, __releaseDir } from './prepare.js';
 import { logger } from './logger.js';
 import 'yaml';
 import 'execa';
-import 'node:url';
 import 'picocolors';
 
 async function isGitFlowRepo() {
@@ -112,7 +111,6 @@ async function getChangeLog(host, newVersion, userSelectedLatestTag, markdownUrl
     });
     newChangelog += "\n";
   }
-  console.log("\u{1F680} ~ getChangeLog ~features & Bugfixes:", features, Bugfixes);
   newChangelog += `# Artifacts
 `;
   newChangelog += `## tar\u5305
@@ -180,16 +178,16 @@ async function publish(params) {
       throw Error(`The target repo not founded!`);
     }
     const id = proj.id;
-    const assetFile = path.resolve(__releaseDir, pkgName);
+    const assetFile = resolve(__releaseDir, pkgName);
     const file = fs.readFileSync(assetFile);
     const hash = crypto.createHash("md5");
     hash.update(file);
     const md5 = hash.digest("hex");
     const md5FileName = `${appName}_${version}.md5.txt`;
-    const docPath = path.join(__releaseDir, "doc");
+    const docPath = join(__releaseDir, "doc");
     const replacedConstants = [["\\$APP_NAME\\$", appName], ["\\$VERSION\\$", version], ["\\$TAR_PKG\\$", pkgName]];
     const docUploadsPromises = fs.readdirSync(docPath).map((docFIleName) => {
-      const docFilePath = path.resolve(docPath, docFIleName);
+      const docFilePath = resolve(docPath, docFIleName);
       const stats = fs.statSync(docFilePath);
       if (stats.isFile()) {
         let content = fs.readFileSync(docFilePath).toString();

package/dist/release.js

@@ -5,17 +5,16 @@ import { pack } from './pack.js';
 import { getGitTags, selectLatestTag, publish, isGitFlowRepo } from './publish.js';
 import { checkEnvInfo, $, releaseConf } from './prepare.js';
 import { logger } from './logger.js';
-import 'fs';
-import 'path';
+import 'node:fs';
+import 'node:path';
 import 'tar';
-import 'url';
-import 'crypto';
+import 'node:url';
+import 'node:crypto';
 import 'mime';
 import 'node:timers/promises';
 import '@gitbeaker/rest';
 import 'yaml';
 import 'execa';
-import 'node:url';
 
 async function release(fromPublishCmd = false) {
   try {

package/dist/start_prepare.js

@@ -1,8 +1,8 @@
 import { logger } from './logger.js';
 import { prepare } from './prepare.js';
 import 'picocolors';
-import 'path';
-import 'fs';
+import 'node:path';
+import 'node:fs';
 import 'yaml';
 import '@inquirer/prompts';
 import 'execa';
@@ -11,7 +11,7 @@ import 'node:url';
 (async function startPrepare() {
   try {
     logger.info("start to generate .release configuration ");
-    await prepare();
+    await prepare({ callBy: "postinstall" });
     logger.info("done");
   } catch (error) {
     console.error(`release-helper error: `, error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wjwjq/release-helper",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "generate deployment package for frontend, include nginx...",
   "main": "dist/index.js",
   "module": "dist/index.js",