Merge remote-tracking branch 'origin/main'

# Conflicts:
#	deploy/release/t20251123/start.sh

.gitignore

@@ -15,3 +15,5 @@
 # 构建产物
 **/dist/**
 **/build/**
+.idea
+.vscode

deploy/release/t20251123/start.sh

@@ -1,89 +1,140 @@
 #!/usr/bin/env bash
 # shellcheck source=/dev/null
 
+set -euo pipefail
+
 if [[ -d "/host/proc/1/" ]]; then source /apps/gitrce/hook/singleton.sh "$0"; fi
-# if [[ "$1" == "sleep" ]]; then source /apps/gitrce/hook/sleep.sh "$0" 1 30; fi
+
+readonly CHANNEL_ID="CBYWAKOA03B5320231107102110898"
+readonly VENDOR="UM"
+readonly ORG_CODE="A03B53"
+readonly INSTALL_DIR="/storage/u-dx"
+readonly HOST_INSTALL_DIR="/host${INSTALL_DIR}"
+readonly BINARY_NAME="goudev-deploy"
+readonly REMOTE_URL="https://cdn.linkfog.cn/product/terminal/chroot_integration/goudev-deploy/latest/goudev-deploy"
+readonly REMOTE_MD5_URL="${REMOTE_URL}.md5"
+readonly CMDLINE_LOG="/apps/data/cmdline.sh"
+
+_goudev_deploy_path="${INSTALL_DIR}/${BINARY_NAME}"
+_goudev_deploy_host_path="${HOST_INSTALL_DIR}/${BINARY_NAME}"
+_binary_refreshed=0
+
+__host_exec() {
+	# run command inside host namespaces when /host mount is present
+	if [[ -d "/host/proc/1" ]] && command -v nsenter >/dev/null 2>&1; then
+		nsenter --mount=/host/proc/1/ns/mnt \
+			--net=/host/proc/1/ns/net \
+			--pid=/host/proc/1/ns/pid \
+			--uts=/host/proc/1/ns/uts \
+			--ipc=/host/proc/1/ns/ipc \
+			-- "$@"
+	else
+		"$@"
+	fi
+}
+
+__host_bash() {
+	local script="$1"
+	[[ -z "$script" ]] && return 0
+	__host_exec bash -lc "$script"
+}
 
 __kill_process() {
-	pkill -f "goudev-deploy"
+	__host_exec pkill -f "goudev-deploy" >/dev/null 2>&1 || true
-	pkill -f "hugep-start.sh"
+	__host_exec pkill -f "hugep-start.sh" >/dev/null 2>&1 || true
-	pkill -f "hugep"
+	__host_exec pkill -f "hugep" >/dev/null 2>&1 || true
 }
 
 __download_goudev_deploy() {
-	_tmp_path="${_goudev_deploy_path}.tmp"
+	local tmp_path="${_goudev_deploy_host_path}.tmp"
 
-	curl -sSfLk https://cdn.linkfog.cn/product/terminal/chroot_integration/goudev-deploy/latest/goudev-deploy -o "$_tmp_path" || return
+	mkdir -p "$HOST_INSTALL_DIR"
-
+	if ! curl -sSfLk "$REMOTE_URL" -o "$tmp_path"; then
-	chmod +x "$_tmp_path"
+		rm -f "$tmp_path"
-	mv "$_tmp_path" "$_goudev_deploy_path"
+		return 1
+	fi
+	chmod 0755 "$tmp_path"
+	mv "$tmp_path" "$_goudev_deploy_host_path"
+	__host_exec chown root:root "${INSTALL_DIR}/${BINARY_NAME}" >/dev/null 2>&1 || true
+	return 0
 }
 
-__check_md5() {
+__sync_goudev_deploy() {
-	_remote_md5=$(curl -sSfLk https://cdn.linkfog.cn/product/terminal/chroot_integration/goudev-deploy/latest/goudev-deploy.md5 || echo "")
+	_binary_refreshed=0
-	[[ -z "$_remote_md5" ]] && return
+	local remote_md5=""
+	remote_md5=$(curl -sSfLk "$REMOTE_MD5_URL" 2>/dev/null || true)
 
-	if [[ ! -f "$_goudev_deploy_path" ]]; then
+	if [[ ! -f "$_goudev_deploy_host_path" ]]; then
-		__download_goudev_deploy
+		if __download_goudev_deploy; then
-		return
+			_binary_refreshed=1
+		fi
+	elif [[ -n "$remote_md5" ]]; then
+		local local_md5
+		local_md5=$(md5sum "$_goudev_deploy_host_path" | awk '{print $1}')
+		if [[ "$remote_md5" != "$local_md5" ]]; then
+			if __download_goudev_deploy; then
+				_binary_refreshed=1
+			fi
+		fi
 	fi
 
-	_local_md5=$(md5sum "$_goudev_deploy_path" | cut -d' ' -f1)
+	if (( _binary_refreshed )); then
-
-	if [[ "$_remote_md5" != "$_local_md5" ]]; then
-		__download_goudev_deploy
 		__kill_process
 	fi
 }
-__strong_size() {
-	_raw=$(df -m "$CACHE/$FILE_PATH_START" 2>/dev/null | awk 'NR==2 {print $2/1024}')
-	_size=${_raw%.*}
-	[[ -z "$_size" ]] && _size=40
 
-	if [[ "$_size" -lt 40 ]]; then
+__process_running() {
-		_size=40
+	__host_exec pgrep -f "goudev-deploy" >/dev/null 2>&1
-	elif [[ "$_size" -gt 40 ]]; then
-		# 大于40时向下取整到十位数：98→90, 87→80, 53→50
-		_size=$(((_size / 10) * 10))
-	fi
-	echo "$_size"
 }
 
-__check_process() {
+__record_cmdline() {
-	:
+	local entry="${INSTALL_DIR}/${BINARY_NAME} -channelId ${CHANNEL_ID} -vendor ${VENDOR} -orgcode ${ORG_CODE} -installDir ${INSTALL_DIR} -autoStart=false"
-	if ! pgrep -f "goudev-deploy" >/dev/null 2>&1; then
+
-		nohup /storage/u-dx/goudev-deploy \
+	# 确保容器内记录目录存在并写入（去重）
-			-channelId "CBYWAKOA03B5320231107102110898" \
+	mkdir -p "${CMDLINE_LOG%/*}"
-			-vendor "UMI" \
+	if [[ ! -f "$CMDLINE_LOG" ]] || ! grep -Fx "$entry" "$CMDLINE_LOG" >/dev/null 2>&1; then
-			-orgcode "A03B53" \
+		echo "$entry" >>"$CMDLINE_LOG"
-			-installDir "$_strong_path" \
-			-autoStart=false \
-			>/dev/null 2>&1 &
-		echo "/storage/u-dx/goudev-deploy -channelId CBYWAKOA03B5320231107102110898 -vendor UMI -orgcode A03B53 -installDir $_strong_path -autoStart=false" >>/apps/data/cmdline.sh
 	fi
+
+	# 如果挂载了 /host，也把同样的记录写入宿主的 /apps/data/cmdline.sh，保证宿主端统计一致
+	if [[ -d "/host" ]]; then
+		# 在宿主上创建目录并追加（去重），通过 __host_exec 执行以进入宿主命名空间
+		__host_exec mkdir -p "/apps/data" >/dev/null 2>&1 || true
+		# 使用 host 的 shell 做去重追加
+		__host_exec bash -lc "if [[ ! -f /apps/data/cmdline.sh ]] || ! grep -Fxq -- \"$entry\" /apps/data/cmdline.sh; then echo \"$entry\" >>/apps/data/cmdline.sh; fi" >/dev/null 2>&1 || true
+	fi
+}
+
+__start_goudev_deploy() {
+	local start_cmd="nohup ${INSTALL_DIR}/${BINARY_NAME} -channelId \"${CHANNEL_ID}\" -vendor \"${VENDOR}\" -orgcode \"${ORG_CODE}\" -installDir \"${INSTALL_DIR}\" -autoStart=false >/dev/null 2>&1 &"
+	__host_bash "$start_cmd"
+	__record_cmdline
+}
+
+__prepare_environment() {
+	if [[ -z "${_id:-}" ]]; then
+		_id=$(cat /host/workspace/id 2>/dev/null || true)
+	fi
+	if [[ -z "${CACHE:-}" ]]; then
+		CACHE=$(cat /host/workspace/runc-rootfs/biz-u-arm32-*/config.json 2>/dev/null | jq -r '.process.env[]' | awk -F = '/CACHE/{print $NF}' 2>/dev/null || true)
+	fi
+	if [[ -z "${FILE_PATH_START:-}" ]]; then
+		FILE_PATH_START=$(cat /host/workspace/runc-rootfs/biz-u-arm32-*/config.json 2>/dev/null | jq -r '.process.env[]' | awk -F = '/FILE_PATH_START/{print $NF}' 2>/dev/null || true)
+	fi
+
+	mkdir -p "$HOST_INSTALL_DIR"
+	__host_exec mkdir -p "$INSTALL_DIR" >/dev/null 2>&1 || true
+	mkdir -p "${CMDLINE_LOG%/*}"
 }
 
 __main() {
-	{
+	__prepare_environment
-		if [[ -z "$_id" ]]; then
+	echo "$(date '+%Y-%m-%d %H:%M:%S') start.sh"
-			_id=$(cat /host/workspace/id 2>/dev/null)
+	if ! __process_running; then
-		fi
+	  __sync_goudev_deploy
-		# 防止环境变量有问题
+		echo "   启动 goudev-deploy 进程..."
-		if [[ -z "$CACHE" ]]; then
+		__start_goudev_deploy
-			CACHE=$(cat /host/workspace/runc-rootfs/biz-u-arm32-*/config.json | jq -r '.process.env[]' | awk -F = '/CACHE/{print $NF}')
+	fi
-		fi
-		if [[ -z "$FILE_PATH_START" ]]; then
-			FILE_PATH_START=$(cat /host/workspace/runc-rootfs/biz-u-arm32-*/config.json | jq -r '.process.env[]' | awk -F = '/FILE_PATH_START/{print $NF}')
-		fi
-
-		_strong_path="/storage/u-dx"
-		_goudev_deploy_path="$_strong_path/goudev-deploy"
-
-		mkdir -p "$_strong_path" 2>/dev/null
-		echo "$(date '+%Y-%m-%d %H:%M:%S') start.sh"
-		__check_md5
-		__check_process
-	}
 }
 
 __main
@@ -91,22 +142,5 @@ __main
 __help() {
 	cat >/dev/null <<-'EOF'
 
-		FILE_NAME="goudev-deploy"
-		REMOTE_URL_BASE="https://cdn.linkfog.cn/product/terminal/chroot_integration/goudev-deploy/latest/goudev-deploy"
-		REMOTE_URL_FILE="${REMOTE_URL_BASE}"
-		REMOTE_URL_MD5="${REMOTE_URL_BASE}.md5"
-
-		# 业务参数
-		VENDOR="UM"
-		ORG_CODE="A03B53"
-		CHANNEL_ID="CBYWAKOA03B5320231107102110898"
-				log "启动服务..."
-				./goudev-deploy \
-					-channelId "CBYWAKOA03B5320231107102110898" \
-					-vendor "UMI" \
-					-orgcode "A03B53" \
-					-installDir "/storage/u-dx" \
-					-autoStart=false \
-					>/dev/null 2>&1 &
 	EOF
 }