@wjwjq/release-helper 0.1.0 → 0.1.2

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

@@ -9,4 +9,7 @@ assetsDir: 'dist'
 
 # nginx和assets 所属用户和用户组
 user: root
-userGroup: root
+userGroup: root
+
+# 指定安装模式  standalone(supervisor) 、 cluster（agent\systemd) 、 both
+installMode: both

package/dist/deploy/pkg/nginx_binary/compile.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# current nginx source code version 1.22.1
+
+./configure \
+  --prefix=/etc/nginx \
+  --conf-path=/etc/nginx/nginx.conf \
+  --error-log-path=/var/log/nginx/error.log \
+  --http-log-path=/var/log/nginx/access.log \
+  --pid-path=/var/run/nginx/nginx.pid \
+  --lock-path=/var/run/nginx/nginx.lock \
+  --with-http_ssl_module \
+  --with-http_v2_module \
+  --with-http_gzip_static_module \
+  --with-http_stub_status_module \
+  --with-stream \
+  --with-pcre
+
+make
+
+make install
+
+echo '------------------compile and install done----------------------------'
+
+arch=$(uname -m) 
+ssl_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
+
+if [[ -z "${arch}" ]]; then
+  arch="x86_64"
+fi
+
+if [[ -z "${ssl_version}" ]]; then
+  ssl_version="1.0.2"
+fi
+
+tar -zcvf nginx-"$arch"-ssl"$ssl_version".tar.gz /etc/nginx/ -C /root
+
+echo "-----------pack at: /root  nginx-"$arch"-ssl"$ssl_version".tar.gz--------------"

package/dist/deploy/script/common.sh

@@ -133,7 +133,36 @@ install_assets() {
 }
 
 start() {
-  log "-----------execute ${app_name} script-------------"
+  # 未安装
+  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
+
+  # 已安装 询问是否更新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
+
   # 创建用户
   create_user_csri
 

package/dist/deploy/script/install.sh

@@ -4,48 +4,4 @@ basepath=$(dirname "$(realpath "${BASH_SOURCE[-1]}")")
 
 source "$basepath"/common.sh
 
-# 未安装
-if ((has_nginx_installed == 0)); then
-  # while true; do
-  #   read -r -p "Nginx not found, install it?[Y/N]" yn
-  #   case $yn in
-  #   [Yy]*)
-  #     chmod +x "$basepath"/../nginx/script/install.sh
-  #     sh "$basepath"/../nginx/script/install.sh
-  #     break
-  #     ;;
-  #   [Nn]*) exit ;;
-  #   *) echo "Please answer yes or no." ;;
-  #   esac
-  # done
-  chmod +x "$basepath"/../nginx/script/install.sh
-  sh "$basepath"/../nginx/script/install.sh
-
-  if [[ $? != 0 ]]; then
-    echo "$(tput setaf 1)"failed to install!"$(tput sgr0)"
-    exit 1
-  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]*)
-      chmod +x "$basepath"/../nginx/script/install.sh
-      sh "$basepath"/../nginx/script/install.sh "${@}"
-
-      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
-
 start

package/dist/deploy/script/nginx.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
-# 指定安装目录
-# nginx_conf_install_path="$prefix/etc/nginx_instances/${app_name}/"
-nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
 
 # 安装包所在路径
 pkg_path="${project_path}/pkg"
 
+#------------------------------------ nginx服务配置文件服务 start----------------------------------
 # 配置文件所在路径
 new_nginx_conf_path="${pkg_path}/nginx"
 
+# 指定安装目录
+nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
+
 # nginx服务配置文件路径
 nginx_conf_path="${nginx_conf_install_path}nginx.conf"
 
@@ -21,8 +22,6 @@ nginx_pid_file_path="$nginx_pid_dir${app_name}.nginx.pid"
 conf_version=$(awk '{print $1}' "${pkg_path}"/version)
 echo "$conf_version"
 
