Compare commits

..

4 Commits
3.2.1 ... 3.2.5

Author SHA1 Message Date
3da90aa1a4 Fixing typo. 2025-04-14 00:06:02 +00:00
aa9afba282 Trying to fix existing tunnel. 2025-04-13 23:44:58 +00:00
0fe46e635d Trying to fix issue if data authentication already exist.
Some checks failed
Build and Push Docker Image ARM64 / docker (push) Failing after 1m52s
2025-04-13 04:27:21 +00:00
d84caeb8cf Trying to fix issue when restart. 2025-04-13 03:57:47 +00:00
2 changed files with 30 additions and 13 deletions

View File

@ -159,25 +159,42 @@ fi
# Check if CLI directory exists and has content # Check if CLI directory exists and has content
if [ -d "/home/${HOME_USER}/.vscode/cli" ] && [ "$(ls -A /home/${HOME_USER}/.vscode/cli 2>/dev/null)" ]; then if [ -d "/home/${HOME_USER}/.vscode/cli" ] && [ "$(ls -A /home/${HOME_USER}/.vscode/cli 2>/dev/null)" ]; then
# CLI directory exists and has content, ensure proper permissions first # CLI directory exists and has content, extract token and tunnel information
sudo chmod -R a+rwX /home/${HOME_USER}/.vscode/cli
# Wait briefly to ensure services are up # Extract token from token.json if it exists
sleep 2 TOKEN_FILE="/home/${HOME_USER}/.vscode/cli/token.json"
if [ -f "$TOKEN_FILE" ]; then
TOKEN=$(cat "$TOKEN_FILE" | tr -d '\n')
else
TOKEN=""
fi
echo "Restarting VS Code tunnel..." # Extract id and cluster from code_tunnel.json if it exists
# Try to restart, but fall back to normal startup if it fails TUNNEL_FILE="/home/${HOME_USER}/.vscode/cli/code_tunnel.json"
if ! sudo su ${HOME_USER} -c "code tunnel restart"; then if [ -f "$TUNNEL_FILE" ]; then
echo "Tunnel restart failed, trying normal startup..." if command -v jq &> /dev/null; then
if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then # Use jq if available
sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms --name ${VSCODE_TUNNEL_NAME}" ID=$(jq -r '.id' "$TUNNEL_FILE")
CLUSTER=$(jq -r '.cluster' "$TUNNEL_FILE")
else else
sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms" # Fallback to grep and cut if jq is not available
ID=$(grep -o '"id"[^,}]*' "$TUNNEL_FILE" | cut -d'"' -f4)
CLUSTER=$(grep -o '"cluster"[^,}]*' "$TUNNEL_FILE" | cut -d'"' -f4)
fi fi
TUNNEL_ID="${ID}.${CLUSTER}"
else
TUNNEL_ID=""
fi
# Create tunnel with extracted values if available
if [ -n "$TOKEN" ] && [ -n "$TUNNEL_ID" ]; then
sudo su ${HOME_USER} -c "code tunnel --name ${VSCODE_TUNNEL_NAME} --tunnel-id ${TUNNEL_ID} --host-token ${TOKEN}"
else
# Fallback to simpler command if values couldn't be extracted
sudo su ${HOME_USER} -c "code tunnel --name ${VSCODE_TUNNEL_NAME}"
fi fi
else else
# No CLI directory or empty, use normal startup # No CLI directory or empty, use normal startup
echo "Starting new VS Code tunnel session..."
if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then if [[ -v VSCODE_TUNNEL_NAME && -n "${VSCODE_TUNNEL_NAME}" ]]; then
sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms --name ${VSCODE_TUNNEL_NAME}" sudo su ${HOME_USER} -c "code tunnel --accept-server-license-terms --name ${VSCODE_TUNNEL_NAME}"
else else

View File

@ -1 +1 @@
3.2.1 3.2.5