@dazhicheng/common 1.0.43 → 1.0.46

package/.env.test

@@ -13,4 +13,4 @@ VITE_DROP_CONSOLE = true
 VITE_FEISHU_REDIRECT_URI = http://fulfillment-qd.tiantai-jp.com:23006/feishuOAuth
 
 # webSocket地址
-VITE_WEBSOCKET_URL = ws://116.6.49.180:11001
+VITE_WEBSOCKET_URL = ws://fulfillment-test.tiantai-jp.com:11000

package/.gitlab-ci.yml

@@ -38,6 +38,7 @@ variables:
       - dist/
       - nginx_*.conf
       - docker-entrypoint.sh
+      - deploy-docker.sh
       - Dockerfile
     expire_in: 1 day
 
@@ -57,29 +58,20 @@ variables:
       - dist-test/
       - nginx_*.conf
       - docker-entrypoint.sh
+      - deploy-docker.sh
       - Dockerfile
     expire_in: 1 day
 
 # 部署锚点（通用脚本直接写在这里，不需要项目覆盖） -------------------------
 # 使用 named volume 持久化静态资源：发版时合并新构建并保留旧 hashed 文件，
 # 使已打开的旧页面仍能懒加载到旧入口资源。
-# 若存在 dist-${NODE_ENV}（develop 双构建产物），先还原为 dist/ 再 docker build。
+# 热更新逻辑见 deploy-docker.sh（sync-common 同步到各 *-web）。
 .deploy_template: &deploy_template
   stage: deploy
   image: docker:26.1.4
   script:
-    - |
-      if [ -d "dist-${NODE_ENV}" ]; then
-        rm -rf dist
-        mv "dist-${NODE_ENV}" dist
-      fi
-    - docker volume create ${IMAGE_NAME}-assets || true
-    - docker build --build-arg NODE_ENV=$NODE_ENV -t $IMAGE_NAME:latest .
-    - docker stop $IMAGE_NAME || true
-    - docker rm $IMAGE_NAME || true
-    - >
-      docker run -d --name $IMAGE_NAME --restart always -p $HOST_PORT:$CONTAINER_PORT -v ${IMAGE_NAME}-assets:/usr/share/nginx/html -e ASSET_RETENTION_DAYS=14 $IMAGE_NAME:latest
-
+    - chmod +x deploy-docker.sh
+    - ./deploy-docker.sh
     - docker image prune -f || true
 
 # MR 验证 -----------------------------------------------------------------
@@ -136,27 +128,41 @@ MR 构建验证:
 #     <<<开发环境发版_107_NO>>>
 #   only: [develop]
 
-测试环境发版:
+# develop：双构建产物 dist-test；构建失败则不发版（needs 非 optional）
+测试环境发版_develop:
+  <<: *deploy_template
+  needs: [构建_develop]
+  tags: [test]
+  resource_group: deploy-test
+  variables:
+    NODE_ENV: test
+    <<<测试环境发版>>>
+  only: [develop]
+
+# test：单构建产物 dist/；构建失败则不发版
+测试环境发版_test:
   <<: *deploy_template
-  needs:
-    - job: 构建_develop
-      optional: true
-    - job: 构建_test
-      optional: true
+  needs: [构建_test]
   tags: [test]
   resource_group: deploy-test
   variables:
     NODE_ENV: test
     <<<测试环境发版>>>
-  only: [test, develop]
+  only: [test]
+
+# 测试环境发版_107_develop:
+#   <<: *deploy_template
+#   needs: [构建_develop]
+#   tags: [test_107]
+#   resource_group: deploy-test_107
+#   variables:
+#     NODE_ENV: test
+#     <<<测试环境发版_107_NO>>>
+#   only: [develop]
 
-# 测试环境发版_107:
+# 测试环境发版_107_test:
 #   <<: *deploy_template
-#   needs:
-#     - job: 构建_develop
-#       optional: true
-#     - job: 构建_test
-#       optional: true
+#   needs: [构建_test]
 #   tags: [test_107]
 #   resource_group: deploy-test_107
 #   variables:

package/deploy-docker.sh

