@wjwjq/release-helper 0.2.97 → 0.2.99

package/dist/.release/doc//351/203/250/347/275/262/346/211/213/345/206/214.md

@@ -81,7 +81,7 @@ Nginx has been installed, re-install it?[Y/N]n                                #
 ...
 2024-06-28 14:57:39: nginx start command: /usr/sbin/nginx -c /opt/$APP_NAME$/nginx/nginx.conf
 2024-06-28 14:57:39: $VERSION$ /opt/$APP_NAME$/nginx/nginx.conf replaced successfully!       
-2024-06-28 14:57:39: add $APP_NAME$.nginx.service to /usr/lib/systemd/system/ 
+2024-06-28 14:57:39: add $APP_NAME$.service to /usr/lib/systemd/system/ 
 2024-06-28 14:57:39: /opt/$APP_NAME$/assets/settings
 2024-06-28 14:57:39: $APP_NAME$ deployed successfully                      #安装成功
 ```
@@ -162,7 +162,7 @@ chmod +x upgrade.sh
 ...
 2024-06-28 14:57:39: nginx start command: /usr/sbin/nginx -c /opt/$APP_NAME$/nginx/nginx.conf
 2024-06-28 14:57:39: $VERSION$ /opt/$APP_NAME$/nginx/nginx.conf replaced successfully!       
-2024-06-28 14:57:39: add $APP_NAME$.nginx.service to /usr/lib/systemd/system/
+2024-06-28 14:57:39: add $APP_NAME$.service to /usr/lib/systemd/system/
 2024-06-28 14:57:39: /opt/$APP_NAME$/assets/settings
 2024-06-28 14:57:39: $APP_NAME$ deployed successfully                      #安装成功
 ```
@@ -185,7 +185,7 @@ chmod +x upgrade.sh
 | 日志文件位置       | /var/log/$APP_NAME$/nginx.log                        |
 | 系统静态资源目录   | /opt/$APP_NAME$/assets/                              |
 | 系统配置文件       | /opt/$APP_NAME$/assets/settings                      |
-| system service位置 | /usr/lib/systemd/system/$APP_NAME$.nginx.service     |
+| system service位置 | /usr/lib/systemd/system/$APP_NAME$.service     |
 | 日志翻转配置位置 | /etc/logrotate.d/$APP_NAME$.nginx     |
 
 ## 4.2 启动命令
@@ -209,7 +209,7 @@ supervisorctl start $APP_NAME$.nginx
 需安装时选择 -cluster 模式
 
 ```bash
-systemctl start $APP_NAME$.nginx.service
+systemctl start $APP_NAME$.service
 ```
 
 ## 4.3 验证

package/dist/.release/nginx/nginx.conf

@@ -3,7 +3,7 @@ daemon off;
 user  root;
 worker_processes 2; 
 
-#PID_FILE_PALCEHOLDER
+#PID_FILE_PLACEHOLDER
 
 # 请勿删除此处占位符
 #ERROR_LOG_PLACEHOLDER 
@@ -74,8 +74,9 @@ http {
     
     server { 
         # listen 80;
-        listen 5443 default_server ssl http2;
+        listen 5443 default_server ssl;
         server_name  localhost;
+        http2 on;
         root  __root__;   # 请勿修改 此处会在脚本中动态替换
         
         error_page 497 =301 https://$http_host$request_uri;

package/dist/cli.js

@@ -22,12 +22,12 @@ cli.command("init", "generate release configuration").action(async (options) =>
     console.error(`release-helper error: `, e);
   }
 });
