set up the router in advance and run it with runRouter instead of RouterLaunch.main

Makefile

@@ -78,7 +78,7 @@ build/I2P: I2P build
 	cp -rv I2P build/I2P ; true
 	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true
 
-src/I2P/config: build/I2P
+src/I2P/config:
 	mkdir -p src/I2P/config
 	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
 	echo true | tee src/I2P/config/jpackaged

build.sh

@@ -41,7 +41,7 @@ sleep 5s
 HERE="$PWD"
 if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
   git clone -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
-  tar --exclude="$HERE/../i2p.i2p.jpackage-build/.git" cvzf i2p.i2p.jpackage-build.tar.gz "$HERE/../i2p.i2p.jpackage-build/"
+  tar --exclude="$HERE/../i2p.i2p.jpackage-build/.git" -cvzf i2p.i2p.jpackage-build.tar.gz "$HERE/../i2p.i2p.jpackage-build/"
 fi
 cd "$HERE/../i2p.i2p.jpackage-build/"
 for i in $COUNT; do
@@ -91,6 +91,9 @@ fi
 echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
 
 rm -rf I2P
+
+make src/I2P/config
+
 "$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
   --verbose \
   --java-options "-Xmx512m" \
@@ -101,6 +104,7 @@ rm -rf I2P
   --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
   $JPACKAGE_OPTS \
   --resource-dir build \
+  --app-content src/I2P/config \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
 
 cp "$I2P_PKG/licenses/"* license/

daily.sh

@@ -50,6 +50,6 @@ ZIPCHECKSUM=$(sha256sum "../I2P.zip")
 echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
 github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
 
-TARCHECKSUM=$(sha256sum "i2p.i2p.jpackage-build.tar.gz")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+TARCHECKSUM=$(sha256sum "../../i2p.i2p.jpackage-build.tar.gz")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"

exe.sh

@@ -6,7 +6,7 @@
 
 . ./config.sh
 . ./i2pversion
-jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
+jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
     --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \

i2pversion

@@ -3,7 +3,7 @@
 JNA_VERSION=5.11.0
 export JNA_VERSION=5.11.0
 I2PFIREFOX_VERSION=0.0.34
-export I2PFIREFOX_VERSION=0.0.34
+export I2PFIREFOX_VERSION=0.0.36
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=1

java/net/i2p/router/CopyConfigDir.java

@@ -0,0 +1,76 @@
+package net.i2p.router;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class CopyConfigDir {
+
+  public boolean copyDirectory(String baseDir, String workDir) {
+    File baseFile = new File(baseDir);
+    File workFile = new File(workDir);
+    return copyDirectory(baseFile, workFile);
+  }
+
+  public boolean copyDirectory(File baseDir, File workDir) {
+    for (File file : baseDir.listFiles()) {
+      System.out.println(file.getAbsolutePath());
+      if (file.isDirectory())
+        copyDirectory(file, new File(workDir, file.toString()));
+      if (file.isFile())
+        copyFileNeverOverwrite(file, new File(workDir, file.toString()));
+    }
+    return true;
+  }
+
+  public boolean copyConfigDirectory(File baseDir, File workDir) {
+    for (File file : baseDir.listFiles()) {
+      System.out.println(file.getAbsolutePath());
+      if (file.isDirectory())
+        copyDirectory(file, new File(workDir, file.toString()));
+      if (file.isFile())
+        copyFileNeverOverwrite(file, new File(workDir, file.toString()));
+    }
+    return true;
+  }
+
+  public boolean copyFileNeverOverwrite(String basePath, String workPath) {
+    File baseFile = new File(basePath);
+    File workFile = new File(workPath);
+    return copyFileNeverOverwrite(baseFile, workFile);
+  }
+
+  public boolean copyFileNeverOverwrite(File basePath, File workPath) {
+    return copyFile(basePath, workPath, false);
+  }
+
+  public boolean copyFile(File basePath, File workPath, boolean overWrite) {
+    if (!basePath.exists()) {
+      return false;
+    }
+    if (!overWrite && workPath.exists()) {
+      return false;
+    }
+    try (InputStream in =
+             new BufferedInputStream(new FileInputStream(basePath));
+         OutputStream out =
+             new BufferedOutputStream(new FileOutputStream(workPath))) {
+
+      byte[] buffer = new byte[1024];
+      int lengthRead;
+      while ((lengthRead = in.read(buffer)) > 0) {
+        out.write(buffer, 0, lengthRead);
+        out.flush();
+      }
+      in.close();
+      out.close();
+      return true;
+    } catch (Throwable e) {
+      return false;
+    }
+  }
+}