-
-
 copy_nginx_conf_and_write_verison() {
   mkdir -p "$nginx_conf_install_path"
   #  创建pid目录
@@ -171,3 +170,86 @@ add_nginx_service() {
     rm -rf /usr/lib/systemd/system/"$app_name".nginx.service
   fi
 }
+#------------------------------------ nginx服务配置文件服务 end----------------------------------
+
+
+#------------------------------------ nginx 可执行程序相关 start----------------------------------
+# 指定安装目录
+nginx_binary_install_path="/etc/nginx/"
+
+mkdir -p "$nginx_binary_install_path"
+
+# 安装包所在路径
+nginx_binary_pkg_path="${pkg_path}/nginx_binary"
+
+open_port_80() {
+  # 查看防火墙是否开启
+  systemctl status firewalld
+  # 若未开启则开启
+  systemctl start firewalld
+
+  # 查看所有开启的端口
+  #firewall-cmd --list-ports
+
+  # 开启nginx默认80端口（关键步骤一）
+  firewall-cmd --zone=public --add-port=80/tcp --permanent
+
+  # 重启防火墙（关键步骤二）
+  firewall-cmd --reload
+}
+
+# 安装nginx可执行程序
+install_nginx_binary() {
+  log "install nginx to path: ${nginx_binary_install_path}"
+
+  arch=$(uname -m)
+  ssl_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
+
+  if [[ -z "${arch}" ]]; then
+    arch="x86_64"
+  fi
+
+  if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
+    arch="arm"
+  fi
+
+  if [[ "${ssl_version}" == "1.0" ]]; then
+    ssl_version="1.0.2"
+  fi
+
+  if [[ "${ssl_version}" == "1.1" ]]; then
+    ssl_version="1.1.1"
+  fi
+
+  if [[ "${ssl_version}" == "3.0" ]]; then
+    ssl_version="3.0.7"
+  fi
+
+  if [[ -z "${ssl_version}" ]]; then
+    ssl_version="1.0.2"
+  fi
+
+  pkg="$nginx_binary_pkg_path"/nginx-"$arch"-ssl"$ssl_version".tar.gz
+
+  if [ ! -f "$pkg" ]; then
+    log_error "Fatal error: nginx-$arch-ssl$ssl_version.tar.gz not matched!  contact developer!"
+    exit 1
+  fi
+
+  log "current arch: $arch, current ssl_version： $ssl_version"
+
+  tar -zxvhf "$pkg" -C "$nginx_binary_install_path" --strip-components 1
+  # 检测是否安装成功
+  if [[ $? == 0 ]]; then
+    log_success "nginx installation successfully!"
+  else
+    log_error "nginx installation failed!"
+  fi
+
+  cp "$nginx_binary_install_path"sbin/nginx /usr/sbin/
+
+  # 修改/etc/nginx 用户(组)
+  chown -R $user:$usergroup "$nginx_binary_install_path"
+  chmod 744 -R "$nginx_binary_install_path"
+}
+#------------------------------------ nginx 可执行程序相关 end ----------------------------------

package/dist/deploy/script/prompt.sh

@@ -6,7 +6,18 @@ log "-----------receive parameter: $@------------"
 #   exit 1
 # fi
 
-mode=""
+mode="__INSTALL_MODE__"
+
+if [[ "${mode}" == "standalone" ]]; then
+  mode=1
+elif [[ "${mode}" == "cluster" ]]; then
+  mode=2
+else
+  mode=''
+fi
+
+
+if [[ -z "${mode}" ]]; then
 while [ $# -gt 0 ]; do
   case "$1" in
   -S | -standalone)
@@ -58,6 +69,7 @@ while [ $# -gt 0 ]; do
     ;;
   esac
 done
+fi
 
 if [[ -z "${mode}" ]]; then
   log_error "Fatal error: parameter -standalone or -cluster  is required!"

package/dist/deploy/script/upgrade.sh

@@ -4,47 +4,4 @@ basepath=$(dirname "$(realpath "${BASH_SOURCE[-1]}")")
 
 source "$basepath"/common.sh
 
-# 未安装
-if ((has_nginx_installed == 0)); then
-  # while true; do
-  #   read -r -p "Nginx not found, install it?[Y/N]" yn
-  #   case $yn in
-  #   [Yy]*)
-  #     chmod +x "$basepath"/../nginx/script/install.sh
-  #     sh "$basepath"/../nginx/script/install.sh
-  #     break
-  #     ;;
-  #   [Nn]*) exit ;;
-  #   *) echo "Please answer yes or no." ;;
-  #   esac
-  # done
-  chmod +x "$basepath"/../nginx/script/install.sh
-  sh "$basepath"/../nginx/script/install.sh "${@}"
-
-  if [[ $? != 0 ]]; then
-    echo "$(tput setaf 1)"failed to install!"$(tput sgr0)"
-    exit 1
-  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]*)
-      chmod +x "$basepath"/../nginx/script/install.sh
-      sh "$basepath"/../nginx/script/install.sh "${@}"
-      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
-
 start

package/dist/pack.js

@@ -3,7 +3,7 @@ import path from 'path';
 import * as inquirer from '@inquirer/prompts';
 import pc from 'picocolors';
 import * as tar from 'tar';
