From a1ec01ec2ddc0f70e0ff36fefc6015d5ffb6ffaa Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 16 Jun 2009 17:38:23 +0000
Subject: [PATCH] * Browser Launch: Wait until the routerconsole is up
before launching the browser
---
.../src/net/i2p/apps/systray/UrlLauncher.java | 55 +++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
index 55a7b52773..b0f6425d32 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
@@ -12,9 +12,12 @@ package net.i2p.apps.systray;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
+import java.net.InetSocketAddress;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
+import java.net.Socket;
+import java.net.SocketAddress;
import java.net.URL;
import net.i2p.I2PAppContext;
@@ -34,6 +37,56 @@ public class UrlLauncher {
ShellCommand _shellCommand = new ShellCommand();
+ private static final int WAIT_TIME = 5*1000;
+ private static final int MAX_WAIT_TIME = 5*60*1000;
+ private static final int MAX_TRIES = 99;
+
+ /**
+ * Prevent bad user experience by waiting for the server to be there
+ * before launching the browser.
+ * @return success
+ */
+ public boolean waitForServer(String urlString) {
+ URL url;
+ try {
+ url = new URL(urlString);
+ } catch (MalformedURLException e) {
+ return false;
+ }
+ String host = url.getHost();
+ int port = url.getPort();
+ if (port <= 0) {
+ port = url.getDefaultPort();
+ if (port <= 0)
+ return false;
+ }
+ SocketAddress sa;
+ try {
+ sa = new InetSocketAddress(host, port);
+ } catch (IllegalArgumentException iae) {
+ return false;
+ }
+ long done = System.currentTimeMillis() + MAX_WAIT_TIME;
+ for (int i = 0; i < MAX_TRIES; i++) {
+ try {
+ Socket test = new Socket();
+ // this will usually fail right away if it's going to fail since it's local
+ test.connect(sa, WAIT_TIME);
+ // it worked
+ try {
+ test.close();
+ } catch (IOException ioe) {}
+ return true;
+ } catch (Exception e) {}
+ if (System.currentTimeMillis() > done)
+ break;
+ try {
+ Thread.sleep(WAIT_TIME);
+ } catch (InterruptedException ie) {}
+ }
+ return false;
+ }
+
/**
* Discovers the operating system the installer is running under and tries
* to launch the given URL using the default browser for that platform; if
@@ -50,6 +103,7 @@ public class UrlLauncher {
String osName = System.getProperty("os.name");
+ waitForServer(url);
if (validateUrlFormat(url)) {
if (osName.toLowerCase().indexOf("mac") > -1) {
if (osName.toLowerCase().startsWith("mac os x")) {
@@ -143,6 +197,7 @@ public class UrlLauncher {
*/
public boolean openUrl(String url, String browser) throws Exception {
+ waitForServer(url);
if (validateUrlFormat(url))
if (_shellCommand.executeSilentAndWaitTimed(browser + " " + url, 5))
return true;
--
GitLab