@@ -0,0 +1,213 @@
+#!/bin/sh
+# 静态 SPA Docker 热更新部署：合并 volume、按需 reload nginx / 重建容器。
+# 由 GitLab CI deploy job 调用；依赖环境变量见下方「必需变量」。
+set -e
+
+# --- 必需变量（由 CI job variables 注入）---
+: "${IMAGE_NAME:?IMAGE_NAME is required}"
+: "${NODE_ENV:?NODE_ENV is required}"
+: "${HOST_PORT:?HOST_PORT is required}"
+: "${CONTAINER_PORT:?CONTAINER_PORT is required}"
+
+ASSET_RETENTION_DAYS="${ASSET_RETENTION_DAYS:-14}"
+
+# 构建产物校验（须在 dist-${NODE_ENV} 还原为 dist/ 之前）
+if [ -d "dist-${NODE_ENV}" ]; then
+  test -f "dist-${NODE_ENV}/index.html" || {
+    echo "missing dist-${NODE_ENV}/index.html, abort deploy" >&2
+    exit 1
+  }
+else
+  test -f dist/index.html || {
+    echo "missing dist/index.html, abort deploy" >&2
+    exit 1
+  }
+fi
+
+if [ -d "dist-${NODE_ENV}" ]; then
+  rm -rf dist
+  mv "dist-${NODE_ENV}" dist
+fi
+
+ASSETS_VOL="${IMAGE_NAME}-assets"
+docker volume create "$ASSETS_VOL" || true
+docker build --build-arg NODE_ENV="$NODE_ENV" -t "${IMAGE_NAME}:latest" .
+
+# 合并静态资源到持久卷（entrypoint 执行 cp/find 后 CMD=true 退出，不停正在跑的 nginx）
+docker run --rm \
+  -v "${ASSETS_VOL}:/usr/share/nginx/html" \
+  -e "ASSET_RETENTION_DAYS=${ASSET_RETENTION_DAYS}" \
+  "${IMAGE_NAME}:latest" \
+  true
+
+file_hash_from_image() {
+  _path="$1"
+  _cid=$(docker create "${IMAGE_NAME}:latest")
+  docker cp "$_cid:$_path" /tmp/img-file-hash.bin
+  docker rm -f "$_cid" >/dev/null
+  sha256sum /tmp/img-file-hash.bin | awk '{print $1}'
+}
+
+file_hash_from_container() {
+  _path="$1"
+  docker cp "$IMAGE_NAME:$_path" /tmp/ctr-file-hash.bin 2>/dev/null || return 1
+  sha256sum /tmp/ctr-file-hash.bin | awk '{print $1}'
+}
+
+# 热更新 default.conf：先备份，nginx -t 失败则还原，避免坏配置落盘导致重启起不来
+sync_nginx_conf() {
+  _new=$(file_hash_from_image /etc/nginx/conf.d/default.conf)
+  _old=$(file_hash_from_container /etc/nginx/conf.d/default.conf || true)
+  if [ -z "$_old" ] || [ "$_new" = "$_old" ]; then
+    return 0
+  fi
+
+  _cid=$(docker create "${IMAGE_NAME}:latest")
+  docker cp "$_cid:/etc/nginx/conf.d/default.conf" /tmp/nginx-default-new.conf
+  docker rm -f "$_cid" >/dev/null
+
+  docker exec "$IMAGE_NAME" sh -c \
+    'cp /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf.bak'
+  docker cp /tmp/nginx-default-new.conf "$IMAGE_NAME:/etc/nginx/conf.d/default.conf"
+  if ! docker exec "$IMAGE_NAME" nginx -t; then
+    docker exec "$IMAGE_NAME" sh -c \
+      'mv /etc/nginx/conf.d/default.conf.bak /etc/nginx/conf.d/default.conf'
+    echo "nginx -t failed, restored previous default.conf" >&2
+    return 1
+  fi
+  docker exec "$IMAGE_NAME" sh -c 'rm -f /etc/nginx/conf.d/default.conf.bak'
+  docker exec "$IMAGE_NAME" nginx -s reload
+}
+
+need_recreate() {
+  if [ "${FORCE_RECREATE:-0}" = "1" ]; then
+    echo "FORCE_RECREATE=1, will recreate container"
+    return 0
+  fi
+  # 端口映射变化（HostConfig 在 stopped 时仍可读）
+  _bound=$(docker inspect -f \
+    "{{with index .HostConfig.PortBindings \"${CONTAINER_PORT}/tcp\"}}{{(index . 0).HostPort}}{{end}}" \
+    "$IMAGE_NAME" 2>/dev/null || true)
+  if [ "$_bound" != "$HOST_PORT" ]; then
+    echo "port mapping changed (${_bound:-none} -> ${HOST_PORT}), will recreate"
+    return 0
+  fi
+  _new_ep=$(file_hash_from_image /docker-entrypoint.sh)
+  _old_ep=$(file_hash_from_container /docker-entrypoint.sh || true)
+  if [ -n "$_old_ep" ] && [ "$_new_ep" != "$_old_ep" ]; then
+    echo "docker-entrypoint.sh changed, will recreate"
+    return 0
+  fi
+  _new_ngx=$(file_hash_from_image /usr/sbin/nginx)
+  _old_ngx=$(file_hash_from_container /usr/sbin/nginx || true)
+  if [ -n "$_old_ngx" ] && [ "$_new_ngx" != "$_old_ngx" ]; then
+    echo "nginx binary changed, will recreate"
+    return 0
+  fi
+  return 1
+}
+
+start_container() {
+  docker run -d --name "$IMAGE_NAME" --restart always \
+    -p "${HOST_PORT}:${CONTAINER_PORT}" \
+    -v "${ASSETS_VOL}:/usr/share/nginx/html" \
+    -e "ASSET_RETENTION_DAYS=${ASSET_RETENTION_DAYS}" \
+    "${IMAGE_NAME}:latest"
+}
+
+# 探活：优先本机 curl；CI 容器内无 curl 时用 host 网络 curl 容器访问宿主机映射端口
+http_probe() {
+  _port="$1"
+  if command -v curl >/dev/null 2>&1; then
+    curl -sf --connect-timeout 1 "http://127.0.0.1:${_port}/" >/dev/null
+    return $?
+  fi
+  docker run --rm --network host curlimages/curl:8.5.0 \
+    -sf --connect-timeout 1 "http://127.0.0.1:${_port}/" >/dev/null
+}
+
+wait_http() {
+  _port="$1"
+  _attempts="${2:-30}"
+  _i=1
+  while [ "$_i" -le "$_attempts" ]; do
+    if http_probe "$_port"; then
+      return 0
+    fi
+    sleep 0.5
+    _i=$((_i + 1))
+  done
+  return 1
+}
+
+# 重建前旁路探活：127.0.0.1 上由 Docker 分配空闲宿主机端口（无固定偏移）
+start_sidecar_container() {
+  NEXT_NAME="${IMAGE_NAME}-next"
+  _publish="127.0.0.1::${CONTAINER_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
+  fi
+
+  docker run -d --name "$NEXT_NAME" \
+    -p "$_publish" \
+    -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
+}
+
+probe_sidecar_before_recreate() {
+  NEXT_NAME="${IMAGE_NAME}-next"
+  TEMP_PORT=$(start_sidecar_container) || {
+    echo "sidecar container failed to start" >&2
+    exit 1
+  }
+
+  if ! wait_http "$TEMP_PORT"; then
+    echo "sidecar probe failed on port ${TEMP_PORT}" >&2
+    docker logs "$NEXT_NAME" 2>&1 || true
+    docker rm -f "$NEXT_NAME" || true
+    exit 1
+  fi
+
+  docker stop "$NEXT_NAME" && docker rm "$NEXT_NAME"
+}
+
+wait_main_port() {
+  if ! wait_http "$HOST_PORT"; then
+    echo "main port probe failed on ${HOST_PORT}" >&2
+    if docker inspect "$IMAGE_NAME" >/dev/null 2>&1; then
+      docker logs "$IMAGE_NAME" 2>&1 || true
+    fi
+    exit 1
+  fi
+}
+
+if ! docker inspect "$IMAGE_NAME" >/dev/null 2>&1; then
+  start_container
+  wait_main_port
+elif need_recreate; then
+  probe_sidecar_before_recreate
+  docker stop "$IMAGE_NAME" || true
+  docker rm "$IMAGE_NAME" || true
+  start_container
+  wait_main_port
+else
+  # 已停止则先 start，再走同一套 conf 备份 / -t / reload（docker exec 需要运行中）
+  if [ "$(docker inspect -f '{{.State.Running}}' "$IMAGE_NAME")" != "true" ]; then
+    docker start "$IMAGE_NAME"
+  fi
+  sync_nginx_conf
+  wait_main_port
+fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/common",
-  "version": "1.0.43",
+  "version": "1.0.46",
   "description": "共享配置文件",
   "type": "module",
   "types": "./src/types/index.d.ts",
@@ -25,6 +25,7 @@
     "tsconfig.json",
     "Dockerfile",
     "docker-entrypoint.sh",
+    "deploy-docker.sh",
     "nginx_dev.conf",
     "nginx_test.conf",
     "sync-common.mjs",

package/sync-common.mjs

@@ -27,6 +27,7 @@ const defaultManagedFiles = [
   "pnpm-workspace.yaml",
   "Dockerfile",
   "docker-entrypoint.sh",
+  "deploy-docker.sh",
   { name: "eslint.config.mjs.txt" },
   "tsconfig.json",
   { name: "nginx_dev.conf" },