@dazhicheng/common 1.0.46 → 1.0.47

package/deploy-docker.sh

@@ -140,31 +140,89 @@ wait_http() {
   return 1
 }
 
-# 重建前旁路探活：127.0.0.1 上由 Docker 分配空闲宿主机端口（无固定偏移）
+# 收集宿主机已占用 TCP 端口（Docker 映射 + 系统监听）
+collect_used_ports() {
+  _out=""
+  for _id in $(docker ps -q 2>/dev/null); do
+    _chunk=$(docker inspect -f \
+      '{{range $p, $conf := .NetworkSettings.Ports}}{{if $conf}}{{range $conf}}{{.HostPort}}{{"\n"}}{{end}}{{end}}{{end}}' \
+      "$_id" 2>/dev/null || true)
+    _out="${_out}${_chunk}"
+  done
+  if command -v ss >/dev/null 2>&1; then
+    _out="${_out}$(ss -H -ltn 2>/dev/null | awk '{print $4}' | sed -e 's/^\[::\]://' -e 's/^.*://')
+"
+  elif command -v netstat >/dev/null 2>&1; then
+    _out="${_out}$(netstat -ltn 2>/dev/null | awk 'NR>2 {sub(/^.*:/, "", $4); print $4}')"
+  fi
+  echo "$_out" | grep -E '^[0-9]+$' | sort -nu
+}
+
+is_port_in_use() {
+  echo "$USED_PORTS" | grep -qx "$1"
+}
+
+# 在系统临时端口范围内选第一个空闲端口（不依赖 HOST_PORT 偏移）
+pick_available_sidecar_port() {
+  if [ -n "${SIDECAR_HOST_PORT:-}" ]; then
+    if ! is_port_in_use "$SIDECAR_HOST_PORT"; then
+      echo "$SIDECAR_HOST_PORT"
+      return 0
+    fi
+    echo "sidecar: SIDECAR_HOST_PORT=${SIDECAR_HOST_PORT} already in use" >&2
+    return 1
+  fi
+
+  if [ -r /proc/sys/net/ipv4/ip_local_port_range ]; then
+    _range=$(cat /proc/sys/net/ipv4/ip_local_port_range)
+  else
+    _range="32768 60999"
+  fi
+  _min=$(echo "$_range" | awk '{print $1}')
+  _max=$(echo "$_range" | awk '{print $2}')
+
+  _port="$_min"
+  while [ "$_port" -le "$_max" ]; do
+    if ! is_port_in_use "$_port"; then
+      echo "$_port"
+      return 0
+    fi
+    _port=$((_port + 1))
+  done
+  return 1
+}
+
+# 重建前旁路探活：先枚举已用端口，再绑定空闲端口
 start_sidecar_container() {
   NEXT_NAME="${IMAGE_NAME}-next"
-  _publish="127.0.0.1::${CONTAINER_PORT}"
+  TEMP_PORT=""
 
   docker rm -f "$NEXT_NAME" 2>/dev/null || true
 
-  if [ -n "${SIDECAR_HOST_PORT:-}" ]; then
-    _publish="127.0.0.1:${SIDECAR_HOST_PORT}:${CONTAINER_PORT}"
-    echo "sidecar: using fixed port ${SIDECAR_HOST_PORT}" >&2
-  else
-    echo "sidecar: binding ephemeral free port on 127.0.0.1" >&2
+  USED_PORTS=$(collect_used_ports)
+  _used_flat=$(echo "$USED_PORTS" | tr '\n' ' ' | sed 's/ $//')
+  echo "sidecar: in-use host ports: ${_used_flat:-none}" >&2
+
+  TEMP_PORT=$(pick_available_sidecar_port) || TEMP_PORT=""
+
+  if [ -n "$TEMP_PORT" ]; then
+    echo "sidecar: selected free port ${TEMP_PORT}" >&2
+    docker run -d --name "$NEXT_NAME" \
+      -p "127.0.0.1:${TEMP_PORT}:${CONTAINER_PORT}" \
+      -v "${ASSETS_VOL}:/usr/share/nginx/html" \
+      -e "ASSET_RETENTION_DAYS=${ASSET_RETENTION_DAYS}" \
+      "${IMAGE_NAME}:latest"
+    echo "$TEMP_PORT"
+    return 0
   fi
 
+  echo "sidecar: no free port in ephemeral range, fallback to docker auto-assign" >&2
   docker run -d --name "$NEXT_NAME" \
-    -p "$_publish" \
+    -p "127.0.0.1::${CONTAINER_PORT}" \
     -v "${ASSETS_VOL}:/usr/share/nginx/html" \
     -e "ASSET_RETENTION_DAYS=${ASSET_RETENTION_DAYS}" \
     "${IMAGE_NAME}:latest"
-
-  if [ -n "${SIDECAR_HOST_PORT:-}" ]; then
-    echo "$SIDECAR_HOST_PORT"
-  else
-    docker port "$NEXT_NAME" "${CONTAINER_PORT}/tcp" | sed 's/.*://'
-  fi
+  docker port "$NEXT_NAME" "${CONTAINER_PORT}/tcp" | sed 's/.*://'
 }
 
 probe_sidecar_before_recreate() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/common",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "description": "共享配置文件",
   "type": "module",
   "types": "./src/types/index.d.ts",