-cli.command("pack", "start to pack assets").action(async (options) => {
+cli.command("pack", "start to pack assets").option("--ver <version>", `[version] specify version`).action(async (options) => {
   filterDuplicateOptions(options);
   try {
     logger.info("start to pack assets");
     const { pack } = await import('./pack.js');
-    await pack();
+    await pack(options["ver"]);
   } catch (e) {
     process.exit(1);
   }

package/dist/deploy/pkg/nginx/nginx.service.tpl

@@ -19,7 +19,6 @@ PermissionsStartOnly=true
 # 应用安装目录,需手动修改
 WorkingDirectory=/etc/nginx
 
-[Service]
 Type=forking
 PIDFile=_pid_file_
 ExecStart=_exec_cmd_

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

@@ -8,10 +8,12 @@
 # # 下载 ansible 依赖包
 # yumdownloader --resolve --destdir=/deps openssl openssl-devel  pcre pcre-devel gcc gcc-c++ zlib zlib-devel
 
+# x86_64 使用centos 7.9 从源码编译 并打包
+# arm 使用ctyunos 2.0.1 从源码编译 并打包
 
-nginx_version="1.22.1"
+nginx_version="1.31.0"
 
-wget https://nginx.org/download/nginx-${nginx_version}.tar.gz
+curl -LO https://nginx.org/download/nginx-${nginx_version}.tar.gz
 
 tar -zxvf nginx-${nginx_version}.tar.gz
 
@@ -28,6 +30,7 @@ cd nginx-${nginx_version} || exit
   --with-http_gzip_static_module \
   --with-http_stub_status_module \
   --with-stream \
+  --with-http_grpc_module \
   --with-pcre
 
 make
@@ -39,25 +42,28 @@ cp -f /etc/nginx/conf/mime.types /etc/nginx/
 echo '------------------compile and install done----------------------------'
 
 arch=$(uname -m)
-# system_name=$(uname -r | awk -F'.' '{print $(NF-1)"."$NF}')
-system_name=$(uname -r | awk -F'.' '{print $(NF-1)}')
-ssl_version=$(openssl version | awk '{print $2}')
-system_name_with_arch=$system_name"."$arch
+ssl_version=$(openssl version | awk '{print $2}' | cut -d'-' -f1)
+# 只保留 x.x.x 版本号，去掉后缀如 "1.1.1f" -> "1.1.1"
+ssl_version=$(echo "$ssl_version" | grep -oP '^\d+\.\d+\.\d+')
 
 
 if [[ -z "${arch}" ]]; then
   arch="x86_64"
 fi
 
-if [[ $arch == arm* ]] || [[ $arch == aarch64 ]]; then
+if [[ $arch == arm* ]] || [[ $arch == aarch* ]]; then
   arch="arm"
 fi
 
+if [[ $arch == x86_64 ]]; then
+  arch="x86_64"
+fi
+
 
 if [[ -z "${ssl_version}" ]]; then
   ssl_version="1.0.2"
 fi
 
-tar -zcvf nginx-"$system_name_with_arch"-ssl"$ssl_version".tar.gz -C /etc nginx/
+tar -zcvf nginx-"$arch"-ssl"$ssl_version".tar.gz -C /etc nginx/
 
-echo "-----------done to pack:   nginx-${system_name_with_arch}-ssl${ssl_version}.tar.gz--------------"
+echo "-----------done to pack:   nginx-${arch}-ssl${ssl_version}.tar.gz--------------"

package/dist/deploy/script/common.sh

@@ -257,8 +257,8 @@ start() {
   chmod 744 -R "$INSTALL_PATH"
 
   if [[ $? == 0 ]]; then
-    log_success "posidon-frontend deployed successfully"
+    log_success "${APP_NAME} deployed successfully"
   else
-    log_error "posidon-frontend deployment failed"
+    log_error "${APP_NAME} deployment failed"
   fi
 }

package/dist/deploy/script/nginx.sh

@@ -161,12 +161,12 @@ add_nginx_service() {
 
   if ((mode == 2)); then
     # systemctl enable nginx
-    cp ./nginx.service /usr/lib/systemd/system/"$APP_NAME".nginx.service
+    cp ./nginx.service /usr/lib/systemd/system/"$APP_NAME".service
     systemctl daemon-reload
 
-    log_success "add ${APP_NAME}.nginx.service to /usr/lib/systemd/system/"
+    log_success "add ${APP_NAME}.service to /usr/lib/systemd/system/"
   else
-    rm -rf /usr/lib/systemd/system/"$APP_NAME".nginx.service
+    rm -rf /usr/lib/systemd/system/"$APP_NAME".service
   fi
 }
 
@@ -179,7 +179,7 @@ add_log_rotate(){
 
   sed -i "s#__usergroup__#$usergroup#g" ./nginx.logrotate
   sed -i "s#__user__#$user#g" ./nginx.logrotate
-  sed -i "s#__APP_NAME__#$APP_NAME#g" ./nginx.logrotate
+  sed -i "s#__app_name__#$APP_NAME#g" ./nginx.logrotate
   sed -i "s#__pid_file__#$NGINX_PID_FILE_PATH#g" ./nginx.logrotate
   
   cp -f ./nginx.logrotate /etc/logrotate.d/${APP_NAME}.nginx
@@ -213,25 +213,23 @@ install_nginx_from_binary(){
   log "start to install nginx binary"
 
   arch=$(uname -m)
-  system_name=$(uname -r | awk -F'.' '{print $(NF-1)}')
   ssl_full_version=$(openssl version | awk '{print $2}')
   ssl_fuzzy_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
-  system_name_with_arch=$system_name"."$arch
 
-  # 若存在完整的系统名称.架构.ssl版本的包则优先使用该包安装
-  pkg="$NGINX_BINARY_PKG_PATH"/binary/nginx-"$system_name_with_arch"-ssl"$ssl_full_version".tar.gz
+  if [[ -z "${arch}" ]]; then
+    arch="x86_64"
+  fi
 
-  if [ -f "$pkg" ]; then
-    log "current arch: $system_name_with_arch, current ssl_version： $ssl_full_version"
-  else
-    if [[ -z "${arch}" ]]; then
-      arch="x86_64"
-    fi
+  if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
+    arch="arm"
+  fi
 
-    if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
-      arch="arm"
-    fi
+  # 优先用完整 OpenSSL 版本号匹配（如 nginx-x86_64-ssl3.2.1.tar.gz）
+  pkg="$NGINX_BINARY_PKG_PATH"/binary/nginx-"$arch"-ssl"$ssl_full_version".tar.gz
 
+  if [ -f "$pkg" ]; then
+    log "current arch: $arch, current ssl_version: $ssl_full_version (full version match)"
+  else
     if [[ "${ssl_fuzzy_version}" == "1.0" ]]; then
       ssl_fuzzy_version="1.0.2"
     fi
@@ -244,6 +242,10 @@ install_nginx_from_binary(){
       ssl_fuzzy_version="3.0.7"
     fi
 
+    if [[ "${ssl_fuzzy_version}" == "3.2" ]]; then
+      ssl_fuzzy_version="3.2.1"
+    fi
+
     if [[ -z "${ssl_fuzzy_version}" ]]; then
       ssl_fuzzy_version="1.0.2"
     fi
@@ -255,7 +257,7 @@ install_nginx_from_binary(){
       exit 1
     fi
 
-    log "current arch: $arch, current ssl_version： $ssl_fuzzy_version"
+    log "current arch: $arch, current ssl_version: $ssl_fuzzy_version (fuzzy version match)"
   fi
 
   tar -zxvhf "$pkg" -C "$NGINX_BINARY_INSTALL_PATH" --strip-components 1
@@ -301,7 +303,8 @@ install_nginx_from_source(){
 # 安装nginx可执行程序
 install_nginx_binary() {
   log "install nginx to path: ${NGINX_BINARY_INSTALL_PATH}"
-  
+  mkdir -p $NGINX_BINARY_INSTALL_PATH
+
   if [[ "${nginx_install_mode}" == "source" ]]; then
     install_nginx_from_source
   else

package/dist/deploy/script/readme.md

@@ -6,5 +6,5 @@ Install
          a. 若无 --> 安装
          b. 若有 --> 询问是否替换安装
       --> 资源部署
-         1. 生成对应 xxx.nginx.conf （替换对应日志xxx.nginx.log、进程和生成 xxx.nginx.service）  
+         1. 生成对应 xxx.nginx.conf （替换对应日志xxx.nginx.log、进程和生成 xxx.service）  
          2. 复制静态资源文件

package/dist/publish.js

@@ -15,7 +15,7 @@ import 'picocolors';
 
 async function isGitFlowRepo() {
   try {
-    let { stdout } = await execa("git config", ["--get-regexp", `^gitflow.`]);
+    let { stdout } = await execa("git", ["config", "--get-regexp", `^gitflow.`]);
     return stdout.toString().length > 0;
   } catch (error) {
     console.error("\u{1F680} ~ doGitFlowRelease ~ error:", error);
@@ -24,13 +24,10 @@ async function isGitFlowRepo() {
 }
 async function getRepo() {
   let repo;
-  try {
-    const res = await execa(`git remote -v  `).pipe(` sed -n '1p'`).pipe(`awk -F ' ' '{print $2}'`).pipe(`sed -e 's/.git//'`);
-    repo = res.stdout.replace("\n", "");
-  } catch (error) {
-    const res = await $`git remote -v`;
-    repo = res.stdout.split("\n")[1].split(" ")[0].split("	")[1].replace(".git", "").replace("\n", "");
-  }
+  const res = await $`git remote -v`;
+  const lines = res.stdout.split("\n").filter(Boolean);
+  const firstLine = lines[0] || "";
+  repo = firstLine.split(/\s+/)[1]?.replace(".git", "") || "";
   if (repo.startsWith("git@")) {
     const ps2 = repo.split("/");
     return {

package/dist/release.js

@@ -136,7 +136,7 @@ async function doGitFlowRelease(version) {
   const hasUncommitted = await hasUncommittedChanges(true);
   if (hasUncommitted) {
     await $`git add -A`;
-    await execa("git commit", ["-m", `Release version: ${version}`, "--no-verify"]);
+    await execa("git", ["commit", "-m", `Release version: ${version}`, "--no-verify"]);
   }
   await execWithPipe(`git flow release finish`, [version, "-m", `Release version: ${version}`]);
   await $`git push --all --no-verify`;
@@ -175,7 +175,7 @@ async function execGitPullOrigin(remoteTargetBranch) {
   }
 }
 async function execWithPipe(...args) {
-  const execRes = execa(...args);
+  const execRes = execa(args[0], args[1], { shell: true });
   execRes.stdout.pipe(process.stdout);
   execRes.stderr.pipe(process.stderr);
   const result = await execRes;
@@ -185,14 +185,11 @@ async function execGitCheckout(remoteTargetBranch) {
   await hasUncommittedChanges();
   const { stdout: prevCurrentBranch } = await $`git branch --show-current`;
   if (prevCurrentBranch !== remoteTargetBranch) {
-    const execRes = execa(`git checkout ${remoteTargetBranch}`);
-    execRes.stdout.pipe(process.stdout);
-    execRes.stderr.pipe(process.stderr);
-    const result = await execRes;
+    await $`git checkout ${remoteTargetBranch}`;
     const { stdout: currentBranch } = await $`git branch --show-current`;
     if (currentBranch !== remoteTargetBranch) {
       logger.error(`\u76EE\u6807\u53D1\u5E03\u5206\u652F[${remoteTargetBranch}] checkout \u5931\u8D25`);
-      return Promise.reject(result);
+      return Promise.reject(new Error(`\u76EE\u6807\u53D1\u5E03\u5206\u652F[${remoteTargetBranch}] checkout \u5931\u8D25`));
     }
   }
 }

package/example/README.md

@@ -0,0 +1,71 @@
+# Example Project
+
+用于测试 release-helper 完整发版流程的示例项目。
+
+## 目录结构
+
+```
+example-frontend/
+├── package.json              # 前端项目配置，引用本地 release-helper
+├── dist/                     # 构建产物目录
+│   └── index.html            # 模拟的构建产物
+└── .release/                 # 发版配置目录
+    ├── release.conf.yaml     # 打包发版配置
+    ├── nginx/                # nginx 配置
+    │   ├── nginx.conf
+    │   └── ca/               # SSL 证书
+    └── doc/                  # 发版附带文档
+        └── 部署手册.md
+```
+
+## 使用
+
+### 1. 安装依赖
+
+```bash
+cd example/example-frontend
+pnpm install
+```
+
+### 2. 配置
+
+编辑 `.release/release.conf.yaml`，填写真实的 GitLab 地址和 token：
+
+```yaml
+host: 'https://your-gitlab.example.com'
+token: 'your-token-here'
+```
+
+### 3. 测试打包
+
+```bash
+pnpm pack
+# 或
+pnpm release-helper pack
+```
+
+打包完成后，在 `example-frontend/.release/` 目录下会生成 `example-frontend_x.tar.gz` 文件。
+
+### 4. 测试发版
+
+配置好 GitLab 信息后：
+
+```bash
+pnpm release
+# 或
+pnpm release-helper release
+```
+
+## 验证打包产物
+
+解压 tar.gz 检查内部结构：
+
+```bash
+tar -tzf .release/example-frontend_*.tar.gz | head -30
+```
+
+应包含：
+- `example-frontend/script/` — 安装脚本
+- `example-frontend/pkg/assets/` — 前端静态资源
+- `example-frontend/pkg/nginx/` — nginx 配置
+- `example-frontend/pkg/version` — 版本文件

package/example/example-frontend/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "example-frontend",
+  "version": "0.1.0",
+  "private": true,
+  "description": "example project for testing release-helper",
+  "scripts": {
+    "build": "echo 'simulating build...' && mkdir -p dist && echo '<!DOCTYPE html><html><head><meta x-v=__version__></head><body><h1>Example Frontend</h1></body></html>' > dist/index.html",
+    "pack": "release-helper pack",
+    "release": "release-helper release"
+  },
+  "devDependencies": {
+    "@wjwjq/release-helper": "file:../../"
+  }
+}