@atriumchat/install 0.7.1 → 0.7.2

package/README.md

@@ -1,4 +1,4 @@
-# Atrium 0.7.1
+# Atrium 0.7.2
 
 Установщик Atrium и архив релиза, который он распаковывает.
 
@@ -13,7 +13,7 @@ npx @atriumchat/install
 Без Node:
 
 ```sh
-curl -fsSL https://cdn.jsdelivr.net/npm/@atriumchat/install@0.7.1/install.sh | sh
+curl -fsSL https://cdn.jsdelivr.net/npm/@atriumchat/install@0.7.2/install.sh | sh
 ```
 
 Основной адрес и исходники: https://github.com/atriumchat/atrium

package/install.sh

@@ -52,13 +52,13 @@ shopt -u patsub_replacement 2>/dev/null || true
 umask 022
 
 # == The release this installer puts on the server. deploy/release.sh rewrites these lines.
-RELEASE_VERSION=0.7.1
-RELEASE_SHA256=a731cb23ffd5a273796c3ffffde28ea9da6b62a5abeb80e3ca9b571fbc16b90b
+RELEASE_VERSION=0.7.2
+RELEASE_SHA256=36f0ee977dc5bc784b541d270830179e924eefe691a5164463a302f896d04907
 RELEASE_REPO=atriumchat/atrium
 # The npm package that mirrors each release's install.sh and tarball (deploy/release.sh publishes it).
 RELEASE_NPM=@atriumchat/install
 RELEASE_REGISTRY=ghcr.io/atriumchat
-RELEASE_APP_DIGEST=sha256:d4f63d2b370a9fe686e2f01c92092fa7730b2baef045c42b1f3d4cbce0463f24
+RELEASE_APP_DIGEST=sha256:7e0aa37b22725f7cd1ce91b882a0c0611fdc214cb2c2b1937363ea398c9b15e1
 RELEASE_CADDY_DIGEST=sha256:cd2cf5a7985bb21afa94786e9779dcf972b89e7e281a0a9b616acc659ce30bbf
 
 # == gum, for this run only.
@@ -438,12 +438,27 @@ wait_dns() {
   for i in $(seq 1 60); do
     check_dns
     progress sub "Записей на месте: $DNS_HITS из 3"
-    (( DNS_OK )) && break
+    (( DNS_OK )) && dns_everywhere && break
+    (( DNS_OK )) && progress sub "Адрес расходится по интернету"
     sleep 3
   done
   progress "done" address
 }
 
+# Every name answers from both Cloudflare and Google with this server's address. Let's Encrypt asks from its own
+# resolvers, and a name one big resolver has while another still fails it (dedyn.io's delegation shows up a little
+# later in some) can fail the certificate; Caddy then waits longer and longer before it tries again (step_https).
+dns_everywhere() {
+  local host url out
+  for host in "$DOMAIN" "app.$DOMAIN" "$TURN_HOST.$DOMAIN"; do
+    for url in "https://cloudflare-dns.com/dns-query?name=$host&type=A" "https://dns.google/resolve?name=$host&type=A"; do
+      out=$(curl -fsS --max-time 5 -H 'accept: application/dns-json' "$url" 2>/dev/null) || return 1
+      [[ $out == *'"Status":0'* || $out == *'"Status": 0'* ]] || return 1
+      [[ -z ${SERVER_IP:-} || $out == *"\"$SERVER_IP\""* ]] || return 1
+    done
+  done
+}
+
 print_checks() {
   local item
   for item in "${CHECK_LINES[@]}"; do
@@ -1076,11 +1091,20 @@ step_up() {
   docker image prune -f
 }
 
+# The certificate. Caddy asks for it as it starts; when that first try fails (the name not seen everywhere yet), it
+# waits a minute, then two, four… before the next. A minute without one, Caddy is started again, which asks at once:
+# the certificate comes within a minute of the name being everywhere instead of after Caddy's next turn. Four minutes
+# in all; past that it's left to Caddy and the install still ends (screen_done says so).
 step_https() {
   local i
+  cd "$ATRIUM_DIR/deploy" || return
   progress sub "Ждём сертификат от Let's Encrypt"
-  for i in $(seq 1 30); do
+  for i in $(seq 1 80); do
     curl -fsS --max-time 5 -o /dev/null --resolve "app.$DOMAIN:443:127.0.0.1" "https://app.$DOMAIN/api/setup" && return 0
+    if (( i % 20 == 0 )); then
+      progress sub "Просим сертификат ещё раз"
+      docker compose restart caddy >/dev/null 2>&1 || true
+    fi
     sleep 3
   done
   return 1

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@atriumchat/install",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Atrium installer and release files: npx @atriumchat/install, or curl -fsSL https://cdn.jsdelivr.net/npm/@atriumchat/install/install.sh | sh",
   "homepage": "https://github.com/atriumchat/atrium",
   "repository": { "type": "git", "url": "git+https://github.com/atriumchat/atrium.git" },
   "license": "AGPL-3.0-only",
   "bin": { "atrium-install": "install.sh" },
-  "files": ["install.sh", "atrium-0.7.1.tar.gz", "LICENSE"]
+  "files": ["install.sh", "atrium-0.7.2.tar.gz", "LICENSE"]
 }