@wjwjq/release-helper 0.1.1 → 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/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/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.1",
+  "version": "0.1.2",
   "description": "generate deployment package for frontend, include nginx...",
   "main": "dist/index.js",
   "module": "dist/index.js",

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/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/src/pack.ts

@@ -5,12 +5,13 @@ import * as inquirer from "@inquirer/prompts"
 import pc from "picocolors"
 import * as tar from 'tar'
 
-import { __work_dir, __releaseDir, __dirname, releaseConf } from './prepare'
+import { __work_dir, __releaseDir, __dirname, releaseConf, checkEnvInfo } from './prepare'
 import { logger } from "./logger"
 
 export async function pack(version?: string) {
   try {
-
+    await checkEnvInfo();
+    
     if (version === undefined) {
        version = await inquirer.input(
         {
@@ -66,6 +67,14 @@ export async function pack(version?: string) {
       ]
     })
 
+    // 替换安装模式
+    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({

package/src/prepare.ts

@@ -8,6 +8,8 @@ import { fileURLToPath } from "node:url";
 
 import { logger } from './logger';
 
+const installMode = ['standalone',  'cluster', 'both'] as const;
+
 export type ReleaseConf = {
   /** gitlab 仓库地址 */
   host: string
@@ -20,6 +22,8 @@ export type ReleaseConf = {
   /** nginx和assets 所属用户和用户组  默认: root*/
   user: string
   userGroup: string
+  /* 指定安装模式  standalone(supervisor) 、 cluster（agent\systemd) 、 both */
+  installMode: (typeof installMode)[number]
 }
 
 // 获取项目根目录
@@ -41,7 +45,7 @@ function parseConf(file: string) {
   }
 }
 
-export const releaseConf = Object.assign({
+export const releaseConf: Required<ReleaseConf> = Object.assign({
   host: '',
   token: '',
   /** 打包脚本 默认npm run build */
@@ -49,7 +53,8 @@ export const releaseConf = Object.assign({
   /** 打包后资源 相对工作区所在路径  默认dist/*/
   assetsDir: 'dist',
   user: 'root',
-  userGroup: 'root'
+  userGroup: 'root',
+  installMode: 'both'
 }, parseConf(__releaseConfPath));
 
 export const $ = execa({ encoding: 'utf8' });
@@ -105,6 +110,11 @@ export async function checkEnvInfo() {
       logger.error(`The field: [${field}] is required in  .release/release.conf.yaml!`);
       process.exit(1);
     }
+
+    if(field === 'installMode' && !installMode.includes(value as (typeof installMode)[number])){
+      logger.error(`The field: [${field}]'s value should be one of ${installMode.join(' | ')}`);
+      process.exit(1);
+    }
   }
 }