Nicolas Cantu
42e3e7e692
**Motivations:** - Keep dependencies up to date for security and features - Automate dependency updates in deployment script - Fix compatibility issues with major version updates (React 19, Next.js 16, nostr-tools 2.x) **Root causes:** - Dependencies were outdated - Deployment script did not update dependencies before deploying - Major version updates introduced breaking API changes **Correctifs:** - Updated all dependencies to latest versions using npm-check-updates - Modified deploy.sh to run npm-check-updates before installing dependencies - Fixed nostr-tools 2.x API changes (generatePrivateKey -> generateSecretKey, signEvent -> finalizeEvent, verifySignature -> verifyEvent) - Fixed React 19 ref types to accept null - Fixed JSX namespace issues (JSX.Element -> React.ReactElement) - Added proper types for event callbacks - Fixed SimplePool.sub typing issues with type assertions **Evolutions:** - Deployment script now automatically updates dependencies to latest versions before deploying - All dependencies updated to latest versions (Next.js 14->16, React 18->19, nostr-tools 1->2, etc.) **Pages affectées:** - package.json - deploy.sh - lib/keyManagement.ts - lib/nostr.ts - lib/nostrRemoteSigner.ts - lib/zapVerification.ts - lib/platformTrackingEvents.ts - lib/sponsoringTracking.ts - lib/articlePublisherHelpersVerification.ts - lib/contentDeliveryVerification.ts - lib/paymentPollingZapReceipt.ts - lib/nostrPrivateMessages.ts - lib/nostrSubscription.ts - lib/nostrZapVerification.ts - lib/markdownRenderer.tsx - components/AuthorFilter.tsx - components/AuthorFilterButton.tsx - components/UserArticlesList.tsx - types/nostr-tools-extended.ts
228 lines
7.4 KiB
Bash
228 lines
7.4 KiB
Bash
#!/bin/bash
|
|
set -e
|
|
|
|
# Configuration
|
|
SERVER="debian@92.243.27.35"
|
|
APP_NAME="zapwall"
|
|
DOMAIN="zapwall.fr"
|
|
APP_DIR="/var/www/${DOMAIN}"
|
|
GIT_REPO="https://git.4nkweb.com/4nk/story-research-zapwall.git"
|
|
|
|
# Configuration SSH pour connexion persistante (évite MaxStartups)
|
|
# Utiliser un chemin temporaire sans espaces pour ControlPath
|
|
SSH_CONTROL_DIR="/tmp/ssh_control_$$"
|
|
mkdir -p "${SSH_CONTROL_DIR}"
|
|
SSH_CONTROL_PATH="${SSH_CONTROL_DIR}/debian_92.243.27.35_22"
|
|
|
|
# Fonction pour exécuter une commande SSH avec connexion persistante
|
|
ssh_exec() {
|
|
ssh -o ControlMaster=auto -o ControlPath="${SSH_CONTROL_PATH}" -o ControlPersist=300 ${SERVER} "$@"
|
|
}
|
|
|
|
# Nettoyer les connexions SSH persistantes et le répertoire temporaire à la fin
|
|
cleanup_ssh() {
|
|
ssh -O exit -o ControlPath="${SSH_CONTROL_PATH}" ${SERVER} 2>/dev/null || true
|
|
rm -rf "${SSH_CONTROL_DIR}" 2>/dev/null || true
|
|
}
|
|
trap cleanup_ssh EXIT
|
|
|
|
# Vérifier qu'un message de commit est fourni
|
|
if [ -z "$1" ]; then
|
|
echo "Erreur: Un message de commit est requis"
|
|
echo ""
|
|
echo "Usage: ./deploy.sh \"Message de commit\""
|
|
echo ""
|
|
echo "Exemple: ./deploy.sh \"Fix: Correction du bug de connexion\""
|
|
exit 1
|
|
fi
|
|
|
|
COMMIT_MESSAGE="$1"
|
|
|
|
echo "=== Déploiement de ${DOMAIN} ==="
|
|
echo ""
|
|
|
|
# Détecter la branche courante
|
|
BRANCH=$(git branch --show-current 2>/dev/null || echo "main")
|
|
echo "Branche courante: ${BRANCH}"
|
|
echo "Message de commit: ${COMMIT_MESSAGE}"
|
|
echo ""
|
|
|
|
# Commit et push des modifications locales
|
|
echo "1. Préparation du commit local..."
|
|
HAS_CHANGES=false
|
|
HAS_UNPUSHED_COMMITS=false
|
|
|
|
# Vérifier s'il y a des modifications non commitées
|
|
if ! git diff --quiet || ! git diff --cached --quiet; then
|
|
HAS_CHANGES=true
|
|
fi
|
|
|
|
# Vérifier s'il y a des commits non poussés
|
|
if git rev-parse --abbrev-ref ${BRANCH}@{upstream} >/dev/null 2>&1; then
|
|
LOCAL=$(git rev-parse @)
|
|
REMOTE=$(git rev-parse @{u})
|
|
if [ "$LOCAL" != "$REMOTE" ]; then
|
|
HAS_UNPUSHED_COMMITS=true
|
|
fi
|
|
else
|
|
# Pas de branche distante configurée, vérifier s'il y a des commits locaux
|
|
if git rev-list --count origin/${BRANCH}..HEAD >/dev/null 2>&1; then
|
|
UNPUSHED_COUNT=$(git rev-list --count origin/${BRANCH}..HEAD 2>/dev/null || echo "0")
|
|
if [ "$UNPUSHED_COUNT" -gt 0 ]; then
|
|
HAS_UNPUSHED_COMMITS=true
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
if [ "$HAS_CHANGES" = true ]; then
|
|
echo " ✓ Modifications détectées"
|
|
echo ""
|
|
echo "2. Ajout des modifications..."
|
|
git add -A
|
|
echo " ✓ Fichiers ajoutés"
|
|
echo ""
|
|
echo "3. Création du commit..."
|
|
git commit -m "${COMMIT_MESSAGE}"
|
|
echo " ✓ Commit créé"
|
|
HAS_UNPUSHED_COMMITS=true
|
|
fi
|
|
|
|
if [ "$HAS_UNPUSHED_COMMITS" = true ]; then
|
|
echo ""
|
|
echo "4. Push vers le dépôt distant..."
|
|
git push origin ${BRANCH}
|
|
echo " ✓ Push effectué"
|
|
else
|
|
echo " ⚠ Aucune modification à commiter ni commit à pousser"
|
|
fi
|
|
|
|
# Vérifier si Git est initialisé sur le serveur
|
|
echo ""
|
|
echo "5. Vérification du dépôt Git sur le serveur..."
|
|
if ssh_exec "cd ${APP_DIR} && git status >/dev/null 2>&1"; then
|
|
echo " ✓ Dépôt Git détecté"
|
|
else
|
|
echo " ⚠ Dépôt Git non initialisé, initialisation..."
|
|
ssh_exec "cd ${APP_DIR} && git init && git remote add origin ${GIT_REPO} 2>/dev/null || git remote set-url origin ${GIT_REPO}"
|
|
ssh_exec "cd ${APP_DIR} && git checkout -b ${BRANCH} 2>/dev/null || true"
|
|
fi
|
|
|
|
# Récupérer les dernières modifications
|
|
echo ""
|
|
echo "6. Récupération des dernières modifications..."
|
|
ssh_exec "cd ${APP_DIR} && git fetch origin"
|
|
|
|
# Sauvegarder les modifications locales sur le serveur
|
|
echo ""
|
|
echo "7. Sauvegarde des modifications locales sur le serveur..."
|
|
STASH_OUTPUT=$(ssh_exec "cd ${APP_DIR} && git stash push -u -m 'Auto-stash before deploy - $(date +%Y-%m-%d_%H:%M:%S)' 2>&1" || echo "No changes to stash")
|
|
if echo "$STASH_OUTPUT" | grep -q "No local changes"; then
|
|
echo " ✓ Aucune modification locale à sauvegarder"
|
|
else
|
|
echo " ✓ Modifications locales sauvegardées"
|
|
fi
|
|
|
|
# Nettoyer les fichiers non suivis
|
|
echo ""
|
|
echo "8. Nettoyage des fichiers non suivis..."
|
|
ssh_exec "cd ${APP_DIR} && git clean -fd || true"
|
|
|
|
# Vérifier que la branche existe
|
|
echo ""
|
|
echo "9. Vérification de la branche ${BRANCH}..."
|
|
if ssh_exec "cd ${APP_DIR} && git ls-remote --heads origin ${BRANCH} | grep -q ${BRANCH}"; then
|
|
echo " ✓ Branche ${BRANCH} trouvée"
|
|
else
|
|
echo " ✗ Branche ${BRANCH} non trouvée sur le dépôt distant"
|
|
echo ""
|
|
echo " Branches disponibles:"
|
|
AVAILABLE_BRANCHES=$(ssh_exec "cd ${APP_DIR} && git ls-remote --heads origin | sed 's/.*refs\\/heads\\///'")
|
|
echo "$AVAILABLE_BRANCHES" | sed 's/^/ - /'
|
|
echo ""
|
|
echo " Erreur: La branche '${BRANCH}' n'existe pas sur le dépôt distant."
|
|
echo " Vérifiez que vous avez bien poussé la branche avec 'git push origin ${BRANCH}'"
|
|
exit 1
|
|
fi
|
|
|
|
# Mise à jour depuis la branche
|
|
echo ""
|
|
echo "10. Mise à jour depuis la branche ${BRANCH}..."
|
|
ssh_exec "cd ${APP_DIR} && git checkout ${BRANCH} 2>/dev/null || git checkout -b ${BRANCH} origin/${BRANCH}"
|
|
ssh_exec "cd ${APP_DIR} && git pull origin ${BRANCH}"
|
|
|
|
# Afficher le dernier commit
|
|
echo ""
|
|
echo "11. Dernier commit:"
|
|
ssh_exec "cd ${APP_DIR} && git log -1 --oneline"
|
|
|
|
# Copier next.config.js local vers le serveur (pour ignorer ESLint pendant le build)
|
|
echo ""
|
|
echo "12. Mise à jour de next.config.js pour ignorer ESLint pendant le build..."
|
|
if [ -f "next.config.js" ]; then
|
|
cat next.config.js | ssh_exec "cat > ${APP_DIR}/next.config.js"
|
|
echo " ✓ next.config.js mis à jour"
|
|
else
|
|
echo " ⚠ next.config.js local non trouvé, utilisation de celui du serveur"
|
|
fi
|
|
|
|
# Mettre à jour les dépendances aux dernières versions
|
|
echo ""
|
|
echo "13. Mise à jour des dépendances aux dernières versions..."
|
|
ssh_exec "cd ${APP_DIR} && npx -y npm-check-updates -u || true"
|
|
|
|
# Installer les dépendances
|
|
echo ""
|
|
echo "14. Installation des dépendances..."
|
|
ssh_exec "cd ${APP_DIR} && npm install"
|
|
|
|
# Construire l'application
|
|
echo ""
|
|
echo "15. Construction de l'application..."
|
|
ssh_exec "cd ${APP_DIR} && npm run build"
|
|
|
|
# Redémarrer le service
|
|
echo ""
|
|
echo "16. Redémarrage du service ${APP_NAME}..."
|
|
ssh_exec "sudo systemctl restart ${APP_NAME}"
|
|
sleep 3
|
|
|
|
# Vérifier que le service fonctionne
|
|
echo ""
|
|
echo "17. Vérification du service..."
|
|
if ssh_exec "sudo systemctl is-active ${APP_NAME} >/dev/null"; then
|
|
echo " ✓ Service actif"
|
|
echo ""
|
|
echo " Statut du service:"
|
|
ssh_exec "sudo systemctl status ${APP_NAME} --no-pager | head -10"
|
|
else
|
|
echo " ✗ Service inactif, vérification des logs..."
|
|
ssh_exec "sudo journalctl -u ${APP_NAME} --no-pager -n 30"
|
|
exit 1
|
|
fi
|
|
|
|
# Vérifier que le port est en écoute
|
|
echo ""
|
|
echo "18. Vérification du port 3001..."
|
|
if ssh_exec "sudo ss -tuln | grep -q ':3001 '"; then
|
|
echo " ✓ Port 3001 en écoute"
|
|
else
|
|
echo " ⚠ Port 3001 non encore en écoute, attente..."
|
|
sleep 5
|
|
if ssh_exec "sudo ss -tuln | grep -q ':3001 '"; then
|
|
echo " ✓ Port 3001 maintenant en écoute"
|
|
else
|
|
echo " ✗ Port 3001 toujours non en écoute"
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
echo ""
|
|
echo "=== Déploiement terminé avec succès ==="
|
|
echo ""
|
|
echo "Site disponible sur: https://${DOMAIN}/"
|
|
echo ""
|
|
echo "Commandes utiles:"
|
|
echo " Voir les logs: ssh ${SERVER} 'sudo journalctl -u ${APP_NAME} -f'"
|
|
echo " Voir les stashes: ssh ${SERVER} 'cd ${APP_DIR} && git stash list'"
|
|
echo " Restaurer un stash: ssh ${SERVER} 'cd ${APP_DIR} && git stash pop'"
|