java/net/i2p/router/WinLauncher.java

@@ -32,22 +32,12 @@ import net.i2p.util.SystemVersion;
  */
 public class WinLauncher {
   static Logger logger = Logger.getLogger("launcherlog");
+  static WindowsUpdatePostProcessor wupp = null;
   static FileHandler fh;
+  private static Router i2pRouter;
 
   public static void main(String[] args) throws Exception {
-    try {
-      // This block configure the logger with handler and formatter
-      fh = new FileHandler(logFile().toString());
-      logger.addHandler(fh);
-      SimpleFormatter formatter = new SimpleFormatter();
-      fh.setFormatter(formatter);
-      // the following statement is used to log any messages
-      logger.info("My first log");
-    } catch (SecurityException e) {
-      e.printStackTrace();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
+    setupLauncher();
     boolean privateBrowsing = false;
     boolean usabilityMode = false;
     boolean chromiumFirst = false;
@@ -97,38 +87,23 @@ public class WinLauncher {
       }
     }
 
-    File programs = selectProgramFile();
-    if (!programs.exists())
-      programs.mkdirs();
-    else if (!programs.isDirectory()) {
-      logger.warning(
-          programs +
-          " exists but is not a directory. Please get it out of the way");
-      System.exit(1);
-    }
+    File programs = programFile();
+    File home = homeDir();
 
-    File home = selectHome();
-    if (!home.exists())
-      home.mkdirs();
-    else if (!home.isDirectory()) {
-      logger.warning(
-          home +
-          " exists but is not a directory. Please get it out of the way");
-      System.exit(1);
-    }
-    if (i2pIsRunning()) {
-      setNotRunning();
-      logger.warning("I2P is already running");
-      I2PBrowser i2pBrowser = new I2PBrowser();
-      i2pBrowser.usability = usabilityMode;
-      i2pBrowser.chromiumFirst = chromiumFirst;
-      i2pBrowser.firefox = !chromiumFirst;
-      i2pBrowser.chromium = chromiumFirst;
-      i2pBrowser.setProxyTimeoutTime(proxyTimeoutTime);
-      System.out.println("I2PBrowser");
-      String[] newArgs = newArgsList.toArray(new String[newArgsList.size()]);
-      i2pBrowser.launch(privateBrowsing, newArgs);
-      return;
+    // TODO: I want to minimize the amount of stuff I have to rely on NSIS for
+    // and if I
+    // 1. make the config directory inclusion part of the jpackage step
+    // and
+    // 2. make the launcher copy new or missing config files at launch
+    // then NSIS serves primarily as a way of providing multilanguage
+    // support in the installer. It has a higher degree of customization,
+    // but probably ceases to be necessary, I can make jpackage generate
+    // the installer, **and** I get to build every other kind of jpackage
+    // powered package.
+
+    if (launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
+                      proxyTimeoutTime, newArgsList)) {
+      System.exit(0);
     }
 
     System.setProperty("i2p.dir.base", programs.getAbsolutePath());
@@ -146,7 +121,7 @@ public class WinLauncher {
      */
     System.setProperty("user.dir", programs.getAbsolutePath());
 
-    // wupp.i2pRouter = new Router(System.getProperties());
+    i2pRouter = new Router(System.getProperties());
     logger.info("Router is configured");
 
     Thread registrationThread = new Thread(REGISTER_UPP);
@@ -154,14 +129,91 @@ public class WinLauncher {
     registrationThread.setDaemon(true);
     registrationThread.start();
 
-    setNotRunning();
-    // wupp.i2pRouter.runRouter();
-    RouterLaunch.main(args);
+    setNotStarting();
+    // TODO: I actually did this once before, and reversed it for
+    // some dumb reason I can't remember. But if I go back through
+    // all the steps then I set up the router before I run it ^^
+    // see above commented out `wupp` and I don't have to wait for
+    // certain contexts to be ready anymore.
+    i2pRouter.runRouter();
+    // RouterLaunch.main(args);
+  }
+
+  private static void setupLauncher() {
+    try {
+      // This block configure the logger with handler and formatter
+      fh = new FileHandler(logFile().toString());
+      logger.addHandler(fh);
+      SimpleFormatter formatter = new SimpleFormatter();
+      fh.setFormatter(formatter);
+      // the following statement is used to log any messages
+      logger.info("My first log");
+    } catch (SecurityException e) {
+      e.printStackTrace();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+
+    File jrehome = javaHome();
+    logger.info("jre home is: " + jrehome.getAbsolutePath());
+    File appimagehome = appImageHome();
+    logger.info("appimage home is: " + appimagehome.getAbsolutePath());
+  }
+
+  private static File programFile() {
+    File programs = selectProgramFile();
+    if (!programs.exists())
+      programs.mkdirs();
+    else if (!programs.isDirectory()) {
+      logger.warning(
+          programs +
+          " exists but is not a directory. Please get it out of the way");
+      System.exit(1);
+    }
+    return programs;
+  }
+
+  private static File homeDir() {
+    File home = selectHome();
+    if (!home.exists())
+      home.mkdirs();
+    else if (!home.isDirectory()) {
+      logger.warning(
+          home +
+          " exists but is not a directory. Please get it out of the way");
+      System.exit(1);
+    }
+    return home;
+  }
+
+  private static boolean launchBrowser(boolean privateBrowsing,
+                                       boolean usabilityMode,
+                                       boolean chromiumFirst,
+                                       int proxyTimeoutTime,
+                                       ArrayList<String> newArgsList) {
+    if (i2pIsRunning()) {
+      logger.info("I2P is already running, launching an I2P browser");
+      I2PBrowser i2pBrowser = new I2PBrowser();
+      i2pBrowser.usability = usabilityMode;
+      i2pBrowser.chromiumFirst = chromiumFirst;
+      i2pBrowser.firefox = !chromiumFirst;
+      i2pBrowser.chromium = chromiumFirst;
+      if (chromiumFirst) {
+        logger.warning("favoring Chromium instead of Firefox");
+      }
+      i2pBrowser.setProxyTimeoutTime(proxyTimeoutTime);
+      System.out.println("I2PBrowser");
+      String[] newArgs = newArgsList.toArray(new String[newArgsList.size()]);
+      setNotStarting();
+      i2pBrowser.launch(privateBrowsing, newArgs);
+      return true;
+    }
+    return false;
   }
 
   // see
   // https://stackoverflow.com/questions/434718/sockets-discover-port-availability-using-java
-  public static boolean isAvailable(int portNr) {
+  private static boolean isAvailable(int portNr) {
     boolean portFree;
     try (var ignored = new ServerSocket(portNr)) {
       portFree = true;
@@ -173,55 +225,55 @@ public class WinLauncher {
 
   private static boolean i2pIsRunningCheck() {
     // check if there's something listening on port 7657(Router Console)
-    if (!isAvailable(7657)) {
+    if (!isAvailable(7657))
       return true;
-    }
     // check if there's something listening on port 7654(I2CP)
-    if (!isAvailable(7654)) {
+    if (!isAvailable(7654))
+      return true;
+    if (checkPing())
       return true;
-    }
-    // check for the existence of router.ping file, if it's less then 2
-    // minutes old, exit
-    File home = selectHome();
-    File ping = new File(home, "router.ping");
-    if (ping.exists()) {
-      long diff = System.currentTimeMillis() - ping.lastModified();
-      if (diff < 60 * 1000) {
-        logger.info(
-            "router.ping exists and is less than 1 minute old, I2P appears to be running already.");
-        logger.info("If I2P is not running, wait 60 seconds and try again.");
-        return true;
-      }
-    }
     return false;
   }
 
-  private static void setNotRunning() {
+  private static void setNotStarting() {
+    logger.info("removing startup file, the application has started");
     File home = selectHome();
-    File running = new File(home, "running");
-    if (running.exists()) {
-      running.delete();
+    File starting = new File(home, "starting");
+    if (starting.exists()) {
+      starting.delete();
     }
   }
-  private static void setRunning() {
+
+  private static void setStarting() {
+    logger.info("creating startup file, router is starting up");
     File home = selectHome();
-    File running = new File(home, "running");
-    if (!running.exists()) {
+    File starting = new File(home, "starting");
+    if (!starting.exists()) {
       try {
-        running.createNewFile();
+        starting.createNewFile();
       } catch (IOException e) {
         logger.info(e.toString());
       }
     }
   }
 
-  private static boolean i2pIsRunning() {
+  private static boolean checkStarting() {
+    logger.info("checking startup file");
     File home = selectHome();
-    File running = new File(home, "running");
-    if (running.exists()) {
+    File starting = new File(home, "starting");
+    if (starting.exists()) {
+      logger.info("startup file exists, I2P is already starting up");
       return true;
     }
-    setRunning();
+    logger.info("startup file does not exist but we're running now");
+    setStarting();
+    return false;
+  }
+
+  // check for the existence of router.ping file, if it's less then 2
+  // minutes old, exit
+  private static boolean checkPing() {
+    File home = selectHome();
     File ping = new File(home, "router.ping");
     if (ping.exists()) {
       long diff = System.currentTimeMillis() - ping.lastModified();
@@ -230,8 +282,18 @@ public class WinLauncher {
             "router.ping exists and is more than 1 minute old, I2P does not appear to be running.");
         logger.info("If I2P is running, report this as a bug.");
         return false;
+      } else {
+        return true;
       }
     }
+    return false;
+  }
+
+  private static boolean i2pIsRunning() {
+    if (checkStarting())
+      return true;
+    if (checkPing())
+      return true;
     if (i2pIsRunningCheck())
       return true;
     for (int i = 0; i < 10; i++) {
@@ -243,40 +305,25 @@ public class WinLauncher {
   }
 
   private static final Runnable REGISTER_UPP = () -> {
-
-    // first wait for the RouterContext to appear
     RouterContext ctx;
-    while ((ctx = (RouterContext)RouterContext.getCurrentContext()) == null) {
+    while ((ctx = i2pRouter.getContext()) == null) {
       sleep(1000);
     }
-
     // then wait for the update manager
-
     ClientAppManager cam;
     while ((cam = ctx.clientAppManager()) == null) {
       sleep(1000);
     }
-
     UpdateManager um;
     while ((um = (UpdateManager)cam.getRegisteredApp(UpdateManager.APP_NAME)) ==
            null) {
       sleep(1000);
     }
-
     WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(ctx);
     um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
     um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
   };
 
-  private static void sleep(int millis) {
-    try {
-      Thread.sleep(millis);
-    } catch (InterruptedException bad) {
-      bad.printStackTrace();
-      throw new RuntimeException(bad);
-    }
-  }
-
   private static File selectHome() { // throws Exception {
     String path_override = System.getenv("I2P_CONFIG");
     if (path_override != null) {
@@ -289,17 +336,12 @@ public class WinLauncher {
       }
     }
     if (SystemVersion.isWindows()) {
-      File home = new File(System.getProperty("user.home"));
-      File appData = new File(home, "AppData");
-      File local = new File(appData, "Local");
-      File i2p;
-      i2p = new File(local, "I2P");
-      logger.info("Windows jpackage wrapper starting up, using: " + i2p +
-                  " as base config");
-      return i2p.getAbsoluteFile();
+      File i2p = appImageHome();
+      logger.info("Checking for signs of life in I2P directory: " + i2p);
+      return i2p;
     } else {
-      File jrehome = new File(System.getProperty("java.home"));
-      File programs = new File(jrehome.getParentFile().getParentFile(), ".i2p");
+      File i2p = appImageHome();
+      File programs = new File(i2p, ".i2p");
       logger.info("Linux portable jpackage wrapper starting up, using: " +
                   programs + " as base config");
       return programs.getAbsoluteFile();
@@ -332,10 +374,122 @@ public class WinLauncher {
     }
   }
 
+  /**
+   * get the OS name(windows, mac, linux only)
+   *
+   * @return os name in lower-case, "windows" "mac" or  "linux"
+   */
+  private static String osName() {
+    String osName = System.getProperty("os.name").toLowerCase();
+    if (osName.contains("windows"))
+      return "windows";
+    if (osName.contains("mac"))
+      return "mac";
+    return "linux";
+  }
+
+  /**
+   * get the path to the java home, for jpackage this is related to the
+   * executable itself, which is handy to know. It's a directory called runtime,
+   * relative to the root of the app-image on each platform:
+   *
+   * Windows - Root of appimage is 1 directory above directory named runtime
+   *     ./runtime
+   *
+   * Linux - Root of appimage is 2 directories above directory named runtime
+   *     ./lib/runtime
+   *
+   * Mac OSX - Unknown for now
+   *
+   * @return
+   */
+  private static File javaHome() {
+    File jrehome = new File(System.getProperty("java.home"));
+    if (jrehome != null) {
+      if (jrehome.exists()) {
+        return jrehome;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the root of the app-image root by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information.
+   *
+   * @return the app-image root
+   */
+  private static File appImageHome() {
+    File jreHome = javaHome();
+    if (jreHome != null) {
+      switch (osName()) {
+      case "windows":
+        return jreHome.getAbsoluteFile().getParentFile();
+      case "mac":
+      case "linux":
+        return jreHome.getAbsoluteFile().getParentFile().getParentFile();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the default config of the app-image by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information, then appending lib/config to the end.
+   *
+   * @return the app-image root
+   */
+  private static File appImageConfig() {
+    File aih = appImageHome();
+    if (aih == null) {
+      return null;
+    }
+    String osName = osName();
+    switch (osName) {
+    case "windows":
+      File winConfigDir = new File(aih, "config");
+      if (winConfigDir != null) {
+        if (winConfigDir.exists()) {
+          return winConfigDir;
+        }
+      }
+    case "mac":
+    case "linux":
+      File linConfigDir = new File(aih, "lib/config");
+      if (linConfigDir != null) {
+        if (linConfigDir.exists()) {
+          return linConfigDir;
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * set up the path to the log file
+   *
+   * @return
+   */
   private static File logFile() {
-    File log = new File(selectProgramFile(), "log");
+    File log = new File(selectProgramFile(), "logs");
     if (!log.exists())
       log.mkdirs();
     return new File(log, "launcher.log");
   }
+
+  /**
+   * sleep for 1 second
+   *
+   * @param millis
+   */
+  private static void sleep(int millis) {
+    try {
+      Thread.sleep(millis);
+    } catch (InterruptedException bad) {
+      bad.printStackTrace();
+      throw new RuntimeException(bad);
+    }
+  }
 }