PLUS: пульс с первого байта против 520 и логи прокси в файл

plus/serve_muscriptor.py

@@ -421,7 +421,7 @@ def start_proxy(server_port: int, listen_port: int,
          "--listen", str(listen_port), "--target", str(server_port),
          "--instruments", instruments]
         + (["--multi-pass", multi_pass] if multi_pass else []),
-        stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
+        stdout=open("muscriptor_proxy.log", "a"), stderr=subprocess.STDOUT)
     for _ in range(20):
         time.sleep(0.5)
         if proc.poll() is not None:
@@ -530,6 +530,7 @@ def main(argv: list[str] | None = None) -> int:
         say(">>> OPEN THIS LINK: " + str(tunnel.url))
 
     started, beat = time.time(), time.time()
+    public_fails, checked = 0, time.time()
     try:
         while True:
             time.sleep(10)
@@ -548,6 +549,23 @@ def main(argv: list[str] | None = None) -> int:
                 say("прокси упал, поднимаю заново")
                 proxy = start_proxy(args.port, proxy_port, args.instruments,
                                     args.multi_pass, args.no_articulation)
+            if tunnel is not None and tunnel.url and time.time() - checked > 60:
+                checked = time.time()
+                status, body = probe_page(tunnel.url)
+                fine, note = looks_like_app(status, body)
+                if fine:
+                    public_fails = 0
+                else:
+                    public_fails += 1
+                    say("      ссылка снаружи: %s (%d подряд)" % (note, public_fails))
+                    if public_fails >= 2:
+                        say("      переоткрываю туннель: снаружи не отвечает")
+                        tunnel.kill()
+                        tunnel = open_tunnel(proxy_port, order)
+                        write_link(tunnel.url or "", args.port, proxy_port)
+                        if tunnel.url:
+                            say(">>> OPEN THIS LINK: " + tunnel.url)
+                        public_fails = 0
             if tunnel is not None and not tunnel.alive():
                 say("туннель умер, открываю новый")
                 tunnel.kill()