Merge branch 'master' of http://82.157.175.59:3000/GenarrativeAI/Genarrative

scripts/deploy-rust-remote.sh

@@ -483,6 +483,15 @@ server.listen(webPort, webHost, () => {
 });
 WEB_SERVER
 
+touch "${TARGET_DIR}/.env"
+for env_file in "${TARGET_DIR}/.env" "${TARGET_DIR}/.env.local"; do
+  if [[ -f "${env_file}" ]]; then
+    grep -v '^GENARRATIVE_SPACETIME_ROOT_DIR=' "${env_file}" >"${env_file}.tmp" || true
+    mv "${env_file}.tmp" "${env_file}"
+    printf '\nGENARRATIVE_SPACETIME_ROOT_DIR=__GENARRATIVE_RUNTIME_SPACETIME_ROOT_DIR__\n' >>"${env_file}"
+  fi
+done
+
 cat >"${TARGET_DIR}/start.sh" <<'START_SCRIPT'
 #!/usr/bin/env bash
 
@@ -575,6 +584,9 @@ load_env_file "${SCRIPT_DIR}/.env"
 load_env_file "${SCRIPT_DIR}/.env.local"
 
 SPACETIME_ROOT_DIR="${GENARRATIVE_SPACETIME_ROOT_DIR:-${SCRIPT_DIR}/.spacetimedb}"
+if [[ "${SPACETIME_ROOT_DIR}" == "__GENARRATIVE_RUNTIME_SPACETIME_ROOT_DIR__" ]]; then
+  SPACETIME_ROOT_DIR="${SCRIPT_DIR}/.spacetimedb"
+fi
 SPACETIME_HOST="${GENARRATIVE_SPACETIME_HOST:-__GENARRATIVE_DEFAULT_SPACETIME_HOST__}"
 SPACETIME_PORT="${GENARRATIVE_SPACETIME_PORT:-__GENARRATIVE_DEFAULT_SPACETIME_PORT__}"
 SPACETIME_SERVER_URL="${GENARRATIVE_SPACETIME_SERVER_URL:-http://${SPACETIME_HOST}:${SPACETIME_PORT}}"
@@ -787,7 +799,7 @@ start_process() {
   fi
 
   echo "[start] 启动 ${name}"
-  nohup "$@" >"${log_file}" 2>&1 &
+  JENKINS_NODE_COOKIE=dontKillMe BUILD_ID=dontKillMe nohup "$@" >"${log_file}" 2>&1 &
   echo "$!" >"${pid_file}"
 }
 
@@ -919,10 +931,10 @@ STOP_SCRIPT
 
 chmod +x "${TARGET_DIR}/start.sh" "${TARGET_DIR}/stop.sh"
 
-cat >"${TARGET_DIR}/README.md" <<EOF
+cat >"${TARGET_DIR}/README.md" <<'EOF'
 # Genarrative Ubuntu Release
 
-构建时间：\`${BUILD_NAME}\`
+构建时间：`__GENARRATIVE_BUILD_NAME__`
 
 ## 内容
 
@@ -961,6 +973,7 @@ cat >"${TARGET_DIR}/README.md" <<EOF
 - OSS、LLM、短信、微信等业务密钥仍通过目标服务器环境变量或同目录 \`.env.local\` 管理。
 - 迁移引导密钥由构建发布包时随机生成，构建日志和服务器 \`start.sh\` 发布日志都会显示同一份密钥。
 EOF
+replace_placeholder_in_file "${TARGET_DIR}/README.md" "__GENARRATIVE_BUILD_NAME__" "${BUILD_NAME}"
 
 BUILD_COMPLETED=1
 

scripts/jenkins-deploy-release.sh

@@ -112,6 +112,7 @@ DEPLOY_ITEMS=(
   ".env.local"
   "README.md"
   "api-server"
+  "migration-bootstrap-secret.txt"
   "spacetime_module.wasm"
   "start.sh"
   "stop.sh"

scripts/spacetime-migration-common.mjs

@@ -93,8 +93,13 @@ export function buildSpacetimeCallArgs(options, procedureName, input) {
   args.push('call');
   if (options.server) {
     args.push('-s', options.server);
+  } else if (options.serverUrl) {
+    args.push('-s', options.serverUrl);
   }
   args.push(...options.passthrough);
+  if (!options.passthrough.includes('--no-config')) {
+    args.push('--no-config');
+  }
   args.push(options.database, procedureName, JSON.stringify(input), '-y');
   return args;
 }