-import { __work_dir, __releaseDir, __dirname, releaseConf } from './prepare.js';
+import { checkEnvInfo, __work_dir, __releaseDir, __dirname, releaseConf } from './prepare.js';
 import { logger } from './logger.js';
 import 'yaml';
 import 'execa';
@@ -11,6 +11,7 @@ import 'node:url';
 
 async function pack(version) {
   try {
+    await checkEnvInfo();
     if (version === void 0) {
       version = await inquirer.input(
         {
@@ -50,6 +51,12 @@ async function pack(version) {
         ["__USER_GROUP__", releaseConf.userGroup]
       ]
     });
+    replaceFileContent({
+      filePath: path.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"),

package/dist/prepare.js

@@ -7,6 +7,7 @@ import { fileURLToPath } from 'node:url';
 import { logger } from './logger.js';
 import 'picocolors';
 
+const installMode = ["standalone", "cluster", "both"];
 const __work_dir = process.env.INIT_CWD || process.cwd();
 const __releaseDir = path.resolve(__work_dir, ".release");
 const __filename = fileURLToPath(import.meta.url);
@@ -29,7 +30,8 @@ const releaseConf = Object.assign({
   /** 打包后资源 相对工作区所在路径  默认dist/*/
   assetsDir: "dist",
   user: "root",
-  userGroup: "root"
+  userGroup: "root",
+  installMode: "both"
 }, parseConf(__releaseConfPath));
 const $ = execa({ encoding: "utf8" });
 async function prepare() {
@@ -72,6 +74,10 @@ async function checkEnvInfo() {
       logger.error(`The field: [${field}] is required in  .release/release.conf.yaml!`);
       process.exit(1);
     }
+    if (field === "installMode" && !installMode.includes(value)) {
+      logger.error(`The field: [${field}]'s value should be one of ${installMode.join(" | ")}`);
+      process.exit(1);
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wjwjq/release-helper",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "generate deployment package for frontend, include nginx...",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -65,7 +65,7 @@
   "scripts": {
     "localpack": "pnpm link --global",
     "postinstall": "node dist/start_prepare.js",
-    "build": "rollup -c",
+    "build": "rm -rf dist && rollup -c",
     "prepublish": "pnpm build"
   }
 }

package/src/.release/release.conf.yaml

@@ -9,4 +9,7 @@ assetsDir: 'dist'
 
 # nginx和assets 所属用户和用户组
 user: root
-userGroup: root
+userGroup: root
+
+# 指定安装模式  standalone(supervisor) 、 cluster（agent\systemd) 、 both
+installMode: both

package/src/deploy/pkg/nginx_binary/compile.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# current nginx source code version 1.22.1
+
+./configure \
+  --prefix=/etc/nginx \
+  --conf-path=/etc/nginx/nginx.conf \
+  --error-log-path=/var/log/nginx/error.log \
+  --http-log-path=/var/log/nginx/access.log \
+  --pid-path=/var/run/nginx/nginx.pid \
+  --lock-path=/var/run/nginx/nginx.lock \
+  --with-http_ssl_module \
+  --with-http_v2_module \
+  --with-http_gzip_static_module \
+  --with-http_stub_status_module \
+  --with-stream \
+  --with-pcre
+
+make
+
+make install
+
+echo '------------------compile and install done----------------------------'
+
+arch=$(uname -m) 
+ssl_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
+
+if [[ -z "${arch}" ]]; then
+  arch="x86_64"
+fi
+
+if [[ -z "${ssl_version}" ]]; then
+  ssl_version="1.0.2"
+fi
+
+tar -zcvf nginx-"$arch"-ssl"$ssl_version".tar.gz /etc/nginx/ -C /root
+
+echo "-----------pack at: /root  nginx-"$arch"-ssl"$ssl_version".tar.gz--------------"

package/src/deploy/script/common.sh

@@ -133,7 +133,36 @@ install_assets() {
 }
 
 start() {
-  log "-----------execute ${app_name} script-------------"
+  # 未安装
+  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
+
+  # 已安装 询问是否更新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
+
   # 创建用户
   create_user_csri
 

package/src/deploy/script/install.sh

@@ -4,48 +4,4 @@ basepath=$(dirname "$(realpath "${BASH_SOURCE[-1]}")")
 
 source "$basepath"/common.sh
 
-# 未安装
-if ((has_nginx_installed == 0)); then
-  # while true; do
-  #   read -r -p "Nginx not found, install it?[Y/N]" yn
-  #   case $yn in
-  #   [Yy]*)
-  #     chmod +x "$basepath"/../nginx/script/install.sh
-  #     sh "$basepath"/../nginx/script/install.sh
-  #     break
-  #     ;;
-  #   [Nn]*) exit ;;
-  #   *) echo "Please answer yes or no." ;;
-  #   esac
-  # done
-  chmod +x "$basepath"/../nginx/script/install.sh
-  sh "$basepath"/../nginx/script/install.sh
-
-  if [[ $? != 0 ]]; then
-    echo "$(tput setaf 1)"failed to install!"$(tput sgr0)"
-    exit 1
-  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]*)
-      chmod +x "$basepath"/../nginx/script/install.sh
-      sh "$basepath"/../nginx/script/install.sh "${@}"
-
-      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
-
 start

package/src/deploy/script/nginx.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
-# 指定安装目录
-# nginx_conf_install_path="$prefix/etc/nginx_instances/${app_name}/"
-nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
 
 # 安装包所在路径
 pkg_path="${project_path}/pkg"
 
+#------------------------------------ nginx服务配置文件服务 start----------------------------------
 # 配置文件所在路径
 new_nginx_conf_path="${pkg_path}/nginx"
 
+# 指定安装目录
+nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
+
 # nginx服务配置文件路径
 nginx_conf_path="${nginx_conf_install_path}nginx.conf"
 
@@ -21,8 +22,6 @@ nginx_pid_file_path="$nginx_pid_dir${app_name}.nginx.pid"
 conf_version=$(awk '{print $1}' "${pkg_path}"/version)
 echo "$conf_version"
 
-
-
 copy_nginx_conf_and_write_verison() {
   mkdir -p "$nginx_conf_install_path"
   #  创建pid目录
@@ -171,3 +170,86 @@ add_nginx_service() {
     rm -rf /usr/lib/systemd/system/"$app_name".nginx.service
   fi
 }
+#------------------------------------ nginx服务配置文件服务 end----------------------------------
+
+
+#------------------------------------ nginx 可执行程序相关 start----------------------------------
+# 指定安装目录
+nginx_binary_install_path="/etc/nginx/"
+
+mkdir -p "$nginx_binary_install_path"
+
+# 安装包所在路径
+nginx_binary_pkg_path="${pkg_path}/nginx_binary"
+
+open_port_80() {
+  # 查看防火墙是否开启
+  systemctl status firewalld
+  # 若未开启则开启
+  systemctl start firewalld
+
+  # 查看所有开启的端口
+  #firewall-cmd --list-ports
+
+  # 开启nginx默认80端口（关键步骤一）
+  firewall-cmd --zone=public --add-port=80/tcp --permanent
+
+  # 重启防火墙（关键步骤二）
+  firewall-cmd --reload
+}
+
+# 安装nginx可执行程序
+install_nginx_binary() {
+  log "install nginx to path: ${nginx_binary_install_path}"
+
+  arch=$(uname -m)
+  ssl_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
+
+  if [[ -z "${arch}" ]]; then
+    arch="x86_64"
+  fi
+
+  if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
+    arch="arm"
+  fi
+
+  if [[ "${ssl_version}" == "1.0" ]]; then
+    ssl_version="1.0.2"
+  fi
+
+  if [[ "${ssl_version}" == "1.1" ]]; then
+    ssl_version="1.1.1"
+  fi
+
+  if [[ "${ssl_version}" == "3.0" ]]; then
+    ssl_version="3.0.7"
+  fi
+
+  if [[ -z "${ssl_version}" ]]; then
+    ssl_version="1.0.2"
+  fi
+
+  pkg="$nginx_binary_pkg_path"/nginx-"$arch"-ssl"$ssl_version".tar.gz
+
+  if [ ! -f "$pkg" ]; then
+    log_error "Fatal error: nginx-$arch-ssl$ssl_version.tar.gz not matched!  contact developer!"
+    exit 1
+  fi
+
+  log "current arch: $arch, current ssl_version： $ssl_version"
+
+  tar -zxvhf "$pkg" -C "$nginx_binary_install_path" --strip-components 1
+  # 检测是否安装成功
+  if [[ $? == 0 ]]; then
+    log_success "nginx installation successfully!"
+  else
+    log_error "nginx installation failed!"
+  fi
+
+  cp "$nginx_binary_install_path"sbin/nginx /usr/sbin/
+
+  # 修改/etc/nginx 用户(组)
+  chown -R $user:$usergroup "$nginx_binary_install_path"
+  chmod 744 -R "$nginx_binary_install_path"
+}
+#------------------------------------ nginx 可执行程序相关 end ----------------------------------